Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3165 from wallabag/it-translation-update | Jérémy Benoist | 2017-06-06 | 1 | -38/+38 |
|\ | | | | | Update Italian translation | ||||
| * | Update messages.it.yml | Jérémy Benoist | 2017-06-02 | 1 | -23/+23 |
| | | |||||
| * | Updated :it: translations | Nicolas Lœuillet | 2017-05-31 | 1 | -13/+13 |
| | | | | | | | | Thank you @matteocoder | ||||
| * | Update :it: translation | Jérémy Benoist | 2017-05-30 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #2708 from jcharaoui/import-disablecontentupdate | Jérémy Benoist | 2017-06-02 | 20 | -103/+160 |
|\ \ | | | | | | | Import disableContentUpdate | ||||
| * | | 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 |
| | | | | | | | | | | | | | | | | | | This commit also decouples the "import" and "update" functions inside ContentProxy. If a content array is available, it must be passed to the new importEntry method. | ||||
| * | | 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 |
| | | | | | | | | | | | | | | | | | | Objects are always passed by reference, so it doesn't make sense to return an object which is passed by reference as it will always be the same object. This change makes the code a bit more readable. | ||||
* | | | Merge pull request #3176 from wallabag/fix-image-download | Nicolas Lœuillet | 2017-06-02 | 2 | -5/+28 |
|\ \ \ | | | | | | | | | Replace images with & in url | ||||
| * | | | CS | Jeremy Benoist | 2017-06-01 | 1 | -3/+2 |
| | | | | |||||
| * | | | Replace images with & | Jeremy Benoist | 2017-06-01 | 2 | -4/+28 |
|/ / / | | | | | | | | | | | | | | | | Images with `&` in the path weren’t well replaced because they might be with `&` in the html instead. Replacing `&` with `&` fix the problem. | ||||
* | | | Merge pull request #3171 from wallabag/drop-fucking-sqlite | Nicolas Lœuillet | 2017-06-01 | 1 | -5/+6 |
|\ \ \ | | | | | | | | | Defined MySQL as the default rdbms for wallabag | ||||
| * | | | 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 |
|\ \ \ \ | |_|/ / |/| | | | More Scrutinizer issues fixed | ||||
| * | | | 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 |
|/ / / | | | | | | | | | | | | | It could have been used if we set the current page inside PreparePagerForEntries. But we did that in each controller because we can have an OutOfRangeCurrentPageException | ||||
* | | | Merge pull request #3137 from aaa2000/isolated-tests | Jérémy Benoist | 2017-06-01 | 23 | -281/+461 |
|\ \ \ | |/ / |/| | | Isolated tests | ||||
| * | | Isolated tests | adev | 2017-05-31 | 24 | -284/+465 |
| | | | | | | | | | | | | Use https://github.com/dmaicher/doctrine-test-bundle to have test isolation. | ||||
* | | | Merge pull request #3077 from wallabag/add-tags-list-view | Nicolas Lœuillet | 2017-05-31 | 6 | -19/+90 |
|\ \ \ | | | | | | | | | Added tags on list view | ||||
| * | | | 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 |
| | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | | | 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 |
|\ \ \ \ | |_|/ / |/| | | | Allow other fields to be send using API | ||||
| * | | | 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 |
| | | | | | | | | | | | | | | | | Add adding more tests for forced content | ||||
| * | | | Improve docs | Jeremy Benoist | 2017-05-31 | 2 | -3/+6 |
| | | | | |||||
| * | | | Remove htmlawed and use graby instead | Jeremy Benoist | 2017-05-31 | 3 | -32/+14 |
| | | | | | | | | | | | | | | | | | | | | Instead of using htmlawed (which is already used in graby) use graby directly (which require some refacto on graby side). Still needs some tests. | ||||
| * | | | Reduce imported entries | Jeremy Benoist | 2017-05-31 | 8 | -491/+23 |
| | | | | | | | | | | | | | | | | Down from 2.2 minutes to 1.39 minutes | ||||
| * | | | Use graby ContentExtractor to clean html | Jeremy Benoist | 2017-05-31 | 4 | -2/+66 |
| | | | | | | | | | | | | | | | | It might be better to re-use some graby functionalities to clean html instead of building a new system. | ||||
| * | | | 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 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Entry API can now have these new fields: - content - language - preview_picture - published_at Re-use the ContentProxy to be able to do the same using the web UI (in the future). htmLawed is used to clean stuff from content, I hope it’ll be enough to avoid security breach. Lower content validation when we want to update an entry with content already defined. Before, language & content_type were required. If there weren’t provided, we re-fetched the content using graby. I think these fields aren’t required for an entry to be created. So I removed them. Which means some import from the v1 export won’t be re-fetched since they provide content, url & title. Also, remove liberation link from Readability import to avoid overlaping import (from wallabag v1, which had the same link) | ||||
* | | | Merge pull request #3168 from wallabag/instapaper-tags-import | Nicolas Lœuillet | 2017-05-31 | 13 | -31/+94 |
|\ \ \ | | | | | | | | | Add support for tag in Instapaper import | ||||
| * | | | 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 |
|\ \ \ \ | | | | | | | | | | | Ignore ActionMarkAsRead when removing tag from entry |