Commit Graph

885 Commits

Author SHA1 Message Date
Lars Kiesow 61b91881d7
Allow uploading larger presentations (#1977)
* Allow uploading larger presentations

This patch allows uploading presentations up to 30MB instead of the
default 1MB. This should prevent users from getting an 401 reply from
Nginx in most cases.

* Update greenlight.nginx

Co-authored-by: Ahmad Farhat <ahmad.farhat@blindsidenetworks.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-08-04 15:41:03 -04:00
Ahmad Farhat 620416f18a
Fixed issue causing account verify to throw 404 (#1987) 2020-08-04 14:04:47 -04:00
Ahmad Farhat 0710c569b7
GRN2-xx: Allowed file types now matches BigBlueButton (#1966)
* Allowed file types now matches BigBlueButton

* Uppercased file types are now allowed

* Rubocop
2020-08-04 10:35:07 -04:00
MrKeksi 35c82f9c17
small cosmetic changes (#1872)
* removed remains

* comment adapted

* removes blinking background from icons on buttons 

like copy (from room links)

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-08-04 10:26:41 -04:00
Ahmad Farhat bb83bf553d
Revert hiding recording menus when recording disabled (#1959) 2020-07-30 15:18:28 -04:00
Ahmad Farhat ec93d5e472
GRN2-xx: Fixed issue with join warning displaying incorrectly (#1957)
* Fixed issue with room settings

* Update room join consent string
2020-07-30 10:50:04 -04:00
transifex-integration[bot] af8c78fdee
Translate /config/locales/en.yml in gl (#1956)
translation completed for the source file '/config/locales/en.yml'
on the 'gl' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-07-30 10:01:33 -04:00
transifex-integration[bot] 70b3f26db8
Translate /config/locales/en.yml in de_DE (#1955)
translation completed for the source file '/config/locales/en.yml'
on the 'de_DE' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2020-07-30 09:47:13 -04:00
transifex-integration[bot] 141518d6c9
Translate '/config/locales/en.yml' in 'id_ID' (#1823)
* Translate /config/locales/en.yml in id_ID

translation completed for the source file '/config/locales/en.yml'
on the 'id_ID' language.

* Translate /config/locales/en.yml in id_ID

translation completed for the source file '/config/locales/en.yml'
on the 'id_ID' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-07-29 14:51:49 -04:00
transifex-integration[bot] dfdada853b
Translate '/config/locales/en.yml' in 'cs' (#1835)
* Translate /config/locales/en.yml in cs

translation completed for the source file '/config/locales/en.yml'
on the 'cs' language.

* Translate /config/locales/en.yml in cs

translation completed for the source file '/config/locales/en.yml'
on the 'cs' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-07-29 14:44:24 -04:00
transifex-integration[bot] f61049bac2
Translate '/config/locales/en.yml' in 'sk_SK' (#1885)
* Translate /config/locales/en.yml in sk_SK

translation completed for the source file '/config/locales/en.yml'
on the 'sk_SK' language.

* Translate /config/locales/en.yml in sk_SK

translation completed for the source file '/config/locales/en.yml'
on the 'sk_SK' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-07-29 14:37:00 -04:00
transifex-integration[bot] 74febbec12
Translate '/config/locales/en.yml' in 'uk' (#1903)
* Translate /config/locales/en.yml in uk

translation completed for the source file '/config/locales/en.yml'
on the 'uk' language.

* Translate /config/locales/en.yml in uk

translation completed for the source file '/config/locales/en.yml'
on the 'uk' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-07-29 14:23:06 -04:00
transifex-integration[bot] b89a523d10
Translate /config/locales/en.yml in nl (#1953)
translation completed for the source file '/config/locales/en.yml'
on the 'nl' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-07-29 14:00:23 -04:00
transifex-integration[bot] 4a97a87459
Translate '/config/locales/en.yml' in 'fa_IR' (#1929)
* Translate /config/locales/en.yml in fa_IR

translation completed for the source file '/config/locales/en.yml'
on the 'fa_IR' language.

* Translate /config/locales/en.yml in fa_IR

translation completed for the source file '/config/locales/en.yml'
on the 'fa_IR' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-07-29 13:46:27 -04:00
transifex-integration[bot] 9932c32956
Translate /config/locales/en.yml in he_IL (#1944)
translation completed for the source file '/config/locales/en.yml'
on the 'he_IL' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-07-29 13:33:22 -04:00
Ahmad Farhat 60cf5f7440
Merge v2.7-alpha (#1951)
* Fix wrong conditional (reported by LGTM) (#1477)

Signed-off-by: Stefan Weil <sw@weilnetz.de>

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Bump rack from 2.2.2 to 2.2.3 (#1839)

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](https://github.com/rack/rack/compare/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>

* [FIX]  Unable to edit long recording names #1776  (#1780)

* Allow to set a filter for LDAP authentication

* [FIX] Unable to edit long recording names #1776

Co-authored-by: François Ménabé <francois.menabe@unistra.fr>
Co-authored-by: farhatahmad <ahmad.af.farhat@gmail.com>

* Desgin for Manage Users Tabs (#1777)

* Update _subtitle.html.erb

* Update _manage_users_tags.html.erb

* Update admins.scss

* Update _primary_themes.scss

* Update _manage_users_tags.html.erb

* Minor style changes to manage users (#1845)

* Maintenance banner moved to admin site (#1775)

* initial

* finish

* travis fixes

* travis again

* not required

* Co-authored-by: Tobias Fiebig <t.fiebig@tudelft.nl> (#1296)

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Enhance Room OpenGraph Metadata (#1601)

* Revert "Enhance Room OpenGraph Metadata (#1601)" (#1852)

This reverts commit 3b007c233ae12e0407f216ae269c63d6179f73b8.

* GRN2-xx: Tab title now displays the current page name (#1853)

* Tab title now displays the current page name

* Added page title for the rest of the pages

* Split Site Settings into 3 different tabs (#1858)

* Split Site Settings into 3 different tabs

* Fix copyright

* Added redirect to correct tab

* Make sure settings are displaying when they should

* Update en.yml (#1857)

* Build images for alpha branches (#1867)

* Upgraded jquery to latest version (#1896)

* Added favicon tag (#1898)

* Fixed XSS issue with role name (#1899)

* Update path for coloring redirect (#1908)

* Added a fourth section to the room uid (#1910)

* Fixed issue with insecure room sharing removal (#1914)

* Fixes typo (#1917)

Fixes typo: successfully was written incorrect.

* Fixed order of rooms in server rooms (#1915)

* Change default room sort to latest activity (#1919)

* GRN2-xx: Small changes/improvements to the recording settings (#1851)

* Small changes/improvements to the recording settings

* Replaced room warning with info flash

* Added global setting to enable/disable the recording consent feature

* Replace Legal with Terms (#1931)

* Added a more friendly OpenGraph description when invited to join a room (#1932)

* Fixed issue causing maintenance banner not to hide correctly (#1933)

* Hide recording menu and recording list when it is disabled (#1935)

* Hide recording menu and recording list when it is disabled

* Hide recording list when disabled

* GRN2-xx: Added an auto-refresh after 2 mins while waiting for room to start (#1947)

* Added an auto-refresh after 2 mins while waiting for room to start

* Fixed random issue with test case

* GRN2-xx: Added ability to preupload presentations to rooms (#1895)

* 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

* Record title, instead of room name, in the popup (#1924)

* Update _public_recording_row.html.erb

* Update _recording_row.html.erb

Co-authored-by: Stefan Weil <sw@weilnetz.de>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: beckerr-rzht <beckerr@hochschule-trier.de>
Co-authored-by: François Ménabé <francois.menabe@unistra.fr>
Co-authored-by: MrKeksi <mrkeksi@users.noreply.github.com>
Co-authored-by: yanosz <yanosz@users.noreply.github.com>
Co-authored-by: Moritz Schlarb <moschlar@metalabs.de>
Co-authored-by: chronikum <34622984+chronikum@users.noreply.github.com>
Co-authored-by: Mitsutaka Sato <miztaka@honestyworks.jp>
Co-authored-by: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
2020-07-29 11:03:22 -04:00
Ahmad Farhat 50c2070188
Fix issue with search in manage users (#1792) 2020-06-12 15:10:12 -04:00
transifex-integration[bot] 152c636fa3
Translate '/config/locales/en.yml' in 'pt_BR' (#1787)
* Translate /config/locales/en.yml in pt_BR

translation completed for the source file '/config/locales/en.yml'
on the 'pt_BR' language.

* Translate /config/locales/en.yml in pt_BR

translation completed for the source file '/config/locales/en.yml'
on the 'pt_BR' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-06-12 11:22:43 -04:00
Ahmad Farhat b84f10a51a
GRN2-xx: Cleaned up manage users query (#1786)
* Cleaned up manage users query

* Bring back filter by role
2020-06-12 10:01:53 -04:00
transifex-integration[bot] a32a383b65
Translate '/config/locales/en.yml' in 'eu' (#1785)
* Translate /config/locales/en.yml in eu

translation completed for the source file '/config/locales/en.yml'
on the 'eu' language.

* Translate /config/locales/en.yml in eu

translation completed for the source file '/config/locales/en.yml'
on the 'eu' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-06-11 16:21:03 -04:00
Ahmad Farhat 06236b49f7
Sanitize search for users and rooms (#1784) 2020-06-11 12:39:18 -04:00
Ahmad Farhat cf794db595
Added ability to map attributes for LDAP (#1779) 2020-06-11 11:28:55 -04:00
transifex-integration[bot] 2c1a11e9a3
Translate '/config/locales/en.yml' in 'ru' (#1781)
* Translate /config/locales/en.yml in ru

translation completed for the source file '/config/locales/en.yml'
on the 'ru' language.

* Translate /config/locales/en.yml in ru

translation completed for the source file '/config/locales/en.yml'
on the 'ru' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-06-11 10:46:18 -04:00
Ahmad Farhat 39c31e759a
Fixed issue causing manage users to through 500 (#1778) 2020-06-11 10:21:11 -04:00
dependabot[bot] 62da03b9dc
Bump websocket-extensions from 0.1.4 to 0.1.5 (#1757)
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-ruby) from 0.1.4 to 0.1.5.
- [Release notes](https://github.com/faye/websocket-extensions-ruby/releases)
- [Changelog](https://github.com/faye/websocket-extensions-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-ruby/compare/0.1.4...0.1.5)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-09 15:19:18 -04:00
transifex-integration[bot] c7472e6d80
Translate '/config/locales/en.yml' in 'kn' (#1754)
* Translate /config/locales/en.yml in kn

translation completed for the source file '/config/locales/en.yml'
on the 'kn' language.

* Translate /config/locales/en.yml in kn

translation completed for the source file '/config/locales/en.yml'
on the 'kn' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2020-06-04 15:59:05 -04:00
Ahmad Farhat 959cfe0425
Fixed user create task failing with invalid role (#1751) 2020-06-04 14:08:25 -04:00
Ahmad Farhat f9e85aadb9
Fix home room not being created if user gets assigned new role (#1750) 2020-06-04 12:05:58 -04:00
Ahmad Farhat 33ca929630
Fixed Role not exist warning in user create (#1737) 2020-06-03 14:44:45 -04:00
Ahmad Farhat a61b96289e
Updated sample env for SMTP setting (#1736) 2020-06-03 13:31:40 -04:00
transifex-integration[bot] 9edddc9fd4
Translate /config/locales/en.yml in da (#1730)
translation completed for the source file '/config/locales/en.yml'
on the 'da' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-06-03 10:28:14 -04:00
LifeEncrypter b297fdfbaf
Added optional SMTP_OPENSSL_VERIFY_MODE (#1703)
* Added optional SMTP_OPENSSL_VERIFY_MODE to fix mailserver certificate issues

* Added optional SMTP_OPENSSL_VERIFY_MODE

Fixed to long line. [139/130]

* Fix multi-line indent

* Remove elseif statements and use much shorter way of checking for SMTP_OPENSSL_VERIFY_MODE

* Too long line again

* Moved SMTP_OPENSSL_VERIFY_OPTION. Specified what it does. Added security warning

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-06-03 10:13:08 -04:00
Ahmad Farhat 13fb9faa4c
Fixed issue with LDAP role not being respected (#1728) 2020-06-02 16:50:52 -04:00
Ahmad Farhat 737d39dce9
Signed in users are now redirected to main page if they try to access root (#1726) 2020-06-02 16:42:15 -04:00
transifex-integration[bot] 9cf7e53c99
Translate '/config/locales/en.yml' in 'ja_JP' (#1708)
* Translate /config/locales/en.yml in ja_JP

translation completed for the source file '/config/locales/en.yml'
on the 'ja_JP' language.

* Translate /config/locales/en.yml in ja_JP

translation completed for the source file '/config/locales/en.yml'
on the 'ja_JP' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-06-02 13:45:42 -04:00
transifex-integration[bot] 68b17a586a
Translate '/config/locales/en.yml' in 'fr' (#1705)
* Translate /config/locales/en.yml in fr

translation completed for the source file '/config/locales/en.yml'
on the 'fr' language.

* Translate /config/locales/en.yml in fr

translation completed for the source file '/config/locales/en.yml'
on the 'fr' language.

* Translate /config/locales/en.yml in fr

translation completed for the source file '/config/locales/en.yml'
on the 'fr' language.

* Translate /config/locales/en.yml in fr

translation completed for the source file '/config/locales/en.yml'
on the 'fr' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-06-02 13:23:55 -04:00
transifex-integration[bot] ae80f76fd6
Translate '/config/locales/en.yml' in 'hu_HU' (#1713)
* Translate /config/locales/en.yml in hu_HU

translation completed for the source file '/config/locales/en.yml'
on the 'hu_HU' language.

* Translate /config/locales/en.yml in hu_HU

translation completed for the source file '/config/locales/en.yml'
on the 'hu_HU' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-06-02 11:33:14 -04:00
Ahmad Farhat 7e27feb70b
Removed default order by priority on roles (#1720) 2020-06-02 11:12:33 -04:00
Ahmad Farhat 4da03957a9
Fix rename recordings (#1721) 2020-06-02 11:01:35 -04:00
Ahmad Farhat 8355c59b00
Upgrade LDAP gem version (#1700) 2020-05-28 18:36:20 -04:00
Ahmad Farhat 8444b2c333
Fixed room remove task (#1695) 2020-05-28 18:24:03 -04:00
Ahmad Farhat fe363e742b
Home rooms are created for all users with role if can_create_rooms is enabled (#1694) 2020-05-28 14:48:18 -04:00
transifex-integration[bot] 5e4fe3b306
Translate '/config/locales/en.yml' in 'zh_CN' (#1683)
* Translate /config/locales/en.yml in zh_CN

translation completed for the source file '/config/locales/en.yml'
on the 'zh_CN' language.

* Translate /config/locales/en.yml in zh_CN

translation completed for the source file '/config/locales/en.yml'
on the 'zh_CN' language.

* Translate /config/locales/en.yml in zh_CN

translation completed for the source file '/config/locales/en.yml'
on the 'zh_CN' language.

* Translate /config/locales/en.yml in zh_CN

translation completed for the source file '/config/locales/en.yml'
on the 'zh_CN' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-05-28 14:37:32 -04:00
Ahmad Farhat 3be109df54
Fixed user create rake task (#1690) 2020-05-28 14:27:46 -04:00
Ahmad Farhat b0de03cc09
Fixed migration erroring (#1681) 2020-05-27 17:45:35 -04:00
Ahmad Farhat db6db06a78
Fix date for duplicate rooms (#1680) 2020-05-27 16:42:26 -04:00
transifex-integration[bot] 140254ad62
Translate '/config/locales/en.yml' in 'gl' (#1676)
* Translate /config/locales/en.yml in gl

translation completed for the source file '/config/locales/en.yml'
on the 'gl' language.

* Translate /config/locales/en.yml in gl

translation completed for the source file '/config/locales/en.yml'
on the 'gl' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-05-27 16:13:19 -04:00
Ahmad Farhat d7079e7880
Fixes for 2.6 (#1677) 2020-05-27 14:46:33 -04:00
transifex-integration[bot] 39962c54df
Translate '/config/locales/en.yml' in 'de_DE' (#1673)
* Translate /config/locales/en.yml in de_DE

translation completed for the source file '/config/locales/en.yml'
on the 'de_DE' language.

* Translate /config/locales/en.yml in de_DE

translation completed for the source file '/config/locales/en.yml'
on the 'de_DE' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-05-27 14:12:44 -04:00
transifex-integration[bot] e3f5d40139
Translate '/config/locales/en.yml' in 'tr' (#1639)
* Translate /config/locales/en.yml in tr

translation completed for the source file '/config/locales/en.yml'
on the 'tr' language.

* Translate /config/locales/en.yml in tr

translation completed for the source file '/config/locales/en.yml'
on the 'tr' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-05-27 11:23:38 -04:00