Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | 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 | |||||
| * | | Ability to check multiple urls in API | Jeremy Benoist | 2016-10-07 | 2 | -1/+37 | |
| | | | ||||||
* | | | Merge pull request #2397 from wallabag/api-orphan-tags | Nicolas Lœuillet | 2016-10-08 | 6 | -27/+78 | |
|\ \ \ | | | | | | | | | Ensure orphan tag are remove in API | |||||
| * | | | Ensure orphan tag are remove in API | Jeremy Benoist | 2016-10-07 | 6 | -27/+78 | |
| | | | | | | | | | | | | | | | | | | | | | | | | When the association between a tag and an entry is removed, if the tag doesn’t have other entries, we can remove it. Also add more tests for that part and ensure TagControllerTest is isolated from the rest of the test suite (finally!) | |||||
* | | | | Merge pull request #2399 from wallabag/use-locale-for-config | Jeremy Benoist | 2016-10-08 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Use default locale for user config | |||||
| * | | | | Use default locale for user config | Jeremy Benoist | 2016-10-08 | 1 | -1/+1 | |
| |/ / / | | | | | | | | | | | | | When creating a user, we set the language config “en” by default. We should use the defined locale (from `parameters.yml`) instead | |||||
* | | | | Merge pull request #2400 from wallabag/doc-env-prod | Jeremy Benoist | 2016-10-08 | 9 | -51/+51 | |
|\ \ \ \ | |/ / / |/| | | | Set env to prod in documentation | |||||
| * | | | Set env to prod in documentation | Jeremy Benoist | 2016-10-08 | 9 | -51/+51 | |
|/ / / | ||||||
* | | | Merge pull request #2396 from wallabag/mruminski-patch-1 | Nicolas Lœuillet | 2016-10-07 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Update messages.pl.yml | |||||
| * | | | Update messages.pl.yml | Mateusz Rumiński | 2016-10-07 | 1 | -1/+1 | |
| |/ / | | | | | | | translated shared_by_wallabag to polish | |||||
* | | | Merge pull request #2395 from wallabag/socket-connection | Nicolas Lœuillet | 2016-10-07 | 3 | -1/+6 | |
|\ \ \ | |/ / |/| | | Add ability to use socket | |||||
| * | | Add ability to use socket | Jeremy Benoist | 2016-10-07 | 3 | -1/+6 | |
|/ / | | | | | | | For Redis & MySQL | |||||
* | | Merge pull request #2386 from wallabag/update-changelog | Nicolas Lœuillet | 2016-10-07 | 2 | -240/+2438 | |
|\ \ | | | | | | | Changed Changelog by using github-changelog-generator from @skywinder | |||||
| * | | Update release process | Nicolas Lœuillet | 2016-10-07 | 1 | -0/+1 | |
| | | | ||||||
| * | | Changed Changelog by using github-changelog-generator from @skywinder | Nicolas Lœuillet | 2016-10-07 | 1 | -240/+2437 | |
| | | | ||||||
* | | | Merge pull request #2389 from wallabag/add-info-publich-articles | Nicolas Lœuillet | 2016-10-07 | 2 | -0/+3 | |
|\ \ \ | | | | | | | | | Added default picture if preview picture is null | |||||
| * | | | Added default picture if preview picture is null | Nicolas Lœuillet | 2016-10-07 | 2 | -0/+3 | |
| | | | | ||||||
* | | | | Merge pull request #2388 from wallabag/fix-2factor-user-admin | Nicolas Lœuillet | 2016-10-07 | 2 | -2/+2 | |
|\ \ \ \ | | | | | | | | | | | Fixed two-factor checkbox display in user admin panel | |||||
| * | | | | Fixed two-factor checkbox display in user admin panel | Nicolas Lœuillet | 2016-10-07 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | Fix #2380 | |||||
* | | | | | Merge pull request #2385 from wallabag/add-doc-about-siteconfig | Jeremy Benoist | 2016-10-07 | 2 | -6/+30 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Added documentation about siteconfig fix | |||||
| * | | | | Fixed review | Nicolas Lœuillet | 2016-10-07 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Added link to fivefilters website | Nicolas Lœuillet | 2016-10-07 | 2 | -5/+5 | |
| | | | | | ||||||
| * | | | | Fixed review | Nicolas Lœuillet | 2016-10-07 | 2 | -3/+3 | |
| | | | | | ||||||
| * | | | | Added documentation about siteconfig fix | Nicolas Lœuillet | 2016-10-07 | 2 | -6/+30 | |
| | |/ / | |/| | | | | | | | | | | Found in #2358, thank you @j0k3r | |||||
* | | | | Merge pull request #2383 from wallabag/add-info-publich-articles | Nicolas Lœuillet | 2016-10-07 | 13 | -3/+35 | |
|\ \ \ \ | |/ / / |/| / / | |/ / | Added OpenGraph support for public articles | |||||
| * | | Added test for OpenGraph | Nicolas Lœuillet | 2016-10-07 | 1 | -1/+4 | |
| | | | ||||||
| * | | Fixed review | Nicolas Lœuillet | 2016-10-07 | 12 | -21/+21 | |
| | | | ||||||
| * | | Added OpenGraph support for public articles | Nicolas Lœuillet | 2016-10-07 | 12 | -2/+31 | |
| | | | | | | | | | | | | Fix #2289 | |||||
* | | | Merge pull request #2332 from wallabag/tags-export | Jeremy Benoist | 2016-10-07 | 17 | -42/+84 | |
|\ \ \ | |/ / |/| | | Fix relations export for Entry | |||||
| * | | Fix tag test | Jeremy Benoist | 2016-10-07 | 3 | -13/+16 | |
| | | |