diff options
Diffstat (limited to 'app')
-rwxr-xr-x | app/Resources/static/themes/material/index.js | 6 | ||||
-rw-r--r-- | app/config/capistrano/deploy.rb | 19 | ||||
-rw-r--r-- | app/config/capistrano/deploy/production.rb | 0 | ||||
-rw-r--r-- | app/config/capistrano/deploy/staging.rb | 2 |
4 files changed, 3 insertions, 24 deletions
diff --git a/app/Resources/static/themes/material/index.js b/app/Resources/static/themes/material/index.js index e808d75c..da055e80 100755 --- a/app/Resources/static/themes/material/index.js +++ b/app/Resources/static/themes/material/index.js | |||
@@ -57,9 +57,9 @@ $(document).ready(() => { | |||
57 | $('.datepicker').pickadate({ | 57 | $('.datepicker').pickadate({ |
58 | selectMonths: true, | 58 | selectMonths: true, |
59 | selectYears: 15, | 59 | selectYears: 15, |
60 | formatSubmit: 'dd/mm/yyyy', | 60 | formatSubmit: 'yyyy-mm-dd', |
61 | hiddenName: true, | 61 | hiddenName: false, |
62 | format: 'dd/mm/yyyy', | 62 | format: 'yyyy-mm-dd', |
63 | container: 'body', | 63 | container: 'body', |
64 | }); | 64 | }); |
65 | 65 | ||
diff --git a/app/config/capistrano/deploy.rb b/app/config/capistrano/deploy.rb deleted file mode 100644 index fee04620..00000000 --- a/app/config/capistrano/deploy.rb +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | # config valid only for current version of Capistrano | ||
2 | |||
3 | set :application, 'wallabag' | ||
4 | set :repo_url, 'git@github.com:wallabag/wallabag.git' | ||
5 | |||
6 | set :ssh_user, 'framasoft_bag' | ||
7 | server '78.46.248.87', user: fetch(:ssh_user), roles: %w{web app db} | ||
8 | |||
9 | set :format, :pretty | ||
10 | set :log_level, :info | ||
11 | # set :log_level, :debug | ||
12 | |||
13 | set :composer_install_flags, '--no-dev --prefer-dist --no-interaction --optimize-autoloader' | ||
14 | |||
15 | set :linked_files, %w{app/config/parameters.yml} | ||
16 | set :linked_dirs, [fetch(:log_path), "var/sessions", "web/uploads", "data"] | ||
17 | set :keep_releases, 3 | ||
18 | |||
19 | after 'deploy:updated', 'symfony:cache:clear' | ||
diff --git a/app/config/capistrano/deploy/production.rb b/app/config/capistrano/deploy/production.rb deleted file mode 100644 index e69de29b..00000000 --- a/app/config/capistrano/deploy/production.rb +++ /dev/null | |||
diff --git a/app/config/capistrano/deploy/staging.rb b/app/config/capistrano/deploy/staging.rb deleted file mode 100644 index ad899a85..00000000 --- a/app/config/capistrano/deploy/staging.rb +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | set :branch, 'master' | ||
2 | set :deploy_to, '/var/www/v2.wallabag.org/web/' | ||