Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3168 from wallabag/instapaper-tags-import | Nicolas Lœuillet | 2017-05-31 | 1 | -0/+17 |
|\ | |||||
| * | Add support for tag in Instapaper import | Jeremy Benoist | 2017-05-31 | 1 | -0/+17 |
* | | Merge pull request #3138 from Kdecherf/2835-tags | Nicolas Lœuillet | 2017-05-31 | 2 | -5/+7 |
|\ \ | |||||
| * | | TagController: ignore ActionMarkAsRead when removing tag from entry | Kevin Decherf | 2017-05-31 | 2 | -5/+7 |
* | | | Merge pull request #3161 from wallabag/scrutinizer-2.3 | Nicolas Lœuillet | 2017-05-31 | 3 | -11/+5 |
|\ \ \ | |_|/ |/| | | |||||
| * | | CS | Jeremy Benoist | 2017-05-30 | 1 | -1/+1 |
| * | | Use a better way to set input for command | Jeremy Benoist | 2017-05-30 | 1 | -1/+0 |
| * | | Fix some Scrutinizer issues | Jeremy Benoist | 2017-05-30 | 3 | -10/+5 |
* | | | Merge pull request #3143 from wallabag/fix-wllbg2-import | Nicolas Lœuillet | 2017-05-31 | 1 | -2/+2 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Add tests | Jeremy Benoist | 2017-05-30 | 1 | -2/+2 |
| * | | Fixed is_starred for wallabag v2 import | Nicolas Lœuillet | 2017-05-24 | 1 | -1/+1 |
* | | | Merge pull request #3065 from wallabag/api-creation-endpoint | Jérémy Benoist | 2017-05-30 | 4 | -7/+171 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Remove unknown validation_groups | Jeremy Benoist | 2017-05-30 | 1 | -3/+1 |
| * | | Re-use `NewUserType` to validate registration | Jeremy Benoist | 2017-05-30 | 2 | -43/+101 |
| * | | WIP | Thomas Citharel | 2017-05-29 | 3 | -0/+108 |
* | | | Merge pull request #3147 from wallabag/delete-confirm | Jérémy Benoist | 2017-05-30 | 17 | -20/+65 |
|\ \ \ | |/ / |/| | | |||||
| * | | Update messages.pl.yml | Mateusz Rumiński | 2017-05-29 | 1 | -8/+8 |
| * | | update :de: messages.de.yml | Sven Fischer | 2017-05-29 | 1 | -8/+8 |
| * | | Add some deletion confirmation to avoid mistake | Jeremy Benoist | 2017-05-24 | 17 | -8/+53 |
| |/ | |||||
* | | CS | Thomas Citharel | 2017-05-28 | 4 | -5/+1 |
* | | Move Tags assigner to a separate file | Thomas Citharel | 2017-05-27 | 11 | -64/+105 |
|/ | |||||
* | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-05-19 | 18 | -28/+47 |
|\ | |||||
| * | 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 #3095 from aaa2000/api-error-on-fail-fetch-content | Thomas Citharel | 2017-05-10 | 1 | -4/+13 |
| |\ | |||||
| | * | Create a new entry via API even when its content can't be retrieved | adev | 2017-05-08 | 1 | -4/+13 |
| * | | 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 |
* | | | | Merge pull request #3101 from wallabag/credentials-new-extrafields | Jérémy Benoist | 2017-05-10 | 3 | -9/+31 |
|\ \ \ \ | |||||
| * | | | | 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 |
* | | | | | Retrieve tag / tags value from query or request | Jeremy Benoist | 2017-05-09 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | 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 | 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 |
| | |_|/ | |/| | | |||||
| * | | | Translate error message in login page | adev | 2017-05-06 | 1 | -1/+1 |
| * | | | Fix display the form errors correctly | adev | 2017-05-05 | 4 | -1/+11 |
| | |/ | |/| | |||||
* | | | 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 |