aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3241 from wallabag/fix-qr-code-transNicolas Lœuillet2017-06-2214-4/+16
|\ | | | | Fix translations on QR code instructions
| * Add :it: translationJérémy Benoist2017-06-221-1/+1
| |
| * Update polish Mateusz Rumiński2017-06-221-3/+3
| | | | | | add missing translation
| * 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 method
| * Add client_credentials oAuth2 auth methodThomas Citharel2017-06-142-4/+25
| | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | Merge pull request #3207 from wallabag/tag-rssJérémy Benoist2017-06-2131-103/+258
|\ \ | | | | | | Add RSS for tags
| * | Add all entries RSS feed and put links on tag page itself and baggy tooThomas Citharel2017-06-2121-45/+106
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | Fix typoJeremy Benoist2017-06-211-3/+3
| | |
| * | add rss iconThomas Citharel2017-06-211-0/+3
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | 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
|\ \ | | | | | | Store credentials in DB
| * | Get rid of masked value in listingJeremy Benoist2017-06-202-6/+0
| | |
| * | Fix reviewsThomas Citharel2017-06-2011-22/+43
| | | | | | | | | | | | | | | | | | | | | | | | Encrypt username too Redirect to list after saving credentials Fix typos Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | Crypt site credential passwordJeremy Benoist2017-06-2015-9/+169
| | |
| * | Add a live test for restricted articleJeremy Benoist2017-06-205-31/+81
| | | | | | | | | | | | | | | | | | | | | It is not aimed to test if we can get the full article (since we aren't using real login/password) but mostly to test the full work (with authentication, etc.) Do not clean fixtured to avoid SQLite to re-use id for entry tag relation 😓
| * | 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
| | | | | | | | | | | | Inject the current user & the repo to retrieve username/password from the database
| * | 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
|\ \ \ | | | | | | | | Empty preview pictures and language return null
| * | | 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 deps
| * | | Fix mobile view and update asset depsThomas Citharel2017-06-159-612/+654
|/ / / | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | Merge pull request #3220 from wallabag/remove-paddingNicolas Lœuillet2017-06-135-5/+5
|\ \ \ | | | | | | | | Removed padding on entry view
| * | | 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 form
| * | Fixed internal settings formNicolas Lœuillet2017-06-121-2/+1
|/ /
* | Merge pull request #3208 from wallabag/is-publicNicolas Lœuillet2017-06-1219-6/+165
|\ \ | |/ |/| Add ability to filter public entries & use it in the API
| * 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
| | | | | | | | | | | | Listing entries can now be filtered by “public”. Creating or patching an entry can now set is to public or remove the public. Entry response now include “is_public” boolean field
| * 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
| |\ | | | | | | Config label improvement #3199
| | * 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.yml
| * | Update validators.pl.ymlMateusz Rumiński2017-06-101-1/+1
| | | | | | | | | add "quote_length_too_high" translation
* | | Merge pull request #3203 from wallabag/fix-tag-count-baggyJérémy Benoist2017-06-101-1/+1
|\ \ \ | |/ / |/| | Fix tags count in tags list on baggy
| * | 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
|\ \ \ | |/ / |/| | remove craueconfig domain name setting and add a proper one in parame…
| * | Promote httpsJeremy Benoist2017-06-092-2/+2
| | |
| * | ReviewJeremy Benoist2017-06-088-9/+5
| | |
| * | fix testsThomas Citharel2017-06-062-1/+2
| | |