diff --git a/app/assets/javascripts/recordings.coffee b/app/assets/javascripts/recordings.coffee index 34a54e798b..701394a103 100644 --- a/app/assets/javascripts/recordings.coffee +++ b/app/assets/javascripts/recordings.coffee @@ -168,7 +168,7 @@ class @Recordings draw: -> if !@isOwner() - @table.api().columns(5).search('true') + @table.api().columns(6).search('true') @table.api().columns.adjust().draw() # refresh the recordings from the server diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 928bf1c9c4..bacfc69aed 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -47,10 +47,4 @@ def omniauth_providers_configured(provider = nil) def on_room_or_meeting_page? params[:id].present? end - - def version - Greenlight::VERSION - rescue - 'development' - end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 1db824d379..1cd6131b1c 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -43,7 +43,7 @@ with BigBlueButton; if not, see . diff --git a/circle.yml b/circle.yml index caf30c5c57..5667afd2c7 100644 --- a/circle.yml +++ b/circle.yml @@ -10,5 +10,4 @@ deployment: hub: branch: master commands: - - ./scripts/set_version.sh - ./scripts/build_image_master.sh diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml index bf919df06b..6c51afbc96 100644 --- a/config/locales/en-us.yml +++ b/config/locales/en-us.yml @@ -68,6 +68,7 @@ en-US: end: End enter_name: Enter your name enter_meeting_name: Enter a meeting name to start + footer_html: Powered by %{bbb_link} greet_user: Welcome, %{name} greet_guest: Welcome to %{name} Meeting Space hi_all: Hi Everyone @@ -100,7 +101,6 @@ en-US: phrase2: "Access the following website to view it and publish to other users: %{url}" subject: "Your recording is ready!" past_recordings: Past Recordings - footer_html: "%{greenlight_link} build %{version}, Powered by %{bbb_link}" presentation: Presentation previously_joined_meetings: Previously Joined Meetings return_to_room: Return to your personal room diff --git a/scripts/set_version.sh b/scripts/set_version.sh deleted file mode 100755 index 523e0e7fa3..0000000000 --- a/scripts/set_version.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -echo "module Greenlight VERSION = ${CIRCLE_BUILD_NUM} end" >| $HOME/greenlight/app/lib/version.rb