aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* NotificationsThomas Citharel2017-07-0968-16/+1701
| | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* Merge pull request #3256 from wallabag/fix-patchJérémy Benoist2017-07-055-167/+347
|\ | | | | Fix PATCH method
| * CSJeremy Benoist2017-07-034-96/+95
| |
| * Fix validateAndSetPreviewPictureJeremy Benoist2017-07-032-4/+36
| | | | | | | | Which wasn't covered by a test!
| * Fix PATCH methodJeremy Benoist2017-07-035-121/+270
| | | | | | | | | | The PATCH method for the entry should only update what user sent to us and not the whole entry as it was before. Also, sending tags when patching an entry will now remove all current tags & assocatied new ones.
* | Merge pull request #3257 from wallabag/fix-mapping-entitiesJérémy Benoist2017-07-032-1/+8
|\ \ | |/ |/| Fixed mapping entities
| * CSJeremy Benoist2017-07-032-2/+2
| |
| * Fixed mapping entitiesJeremy Benoist2017-07-031-0/+7
|/ | | | | | There were this error in the console: > The association Wallabag\CoreBundle\Entity\SiteCredential#user refers to the inverse side field Wallabag\UserBundle\Entity\User#site_credentials which does not exist.
* Merge pull request #3258 from wallabag/cs-fixerJérémy Benoist2017-07-03171-2330/+2352
|\ | | | | Add a real configuration for CS-Fixer
| * Fix testsJeremy Benoist2017-07-039-39/+34
| |
| * Add a real configuration for CS-FixerJeremy Benoist2017-07-01170-2312/+2339
|/
* Merge pull request #3245 from wallabag/fix-bcJérémy Benoist2017-06-292-8/+69
|\ | | | | Avoid BC on exists endpoint
| * 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
| |\ | | | | | | Revised messages.it.yml file
| | * Fixed broken lines and added new linesmatteocoder2017-06-241-5/+7
| | | | | | | | | In addition to fixing broken lines, I've also added a couple of lines from recent PRs.
| | * Merge pull request #1 from matteocoder/matteocoder-messages.itmatteocoder2017-06-171-154/+156
| |/| | | | | | | revised messages.it
| | * revised messages.itmatteocoder2017-06-171-154/+156
| |/
* | Merge pull request #3204 from wallabag/better-export-pageJérémy Benoist2017-06-2220-80/+479
|\ \ | | | | | | Better public sharing page
| * | 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
| | | | | | | | | | | | Still needs to include it in the twig template
| * | 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
|/ / | | | | | | I’ve increase the width of the page 900px, 600px looks too small for me. Should we use something like 90% instead?
* | 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