Merge v2.7-alpha #1951
Merged
Merge v2.7-alpha #1951
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Stefan Weil <sw@weilnetz.de> Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
Bumps [rack](https://github.com/rack/rack) from 2.2.2 to 2.2.3. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md) - [Commits](rack/rack@v2.2.2...2.2.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Update _subtitle.html.erb * Update _manage_users_tags.html.erb * Update admins.scss * Update _primary_themes.scss * Update _manage_users_tags.html.erb
* initial * finish * travis fixes * travis again * not required
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
* Tab title now displays the current page name * Added page title for the rest of the pages
* Split Site Settings into 3 different tabs * Fix copyright * Added redirect to correct tab * Make sure settings are displaying when they should
Fixes typo: successfully was written incorrect.
* Small changes/improvements to the recording settings * Replaced room warning with info flash * Added global setting to enable/disable the recording consent feature
* Hide recording menu and recording list when it is disabled * Hide recording list when disabled
… start (#1947) * Added an auto-refresh after 2 mins while waiting for room to start * Fixed random issue with test case
* Added ability to preupload presentations to rooms (#1868) * Added setting to site settings and allowed admins to change the presentation * Added AWS S3 and GCS Storage ENV variables * Added check to ensure file extension is correct * Added icon to remove presentation * Added testcases for preupload * Add nginx redirect to solve issue with relative root
* Update _public_recording_row.html.erb * Update _recording_row.html.erb
MBcom
pushed a commit
to MBcom/enforce-authentication-greenlight
that referenced
this pull request
Apr 10, 2021
…matik * commit '5c75d9bc905f3ba21c79fc94c36ed44a72417b71': Translate /config/locales/en.yml in de_DE Translate /config/locales/en.yml in de_DE Translate '/config/locales/en.yml' in 'id_ID' (bigbluebutton#1823) Translate '/config/locales/en.yml' in 'cs' (bigbluebutton#1835) Translate '/config/locales/en.yml' in 'sk_SK' (bigbluebutton#1885) Translate '/config/locales/en.yml' in 'uk' (bigbluebutton#1903) Translate /config/locales/en.yml in nl (bigbluebutton#1953) Translate '/config/locales/en.yml' in 'fa_IR' (bigbluebutton#1929) Translate /config/locales/en.yml in he_IL (bigbluebutton#1944) Merge v2.7-alpha (bigbluebutton#1951)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.