aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config/config.yml
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master' into 2.2Jeremy Benoist2016-11-191-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * Change version to 2.2.0-devNicolas Lœuillet2016-11-191-1/+1
| |
| * Prepare wallabag 2.1.4 :rocket:Nicolas Lœuillet2016-11-181-1/+1
| |
| * Prepare wallabag 2.1.3 :rocket:Nicolas Lœuillet2016-11-041-1/+1
| |
* | Added new shortcutsNicolas Lœuillet2016-11-151-1/+0
| |
* | Changed FOSJSRouting format in configNicolas Lœuillet2016-11-151-1/+12
| |
* | Added shortcutsNicolas Lœuillet2016-11-151-0/+3
| |
* | Merge pull request #2548 from wallabag/pinboardJeremy Benoist2016-11-081-0/+13
|\ \ | | | | | | Add Pinboard import
| * | Add Pinboard importJeremy Benoist2016-11-041-0/+13
| | |
* | | Removed Maintenance bundleNicolas Lœuillet2016-11-061-10/+0
|/ /
* | Merge remote-tracking branch 'origin/master' into 2.2Jeremy Benoist2016-11-031-1/+3
|\|
| * Merge pull request #2473 from pmichelazzo/masterJeremy Benoist2016-10-251-0/+1
| |\ | | | | | | Portuguese (Brazilian) translation
| | * Update Portuguese (Brazilian) translationPaulino Michelazzo2016-10-191-0/+1
| | | | | | | | | | | | Adding the config.yml on the package.
| * | Removed the email partNicolas Lœuillet2016-10-241-1/+1
| | |
| * | Add relevant links to fetch content error pages.Baptiste Mille-Mathias2016-10-231-1/+2
| | | | | | | | | | | | We link to the troubleshooting guide and give the mail link.
* | | Merge remote-tracking branch 'origin/master' into 2.2Jeremy Benoist2016-10-241-1/+2
|\| |
| * | If reload content failed, don’t update itJeremy Benoist2016-10-201-0/+1
| |/ | | | | | | 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.
| * Update wallabag version for master branchNicolas Lœuillet2016-10-171-1/+1
| |
| * Prepare wallabag 2.1.2 :rocket:Nicolas Lœuillet2016-10-171-1/+1
| |
* | Fix emoji insertion in MySQLJeremy Benoist2016-10-221-1/+1
| | | | | | | | | | Switch to utf8mb4 instead of utf8 because f*** MySQL See https://github.com/doctrine/dbal/pull/851
* | ApiDoc & Route annotation were conflictedJeremy Benoist2016-10-151-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | 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 …
* | Merge pull request #2372 from pmartin/api-get-entry-as-epubJeremy Benoist2016-10-121-0/+2
|\ \ | |/ |/| API: ability to export entry in all available format (epub, pdf, etc...)
| * Add entry export in APIJeremy Benoist2016-10-081-0/+2
| | | | | | | | | | Export isn't available for json & xml because user can use the default entry endpoint instead.
* | Define a dev version for the masterJeremy Benoist2016-10-101-1/+1
|/ | | This is to be sure that user testing wallabag from the master will have the version defined as dev.
* Use default locale for user configJeremy Benoist2016-10-081-1/+1
| | | | When creating a user, we set the language config “en” by default. We should use the defined locale (from `parameters.yml`) instead
* Add ability to use socketJeremy Benoist2016-10-071-0/+1
| | | | For Redis & MySQL
* Prepare wallabag 2.1.1Nicolas Lœuillet2016-10-041-1/+1
|
* Customize errors templatesJeremy Benoist2016-10-011-0/+1
| | | | All error goes to the same template which only display the error message and the status code.
* Add controller test for InstapaperJeremy Benoist2016-09-271-0/+13
|
* Add Instapaper importJeremy Benoist2016-09-271-1/+1
| | | | Also update ImportController with latest import (chrome, firefox & instapaper).
* cs & fixesThomas Citharel2016-09-251-0/+26
|
* Fixed version in documentationNicolas Lœuillet2016-09-191-1/+1
|
* Add documentation about article sharingNicolas Lœuillet2016-09-191-1/+1
|
* Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-09-191-1/+1
|\
| * Prepare wallabag 2.0.8Nicolas Lœuillet2016-09-071-1/+1
| |
* | AMPQ -> AMQPJeremy Benoist2016-09-141-4/+4
| |
* | Enable Redis async importJeremy Benoist2016-09-111-4/+4
| | | | | | | | | | | | | | | | - using javibravo/simpleue - internal config value are now `import_with_redis` & `import_with_rabbit` which are more clear - if both option are enable rabbit will be choosen - services imports related to async are now splitted into 2 files: `redis.yml` & `rabbit.yml` -
* | Convert other imports to RabbitJeremy Benoist2016-09-111-2/+41
| |
* | Send every imported item to the queueJeremy Benoist2016-09-111-11/+11
| | | | | | | | | | Instead of queing real Entry to process, we queue all the item to import from Pocket in a raw format. Then, the worker retrieve that information, find / create the entry and save it.
* | 1st draft for rabbitMQNicolas Lœuillet2016-09-111-0/+25
| |
* | Merge pull request #2002 from wallabag/feature-display-itemsNumberJeremy Benoist2016-09-031-0/+1
|\ \ | | | | | | Feature display items number
| * | Store cache lifetime in configNicolas Lœuillet2016-09-031-0/+1
| | |
* | | Proper parameter name, simplify logic & phpdocThomas Citharel2016-08-231-1/+1
| | |
* | | Add option to disable registrationThomas Citharel2016-08-231-0/+3
|/ /
* | Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-08-221-1/+6
|\|
| * Prepare wallabag 2.0.7Nicolas Lœuillet2016-08-221-1/+1
| |
| * Merge pull request #2220 from Rurik19/masterJeremy Benoist2016-08-181-1/+1
| |\ | | | | | | Enable PATCH method for CORS in API part
| | * Enable PATCH method for CORS in API partRurik192016-08-181-1/+1
| | |
| * | Merge pull request #2216 from Rurik19/masterNicolas Lœuillet2016-08-161-0/+5
| |\| | | | | | | Enable CORS headers for OAUTH part
| | * Enable CORS headers for OAUTH partRurik192016-08-121-0/+5
| | |