Merge branch 'master' into webhooks

config/initializers/omniauth.rb

@@ -7,5 +7,5 @@ Rails.application.config.omniauth_twitter = ENV['TWITTER_ID'].present?
 Rails.application.config.middleware.use OmniAuth::Builder do
   provider :twitter, ENV['TWITTER_ID'], ENV['TWITTER_SECRET']
   provider :google_oauth2, ENV['GOOGLE_OAUTH2_ID'], ENV['GOOGLE_OAUTH2_SECRET'],
-    scope: ['profile', 'email'], access_type: 'online', name: 'google'
+    scope: ['profile', 'email', 'youtube', 'youtube.upload'], access_type: 'online', name: 'google'
 end

config/initializers/youtube.rb

@@ -0,0 +1,21 @@
+# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
+#
+# Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
+#
+# This program is free software; you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License as published by the Free Software
+# Foundation; either version 3.0 of the License, or (at your option) any later
+# version.
+#
+# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+
+Yt.configure do |config|
+  config.log_level = :debug
+  config.client_id = ENV['GOOGLE_OAUTH2_ID']
+  config.client_secret = ENV['GOOGLE_OAUTH2_SECRET']
+end

config/locales/en-us.yml

@@ -47,8 +47,11 @@ en-US:
   client:
     are_you_sure: Are you sure?
     change_visibility: Change visibility
-    delete_recording: Delete recording
+    delete_recording: Delete
+    email_footer_1: This e-mail is auto-generated by your friendly neighbourhood BigBlueButton server. Do no reply to this e-mail.
+    email_footer_2: BigBlueButton is an open source web conferencing system. For more information on BigBlueButton and it's amazing capabilities, see https://bigbluebutton.org/ .
     enter_name: Enter a name to join
+    mail_recording: Mail
     meeting_ended: Meeting was ended
     meeting_started: Meeting was started
     no_recordings: No Recordings
@@ -59,13 +62,18 @@ en-US:
     recording_created: A recording was created
     recording_deleted: Recording was deleted
     recording_published: Recording was published
+    recording_mail_subject: " has invited you to view a recording."
+    recording_mail_body: "To view the recording, follow the link below:"
     recording_unlisted: Recording was unlisted
     recording_unpublished: Recording was unpublished
+    share: Share
     unpublish_recording: Hide recording
     unlisted: Unlisted
     unpublished: No one
+    upload_youtube: Youtube
     user_waiting_body: "%{user} is waiting to join %{meeting}!"
     user_waiting_title: A user is waiting
+    youtube_disabled: Recording did not contain any video.
   copied: Copied
   copy_error: Use Ctrl-c to copy
   create_your_session: Create your own meeting
@@ -156,11 +164,18 @@ en-US:
       phrase1: This is a test email sent to %{email}
   thumbnails: Thumbnails
   upload: Upload
+  upload_to_youtube: Upload to Youtube
   url_copy_explanation: Copy this URL to invite others to the meeting
   user_person_room: "%{name} personal room"
   video: Video
+  video_title: Video title
   visibility: Visibility
   wait_for_mod_msg: Looks like you're the first one here...
   wait_for_mod_explanation: You will automatically join when the meeting starts
   watch: Watch
   'yes': 'Yes'
+  youtube_description: This recording was recorded with BigBlueButton. For more information check out %{url}.
+  youtube_privacy_options:
+    public: Public
+    private: Private
+    unlisted: Unlisted

config/routes.rb

@@ -38,6 +38,8 @@ Rails.application.routes.draw do
     scope '/:room_id', :constraints => {:room_id => disallow_slash} do
       # recording routes for updating, deleting and viewing recordings
       get '/(:id)/recordings', to: 'bbb#recordings', defaults: {id: nil, format: 'json'}, :constraints => {:id => disallow_slash}
+      get '/(:id)/recordings/can_upload', to: 'bbb#can_upload', defaults: {id: nil, format: 'json'}, :constraints => {:id => disallow_slash}
+      post '/(:id)/recordings/:record_id', to: 'bbb#youtube_publish', defaults: {id: nil, format: 'json'}, :constraints => {:id => disallow_slash}
       patch '/(:id)/recordings/:record_id', to: 'bbb#update_recordings', defaults: {id: nil, format: 'json'}, :constraints => {:id => disallow_slash}
       delete '/(:id)/recordings/:record_id', to: 'bbb#delete_recordings', defaults: {id: nil, format: 'json'}, :constraints => {:id => disallow_slash}