aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* API user creation behing a toggleJeremy Benoist2017-06-0210-343/+297
| | | | | | | | I've added a toggle feature (in internal settings) so that user api creation can be disabled while form registration still can be enabled. Also, the /api/user endpoint shouldn't require authentication. Even if we check the authentication when sending a GET request, to retrieve current user information. I've moved all the internal settings definition to config to avoid duplicated place to define them. I don't know why we didn't did that earlier.
* Merge pull request #2708 from jcharaoui/import-disablecontentupdateJérémy Benoist2017-06-0220-103/+160
|\ | | | | 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-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
| | | | | | | | | | | | 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-015-3/+5
| |
| * Avoid returning objects passed by reference.Jerome Charaoui2017-06-0111-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-downloadNicolas Lœuillet2017-06-022-5/+28
|\ \ | | | | | | Replace images with & in url
| * | CSJeremy Benoist2017-06-011-3/+2
| | |
| * | Replace images with &Jeremy Benoist2017-06-012-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-sqliteNicolas Lœuillet2017-06-011-5/+6
|\ \ | | | | | | Defined MySQL as the default rdbms for wallabag
| * | 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
|\ \ \ | |_|/ |/| | More Scrutinizer issues fixed
| * | 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-0123-281/+461
|\ \ | |/ |/| Isolated tests
| * Isolated testsadev2017-05-3124-284/+465
| | | | | | | | 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-316-19/+90
|\ \ | | | | | | Added tags on list view
| * | Reduced border-radius for tagsNicolas Lœuillet2017-05-312-0/+2
| | |
| * | Add some flex magicThomas Citharel2017-05-314-53/+64
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | 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
|\ \ \ | |_|/ |/| | Allow other fields to be send using API
| * | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 08:40:17 +0000