Commit Graph
100 Commits
Author SHA1 Message Date
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
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
Ahmad Farhat d7079e7880 Fixes for 2.6 (#1677) 2020-05-27 14:46:33 -04:00
+1 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
Ahmad Farhat 6b628d62d3 Remove production check for hosts (#1549) 2020-05-08 16:09:03 -04:00
Ahmad FarhatandJesus Federico 891a32a15c GR2-xx: Updated gems to point to rubygems (#1546)
* Updated gems

* Updated another gem

Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-05-08 15:29:20 -04:00
Ahmad Farhatandjfederico f47d68ea18 GRN2-xx: Allow SAFE_HOSTS to be left blank (#1545)
* Allow SAFE_HOSTS to be left blank

* a different approach

Co-authored-by: jfederico <jesus@123it.ca>
2020-05-08 15:25:24 -04:00
Ahmad Farhat 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
Ahmad FarhatandJesus Federico 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
Ahmad Farhat 8f3ba8a038 Bumped LDAP gem version (#1443) 2020-04-29 17:45:37 -04:00
Ahmad Farhat 8788664061 Merge branch 'master' into room-settings 2020-04-28 13:30:39 -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
Ahmad Farhat 855694c716 Store a random user id for unauthenticated users as a cookie (#1364) 2020-04-22 09:46:21 -04:00
farhatahmad 1d88f54b44 Added disabled styling to always enabled settings 2020-04-16 15:50:23 -04:00
farhatahmad 63b6bb7407 Added tests 2020-04-16 15:50:23 -04:00
farhatahmad 33d7fa4e1e Fixed rspec 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
Ahmad FarhatandJesus Federico 5aa1868f63 Local account email is now downcased to match the downcased value stored in db (#1319)
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-16 15:21:27 -04:00
Ahmad FarhatandJesus Federico f4990b4523 GRN2-xx: Replaced bbb_id field with a better string generator (#1250)
* Replaced bbb_id field with a better string generator

* Update room.rb

How about this instead @farhatahmad ?

* Update room.rb

Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-16 15:06:56 -04:00
Ahmad Farhat 9d14b561a5 Updated ldap gem to newest version (#1318) 2020-04-16 14:01:27 -04:00
Ahmad FarhatandJesus Federico 37decd9b43 Fixed role permissin check for update_recording and delete_recording (#1308)
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-16 12:52:04 -04:00
Ahmad FarhatandJesus Federico 7738499978 Add check to make sure ldap username isn't blank (#1252)
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-16 12:42:27 -04:00
Ahmad FarhatandJesus Federico da82867abe Remove report issue from being included automatically (#1257)
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-16 12:35:58 -04:00
Ahmad FarhatandJesus Federico 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
Ahmad FarhatandJesus Federico 11cdd1ec14 Fixed configuration rake task check (#1155)
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-01 17:28:46 -04:00
Ahmad FarhatandJesus Federico 509215ae8d Added fallback message if image url is invalid (#1149)
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-01 17:26:16 -04:00
Ahmad Farhat 6dc0ffc5c1 Remove hardcoded role value (#1152) 2020-04-01 17:18:27 -04:00
Ahmad FarhatandJesus Federico 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
Ahmad FarhatandJesus Federico c72d77dbcb Prevented LDAP sign in without password (#1092)
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-01 10:45:45 -04:00
Ahmad FarhatandJesus Federico fab3b479c9 Fixed issue with duplicate roles from LDAP sigin (#1090)
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-01 10:43:27 -04:00
Ahmad FarhatandJesus Federico b8eddf73a9 Updated restart policy for db container (#1026)
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-03-31 22:35:51 -04:00
Ahmad Farhat a82526736b Fixed issue with adding roles (#1051) 2020-03-20 14:07:39 -04:00
Ahmad FarhatandJesus Federico 7fa7d2f525 Removed placeholder text for maintenance window (#1049)
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-03-20 11:48:54 -04:00
Ahmad FarhatandJesus Federico b23c1d11b3 Added log line when BigBlueButton exception occurs (#1048)
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-03-20 11:40:13 -04:00
Ahmad Farhat 03cdbd6b69 Fixed bugs in administrator panel (#1047) 2020-03-20 11:18:05 -04:00
Ahmad FarhatandJesus Federico 71f35c4c50 Add callback location for each provider (#1029)
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-03-19 11:18:30 -04:00
Ahmad FarhatandJesus Federico 3e7fb7ecc2 GRN2-xx: Added option to specify different redirect url for google auth (#1016)
* Added option to specify different redirect url for google auth

* Made the redirect url generic so it works with 365

Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-03-18 16:26:45 -04:00
Ahmad FarhatandJesus Federico 43911b9fd5 Fixed order of rooms in postgres (#979)
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-03-04 09:50:06 -05:00
Ahmad Farhat 037e4f1c43 Scoped reset password to provider (#978) 2020-03-03 14:43:10 -05:00
Ahmad Farhat 0092a28bec Replaced PG variables in docker-compose with the correct ones (#968) 2020-02-28 14:45:44 -05:00
Ahmad Farhat 50f4d5e4f8 Small fixes to shared access (#966) 2020-02-28 10:13:51 -05:00
Ahmad Farhat 2c1472daff Admins can no longer delete a users home room (#965) 2020-02-25 09:53:08 -05:00
Ahmad Farhat 54234ef54b Admins that are not signed in are redirected to the signin page when doing admin actions (#964) 2020-02-24 17:30:39 -05:00
Ahmad Farhat 475374090a Fixed issue with rooms not correctly ordering (#963) 2020-02-24 16:48:51 -05:00
Ahmad Farhat 4093a89b4a Added dropdown for dynamically changing the log level (#962) 2020-02-24 12:51:27 -05:00
Ahmad Farhat 2cc1fdf281 Refactored code to reduce number of database queries (#960) 2020-02-24 12:31:30 -05:00
Ahmad Farhat c75c624a1a GRN2-xx: Made role priority unique scoped to provider (#942)
* Made role priority unique scoped to provider

* Fixed issues related to update_role after making role priority unique
2020-02-19 13:38:16 -05:00
Ahmad Farhat feccee7d62 GRN2-164: Switched the default database to Postgres (#952)
* Switched the default database to Postgres

* Uncomment DB variables in sample.env
2020-02-18 15:22:51 -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
Ahmad Farhat 31258272c2 GRN2-265: No longer throws 500 if provider not included (#944)
* No longer throws 500 if provider not included

* Rubocop fix
2020-02-14 10:03:16 -05:00
Ahmad Farhat d6b7e975b0 Final fix for vendor assets (#940) 2020-02-12 17:49:35 -05:00
Ahmad Farhat e15e119d5d Included missing assets and fixed room delete 404 (#939) 2020-02-12 17:49:35 -05:00
Ahmad Farhat 3f8ffa61d7 Fixed issue with links (#934) 2020-02-12 17:49:35 -05:00
Ahmad Farhat 5949a6e243 GRN2-xx: Removed unnecessary log lines (#930)
* Removed unnecessary log lines

* Removed empty function
2020-02-12 17:49:35 -05:00
Ahmad Farhat 397b4b742f GRN2-128: Fixed issue with manage rooms permissions (#929)
* Fixed issue with manage rooms permissions

* Improved server rooms efficiency
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 8cbfc3f730 GRN2-xx: Users can no longer join a room whose owner is banned or pending (Fixed #902) (#922)
* Users can no longer join a room whose owner is banned or pending

* Changed flash message

* rubocop fix
2020-02-12 17:49:35 -05:00
Ahmad Farhat df1705d9ea Join button now expands to fit text (#921) 2020-02-12 17:49:35 -05:00
Ahmad Farhat eb965e5c52 Added data-disable to all button_to to fix double click issue (#923) 2020-02-12 17:49:35 -05:00
Ahmad Farhat 8a8eee52fe Fixed issue with ldap images (#926) 2020-02-12 17:49:35 -05:00
Ahmad Farhat 005ec84c73 GRN2-252: Change to how sign ins are processed (#869)
* Social to local

* Social/Local to Social

* Rubocop fixes

* Added test cases

* Added the ability to clear social uids

* Update admins_controller.rb

* Update admins_controller.rb
2020-02-12 17:49:35 -05:00
Ahmad Farhat 42e6e4f235 GRN2-241: Moved assets precompile to start script (#927)
* Moved assets precompile to start script

* Added curl to image for postgres database
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 c13a83a3f3 Fixed issues with rubocop (#916) 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 984e5cc085 Fixed 500 caused by 1 provider (#937) 2020-01-28 11:34:46 -05:00
Ahmad FarhatandJesus Federico 079d64795b Redirect authenticated users to main room when accessing ldap signin (#856)
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-01-22 16:32:26 -05:00
Ahmad FarhatandJesus Federico ebff9d3625 GRN2-xx: Fixed issue with rooms not being ordered correctly (#897)
* Fixed issue with rooms not being ordered correctly

* removed home room from list

Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-01-08 10:34:01 -05:00