Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-05-19 | 17 | -24/+34 |
|\ | |||||
| * | modify key name as well | Cedric Girard | 2017-05-18 | 13 | -13/+13 |
| * | unify Download/Export wording. | Cedric Girard | 2017-05-18 | 9 | -9/+9 |
| * | Fixed documentation URL | Nicolas Lœuillet | 2017-05-17 | 3 | -9/+10 |
| * | reorder contrib strings in about page | Cedric Girard | 2017-05-16 | 1 | -1/+1 |
| * | Merge pull request #3076 from wallabag/hotfix/2979 | Nicolas Lœuillet | 2017-05-09 | 1 | -1/+10 |
| |\ | |||||
| | * | Add some tests | Jeremy Benoist | 2017-05-09 | 1 | -3/+9 |
| | * | Disable negative numbers in filters | Maxime Marinel | 2017-05-03 | 1 | -0/+3 |
* | | | Update of the oc version of CoreBundle | Quent-in | 2017-05-18 | 1 | -13/+13 |
* | | | Added logger when we match Tagging rules | Nicolas Lœuillet | 2017-05-12 | 2 | -1/+9 |
* | | | Replaced json_array with array | Nicolas Lœuillet | 2017-05-11 | 1 | -4/+4 |
* | | | Added headers field in Entry | Nicolas Lœuillet | 2017-05-11 | 2 | -1/+34 |
* | | | Handle empty configuration | Jeremy Benoist | 2017-05-10 | 1 | -1/+1 |
* | | | Skip auth when no credentials are found | Jeremy Benoist | 2017-05-09 | 3 | -9/+31 |
* | | | Merge pull request #2751 from bdunogier/2.2-guzzle_subscribers_improvement | Jérémy Benoist | 2017-05-09 | 3 | -11/+48 |
|\ \ \ | |||||
| * | | | CS | Jeremy Benoist | 2017-05-09 | 1 | -1/+1 |
| * | | | Changed parsing of login_extra_fields in guzzle auth | Bertrand Dunogier | 2017-05-04 | 1 | -1/+27 |
| * | | | Improved Guzzle subscribers extensibility | Bertrand Dunogier | 2017-05-04 | 2 | -9/+20 |
* | | | | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-05-09 | 3 | -2/+7 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Update graby* licenses | Jérémy Benoist | 2017-05-09 | 1 | -2/+2 |
| * | | | Fix display the form errors correctly | adev | 2017-05-05 | 3 | -0/+6 |
| | |/ | |/| | |||||
* | | | Merge pull request #3022 from wallabag/webpack | Thomas Citharel | 2017-05-09 | 8 | -75/+77 |
|\ \ \ | |||||
| * | | | Fix review again | Thomas Citharel | 2017-05-07 | 1 | -36/+38 |
| * | | | Fix reviews | Aline | 2017-05-07 | 3 | -8/+7 |
| * | | | Fix according to review | Thomas Citharel | 2017-05-04 | 1 | -1/+1 |
| * | | | fix theme changes | Thomas Citharel | 2017-05-04 | 1 | -6/+6 |
| * | | | Adds Webpack support and removes the use for Grunt | Thomas Citharel | 2017-05-04 | 6 | -25/+26 |
* | | | | 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 | 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 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | 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 | 2 | -0/+4 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Added limit | Nicolas Lœuillet | 2017-05-01 | 2 | -0/+4 |
| |/ / / | |||||
* | | | | Merge pull request #3060 from wallabag/search-users | Thomas Citharel | 2017-05-04 | 12 | -69/+93 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Merged list and search methods | Nicolas Lœuillet | 2017-05-02 | 12 | -82/+70 |
| * | | | Add filter to users management page | Thomas Citharel | 2017-05-02 | 12 | -0/+36 |
* | | | | Merge pull request #3047 from wallabag/add-notmatches-operator | Nicolas Lœuillet | 2017-05-03 | 18 | -5/+79 |
|\ \ \ \ | |||||
| * | | | | 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 |
* | | Merge pull request #3024 from wallabag/store-date | Nicolas Lœuillet | 2017-04-18 | 16 | -3/+121 |
|\ \ | |||||
| * | | 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 |
|\ \ \ | |/ / |/| / | |/ |