Commit Graph

271 Commits

Author SHA1 Message Date
Mohamad Abras 25254ce47c
fix wihtespace, tabs to spaces (#2683) 2021-04-24 13:37:48 -04:00
Mohamad Abras 81c9e7db10
use rails action_name & controller_name methods (#2666)
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2021-04-17 14:35:52 -04:00
Dennis1993 5eea14a780
Optimize space between icon and text in navigation (#2672)
* straighten navigation 

Position of the text are not the same in every entry. This change unifies the distance between icon and text

* define space between text and icon

add the same space between icon and text in the navigation.
2021-04-17 14:18:47 -04:00
Ahmad Farhat 076bee5e95
Added privacy policy link to cookie banner (#2647) 2021-04-12 18:36:05 -04:00
Ahmad Farhat e8ea4972f3
Fixed bug that caused public recordings not to show (#2601) 2021-03-23 18:07:41 -04:00
Ahmad Farhat 79beb7f3fa
Added valid until text to invite email (#2599) 2021-03-22 19:26:51 -04:00
Ahmad Farhat a33fa06f09
Moved moderator access setting to Room Configuration (#2579) 2021-03-17 17:21:34 -04:00
zechmeister 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
Ahmad Farhat 4cd41f5aa8
Replace all CRLF files to LF (#2572) 2021-03-14 14:06:11 -04:00
Ahmad Farhat 3155e8a2e5
Removed unused button (#2523) 2021-02-10 17:19:01 -05:00
Ahmad Farhat 6ee92c839b
Added recaptcha to reset password if enabled (#2475) 2021-01-26 19:44:23 -05:00
Ahmad Farhat 0833491f41
Include shared rooms in room count for search (#2470) 2021-01-25 20:14:33 -05:00
Ahmad Farhat 957bf88a85
Allowed admins to share room with themselves (#2442) 2021-01-18 18:34:42 -05:00
Ahmad Farhat 0e8e188e24
Fixed room name wrapping issues (#2439) 2021-01-18 17:45:54 -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
Ahmad Farhat b2500e6504
GRN2-309: Allows admins to edit a non-local users name and email (#2389)
* Allows admins to edit a non-local users name and email

* Fixed edge case
2020-12-24 13:21:56 -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
Ahmad Farhat 0ff938a0fd
GRN2-xx: Hide signin when error occures (#2221)
* Hide signin when error occures

* Rubocop fixes
2020-10-23 10:01:19 -04:00
Ahmad Farhat 0801c626c5
Added limit for join name (#2220) 2020-10-22 15:47:54 -04:00
Ahmad Farhat bc9867566c
Updated language dropdown to look nicer (#2171) 2020-10-07 16:26:38 -04:00
Ahmad Farhat 92d6c285c4
Removed public from public room recordings (#2169) 2020-10-07 13:32:11 -04:00
Ahmad Farhat 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
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 816cefe1b6
Fixed 404 when resending verification email (#2110) 2020-09-21 15:32:05 -04:00
Ahmad Farhat 74ebb15dad
Fixed 500 when there is an invalid profile picture (#2109) 2020-09-21 13:12:17 -04:00
Toni Förster a27884733d
fixes #2082 proper link in mail (#2083)
* fixes #2082 proper link in mail

only send the promoted user a link to the admin page if their role 
allows them to.

* addressed review

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-09-15 16:08:32 -04:00
Ahmad Farhat ca94ac46ba
Added back ability to set maintenance window through env variables (#2089) 2020-09-15 13:37:58 -04:00
Ahmad Farhat 5cbcc82e9b
Added confirm modal when deleting recording (#2056) 2020-09-03 11:08:13 -04:00
Ahmad Farhat 99c7262971
Added env variable to exclude recording formats from public recordings (#2055) 2020-09-03 10:55:24 -04:00
Mitsutaka Sato 3de60daf85
WR342136 One more piece for hide/show recording (#2059)
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-09-03 10:45:53 -04:00
felix-itz 5760bea00b
LDAP Sign-In form: user field attributes (#2014)
- autocomplete="username": Tell the browser a user name should be filled, if any.
  Reference: https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/autocomplete
- autocapitalize="none": Tell browsers (especially on mobile devices like iOS) not to
  capitalize the first letter
  Reference: https://developer.apple.com/library/archive/documentation/AppleApplications/Reference/SafariHTMLRef/Articles/Attributes.html#//apple_ref/doc/uid/TP40008058-autocapitalize
- spellcheck="false": Do not spell-check the user name
  Reference: https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/spellcheck
- autofocus: indicates that the input should automatically have focus, which makes sense
  because this form is shown after having clicked the "login" button so it's not an issue that
  the screen reader will skip the "Sign in to your account" text.
  Reference: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#htmlattrdefautofocus

This PR will improve usability especially on mobile devices. It does *not* not attempt to improve WCAG compliance.

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-08-26 14:03:19 -04:00
Ahmad Farhat aeb5edf8a0
Hide recording table when disabled through room config (#1988) 2020-08-04 17:59: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
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
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 d7079e7880
Fixes for 2.6 (#1677) 2020-05-27 14:46:33 -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
Ahmad Farhat 44bd2315b2
Merge branch 'master' into room-settings 2020-04-28 13:12:20 -04:00
Ahmad Farhat b08b1ff013
GRN2-xx: Fixed translation location for room status (#1378)
* Fixed translation location for room status

* Added more missing translations
2020-04-28 13:04:04 -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 21cb768fc4
make help link configurable (#1161)
* make help link configurable

* change default help url

* use default help url in setups without env var

Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-16 10:56:34 -04:00