Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3088 from wallabag/execute-migrations-after-install | Jérémy Benoist | 2017-05-05 | 3 | -12/+26 |
|\ | | | | | Added migrations execution after fresh install | ||||
| * | Added migrations execution after fresh install | Nicolas Lœuillet | 2017-05-05 | 5 | -14/+28 |
| | | |||||
* | | Merge pull request #2920 from wallabag/cleanduplicatescommand | Jérémy Benoist | 2017-05-05 | 7 | -2/+319 |
|\ \ | |/ |/| | Clean Duplicates Command | ||||
| * | Fixed test | Nicolas Lœuillet | 2017-05-05 | 1 | -0/+4 |
| | | |||||
| * | Fixed @j0k3r review | Nicolas Lœuillet | 2017-05-05 | 2 | -6/+4 |
| | | |||||
| * | Added test for deduplication | Nicolas Lœuillet | 2017-05-05 | 4 | -3/+67 |
| | | |||||
| * | Add docs for cli commands | Thomas Citharel | 2017-05-01 | 2 | -0/+60 |
| | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | Add basic tests | Thomas Citharel | 2017-05-01 | 1 | -0/+59 |
| | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | Add Clean Duplicates Command | Thomas Citharel | 2017-05-01 | 2 | -0/+132 |
| | | |||||
* | | Merge pull request #3053 from wallabag/api-bulk-add | Nicolas Lœuillet | 2017-05-05 | 5 | -83/+236 |
|\ \ | | | | | | | Added API endpoint to handle a list of URL | ||||
| * | | Little refacto and send 400 on reaching urls limit | Jeremy Benoist | 2017-05-05 | 2 | -106/+97 |
| | | | |||||
| * | | Added limit | Nicolas Lœuillet | 2017-05-01 | 5 | -0/+37 |
| | | | |||||
| * | | Fix tests (for real this time) | Jeremy Benoist | 2017-05-01 | 1 | -2/+2 |
| | | | |||||
| * | | Fix tests | Jeremy Benoist | 2017-05-01 | 2 | -5/+4 |
| | | | |||||
| * | | Splitted the endpoint in two | Nicolas Lœuillet | 2017-05-01 | 2 | -63/+88 |
| | | | |||||
| * | | Added API endpoint to handle a list of URL | Nicolas Lœuillet | 2017-05-01 | 2 | -8/+109 |
| |/ | | | | | | | By passing an array, you can add / delete URL in mass (bulk request) | ||||
* | | Merge pull request #3080 from wallabag/use-username-to-import | Nicolas Lœuillet | 2017-05-04 | 3 | -16/+41 |
|\ \ | | | | | | | Use username to import | ||||
| * | | Use username to import | Thomas Citharel | 2017-05-04 | 3 | -16/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> add docs Signed-off-by: Thomas Citharel <tcit@tcit.fr> use username as default Signed-off-by: Thomas Citharel <tcit@tcit.fr> rename user to username typo Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | | Merge pull request #3060 from wallabag/search-users | Thomas Citharel | 2017-05-04 | 17 | -118/+256 |
|\ \ \ | |/ / |/| | | Search & paginate users | ||||
| * | | Merged list and search methods | Nicolas Lœuillet | 2017-05-02 | 15 | -154/+99 |
| | | | |||||
| * | | rename index to list | Thomas Citharel | 2017-05-02 | 2 | -6/+6 |
| | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | | Fix tests | Thomas Citharel | 2017-05-02 | 2 | -5/+23 |
| | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | | Add pagination | Thomas Citharel | 2017-05-02 | 3 | -12/+45 |
| | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | | Add filter to users management page | Thomas Citharel | 2017-05-02 | 17 | -28/+170 |
| | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | | Merge pull request #3079 from wallabag/update-doc | Jérémy Benoist | 2017-05-04 | 16 | -26/+26 |
|\ \ \ | | | | | | | | | Fixed old links in documentation | ||||
| * | | | Updated documentation version | Nicolas Lœuillet | 2017-05-03 | 4 | -8/+8 |
| | | | | |||||
| * | | | Fixed old links in documentation | Nicolas Lœuillet | 2017-05-03 | 12 | -18/+18 |
|/ / / | |||||
* | | | Merge pull request #3047 from wallabag/add-notmatches-operator | Nicolas Lœuillet | 2017-05-03 | 32 | -51/+126 |
|\ \ \ | | | | | | | | | Added notmatches operator for tagging rule | ||||
| * | | | Changed export test | Nicolas Lœuillet | 2017-05-03 | 1 | -3/+1 |
| | | | | |||||
| * | | | Fixed @j0k3r review | Nicolas Lœuillet | 2017-04-22 | 2 | -2/+2 |
| | | | | |||||
| * | | | Added notmatches operator for tagging rule | Nicolas Lœuillet | 2017-04-20 | 32 | -48/+125 |
| | | | | |||||
* | | | | Merge pull request #3075 from wallabag/disable-shortcuts-login | Nicolas Lœuillet | 2017-05-02 | 2 | -1/+6 |
|\ \ \ \ | | | | | | | | | | | Disabled shortcuts on login/register page | ||||
| * | | | | Disabled shortcuts on login/register page | Nicolas Lœuillet | 2017-05-02 | 2 | -1/+6 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #3073 from wallabag/fix-sandwich | Nicolas Lœuillet | 2017-05-02 | 1 | -5/+5 |
|\ \ \ \ | |/ / / |/| | | | Fixed sandwich menu position in entry view (material theme) | ||||
| * | | | Fixed sandwich menu position in entry view (material theme) | Nicolas Lœuillet | 2017-05-02 | 1 | -5/+5 |
|/ / / | |||||
* | | | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-05-01 | 3 | -2/+6 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Merge pull request #3066 from wallabag/ignore-tests-exported-files | Jérémy Benoist | 2017-04-29 | 1 | -0/+4 |
| |\ \ | | | | | | | | | Ignore tests exported files | ||||
| | * | | Ignore tests exported files | Thomas Citharel | 2017-04-29 | 1 | -0/+4 |
| |/ / | |||||
| * | | Merge pull request #3064 from gileri/master | Jérémy Benoist | 2017-04-29 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Correct create_application en string | ||||
| | * | | Correct create_application en string | Éric Gillet | 2017-04-29 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #3052 from shtrom/fix-relative-symlinks | Jérémy Benoist | 2017-04-25 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Make symfony-assets-install use `relative` symlinks | ||||
| | * | | Make symfony-assets-install use `relative` symlinks | Olivier Mehani | 2017-04-22 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | | | | | | | | | This facilitates packaging, when installing in a different work PREFIX than the final install location. Signed-off-by: Olivier Mehani <shtrom@ssji.net> | ||||
* | | | Merge pull request #3055 from wallabag/api-bulk-add-tags | Nicolas Lœuillet | 2017-05-01 | 3 | -3/+174 |
|\ \ \ | | | | | | | | | Added API endpoint to handle a list of URL and to add/delete tags | ||||
| * | | | Fix tests | Jeremy Benoist | 2017-04-29 | 2 | -15/+13 |
| | | | | |||||
| * | | | Added endpoint to handle URL list to add/delete tags | Nicolas Lœuillet | 2017-04-24 | 3 | -37/+111 |
| | | | | |||||
| * | | | Added API endpoint to handle a list of URL and to add/delete tags | Nicolas Lœuillet | 2017-04-24 | 2 | -0/+99 |
| | | | | |||||
* | | | | Merge pull request #3057 from raf64flo/patch-1 | Jérémy Benoist | 2017-04-26 | 4 | -10/+10 |
|\ \ \ \ | |/ / / |/| | | | Use up-to-date Firefox extension and add F-Droid link for Android app. | ||||
| * | | | Fix IT translation #3057 | Raphaël Flores | 2017-04-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix typos. Fix #3057 | Raphaël Flores | 2017-04-25 | 2 | -2/+2 |
| | | | | |||||
| * | | | Fix documentation for DE/IT/FR language, even if not sure for ED/IT. Fix #3057. | Raphaël Flores | 2017-04-25 | 3 | -6/+6 |
| | | | |