Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-05-09 | 6 | -5/+15 |
|\ | |||||
| * | Update graby* licenses | Jérémy Benoist | 2017-05-09 | 1 | -2/+2 |
| | | |||||
| * | Fix API pagination is broken if perPage is custom value | adev | 2017-05-08 | 1 | -1/+2 |
| | | | | | | | | Fix #2720 | ||||
| * | Translate error message in login page | adev | 2017-05-06 | 1 | -1/+1 |
| | | | | | | | | Fix #2933 | ||||
| * | Fix display the form errors correctly | adev | 2017-05-05 | 4 | -1/+11 |
| | | | | | | | | | | | | | | | | | | Use `property_path` form option to map underscored form fields to object properties @see https://github.com/symfony/symfony/issues/9162#issuecomment-25431148 Fix #3067 | ||||
* | | Merge pull request #3022 from wallabag/webpack | Thomas Citharel | 2017-05-09 | 8 | -75/+77 |
|\ \ | | | | | | | Adds Webpack support and remove Grunt | ||||
| * | | Fix review again | Thomas Citharel | 2017-05-07 | 1 | -36/+38 |
| | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | | Fix reviews | Aline | 2017-05-07 | 3 | -8/+7 |
| | | | | | | | | | | | | Signed-off-by: Aline <chetta.aline@gmail.com> | ||||
| * | | Fix according to review | Thomas Citharel | 2017-05-04 | 1 | -1/+1 |
| | | | |||||
| * | | fix theme changes | Thomas Citharel | 2017-05-04 | 1 | -6/+6 |
| | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | | Adds Webpack support and removes the use for Grunt | Thomas Citharel | 2017-05-04 | 6 | -25/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> use scss Signed-off-by: Thomas Citharel <tcit@tcit.fr> fix build, add babel, fix annotations fixes (and improvements !) for baggy add live reload & environments & eslint & theme fixes | ||||
* | | | Merge pull request #3088 from wallabag/execute-migrations-after-install | Jérémy Benoist | 2017-05-05 | 1 | -7/+16 |
|\ \ \ | | | | | | | | | Added migrations execution after fresh install | ||||
| * | | | Added migrations execution after fresh install | Nicolas Lœuillet | 2017-05-05 | 1 | -7/+16 |
| | | | | |||||
* | | | | Merge pull request #2920 from wallabag/cleanduplicatescommand | Jérémy Benoist | 2017-05-05 | 2 | -0/+149 |
|\ \ \ \ | |/ / / |/| | | | Clean Duplicates Command | ||||
| * | | | Fixed @j0k3r review | Nicolas Lœuillet | 2017-05-05 | 1 | -3/+1 |
| | | | | |||||
| * | | | Added test for deduplication | Nicolas Lœuillet | 2017-05-05 | 1 | -0/+19 |
| | | | | |||||
| * | | | 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 | 3 | -76/+179 |
|\ \ \ \ | | | | | | | | | | | Added API endpoint to handle a list of URL | ||||
| * | | | | Little refacto and send 400 on reaching urls limit | Jeremy Benoist | 2017-05-05 | 1 | -102/+94 |
| | | | | | |||||
| * | | | | Added limit | Nicolas Lœuillet | 2017-05-01 | 3 | -0/+13 |
| | | | | | |||||
| * | | | | Fix tests | Jeremy Benoist | 2017-05-01 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Splitted the endpoint in two | Nicolas Lœuillet | 2017-05-01 | 1 | -34/+62 |
| | | | | | |||||
| * | | | | Added API endpoint to handle a list of URL | Nicolas Lœuillet | 2017-05-01 | 1 | -0/+71 |
| |/ / / | | | | | | | | | | | | | 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 | 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 |
| | |