Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Prepare wallabag 2.2.0 :rocket: | Nicolas Lœuillet | 2017-01-27 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2017-01-26 | 1 | -1/+1 |
|\ | |||||
| * | Prepare wallabag 2.1.6 :rocket: | Nicolas Lœuillet | 2017-01-17 | 1 | -2/+2 |
| | | |||||
* | | Fixed API error 'No matching accepted Response format could be determined' | Nicolas Lœuillet | 2016-12-30 | 1 | -3/+3 |
| | | |||||
* | | Moved RabbitMQ QoS to parameters | Nicolas Lœuillet | 2016-12-15 | 1 | -8/+8 |
| | | |||||
* | | Added QoS for RabbitMQ | Nicolas Lœuillet | 2016-12-15 | 1 | -0/+8 |
| | | |||||
* | | Add default value for list_mode | Jeremy Benoist | 2016-12-12 | 1 | -0/+2 |
| | | |||||
* | | Fixed logout shortcut | Nicolas Lœuillet | 2016-11-23 | 1 | -1/+1 |
| | | |||||
* | | Re-use FOSUser master branch | Jeremy Benoist | 2016-11-22 | 1 | -2/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-11-21 | 1 | -2/+4 |
|\| | |||||
| * | Merge pull request #2624 from Rurik19/master | Jeremy Benoist | 2016-11-21 | 1 | -1/+3 |
| |\ | | | | | | | Fix #2056 update config.yml | ||||
| | * | wrong spaces | Yuriy Evdokimov | 2016-11-21 | 1 | -2/+2 |
| | | | |||||
| | * | Fix #2056 update config.yml | Yuriy Evdokimov | 2016-11-21 | 1 | -1/+3 |
| | | | | | | | | | Resolves refresh token lifetime issue | ||||
| * | | Prepare wallabag 2.1.5 :rocket: | Nicolas Lœuillet | 2016-11-21 | 1 | -1/+1 |
| |/ | |||||
* | | Added shortcut | Nicolas Lœuillet | 2016-11-19 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-11-19 | 1 | -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-dev | Nicolas Lœuillet | 2016-11-19 | 1 | -1/+1 |
| | | |||||
| * | Prepare wallabag 2.1.4 :rocket: | Nicolas Lœuillet | 2016-11-18 | 1 | -1/+1 |
| | | |||||
| * | Prepare wallabag 2.1.3 :rocket: | Nicolas Lœuillet | 2016-11-04 | 1 | -1/+1 |
| | | |||||
* | | Added new shortcuts | Nicolas Lœuillet | 2016-11-15 | 1 | -1/+0 |
| | | |||||
* | | Changed FOSJSRouting format in config | Nicolas Lœuillet | 2016-11-15 | 1 | -1/+12 |
| | | |||||
* | | Added shortcuts | Nicolas Lœuillet | 2016-11-15 | 1 | -0/+3 |
| | | |||||
* | | Merge pull request #2548 from wallabag/pinboard | Jeremy Benoist | 2016-11-08 | 1 | -0/+13 |
|\ \ | | | | | | | Add Pinboard import | ||||
| * | | Add Pinboard import | Jeremy Benoist | 2016-11-04 | 1 | -0/+13 |
| | | | |||||
* | | | Removed Maintenance bundle | Nicolas Lœuillet | 2016-11-06 | 1 | -10/+0 |
|/ / | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-11-03 | 1 | -1/+3 |
|\| | |||||
| * | Merge pull request #2473 from pmichelazzo/master | Jeremy Benoist | 2016-10-25 | 1 | -0/+1 |
| |\ | | | | | | | Portuguese (Brazilian) translation | ||||
| | * | Update Portuguese (Brazilian) translation | Paulino Michelazzo | 2016-10-19 | 1 | -0/+1 |
| | | | | | | | | | | | | Adding the config.yml on the package. | ||||
| * | | Removed the email part | Nicolas Lœuillet | 2016-10-24 | 1 | -1/+1 |
| | | | |||||
| * | | Add relevant links to fetch content error pages. | Baptiste Mille-Mathias | 2016-10-23 | 1 | -1/+2 |
| | | | | | | | | | | | | We link to the troubleshooting guide and give the mail link. | ||||
* | | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-10-24 | 1 | -1/+2 |
|\| | | |||||
| * | | If reload content failed, don’t update it | Jeremy Benoist | 2016-10-20 | 1 | -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 branch | Nicolas Lœuillet | 2016-10-17 | 1 | -1/+1 |
| | | |||||
| * | Prepare wallabag 2.1.2 :rocket: | Nicolas Lœuillet | 2016-10-17 | 1 | -1/+1 |
| | | |||||
* | | Fix emoji insertion in MySQL | Jeremy Benoist | 2016-10-22 | 1 | -1/+1 |
| | | | | | | | | | | Switch to utf8mb4 instead of utf8 because f*** MySQL See https://github.com/doctrine/dbal/pull/851 | ||||
* | | ApiDoc & Route annotation were conflicted | Jeremy Benoist | 2016-10-15 | 1 | -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-epub | Jeremy Benoist | 2016-10-12 | 1 | -0/+2 |
|\ \ | |/ |/| | API: ability to export entry in all available format (epub, pdf, etc...) | ||||
| * | Add entry export in API | Jeremy Benoist | 2016-10-08 | 1 | -0/+2 |
| | | | | | | | | | | Export isn't available for json & xml because user can use the default entry endpoint instead. | ||||
* | | Define a dev version for the master | Jeremy Benoist | 2016-10-10 | 1 | -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 config | Jeremy Benoist | 2016-10-08 | 1 | -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 socket | Jeremy Benoist | 2016-10-07 | 1 | -0/+1 |
| | | | | For Redis & MySQL | ||||
* | Prepare wallabag 2.1.1 | Nicolas Lœuillet | 2016-10-04 | 1 | -1/+1 |
| | |||||
* | Customize errors templates | Jeremy Benoist | 2016-10-01 | 1 | -0/+1 |
| | | | | All error goes to the same template which only display the error message and the status code. | ||||
* | Add controller test for Instapaper | Jeremy Benoist | 2016-09-27 | 1 | -0/+13 |
| | |||||
* | Add Instapaper import | Jeremy Benoist | 2016-09-27 | 1 | -1/+1 |
| | | | | Also update ImportController with latest import (chrome, firefox & instapaper). | ||||
* | cs & fixes | Thomas Citharel | 2016-09-25 | 1 | -0/+26 |
| | |||||
* | Fixed version in documentation | Nicolas Lœuillet | 2016-09-19 | 1 | -1/+1 |
| | |||||
* | Add documentation about article sharing | Nicolas Lœuillet | 2016-09-19 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into 2.1 | Jeremy Benoist | 2016-09-19 | 1 | -1/+1 |
|\ | |||||
| * | Prepare wallabag 2.0.8 | Nicolas Lœuillet | 2016-09-07 | 1 | -1/+1 |
| | |