aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2708 from jcharaoui/import-disablecontentupdateJérémy Benoist2017-06-0216-70/+105
|\ | | | | Import disableContentUpdate
| * 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-012-51/+22
| |
| * CSJeremy Benoist2017-06-011-3/+3
| |
| * Fix testsJeremy Benoist2017-06-015-33/+49
| |
| * CSJeremy Benoist2017-06-011-2/+1
| |
| * Replace Wallabag v1 error strings with v2 stringsJerome Charaoui2017-06-012-3/+17
| |
| * Add disableContentUpdate import optionJerome Charaoui2017-06-013-25/+84
| | | | | | | | | | | | 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 configJerome Charaoui2017-06-014-3/+4
| |
| * Avoid returning objects passed by reference.Jerome Charaoui2017-06-0110-21/+11
| | | | | | | | | | | | 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.
* | CSJeremy Benoist2017-06-011-3/+2
| |
* | Replace images with &Jeremy Benoist2017-06-011-1/+7
| | | | | | | | | | | | Images with `&` in the path weren’t well replaced because they might be with `&` in the html instead. Replacing `&` with `&` fix the problem.
* | 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
|/ | | | | 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-testsJérémy Benoist2017-06-013-14/+11
|\ | | | | Isolated tests
| * Isolated testsadev2017-05-313-14/+11
| | | | | | | | Use https://github.com/dmaicher/doctrine-test-bundle to have test isolation.
* | Merge pull request #3077 from wallabag/add-tags-list-viewNicolas Lœuillet2017-05-312-17/+27
|\ \ | | | | | | Added tags on list view
| * | Add some flex magicThomas Citharel2017-05-311-18/+16
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | Fixed tags display on grid viewNicolas Lœuillet2017-05-312-23/+28
| | |
| * | Added tags on list viewNicolas Lœuillet2017-05-301-1/+8
| | |
* | | Forced date can now be a timestamp tooJeremy Benoist2017-05-312-2/+9
| | | | | | | | | | | | Add adding more tests for forced content
* | | Improve docsJeremy Benoist2017-05-312-3/+6
| | |
* | | Remove htmlawed and use graby insteadJeremy Benoist2017-05-311-18/+1
| | | | | | | | | | | | | | | Instead of using htmlawed (which is already used in graby) use graby directly (which require some refacto on graby side). Still needs some tests.
* | | Use graby ContentExtractor to clean htmlJeremy Benoist2017-05-312-1/+10
| | | | | | | | | | | | It might be better to re-use some graby functionalities to clean html instead of building a new system.
* | | Add support for authorsJeremy Benoist2017-05-311-1/+5
| | |
* | | Allow other fields to be send using APIJeremy Benoist2017-05-312-22/+54
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-importNicolas Lœuillet2017-05-311-0/+17
|\ \ | | | | | | Add support for tag in Instapaper import
| * | Add support for tag in Instapaper importJeremy Benoist2017-05-311-0/+17
| | |
* | | Merge pull request #3138 from Kdecherf/2835-tagsNicolas Lœuillet2017-05-312-5/+7
|\ \ \ | | | | | | | | Ignore ActionMarkAsRead when removing tag from entry
| * | | TagController: ignore ActionMarkAsRead when removing tag from entryKevin Decherf2017-05-312-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #2835 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | | | Merge pull request #3161 from wallabag/scrutinizer-2.3Nicolas Lœuillet2017-05-313-11/+5
|\ \ \ \ | |_|/ / |/| | | Fix some Scrutinizer issues
| * | | CSJeremy Benoist2017-05-301-1/+1
| | | |
| * | | Use a better way to set input for commandJeremy Benoist2017-05-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Actually use the correct to way handle that http://symfony.com/doc/current/components/console/helpers/questionhelper.html#testing-a-command-that-expects-input
| * | | Fix some Scrutinizer issuesJeremy Benoist2017-05-303-10/+5
| | |/ | |/|
* | | Merge pull request #3143 from wallabag/fix-wllbg2-importNicolas Lœuillet2017-05-311-2/+2
|\ \ \ | |_|/ |/| | Fixed is_starred for wallabag v2 import
| * | Add testsJeremy Benoist2017-05-301-2/+2
| | |
| * | 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-304-7/+171
|\ \ \ | |_|/ |/| | Register through API
| * | Remove unknown validation_groupsJeremy Benoist2017-05-301-3/+1
| | | | | | | | | | | | The Profile validation_groups does not exist and then for validation to be skipped (like password length)
| * | Re-use `NewUserType` to validate registrationJeremy Benoist2017-05-302-43/+101
| | | | | | | | | | | | | | | | | | The only ugly things is how we handle error by generating the view and then parse the content to retrieve all errors… Fix exposition fields in User entity
| * | WIPThomas Citharel2017-05-293-0/+108
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | Merge pull request #3147 from wallabag/delete-confirmJérémy Benoist2017-05-3017-20/+65
|\ \ \ | |/ / |/| | Add some deletion confirmation to avoid mistake
| * | Update messages.pl.ymlMateusz Rumiński2017-05-291-8/+8
| | | | | | | | | add missing translation
| * | update :de: messages.de.ymlSven Fischer2017-05-291-8/+8
| | |
| * | Add some deletion confirmation to avoid mistakeJeremy Benoist2017-05-2417-8/+53
| |/
* | CSThomas Citharel2017-05-284-5/+1
| | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>