From bc78968764c741019a6b866ad434678cdbecbba4 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 20 Jan 2016 19:54:57 +0100 Subject: Move default configuration out of parameters These default configuration value shouldn't be in parameters.yml. --- app/config/config.yml | 4 ++++ app/config/parameters.yml.dist | 7 ------- app/config/tests/parameters.yml.dist.mysql | 7 ------- app/config/tests/parameters.yml.dist.pgsql | 7 ------- app/config/tests/parameters.yml.dist.sqlite | 7 ------- 5 files changed, 4 insertions(+), 28 deletions(-) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index a6cfc67d..943365e8 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -33,6 +33,10 @@ wallabag_core: fr: 'Français' de: 'Deutsch' tr: 'Türkçe' + items_on_page: 12 + theme: material + language: en + rss_limit: 50 wallabag_import: allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain'] diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index e4fcbd74..f9555676 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -68,12 +68,5 @@ parameters: wallabag_url: http://v2.wallabag.org wallabag_support_url: 'https://www.wallabag.org/pages/support.html' - # default user config - items_on_page: 12 - theme: material - language: en - from_email: no-reply@wallabag.org - rss_limit: 50 - # pocket import pocket_consumer_key: xxxxxxxx diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql index f902f239..e0e92760 100644 --- a/app/config/tests/parameters.yml.dist.mysql +++ b/app/config/tests/parameters.yml.dist.mysql @@ -58,12 +58,5 @@ parameters: wallabag_url: http://v2.wallabag.org wallabag_support_url: 'https://www.wallabag.org/pages/support.html' - # default user config - items_on_page: 12 - theme: material - language: en_US - from_email: no-reply@wallabag.org - rss_limit: 50 - # pocket import pocket_consumer_key: xxxxxxxx diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql index 76685b14..e6e7636c 100644 --- a/app/config/tests/parameters.yml.dist.pgsql +++ b/app/config/tests/parameters.yml.dist.pgsql @@ -58,12 +58,5 @@ parameters: wallabag_url: http://v2.wallabag.org wallabag_support_url: 'https://www.wallabag.org/pages/support.html' - # default user config - items_on_page: 12 - theme: material - language: en_US - from_email: no-reply@wallabag.org - rss_limit: 50 - # pocket import pocket_consumer_key: xxxxxxxx diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite index cdafb1b1..c47392a3 100644 --- a/app/config/tests/parameters.yml.dist.sqlite +++ b/app/config/tests/parameters.yml.dist.sqlite @@ -58,12 +58,5 @@ parameters: wallabag_url: http://v2.wallabag.org wallabag_support_url: 'https://www.wallabag.org/pages/support.html' - # default user config - items_on_page: 12 - theme: material - language: en_US - from_email: no-reply@wallabag.org - rss_limit: 50 - # pocket import pocket_consumer_key: xxxxxxxx -- cgit v1.2.3 From 26975877d76a99f6a3153d3d3b4fc6c9f32687bc Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 20 Jan 2016 20:00:12 +0100 Subject: Always include warning message We'll remove it later, on the stable release --- app/config/config.yml | 1 - app/config/parameters.yml.dist | 4 ---- app/config/tests/parameters.yml.dist.mysql | 4 ---- app/config/tests/parameters.yml.dist.pgsql | 4 ---- app/config/tests/parameters.yml.dist.sqlite | 4 ---- 5 files changed, 17 deletions(-) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index 943365e8..58e1dd66 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -67,7 +67,6 @@ twig: export_xml: %export_xml% version: %app.version% twofactor_auth: %twofactor_auth% - warning_message: %warning_message% paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" form_themes: - "LexikFormFilterBundle:Form:form_div_layout.html.twig" diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index f9555676..52d26cb4 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -42,10 +42,6 @@ parameters: twofactor_auth: true twofactor_sender: no-reply@wallabag.org - # message to display at the bottom of the page - warning_message: > - You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to our issues list and open a new if necessary - download_pictures: false # if true, pictures will be stored into data/assets for each article # Entry view diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql index e0e92760..073f6c27 100644 --- a/app/config/tests/parameters.yml.dist.mysql +++ b/app/config/tests/parameters.yml.dist.mysql @@ -32,10 +32,6 @@ parameters: twofactor_auth: true twofactor_sender: no-reply@wallabag.org - # message to display at the bottom of the page - warning_message: > - You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to our issues list and open a new if necessary - download_pictures: false # if true, pictures will be stored into data/assets for each article # Entry view diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql index e6e7636c..24a1818a 100644 --- a/app/config/tests/parameters.yml.dist.pgsql +++ b/app/config/tests/parameters.yml.dist.pgsql @@ -32,10 +32,6 @@ parameters: twofactor_auth: true twofactor_sender: no-reply@wallabag.org - # message to display at the bottom of the page - warning_message: > - You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to our issues list and open a new if necessary - download_pictures: false # if true, pictures will be stored into data/assets for each article # Entry view diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite index c47392a3..c739f89b 100644 --- a/app/config/tests/parameters.yml.dist.sqlite +++ b/app/config/tests/parameters.yml.dist.sqlite @@ -32,10 +32,6 @@ parameters: twofactor_auth: true twofactor_sender: no-reply@wallabag.org - # message to display at the bottom of the page - warning_message: > - You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to our issues list and open a new if necessary - download_pictures: false # if true, pictures will be stored into data/assets for each article # Entry view -- cgit v1.2.3 From 63e40f2d7c4074aff0be587c828eb511a6b7c878 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 21 Jan 2016 08:53:09 +0100 Subject: Add CraueConfig for internal settings --- app/config/config.yml | 24 ++---------------------- app/config/parameters.yml.dist | 28 +--------------------------- app/config/routing.yml | 9 ++++++++- app/config/security.yml | 1 + app/config/tests/parameters.yml.dist.mysql | 28 +--------------------------- app/config/tests/parameters.yml.dist.pgsql | 28 +--------------------------- app/config/tests/parameters.yml.dist.sqlite | 28 +--------------------------- 7 files changed, 15 insertions(+), 131 deletions(-) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index 58e1dd66..3c278ea6 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -28,6 +28,8 @@ framework: assets: ~ wallabag_core: + version: 2.0.0-alpha.1 + paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" languages: en: 'English' fr: 'Français' @@ -46,28 +48,6 @@ wallabag_import: twig: debug: "%kernel.debug%" strict_variables: "%kernel.debug%" - globals: - share_twitter: %share_twitter% - share_mail: %share_mail% - share_shaarli: %share_shaarli% - shaarli_url: %shaarli_url% - share_diaspora: %share_diaspora% - diaspora_url: %diaspora_url% - flattr: %flattr% - flattrable: 1 - flattred: 2 - carrot: %carrot% - show_printlink: %show_printlink% - export_epub: %export_epub% - export_mobi: %export_mobi% - export_pdf: %export_pdf% - export_csv: %export_csv% - export_json: %export_json% - export_txt: %export_txt% - export_xml: %export_xml% - version: %app.version% - twofactor_auth: %twofactor_auth% - paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" form_themes: - "LexikFormFilterBundle:Form:form_div_layout.html.twig" diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 52d26cb4..3eeedb78 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -37,32 +37,6 @@ parameters: # A secret key that's used to generate certain security-related tokens secret: ThisTokenIsNotSoSecretChangeIt - # wallabag misc - app.version: 2.0.0-alpha + # two factor stuff twofactor_auth: true twofactor_sender: no-reply@wallabag.org - - download_pictures: false # if true, pictures will be stored into data/assets for each article - - # Entry view - share_twitter: true - share_mail: true - share_shaarli: true - shaarli_url: http://myshaarli.com - share_diaspora: true - diaspora_url: http://diasporapod.com - flattr: true - carrot: true - show_printlink: true - export_epub: true - export_mobi: true - export_pdf: true - export_csv: true - export_json: true - export_txt: true - export_xml: true - wallabag_url: http://v2.wallabag.org - wallabag_support_url: 'https://www.wallabag.org/pages/support.html' - - # pocket import - pocket_consumer_key: xxxxxxxx diff --git a/app/config/routing.yml b/app/config/routing.yml index 84b98d23..c491d35d 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -22,7 +22,9 @@ rest : homepage: path: "/{page}" - defaults: { _controller: WallabagCoreBundle:Entry:showUnread, page : 1 } + defaults: + _controller: WallabagCoreBundle:Entry:showUnread + page : 1 requirements: page: \d+ @@ -31,3 +33,8 @@ fos_user: fos_oauth_server_token: resource: "@FOSOAuthServerBundle/Resources/config/routing/token.xml" + +craue_config_settings_modify: + path: /settings + defaults: + _controller: CraueConfigBundle:Settings:modify diff --git a/app/config/security.yml b/app/config/security.yml index a99a7d80..6f20490b 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -58,3 +58,4 @@ security: - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY } - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/, roles: ROLE_USER } + - { path: ^/settings, roles: ROLE_SUPER_ADMIN } diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql index 073f6c27..3244fd3a 100644 --- a/app/config/tests/parameters.yml.dist.mysql +++ b/app/config/tests/parameters.yml.dist.mysql @@ -27,32 +27,6 @@ parameters: # A secret key that's used to generate certain security-related tokens secret: ThisTokenIsNotSoSecretChangeIt - # wallabag misc - app.version: 2.0.0-alpha + # two factor stuff twofactor_auth: true twofactor_sender: no-reply@wallabag.org - - download_pictures: false # if true, pictures will be stored into data/assets for each article - - # Entry view - share_twitter: true - share_mail: true - share_shaarli: true - shaarli_url: http://myshaarli.com - share_diaspora: true - diaspora_url: http://diasporapod.com - flattr: true - carrot: true - show_printlink: true - export_epub: true - export_mobi: true - export_pdf: true - export_csv: true - export_json: true - export_txt: true - export_xml: true - wallabag_url: http://v2.wallabag.org - wallabag_support_url: 'https://www.wallabag.org/pages/support.html' - - # pocket import - pocket_consumer_key: xxxxxxxx diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql index 24a1818a..cee34473 100644 --- a/app/config/tests/parameters.yml.dist.pgsql +++ b/app/config/tests/parameters.yml.dist.pgsql @@ -27,32 +27,6 @@ parameters: # A secret key that's used to generate certain security-related tokens secret: ThisTokenIsNotSoSecretChangeIt - # wallabag misc - app.version: 2.0.0-alpha + # two factor stuff twofactor_auth: true twofactor_sender: no-reply@wallabag.org - - download_pictures: false # if true, pictures will be stored into data/assets for each article - - # Entry view - share_twitter: true - share_mail: true - share_shaarli: true - shaarli_url: http://myshaarli.com - share_diaspora: true - diaspora_url: http://diasporapod.com - flattr: true - carrot: true - show_printlink: true - export_epub: true - export_mobi: true - export_pdf: true - export_csv: true - export_json: true - export_txt: true - export_xml: true - wallabag_url: http://v2.wallabag.org - wallabag_support_url: 'https://www.wallabag.org/pages/support.html' - - # pocket import - pocket_consumer_key: xxxxxxxx diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite index c739f89b..a1535bc9 100644 --- a/app/config/tests/parameters.yml.dist.sqlite +++ b/app/config/tests/parameters.yml.dist.sqlite @@ -27,32 +27,6 @@ parameters: # A secret key that's used to generate certain security-related tokens secret: ThisTokenIsNotSoSecretChangeIt - # wallabag misc - app.version: 2.0.0-alpha + # two factor stuff twofactor_auth: true twofactor_sender: no-reply@wallabag.org - - download_pictures: false # if true, pictures will be stored into data/assets for each article - - # Entry view - share_twitter: true - share_mail: true - share_shaarli: true - shaarli_url: http://myshaarli.com - share_diaspora: true - diaspora_url: http://diasporapod.com - flattr: true - carrot: true - show_printlink: true - export_epub: true - export_mobi: true - export_pdf: true - export_csv: true - export_json: true - export_txt: true - export_xml: true - wallabag_url: http://v2.wallabag.org - wallabag_support_url: 'https://www.wallabag.org/pages/support.html' - - # pocket import - pocket_consumer_key: xxxxxxxx -- cgit v1.2.3 From 07c9b1c98a104a88f6bd0c97b54a8783444a2ac4 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 22 Jan 2016 18:48:04 +0100 Subject: Fix permission to settings page --- app/config/security.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/config') diff --git a/app/config/security.yml b/app/config/security.yml index 6f20490b..7c10889f 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -57,5 +57,5 @@ security: - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY } - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY } - - { path: ^/, roles: ROLE_USER } - { path: ^/settings, roles: ROLE_SUPER_ADMIN } + - { path: ^/, roles: ROLE_USER } -- cgit v1.2.3 From a74a6ca2b164447f2675a13840f862c2c4c672fd Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 31 Jan 2016 14:54:30 +0100 Subject: Add new export config --- app/config/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index 3c278ea6..dc6bccee 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -28,7 +28,7 @@ framework: assets: ~ wallabag_core: - version: 2.0.0-alpha.1 + version: 2.0.0-alpha.2 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" languages: en: 'English' -- cgit v1.2.3 From 48e3007b7f5b542ebd8dda07a7a206f3bce69d7a Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 31 Jan 2016 15:12:18 +0100 Subject: Fix from_email & fos_user --- app/config/parameters.yml.dist | 2 ++ app/config/tests/parameters.yml.dist.mysql | 2 ++ app/config/tests/parameters.yml.dist.pgsql | 2 ++ app/config/tests/parameters.yml.dist.sqlite | 2 ++ 4 files changed, 8 insertions(+) (limited to 'app/config') diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 3eeedb78..57cae9a0 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -40,3 +40,5 @@ parameters: # two factor stuff twofactor_auth: true twofactor_sender: no-reply@wallabag.org + + from_email: no-reply@wallabag.org diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql index 3244fd3a..2823a424 100644 --- a/app/config/tests/parameters.yml.dist.mysql +++ b/app/config/tests/parameters.yml.dist.mysql @@ -30,3 +30,5 @@ parameters: # two factor stuff twofactor_auth: true twofactor_sender: no-reply@wallabag.org + + from_email: no-reply@wallabag.org diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql index cee34473..5b55cb64 100644 --- a/app/config/tests/parameters.yml.dist.pgsql +++ b/app/config/tests/parameters.yml.dist.pgsql @@ -30,3 +30,5 @@ parameters: # two factor stuff twofactor_auth: true twofactor_sender: no-reply@wallabag.org + + from_email: no-reply@wallabag.org diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite index a1535bc9..01589d28 100644 --- a/app/config/tests/parameters.yml.dist.sqlite +++ b/app/config/tests/parameters.yml.dist.sqlite @@ -30,3 +30,5 @@ parameters: # two factor stuff twofactor_auth: true twofactor_sender: no-reply@wallabag.org + + from_email: no-reply@wallabag.org -- cgit v1.2.3