Commit graph

28 commits

Author SHA1 Message Date
Jeremy Benoist 3ef75cc4e3
Be consistent between migration & schema definition 2016-12-19 14:24:19 +01:00
Nicolas Lœuillet 9aa991281d
Renamed view_mode by list_mode and hide excerpt 2016-11-28 16:10:21 +01:00
Nicolas Lœuillet 9f01d0fde0 Added list view 2016-11-28 14:27:58 +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 540a9bc4a2 Added help on config screen 2016-11-17 09:22:39 +01:00
Nicolas Lœuillet f052f1fd57
Added constants for redirection values 2016-11-16 23:07:34 +01:00
Nicolas Lœuillet a42f38d9fb
Added a configuration to define the redirection after archiving an entry
Fix #496
2016-11-16 23:07:34 +01:00
Jeremy Benoist ebe0787e09
Moved Pocket token to user config 2016-09-16 22:22:25 +02:00
Jeremy Benoist 0d42217e4e Convert english translation file
- convert english translation to translate key
- remove baggy template for login (never used since user isn't logged in and it'll use the default theme: material)
- fix tests about text in response (now checking translation key instead of translated text)
- remove all ugly `<div class="hidden">{{ form_rest(form) }}</div>`
2016-03-20 21:12:22 +01:00
Nicolas Lœuillet 1b64a84b78 Improved tests 2016-03-18 14:01:50 +01:00
Nicolas Lœuillet bca5485946 Added setting to have a personal reading time 2016-03-14 13:01:31 +01:00
Jeremy Benoist 8eedc8cfac Few phpDoc fix
And some little mistakes
2016-01-03 11:15:44 +01:00
Kévin Gomez 752b90d1f2 Fix tagging rules ordering 2015-11-29 16:19:02 +01:00
Kévin Gomez 1d7b350b25 Add missing use statement 2015-11-11 16:23:49 +01:00
Kévin Gomez ac9fec610a Add TaggingRule entity 2015-11-11 16:23:49 +01:00
Jeremy Benoist bd0f3d32c9 Quoted entity to avoid reserved keyword
Should fix #1498
2015-11-07 14:15:33 +01:00
Nicolas Lœuillet 1ce8f30342 fix type hint for User 2015-10-06 12:16:08 +02:00
Nicolas Lœuillet 0a878469d4 move some files to UserBundle 2015-10-03 13:31:48 +02:00
Nicolas Lœuillet 1210dae105 remove old implementation for login/register/recover 2015-10-03 13:31:48 +02:00
Jeremy Benoist 4346a86068 CS 2015-05-30 13:59:33 +02:00
Jeremy 164bd80118 Ability to prefix tables
Will fix #799
2015-04-01 21:32:02 +02:00
Jeremy 371ac69a6b Add tests
and fix few mistakes
2015-03-31 22:48:00 +02:00
Jeremy 0c83fd5994 Add rss for entries
will fix #1000
2015-03-31 22:47:43 +02:00
Jeremy 32da2a70ef Add LiipThemeBundle
Re-defined the config / user relation to be OneToOne bidirectionnal.
ConfigType is now a service so I can inject the list of available themes that are also used by LiipThemeBundle

Force sqlite for test
In case of people use a different driver in parameter.yml (yes I do :))
2015-03-01 10:49:16 +01:00
Jeremy 4d85d7e9ba Implement simple config 2015-02-16 21:31:58 +01:00
Jeremy 55f58c9c5e Update UserConfig schema 2015-02-16 21:31:58 +01:00
Jeremy 7df80cb32c CS 2015-01-31 19:12:49 +01:00
Nicolas Lœuillet ad4d1caa9e move WallabagBundle into Wallabag:CoreBundle 2015-01-23 16:28:37 +01:00
Renamed from src/WallabagBundle/Entity/Config.php (Browse further)