Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Removed FOSUser attributes removed in alpha4 | Nicolas Lœuillet | 2016-11-28 | 1 | -1/+0 |
| | | | | See https://github.com/FriendsOfSymfony/FOSUserBundle/blob/master/Upgrade.md\#200-alpha3-to-200-alpha4 | ||||
* | Enforce lowercase on domain name filter | Kevin Decherf | 2016-11-26 | 1 | -0/+9 |
| | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | Re-use FOSUser master branch | Jeremy Benoist | 2016-11-22 | 1 | -4/+4 |
| | |||||
* | Added authentication for restricted access articles | Bertrand Dunogier | 2016-11-22 | 1 | -0/+85 |
| | | | | Fix #438. Thank you so much @bdunogier | ||||
* | Return 304 when content isn't reloaded using the API | Jeremy Benoist | 2016-11-22 | 1 | -5/+1 |
| | | | | | | Previously it was a 400 but this is more related to a real error. Using the API user should only know the content got reloaded or not. If reloaded: 200 otherwise: 304. | ||||
* | Return an explicit error if reload fail | Jeremy Benoist | 2016-11-20 | 1 | -1/+5 |
| | |||||
* | Fixing tests | Jeremy Benoist | 2016-11-20 | 1 | -3/+2 |
| | |||||
* | Add ability to reload entry from API | Jeremy Benoist | 2016-11-20 | 1 | -0/+37 |
| | |||||
* | Fix tests | Jeremy Benoist | 2016-11-20 | 1 | -9/+5 |
| | |||||
* | Add RSS pagination | Jeremy Benoist | 2016-11-20 | 1 | -4/+53 |
| | | | | Following https://tools.ietf.org/html/rfc5005#page-4 | ||||
* | 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 |
| | | |||||
* | | Fix tests | Jeremy Benoist | 2016-11-17 | 1 | -5/+5 |
| | | |||||
* | | Put log in the most common failure tests | Jeremy Benoist | 2016-11-17 | 7 | -26/+26 |
| | | | | | | | | So we’ll quickly be able to see what kind of test is failing when viewing Travis | ||||
* | | 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 |
| | | |||||
* | | Fix tests | Jeremy Benoist | 2016-11-06 | 2 | -2/+2 |
| | | |||||
* | | Add Pinboard import | Jeremy Benoist | 2016-11-04 | 2 | -0/+202 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-11-03 | 5 | -838/+856 |
|\| | |||||
| * | Fix tests | Jeremy Benoist | 2016-10-30 | 1 | -10/+2 |
| | | |||||
| * | Added test for export by filtering with tag | Nicolas Lœuillet | 2016-10-29 | 1 | -0/+11 |
| | | |||||
| * | Exploded WallabagRestController into many controllers | Nicolas Lœuillet | 2016-10-28 | 3 | -820/+835 |
| | | | | | | | | Fix #2503 | ||||
* | | Add entry.saved event to import & rest | Jeremy Benoist | 2016-11-02 | 9 | -39/+146 |
| | | |||||
* | | 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 |
| | | |||||
* | | Fixed migration and added tests | Nicolas Lœuillet | 2016-10-28 | 2 | -4/+17 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-10-24 | 2 | -2/+40 |
|\| | |||||
| * | Merge pull request #2481 from wallabag/some-fixes | Nicolas Lœuillet | 2016-10-21 | 1 | -1/+1 |
| |\ | | | | | | | Some fixes | ||||
| | * | Fix test | Jeremy Benoist | 2016-10-20 | 1 | -1/+1 |
| | | | |||||
| * | | 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. | ||||
* | | Merge pull request #2401 from wallabag/reset-account | Jeremy Benoist | 2016-10-24 | 1 | -0/+145 |
|\ \ | | | | | | | Reset account | ||||
| * | | Add ability to reset some datas | Jeremy Benoist | 2016-10-22 | 1 | -0/+145 |
| | | | | | | | | | | | | | | | | | | - annotations - tags - entries | ||||
* | | | Add test on /api/annotations | Jeremy Benoist | 2016-10-22 | 1 | -37/+99 |
| | | | | | | | | | | | | | | | | | | | | | Fix controller forward in WallabagRestController. Update PHPDoc so it is sorted the same way as others one Duplicate all annotations test to use both api & normal way Also, make annotation tests independent to each other | ||||
* | | | PHP CS | Nicolas Lœuillet | 2016-10-22 | 1 | -4/+4 |
| | | | |||||
* | | | fix cs and phpdoc | Thomas Citharel | 2016-10-22 | 2 | -7/+27 |
|/ / | |||||
* | | Merge pull request #2372 from pmartin/api-get-entry-as-epub | Jeremy Benoist | 2016-10-12 | 1 | -48/+56 |
|\ \ | | | | | | | API: ability to export entry in all available format (epub, pdf, etc...) | ||||
| * | | Add entry export in API | Jeremy Benoist | 2016-10-08 | 1 | -48/+56 |
| | | | | | | | | | | | | | | | Export isn't available for json & xml because user can use the default entry endpoint instead. | ||||
* | | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-10-11 | 7 | -28/+91 |
|\ \ \ | | |/ | |/| |