Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added shortcut | Nicolas Lœuillet | 2016-11-19 | 1 | -2/+2 |
| | |||||
* | Added tests | Nicolas Lœuillet | 2016-11-19 | 1 | -0/+67 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-11-19 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # .editorconfig # docs/de/index.rst # docs/de/user/import.rst # docs/en/index.rst # docs/en/user/configuration.rst # docs/en/user/import.rst # docs/fr/index.rst # docs/fr/user/import.rst # src/Wallabag/CoreBundle/Command/InstallCommand.php # src/Wallabag/CoreBundle/Resources/translations/messages.da.yml # src/Wallabag/CoreBundle/Resources/translations/messages.de.yml # src/Wallabag/CoreBundle/Resources/translations/messages.en.yml # src/Wallabag/CoreBundle/Resources/translations/messages.es.yml # src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml # src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml # src/Wallabag/CoreBundle/Resources/translations/messages.it.yml # src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml # src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml # src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml # src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml # src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml # src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig # web/bundles/wallabagcore/themes/baggy/css/style.min.css # web/bundles/wallabagcore/themes/baggy/js/baggy.min.js # web/bundles/wallabagcore/themes/material/css/style.min.css # web/bundles/wallabagcore/themes/material/js/material.min.js | ||||
| * | Added help on config screen | Nicolas Lœuillet | 2016-11-17 | 1 | -1/+1 |
| | | |||||
* | | Check if status code is OK | Nicolas Lœuillet | 2016-11-18 | 1 | -0/+11 |
| | | |||||
* | | Added http_status in Entry entity | Nicolas Lœuillet | 2016-11-18 | 2 | -0/+50 |
| | | |||||
* | | CS | Jeremy Benoist | 2016-11-16 | 1 | -3/+0 |
| | | |||||
* | | Update unit test for Redirect | Jeremy Benoist | 2016-11-16 | 1 | -61/+43 |
| | | |||||
* | | Tried to fix tests | Nicolas Lœuillet | 2016-11-16 | 1 | -5/+60 |
| | | |||||
* | | Added tests | Nicolas Lœuillet | 2016-11-16 | 2 | -2/+67 |
| | | |||||
* | | Added a configuration to define the redirection after archiving an entry | Nicolas Lœuillet | 2016-11-16 | 3 | -2/+5 |
| | | | | | | | | Fix #496 | ||||
* | | Use more explicit check | Jeremy Benoist | 2016-11-07 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-11-03 | 1 | -0/+11 |
|\| | |||||
| * | Added test for export by filtering with tag | Nicolas Lœuillet | 2016-10-29 | 1 | -0/+11 |
| | | |||||
* | | Use custom event instead of Doctrine ones | Jeremy Benoist | 2016-11-01 | 2 | -18/+37 |
| | | | | | | | | This give us ability to use Entry ID to determine where to store images and it’s then more easy to remove them when we remove the entry. | ||||
* | | Ability to enable/disable downloading images | Jeremy Benoist | 2016-10-30 | 1 | -0/+40 |
| | | | | | | | | | | This will speed up the test suite because it won’t download everything when we add new entry… Add a custom test with downloading image enabled | ||||
* | | Add instance url to the downloaded images | Jeremy Benoist | 2016-10-30 | 1 | -1/+3 |
| | | |||||
* | | Fixing tests | Jeremy Benoist | 2016-10-30 | 4 | -6/+25 |
| | | |||||
* | | Use doctrine event to download images | Jeremy Benoist | 2016-10-30 | 2 | -0/+123 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-10-24 | 1 | -1/+39 |
|\| | |||||
| * | This test doesn’t require an internet connection | Jeremy Benoist | 2016-10-20 | 1 | -2/+0 |
| | | |||||
| * | If reload content failed, don’t update it | Jeremy Benoist | 2016-10-20 | 1 | -1/+41 |
| | | | | | | | | In case user wants a fresh version of the current one and the website isn’t available, don’t erase it with a boring message saying wallabag wasn’t able to refresh the content. | ||||
* | | Add ability to reset some datas | Jeremy Benoist | 2016-10-22 | 1 | -0/+145 |
| | | | | | | | | | | | | - annotations - tags - entries | ||||
* | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-10-11 | 4 | -105/+37 |
|\| | |||||
| * | Lock deps for FOSUser | Jeremy Benoist | 2016-10-11 | 1 | -3/+1 |
| | | | | | | | | | | We’ll wait until the final release will be out and other related project will be update to support it. Meanwhile we can safely lock to a previous version. | ||||
| * | Merge pull request #2351 from wallabag/fix-api-client-deletion | Nicolas Lœuillet | 2016-10-08 | 1 | -78/+0 |
| |\ | | | | | | | Changed relation between API client and refresh token | ||||
| | * | Ensure access_token are removed | Jeremy Benoist | 2016-10-08 | 1 | -78/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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) | ||||
| * | | Ensure orphan tag are remove in API | Jeremy Benoist | 2016-10-07 | 2 | -24/+36 |
| | | | | | | | | | | | | | | | | | | 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!) | ||||
* | | | Better display and description | Jeremy Benoist | 2016-10-08 | 1 | -3/+4 |
| | | | | | | | | | | | | Confirmation message isn’t required since it is written in the delete description | ||||
* | | | Fix some tests | Jeremy Benoist | 2016-10-08 | 1 | -13/+26 |
| | | | |||||
* | | | Added a test to check if entries are also deleted | Nicolas Lœuillet | 2016-10-08 | 1 | -0/+21 |
| | | | |||||
* | | | Changed tests | Nicolas Lœuillet | 2016-10-08 | 1 | -2/+2 |
| | | | |||||
* | | | Added tests | Nicolas Lœuillet | 2016-10-08 | 1 | -0/+85 |
|/ / | |||||
* | | Merge pull request #2389 from wallabag/add-info-publich-articles | Nicolas Lœuillet | 2016-10-07 | 1 | -0/+1 |
|\ \ | | | | | | | Added default picture if preview picture is null | ||||
| * | | Added default picture if preview picture is null | Nicolas Lœuillet | 2016-10-07 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #2383 from wallabag/add-info-publich-articles | Nicolas Lœuillet | 2016-10-07 | 1 | -1/+4 |
|\| | | | | | | | | Added OpenGraph support for public articles | ||||
| * | | Added test for OpenGraph | Nicolas Lœuillet | 2016-10-07 | 1 | -1/+4 |
| |/ | |||||
* | | Fix tag test | Jeremy Benoist | 2016-10-07 | 2 | -12/+16 |
| | | |||||
* | | Fix relations export for Entry | Jeremy Benoist | 2016-10-07 | 1 | -9/+28 |
|/ | | | | | Tags & Annotations weren’t really well exported. This is now fixed (+ tests) | ||||
* | Merge pull request #2327 from wallabag/user-management | Jeremy Benoist | 2016-10-02 | 1 | -114/+0 |
|\ | | | | | Add users management UI | ||||
| * | Remove NewUser test from Config | Jeremy Benoist | 2016-10-02 | 1 | -114/+0 |
| | | |||||
* | | Merge pull request #2328 from wallabag/avoid-duplicate-url | Nicolas Lœuillet | 2016-10-02 | 1 | -0/+44 |
|\ \ | |/ |/| | Avoid duplicate url with accents | ||||
| * | Remove additional entry | Jeremy Benoist | 2016-10-02 | 1 | -0/+9 |
| | | | | | | | | After the test is done, cleanup what we’ve done | ||||
| * | Avoid duplicate url with accents | Jeremy Benoist | 2016-10-01 | 1 | -0/+35 |
| | | |||||
* | | Merge pull request #2326 from wallabag/update-quickstart | Jeremy Benoist | 2016-10-02 | 1 | -1/+1 |
|\ \ | | | | | | | Changed quickstart layout | ||||
| * | | Update test | Jeremy Benoist | 2016-10-02 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #2324 from wallabag/edit-tagging-rule | Jeremy Benoist | 2016-10-02 | 1 | -13/+48 |
|\ \ \ | | | | | | | | | Add ability to edit a tagging rule | ||||
| * | | | Add ability to edit a tagging rule | Jeremy Benoist | 2016-10-01 | 1 | -13/+48 |
| | |/ | |/| | |||||
* | | | Merge pull request #2323 from wallabag/footer-stats | Jeremy Benoist | 2016-10-02 | 1 | -1/+17 |
|\ \ \ | |/ / |/| | | Add simple stats in footer | ||||
| * | | Add simple stats in footer | Jeremy Benoist | 2016-10-01 | 1 | -1/+17 |
| |/ |