Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3080 from wallabag/use-username-to-import | Nicolas Lœuillet | 2017-05-04 | 1 | -3/+8 |
|\ | | | | | Use username to import | ||||
| * | Use username to import | Thomas Citharel | 2017-05-04 | 1 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 16 | -114/+234 |
|\ \ | |/ |/| | 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 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | Fix tests | Thomas Citharel | 2017-05-02 | 1 | -1/+1 |
| | | | | | | | | 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 #3047 from wallabag/add-notmatches-operator | Nicolas Lœuillet | 2017-05-03 | 18 | -5/+79 |
|\ \ | | | | | | | Added notmatches operator for tagging rule | ||||
| * | | Fixed @j0k3r review | Nicolas Lœuillet | 2017-04-22 | 2 | -2/+2 |
| | | | |||||
| * | | Added notmatches operator for tagging rule | Nicolas Lœuillet | 2017-04-20 | 18 | -5/+79 |
| | | | |||||
* | | | 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 | 1 | -1/+1 |
|\ \ | |||||
| * | | Correct create_application en string | Éric Gillet | 2017-04-29 | 1 | -1/+1 |
| | | | |||||
* | | | Fix tests | Jeremy Benoist | 2017-04-29 | 1 | -2/+0 |
| | | | |||||
* | | | Added endpoint to handle URL list to add/delete tags | Nicolas Lœuillet | 2017-04-24 | 2 | -26/+63 |
| | | | |||||
* | | | Added API endpoint to handle a list of URL and to add/delete tags | Nicolas Lœuillet | 2017-04-24 | 1 | -0/+68 |
| |/ |/| | |||||
* | | Merge pull request #3024 from wallabag/store-date | Nicolas Lœuillet | 2017-04-18 | 16 | -3/+121 |
|\ \ | | | | | | | Added publication date and author | ||||
| * | | Added author of article | Nicolas Lœuillet | 2017-04-09 | 16 | -3/+64 |
| | | | |||||
| * | | Added publication date | Nicolas Lœuillet | 2017-04-05 | 16 | -3/+60 |
| | | | |||||
* | | | Removed is_public in Entry edit form | Nicolas Lœuillet | 2017-04-13 | 14 | -22/+0 |
| | | | |||||
* | | | Remove isPublic from Entry entity fix #2598 | Maxime | 2017-04-13 | 1 | -25/+0 |
| | | | |||||
* | | | Merge branch 'master' into 2.3 | Nicolas Lœuillet | 2017-04-13 | 2 | -2/+4 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | 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. | ||||
| * | 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> | ||||
* | | 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 |
| | | |||||
* | | Allow to remove all archived entries | Thomas Citharel | 2017-03-31 | 17 | -1/+129 |
| | | | | | | | | | | | | Since we still support fucking SQLite, we need to retrieve all tags & annotations for archived entries before deleting them. Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | Merge pull request #3021 from wallabag/rename-method | Jérémy Benoist | 2017-03-30 | 2 | -2/+2 |
|\ \ | | | | | | | Rename method | ||||
| * | | Rename method from *username to *user | Thomas Citharel | 2017-03-30 | 2 | -2/+2 |
| |/ | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | Added migration for Scuttle sharing | Nicolas Lœuillet | 2017-03-28 | 2 | -3/+3 |
| | | |||||
* | | Scuttle sharing | FrenchHope | 2017-03-28 | 4 | -0/+29 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-03-28 | 13 | -291/+311 |
|\| | |||||
| * | remove language on html-tag | Christoph Doblander | 2017-03-06 | 1 | -1/+1 |
| | | |||||
| * | Update Spanish translation | ngosang | 2017-02-20 | 1 | -161/+161 |
| | | |||||
| * | Import: we now skip messages when user is null | Nicolas Lœuillet | 2017-02-20 | 1 | -1/+2 |
| | | |||||
| * | Merge pull request #2832 from Kdecherf/search-domain | Jeremy Benoist | 2017-02-19 | 1 | -1/+2 |
| |\ | | | | | | | Search by term: extend to entries url | ||||
| | * | Search by term: extend to entries url | Kevin Decherf | 2017-02-16 | 1 | -1/+2 |
| | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | Merge pull request #2830 from Kdecherf/striptags-title | Nicolas Lœuillet | 2017-02-17 | 5 | -19/+19 |
| |\ \ | | | | | | | | | Fix rendering of entry title in Twig views | ||||
| | * | | views: cosmetic in share links href | Kevin Decherf | 2017-02-16 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| | * | | Fix rendering of entry title in Twig views | Kevin Decherf | 2017-02-02 | 5 | -19/+19 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit provides some improvements on the rendering of entry title on entries list and entry views and refactors filter calls: - Remove escape filter from apparent title, striptags is enough - Move raw filter to the end of apparent title as it's ignored if not placed as the last filter - Replace raw filter with e('html_attr') for title used in attributes, fixing possible issue and/or glitch - Add striptags to entry.title used for link sharing to respect the apparent title Fixes #2802 Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | Update Spanish translation | ngosang | 2017-02-15 | 2 | -113/+124 |
| | | | |||||
| * | | Merge pull request #2879 from matteocoder/matteocoder-patch-1 | Nicolas Lœuillet | 2017-02-14 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Fixed typo in "first_steps" | ||||
| | * | | Fixed typo in "first_steps" | matteocoder | 2017-01-24 | 1 | -1/+1 |
| | | | | | | | | | | | | Changed "Pimi passi" to "Primi passi | ||||
| * | | | Log restricted access value | Jeremy Benoist | 2017-02-13 | 2 | -2/+9 |
| | | | | | | | | | | | | | | | | It might help to figure out if we have enabled it or not | ||||
* | | | | return id of article instead of true if entry exists | Thomas Citharel | 2017-02-24 | 1 | -2/+2 |
|/ / / | |||||
* | | | fix misspells in polish translation | Mateusz Rumiński | 2017-02-06 | 1 | -6/+6 |
| | | | |||||
* | | | Merge pull request #2842 from K-Phoen/update-rulerz | Jeremy Benoist | 2017-02-06 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Update RulerZ | ||||
| * | | | Update RulerZ | Kévin Gomez | 2017-02-05 | 1 | -2/+2 |
| | | | |