Skip to content
Permalink
Browse files

merge changes

  • Loading branch information...
andibraeu committed Jan 1, 2019
2 parents cc442ed + 474b98f commit 9077b9908a49bb54f1b3b76e3139f27614d9bbd7
Showing with 1,948 additions and 511 deletions.
  1. +11 −0 .dockerignore
  2. +2 −1 .env.development
  3. +1 −0 .env.test
  4. +3 −1 .gitignore
  5. +3 −0 .rubocop.yml
  6. +2 −1 .travis.yml
  7. +12 −0 Dockerfile
  8. +1 −2 Gemfile
  9. +131 −150 Gemfile.lock
  10. +54 −28 README.md
  11. +1 −9 Vagrantfile
  12. +8 −17 app/admin/conference.rb
  13. +15 −1 app/admin/event.rb
  14. BIN app/assets/images/frontend/promoted_bg.jpg
  15. BIN app/assets/images/frontend/promoted_bg.png
  16. +13 −0 app/assets/javascripts/activate-timelens.js
  17. +14 −7 app/assets/javascripts/application.js
  18. +22 −21 app/assets/javascripts/{jquery.bxslider.js → jquery.bxslider-v4.2.12-patched.js}
  19. +0 −2 app/assets/javascripts/mediaelement-fix.js.erb
  20. +1 −1 app/assets/javascripts/mirrorbrain-fix.js
  21. +5 −0 app/assets/javascripts/oembed-player.js
  22. +64 −0 app/assets/javascripts/relive-seek.js
  23. +11 −17 app/assets/javascripts/slider.js
  24. +3 −0 app/assets/stylesheets/application.css
  25. +2 −0 app/assets/stylesheets/embed.css.scss
  26. +6 −14 app/assets/stylesheets/frontend/pages/_list.scss
  27. +18 −0 app/assets/stylesheets/frontend/pages/_show.scss
  28. +1 −1 app/assets/stylesheets/frontend/shared/_promoted.scss
  29. +1 −5 app/assets/stylesheets/frontend/shared/_videoplayer.scss
  30. +2 −2 app/assets/stylesheets/jquery.bxslider.css.scss
  31. +4 −0 app/assets/stylesheets/timelens-custom.css
  32. +1 −1 app/controllers/api/conferences_controller.rb
  33. +2 −2 app/controllers/api/events_controller.rb
  34. +10 −3 app/controllers/frontend/conferences_controller.rb
  35. +15 −5 app/controllers/frontend/events_controller.rb
  36. +13 −7 app/controllers/frontend/feeds_controller.rb
  37. +5 −6 app/controllers/frontend/home_controller.rb
  38. +30 −7 app/helpers/frontend/application_helper.rb
  39. +1 −1 app/models/concerns/elasticsearch_event.rb
  40. +18 −0 app/models/conference.rb
  41. +10 −1 app/models/event.rb
  42. +25 −6 app/models/frontend/conference.rb
  43. +28 −1 app/models/frontend/event.rb
  44. +4 −4 app/models/recording.rb
  45. +19 −0 app/views/frontend/conferences/list.haml
  46. +9 −4 app/views/frontend/conferences/show.html.haml
  47. +44 −0 app/views/frontend/events/playlist.html.haml
  48. +41 −17 app/views/frontend/events/show.html.haml
  49. +12 −7 app/views/frontend/home/index.html.haml
  50. +3 −0 app/views/frontend/shared/_event_metadata.haml
  51. +1 −1 app/views/frontend/shared/_event_with_conference.html.haml
  52. +2 −0 app/views/frontend/shared/_header.haml
  53. +0 −8 app/views/frontend/shared/_player_audio.haml
  54. +56 −0 app/views/frontend/shared/_player_playlist_audio.haml
  55. +67 −0 app/views/frontend/shared/_player_playlist_video.haml
  56. +4 −0 app/views/frontend/shared/_player_relive.html.haml
  57. +10 −13 app/views/frontend/shared/_player_video.haml
  58. +0 −8 app/views/frontend/shared/_player_video_native.haml
  59. +4 −7 app/views/layouts/frontend/oembed.html.haml
  60. +2 −2 app/views/public/shared/_conference.json.jbuilder
  61. +10 −3 app/views/public/shared/_event.json.jbuilder
  62. +2 −2 app/views/public/shared/_recording.json.jbuilder
  63. +53 −0 app/workers/conference_relive_download_worker.rb
  64. +6 −0 bin/docker-dev-up
  65. +2 −0 config/environments/production.rb
  66. +1 −5 config/initializers/active_admin.rb
  67. +6 −1 config/initializers/assets.rb
  68. +5 −0 config/locales/en.yml
  69. +4 −0 config/routes.rb
  70. +6 −0 db/migrate/20180914181622_add_timelens_to_event.rb
  71. +3 −1 db/schema.rb
  72. +57 −0 docker-compose.yml
  73. 0 docker/.gitkeep
  74. +21 −0 docker/database.yml
  75. +50 −0 docker/nginx.conf
  76. +36 −0 docker/settings.yml
  77. +2 −1 env.example
  78. +2 −2 lib/downloader.rb
  79. +1 −1 lib/feeds/podcast_generator.rb
  80. +55 −0 lib/frontend/playlist.rb
  81. +2 −0 lib/languages.rb
  82. +8 −0 lib/tasks/relive_update.rake
  83. +17 −0 test/controllers/api/conferences_controller_test.rb
  84. +52 −13 test/controllers/api/events_controller_test.rb
  85. +6 −0 test/controllers/frontend/feeds_controller_test.rb
  86. +8 −6 test/controllers/frontend/search_controller_test.rb
  87. +21 −19 test/controllers/public/events_controller_test.rb
  88. +47 −45 test/factories.rb
  89. +34 −0 test/fixtures/relive-gpn18.json
  90. +1 −0 test/fixtures/streaming.json
  91. +3 −1 test/integration/events_api_test.rb
  92. +5 −0 test/integration/frontend/events_integration_test.rb
  93. +21 −0 test/lib/feeds/podcast_generator_test.rb
  94. +2 −2 test/models/conference_test.rb
  95. +3 −1 test/models/event_test.rb
  96. +45 −0 test/workers/conference_relive_download_worker_test.rb
  97. +108 −0 vendor/assets/javascripts/clappr-playback-rate-plugin.js
  98. +1 −0 vendor/assets/javascripts/clappr-thumbnails-plugin.js
  99. +1 −0 vendor/assets/javascripts/clappr.min.js
  100. +1 −1 vendor/assets/javascripts/mediaelement-and-player.js
  101. +274 −0 vendor/assets/javascripts/timelens.js
  102. +2 −2 vendor/assets/mediaelement-plugins/playlist/{playlist.css → playlist.css.scss}
  103. +1 −1 vendor/assets/mediaelement-plugins/playlist/playlist.js
  104. +0 −1 vendor/assets/mediaelement-plugins/playlist/playlist.min.css
  105. +0 −12 vendor/assets/mediaelement-plugins/playlist/playlist.min.js
  106. BIN vendor/assets/mediaelement/mediaelement-flash-video.swf
  107. +116 −0 vendor/assets/stylesheets/timelens.css
@@ -0,0 +1,11 @@
.git
.gitignore

Dockerfile
docker-compose.yml

*.txt
*.md

tmp
log
@@ -2,4 +2,5 @@ SECRET_KEY_BASE=abcde
DEVISE_SECRET_KEY=12345
DEVISE_FROM=test@example.org
SMTP_HOST=localhost
STREAMING_URL=http://streaming.media.ccc.de/streams/v2.json
STREAMING_URL=https://streaming.media.ccc.de/streams/v2.json
RELIVE_URL=https://live.ber.c3voc.de/relive/index.json
@@ -3,3 +3,4 @@ DEVISE_SECRET_KEY=12345
DEVISE_FROM=test@example.org
SMTP_HOST=localhost
STREAMING_URL=file:///test/fixtures/streaming.json
RELIVE_URL=
@@ -20,7 +20,9 @@
/Gemfile.lock.tags
*.patch
vendor/gems/
/sbin
docker/content
docker/db
docker/ssh

# Ignore assets
public/assets
@@ -1,3 +1,6 @@
AllCops:
TargetRubyVersion: 2.4

# old ruby style syntax may still be needed
Style/HashSyntax:
Enabled: false
@@ -1,7 +1,8 @@
language: ruby
rvm:
- 2.3.1
- 2.4.1
- 2.4.4
- 2.5.1
env:
- DATABASE_URL=postgresql://localhost/travis_ci_test
services:
@@ -0,0 +1,12 @@
# Use the the official Ruby image as a base
FROM ruby:2.4.1

# Install runtime dependencies
# Node.js is used for JavaScript compression via the uglifier gem
RUN apt-get update -qq && apt-get install -y nodejs

WORKDIR /voctoweb

# Install required gems
COPY Gemfile Gemfile.lock /voctoweb/
RUN gem install bundler && bundle install
@@ -4,8 +4,7 @@ source 'https://rubygems.org'
gem 'rails', '~> 5.1.0'
gem 'dotenv-rails'

gem 'activeadmin', '~> 1.0.0.pre'
gem 'inherited_resources', github: 'activeadmin/inherited_resources'
gem 'activeadmin'

gem 'tinymce-rails'
gem 'devise'

0 comments on commit 9077b99

Please sign in to comment.
You can’t perform that action at this time.