Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 #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 |
| | | | | |||||
| * | | | Remove 'fr' from Firefox extension URL | Raphaël Flores | 2017-04-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update Firefox extension and Android links | Raphaël Flores | 2017-04-25 | 1 | -3/+3 |
|/ / / | | | | | | | Use up-to-date Firefox extension and add F-Droid link for Android app. | ||||
* | | | Merge pull request #3048 from wallabag/remove-download-pictures | Nicolas Lœuillet | 2017-04-22 | 1 | -0/+52 |
|\ \ \ | |_|/ |/| | | Cleaned craue_config_setting by removing useless download_pictures setting | ||||
| * | | Cleaned craue_config_setting by removing useless download_pictures setting | Nicolas Lœuillet | 2017-04-20 | 1 | -0/+52 |
|/ / | |||||
* | | Merge pull request #3024 from wallabag/store-date | Nicolas Lœuillet | 2017-04-18 | 23 | -17/+243 |
|\ \ | | | | | | | Added publication date and author | ||||
| * | | Added test for multiple authors | Nicolas Lœuillet | 2017-04-10 | 1 | -8/+39 |
| | | | |||||
| * | | Fixed migrations | Nicolas Lœuillet | 2017-04-10 | 1 | -0/+5 |
| | | | |||||
| * | | Added author of article | Nicolas Lœuillet | 2017-04-09 | 20 | -6/+79 |
| | | | |||||
| * | | Added publication date | Nicolas Lœuillet | 2017-04-05 | 37 | -23/+140 |
| | | | |||||
* | | | Merge pull request #3044 from wallabag/fos-user-2.0 | Jérémy Benoist | 2017-04-18 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Remove dev FOSUserBundle | ||||
| * | | | Remove dev FOSUserBundle | Jeremy Benoist | 2017-04-18 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #3030 from wallabag/remove-isPublic-from-entry | Jérémy Benoist | 2017-04-14 | 30 | -61/+65 |
|\ \ \ | | | | | | | | | Remove isPublic from Entry entity fix #2598 | ||||
| * | | | Removed is_public in Entry edit form | Nicolas Lœuillet | 2017-04-13 | 29 | -37/+15 |
| | | | | |||||
| * | | | Remove isPublic from Entry entity fix #2598 | Maxime | 2017-04-13 | 2 | -25/+51 |
|/ / / | |||||
* | | | Merge branch 'master' into 2.3 | Nicolas Lœuillet | 2017-04-13 | 2 | -2/+4 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Merge pull request #3023 from mart-e/epub-notice-at-the-end | Jérémy Benoist | 2017-04-05 | 1 | -2/+2 |
| |\ | | | | | | | Add export notice at the end of the epub | ||||
| | * | Add export notice at the end of the epub | Martin Trigaux | 2017-04-05 | 1 | -2/+2 |
| |/ | | | | | | | | | | | | | | | | | The text "Produced by wallabag with PHPePub" is the first page of any epub. On ebooks reader, it is common (e.g. kobo) to use the first page as the cover of unread books, which makes it more difficult to differentiate the books. Move the Notices chapter at the end of the book. | ||||
| * | Merge pull request #3017 from Kdecherf/local-image-alpha | Jérémy Benoist | 2017-03-30 | 1 | -0/+2 |
| |\ | | | | | | | Save alpha channel when downloading PNG images | ||||
| | * | Save alpha channel when downloading PNG images | Kevin Decherf | 2017-03-29 | 1 | -0/+2 |
| |/ | | | | | | | | | | | Fixes #2805 Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | | Merge pull request #3020 from wallabag/add-remove-archived-entries | Nicolas Lœuillet | 2017-03-31 | 19 | -6/+208 |
|\ \ | | | | | | | Allow to remove all archived entries | ||||
| * | | Renamed methods | Nicolas Lœuillet | 2017-03-31 | 3 | -4/+4 |
| | | | |||||
| * | | Refactored code | Nicolas Lœuillet | 2017-03-31 | 1 | -24/+16 |
| | | | |||||
| * | | Added delete button on Baggy theme | Nicolas Lœuillet | 2017-03-31 | 2 | -1/+7 |
| | | |