aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2708 from jcharaoui/import-disablecontentupdateJérémy Benoist2017-06-0220-103/+160
|\
| * Fix option attributesJeremy Benoist2017-06-011-3/+3
| * We don't need that getterJeremy Benoist2017-06-011-8/+0
| * No need to catch that ExceptionJeremy Benoist2017-06-011-9/+2
| * Rewrote code & fix testsJeremy Benoist2017-06-0111-101/+71
| * CSJeremy Benoist2017-06-011-3/+3
| * Fix testsJeremy Benoist2017-06-016-35/+57
| * CSJeremy Benoist2017-06-011-2/+1
| * Replace Wallabag v1 error strings with v2 stringsJerome Charaoui2017-06-013-4/+27
| * Add disableContentUpdate import optionJerome Charaoui2017-06-0111-60/+118
| * Put default fetching error title in global configJerome Charaoui2017-06-015-3/+5
| * Avoid returning objects passed by reference.Jerome Charaoui2017-06-0111-32/+30
* | Merge pull request #3176 from wallabag/fix-image-downloadNicolas Lœuillet2017-06-022-5/+28
|\ \
| * | CSJeremy Benoist2017-06-011-3/+2
| * | Replace images with &Jeremy Benoist2017-06-012-4/+28
|/ /
* | Merge pull request #3171 from wallabag/drop-fucking-sqliteNicolas Lœuillet2017-06-011-5/+6
|\ \
| * | Changed default database nameNicolas Lœuillet2017-06-011-1/+1
| * | Fixed @tcitworld 's reviewNicolas Lœuillet2017-05-311-1/+1
| * | Defined MySQL as the default rdbms for wallabagNicolas Lœuillet2017-05-311-4/+5
* | | Merge pull request #3172 from wallabag/more-scrutiJérémy Benoist2017-06-015-13/+9
|\ \ \ | |_|/ |/| |
| * | fixup! Set the right variable typeJeremy Benoist2017-06-011-2/+2
| * | Both parameter wasn't used in the function, removing themJeremy Benoist2017-06-011-2/+1
| * | Set the right variable typeJeremy Benoist2017-06-011-2/+2
| * | Page parameter was never used in the functionJeremy Benoist2017-06-013-7/+4
|/ /
* | Merge pull request #3137 from aaa2000/isolated-testsJérémy Benoist2017-06-0123-281/+461
|\ \ | |/ |/|
| * Isolated testsadev2017-05-3124-284/+465
* | Merge pull request #3077 from wallabag/add-tags-list-viewNicolas Lœuillet2017-05-316-19/+90
|\ \
| * | Reduced border-radius for tagsNicolas Lœuillet2017-05-312-0/+2
| * | Add some flex magicThomas Citharel2017-05-314-53/+64
| * | Fixed tags display on grid viewNicolas Lœuillet2017-05-315-23/+74
| * | Added tags on list viewNicolas Lœuillet2017-05-301-1/+8
* | | Merge pull request #3106 from wallabag/api-contentJérémy Benoist2017-05-3114-540/+248
|\ \ \ | |_|/ |/| |
| * | PR has been merged in grabyJérémy Benoist2017-05-311-1/+1
| * | Fix tests following rebaseJeremy Benoist2017-05-311-2/+2
| * | CSJeremy Benoist2017-05-311-3/+3
| * | Forced date can now be a timestamp tooJeremy Benoist2017-05-313-2/+90
| * | 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