Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2420 from wallabag/redis-tests | Nicolas Lœuillet | 2016-10-10 | 2 | -0/+2 |
|\ | | | | | Avoid error when Redis isn't here in tests | ||||
| * | Avoid error when Redis isn't here in tests | Jeremy Benoist | 2016-10-10 | 2 | -0/+2 |
| | | |||||
* | | Merge pull request #2403 from wallabag/cleanup-install-process-in-doc | Jeremy Benoist | 2016-10-10 | 24 | -125/+325 |
|\ \ | |/ |/| | Cleaned up documentation for installation process | ||||
| * | Added steps about Redis/RabbitMQ activation | Nicolas Lœuillet | 2016-10-10 | 6 | -0/+24 |
| | | |||||
| * | Fixed links on import page | Nicolas Lœuillet | 2016-10-10 | 2 | -4/+4 |
| | | |||||
| * | Use table for parameters.yml | Jeremy Benoist | 2016-10-10 | 1 | -46/+48 |
| | | |||||
| * | Added page about parameters.yml | Nicolas Lœuillet | 2016-10-10 | 4 | -5/+53 |
| | | |||||
| * | Add -dev version | Jeremy Benoist | 2016-10-10 | 1 | -0/+1 |
| | | | | | | Following https://github.com/wallabag/wallabag/pull/2417 | ||||
| * | Typos in upgrade doc | Nicolas Lœuillet | 2016-10-10 | 1 | -3/+29 |
| | | |||||
| * | Update upgrade documentation | Nicolas Lœuillet | 2016-10-10 | 2 | -21/+11 |
| | | |||||
| * | Update documentation | Nicolas Lœuillet | 2016-10-10 | 9 | -28/+30 |
| | | |||||
| * | Added documentation about testsuite | Nicolas Lœuillet | 2016-10-10 | 8 | -5/+46 |
| | | | | | | | | Fix #2415 | ||||
| * | Update RELEASE_PROCESS.md | Jeremy Benoist | 2016-10-10 | 1 | -13/+13 |
| | | |||||
| * | Update README.md | Jeremy Benoist | 2016-10-10 | 1 | -4/+4 |
| | | |||||
| * | Changed the default command when we launch make | Nicolas Lœuillet | 2016-10-09 | 1 | -0/+2 |
| | | |||||
| * | Created scripts folder to store update/install/release process | Nicolas Lœuillet | 2016-10-09 | 4 | -26/+39 |
| | | |||||
| * | Update Makefile | Nicolas Lœuillet | 2016-10-09 | 1 | -23/+14 |
| | | |||||
| * | Update Makefile | Nicolas Lœuillet | 2016-10-09 | 1 | -11/+34 |
| | | |||||
| * | First draft for Makefile | Nicolas Lœuillet | 2016-10-09 | 2 | -6/+47 |
| | | |||||
| * | update German installation.rst | Strubbl | 2016-10-08 | 1 | -2/+2 |
| | | |||||
| * | update German installation.rst | Strubbl | 2016-10-08 | 1 | -4/+3 |
| | | |||||
| * | Chmoded install.sh | Nicolas Lœuillet | 2016-10-08 | 1 | -0/+0 |
| | | |||||
| * | Cleaned up documentation for installation process | Nicolas Lœuillet | 2016-10-08 | 7 | -80/+77 |
| | | |||||
* | | Merge pull request #2419 from wallabag/fix-twitter-cards | Nicolas Lœuillet | 2016-10-10 | 1 | -0/+1 |
|\ \ | | | | | | | Fixed Twitter Cards by adding a description tag | ||||
| * | | Fixed Twitter Cards by adding a description tag | Nicolas Lœuillet | 2016-10-10 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #2418 from wallabag/add-twitter-cards | Nicolas Lœuillet | 2016-10-10 | 1 | -3/+7 |
|\ \ | | | | | | | Added support of Twitter Cards for public articles | ||||
| * | | Added support of Twitter Cards for public articles | Nicolas Lœuillet | 2016-10-10 | 1 | -3/+7 |
|/ / | |||||
* | | Merge pull request #2417 from wallabag/version-dev | Nicolas Lœuillet | 2016-10-10 | 1 | -1/+1 |
|\ \ | | | | | | | Define a dev version for the master | ||||
| * | | Define a dev version for the master | Jeremy Benoist | 2016-10-10 | 1 | -1/+1 |
|/ / | | | | | This is to be sure that user testing wallabag from the master will have the version defined as dev. | ||||
* | | Merge pull request #2411 from wallabag/fix-entities | Nicolas Lœuillet | 2016-10-10 | 2 | -2/+2 |
|\ \ | | | | | | | Fix entities definition | ||||
| * | | Fix entities definition | Jeremy Benoist | 2016-10-09 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | As per Doctrine said in the debug tool bar: - The field Wallabag\ApiBundle\Entity\Client#refreshTokens is on the inverse side of a bi-directional relationship, but the specified mappedBy association on the target-entity Wallabag\ApiBundle\Entity\RefreshToken#client does not contain the required 'inversedBy="refreshTokens"' attribute. - The field Wallabag\ApiBundle\Entity\Client#accessTokens is on the inverse side of a bi-directional relationship, but the specified mappedBy association on the target-entity Wallabag\ApiBundle\Entity\AccessToken#client does not contain the required 'inversedBy="accessTokens"' attribute. | ||||
* | | | Merge pull request #2414 from szafranek/bugfix-bookmarklet | Jeremy Benoist | 2016-10-10 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Remove automatic closing of the window from bookmarklet | ||||
| * | | | Remove automatic closing of the window from bookmarklet | Krzysztof Szafranek | 2016-10-09 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #2413 from wallabag/sub-command-verbose | Jeremy Benoist | 2016-10-10 | 1 | -7/+10 |
|\ \ \ | | | | | | | | | When a sub command fail, display error message | ||||
| * | | | When a sub command fail, display error message | Jeremy Benoist | 2016-10-09 | 1 | -7/+10 |
|/ / / | | | | | | | | | | | | | | | | We often got issue with message “The command "doctrine:database:create" terminated with an error code: 1.”. Using the `BufferedOutput` we can store the output and only display it if an error occurs. | ||||
* | | | Merge pull request #2410 from wallabag/tag-optim | Nicolas Lœuillet | 2016-10-09 | 15 | -47/+104 |
|\ \ \ | |/ / |/| | | Optimize tag list display | ||||
| * | | CS | Jeremy Benoist | 2016-10-09 | 1 | -1/+2 |
| | | | |||||
| * | | Optimize the way tag list is rendered | Jeremy Benoist | 2016-10-09 | 13 | -45/+92 |
| | | | | | | | | | | | | | | | | | | Instead of retrieve all informations about entries of a tag to just count them, we’ll count them before with a fastest query. Also change the layout of the tag list in material design | ||||
| * | | Avoid tag duplication when tagging all articles | Jeremy Benoist | 2016-10-09 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | Mostly when the tag doesn’t yet exist. It was created each time it matche the rule… glups. | ||||
| * | | Add more log to tag:all | Jeremy Benoist | 2016-10-09 | 1 | -1/+4 |
|/ / | |||||
* | | Merge pull request #2406 from szafranek/bugfix-number-of-annotations | Jeremy Benoist | 2016-10-09 | 11 | -11/+10 |
|\ \ | | | | | | | Show number of annotations instead of nbAnnotations placeholder | ||||
| * | | Show number of annotations instead of nbAnnotations placeholder | Krzysztof Szafranek | 2016-10-09 | 11 | -11/+10 |
| |/ | | | | | | | When there was more than one annotation, a placeholder was displayed in both themes, instead of actual number. | ||||
* | | Merge pull request #2405 from szafranek/cleanup-fix-invalid-html | Nicolas Lœuillet | 2016-10-09 | 3 | -3/+3 |
|\ \ | |/ |/| | Fix few invalid HTML tags | ||||
| * | Fix few invalid HTML tags | Krzysztof Szafranek | 2016-10-09 | 3 | -3/+3 |
|/ | |||||
* | Merge pull request #2402 from wallabag/remove-1x-changelog | Jeremy Benoist | 2016-10-08 | 1 | -1086/+767 |
|\ | | | | | Removed 1.x stuff in CHANGELOG | ||||
| * | Removed 1.x stuff in CHANGELOG | Nicolas Lœuillet | 2016-10-08 | 1 | -1086/+767 |
|/ | |||||
* | Merge pull request #2351 from wallabag/fix-api-client-deletion | Nicolas Lœuillet | 2016-10-08 | 5 | -4/+45 |
|\ | | | | | Changed relation between API client and refresh token | ||||
| * | Ensure access_token are removed | Jeremy Benoist | 2016-10-08 | 5 | -4/+40 |
| | | | | | | | | | | | | | | | | When we remove the client, we should ensure that access_token are also removed. To ensure that, I created a test that generated an access_token. So when we remove the client, this association should be cascaded and shouldn’t generate an error. Also I moved some Api related stuff to the ApiBundle (like the developer controler and ClientType form) | ||||
| * | Changed relation between API client and refresh token | Nicolas Lœuillet | 2016-10-03 | 1 | -0/+5 |
| | | | | | | | | Fix #2350 | ||||
* | | Merge pull request #2393 from wallabag/api-urls-exist | Nicolas Lœuillet | 2016-10-08 | 2 | -1/+37 |
|\ \ | | | | | | | Ability to check multiple urls in API |