aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #3093 from aaa2000/annotation-error-on-saveNicolas Lœuillet2017-06-0723-26/+270
|\ \ \
| * | | Fix postgresql migrationadev2017-06-071-2/+2
| * | | Displays an error with an annotation with a too long quoteadev2017-06-0423-26/+270
* | | | Merge pull request #3181 from wallabag/api-content-patchJérémy Benoist2017-06-073-76/+87
|\ \ \ \
| * | | | 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
| |/ / /
* | | | Merge pull request #3184 from wallabag/better-way-image-extensionJérémy Benoist2017-06-073-5/+70
|\ \ \ \
| * | | | Use an alternative way to detect imageJeremy Benoist2017-06-053-5/+70
| |/ / /
* | | | Merge pull request #3179 from wallabag/show-user-commandJérémy Benoist2017-06-072-0/+172
|\ \ \ \
| * | | | Fix reviewThomas Citharel2017-06-042-4/+4
| * | | | Add show user commandThomas Citharel2017-06-022-0/+172
| |/ / /
* | | | 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 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
|\ \ \
| * \ \ Merge pull request #3180 from wallabag/mruminski-patch-1Jérémy Benoist2017-06-021-1/+1
| |\ \ \
| | * | | Update PL transationMateusz Rumiński2017-06-021-1/+1
| * | | | 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
| | |/ | |/|
* | | Merge pull request #3165 from wallabag/it-translation-updateJérémy Benoist2017-06-061-38/+38
|\ \ \ | |/ / |/| |
| * | Update messages.it.ymlJérémy Benoist2017-06-021-23/+23
| * | Updated :it: translationsNicolas Lœuillet2017-05-311-13/+13
| * | 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
|\ \ \
| * | | 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
| * | | 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
* | | | Merge pull request #3176 from wallabag/fix-image-downloadNicolas Lœuillet2017-06-022-5/+28
|\ \ \ \
| * | | | CSJeremy Benoist2017-06-011-3/+2
| * | | | Replace images with &Jeremy Benoist2017-06-012-4/+28
|/ / / /
* | | | Merge pull request #3171 from wallabag/drop-fucking-sqliteNicolas Lœuillet2017-06-011-5/+6
|\ \ \ \
| * | | | 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
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | 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
|/ / / /