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

511 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh
f282f1a1d8 Merge branch 'master' of https://github.com/bigbluebutton/greenlight 2017-08-22 16:52:51 -04:00
Josh
141660eabf bump ruby version in Dockerfiles 2017-08-22 16:51:36 -04:00
Joshua Arts
c5c4afe493 Merge pull request #186 from joshua-arts/master 
Fix Google authentication and update Omniauth to 1.6.1.
 2017-08-22 15:40:35 -04:00
Josh
be136fe255 update omniauth to 1.6.1 2017-08-21 11:49:53 -04:00
Josh
2e439e08da fix Google authentication 2017-08-21 11:46:07 -04:00
Jesus Federico
83c3a63583 Merge pull request #184 from jfederico/feature-qrcode 
Feature qrcode
 2017-08-15 17:06:27 -04:00
jfederico
22d0f4423d Fixed conflict with master 2017-08-15 20:44:06 +00:00
Jesus Federico
0719cbd1bf Merge pull request #183 from jfederico/updates 
Updates to the environment variables
 2017-08-15 16:41:05 -04:00
jfederico
4b7f104808 Removed duplicated code introduced in previous commit 2017-08-15 20:37:26 +00:00
jfederico
4590725c79 A warning message is shown when the BBB server configured is the one that comes by default 2017-08-15 20:33:19 +00:00
jfederico
20830c0e72 Restored definition of helper 2017-08-15 19:44:53 +00:00
jfederico
9db643a533 Merge branch 'updates' into feature-qrcode 2017-08-15 19:25:10 +00:00
jfederico
f66f3d4dab Fixed issues reported by Scrutinizer 2017-08-15 19:21:19 +00:00
jfederico
ce4c9456a7 Merge branch 'updates' into feature-qrcode 2017-08-15 19:15:56 +00:00
jfederico
4d915b6c1f Fixed issues reported by Scrutinizer 2017-08-15 19:12:24 +00:00
jfederico
ad3c07d1de Fixed issues reported by Scrutinizer 2017-08-15 19:10:34 +00:00
jfederico
f0321367f8 Fixed issue with circle-ci not able to use env variables 2017-08-15 19:03:17 +00:00
jfederico
e0c856522f Added 'QR Code generation' as an optional feature 2017-08-15 19:01:36 +00:00
jfederico
970670ba6f Rework on landingController to reduce duplication 2017-08-14 21:31:01 +00:00
jfederico
5a5693cb33 Added defaults for omniauth 2017-08-14 21:08:56 +00:00
jfederico
ea5c78db47 Updated unified sample.env and setup default values to some variables 2017-08-14 20:26:43 +00:00
jfederico
582ab30eb0 Updated ruby version and some gems 2017-08-14 20:23:54 +00:00
Josh
9135898f1d handle outlier cases where the number of join/leave events dont match 2017-08-01 16:41:28 -04:00
Josh
949fce701c refactor share button & add ability to disable youtube uploading 2017-07-28 14:58:51 -04:00
Joshua Arts
10c2f1f6e5 Merge pull request #182 from phavekes/master 
add ability to restrict google authentication to a specific domain.
 2017-07-26 09:44:06 -04:00
peter
fe6e7c3efe should fix my gitignore 2017-07-25 16:56:23 +02:00
peter
de948a9299 Formatting of comment about GOOGLE_OAUTH2_HD 2017-07-25 16:55:00 +02:00
peter
9edf2bc225 correctly handle empty GOOGLE_OAUTH2_hd 2017-07-25 16:11:36 +02:00
peter
9ff5519abb pass GOOGLE_OAUTH2_ID to provider 2017-07-25 11:28:55 +02:00
peter
1e4719e818 add GOOGLE_OAUTH2_HD parameter 2017-07-25 11:26:58 +02:00
Josh
f40ef121c8 use root_url instead of relative_root to satisfy test 2017-07-24 15:28:10 -04:00
Josh
f4e9e01782 fix ldap auth failure redirect 2017-07-24 15:04:06 -04:00
Josh
23815ca118 properly handle certain characters in active meetings 2017-07-21 11:59:51 -04:00
Josh
3bc31048f4 fix issue where webhooks were not always removed 2017-07-21 11:58:36 -04:00
Josh
2d7ab0006c log to production.log instead of STDOUT by default 2017-07-19 16:12:14 -04:00
Josh
baec82f661 ensure user is in wait list before attempting to remove 2017-07-19 14:30:36 -04:00
Josh
c9ce897c66 add LDAP auth to readme 2017-07-17 11:59:22 -04:00
Josh
42bf2b1e54 clean active_meetings.js and landing.js 2017-07-14 13:21:02 -04:00
Josh
5f2a561922 fix bug when handling recently ended meeting status 2017-07-14 11:13:11 -04:00
Josh
ab5c56c27d add guest landing page when guest access disabled 2017-07-13 12:11:16 -04:00
Josh
ec16f51926 hide preferences link when not logged in 2017-07-13 11:00:17 -04:00
Josh
3a882f85c6 add ability to disable guest access 2017-07-12 16:34:16 -04:00
Josh
0cbb587fc0 don't register webhooks for guest meetings 2017-07-12 14:06:53 -04:00
Josh
29ca709c85 notice when trying to upload to Youtube with Twitter auth 2017-07-11 15:28:30 -04:00
Josh
042622cb01 fix production LDAP routing 2017-07-10 11:11:10 -04:00
Joshua Arts
a45f4d4fd0 Merge pull request #177 from joshua-arts/master 
LDAP Authentication Support
 2017-07-07 10:37:29 -04:00
Josh
0b1ae2497f remove debug code 2017-07-07 10:32:48 -04:00
Josh
0040baecbf display ldap error to help with troubleshooting 2017-07-07 10:32:01 -04:00
Josh
43496a6cf1 change sessions#new test to allow redirect 2017-07-07 10:23:19 -04:00
Josh
d80fd262bc add LDAP method as environment variable 2017-07-06 14:41:54 -04:00