Commit Graph

151 Commits

Author SHA1 Message Date
Ahmad Farhat 957bf88a85
Allowed admins to share room with themselves (#2442) 2021-01-18 18:34:42 -05:00
Ahmad Farhat 4bf0811136
Times are now rendered using the browsers time zone (#2438) 2021-01-17 14:48:51 -05:00
Ahmad Farhat 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
Moritz Schlarb 3b7b45cc03
Refine OpenID Connect Authentication from #1194 (#1399)
* Adds OpenID Connect.

* Add CSS class for openid_connect omniauth provider

* Add translation (de_DE and en) for openid_connect omniauth provider label

* Make uid_field configurable for openid_connect omniauth provider

* updates to support for openid

* updates to support for openid

* updated ldap gem

* updated sample.env

Co-authored-by: mapidentity <git@mapidentity.com>
Co-authored-by: Jesus Federico <jesus@123it.ca>
Co-authored-by: mapidentity <49822181+mapidentity@users.noreply.github.com>
2021-01-07 15:11:17 -05:00
Ahmad Farhat 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
Ahmad Farhat 5a51f6d714
Added mapping roles through email to site settings (#2373) 2020-12-16 19:31:32 -05:00
Ahmad Farhat 7809431873
Fixes to room search (#2343) 2020-12-09 17:48:59 -05:00
Lars Kiesow 04651ea65d
Allow Searching for Rooms (#2315)
* Allow Searching for Rooms

If a user has a lot of rooms, finding the correct one can be somewhat
annoying and it would be great to be able to search for or filter the
rooms in the room list.

This patch adds a very simple search functionality for this. The search
bar is hidden as long as a user has not more than six (two rows in
desktop mode) rooms. If the number of rooms exceeds this limit, a search
field is shown to quickly filter the list.

* Updates Romm Filter Style

This patch updates the room filtering according to the review requests.
It switches to the same search input style that is used at places like
the recording table.

This mans, that this also works slightly different since the input now
has a clear and a search button. The basic functionality is the same
though.

Finally, this switches from plain JavaScript to jQuery functions for
filtering.
2020-12-07 18:20:58 -05:00
Lars Kiesow f2fc803d2e
Improce Word Wrapping in Recording Table (#2328)
Using `break-all` for word-wrapping in the recording table can cause
awkward word wrapping. Using `break-word` should mostly avoid that
while still ensuring that words too long to properly fit are wrapped.

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-12-05 14:39:13 -05:00
Lars Kiesow a17bcb9d14
Fix broken UI on long filenames (#2215)
If you select a presentation with a very long filename in in Greenlight,
the filename text in the upload dialog wraps at the end and leaves the
label box, leading to a slightly broken looking user interface.

This patch adjusts the style to hide the end of a long filename, ending
with a horizontal ellipsis instead.
2020-10-21 10:17:24 -04:00
Ahmad Farhat 7c57f4b93a
Fixed XSS vulnerability in merge user modal (#2214) 2020-10-20 14:31:59 -04:00
Ahmad Farhat bc9867566c
Updated language dropdown to look nicer (#2171) 2020-10-07 16:26:38 -04:00
Ahmad Farhat c80e215110
Added a copy access code button (#2161) 2020-10-06 14:23:46 -04:00
Ahmad Farhat 56be1ad2ae
Improvements to create room modal (#2152) 2020-10-02 14:23:31 -04:00
Ahmad Farhat 7309ef9bfd
Added back join retry as fallback (#2095) 2020-09-17 14:19:18 -04:00
Ahmad Farhat 5cbcc82e9b
Added confirm modal when deleting recording (#2056) 2020-09-03 11:08:13 -04:00
Lars Kiesow 503ca52806
Fix Cross-Site-Scripting Vulnerability (#2034)
This patch fixes a cross-site-scripting vulnerability in Greenlight
which allowed users to inject code into Greenlight by adding scripts
into their names.

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-08-24 14:32:14 -04:00
Ahmad Farhat b23715c906
Changed room joining post to hopefully fix CSRF errors (#2027) 2020-08-19 16:03:10 -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 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 4da03957a9
Fix rename recordings (#1721) 2020-06-02 11:01:35 -04:00
Ahmad Farhat 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 78ed8d74601b613af3fd96ccf75a6bada24deddd.

* 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
farhatahmad 1d88f54b44 Added disabled styling to always enabled settings 2020-04-16 15:50:23 -04:00
farhatahmad 5c7062d7c9 Added room configuration tab to admin panel 2020-04-16 15:50:23 -04:00
Lars Kiesow 311806faa7
Color Configuration for Cookie Banner (#1302)
* Color Configuration for Cookie Banner

Right now, the colors of the cookie banner are hard-coded which can
easily clash with the configured site colors in site settings.

This patch switches to using the configured colors instead.

* Update application.scss

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-16 12:46:46 -04:00
Klaus e7e0c7624c
room block enhancements (#1203)
* highlight current room block

* fix duplicated ids

* remove inline js

* remove some trailing whitespaces

* Fixed Server Rooms room settings name

Co-authored-by: farhatahmad <ahmad.af.farhat@gmail.com>
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-16 11:21:57 -04:00
Klaus a06da481db
fix cookie banner height (#1202) 2020-04-16 10:45:16 -04:00
Ahmad Farhat 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
etiennevvv 92da1f6f87
GRN2-269: Pulling room settings using GET instead of data-attributes (#953)
* GRN2-269: Pulling room settings using GET instead of data-attributes

* GRN2-269: added test case and fixed documentation

* GRN2:269: rubocop fix

* GRN2-269: Fixed test case
2020-02-21 09:20:22 -05:00
Ahmad Farhat 005c738e4d
GRN2-260: Added the ability to merge user accounts (#938)
* Added the ability to merge user accounts

* Styling fixes
2020-02-14 10:24:06 -05:00
etiennevvv 68b231dbdb GRN2-266: Autofocus room name when create room modal appears (#945)
* added autofocus to the Room Name field

* added autofocus to Room Name text field

* added autofocus to Room Name text field

* GRN2-266 Fixing autofocus for Room name when creating room

* removing whitespace

* fixing whitespace

* fixing whitespace
2020-02-12 17:49:35 -05:00
Ahmad Farhat d6b7e975b0 Final fix for vendor assets (#940) 2020-02-12 17:49:35 -05:00
Ahmad Farhat 967130e57c GRN2-253: Added the ability to share rooms across multiple users (#912)
* Added ability to share rooms with other users

* Fixed testcases
2020-02-12 17:49:35 -05:00
Ahmad Farhat 734f7a757e GRN2-241: Switched Docker base image to Alpine (#853)
* Switched to alpine image

* Switch Docker base image to alpine

* Removed uneeded code

* Slimmed it down even further
2020-02-12 17:49:35 -05:00
Ahmad Farhat 09de6b6739 GRN2-128: Added the ability to manage rooms (#848)
* Added the ability to manage rooms

* Small fixes

* Fixed travis complaints

* Fixed issues with role permissions

* Fixed issue with delete room

* Fixed rubocop and added testcases
2020-02-12 17:49:35 -05:00
Ahmad Farhat 628790733e GRN2-xx: Replaced language files with the updated versions (Fixed #813) (#814)
* Updated language files

* Added fix for javascript languages
2019-10-11 08:53:40 -04:00
Ahmad Farhat c1de7f8f70 GRN2-xx: Replaced google fonts api call with local font load (Fixed #830) (#831)
* Replaced google fonts api call with local font load

* Removed references to Roboto
2019-10-10 16:28:46 -04:00
Ahmad Farhat b9dcaa1b18 Fixed issue with return to cookie (#828) 2019-10-10 16:24:35 -04:00
Ahmad Farhat 49def8f405 GRN2-247: Added Active Pending Banned Deleted tabs to manage users (#816)
* Added Active Pending Banned Deleted tabs to manage users

* Removed hard coded strings

* Fixed issues with sign in flow

* Fixed issues with rooms not deleting
2019-10-10 16:10:23 -04:00
Ahmad Farhat 3f5affd116 Only render 1 delete room modal (#819) 2019-10-10 15:45:42 -04:00
Ahmad Farhat 4a791ae0b5 Email recording now translates correctly (#809) 2019-10-10 15:08:55 -04:00
Ahmad Farhat 091b548e90 Fixed issue with Room Settings (#807) 2019-09-20 15:33:08 -04:00
Ahmad Farhat 7c6ad6d903 Improve code quality to increase scrut score (#789) 2019-09-19 10:03:44 -04:00
Ahmad Farhat 666ee12988 GRN2-xx: Cleaning up bugs that appeared after refactoring (#780)
* First step

* Fixed issues with update room
2019-09-19 10:03:44 -04:00
farhatahmad 01b8dbbd0e GRN2-196: Fixed issues that scrutinizer is complaining about (#765)
* Refactored code to improve scrutinizer score

* Bug fixes
2019-09-19 10:03:44 -04:00
farhatahmad fd6077696d GRN2-180: First stages of refactoring code for v2.4 (#748)
* Email rescues and authenticator concern

* Application controller and helper clean up

* Moved controller code out of helpers

* More helper and email clean up

* Cleaned up remaining helpers and create omniauth_options

* Controller code clean up

* restructured views structure

* Restructured role code

* Restructured profile and code clean up

* Master merge

* Added bbb server concern to deal with bbb calls

* Bug fixes and changes after changes

* rspec

* More rubocop fixes
2019-09-19 10:03:44 -04:00
Ahmad Farhat b590a5a264 GRN2-xx: Added fallback language to locales (#788)
* Added fallback language to locales

* Added comments
2019-09-06 14:28:47 -04:00
Ahmad Farhat 390ccf71c2 Localized js is now served as json (#784) 2019-09-06 10:56:53 -04:00
Ahmad Farhat 843d42a1d8 Allowed room access text to be translated (#777) 2019-08-30 16:25:43 -04:00
farhatahmad 9ddc057589 Added a Maintenance Window flash (#758) 2019-08-22 12:15:01 -04:00