diff --git a/Gemfile b/Gemfile index 2e3ec8ba07..9e19b81431 100644 --- a/Gemfile +++ b/Gemfile @@ -26,13 +26,13 @@ gem 'jwt' gem 'mini_magick', '>= 4.9.5' gem 'omniauth', '~> 2.1.2' gem 'omniauth_openid_connect', '>= 0.6.1' -gem 'omniauth-rails_csrf_protection', '~> 1.0.1' +gem 'omniauth-rails_csrf_protection', '~> 1.0.2' gem 'pagy', '~> 6.0', '>= 6.0.0' gem 'pg' gem 'puma', '~> 5.6' -gem 'rails', '~> 7.1.3' +gem 'rails', '~> 7.1.3', '>= 7.1.3.3' gem 'redis', '~> 4.0' -gem 'sprockets-rails' +gem 'sprockets-rails', '>= 3.5.0' gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby] group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index f5ea4a2a32..86bfec749b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,35 +1,35 @@ GEM remote: https://rubygems.org/ specs: - actioncable (7.1.3.1) - actionpack (= 7.1.3.1) - activesupport (= 7.1.3.1) + actioncable (7.1.3.4) + actionpack (= 7.1.3.4) + activesupport (= 7.1.3.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.3.1) - actionpack (= 7.1.3.1) - activejob (= 7.1.3.1) - activerecord (= 7.1.3.1) - activestorage (= 7.1.3.1) - activesupport (= 7.1.3.1) + actionmailbox (7.1.3.4) + actionpack (= 7.1.3.4) + activejob (= 7.1.3.4) + activerecord (= 7.1.3.4) + activestorage (= 7.1.3.4) + activesupport (= 7.1.3.4) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.1.3.1) - actionpack (= 7.1.3.1) - actionview (= 7.1.3.1) - activejob (= 7.1.3.1) - activesupport (= 7.1.3.1) + actionmailer (7.1.3.4) + actionpack (= 7.1.3.4) + actionview (= 7.1.3.4) + activejob (= 7.1.3.4) + activesupport (= 7.1.3.4) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.2) - actionpack (7.1.3.1) - actionview (= 7.1.3.1) - activesupport (= 7.1.3.1) + actionpack (7.1.3.4) + actionview (= 7.1.3.4) + activesupport (= 7.1.3.4) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -37,15 +37,15 @@ GEM rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.3.1) - actionpack (= 7.1.3.1) - activerecord (= 7.1.3.1) - activestorage (= 7.1.3.1) - activesupport (= 7.1.3.1) + actiontext (7.1.3.4) + actionpack (= 7.1.3.4) + activerecord (= 7.1.3.4) + activestorage (= 7.1.3.4) + activesupport (= 7.1.3.4) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.3.1) - activesupport (= 7.1.3.1) + actionview (7.1.3.4) + activesupport (= 7.1.3.4) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) @@ -60,22 +60,22 @@ GEM activemodel (>= 5.2.0) activestorage (>= 5.2.0) activesupport (>= 5.2.0) - activejob (7.1.3.1) - activesupport (= 7.1.3.1) + activejob (7.1.3.4) + activesupport (= 7.1.3.4) globalid (>= 0.3.6) - activemodel (7.1.3.1) - activesupport (= 7.1.3.1) - activerecord (7.1.3.1) - activemodel (= 7.1.3.1) - activesupport (= 7.1.3.1) + activemodel (7.1.3.4) + activesupport (= 7.1.3.4) + activerecord (7.1.3.4) + activemodel (= 7.1.3.4) + activesupport (= 7.1.3.4) timeout (>= 0.4.0) - activestorage (7.1.3.1) - actionpack (= 7.1.3.1) - activejob (= 7.1.3.1) - activerecord (= 7.1.3.1) - activesupport (= 7.1.3.1) + activestorage (7.1.3.4) + actionpack (= 7.1.3.4) + activejob (= 7.1.3.4) + activerecord (= 7.1.3.4) + activesupport (= 7.1.3.4) marcel (~> 1.0) - activesupport (7.1.3.1) + activesupport (7.1.3.4) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -116,12 +116,12 @@ GEM rack (>= 1.6.11) rubyzip (>= 1.3.0) xml-simple (~> 1.1) - bigdecimal (3.1.7) + bigdecimal (3.1.8) bindata (2.5.0) bindex (0.8.1) bootsnap (1.16.0) msgpack (~> 1.2) - builder (3.2.4) + builder (3.3.0) capybara (3.38.0) addressable matrix @@ -135,7 +135,7 @@ GEM activesupport childprocess (4.1.0) clamby (1.6.10) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.3) connection_pool (2.4.1) crack (0.4.5) rexml @@ -215,15 +215,15 @@ GEM json hiredis (0.6.3) httpclient (2.8.3) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) i18n-language-mapping (0.1.3.1) image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) io-console (0.7.2) - irb (1.12.0) - rdoc + irb (1.13.1) + rdoc (>= 4.0.0) reline (>= 0.4.2) jbuilder (2.11.5) actionview (>= 5.0.0) @@ -255,38 +255,38 @@ GEM net-imap net-pop net-smtp - marcel (1.0.2) + marcel (1.0.4) matrix (0.4.2) memoist (0.16.2) mini_magick (4.12.0) mini_mime (1.1.5) - mini_portile2 (2.8.6) - minitest (5.22.3) + mini_portile2 (2.8.7) + minitest (5.23.1) msgpack (1.6.0) multi_json (1.15.0) mutex_m (0.2.0) net-http (0.4.1) uri - net-imap (0.4.10) + net-imap (0.4.12) date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.2) timeout - net-smtp (0.4.0.1) + net-smtp (0.5.0) net-protocol - nio4r (2.7.0) - nokogiri (1.16.4) + nio4r (2.7.3) + nokogiri (1.16.5) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.16.4-x86_64-linux) + nokogiri (1.16.5-x86_64-linux) racc (~> 1.4) omniauth (2.1.2) hashie (>= 3.4.6) rack (>= 2.2.3) rack-protection - omniauth-rails_csrf_protection (1.0.1) + omniauth-rails_csrf_protection (1.0.2) actionpack (>= 4.2) omniauth (~> 2.0) omniauth_openid_connect (0.7.1) @@ -317,7 +317,7 @@ GEM public_suffix (5.0.3) puma (5.6.8) nio4r (~> 2.0) - racc (1.7.3) + racc (1.8.0) rack (2.2.9) rack-oauth2 (2.2.0) activesupport @@ -336,20 +336,20 @@ GEM rackup (1.0.0) rack (< 3) webrick - rails (7.1.3.1) - actioncable (= 7.1.3.1) - actionmailbox (= 7.1.3.1) - actionmailer (= 7.1.3.1) - actionpack (= 7.1.3.1) - actiontext (= 7.1.3.1) - actionview (= 7.1.3.1) - activejob (= 7.1.3.1) - activemodel (= 7.1.3.1) - activerecord (= 7.1.3.1) - activestorage (= 7.1.3.1) - activesupport (= 7.1.3.1) + rails (7.1.3.4) + actioncable (= 7.1.3.4) + actionmailbox (= 7.1.3.4) + actionmailer (= 7.1.3.4) + actionpack (= 7.1.3.4) + actiontext (= 7.1.3.4) + actionview (= 7.1.3.4) + activejob (= 7.1.3.4) + activemodel (= 7.1.3.4) + activerecord (= 7.1.3.4) + activestorage (= 7.1.3.4) + activesupport (= 7.1.3.4) bundler (>= 1.15.0) - railties (= 7.1.3.1) + railties (= 7.1.3.4) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -357,9 +357,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.1.3.1) - actionpack (= 7.1.3.1) - activesupport (= 7.1.3.1) + railties (7.1.3.4) + actionpack (= 7.1.3.4) + activesupport (= 7.1.3.4) irb rackup (>= 1.0.0) rake (>= 12.2) @@ -367,11 +367,11 @@ GEM zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.2.1) - rdoc (6.6.3.1) + rdoc (6.7.0) psych (>= 4.0.0) redis (4.8.0) regexp_parser (2.8.1) - reline (0.5.4) + reline (0.5.9) io-console (~> 0.5) remote_syslog_logger (1.0.4) syslog_protocol @@ -442,12 +442,12 @@ GEM faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - sprockets (4.2.0) + sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) + sprockets-rails (3.5.0) + actionpack (>= 6.1) + activesupport (>= 6.1) sprockets (>= 3.0.0) stringio (3.1.0) swd (2.0.2) @@ -496,7 +496,7 @@ GEM rexml xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.13) + zeitwerk (2.6.15) PLATFORMS ruby @@ -529,12 +529,12 @@ DEPENDENCIES lograge (~> 0.14.0) mini_magick (>= 4.9.5) omniauth (~> 2.1.2) - omniauth-rails_csrf_protection (~> 1.0.1) + omniauth-rails_csrf_protection (~> 1.0.2) omniauth_openid_connect (>= 0.6.1) pagy (~> 6.0, >= 6.0.0) pg puma (~> 5.6) - rails (~> 7.1.3) + rails (~> 7.1.3, >= 7.1.3.3) redis (~> 4.0) remote_syslog_logger rspec-rails (>= 6.0.4) @@ -546,7 +546,7 @@ DEPENDENCIES rubocop-rspec (~> 2.9.0) selenium-webdriver shoulda-matchers (~> 5.0) - sprockets-rails + sprockets-rails (>= 3.5.0) tzinfo-data web-console (>= 4.2.1) webdrivers diff --git a/app/assets/locales/el.json b/app/assets/locales/el.json index 28d6b3c5a4..6ea43f0b92 100644 --- a/app/assets/locales/el.json +++ b/app/assets/locales/el.json @@ -14,6 +14,7 @@ "report": "Αναφορά", "share": "Κοινή χρήση", "cancel": "Ακύρωση", + "reset": "Επαναφορά", "close": "Κλείσιμο", "delete": "Διαγραφή", "copy": "Αντιγραφή συνδέσμου εγγραφής", @@ -229,7 +230,8 @@ "empty_invited_users_subtext": "Μόλις η κατάσταση του χρήστη αλλάξει σε προσκεκλημένος, θα εμφανιστεί εδώ.", "invited": { "time_sent": "Ώρα αποστολής", - "valid": "Έγκυρο" + "valid": "Έγκυρο", + "revoke": "Ανάκληση" } }, "server_rooms": { @@ -429,7 +431,8 @@ "role_permission_updated": "Τα δικαιώματα του ρόλου ενημερώθηκαν." }, "invitations": { - "invitation_sent": "Η πρόσκληση στάλθηκε" + "invitation_sent": "Η πρόσκληση στάλθηκε", + "invitation_revoked": "Έχει γίνει ανάκληση μιας πρόσκλησης" } }, "error": { diff --git a/app/assets/locales/ja.json b/app/assets/locales/ja.json index 181926bb0d..62d3c7dbed 100644 --- a/app/assets/locales/ja.json +++ b/app/assets/locales/ja.json @@ -14,6 +14,7 @@ "report": "報告", "share": "共有", "cancel": "キャンセル", + "reset": "リセット", "close": "閉じる", "delete": "削除", "copy": "参加リンクをコピー", @@ -229,7 +230,8 @@ "empty_invited_users_subtext": "ユーザーの状態が招待中に変わると、こちらに表示されます。", "invited": { "time_sent": "送付日時", - "valid": "有効" + "valid": "有効", + "revoke": "取り消す" } }, "server_rooms": { @@ -429,7 +431,8 @@ "role_permission_updated": "この役割の権限が更新されました。" }, "invitations": { - "invitation_sent": "招待状が送付されました" + "invitation_sent": "招待状が送付されました", + "invitation_revoked": "招待状を取り消しました" } }, "error": { diff --git a/app/services/tenant_setup.rb b/app/services/tenant_setup.rb index 12ff066578..47a8b8651f 100644 --- a/app/services/tenant_setup.rb +++ b/app/services/tenant_setup.rb @@ -55,7 +55,6 @@ def create_site_settings { setting: Setting.find_by(name: 'RoleMapping'), value: '', provider: @provider }, { setting: Setting.find_by(name: 'DefaultRole'), provider: @provider, value: 'User' }, { setting: Setting.find_by(name: 'DefaultRecordingVisibility'), provider: @provider, value: 'Published' }, - { setting: Setting.find_by(name: 'HelpCenter'), provider: @provider, value: '' }, { setting: Setting.find_by(name: 'Maintenance'), provider: @provider, value: '' }, { setting: Setting.find_by(name: 'SessionTimeout'), provider: @provider, value: '1' } ] diff --git a/package-lock.json b/package-lock.json index a93e865bd4..e956500984 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3549,12 +3549,11 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "license": "MIT", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -4732,10 +4731,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "license": "MIT", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -4837,6 +4835,19 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "license": "ISC" }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", @@ -5437,7 +5448,6 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -7243,7 +7253,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, diff --git a/yarn.lock b/yarn.lock index 52cf063646..7c25c3bb52 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1728,11 +1728,11 @@ brace-expansion@^1.1.7: concat-map "0.0.1" braces@^3.0.2, braces@~3.0.2: - version "3.0.2" - resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + version "3.0.3" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" + integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== dependencies: - fill-range "^7.0.1" + fill-range "^7.1.1" broadcast-channel@^3.4.1: version "3.7.0" @@ -2410,10 +2410,10 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== +fill-range@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" + integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg== dependencies: to-regex-range "^5.0.1"