aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #3245 from wallabag/fix-bcJérémy Benoist2017-06-292-8/+69
|\
| * CSJérémy Benoist2017-06-281-2/+2
| * Return null instead of falseJeremy Benoist2017-06-282-6/+30
| * Avoid BC on exists endpointJeremy Benoist2017-06-232-6/+43
* | Merge remote-tracking branch 'origin/master' into 2.3Jeremy Benoist2017-06-261-142/+142
|\ \ | |/ |/|
| * Merge pull request #3237 from matteocoder/masterJérémy Benoist2017-06-261-156/+160
| |\
| | * Fixed broken lines and added new linesmatteocoder2017-06-241-5/+7
| | * Merge pull request #1 from matteocoder/matteocoder-messages.itmatteocoder2017-06-171-154/+156
| |/|
| | * revised messages.itmatteocoder2017-06-171-154/+156
| |/
* | Merge pull request #3204 from wallabag/better-export-pageJérémy Benoist2017-06-2220-80/+479
|\ \
| * | Don't load js for nothing in prodThomas Citharel2017-06-221-2/+3
| * | Add css on share public pageThomas Citharel2017-06-229-3/+17
| * | Add share.scss fileJeremy Benoist2017-06-222-26/+407
| * | Fix linter issue on webpack config filesJeremy Benoist2017-06-223-42/+40
| * | add :it: shared_by_wallabag string translated by @matteocoderSven Fischer2017-06-221-1/+1
| * | adjust :de: shared_by_wallabag string to include user infoSven Fischer2017-06-221-1/+1
| * | Better export pageJeremy Benoist2017-06-228-9/+14
|/ /
* | Merge pull request #3241 from wallabag/fix-qr-code-transNicolas Lœuillet2017-06-2214-4/+16
|\ \
| * | Add :it: translationJérémy Benoist2017-06-221-1/+1
| * | Update polish Mateusz Rumiński2017-06-221-3/+3
| * | Fix translations on QR code instructionsThomas Citharel2017-06-2214-2/+14
* | | Merge pull request #3227 from wallabag/oauth-client-credentialsNicolas Lœuillet2017-06-222-4/+25
|\ \ \ | |/ / |/| |
| * | Add client_credentials oAuth2 auth methodThomas Citharel2017-06-142-4/+25
* | | Merge pull request #3207 from wallabag/tag-rssJérémy Benoist2017-06-2131-103/+258
|\ \ \
| * | | Add all entries RSS feed and put links on tag page itself and baggy tooThomas Citharel2017-06-2121-45/+106
| * | | Fix typoJeremy Benoist2017-06-211-3/+3
| * | | add rss iconThomas Citharel2017-06-211-0/+3
| * | | Fix testsJeremy Benoist2017-06-211-1/+1
| * | | Fix getContainer in commandJeremy Benoist2017-06-215-8/+7
| * | | Add RSS tags feedsJeremy Benoist2017-06-215-20/+117
| * | | User existing service instead of getDoctrineJeremy Benoist2017-06-218-37/+32
|/ / /
* | | 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
|/ / /