forked from External/greenlight
Merge v2.6-alpha (#1672)
* GRN2-xx: Switch the relation between users and roles to make queries cleaner and faster (#1299)
* First steps
* Fixes in account creation flow
* Fixed most testcases
* more test fixes
* Fixed more test cases
* Passing tests and rubocop
* Added rake task to remove rooms
* Adding translation (#1510)
* Update _account.html.erb
* Update en.yml
* Fix "for" attribute for label elements (#1488)
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
* Fix some issues reported by LGTM (#1478)
* Declare local JavaScript variables (reported by LGTM)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* Remove unused local JavaScript variable (reported by LGTM)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* Puma Worker Configuration (#1332)
We noticed that the current default settings perform very poorly under
load. We managed to literally take down Greenlight during a larger event
when people where accessing the landing page for rooms and when doing
some tests, I was more or less able to DoS Greenlight on my own.
This patch adds a default worker configuration which significantly
improves the situation. The small, 4 core machine I was testing on could
handle about thrice the amount of requests.
While the new default configuration should be reasonably well suited for
most deployments, this patch further allows users to easily configure
the worker pool on their own in the environment file.
* Made name and email readonly for no greenlight accounts (#1534)
* Fixed hardcoded string (#1532)
* fixed spelling error that was bugging me :) - sep a rat e (#1535)
Co-authored-by: Dave Lane <dave@oerfoundation.org>
* Improve Server Rooms View (#1524)
* Order rooms by status
* Cleaned up order function
* Now displays Started/Created/Ended
* Added participant count to rooms list
* Fix rake task user:create so that users can be created when terms are present (#1565)
* Changed user create task to always accept terms
* clean up
* More secure room ID (#1451)
* Legal and privpolicy link (#1421)
* add customizable Links to Imprint and Privacy Policy
* fix copy&paste error in spec
* replace "imprint" with "legal" since that is the correct term
* remove german translation of new strings, transifex will take care of them later
* GRN2-295:Refactored update profile and update password (#1591)
* Refactored update profile and update password
* Relowered rubocop settings
* Fixed email sending when not supposed to (#1592)
* Design changes for small screens (#1580)
* now rap for pagination
* Update _subtitle.html.erb
* Update _rooms.html.erb
* Update _recordings.html.erb
* Update _rooms.html.erb
* Update _users.html.erb
* Update cant_create_rooms.html.erb
* Update room.js
* Update edit.html.erb
* Update new.html.erb
* Update cant_create_rooms.html.erb
* Update _sessions.html.erb
* Update _account.html.erb
* Make Greenlight work with Ruby 2.7 (#1560)
Greenlight's failure to start up with Ruby 2.7 seems to be caused by [an
issue in bootsnap](https://github.com/Shopify/bootsnap/issues/258).
Updating that library makes Greenlight work again.
However, there are still a lot of deprecation warnings. But that's
something to deal with separately.
This fixes #1558
* use email input for sign in (#1199)
* use email input for sign in
* use email input for registration
* use email input for invitation
* use email input for account settings
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
* Fix Gemfile (#1593)
* Fixed invalid token for password reset (#1632)
* HELP_URL env variable now works as expected (#1636)
* #1372 Fix for long Text in Table + Remove invalid HTML Tag (#1403)
* removed invalid HTML Tag
* removed invalid HTML Tag
* Update _public_recording_row.html.erb
* Update _recording_row.html.erb
* Update _server_recording_row.html.erb
form-inline replaced by own css
* Update _server_room_row.html.erb
* Update _public_recording_row.html.erb
* Update _recording_row.html.erb
* Update _public_recording_row.html.erb
* Update _recordings.html.erb
* Update _rooms.html.erb
* Update main.scss
fix for long text
* Update main.scss
* Update _public_recording_row.html.erb
* Added more validation on profile image (#1644)
* Users who can't create rooms but have shared rooms now have a different view (#1649)
* Revert "Puma Worker Configuration (#1332)" (#1667)
This reverts commit 78ed8d7460.
* Removed html safe from all flash messages (#1668)
* Remove hardcoded guest=true if require mod approval is set (#1669)
* Change random generation for room uid (#1670)
* GRN2-290: Update gems and update to Rails 5.2.4.3 (#1671)
* Update gems and update to Rails 5.2.4.3
* remove gemfile error
Co-authored-by: MrKeksi <mrkeksi@users.noreply.github.com>
Co-authored-by: Florian Weber <fnwbr@users.noreply.github.com>
Co-authored-by: Stefan Weil <sw@weilnetz.de>
Co-authored-by: Lars Kiesow <lkiesow@uos.de>
Co-authored-by: Dave Lane <dave@lane.net.nz>
Co-authored-by: Dave Lane <dave@oerfoundation.org>
Co-authored-by: Henning <hng@users.noreply.github.com>
Co-authored-by: Marcel Waldvogel <marcel@waldvogel.family>
Co-authored-by: Christian Marg <marg@rz.tu-clausthal.de>
Co-authored-by: Klaus <klaus@jsxc.org>
This commit is contained in:
Ahmad Farhat
GitHub
@ -126,7 +126,7 @@ module Greenlight
|
||||
config.maintenance_mode = ENV["MAINTENANCE_MODE"] == "true"
|
||||
|
||||
config.report_issue_url = ENV["REPORT_ISSUE_URL"]
|
||||
config.help_url = ENV["HELP_URL"].presence || "https://docs.bigbluebutton.org/greenlight/gl-overview.html"
|
||||
config.help_url = ENV["HELP_URL"].nil? ? "https://docs.bigbluebutton.org/greenlight/gl-overview.html" : ENV["HELP_URL"]
|
||||
|
||||
# DEFAULTS
|
||||
|
||||
|
||||
@ -43,6 +43,18 @@ en:
|
||||
placeholder: Image Url...
|
||||
title: Branding Image
|
||||
invalid: Invalid URL
|
||||
legal:
|
||||
change: Change URL
|
||||
info: Change the Legal Link that appears in the bottom of the page
|
||||
placeholder: Legal URL...
|
||||
title: Legal
|
||||
invalid: Invalid URL
|
||||
privpolicy:
|
||||
change: Change URL
|
||||
info: Change the Privacy Policy Link that appears in the bottom of the page
|
||||
placeholder: Privacy Policy URL...
|
||||
title: Privacy Policy
|
||||
invalid: Invalid URL
|
||||
cache:
|
||||
info: Clears the stored provider cache which forces a new request for the updated info
|
||||
title: Clear Provider Cache
|
||||
@ -145,9 +157,12 @@ en:
|
||||
rooms:
|
||||
title: Server Rooms
|
||||
table:
|
||||
ended: "Ended: %{session}"
|
||||
id: ID
|
||||
not_running: Not Running
|
||||
participants: Participants
|
||||
running: Running
|
||||
started: "Started: %{session}"
|
||||
status: Status
|
||||
view: View
|
||||
title: Organization Settings
|
||||
@ -246,6 +261,8 @@ en:
|
||||
designs: Custom Designs
|
||||
authentication: User Authentication
|
||||
footer:
|
||||
legal: Legal
|
||||
privpolicy: Privacy Policy
|
||||
powered_by: Powered by %{href}.
|
||||
forgot_password:
|
||||
subtitle: Forgot Password
|
||||
@ -368,7 +385,7 @@ en:
|
||||
warning: You will <b>not</b> be able to recover this room
|
||||
recording_warning: or any of its %{recordings_num} associated recordings.
|
||||
invite_user:
|
||||
email_placeholder: Enter the users' emails (seperated by commas)
|
||||
email_placeholder: Enter the users' emails (separated by commas)
|
||||
footer: The user will receive an email with instructions on how to sign up
|
||||
send: Send Invite
|
||||
title: Invite User
|
||||
@ -469,6 +486,7 @@ en:
|
||||
remove: Remove
|
||||
rename: Rename
|
||||
reset_password:
|
||||
invalid_token: Password reset token is invalid. Please try resetting your password again.
|
||||
subtitle: Reset Password
|
||||
password: New Password
|
||||
confirm: New Password Confirmation
|
||||
@ -534,9 +552,10 @@ en:
|
||||
provider: Provider
|
||||
image: Image
|
||||
image_url: Profile Image URL
|
||||
roles: User Roles
|
||||
roles: User Role
|
||||
subtitle: Update your Account Info
|
||||
title: Account Info
|
||||
reset_password: Reset user password
|
||||
delete:
|
||||
button: Yes, I would like to delete my account.
|
||||
disclaimer: If you choose to delete your account, it will <b>NOT</b> be recoverable. All information regarding your account, including settings, rooms, and recording will be removed.
|
||||
|
||||
@ -17,6 +17,9 @@ port ENV.fetch("PORT") { 80 }
|
||||
#
|
||||
environment ENV.fetch("RAILS_ENV") { "development" }
|
||||
|
||||
# Specifies the `pidfile` that Puma will use.
|
||||
pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
|
||||
|
||||
# Specifies the number of `workers` to boot in clustered mode.
|
||||
# Workers are forked webserver processes. If using threads and workers together
|
||||
# the concurrency of the application would be max `threads` * `workers`.
|
||||
|
||||
@ -88,13 +88,14 @@ Rails.application.routes.draw do
|
||||
post '/login', to: 'sessions#create', as: :create_session
|
||||
|
||||
# Log the user out of the session.
|
||||
get '/logout', to: 'sessions#destroy'
|
||||
post '/logout', to: 'sessions#destroy'
|
||||
|
||||
# Account management.
|
||||
get '/:user_uid/edit', to: 'users#edit', as: :edit_user
|
||||
get '/:user_uid/change_password', to: 'users#change_password', as: :change_password
|
||||
get '/:user_uid/delete_account', to: 'users#delete_account', as: :delete_account
|
||||
patch '/:user_uid/edit', to: 'users#update', as: :update_user
|
||||
post '/:user_uid/edit', to: 'users#update', as: :update_user
|
||||
post '/:user_uid/change_password', to: 'users#update_password', as: :update_password
|
||||
delete '/:user_uid', to: 'users#destroy', as: :delete_user
|
||||
|
||||
# All user recordings
|
||||
@ -106,6 +107,9 @@ Rails.application.routes.draw do
|
||||
get '/auth/failure', to: 'sessions#omniauth_fail'
|
||||
post '/auth/ldap', to: 'sessions#ldap', as: :ldap_callback
|
||||
|
||||
# Users who can't create rooms
|
||||
get '/rooms', to: 'rooms#cant_create_rooms', as: :cant_create_rooms
|
||||
|
||||
# Room resources.
|
||||
resources :rooms, only: [:create, :show, :destroy], param: :room_uid, path: '/'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user