aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Improve docsJeremy Benoist2017-05-312-3/+6
| * | | Remove htmlawed and use graby insteadJeremy Benoist2017-05-313-32/+14
| * | | Reduce imported entriesJeremy Benoist2017-05-318-491/+23
| * | | Use graby ContentExtractor to clean htmlJeremy Benoist2017-05-314-2/+66
| * | | Add support for authorsJeremy Benoist2017-05-312-1/+9
| * | | Allow other fields to be send using APIJeremy Benoist2017-05-317-43/+74
|/ / /
* | | Merge pull request #3168 from wallabag/instapaper-tags-importNicolas Lœuillet2017-05-3113-31/+94
|\ \ \
| * | | CS & improve tags assertionsJeremy Benoist2017-05-319-18/+34
| * | | Add support for tag in Instapaper importJeremy Benoist2017-05-314-13/+60
* | | | Merge pull request #3138 from Kdecherf/2835-tagsNicolas Lœuillet2017-05-314-5/+35
|\ \ \ \
| * | | | Ensure retrieved data are freshJeremy Benoist2017-05-311-0/+6
| * | | | TagController: ignore ActionMarkAsRead when removing tag from entryKevin Decherf2017-05-314-5/+29
* | | | | Merge pull request #3161 from wallabag/scrutinizer-2.3Nicolas Lœuillet2017-05-314-87/+35
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | CSJeremy Benoist2017-05-301-1/+1
| * | | | Use a better way to set input for commandJeremy Benoist2017-05-302-77/+30
| * | | | Fix some Scrutinizer issuesJeremy Benoist2017-05-303-10/+5
| | |_|/ | |/| |
* | | | Merge pull request #3143 from wallabag/fix-wllbg2-importNicolas Lœuillet2017-05-313-3/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Add testsJeremy Benoist2017-05-303-3/+4
| * | | Fixed is_starred for wallabag v2 importNicolas Lœuillet2017-05-241-1/+1
* | | | Merge pull request #3065 from wallabag/api-creation-endpointJérémy Benoist2017-05-307-10/+284
|\ \ \ \ | |_|/ / |/| | |
| * | | Avoid side effect on other testsJeremy Benoist2017-05-301-1/+13
| * | | Remove unknown validation_groupsJeremy Benoist2017-05-302-5/+3
| * | | Re-use `NewUserType` to validate registrationJeremy Benoist2017-05-304-44/+200
| * | | WIPThomas Citharel2017-05-293-0/+108
* | | | Merge remote-tracking branch 'origin/master' into 2.3Jeremy Benoist2017-05-302-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge pull request #3146 from DamienCassou/fix-doc-urlJérémy Benoist2017-05-242-2/+2
| |\ \ \
| | * | | Fix documentation URL for "How can I help to fix that?"Damien Cassou2017-05-242-2/+2
| |/ / /
* | | | Merge pull request #3147 from wallabag/delete-confirmJérémy Benoist2017-05-3017-20/+65
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge pull request #3160 from wallabag/mruminski-patch-1Jérémy Benoist2017-05-301-8/+8
| |\ \ \
| | * | | Update messages.pl.ymlMateusz Rumiński2017-05-291-8/+8
| |/ / /
| * | | update :de: messages.de.ymlSven Fischer2017-05-291-8/+8
| * | | Add some deletion confirmation to avoid mistakeJeremy Benoist2017-05-2417-8/+53
| | |/ | |/|
* | | Merge pull request #3153 from wallabag/content-proxy-refactorThomas Citharel2017-05-2820-202/+266
|\ \ \ | |/ / |/| |
| * | CSThomas Citharel2017-05-281-6/+0
| * | CSThomas Citharel2017-05-284-5/+1
| * | Move Tags assigner to a separate fileThomas Citharel2017-05-2720-200/+274
|/ /
* | Merge pull request #3145 from wallabag/fix-soJérémy Benoist2017-05-241-4/+4
|\ \
| * | Fix SO testsJeremy Benoist2017-05-241-4/+4
|/ /
* | Switch back to latest guzzle-site-authenticatorJeremy Benoist2017-05-241-1/+1
* | Merge pull request #3133 from wallabag/testing-travis-failureJérémy Benoist2017-05-193-37/+29
|\ \
| * | Ensure download_images_enabled is disabledJeremy Benoist2017-05-191-1/+20
| * | Fold migrations & fixtures command on TravisJeremy Benoist2017-05-192-36/+9
|/ /
* | Merge remote-tracking branch 'origin/master' into 2.3Jeremy Benoist2017-05-1923-630/+753
|\|
| * Merge pull request #3130 from X-dark/masterJérémy Benoist2017-05-1913-13/+13
| |\
| | * modify key name as wellCedric Girard2017-05-1813-13/+13
| | * unify Download/Export wording.Cedric Girard2017-05-189-9/+9
| |/
| * Merge pull request #3125 from wallabag/prepare-222Jérémy Benoist2017-05-172-601/+651
| |\
| | * Prepare wallabag 2.2.3Nicolas Lœuillet2017-05-172-601/+651
| |/
| * Merge pull request #3117 from wallabag/fix-docNicolas Lœuillet2017-05-173-9/+10
| |\
| | * Fixed documentation URLNicolas Lœuillet2017-05-173-9/+10
| |/