Commit Graph

81 Commits

Author SHA1 Message Date
42f4fcff5a URI check only for http or https (#2915)
* URI check only for http or https

* Update joiner.rb

* Update joiner.rb

* Update joiner.rb
2021-09-27 21:31:03 -04:00
6e804d550a response code must be 200 (#2916) 2021-09-27 21:30:08 -04:00
3987a8b913 Added support for protected recordings (#2907) 2021-09-19 14:14:53 -04:00
beb414aec7 Use the user image for BBB avatar #2 (Limit image size) (#2860)
* Update bbb_server.rb

* Update bbb_server.rb

* showing user avatar

To make sure something unexpected happens

* revert if current_user due to the undefined error

* Update bbb_server.rb

'if current_user' should not have problem, but rubocop complains...

* Update bbb_server.rb

* add an option to avatar image

* Add an option to avatar image

* add an option avatar_image

* Update rooms_controller.rb

* Update joiner.rb

* Update bbb_server.rb

* Update joiner.rb

* Update joiner.rb

* Update rooms_controller.rb

* Update joiner.rb

* Update sample.env

* Update application_helper.rb

* Update rooms_controller.rb

* Update joiner.rb

* Update bbb_server.rb

* Update application_helper.rb

Add a check if the URL is valid.

* double the limit

* move the judgement to controller

* Update joiner.rb

* Update rooms_controller.rb

* Update application_helper.rb

* Update rooms_controller.rb

* Update application.rb

* Update joiner.rb

* Update rooms_controller.rb

* Update joiner.rb

* Update rooms_controller.rb

* Update application_helper.rb

* Update application.rb

* in case parameter not set

* change to MAX_AVATAR_SIZE

* Notification default value

Co-authored-by: Jesus Federico <jesus@123it.ca>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2021-09-18 18:56:39 -04:00
1f2ef10da6 Fixed issue with All Recordings not returning all recordings if user has too many rooms (#2896) 2021-09-06 14:58:41 -04:00
e19e6e02fe Show access code in welcome message (#2817)
* WR361495 Show access code in welcome message

* Add spec and tidyup code
2021-07-07 23:00:31 -04:00
f013e2b529 GRN2-385: Recording permission tied to role cleanup (#2812)
* Code cleanup

* String change
2021-06-28 21:47:04 -04:00
a7ecd54381 Feat: recording perm (#2775)
* fix: comment into code not related - abusive copy/paste

* Add user permission for recording

Add a role permission 'can_launch_record' to users to set the ability to run recording. By default everybody can record, but we can set to the user role without perm to record and create a new role for those who can.
2021-06-23 18:16:37 -04:00
0f90c4e873 Added inaccesible recording format (#2750) 2021-06-02 18:50:11 -04:00
3a4497d1a1 Fix error with missing last session (#2721)
In some cases when you create a new room there is a missing last session. This throws an error. This check fixes that error.
2021-05-19 16:58:32 -04:00
eeab951fcd Added full email list to invite flash (#2646) 2021-04-12 17:32:48 -04:00
6b7f9e0831 Fixed 500 if user has no rooms in Latest Recordings (#2600) 2021-03-23 17:58:30 -04:00
79beb7f3fa Added valid until text to invite email (#2599) 2021-03-22 19:26:51 -04:00
9dc59b1211 Add optional moderator codes (#2413)
* add column for moderator code

* add interface for moderator access code

* add support for write and update moderator access

* check if correct moderator_code in session

* move access code form into own component

* add support for moderator access code

* add support for moderator access code

* add copy code button for moderator code

* freeze all the things

* add tests for moderator access code

* add helpfer for moderator_access setting

* add setting for moderator access code

* show setting for moderator access code

* add checks for moderator code setting

* use method from room controller for moderator password check

* add tests for login with moderator access code

* add check for moderator code setting

* check if moderator codes are enabled in settings

* only display form for moderator code if enabled in settings

* add newline at end of file

* make check for moderator code available as helper

* align style of join button and access code button

* add localization for moderator codes

* add field for moderator codes

* add field for moderator access code to rooms

* fixes for rubocop

* fix LineLenghts for rubocop

* fix double space

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2021-03-14 14:24:30 -04:00
09ab074aaf Complete refactor of Gemfile and upgraded gems (#2553) 2021-02-26 17:34:07 -05:00
1667ac40e8 fix(omniauth): Correct too many redrect error with OpenID provider (#2462)
* fix(omniauth): Correct too many redrect error with OpenID provider

This fix avoids "Too Many redirects" error with login with OpenID and without terms

* Correct code for travis rules checks

Replace if not by unless to fulfill requirements by travis

* Update authenticator.rb

* Remove trailing space

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2021-02-10 17:13:54 -05:00
8fcb80a7d5 Fixed issue causing 500 for unautheticated users (#2515) 2021-02-06 15:40:21 -05:00
062525d2d5 Pass createTime as part of the join call (#2488) 2021-01-27 19:48:39 -05:00
2b0a80c7eb GRN2-277: Optimize server recordings to make it useable for large deployments (#2411)
* First changes to server recordings

* Update server recordings

* Rubocop

* Make sure to return nothing for empty searches

* Made sure exactly the right amount of recordings are returned

* Added test cases
2021-01-12 17:36:51 -05:00
752b192ef9 Only pass muteOnStart if set to true (#2401) 2021-01-04 17:55:09 -05:00
86e6056d3c GRN2-310: Share Access now dynamically pulls the list of users from the server (#2380)
* Share Access now dynamically pulls the list of users from the server

* Merge users now dynamically pulls the list of users from the server

* Only return the information needed to the front-end
2020-12-21 17:21:17 -05:00
5a51f6d714 Added mapping roles through email to site settings (#2373) 2020-12-16 19:31:32 -05:00
14350c5f5d Added field to track users last login (#2367) 2020-12-14 18:52:08 -05:00
0c8c102f4a Fix Invite Link Separator (#2309)
This patch fixes the separator before the invite link in the text which
is sent to BigBlueButton. The `\n` characters were filtered out so that
at least a space character was missing here.

This fixes #2307

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-12-05 14:27:56 -05:00
49f7a7714a Fixed issue with ldap redirect throwing 404 (#2231) 2020-10-26 11:50:43 -04:00
5c79d37524 GRN2-xx: Added a tab that displays invited users when using Join by Invitation (#2162)
* Added a tab that displays invited users when using Join by Invitation

* Made search work
2020-10-07 11:23:19 -04:00
1c2e8ad040 Removed unused option in code (#2153) 2020-10-05 13:53:47 -04:00
165eeccb23 Manually encode the ampersand in a presentation file name (#2140) 2020-09-29 14:48:54 -04:00
c1c62e8bf8 Fixed issue with shared room not having correct record setting (#2053) 2020-09-02 13:55:09 -04:00
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
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 3b007c233a.

* 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
50c2070188 Fix issue with search in manage users (#1792) 2020-06-12 15:10:12 -04:00
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
39c31e759a Fixed issue causing manage users to through 500 (#1778) 2020-06-11 10:21:11 -04:00
f9e85aadb9 Fix home room not being created if user gets assigned new role (#1750) 2020-06-04 12:05:58 -04:00
7e27feb70b Removed default order by priority on roles (#1720) 2020-06-02 11:12:33 -04:00
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
51824ad84b 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>
2020-05-26 17:37:23 -04:00
6fc402e40b GRN2-xx: Added SAFE_HOSTS env variable to block unknown hosts (#1543)
* Added SAFE_HOSTS env variable to block unknown hosts

* Update sample.env
2020-05-08 13:33:02 -04:00
28302107bd GRN2-xx: Restructured email verification and password reset (#1444)
* Restructured email verification and password reset

* Fixed issue with password reset

Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-29 17:56:46 -04:00
c81c6ab417 Update joiner.rb 2020-04-28 13:31:27 -04:00
44bd2315b2 Merge branch 'master' into room-settings 2020-04-28 13:12:20 -04:00
aeaa1e7d45 Merge branch 'v2' 2020-04-22 23:40:28 -04:00
855694c716 Store a random user id for unauthenticated users as a cookie (#1364) 2020-04-22 09:46:21 -04:00
5c7062d7c9 Added room configuration tab to admin panel 2020-04-16 15:50:23 -04:00
2f41b02e72 Fixed server recordings 500 if user doesn't have an email (#1254)
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-16 12:31:57 -04:00
348713d4df GRN2-xx: Admin actions are now dictated by the correct role permission (#1140)
* Admin actions are now dictated by the correct role permission

* Rspec fix

Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-01 10:58:13 -04:00
a82526736b Fixed issue with adding roles (#1051) 2020-03-20 14:07:39 -04:00
4cc45ab017 Fixed issue with users not being muted on join (#1027)
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-03-20 11:10:31 -04:00
73061bdba9 GRN2-284: Fixed bug where admin rights emails was sent multiple times (#996)
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-03-19 11:17:33 -04:00