Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-05-19 | 1 | -1/+1 | |
|\| | ||||||
| * | Prepare wallabag 2.2.3 | Nicolas Lœuillet | 2017-05-17 | 1 | -1/+1 | |
| | | ||||||
* | | Upgraded CraueConfigBundle to 2.0 | Nicolas Lœuillet | 2017-05-12 | 2 | -0/+9 | |
| | | ||||||
* | | Merge pull request #3022 from wallabag/webpack | Thomas Citharel | 2017-05-09 | 5 | -3/+208 | |
|\ \ | | | | | | | Adds Webpack support and remove Grunt | |||||
| * | | add comment to config.yml to explain live reload feature | Thomas Citharel | 2017-05-04 | 1 | -0/+1 | |
| | | | ||||||
| * | | disable default dev server | Thomas Citharel | 2017-05-04 | 1 | -1/+1 | |
| | | | ||||||
| * | | Adds Webpack support and removes the use for Grunt | Thomas Citharel | 2017-05-04 | 5 | -3/+207 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> use scss Signed-off-by: Thomas Citharel <tcit@tcit.fr> fix build, add babel, fix annotations fixes (and improvements !) for baggy add live reload & environments & eslint & theme fixes | |||||
* | | | Added limit | Nicolas Lœuillet | 2017-05-01 | 1 | -0/+1 | |
|/ / | ||||||
* / | Changed default value for list mode (grid instead of list) | Nicolas Lœuillet | 2017-03-29 | 1 | -1/+1 | |
|/ | ||||||
* | Changed wallabag version | Nicolas Lœuillet | 2017-03-02 | 1 | -1/+1 | |
| | ||||||
* | Update RulerZ | Kévin Gomez | 2017-02-05 | 1 | -1/+1 | |
| | ||||||
* | Prepare wallabag 2.2.1 :rocket: | Nicolas Lœuillet | 2017-01-31 | 1 | -1/+1 | |
| | ||||||
* | 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 | 2 | -8/+9 | |
| | | ||||||
* | | Added QoS for RabbitMQ | Nicolas Lœuillet | 2016-12-15 | 1 | -0/+8 | |
| | | ||||||
* | | Merge pull request #2667 from wallabag/upgrade-symfony-32 | Nicolas Lœuillet | 2016-12-15 | 1 | -4/+0 | |
|\ \ | | | | | | | Upgrade to Symfony 3.2 | |||||
| * | | Fix tests & deprecation notice | Jeremy Benoist | 2016-12-15 | 1 | -4/+0 | |
| | | | ||||||
* | | | 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 | |
| | | ||||||
* | | Added authentication for restricted access articles | Bertrand Dunogier | 2016-11-22 | 1 | -0/+3 | |
| | | | | | | | | Fix #438. Thank you so much @bdunogier | |||||
* | | 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 | |
| |/ | ||||||
* | | Add ability to use Redis with password | Jeremy Benoist | 2016-11-20 | 1 | -0/+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 | 2 | -0/+6 | |
| | | ||||||
* | | 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 | 2 | -9/+4 | |
|\| | ||||||
| * | Updated Capistrano configuration | Nicolas Lœuillet | 2016-10-29 | 1 | -8/+1 | |
| | | ||||||
| * | 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. | |||||
* | | | Move related event things in Event folder | Jeremy Benoist | 2016-10-30 | 1 | -2/+2 | |
| | | | ||||||
* | | | 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. |