diff --git a/Gemfile.lock b/Gemfile.lock index 24665e2..bab908e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,93 +1,94 @@ GIT remote: https://github.com/rails/activeresource.git - revision: dedecf90996622776b7aa0e54957ffc8fb3ac2f9 + revision: 9dfc15e98007d0e546c404d7236a218bb04a8698 specs: - activeresource (5.1.1) - activemodel (>= 5.0, < 7) + activeresource (6.0.0) + activemodel (>= 6.0) activemodel-serializers-xml (~> 1.0) - activesupport (>= 5.0, < 7) + activesupport (>= 6.0) GEM remote: https://rubygems.org/ specs: - actioncable (6.0.4.7) - actionpack (= 6.0.4.7) + actioncable (6.0.5.1) + actionpack (= 6.0.5.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.4.7) - actionpack (= 6.0.4.7) - activejob (= 6.0.4.7) - activerecord (= 6.0.4.7) - activestorage (= 6.0.4.7) - activesupport (= 6.0.4.7) + actionmailbox (6.0.5.1) + actionpack (= 6.0.5.1) + activejob (= 6.0.5.1) + activerecord (= 6.0.5.1) + activestorage (= 6.0.5.1) + activesupport (= 6.0.5.1) mail (>= 2.7.1) - actionmailer (6.0.4.7) - actionpack (= 6.0.4.7) - actionview (= 6.0.4.7) - activejob (= 6.0.4.7) + actionmailer (6.0.5.1) + actionpack (= 6.0.5.1) + actionview (= 6.0.5.1) + activejob (= 6.0.5.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.4.7) - actionview (= 6.0.4.7) - activesupport (= 6.0.4.7) + actionpack (6.0.5.1) + actionview (= 6.0.5.1) + activesupport (= 6.0.5.1) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.4.7) - actionpack (= 6.0.4.7) - activerecord (= 6.0.4.7) - activestorage (= 6.0.4.7) - activesupport (= 6.0.4.7) + actiontext (6.0.5.1) + actionpack (= 6.0.5.1) + activerecord (= 6.0.5.1) + activestorage (= 6.0.5.1) + activesupport (= 6.0.5.1) nokogiri (>= 1.8.5) - actionview (6.0.4.7) - activesupport (= 6.0.4.7) + actionview (6.0.5.1) + activesupport (= 6.0.5.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.4.7) - activesupport (= 6.0.4.7) + activejob (6.0.5.1) + activesupport (= 6.0.5.1) globalid (>= 0.3.6) - activemodel (6.0.4.7) - activesupport (= 6.0.4.7) + activemodel (6.0.5.1) + activesupport (= 6.0.5.1) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (6.0.4.7) - activemodel (= 6.0.4.7) - activesupport (= 6.0.4.7) - activestorage (6.0.4.7) - actionpack (= 6.0.4.7) - activejob (= 6.0.4.7) - activerecord (= 6.0.4.7) - marcel (~> 1.0.0) - activesupport (6.0.4.7) + activerecord (6.0.5.1) + activemodel (= 6.0.5.1) + activesupport (= 6.0.5.1) + activestorage (6.0.5.1) + actionpack (= 6.0.5.1) + activejob (= 6.0.5.1) + activerecord (= 6.0.5.1) + marcel (~> 1.0) + activesupport (6.0.5.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - airbrussh (1.4.0) + airbrussh (1.4.1) sshkit (>= 1.6.1, != 1.7.0) builder (3.2.4) - capistrano (3.14.1) + capistrano (3.17.1) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) sshkit (>= 1.9.0) - capistrano-bundler (2.0.1) + capistrano-bundler (2.1.0) capistrano (~> 3.1) - capistrano-rails (1.6.1) + capistrano-rails (1.6.2) capistrano (~> 3.1) capistrano-bundler (>= 1.1, < 3) capistrano-rvm (0.1.2) capistrano (~> 3.0) sshkit (~> 1.2) - capistrano3-puma (1.2.1) - capistrano (~> 3.0) - puma (>= 2.6) + capistrano3-puma (5.2.0) + capistrano (~> 3.7) + capistrano-bundler + puma (>= 4.0, < 6.0) coderay (1.1.3) coffee-rails (5.0.0) coffee-script (>= 2.2.0) @@ -98,24 +99,25 @@ GEM coffee-script-source (1.12.2) concurrent-ruby (1.1.10) crass (1.0.6) - ed25519 (1.2.4) - erubi (1.10.0) - execjs (2.7.0) + ed25519 (1.3.0) + erubi (1.11.0) + execjs (2.8.1) ffi (1.15.5) globalid (1.0.0) activesupport (>= 5.0) - i18n (1.10.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) - jbuilder (2.10.1) + jbuilder (2.11.5) + actionview (>= 5.0.0) activesupport (>= 5.0.0) - jquery-rails (4.4.0) + jquery-rails (4.5.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.15.0) + loofah (2.18.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -124,54 +126,54 @@ GEM method_source (1.0.0) mini_mime (1.1.2) mini_portile2 (2.8.0) - minitest (5.15.0) - net-scp (3.0.0) - net-ssh (>= 2.6.5, < 7.0.0) - net-ssh (6.1.0) + minitest (5.16.3) + net-scp (4.0.0.rc1) + net-ssh (>= 2.6.5, < 8.0.0) + net-ssh (7.0.1) nio4r (2.5.8) - nokogiri (1.13.3) + nokogiri (1.13.8) mini_portile2 (~> 2.8.0) racc (~> 1.4) - pg (1.2.3) - pry (0.13.1) + pg (1.4.3) + pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) pry-rails (0.3.9) pry (>= 0.10.4) - puma (4.3.11) + puma (4.3.12) nio4r (~> 2.0) racc (1.6.0) - rack (2.2.3) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (6.0.4.7) - actioncable (= 6.0.4.7) - actionmailbox (= 6.0.4.7) - actionmailer (= 6.0.4.7) - actionpack (= 6.0.4.7) - actiontext (= 6.0.4.7) - actionview (= 6.0.4.7) - activejob (= 6.0.4.7) - activemodel (= 6.0.4.7) - activerecord (= 6.0.4.7) - activestorage (= 6.0.4.7) - activesupport (= 6.0.4.7) + rack (2.2.4) + rack-test (2.0.2) + rack (>= 1.3) + rails (6.0.5.1) + actioncable (= 6.0.5.1) + actionmailbox (= 6.0.5.1) + actionmailer (= 6.0.5.1) + actionpack (= 6.0.5.1) + actiontext (= 6.0.5.1) + actionview (= 6.0.5.1) + activejob (= 6.0.5.1) + activemodel (= 6.0.5.1) + activerecord (= 6.0.5.1) + activestorage (= 6.0.5.1) + activesupport (= 6.0.5.1) bundler (>= 1.3.0) - railties (= 6.0.4.7) + railties (= 6.0.5.1) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) + rails-html-sanitizer (1.4.3) loofah (~> 2.3) - railties (6.0.4.7) - actionpack (= 6.0.4.7) - activesupport (= 6.0.4.7) + railties (6.0.5.1) + actionpack (= 6.0.5.1) + activesupport (= 6.0.5.1) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rake (13.0.6) - rb-fsevent (0.11.1) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) sass-rails (6.0.0) @@ -184,29 +186,29 @@ GEM sprockets (> 3.0) sprockets-rails tilt - spring (2.1.1) - sprockets (4.0.3) + spring (4.0.0) + sprockets (4.1.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.4.2) - sshkit (1.21.0) + sqlite3 (1.4.4) + sshkit (1.21.2) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) thor (1.2.1) thread_safe (0.3.6) - tilt (2.0.10) - tzinfo (1.2.9) + tilt (2.0.11) + tzinfo (1.2.10) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.5.4) + zeitwerk (2.6.0) PLATFORMS ruby diff --git a/app/models/talk.rb b/app/models/talk.rb index 7380a38..23ef863 100644 --- a/app/models/talk.rb +++ b/app/models/talk.rb @@ -1,7 +1,7 @@ class Talk < ActiveResource::Base has_many :selections, class_name: 'SelectedTalk' - self.site = "https://cfp.openfest.org/api/conferences/7" + self.site = "https://cfp.openfest.org/api/conferences/9" self.element_name = "event" def self.ordered_by_id diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 16ac311..9711442 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -72,10 +72,9 @@
-

Technical

-

Advanced Technical

-

OpenBiz

-

Civic Hacking

-

Social

-

Education

-

Misc

+

Technical

+

Advanced Technical

+

OpenBiz

+

Civic Hacking

+

Social

+

Education

diff --git a/config/locales/bg.yml b/config/locales/bg.yml index e229f01..a64470a 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -1,6 +1,6 @@ bg: generic: - title: Възможни лекции за OpenFest 2020 + title: Възможни лекции за OpenFest 2022 submit: Изпрати store_and_submit_changes: Запази локално промените и ги изпрати, ако е възможно help_us_reduce_the_conflicts: Помогнете ни да намалим конфликтите в програмата на OpenFest diff --git a/config/locales/en.yml b/config/locales/en.yml index 0a5aeb7..3b62db1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,6 +1,6 @@ en: generic: - title: OpenFest 2020 Talk Preference Poll + title: OpenFest 2022 Talk Preference Poll submit: Submit store_and_submit_changes: Store your changes locally and submit them if possible help_us_reduce_the_conflicts: "Help us to reduce the conflicts in OpenFest's schedule"