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

530 Commits

Author SHA1 Message Date
Fred Dixon 8e3ba8bda3
Merge pull request #207 from JDenhartogh/gemupdate 
Loofah gem updated
 2018-03-22 17:39:12 -04:00
jeremydenhartogh a44ddaa3ad loofah gem updated 2018-03-21 16:50:48 -04:00
Jesus Federico 8c64087395
Merge pull request #200 from JDenhartogh/gemupdate 
Update paperclip gem
 2018-02-26 16:38:09 -05:00
jeremydenhartogh 20ee45f481 Update paperclip gem 2018-02-20 10:39:34 -05:00
Jesus Federico ba1fec5b72
Merge pull request #195 from JDenhartogh/master 
Update gems
 2018-01-22 17:02:10 -05:00
jeremydenhartogh be287098ef Update gems 2018-01-22 13:05:24 -05:00
Joshua Arts 3b32a92c36 Merge pull request #191 from joshua-arts/html5-support 
Add support for HTML5 client
 2017-10-12 17:01:57 -04:00
Josh 16443584ab fix multiple notifications when user has multiple tabs 2017-10-12 14:50:42 -04:00
Josh 8ac2c5d6d7 fix recording ready email for 2.0 2017-10-12 14:20:23 -04:00
Josh 3036e3d470 update schema.rb 2017-10-12 11:02:40 -04:00
Josh 2372b48e6a fix endless loading spinner 2017-10-05 16:47:03 -04:00
Josh f4d760fb11 fixes for html5 support 2017-10-05 15:51:45 -04:00
Josh ce761ce994 handle mobile case for HTML5 2017-09-29 17:10:51 -04:00
Josh da07eb749f add HTML5 support 2017-09-28 16:03:47 -04:00
Joshua Arts bca906ff6d Merge pull request #189 from joshua-arts/master 
Update GreenLight to work with changes introduced in BigBlueButton 2.0 .
 2017-09-15 09:25:43 -04:00
Josh 40ee86a6a4 add temp fix for recording length in milliseconds 2017-09-14 16:14:47 -04:00
Josh fbc8a56fc0 add support for BBB 2.0 webhooks 2017-09-14 15:59:42 -04:00
Josh 133dc664a4 re-include sample.env in docker image 2017-08-28 10:47:15 -04:00
Josh 61182448ad fix QR code whitespace under invite URL 2017-08-24 10:02:30 -04:00
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