lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity
822 Commits 7 Branches 0 Tags
9e3d8f2821627e9ddc5fe8ac1c27a1cd95c7010a
Commit Graph

414 Commits

Author SHA1 Message Date
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 Farhat
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
c81c6ab417 Update joiner.rb 2020-04-28 13:31:27 -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
jfederico
aeaa1e7d45 Merge branch 'v2' 2020-04-22 23:40:28 -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
François Ménabé
8049ddbd01 Allow to set a filter for LDAP authentication (#1306) 2020-04-20 15:25:25 -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
5c7062d7c9 Added room configuration tab to admin panel 2020-04-16 15:50:23 -04:00
Ahmad Farhat
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 Farhat
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
Lars Kiesow
10ef20363a Additional LDAP Authentication Methods (#1287) 
This patch allows anonymous and user based authentication to LDAP
servers. This change is based on a patch against bn-ldap-authentication:

-  https://github.com/blindsidenetworks/bn-ldap-authentication/pull/2

The patch introduces a new environment variable `LDAP_AUTH` which
controls the authentication method used against the LDAP server:

- `anonymous` enables an anonymous bind to the LDAP with no password
  being used.

- `user` uses the user's own credentials to search for his data,
  enabling authenticated login to LDAP without the need for a user with
  global read privileges.

The default still remains at using a bind user, allowing for a seamless
upgrade path from the previous version.

This fixes #1082

Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-04-16 14:10:14 -04:00
Ahmad Farhat
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
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
Ahmad Farhat
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 Farhat
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
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
Klaus
a06da481db fix cookie banner height (#1202) 2020-04-16 10:45:16 -04:00
Ahmad Farhat
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 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
Ahmad Farhat
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 Farhat
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 Farhat
a82526736b Fixed issue with adding roles (#1051) 2020-03-20 14:07:39 -04:00
Ahmad Farhat
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 Farhat
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
etiennevvv
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
etiennevvv
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
etiennevvv
84fb615005 GRN2-283: Fixed bug where users can't join a shared room (Fixed #989) (#995) 
* GRN2-283: Fixed bug where users can't join a shared room

* GRN2-283: Fixed bug where users can't join a shared room

* GRN2-283: Fixed bug where users can't join a shared room

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
 2020-03-18 15:19:16 -04:00
Ahmad Farhat
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
etiennevvv
edcda54f89 GRN2-268: Fixed redirection after executing an action in Manage Users (#967) 
* GRN2-268: Fixed redirection after executing an action in Manage Users

* GRN2-268: rubocop fix
 2020-02-28 11:32:32 -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
etiennevvv
03266730e8 GRN2-233: Made account activation & password reset links based on tokens only (#959) 
* GRN2-233: Hiding email in verification link and password reset link

* updating tests

* removing uid from email verificaiton link

* GRN2-233: modifying test cases

* GRN2-233: Removing uid from password reset link

* GRN2-233: Removed email_params and fixed "authenticated?" method

* GRN2-233: Fixed error when trying to sign in unverified

* GRN2-233: Changed how activation tokens are generated
 2020-02-24 13:05:09 -05:00
etiennevvv
b7aa5406ea GRN2-273: Fixed bug where incorrect recording length returned when "Notes" format was included (#961) 
* GRN2-273: Fixed bug where incorrect recording length returned

* GRN2-273: Changing iteration variable name   in recording_length method
 2020-02-24 12:58:28 -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
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
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
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
etiennevvv
3641f1b953 GRN2-270: Hiding delete button in room dropdown for Home Room (#956) 2020-02-14 09:47:17 -05:00
etiennevvv
9fa79bcc16 GRN2-271: Removing redirection to "#" in invite participants copy button (#957) 2020-02-14 09:47:02 -05:00