Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'wallabag/master' | Paulino Michelazzo | 2016-10-18 | 235 | -20760/+5158 |
|\ | |||||
| * | Merge pull request #2455 from wallabag/fix-material-config-tabs | Jeremy Benoist | 2016-10-16 | 2 | -10/+10 |
| |\ | | | | | | | Fix tabs on material | ||||
| | * | Fix tabs on material | Thomas Citharel | 2016-10-15 | 2 | -10/+10 |
| | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | | Merge pull request #2454 from wallabag/fix-baggy-small-width | Jeremy Benoist | 2016-10-16 | 1 | -14/+14 |
| |\ \ | | | | | | | | | Fix baggy display on small screens | ||||
| | * | | Fix baggy on small screens | Thomas Citharel | 2016-10-15 | 1 | -14/+14 |
| | |/ | |||||
| * | | Merge pull request #2459 from wallabag/improve-german-translation | Thomas Citharel | 2016-10-16 | 2 | -49/+49 |
| |\ \ | | | | | | | | | German: improve existing and add missing translation | ||||
| | * | | German: improve existing and add missing translation | Sven Fischer | 2016-10-16 | 2 | -49/+49 |
| | |/ | |||||
| * / | add link to German documentation in about page | Sven Fischer | 2016-10-16 | 1 | -0/+1 |
| |/ | |||||
| * | Improved side menu, reduced the font size on small screens, fixed a form to ↵ | Alexandr Danilov | 2016-10-15 | 1 | -3/+3 |
| | | | | | | | | add links on small screens | ||||
| * | Fixed Twitter Cards by adding a description tag | Nicolas Lœuillet | 2016-10-10 | 1 | -0/+1 |
| | | |||||
| * | Added support of Twitter Cards for public articles | Nicolas Lœuillet | 2016-10-10 | 1 | -3/+7 |
| | | |||||
| * | 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 |
| | |/ | |||||
| * | | 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. | ||||
| * | | Optimize the way tag list is rendered | Jeremy Benoist | 2016-10-09 | 6 | -12/+58 |
| | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | Fix few invalid HTML tags | Krzysztof Szafranek | 2016-10-09 | 3 | -3/+3 |
| |/ | |||||
| * | Merge pull request #2351 from wallabag/fix-api-client-deletion | Nicolas Lœuillet | 2016-10-08 | 3 | -3/+13 |
| |\ | | | | | | | Changed relation between API client and refresh token | ||||
| | * | Ensure access_token are removed | Jeremy Benoist | 2016-10-08 | 3 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+21 |
| |\ \ | | | | | | | | | Ability to check multiple urls in API | ||||
| | * | | Ability to check multiple urls in API | Jeremy Benoist | 2016-10-07 | 1 | -1/+21 |
| | | | | |||||
| * | | | Ensure orphan tag are remove in API | Jeremy Benoist | 2016-10-07 | 3 | -3/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 #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 | ||||
| * / / | Add ability to use socket | Jeremy Benoist | 2016-10-07 | 1 | -1/+2 |
| |/ / | | | | | | | | | | For Redis & MySQL | ||||
| * | | Merge pull request #2389 from wallabag/add-info-publich-articles | Nicolas Lœuillet | 2016-10-07 | 1 | -0/+2 |
| |\ \ | | | | | | | | | Added default picture if preview picture is null | ||||
| | * | | Added default picture if preview picture is null | Nicolas Lœuillet | 2016-10-07 | 1 | -0/+2 |
| | | | | |||||
| * | | | Fixed two-factor checkbox display in user admin panel | Nicolas Lœuillet | 2016-10-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Fix #2380 | ||||
| * | | | Merge pull request #2383 from wallabag/add-info-publich-articles | Nicolas Lœuillet | 2016-10-07 | 12 | -2/+31 |
| |\| | | | | | | | | | | Added OpenGraph support for public articles | ||||
| | * | | 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 | ||||
| * | | | Fix tag test | Jeremy Benoist | 2016-10-07 | 1 | -1/+0 |
| | | | | |||||
| * | | | Fix bad translation key | Jeremy Benoist | 2016-10-07 | 11 | -11/+11 |
| | | | | | | | | | | | | | | | | `entry_reload_failed` instead of `entry_reloaded_failed` | ||||
| * | | | Fix relations export for Entry | Jeremy Benoist | 2016-10-07 | 4 | -10/+30 |
| |/ / | | | | | | | | | | | | | Tags & Annotations weren’t really well exported. This is now fixed (+ tests) | ||||
| * | | Merge pull request #2377 from wallabag/fix-exists-api | Thomas Citharel | 2016-10-05 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Fix exists API call | ||||
| | * | | Fix typo & add test | Jeremy Benoist | 2016-10-05 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix exists API call | Thomas Citharel | 2016-10-05 | 1 | -1/+1 |
| | | | | | | | | | | | | Boo | ||||
| * | | | better tags on material | Thomas Citharel | 2016-10-05 | 2 | -5/+6 |
| | | | | |||||
| * | | | better tags on baggy | Thomas Citharel | 2016-10-04 | 2 | -4/+6 |
| |/ / | |||||
| * | | Merge pull request #2353 from wallabag/assets-fix | Thomas Citharel | 2016-10-04 | 2 | -20/+25 |
| |\ \ | | | | | | | | | Basically, fix everything | ||||
| | * | | Fix icon position | Thomas Citharel | 2016-10-04 | 1 | -3/+6 |
| | | | | |||||
| | * | | Fixed calendar icon position with baggy theme | Nicolas Lœuillet | 2016-10-04 | 1 | -1/+2 |
| | | | | |||||
| | * | | Fixed icon position in share menu | Nicolas Lœuillet | 2016-10-04 | 1 | -7/+6 |
| | | | | |||||
| | * | | fix icons | Thomas Citharel | 2016-10-04 | 1 | -8/+6 |
| | | | |