aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #2683 from wallabag/credentials-in-dbJérémy Benoist2017-06-2041-39/+1605
|\ \ \
| * | | Get rid of masked value in listingJeremy Benoist2017-06-202-6/+0
| * | | Fix reviewsThomas Citharel2017-06-2011-22/+43
| * | | Crypt site credential passwordJeremy Benoist2017-06-2015-9/+169
| * | | Add a live test for restricted articleJeremy Benoist2017-06-205-31/+81
| * | | Force sequence creation for postgresqlJeremy Benoist2017-06-201-1/+6
| * | | Add menu access to site credentials CRUDJeremy Benoist2017-06-2022-14/+258
| * | | Retrieve username/password from databaseJeremy Benoist2017-06-204-13/+49
| * | | Update route & user verificationJeremy Benoist2017-06-206-19/+34
| * | | Add CRUD for site credentialsJeremy Benoist2017-06-2024-13/+1054
* | | | Merge pull request #3215 from wallabag/fix-3192Jérémy Benoist2017-06-202-5/+5
|\ \ \ \
| * | | | Fix empty language and preview picsThomas Citharel2017-06-122-5/+5
* | | | | Merge pull request #3229 from wallabag/fix-mobile-viewThomas Citharel2017-06-159-612/+654
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix mobile view and update asset depsThomas Citharel2017-06-159-612/+654
|/ / / /
* | | | Merge pull request #3220 from wallabag/remove-paddingNicolas Lœuillet2017-06-135-5/+5
|\ \ \ \
| * | | | Updated production filesNicolas Lœuillet2017-06-134-4/+4
| * | | | Removed padding on entry viewNicolas Lœuillet2017-06-131-1/+1
|/ / / /
* | | | Merge pull request #3213 from wallabag/fix-internal-settings-formNicolas Lœuillet2017-06-131-2/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed internal settings formNicolas Lœuillet2017-06-121-2/+1
|/ / /
* | | Merge pull request #3208 from wallabag/is-publicNicolas Lœuillet2017-06-1219-6/+165
|\ \ \ | |/ / |/| |
| * | CSJeremy Benoist2017-06-101-1/+1
| * | Few fixesJeremy Benoist2017-06-103-3/+4
| * | Add public filter/field in the APIJeremy Benoist2017-06-104-6/+88
| * | Add isPublic filter on entriesJeremy Benoist2017-06-1016-0/+76
|/ /
* | Merge remote-tracking branch 'origin/master' into 2.3Jeremy Benoist2017-06-107-7/+7
|\|
| * Merge pull request #3202 from pVesian/masterJérémy Benoist2017-06-107-7/+7
| |\
| | * Update translationsJeremy Benoist2017-06-102-2/+2
| | * Config label improvement #3199Pierre de Vésian2017-06-097-7/+7
| |/
* | Merge pull request #3206 from wallabag/mruminski-patch-1Jérémy Benoist2017-06-101-1/+1
|\ \
| * | Update validators.pl.ymlMateusz Rumiński2017-06-101-1/+1
* | | Merge pull request #3203 from wallabag/fix-tag-count-baggyJérémy Benoist2017-06-101-1/+1
|\ \ \ | |/ / |/| |
| * | Fix tags count in tags list on baggyJeremy Benoist2017-06-101-1/+1
* | | Merge pull request #3173 from wallabag/domain-name-paramJérémy Benoist2017-06-1018-20/+60
|\ \ \ | |/ / |/| |
| * | Promote httpsJeremy Benoist2017-06-092-2/+2
| * | ReviewJeremy Benoist2017-06-088-9/+5
| * | fix testsThomas Citharel2017-06-062-1/+2
| * | add migrationThomas Citharel2017-06-063-4/+53
| * | remove craueconfig domain name setting and add a proper one in parametersThomas Citharel2017-06-0618-14/+8
* | | Merge pull request #3192 from wallabag/validate-content-fieldsJérémy Benoist2017-06-095-41/+275
|\ \ \
| * | | Cleanup testJeremy Benoist2017-06-091-1/+0
| * | | Convert - to _ in languageJeremy Benoist2017-06-093-5/+13
| * | | Use Locale instead of LanguageJeremy Benoist2017-06-092-16/+80
| * | | Fix testJeremy Benoist2017-06-082-5/+5
| * | | CSJeremy Benoist2017-06-081-1/+2
| * | | Validate language & preview picture fieldsJeremy Benoist2017-06-083-23/+185
* | | | Merge pull request #3195 from wallabag/authentication-errorJérémy Benoist2017-06-093-0/+114
|\ \ \ \ | |/ / / |/| | |
| * | | Use a listener to catch auth failureJeremy Benoist2017-06-095-68/+111
| * | | CSJeremy Benoist2017-06-081-2/+2
| * | | Log an error level message when user auth failJeremy Benoist2017-06-083-0/+71
|/ / /
* | | Merge pull request #3187 from wallabag/api-client-credentialsJérémy Benoist2017-06-087-19/+88
|\ \ \