Commit Graph
100 Commits
Author SHA1 Message Date
Ahmad Farhat 09ab074aaf Complete refactor of Gemfile and upgraded gems (#2553) 2021-02-26 17:34:07 -05:00
Ahmad Farhat 7c547c36ec Removed old travis stuff (#2531) 2021-02-14 14:06:19 -05:00
Ahmad Farhat 51cc00bcff Only build image on release (#2530) 2021-02-14 14:01:12 -05:00
Ahmad Farhat 96b554bb5b added sqlite to Gemfile (#2528) 2021-02-12 18:35:00 -05:00
Ahmad Farhat 3155e8a2e5 Removed unused button (#2523) 2021-02-10 17:19:01 -05:00
Ahmad Farhat be6e2564d6 Renamed workflows and updated version code (#2516) 2021-02-06 16:24:22 -05:00
Ahmad Farhat 8fcb80a7d5 Fixed issue causing 500 for unautheticated users (#2515) 2021-02-06 15:40:21 -05:00
Ahmad Farhat 5b52489d54 Shortened list of users being returned (#2512) 2021-02-06 14:35:13 -05:00
Ahmad Farhat a608975b08 GRN2-346: Final fix for github actions (#2511)
* Final fix to docker version code

* Final fix for release version code
2021-02-04 19:02:13 -05:00
Ahmad Farhat 27bc685b76 GRN2-346: Another attempt at short sha (#2508)
* Short sha

* Another try at short sha
2021-02-03 17:34:12 -05:00
Ahmad Farhat d304cb0d39 Short sha (#2507) 2021-02-03 17:29:19 -05:00
Ahmad Farhat 9a2842297b Attempt to fix version code (#2506) 2021-02-03 17:21:55 -05:00
Ahmad Farhat b77b6665a5 More changes to workflow (#2500) 2021-02-01 18:28:21 -05:00
Ahmad Farhat d64b8d023a GRN2-346: Workflow changes (#2499)
* Move cd from travis to github

* Changes to workflow
2021-02-01 18:14:58 -05:00
Ahmad Farhat 422ded1d3b GRN2-346: Move cd from travis to github (#2498)
* Move cd from travis to github

* Fix build args
2021-02-01 18:02:23 -05:00
Ahmad Farhat 629dd7037a Fix workflow cache (#2493) 2021-02-01 17:52:59 -05:00
Ahmad Farhat cfe9b1e787 Attempt to fix workflow (#2492) 2021-01-30 13:05:23 -05:00
Ahmad Farhat 520ce28cf4 Move yml file to workflows (#2491) 2021-01-28 19:31:33 -05:00
Ahmad Farhat 502fa42978 Rename ci.yml to main.yml 2021-01-28 19:28:58 -05:00
Ahmad Farhat dbba634dfd Added rubocop and rspec check to Github actions (#2490) 2021-01-28 19:28:09 -05:00
Ahmad Farhat 062525d2d5 Pass createTime as part of the join call (#2488) 2021-01-27 19:48:39 -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 60b8bbfa06 Shortened date for last session to make room block smaller (#2449) 2021-01-20 16:55:05 -05:00
Ahmad Farhat 656e4057cc Fixed 400 with share room and merge user (#2448) 2021-01-19 18:28:10 -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 6be629ae82 Make all LIKE queries case insensitive (#2402) 2021-01-05 17:22:57 -05:00
Ahmad Farhat 752b192ef9 Only pass muteOnStart if set to true (#2401) 2021-01-04 17:55:09 -05:00
Ahmad Farhat cf3b450743 Only return required info for dynamic user lists (#2397) 2020-12-30 17:39:31 -05:00
Ahmad Farhat c9b16729f6 Make room delete permanent (#2390) 2020-12-24 13:54:27 -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 14350c5f5d Added field to track users last login (#2367) 2020-12-14 18:52:08 -05:00
Ahmad Farhat 7a2405aa9e Fixed 500 caused by room search (#2366) 2020-12-14 18:15:07 -05:00
Ahmad Farhat 7809431873 Fixes to room search (#2343) 2020-12-09 17:48:59 -05:00
Ahmad Farhat 42bb568172 Uppercased Name in Full Name (#2333) 2020-12-07 18:50:04 -05:00
Ahmad Farhat 95b86b167e Fixed issue with account activation allowing it to be circumvented (#2324) 2020-12-01 18:21:09 -05:00
Ahmad Farhat 57bf994f1b Made rescue clause more specific to catch timeouts for Server Rooms (#2245) 2020-10-28 10:27:24 -04:00
Ahmad Farhat 23b08853db Added missing question mark (#2234)
* Added missing question mark

* Made bigbluebutton name variable
2020-10-26 15:27:49 -04:00
Ahmad Farhat 68716bc6f3 Added a flash message if the getMeetings call times out (#2232) 2020-10-26 14:38:19 -04:00
Ahmad Farhat 49f7a7714a Fixed issue with ldap redirect throwing 404 (#2231) 2020-10-26 11:50:43 -04: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 7c57f4b93a Fixed XSS vulnerability in merge user modal (#2214) 2020-10-20 14:31:59 -04:00
Ahmad Farhat c77ae11ea0 Bumped Rails to 5.2.4.4 (#2185) 2020-10-09 10:55:19 -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 1c2e8ad040 Removed unused option in code (#2153) 2020-10-05 13:53:47 -04:00
Ahmad Farhat 56be1ad2ae Improvements to create room modal (#2152) 2020-10-02 14:23:31 -04:00
Ahmad Farhat c8a104c76e Added timestamp to production logs (#2151) 2020-10-02 14:15:46 -04:00
Ahmad Farhat 07557f45dc Added env variable to set the default language (#2147) 2020-10-02 09:50:24 -04:00
Ahmad Farhat 165eeccb23 Manually encode the ampersand in a presentation file name (#2140) 2020-09-29 14:48:54 -04:00
Ahmad Farhat ba7beb827a Switched default cable adapter to postgres (#2139) 2020-09-29 11:31:42 -04:00
Ahmad Farhat b89cbfad03 ENABLE_SSL is now defaulted to true for new installations (#2121) 2020-09-23 10:25:44 -04:00
Ahmad Farhat 816cefe1b6 Fixed 404 when resending verification email (#2110) 2020-09-21 15:32:05 -04:00
Ahmad Farhat 360783606e Fixed 500 caused by editting a user when not allowed to (#2108) 2020-09-21 13:20:15 -04:00
Ahmad Farhat 74ebb15dad Fixed 500 when there is an invalid profile picture (#2109) 2020-09-21 13:12:17 -04:00
Ahmad Farhat f992f76ae1 Set default cable adapter to postgres (#2096) 2020-09-17 15:02:54 -04:00
Ahmad Farhat 7309ef9bfd Added back join retry as fallback (#2095) 2020-09-17 14:19:18 -04:00
Ahmad Farhat 55dd5725b5 Fixed 404 on room join (#2092) 2020-09-17 11:32:06 -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 4deefdfee9 Docker ignore new security policy (#2062) 2020-09-03 12:04:19 -04:00
Ahmad Farhat a00732c10e Create SECURITY.md 2020-09-03 11:25:24 -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
Ahmad Farhat c1c62e8bf8 Fixed issue with shared room not having correct record setting (#2053) 2020-09-02 13:55:09 -04:00
Ahmad Farhat cb700404f3 Fixed bug allowing users to access their own room when they aren't allowed (#2054) 2020-09-02 13:45:29 -04:00
Ahmad Farhat e2bfdef967 More work to fix CSRF issue on join (#2043) 2020-08-26 10:20:50 -04:00
Ahmad Farhat e5340d2a7a Add env variables to change same_site and secure (#2040) 2020-08-24 14:19:46 -04:00
Ahmad Farhat b23715c906 Changed room joining post to hopefully fix CSRF errors (#2027) 2020-08-19 16:03:10 -04:00
Ahmad Farhat 6dea54ccd7 Added cable url (#2026) 2020-08-19 15:55:50 -04:00
Ahmad Farhat aeb5edf8a0 Hide recording table when disabled through room config (#1988) 2020-08-04 17:59:47 -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
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
+1 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
Ahmad Farhat 50c2070188 Fix issue with search in manage users (#1792) 2020-06-12 15:10:12 -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
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
Ahmad Farhat 39c31e759a Fixed issue causing manage users to through 500 (#1778) 2020-06-11 10:21:11 -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
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
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
Ahmad Farhat 3be109df54 Fixed user create rake task (#1690) 2020-05-28 14:27:46 -04:00