aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3093 from aaa2000/annotation-error-on-saveNicolas Lœuillet2017-06-0723-26/+270
|\ | | | | Displays an error with an annotation with a too long quote
| * Fix postgresql migrationadev2017-06-071-2/+2
| |
| * Displays an error with an annotation with a too long quoteadev2017-06-0423-26/+270
| | | | | | | | Fix #2762
* | Merge pull request #3181 from wallabag/api-content-patchJérémy Benoist2017-06-073-76/+87
|\ \ | | | | | | Add ability to patch an entry with more fields
| * | Refactorize the way to save an Entry in the APIJeremy Benoist2017-06-071-102/+70
| | |
| * | Add ability to patch an entry with more fieldsJeremy Benoist2017-06-023-4/+47
| |/ | | | | | | | | | | | | | | | | Like when we create an entry, we can now patch an entry with new fields: - content - language - preview_picture - published_at - authors
* | Merge pull request #3184 from wallabag/better-way-image-extensionJérémy Benoist2017-06-073-5/+70
|\ \ | | | | | | Use an alternative way to detect images
| * | Use an alternative way to detect imageJeremy Benoist2017-06-053-5/+70
| |/ | | | | | | | | | | | | When parsing content to retrieve images to save locally, we only check for the content-type of the image response. In some case, that value is empty. Now we’re also checking for the first few bytes of the content as an alternative to detect if it’s an image wallabag can handle. We might get higher image supports using that alternative method.
* | Merge pull request #3179 from wallabag/show-user-commandJérémy Benoist2017-06-072-0/+172
|\ \ | | | | | | Show user command
| * | Fix reviewThomas Citharel2017-06-042-4/+4
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | Add show user commandThomas Citharel2017-06-022-0/+172
| |/ | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | Merge remote-tracking branch 'origin/master' into 2.3Jeremy Benoist2017-06-061-1/+1
|\ \
| * \ Merge pull request #3167 from wallabag/doc-github-templateNicolas Lœuillet2017-05-311-1/+1
| |\ \ | | | | | | | | Fix link in Github template
| | * | Fix link in Github templateJérémy Benoist2017-05-311-1/+1
| |/ /
* | | Merge pull request #3177 from wallabag/api-create-user-updateJérémy Benoist2017-06-0623-385/+358
|\ \ \ | | | | | | | | API user creation behing a toggle
| * \ \ Merge pull request #3180 from wallabag/mruminski-patch-1Jérémy Benoist2017-06-021-1/+1
| |\ \ \ | | | | | | | | | | Update PL translation
| | * | | Update PL transationMateusz Rumiński2017-06-021-1/+1
| | | | | | | | | | | | | | | add missing translation
| * | | | Return 201 on user creationJeremy Benoist2017-06-022-7/+14
| |/ / /
| * | | Add :it: translationJérémy Benoist2017-06-021-1/+1
| | | |
| * | | Use a dedicated file for wallabag configJeremy Benoist2017-06-022-165/+165
| | | |
| * | | Add translationJeremy Benoist2017-06-0213-1/+13
| | | |
| * | | 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 #3165 from wallabag/it-translation-updateJérémy Benoist2017-06-061-38/+38
|\ \ \ | |/ / |/| | Update Italian translation
| * | Update messages.it.ymlJérémy Benoist2017-06-021-23/+23
| | |
| * | Updated :it: translationsNicolas Lœuillet2017-05-311-13/+13
| | | | | | | | | | | | Thank you @matteocoder
| * | Update :it: translationJérémy Benoist2017-05-301-2/+2
| | |
* | | 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 `&amp;` in the html instead. Replacing `&` with `&amp;` 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