| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #2708 from jcharaoui/import-disablecontentupdate | Jérémy Benoist | 2017-06-02 | 20 | -103/+160 |
|\ |
|
| * | Fix option attributes | Jeremy Benoist | 2017-06-01 | 1 | -3/+3 |
| * | We don't need that getter | Jeremy Benoist | 2017-06-01 | 1 | -8/+0 |
| * | No need to catch that Exception | Jeremy Benoist | 2017-06-01 | 1 | -9/+2 |
| * | Rewrote code & fix tests | Jeremy Benoist | 2017-06-01 | 11 | -101/+71 |
| * | CS | Jeremy Benoist | 2017-06-01 | 1 | -3/+3 |
| * | Fix tests | Jeremy Benoist | 2017-06-01 | 6 | -35/+57 |
| * | CS | Jeremy Benoist | 2017-06-01 | 1 | -2/+1 |
| * | Replace Wallabag v1 error strings with v2 strings | Jerome Charaoui | 2017-06-01 | 3 | -4/+27 |
| * | Add disableContentUpdate import option | Jerome Charaoui | 2017-06-01 | 11 | -60/+118 |
| * | Put default fetching error title in global config | Jerome Charaoui | 2017-06-01 | 5 | -3/+5 |
| * | Avoid returning objects passed by reference. | Jerome Charaoui | 2017-06-01 | 11 | -32/+30 |
* | | Merge pull request #3176 from wallabag/fix-image-download | Nicolas Lœuillet | 2017-06-02 | 2 | -5/+28 |
|\ \ |
|
| * | | CS | Jeremy Benoist | 2017-06-01 | 1 | -3/+2 |
| * | | Replace images with & | Jeremy Benoist | 2017-06-01 | 2 | -4/+28 |
|/ / |
|
* | | Merge pull request #3171 from wallabag/drop-fucking-sqlite | Nicolas Lœuillet | 2017-06-01 | 1 | -5/+6 |
|\ \ |
|
| * | | Changed default database name | Nicolas Lœuillet | 2017-06-01 | 1 | -1/+1 |
| * | | Fixed @tcitworld 's review | Nicolas Lœuillet | 2017-05-31 | 1 | -1/+1 |
| * | | Defined MySQL as the default rdbms for wallabag | Nicolas Lœuillet | 2017-05-31 | 1 | -4/+5 |
* | | | Merge pull request #3172 from wallabag/more-scruti | Jérémy Benoist | 2017-06-01 | 5 | -13/+9 |
|\ \ \
| |_|/
|/| | |
|
| * | | fixup! Set the right variable type | Jeremy Benoist | 2017-06-01 | 1 | -2/+2 |
| * | | Both parameter wasn't used in the function, removing them | Jeremy Benoist | 2017-06-01 | 1 | -2/+1 |
| * | | Set the right variable type | Jeremy Benoist | 2017-06-01 | 1 | -2/+2 |
| * | | Page parameter was never used in the function | Jeremy Benoist | 2017-06-01 | 3 | -7/+4 |
|/ / |
|
* | | Merge pull request #3137 from aaa2000/isolated-tests | Jérémy Benoist | 2017-06-01 | 23 | -281/+461 |
|\ \
| |/
|/| |
|
| * | Isolated tests | adev | 2017-05-31 | 24 | -284/+465 |
* | | Merge pull request #3077 from wallabag/add-tags-list-view | Nicolas Lœuillet | 2017-05-31 | 6 | -19/+90 |
|\ \ |
|
| * | | Reduced border-radius for tags | Nicolas Lœuillet | 2017-05-31 | 2 | -0/+2 |
| * | | Add some flex magic | Thomas Citharel | 2017-05-31 | 4 | -53/+64 |
| * | | Fixed tags display on grid view | Nicolas Lœuillet | 2017-05-31 | 5 | -23/+74 |
| * | | Added tags on list view | Nicolas Lœuillet | 2017-05-30 | 1 | -1/+8 |
* | | | Merge pull request #3106 from wallabag/api-content | Jérémy Benoist | 2017-05-31 | 14 | -540/+248 |
|\ \ \
| |_|/
|/| | |
|
| * | | PR has been merged in graby | Jérémy Benoist | 2017-05-31 | 1 | -1/+1 |
| * | | Fix tests following rebase | Jeremy Benoist | 2017-05-31 | 1 | -2/+2 |
| * | | CS | Jeremy Benoist | 2017-05-31 | 1 | -3/+3 |
| * | | Forced date can now be a timestamp too | Jeremy Benoist | 2017-05-31 | 3 | -2/+90 |
| * | | Improve docs | Jeremy Benoist | 2017-05-31 | 2 | -3/+6 |
| * | | Remove htmlawed and use graby instead | Jeremy Benoist | 2017-05-31 | 3 | -32/+14 |
| * | | 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 |