Commit graph

229 commits

Author SHA1 Message Date
Nicolas Lœuillet 66e9dde0dc
Fixed logout shortcut 2016-11-23 14:40:00 +01:00
Jeremy Benoist 5066c3e066
Re-use FOSUser master branch 2016-11-22 21:25:05 +01:00
Bertrand Dunogier 7aab0ecf2f Added authentication for restricted access articles
Fix #438. Thank you so much @bdunogier
2016-11-22 14:01:46 +01:00
Jeremy Benoist eb2d613c3e
Merge remote-tracking branch 'origin/master' into 2.2 2016-11-21 15:15:30 +01:00
Jeremy Benoist 625bb56181 Merge pull request #2624 from Rurik19/master
Fix #2056 update config.yml
2016-11-21 13:14:31 +01:00
Nicolas Lœuillet 98253436e9
Prepare wallabag 2.1.5 🚀 2016-11-21 09:20:27 +01:00
Yuriy Evdokimov 05cdd393d8 wrong spaces 2016-11-21 11:29:09 +05:00
Yuriy Evdokimov 5e7fdfc8dd Fix #2056 update config.yml
Resolves refresh token lifetime issue
2016-11-21 11:13:40 +05:00
Jeremy Benoist c1683778ab
Add ability to use Redis with password 2016-11-20 20:43:04 +01:00
Nicolas Lœuillet 995c204428 Added shortcut 2016-11-19 20:05:16 +01:00
Jeremy Benoist 68003139e1
Merge remote-tracking branch 'origin/master' into 2.2
# Conflicts:
#	.editorconfig
#	docs/de/index.rst
#	docs/de/user/import.rst
#	docs/en/index.rst
#	docs/en/user/configuration.rst
#	docs/en/user/import.rst
#	docs/fr/index.rst
#	docs/fr/user/import.rst
#	src/Wallabag/CoreBundle/Command/InstallCommand.php
#	src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
#	src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
#	web/bundles/wallabagcore/themes/baggy/css/style.min.css
#	web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
#	web/bundles/wallabagcore/themes/material/css/style.min.css
#	web/bundles/wallabagcore/themes/material/js/material.min.js
2016-11-19 15:30:49 +01:00
Nicolas Lœuillet 8fdadee3a5
Change version to 2.2.0-dev 2016-11-19 14:28:25 +01:00
Nicolas Lœuillet 5d2971cadd
Prepare wallabag 2.1.4 🚀 2016-11-18 10:00:29 +01:00
Nicolas Lœuillet f9cded7dd2 Added new shortcuts 2016-11-15 21:54:34 +01:00
Nicolas Lœuillet 49c5d0ad6e Changed FOSJSRouting format in config 2016-11-15 21:54:20 +01:00
Nicolas Lœuillet 3cc78f0679 Added shortcuts 2016-11-15 21:54:20 +01:00
Jeremy Benoist 41c2178685 Merge pull request #2548 from wallabag/pinboard
Add Pinboard import
2016-11-08 14:19:40 +01:00
Nicolas Lœuillet db3838545c
Removed Maintenance bundle 2016-11-06 15:34:08 +01:00
Jeremy Benoist 9ab024b4f5
Add Pinboard import 2016-11-04 22:44:31 +01:00
Nicolas Lœuillet a3f7d8a870
Prepare wallabag 2.1.3 🚀 2016-11-04 09:10:15 +01:00
Jeremy Benoist 5a619812ca
Merge remote-tracking branch 'origin/master' into 2.2 2016-11-03 16:41:29 +01:00
Jeremy Benoist 535bfcbe80
Move related event things in Event folder 2016-10-30 09:58:39 +01:00
Nicolas Lœuillet c4b3933bae Updated Capistrano configuration 2016-10-29 14:39:07 +02:00
Jeremy Benoist c68720d40e Merge pull request #2473 from pmichelazzo/master
Portuguese (Brazilian) translation
2016-10-25 11:41:24 +02:00
Nicolas Lœuillet d36e5e20a5 Removed the email part 2016-10-24 21:01:13 +02:00
Jeremy Benoist 64a8781e45
Merge remote-tracking branch 'origin/master' into 2.2 2016-10-24 12:03:17 +02:00
Jeremy Benoist f623516e10
SQLite should use utf8, not utf8mb4 2016-10-24 10:10:38 +02:00
Baptiste Mille-Mathias d1b075509d Add relevant links to fetch content error pages.
We link to the troubleshooting guide and give the mail link.
2016-10-23 15:34:52 +02:00
Jeremy Benoist fc79f1ffa8
Add verification check for MySQL version
Must now be >= 5.5.4
2016-10-22 13:41:03 +02:00
Jeremy Benoist b0de88f75d
Use statements & update translation 2016-10-22 13:13:07 +02:00
Jeremy Benoist 2f82e7f8e1
Cleanup subscriber / listener definition 2016-10-22 13:13:07 +02:00
Jeremy Benoist 98efffc2a6
Fix emoji insertion in MySQL
Switch to utf8mb4 instead of utf8 because f*** MySQL
See https://github.com/doctrine/dbal/pull/851
2016-10-22 13:13:07 +02:00
Jeremy Benoist 2297d60f10
If reload content failed, don’t update it
In case user wants a fresh version of the current one and the website isn’t available, don’t erase it with a boring message saying wallabag wasn’t able to refresh the content.
2016-10-20 22:49:46 +02:00
Paulino Michelazzo 5d6cffedb1 Update Portuguese (Brazilian) translation
Adding the config.yml on the package.
2016-10-19 19:25:48 +02:00
Nicolas Lœuillet f31361a6d9 Update wallabag version for master branch 2016-10-17 11:56:29 +02:00
Nicolas Lœuillet ef22711605 Prepare wallabag 2.1.2 🚀 2016-10-17 09:43:13 +02:00
Jeremy Benoist f1c3f68e90
ApiDoc & Route annotation were conflicted
The generated error was “Unable to guess how to get a Doctrine instance from the request information.”.

I haven’t checked deeper in Doctrine (I know it was coming from the DoctrineParamConverter).

Anyway, I check for FosRest possiblity to add extra format without allowing them for every route (like it was done in the first place).

I finally found a way but it then seems all request goes to the FormatListener of FosRest so I needed to add a custom rules to match all request to be sure we don’t get  a 406 error from FosRest.

Should be ok now …
2016-10-15 16:46:42 +02:00
Jeremy Benoist b1b561da51 Merge pull request #2372 from pmartin/api-get-entry-as-epub
API: ability to export entry in all available format (epub, pdf, etc...)
2016-10-12 14:06:33 +02:00
Jeremy Benoist fb8835cc8f Define a dev version for the master
This is to be sure that user testing wallabag from the master will have the version defined as dev.
2016-10-10 11:31:57 +02:00
Nicolas Lœuillet 93a95c09bf Merge pull request #2351 from wallabag/fix-api-client-deletion
Changed relation between API client and refresh token
2016-10-08 13:31:54 +02:00
Jeremy Benoist 3f3a60879e
Add entry export in API
Export isn't available for json & xml because user can use the default
entry endpoint instead.
2016-10-08 12:59:19 +02:00
Jeremy Benoist dd32c89ed6
Use default locale for user config
When creating a user, we set the language config “en” by default. We should use the defined locale (from `parameters.yml`) instead
2016-10-08 09:33:55 +02:00
Jeremy Benoist ee32248f43
Ensure access_token are removed
When we remove the client, we should ensure that access_token are also removed.

To ensure that, I created a test that generated an access_token. So when we remove the client, this association should be cascaded and shouldn’t generate an error.

Also I moved some Api related stuff to the ApiBundle (like the developer controler and ClientType form)
2016-10-08 00:05:41 +02:00
Jeremy Benoist 6d204f5382
Add ability to use socket
For Redis & MySQL
2016-10-07 21:00:13 +02:00
Nicolas Lœuillet 5958597ba6
Prepare wallabag 2.1.1 2016-10-04 17:08:34 +02:00
Jeremy Benoist f440e28281
Update doc
Merge VALIDATE_TRANSLATION_FILE & ASSET build (less build on Travis)
2016-10-04 10:31:03 +02:00
Jeremy Benoist 152fcccd44
Add users management UI
- remove the “add a user” from the config page
- add a CRUD on user
- fix some missing translations (+ bad indentation)
2016-10-02 11:08:53 +02:00
Jeremy Benoist bfb3ae01da Merge pull request #2323 from wallabag/footer-stats
Add simple stats in footer
2016-10-02 11:04:49 +02:00
Jeremy Benoist 1264029cd4
Add simple stats in footer 2016-10-01 16:03:50 +02:00
Jeremy Benoist 40e219622a
Customize errors templates
All error goes to the same template which only display the error message and the status code.
2016-10-01 14:58:48 +02:00