aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | Add adding more tests for forced content
* Improve docsJeremy Benoist2017-05-312-3/+6
|
* Remove htmlawed and use graby insteadJeremy Benoist2017-05-313-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 entriesJeremy Benoist2017-05-318-491/+23
| | | | Down from 2.2 minutes to 1.39 minutes
* Use graby ContentExtractor to clean htmlJeremy Benoist2017-05-314-2/+66
| | | | 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-312-1/+9
|
* Allow other fields to be send using APIJeremy Benoist2017-05-317-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-importNicolas Lœuillet2017-05-3113-31/+94
|\ | | | | Add support for tag in Instapaper import
| * 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
|\ \ | | | | | | Ignore ActionMarkAsRead when removing tag from entry
| * | Ensure retrieved data are freshJeremy Benoist2017-05-311-0/+6
| | |
| * | TagController: ignore ActionMarkAsRead when removing tag from entryKevin Decherf2017-05-314-5/+29
| | | | | | | | | | | | | | | | | | Fixes #2835 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | | Merge pull request #3161 from wallabag/scrutinizer-2.3Nicolas Lœuillet2017-05-314-87/+35
|\ \ \ | |_|/ |/| | Fix some Scrutinizer issues
| * | CSJeremy Benoist2017-05-301-1/+1
| | |
| * | Use a better way to set input for commandJeremy Benoist2017-05-302-77/+30
| | | | | | | | | | | | | | | | | | 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-313-3/+4
|\ \ \ | |_|/ |/| | Fixed is_starred for wallabag v2 import
| * | 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
|\ \ \ | |_|/ |/| | Register through API
| * | Avoid side effect on other testsJeremy Benoist2017-05-301-1/+13
| | |
| * | Remove unknown validation_groupsJeremy Benoist2017-05-302-5/+3
| | | | | | | | | | | | 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-304-44/+200
| | | | | | | | | | | | | | | | | | 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 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?"
| | * | | 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
|\ \ \ \ | |_|/ / |/| | | Add some deletion confirmation to avoid mistake
| * | | Merge pull request #3160 from wallabag/mruminski-patch-1Jérémy Benoist2017-05-301-8/+8
| |\ \ \ | | | | | | | | | | Update messages.pl.yml
| | * | | 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
| | |/ | |/|
* | | Merge pull request #3153 from wallabag/content-proxy-refactorThomas Citharel2017-05-2820-202/+266
|\ \ \ | |/ / |/| | Move Tags assigner to a separate file
| * | CSThomas Citharel2017-05-281-6/+0
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | CSThomas Citharel2017-05-284-5/+1
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | Move Tags assigner to a separate fileThomas Citharel2017-05-2720-200/+274
|/ / | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | Merge pull request #3145 from wallabag/fix-soJérémy Benoist2017-05-241-4/+4
|\ \ | | | | | | Fix SO tests
| * | Fix SO testsJeremy Benoist2017-05-241-4/+4
|/ / | | | | | | SO switched to http yesterday
* | 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
|\ \ | | | | | | Let's play !
| * | Ensure download_images_enabled is disabledJeremy Benoist2017-05-191-1/+20
| | | | | | | | | | | | | | | Even if the tests fail, that config must stay disabled after the test. Otherwise it might timeout on other test (because it'll try to save all other images)
| * | 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
| |\ | | | | | | unify Download/Export wording.
| | * modify key name as wellCedric Girard2017-05-1813-13/+13
| | |
| | * unify Download/Export wording.Cedric Girard2017-05-189-9/+9
| |/ | | | | | | This fixes #2967