From 1680c95c2761e9b387e2bdc4074748e3c495ef43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 29 Mar 2017 14:43:47 +0200 Subject: Changed default value for list mode (grid instead of list) --- 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 d7231112..4f4fb900 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -52,7 +52,7 @@ wallabag_core: reading_speed: 1 cache_lifetime: 10 action_mark_as_read: 1 - list_mode: 1 + list_mode: 0 fetching_error_message: | wallabag can't retrieve contents for this article. Please troubleshoot this issue. -- cgit v1.2.3 From efd351c98fa0caa4c8df9c7ff6965c537524f12a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 1 May 2017 09:21:59 +0200 Subject: Added limit --- app/config/config.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index 4f4fb900..451809d6 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -55,6 +55,7 @@ wallabag_core: list_mode: 0 fetching_error_message: | wallabag can't retrieve contents for this article. Please troubleshoot this issue. + api_limit_mass_actions: 10 wallabag_user: registration_enabled: "%fosuser_registration%" -- cgit v1.2.3 From 64f81bc31699ed239e4becec1cfa7ebc0bef2b5a Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 31 Mar 2017 20:21:41 +0200 Subject: Adds Webpack support and removes the use for Grunt Signed-off-by: Thomas Citharel use scss Signed-off-by: Thomas Citharel fix build, add babel, fix annotations fixes (and improvements !) for baggy add live reload & environments & eslint & theme fixes --- app/config/config.yml | 3 ++ app/config/config_prod.yml | 6 +-- app/config/webpack/common.js | 40 ++++++++++++++++++ app/config/webpack/dev.js | 62 +++++++++++++++++++++++++++ app/config/webpack/prod.js | 99 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 207 insertions(+), 3 deletions(-) create mode 100644 app/config/webpack/common.js create mode 100644 app/config/webpack/dev.js create mode 100644 app/config/webpack/prod.js (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index 4f4fb900..e0d6b860 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -3,6 +3,9 @@ imports: - { resource: security.yml } - { resource: services.yml } +parameters: + use_webpack_dev_server: true + framework: #esi: ~ translator: diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml index 5a4dd69e..65b02d66 100644 --- a/app/config/config_prod.yml +++ b/app/config/config_prod.yml @@ -1,9 +1,9 @@ imports: - { resource: config.yml } -#framework: -# cache: -# system: cache.adapter.apcu +framework: + assets: + # json_manifest_path: '%kernel.root_dir%/../web/bundles/wallabagcore/manifest.json' #doctrine: # orm: diff --git a/app/config/webpack/common.js b/app/config/webpack/common.js new file mode 100644 index 00000000..4f5739f0 --- /dev/null +++ b/app/config/webpack/common.js @@ -0,0 +1,40 @@ +const path = require('path'); +const webpack = require('webpack'); +const StyleLintPlugin = require('stylelint-webpack-plugin'); + +const rootDir = path.resolve(__dirname, '../../../'); + +module.exports = function() { + return { + entry: { + material: path.join(rootDir, './app/Resources/static/themes/material/index.js'), + baggy: path.join(rootDir, './app/Resources/static/themes/baggy/index.js'), + }, + + output: { + filename: '[name].js', + path: path.resolve(rootDir, 'web/bundles/wallabagcore'), + publicPath: '/bundles/wallabagcore/', + }, + plugins: [ + new webpack.ProvidePlugin({ + $: 'jquery', + jQuery: 'jquery', + 'window.$': 'jquery', + 'window.jQuery': 'jquery' + }), + new StyleLintPlugin({ + configFile: '.stylelintrc', + failOnError: false, + quiet: false, + context: 'app/Resources/static/themes', + files: '**/*.scss', + }), + ], + resolve: { + alias: { + jquery: path.join(rootDir, 'node_modules/jquery/dist/jquery.js') + } + }, + }; +}; diff --git a/app/config/webpack/dev.js b/app/config/webpack/dev.js new file mode 100644 index 00000000..771df65b --- /dev/null +++ b/app/config/webpack/dev.js @@ -0,0 +1,62 @@ +const webpackMerge = require('webpack-merge'); +const webpack = require('webpack'); +const path = require('path'); +const commonConfig = require('./common.js'); + +module.exports = function () { + return webpackMerge(commonConfig(), { + devtool: 'eval-source-map', + output: { + filename: '[name].dev.js' + }, + + devServer: { + hot: true, + // enable HMR on the server + + contentBase: './web', + // match the output path + }, + plugins: [ + new webpack.HotModuleReplacementPlugin(), + ], + module: { + rules: [ + { + enforce: 'pre', + test: /\.js$/, + loader: 'eslint-loader', + exclude: /node_modules/, + }, + { + test: /\.js$/, + exclude: /(node_modules)/, + use: { + loader: 'babel-loader', + options: { + presets: ['env'] + } + } + }, + { + test: /\.(s)?css$/, + use: [ + 'style-loader', + { + loader: 'css-loader', + options: { + importLoaders: 1, + } + }, + 'postcss-loader', + 'sass-loader' + ] + }, + { + test: /\.(jpg|png|gif|svg|eot|ttf|woff|woff2)$/, + use: 'url-loader' + }, + ] + }, + }) +}; diff --git a/app/config/webpack/prod.js b/app/config/webpack/prod.js new file mode 100644 index 00000000..ef41ab99 --- /dev/null +++ b/app/config/webpack/prod.js @@ -0,0 +1,99 @@ +const webpack = require('webpack'); +const webpackMerge = require('webpack-merge'); +const ExtractTextPlugin = require('extract-text-webpack-plugin'); +const ManifestPlugin = require('webpack-manifest-plugin'); + +const commonConfig = require('./common.js'); + +module.exports = function() { + return webpackMerge(commonConfig(), { + output: { + filename: '[name].js' + }, + devtool: 'source-map', + plugins: [ + new webpack.DefinePlugin({ + 'process.env': { + 'NODE_ENV': JSON.stringify('production') + } + }), + new webpack.optimize.UglifyJsPlugin({ + beautify: false, + mangle: { + screw_ie8: true, + keep_fnames: true + }, + compress: { + screw_ie8: true, + warnings: false + }, + comments: false + }), + new ExtractTextPlugin('[name].css'), + new ManifestPlugin({ + fileName: 'manifest.json', + }) + ], + module: { + rules: [ + { + enforce: 'pre', + test: /\.js$/, + loader: 'eslint-loader', + exclude: /node_modules/, + }, + { + test: /\.js$/, + exclude: /(node_modules)/, + use: { + loader: 'babel-loader', + options: { + presets: ['env'] + } + } + }, + { + test: /\.(s)?css$/, + use: ExtractTextPlugin.extract({ + fallback: 'style-loader', + use: [ + { + loader: 'css-loader', + options: { + importLoaders: 1, + minimize: { + discardComments: { + removeAll: true + }, + core: true, + minifyFontValues: true + } + } + }, + 'postcss-loader', + 'sass-loader' + ] + }) + }, + { + test: /\.(jpg|png|gif|svg)$/, + use: { + loader: 'file-loader', + options: { + name: 'img/[name].[ext]', + } + } + }, + { + test: /\.(eot|ttf|woff|woff2)$/, + use: { + loader: 'file-loader', + options: { + name: 'fonts/[name].[ext]', + } + } + } + ] + }, + }) +}; -- cgit v1.2.3 From 8655913ebf99a9d65be16ede71b52ee3d3474c5e Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 27 Apr 2017 13:28:57 +0200 Subject: disable default dev server --- 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 e0d6b860..ee8186a6 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -4,7 +4,7 @@ imports: - { resource: services.yml } parameters: - use_webpack_dev_server: true + use_webpack_dev_server: false framework: #esi: ~ -- cgit v1.2.3 From e35f8439a7e26d6e3e66f18ba6635968831c0ac7 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 29 Apr 2017 19:44:27 +0200 Subject: add comment to config.yml to explain live reload feature --- app/config/config.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index ee8186a6..c076aea9 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -4,6 +4,7 @@ imports: - { resource: services.yml } parameters: + # Allows to use the live reload feature for changes in assets use_webpack_dev_server: false framework: -- cgit v1.2.3 From 3b792787d741932acc4d1e35124d38886bad11d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 12 May 2017 16:33:12 +0200 Subject: Upgraded CraueConfigBundle to 2.0 --- app/config/config.yml | 1 + app/config/services.yml | 8 ++++++++ 2 files changed, 9 insertions(+) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index 116bb04c..28abe734 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -6,6 +6,7 @@ imports: parameters: # Allows to use the live reload feature for changes in assets use_webpack_dev_server: false + craue_config.cache_adapter.class: Craue\ConfigBundle\CacheAdapter\SymfonyCacheComponentAdapter framework: #esi: ~ diff --git a/app/config/services.yml b/app/config/services.yml index 9a1ce80b..7b85d846 100644 --- a/app/config/services.yml +++ b/app/config/services.yml @@ -42,3 +42,11 @@ services: arguments: ["@session"] tags: - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin } + + craue_config_cache_provider: + class: Symfony\Component\Cache\Adapter\FilesystemAdapter + public: false + arguments: + - 'craue_config' + - 0 + - '%kernel.cache_dir%' -- cgit v1.2.3 From 7ab5eb9508921d84b4b4ec84a59135d536da748e Mon Sep 17 00:00:00 2001 From: adev Date: Mon, 15 May 2017 20:47:59 +0200 Subject: Isolated tests Use https://github.com/dmaicher/doctrine-test-bundle to have test isolation. --- app/config/config_test.yml | 3 ++- app/config/parameters_test.yml | 3 ++- app/config/tests/parameters_test.mysql.yml | 1 + app/config/tests/parameters_test.pgsql.yml | 1 + app/config/tests/parameters_test.sqlite.yml | 5 ++++- 5 files changed, 10 insertions(+), 3 deletions(-) (limited to 'app/config') diff --git a/app/config/config_test.yml b/app/config/config_test.yml index f5e2c25e..c620c359 100644 --- a/app/config/config_test.yml +++ b/app/config/config_test.yml @@ -29,7 +29,8 @@ doctrine: user: "%test_database_user%" password: "%test_database_password%" charset: "%test_database_charset%" - path: "%test_database_path%" + path: "%env(TEST_DATABASE_PATH)%" + orm: metadata_cache_driver: type: service diff --git a/app/config/parameters_test.yml b/app/config/parameters_test.yml index 5f2e25bb..010785e6 100644 --- a/app/config/parameters_test.yml +++ b/app/config/parameters_test.yml @@ -5,5 +5,6 @@ parameters: test_database_name: null test_database_user: null test_database_password: null - test_database_path: '%kernel.root_dir%/../data/db/wallabag_test.sqlite' + test_database_path: "%env(TEST_DATABASE_PATH)%" + env(TEST_DATABASE_PATH): "%kernel.root_dir%/../data/db/wallabag_test.sqlite" test_database_charset: utf8 diff --git a/app/config/tests/parameters_test.mysql.yml b/app/config/tests/parameters_test.mysql.yml index bca2d466..36b227fb 100644 --- a/app/config/tests/parameters_test.mysql.yml +++ b/app/config/tests/parameters_test.mysql.yml @@ -6,4 +6,5 @@ parameters: test_database_user: root test_database_password: ~ test_database_path: ~ + env(TEST_DATABASE_PATH): ~ test_database_charset: utf8mb4 diff --git a/app/config/tests/parameters_test.pgsql.yml b/app/config/tests/parameters_test.pgsql.yml index 3e18d4a0..60f51df6 100644 --- a/app/config/tests/parameters_test.pgsql.yml +++ b/app/config/tests/parameters_test.pgsql.yml @@ -6,4 +6,5 @@ parameters: test_database_user: travis test_database_password: ~ test_database_path: ~ + env(TEST_DATABASE_PATH): ~ test_database_charset: utf8 diff --git a/app/config/tests/parameters_test.sqlite.yml b/app/config/tests/parameters_test.sqlite.yml index b8a5f41a..5c731bf5 100644 --- a/app/config/tests/parameters_test.sqlite.yml +++ b/app/config/tests/parameters_test.sqlite.yml @@ -5,5 +5,8 @@ parameters: test_database_name: ~ test_database_user: ~ test_database_password: ~ - test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite" + # Using an environnement variable in order to avoid the error "attempt to write a readonly database" + # when the schema is dropped then recreate + test_database_path: "%env(TEST_DATABASE_PATH)%" + env(TEST_DATABASE_PATH): "%kernel.root_dir%/../data/db/wallabag_test.sqlite" test_database_charset: utf8 -- cgit v1.2.3 From 7d5e84fec18b4edb2d8ce293c2b7c9e1e28afb78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 31 May 2017 22:36:21 +0200 Subject: Defined MySQL as the default rdbms for wallabag --- app/config/parameters.yml.dist | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'app/config') diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 97f51ed1..c867aa6d 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -10,17 +10,18 @@ parameters: # database_user: %env.database_user% # database_password: %env.database_password% - database_driver: pdo_sqlite + database_driver: pdo_mysql database_host: 127.0.0.1 database_port: ~ database_name: symfony database_user: root database_password: ~ - database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite" + # For SQLite, database_path should be "%kernel.root_dir%/../data/db/wallabag.sqlite" + database_path: null database_table_prefix: wallabag_ database_socket: null - # with MySQL, use "utf8mb4" if you got problem with content with emojis - database_charset: utf8 + # with PostgreSQL and SQLite, you can set "utf8" + database_charset: utf8mb4 mailer_transport: smtp mailer_host: 127.0.0.1 -- cgit v1.2.3 From 46825cfffbe8cd2e1713fce7f1c655c483c31fb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 31 May 2017 22:50:18 +0200 Subject: Fixed @tcitworld 's review --- app/config/parameters.yml.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/config') diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index c867aa6d..dfb33489 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -20,7 +20,7 @@ parameters: database_path: null database_table_prefix: wallabag_ database_socket: null - # with PostgreSQL and SQLite, you can set "utf8" + # with PostgreSQL and SQLite, you must set "utf8" database_charset: utf8mb4 mailer_transport: smtp -- cgit v1.2.3 From ec42e697ea40e2fa9dbefba8b74ff820199c1118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 1 Jun 2017 09:17:05 +0200 Subject: Changed default database name --- app/config/parameters.yml.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/config') diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index dfb33489..afcee039 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -13,7 +13,7 @@ parameters: database_driver: pdo_mysql database_host: 127.0.0.1 database_port: ~ - database_name: symfony + database_name: wallabag database_user: root database_password: ~ # For SQLite, database_path should be "%kernel.root_dir%/../data/db/wallabag.sqlite" -- cgit v1.2.3 From 1c5da417e4ddb14223f9af6e5cea6778e5c0fd08 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Tue, 6 Dec 2016 22:27:08 -0500 Subject: Put default fetching error title in global config --- app/config/config.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index 9792616e..04f8547d 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -58,6 +58,7 @@ wallabag_core: cache_lifetime: 10 action_mark_as_read: 1 list_mode: 0 + fetching_error_message_title: 'No title found' fetching_error_message: | wallabag can't retrieve contents for this article. Please troubleshoot this issue. api_limit_mass_actions: 10 -- cgit v1.2.3 From 426bb453d295900fb3e35dce2f9081a42639cf27 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 2 Jun 2017 10:19:33 +0200 Subject: API user creation behing a toggle I've added a toggle feature (in internal settings) so that user api creation can be disabled while form registration still can be enabled. Also, the /api/user endpoint shouldn't require authentication. Even if we check the authentication when sending a GET request, to retrieve current user information. I've moved all the internal settings definition to config to avoid duplicated place to define them. I don't know why we didn't did that earlier. --- app/config/config.yml | 129 ++++++++++++++++++++++++++++++++++++++++++++++++ app/config/security.yml | 1 + 2 files changed, 130 insertions(+) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index 04f8547d..b0d330ab 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -62,6 +62,135 @@ wallabag_core: fetching_error_message: | wallabag can't retrieve contents for this article. Please troubleshoot this issue. api_limit_mass_actions: 10 + default_internal_settings: + - + name: share_public + value: 1 + section: entry + - + name: carrot + value: 1 + section: entry + - + name: share_diaspora + value: 1 + section: entry + - + name: diaspora_url + value: http://diasporapod.com + section: entry + - + name: share_unmark + value: 1 + section: entry + - + name: unmark_url + value: https://unmark.it + section: entry + - + name: share_shaarli + value: 1 + section: entry + - + name: share_scuttle + value: 1 + section: entry + - + name: shaarli_url + value: http://myshaarli.com + section: entry + - + name: scuttle_url + value: http://scuttle.org + section: entry + - + name: share_mail + value: 1 + section: entry + - + name: share_twitter + value: 1 + section: entry + - + name: show_printlink + value: 1 + section: entry + - + name: restricted_access + value: 0 + section: entry + - + name: export_epub + value: 1 + section: export + - + name: export_mobi + value: 1 + section: export + - + name: export_pdf + value: 1 + section: export + - + name: export_csv + value: 1 + section: export + - + name: export_json + value: 1 + section: export + - + name: export_txt + value: 1 + section: export + - + name: export_xml + value: 1 + section: export + - + name: import_with_redis + value: 0 + section: import + - + name: import_with_rabbitmq + value: 0 + section: import + - + name: piwik_enabled + value: 0 + section: analytics + - + name: piwik_host + value: v2.wallabag.org + section: analytics + - + name: piwik_site_id + value: 1 + section: analytics + - + name: demo_mode_enabled + value: 0 + section: misc + - + name: demo_mode_username + value: wallabag + section: misc + - + name: download_images_enabled + value: 0 + section: misc + - + name: wallabag_support_url + value: https://www.wallabag.org/pages/support.html + section: misc + - + name: wallabag_url + value: http://v2.wallabag.org + section: misc + - + name: api_user_registration + value: 0 + section: api wallabag_user: registration_enabled: "%fosuser_registration%" diff --git a/app/config/security.yml b/app/config/security.yml index efb00a53..ffb1d356 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -56,6 +56,7 @@ security: access_control: - { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/api/version, roles: IS_AUTHENTICATED_ANONYMOUSLY } + - { path: ^/api/user, roles: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY } -- cgit v1.2.3 From bf7f0cb5a310f661d969199d7f01b738f5804f3b Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 2 Jun 2017 10:46:04 +0200 Subject: Use a dedicated file for wallabag config --- app/config/config.yml | 166 +----------------------------------------------- app/config/wallabag.yml | 164 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 165 insertions(+), 165 deletions(-) create mode 100644 app/config/wallabag.yml (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index b0d330ab..2bc5e3b3 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -2,6 +2,7 @@ imports: - { resource: parameters.yml } - { resource: security.yml } - { resource: services.yml } + - { resource: wallabag.yml } parameters: # Allows to use the live reload feature for changes in assets @@ -34,171 +35,6 @@ framework: http_method_override: true assets: ~ -wallabag_core: - version: 2.2.3 - paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" - languages: - en: 'English' - fr: 'Français' - de: 'Deutsch' - tr: 'Türkçe' - fa: 'فارسی' - ro: 'Română' - pl: 'Polish' - da: 'Dansk' - es: 'Español' - oc: 'Occitan' - it: 'Italiano' - pt: 'Português' - items_on_page: 12 - theme: material - language: '%locale%' - rss_limit: 50 - reading_speed: 1 - cache_lifetime: 10 - action_mark_as_read: 1 - list_mode: 0 - fetching_error_message_title: 'No title found' - fetching_error_message: | - wallabag can't retrieve contents for this article. Please troubleshoot this issue. - api_limit_mass_actions: 10 - default_internal_settings: - - - name: share_public - value: 1 - section: entry - - - name: carrot - value: 1 - section: entry - - - name: share_diaspora - value: 1 - section: entry - - - name: diaspora_url - value: http://diasporapod.com - section: entry - - - name: share_unmark - value: 1 - section: entry - - - name: unmark_url - value: https://unmark.it - section: entry - - - name: share_shaarli - value: 1 - section: entry - - - name: share_scuttle - value: 1 - section: entry - - - name: shaarli_url - value: http://myshaarli.com - section: entry - - - name: scuttle_url - value: http://scuttle.org - section: entry - - - name: share_mail - value: 1 - section: entry - - - name: share_twitter - value: 1 - section: entry - - - name: show_printlink - value: 1 - section: entry - - - name: restricted_access - value: 0 - section: entry - - - name: export_epub - value: 1 - section: export - - - name: export_mobi - value: 1 - section: export - - - name: export_pdf - value: 1 - section: export - - - name: export_csv - value: 1 - section: export - - - name: export_json - value: 1 - section: export - - - name: export_txt - value: 1 - section: export - - - name: export_xml - value: 1 - section: export - - - name: import_with_redis - value: 0 - section: import - - - name: import_with_rabbitmq - value: 0 - section: import - - - name: piwik_enabled - value: 0 - section: analytics - - - name: piwik_host - value: v2.wallabag.org - section: analytics - - - name: piwik_site_id - value: 1 - section: analytics - - - name: demo_mode_enabled - value: 0 - section: misc - - - name: demo_mode_username - value: wallabag - section: misc - - - name: download_images_enabled - value: 0 - section: misc - - - name: wallabag_support_url - value: https://www.wallabag.org/pages/support.html - section: misc - - - name: wallabag_url - value: http://v2.wallabag.org - section: misc - - - name: api_user_registration - value: 0 - section: api - -wallabag_user: - registration_enabled: "%fosuser_registration%" - -wallabag_import: - allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv'] - resource_dir: "%kernel.root_dir%/../web/uploads/import" - # Twig Configuration twig: debug: "%kernel.debug%" diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml new file mode 100644 index 00000000..d8c593c6 --- /dev/null +++ b/app/config/wallabag.yml @@ -0,0 +1,164 @@ +wallabag_core: + version: 2.2.3 + paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" + languages: + en: 'English' + fr: 'Français' + de: 'Deutsch' + tr: 'Türkçe' + fa: 'فارسی' + ro: 'Română' + pl: 'Polish' + da: 'Dansk' + es: 'Español' + oc: 'Occitan' + it: 'Italiano' + pt: 'Português' + items_on_page: 12 + theme: material + language: '%locale%' + rss_limit: 50 + reading_speed: 1 + cache_lifetime: 10 + action_mark_as_read: 1 + list_mode: 0 + fetching_error_message_title: 'No title found' + fetching_error_message: | + wallabag can't retrieve contents for this article. Please troubleshoot this issue. + api_limit_mass_actions: 10 + default_internal_settings: + - + name: share_public + value: 1 + section: entry + - + name: carrot + value: 1 + section: entry + - + name: share_diaspora + value: 1 + section: entry + - + name: diaspora_url + value: http://diasporapod.com + section: entry + - + name: share_unmark + value: 1 + section: entry + - + name: unmark_url + value: https://unmark.it + section: entry + - + name: share_shaarli + value: 1 + section: entry + - + name: share_scuttle + value: 1 + section: entry + - + name: shaarli_url + value: http://myshaarli.com + section: entry + - + name: scuttle_url + value: http://scuttle.org + section: entry + - + name: share_mail + value: 1 + section: entry + - + name: share_twitter + value: 1 + section: entry + - + name: show_printlink + value: 1 + section: entry + - + name: restricted_access + value: 0 + section: entry + - + name: export_epub + value: 1 + section: export + - + name: export_mobi + value: 1 + section: export + - + name: export_pdf + value: 1 + section: export + - + name: export_csv + value: 1 + section: export + - + name: export_json + value: 1 + section: export + - + name: export_txt + value: 1 + section: export + - + name: export_xml + value: 1 + section: export + - + name: import_with_redis + value: 0 + section: import + - + name: import_with_rabbitmq + value: 0 + section: import + - + name: piwik_enabled + value: 0 + section: analytics + - + name: piwik_host + value: v2.wallabag.org + section: analytics + - + name: piwik_site_id + value: 1 + section: analytics + - + name: demo_mode_enabled + value: 0 + section: misc + - + name: demo_mode_username + value: wallabag + section: misc + - + name: download_images_enabled + value: 0 + section: misc + - + name: wallabag_support_url + value: https://www.wallabag.org/pages/support.html + section: misc + - + name: wallabag_url + value: http://v2.wallabag.org + section: misc + - + name: api_user_registration + value: 0 + section: api + +wallabag_user: + registration_enabled: "%fosuser_registration%" + +wallabag_import: + allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv'] + resource_dir: "%kernel.root_dir%/../web/uploads/import" -- cgit v1.2.3 From be9d693e74e41fdcdb18bf80aa1aff614154bcce Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 1 Jun 2017 10:42:19 +0200 Subject: remove craueconfig domain name setting and add a proper one in parameters --- app/config/parameters.yml.dist | 2 ++ app/config/wallabag.yml | 1 + 2 files changed, 3 insertions(+) (limited to 'app/config') diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index afcee039..c00ffb0e 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -23,6 +23,8 @@ parameters: # with PostgreSQL and SQLite, you must set "utf8" database_charset: utf8mb4 + domain_name: wallabag.me + mailer_transport: smtp mailer_host: 127.0.0.1 mailer_user: ~ diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index d8c593c6..65bac1b4 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -26,6 +26,7 @@ wallabag_core: fetching_error_message: | wallabag can't retrieve contents for this article. Please troubleshoot this issue. api_limit_mass_actions: 10 + domain_name: '%domain_name%' default_internal_settings: - name: share_public -- cgit v1.2.3 From d6c4c484c46706f9eecf81af3f64649f014418e1 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 6 Jun 2017 16:04:51 +0200 Subject: add migration --- app/config/wallabag.yml | 4 ---- 1 file changed, 4 deletions(-) (limited to 'app/config') diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index 65bac1b4..d03450a0 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -148,10 +148,6 @@ wallabag_core: name: wallabag_support_url value: https://www.wallabag.org/pages/support.html section: misc - - - name: wallabag_url - value: http://v2.wallabag.org - section: misc - name: api_user_registration value: 0 -- cgit v1.2.3 From e48b238a3e2c387be1f897e6f2c3c481d25f5203 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 6 Jun 2017 16:18:25 +0200 Subject: fix tests --- app/config/parameters_test.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'app/config') diff --git a/app/config/parameters_test.yml b/app/config/parameters_test.yml index 010785e6..92f0364f 100644 --- a/app/config/parameters_test.yml +++ b/app/config/parameters_test.yml @@ -8,3 +8,4 @@ parameters: test_database_path: "%env(TEST_DATABASE_PATH)%" env(TEST_DATABASE_PATH): "%kernel.root_dir%/../data/db/wallabag_test.sqlite" test_database_charset: utf8 + domain_name: 'http://v2.wallabag.org' -- cgit v1.2.3 From 80f4d85ac92ab4dc490c51f2d831ac7fa3853826 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 8 Jun 2017 19:15:33 +0200 Subject: Review --- app/config/parameters.yml.dist | 2 +- app/config/parameters_test.yml | 1 - app/config/wallabag.yml | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) (limited to 'app/config') diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index c00ffb0e..d827219a 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -23,7 +23,7 @@ parameters: # with PostgreSQL and SQLite, you must set "utf8" database_charset: utf8mb4 - domain_name: wallabag.me + domain_name: http://your-wallabag-url-instance.com mailer_transport: smtp mailer_host: 127.0.0.1 diff --git a/app/config/parameters_test.yml b/app/config/parameters_test.yml index 92f0364f..010785e6 100644 --- a/app/config/parameters_test.yml +++ b/app/config/parameters_test.yml @@ -8,4 +8,3 @@ parameters: test_database_path: "%env(TEST_DATABASE_PATH)%" env(TEST_DATABASE_PATH): "%kernel.root_dir%/../data/db/wallabag_test.sqlite" test_database_charset: utf8 - domain_name: 'http://v2.wallabag.org' diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index d03450a0..51b7e4e3 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -26,7 +26,6 @@ wallabag_core: fetching_error_message: | wallabag can't retrieve contents for this article. Please troubleshoot this issue. api_limit_mass_actions: 10 - domain_name: '%domain_name%' default_internal_settings: - name: share_public -- cgit v1.2.3 From 1a94252831638cf41f0fe489939dee9dae1c1251 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 9 Jun 2017 10:07:27 +0200 Subject: Promote https --- app/config/parameters.yml.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/config') diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index d827219a..914fb1ef 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -23,7 +23,7 @@ parameters: # with PostgreSQL and SQLite, you must set "utf8" database_charset: utf8mb4 - domain_name: http://your-wallabag-url-instance.com + domain_name: https://your-wallabag-url-instance.com mailer_transport: smtp mailer_host: 127.0.0.1 -- cgit v1.2.3 From 5a9bc00726ddaf7c8798d4932d0a8b7a38422670 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 1 May 2017 22:13:17 +0200 Subject: Retrieve username/password from database Inject the current user & the repo to retrieve username/password from the database --- app/config/parameters.yml.dist | 3 --- 1 file changed, 3 deletions(-) (limited to 'app/config') diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 914fb1ef..b3fe11c8 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -60,6 +60,3 @@ parameters: redis_port: 6379 redis_path: null redis_password: null - - # sites credentials - sites_credentials: {} -- cgit v1.2.3 From 906424c1b6fd884bf2081bfe6dd0b1f9651c2801 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 11 Jun 2017 23:05:19 +0200 Subject: Crypt site credential password --- app/config/wallabag.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'app/config') diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index 51b7e4e3..b45934e4 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -26,6 +26,7 @@ wallabag_core: fetching_error_message: | wallabag can't retrieve contents for this article. Please troubleshoot this issue. api_limit_mass_actions: 10 + encryption_key_path: "%kernel.root_dir%/../data/site-credentials-secret-key.txt" default_internal_settings: - name: share_public -- cgit v1.2.3 From 18c38dffc67d04e59a9cc26b6910d9b9a4a49cd6 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 10 Jun 2017 13:11:08 +0200 Subject: Add RSS tags feeds --- app/config/security.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'app/config') diff --git a/app/config/security.yml b/app/config/security.yml index ffb1d356..e14a0bd1 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -61,6 +61,7 @@ security: - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY } - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY } + - { path: /tags/(.*).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/share, roles: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/settings, roles: ROLE_SUPER_ADMIN } - { path: ^/annotations, roles: ROLE_USER } -- cgit v1.2.3 From 789c46821db9fbab5bbea99846fa0021d779a592 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 20 Jun 2017 07:14:04 +0200 Subject: Fix linter issue on webpack config files --- app/config/webpack/common.js | 9 ++++---- app/config/webpack/dev.js | 23 ++++++++++---------- app/config/webpack/prod.js | 50 ++++++++++++++++++++++---------------------- 3 files changed, 40 insertions(+), 42 deletions(-) (limited to 'app/config') diff --git a/app/config/webpack/common.js b/app/config/webpack/common.js index 4f5739f0..1ef193c7 100644 --- a/app/config/webpack/common.js +++ b/app/config/webpack/common.js @@ -4,13 +4,12 @@ const StyleLintPlugin = require('stylelint-webpack-plugin'); const rootDir = path.resolve(__dirname, '../../../'); -module.exports = function() { +module.exports = function () { return { entry: { material: path.join(rootDir, './app/Resources/static/themes/material/index.js'), baggy: path.join(rootDir, './app/Resources/static/themes/baggy/index.js'), }, - output: { filename: '[name].js', path: path.resolve(rootDir, 'web/bundles/wallabagcore'), @@ -21,7 +20,7 @@ module.exports = function() { $: 'jquery', jQuery: 'jquery', 'window.$': 'jquery', - 'window.jQuery': 'jquery' + 'window.jQuery': 'jquery', }), new StyleLintPlugin({ configFile: '.stylelintrc', @@ -33,8 +32,8 @@ module.exports = function() { ], resolve: { alias: { - jquery: path.join(rootDir, 'node_modules/jquery/dist/jquery.js') - } + jquery: path.join(rootDir, 'node_modules/jquery/dist/jquery.js'), + }, }, }; }; diff --git a/app/config/webpack/dev.js b/app/config/webpack/dev.js index 771df65b..b6551152 100644 --- a/app/config/webpack/dev.js +++ b/app/config/webpack/dev.js @@ -1,13 +1,12 @@ const webpackMerge = require('webpack-merge'); const webpack = require('webpack'); -const path = require('path'); const commonConfig = require('./common.js'); module.exports = function () { return webpackMerge(commonConfig(), { devtool: 'eval-source-map', output: { - filename: '[name].dev.js' + filename: '[name].dev.js', }, devServer: { @@ -34,9 +33,9 @@ module.exports = function () { use: { loader: 'babel-loader', options: { - presets: ['env'] - } - } + presets: ['env'], + }, + }, }, { test: /\.(s)?css$/, @@ -46,17 +45,17 @@ module.exports = function () { loader: 'css-loader', options: { importLoaders: 1, - } + }, }, - 'postcss-loader', - 'sass-loader' - ] + 'postcss-loader', + 'sass-loader', + ], }, { test: /\.(jpg|png|gif|svg|eot|ttf|woff|woff2)$/, - use: 'url-loader' + use: 'url-loader', }, - ] + ], }, - }) + }); }; diff --git a/app/config/webpack/prod.js b/app/config/webpack/prod.js index ef41ab99..44961cc5 100644 --- a/app/config/webpack/prod.js +++ b/app/config/webpack/prod.js @@ -5,34 +5,34 @@ const ManifestPlugin = require('webpack-manifest-plugin'); const commonConfig = require('./common.js'); -module.exports = function() { +module.exports = function () { return webpackMerge(commonConfig(), { output: { - filename: '[name].js' + filename: '[name].js', }, devtool: 'source-map', plugins: [ new webpack.DefinePlugin({ 'process.env': { - 'NODE_ENV': JSON.stringify('production') - } + 'NODE_ENV': JSON.stringify('production'), + }, }), new webpack.optimize.UglifyJsPlugin({ beautify: false, mangle: { screw_ie8: true, - keep_fnames: true + keep_fnames: true, }, compress: { screw_ie8: true, - warnings: false + warnings: false, }, - comments: false + comments: false, }), new ExtractTextPlugin('[name].css'), new ManifestPlugin({ fileName: 'manifest.json', - }) + }), ], module: { rules: [ @@ -48,9 +48,9 @@ module.exports = function() { use: { loader: 'babel-loader', options: { - presets: ['env'] - } - } + presets: ['env'], + }, + }, }, { test: /\.(s)?css$/, @@ -63,17 +63,17 @@ module.exports = function() { importLoaders: 1, minimize: { discardComments: { - removeAll: true + removeAll: true, }, core: true, - minifyFontValues: true - } - } + minifyFontValues: true, + }, + }, }, 'postcss-loader', - 'sass-loader' - ] - }) + 'sass-loader', + ], + }), }, { test: /\.(jpg|png|gif|svg)$/, @@ -81,8 +81,8 @@ module.exports = function() { loader: 'file-loader', options: { name: 'img/[name].[ext]', - } - } + }, + }, }, { test: /\.(eot|ttf|woff|woff2)$/, @@ -90,10 +90,10 @@ module.exports = function() { loader: 'file-loader', options: { name: 'fonts/[name].[ext]', - } - } - } - ] + }, + }, + }, + ], }, - }) + }); }; -- cgit v1.2.3 From 77255d668828d7ae4cceb186b5215a0d4ddd69f6 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 22 Jun 2017 12:15:24 +0200 Subject: Add css on share public page --- app/config/webpack/common.js | 1 + 1 file changed, 1 insertion(+) (limited to 'app/config') diff --git a/app/config/webpack/common.js b/app/config/webpack/common.js index 1ef193c7..c497689a 100644 --- a/app/config/webpack/common.js +++ b/app/config/webpack/common.js @@ -9,6 +9,7 @@ module.exports = function () { entry: { material: path.join(rootDir, './app/Resources/static/themes/material/index.js'), baggy: path.join(rootDir, './app/Resources/static/themes/baggy/index.js'), + public: path.join(rootDir, './app/Resources/static/themes/_global/share.js'), }, output: { filename: '[name].js', -- cgit v1.2.3 From 2e6239bb9f44778646d52005399bbb0632fef058 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 9 Jul 2017 10:07:14 +0200 Subject: Disallow html for templating formats MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using html template format will then put the html format in the allowed list for the api doc which we don’t want since the api doesn’t response for html format. --- 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 2bc5e3b3..d37ed227 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -110,7 +110,7 @@ fos_rest: epub: true mobi: true templating_formats: - html: true + html: false force_redirects: html: true failed_validation: HTTP_BAD_REQUEST -- cgit v1.2.3 From f40c88eb1fa349aab600f9c1c94364f317fe62dd Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 9 Oct 2017 16:45:09 +0200 Subject: Jump to Symfony 3.3 & update others deps Also update tests urls --- app/config/config.yml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index d37ed227..b76fb696 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -350,3 +350,10 @@ fos_js_routing: - howto - fos_user_security_logout - new + +jms_serializer: + handlers: + # to be removed if we switch to (default) ISO8601 datetime instead of ATOM + # see: https://github.com/schmittjoh/JMSSerializerBundle/pull/494 + datetime: + default_format: "Y-m-d\\TH:i:sO" # ATOM -- cgit v1.2.3 From ef5fcdee20bc2c9915f59065fc738bc10f95f003 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9E=D0=BB=D0=B5=D0=B3?= Date: Fri, 6 Oct 2017 15:39:34 +0300 Subject: add Russian language --- app/config/wallabag.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'app/config') diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index b45934e4..d70653ce 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -14,6 +14,7 @@ wallabag_core: oc: 'Occitan' it: 'Italiano' pt: 'Português' + ru: 'Русский' items_on_page: 12 theme: material language: '%locale%' -- cgit v1.2.3 From 9ca069a6fea67ddf2ef44601901ea3c02e3cffbe Mon Sep 17 00:00:00 2001 From: Nicolas Hart Date: Fri, 13 Oct 2017 23:52:15 +0200 Subject: Replace kernel.root_dir by kernel.project_dir kernel.root_dir and Kernel::getRootDir() are deprecated since Symfony 3.3. See https://symfony.com/blog/new-in-symfony-3-3-a-simpler-way-to-get-the-project-root-directory and https://github.com/symfony/symfony/blob/3.3/UPGRADE-3.3.md#httpkernel for more information. --- app/config/config.yml | 6 +++--- app/config/config_dev.yml | 2 +- app/config/config_prod.yml | 2 +- app/config/parameters.yml.dist | 2 +- app/config/parameters_test.yml | 2 +- app/config/tests/parameters_test.sqlite.yml | 2 +- app/config/wallabag.yml | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index b76fb696..08da4f8f 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -16,7 +16,7 @@ framework: fallback: "%locale%" secret: "%secret%" router: - resource: "%kernel.root_dir%/config/routing.yml" + resource: "%kernel.project_dir%/app/config/routing.yml" strict_requirements: ~ form: ~ csrf_protection: ~ @@ -30,7 +30,7 @@ framework: session: # handler_id set to null will use default session handler from php.ini handler_id: session.handler.native_file - save_path: "%kernel.root_dir%/../var/sessions/%kernel.environment%" + save_path: "%kernel.project_dir%/var/sessions/%kernel.environment%" fragments: ~ http_method_override: true assets: ~ @@ -72,7 +72,7 @@ stof_doctrine_extensions: sluggable: true doctrine_migrations: - dir_name: "%kernel.root_dir%/DoctrineMigrations" + dir_name: "%kernel.project_dir%/app/DoctrineMigrations" namespace: Application\Migrations table_name: migration_versions name: Application Migrations diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index 3b67d8f6..0c490575 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -3,7 +3,7 @@ imports: framework: router: - resource: "%kernel.root_dir%/config/routing_dev.yml" + resource: "%kernel.project_dir%/app/config/routing_dev.yml" strict_requirements: true profiler: only_exceptions: false diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml index 65b02d66..44e29aac 100644 --- a/app/config/config_prod.yml +++ b/app/config/config_prod.yml @@ -3,7 +3,7 @@ imports: framework: assets: - # json_manifest_path: '%kernel.root_dir%/../web/bundles/wallabagcore/manifest.json' + # json_manifest_path: '%kernel.project_dir%/web/bundles/wallabagcore/manifest.json' #doctrine: # orm: diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index b3fe11c8..b5b97950 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -16,7 +16,7 @@ parameters: database_name: wallabag database_user: root database_password: ~ - # For SQLite, database_path should be "%kernel.root_dir%/../data/db/wallabag.sqlite" + # For SQLite, database_path should be "%kernel.project_dir%/data/db/wallabag.sqlite" database_path: null database_table_prefix: wallabag_ database_socket: null diff --git a/app/config/parameters_test.yml b/app/config/parameters_test.yml index 010785e6..257d2ace 100644 --- a/app/config/parameters_test.yml +++ b/app/config/parameters_test.yml @@ -6,5 +6,5 @@ parameters: test_database_user: null test_database_password: null test_database_path: "%env(TEST_DATABASE_PATH)%" - env(TEST_DATABASE_PATH): "%kernel.root_dir%/../data/db/wallabag_test.sqlite" + env(TEST_DATABASE_PATH): "%kernel.project_dir%/data/db/wallabag_test.sqlite" test_database_charset: utf8 diff --git a/app/config/tests/parameters_test.sqlite.yml b/app/config/tests/parameters_test.sqlite.yml index 5c731bf5..2b92d579 100644 --- a/app/config/tests/parameters_test.sqlite.yml +++ b/app/config/tests/parameters_test.sqlite.yml @@ -8,5 +8,5 @@ parameters: # Using an environnement variable in order to avoid the error "attempt to write a readonly database" # when the schema is dropped then recreate test_database_path: "%env(TEST_DATABASE_PATH)%" - env(TEST_DATABASE_PATH): "%kernel.root_dir%/../data/db/wallabag_test.sqlite" + env(TEST_DATABASE_PATH): "%kernel.project_dir%/data/db/wallabag_test.sqlite" test_database_charset: utf8 diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index d70653ce..6b4722fc 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -27,7 +27,7 @@ wallabag_core: fetching_error_message: | wallabag can't retrieve contents for this article. Please troubleshoot this issue. api_limit_mass_actions: 10 - encryption_key_path: "%kernel.root_dir%/../data/site-credentials-secret-key.txt" + encryption_key_path: "%kernel.project_dir%/data/site-credentials-secret-key.txt" default_internal_settings: - name: share_public @@ -159,4 +159,4 @@ wallabag_user: wallabag_import: allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv'] - resource_dir: "%kernel.root_dir%/../web/uploads/import" + resource_dir: "%kernel.project_dir%/web/uploads/import" -- cgit v1.2.3 From 7a1e1247cbc3b7a68c82c45733713c4630e9dcb7 Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Sun, 15 Oct 2017 23:57:35 +0200 Subject: webpack: handle _global img folder Fixes missing image files after composer cleaning assets Source of requireAll(): https://stackoverflow.com/a/30652110 Signed-off-by: Kevin Decherf --- app/config/webpack/prod.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'app/config') diff --git a/app/config/webpack/prod.js b/app/config/webpack/prod.js index 44961cc5..17b8c384 100644 --- a/app/config/webpack/prod.js +++ b/app/config/webpack/prod.js @@ -76,7 +76,8 @@ module.exports = function () { }), }, { - test: /\.(jpg|png|gif|svg)$/, + test: /\.(jpg|png|gif|svg|ico)$/, + include: /node_modules/, use: { loader: 'file-loader', options: { @@ -84,6 +85,17 @@ module.exports = function () { }, }, }, + { + test: /\.(jpg|png|gif|svg|ico)$/, + exclude: /node_modules/, + use: { + loader: 'file-loader', + options: { + context: 'app/Resources/static', + name: '[path][name].[ext]', + }, + }, + }, { test: /\.(eot|ttf|woff|woff2)$/, use: { -- cgit v1.2.3 From 3f29386cb797a8cc9b4eff8dc9b0a75f201366a5 Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Mon, 16 Oct 2017 00:07:12 +0200 Subject: Update prod assets Signed-off-by: Kevin Decherf --- app/config/webpack/dev.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/config') diff --git a/app/config/webpack/dev.js b/app/config/webpack/dev.js index b6551152..97abc5eb 100644 --- a/app/config/webpack/dev.js +++ b/app/config/webpack/dev.js @@ -52,7 +52,7 @@ module.exports = function () { ], }, { - test: /\.(jpg|png|gif|svg|eot|ttf|woff|woff2)$/, + test: /\.(jpg|png|gif|svg|ico|eot|ttf|woff|woff2)$/, use: 'url-loader', }, ], -- cgit v1.2.3 From b4da3ee8e565070802db28bda4b8cd46134a3d19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 20 Oct 2017 14:17:37 +0200 Subject: Prepare wallabag 2.3.0 --- app/config/wallabag.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/config') diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index 6b4722fc..bbc587b0 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -1,5 +1,5 @@ wallabag_core: - version: 2.2.3 + version: 2.3.0 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