Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Reduce imported entries | Jeremy Benoist | 2017-05-31 | 8 | -491/+23 |
* | Use graby ContentExtractor to clean html | Jeremy Benoist | 2017-05-31 | 4 | -2/+66 |
* | Add support for authors | Jeremy Benoist | 2017-05-31 | 2 | -1/+9 |
* | Allow other fields to be send using API | Jeremy Benoist | 2017-05-31 | 7 | -43/+74 |
* | Merge pull request #3168 from wallabag/instapaper-tags-import | Nicolas Lœuillet | 2017-05-31 | 13 | -31/+94 |
|\ | |||||
| * | CS & improve tags assertions | Jeremy Benoist | 2017-05-31 | 9 | -18/+34 |
| * | Add support for tag in Instapaper import | Jeremy Benoist | 2017-05-31 | 4 | -13/+60 |
* | | Merge pull request #3138 from Kdecherf/2835-tags | Nicolas Lœuillet | 2017-05-31 | 4 | -5/+35 |
|\ \ | |||||
| * | | Ensure retrieved data are fresh | Jeremy Benoist | 2017-05-31 | 1 | -0/+6 |
| * | | TagController: ignore ActionMarkAsRead when removing tag from entry | Kevin Decherf | 2017-05-31 | 4 | -5/+29 |
* | | | Merge pull request #3161 from wallabag/scrutinizer-2.3 | Nicolas Lœuillet | 2017-05-31 | 4 | -87/+35 |
|\ \ \ | |_|/ |/| | | |||||
| * | | CS | Jeremy Benoist | 2017-05-30 | 1 | -1/+1 |
| * | | Use a better way to set input for command | Jeremy Benoist | 2017-05-30 | 2 | -77/+30 |
| * | | 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 | 3 | -3/+4 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Add tests | Jeremy Benoist | 2017-05-30 | 3 | -3/+4 |
| * | | 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 | 7 | -10/+284 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Avoid side effect on other tests | Jeremy Benoist | 2017-05-30 | 1 | -1/+13 |
| * | | Remove unknown validation_groups | Jeremy Benoist | 2017-05-30 | 2 | -5/+3 |
| * | | Re-use `NewUserType` to validate registration | Jeremy Benoist | 2017-05-30 | 4 | -44/+200 |
| * | | WIP | Thomas Citharel | 2017-05-29 | 3 | -0/+108 |
* | | | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-05-30 | 2 | -2/+2 |
|\ \ \ | |||||
| * \ \ | Merge pull request #3146 from DamienCassou/fix-doc-url | Jérémy Benoist | 2017-05-24 | 2 | -2/+2 |
| |\ \ \ | |||||
| | * | | | Fix documentation URL for "How can I help to fix that?" | Damien Cassou | 2017-05-24 | 2 | -2/+2 |
| |/ / / | |||||
* | | | | Merge pull request #3147 from wallabag/delete-confirm | Jérémy Benoist | 2017-05-30 | 17 | -20/+65 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Merge pull request #3160 from wallabag/mruminski-patch-1 | Jérémy Benoist | 2017-05-30 | 1 | -8/+8 |
| |\ \ \ | |||||
| | * | | | 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 |
| | |/ | |/| | |||||
* | | | Merge pull request #3153 from wallabag/content-proxy-refactor | Thomas Citharel | 2017-05-28 | 20 | -202/+266 |
|\ \ \ | |/ / |/| | | |||||
| * | | CS | Thomas Citharel | 2017-05-28 | 1 | -6/+0 |
| * | | CS | Thomas Citharel | 2017-05-28 | 4 | -5/+1 |
| * | | Move Tags assigner to a separate file | Thomas Citharel | 2017-05-27 | 20 | -200/+274 |
|/ / | |||||
* | | Merge pull request #3145 from wallabag/fix-so | Jérémy Benoist | 2017-05-24 | 1 | -4/+4 |
|\ \ | |||||
| * | | Fix SO tests | Jeremy Benoist | 2017-05-24 | 1 | -4/+4 |
|/ / | |||||
* | | Switch back to latest guzzle-site-authenticator | Jeremy Benoist | 2017-05-24 | 1 | -1/+1 |
* | | Merge pull request #3133 from wallabag/testing-travis-failure | Jérémy Benoist | 2017-05-19 | 3 | -37/+29 |
|\ \ | |||||
| * | | Ensure download_images_enabled is disabled | Jeremy Benoist | 2017-05-19 | 1 | -1/+20 |
| * | | Fold migrations & fixtures command on Travis | Jeremy Benoist | 2017-05-19 | 2 | -36/+9 |
|/ / | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-05-19 | 23 | -630/+753 |
|\| | |||||
| * | Merge pull request #3130 from X-dark/master | Jérémy Benoist | 2017-05-19 | 13 | -13/+13 |
| |\ | |||||
| | * | 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 |
| |/ | |||||
| * | Merge pull request #3125 from wallabag/prepare-222 | Jérémy Benoist | 2017-05-17 | 2 | -601/+651 |
| |\ | |||||
| | * | Prepare wallabag 2.2.3 | Nicolas Lœuillet | 2017-05-17 | 2 | -601/+651 |
| |/ | |||||
| * | Merge pull request #3117 from wallabag/fix-doc | Nicolas Lœuillet | 2017-05-17 | 3 | -9/+10 |
| |\ | |||||
| | * | Fixed documentation URL | Nicolas Lœuillet | 2017-05-17 | 3 | -9/+10 |
| |/ | |||||
| * | Merge pull request #3124 from wallabag/lock-guzzle-auth | Nicolas Lœuillet | 2017-05-17 | 2 | -7/+1 |
| |\ | |||||
| | * | Lock guzzle-site-authenticator to avoid error | Jeremy Benoist | 2017-05-16 | 2 | -7/+1 |
| |/ |