aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config
Commit message (Collapse)AuthorAgeFilesLines
* Fix tests & deprecation noticeJeremy Benoist2016-12-151-4/+0
|
* Fixed logout shortcutNicolas Lœuillet2016-11-231-1/+1
|
* Re-use FOSUser master branchJeremy Benoist2016-11-221-2/+3
|
* Added authentication for restricted access articlesBertrand Dunogier2016-11-221-0/+3
| | | | Fix #438. Thank you so much @bdunogier
* Merge remote-tracking branch 'origin/master' into 2.2Jeremy Benoist2016-11-211-2/+4
|\
| * Merge pull request #2624 from Rurik19/masterJeremy Benoist2016-11-211-1/+3
| |\ | | | | | | Fix #2056 update config.yml
| | * wrong spacesYuriy Evdokimov2016-11-211-2/+2
| | |
| | * Fix #2056 update config.ymlYuriy Evdokimov2016-11-211-1/+3
| | | | | | | | | Resolves refresh token lifetime issue
| * | Prepare wallabag 2.1.5 :rocket:Nicolas Lœuillet2016-11-211-1/+1
| |/
* | Add ability to use Redis with passwordJeremy Benoist2016-11-201-0/+1
| |
* | Added shortcutNicolas Lœuillet2016-11-191-0/+1
| |
* | 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-152-0/+6
| |
* | 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-032-9/+4
|\|
| * Updated Capistrano configurationNicolas Lœuillet2016-10-291-8/+1
| |
| * 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.
* | | Move related event things in Event folderJeremy Benoist2016-10-301-2/+2
| | |
* | | 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
| |
* | SQLite should use utf8, not utf8mb4Jeremy Benoist2016-10-241-1/+1
| |
* | Add verification check for MySQL versionJeremy Benoist2016-10-222-3/+3
| | | | | | | | Must now be >= 5.5.4
* | Use statements & update translationJeremy Benoist2016-10-221-1/+1
| |
* | Cleanup subscriber / listener definitionJeremy Benoist2016-10-221-1/+1
| |
* | Fix emoji insertion in MySQLJeremy Benoist2016-10-227-8/+14
| | | | | | | | | | Switch to utf8mb4 instead of utf8 because f*** MySQL See https://github.com/doctrine/dbal/pull/851
* | ApiDoc & Route annotation were conflictedJeremy Benoist2016-10-152-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge pull request #2351 from wallabag/fix-api-client-deletionNicolas Lœuillet2016-10-081-0/+5
|\ \ | |/ |/| Changed relation between API client and refresh token
| * Ensure access_token are removedJeremy Benoist2016-10-081-0/+5
| | | | | | | | | | | | | | | | 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)
* | 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-072-0/+4
| | | | | | | | For Redis & MySQL
* | Prepare wallabag 2.1.1Nicolas Lœuillet2016-10-041-1/+1
| |
* | Update docJeremy Benoist2016-10-041-1/+1
|/ | | | Merge VALIDATE_TRANSLATION_FILE & ASSET build (less build on Travis)
* Add users management UIJeremy Benoist2016-10-022-0/+6
| | | | | | - remove the “add a user” from the config page - add a CRUD on user - fix some missing translations (+ bad indentation)
* Merge pull request #2323 from wallabag/footer-statsJeremy Benoist2016-10-021-0/+1
|\ | | | | Add simple stats in footer
| * Add simple stats in footerJeremy Benoist2016-10-011-0/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 01:47:40 +0000