Commit Graph

540 Commits

Author SHA1 Message Date
jfederico 05bc7718e1 Merge branch 'master' of github.com:blindsidenetworks/greenlight 2016-10-19 14:02:05 -04:00
jfederico bd3cbee2b4 Fixes required for making the logouturl work 2016-10-19 13:59:40 -04:00
jfederico 061f9c794a Refactored meetings resource and breaked up view into components 2016-10-19 13:43:58 -04:00
Jesus Federico 855746dc08 Updated icons to oauth authentication buttons 2016-10-19 13:58:07 +00:00
jfederico f195cff339 Added icons to social buttons 2016-10-18 18:12:11 -04:00
jfederico d4a9fd9147 Cleaned up code 2016-10-18 17:25:06 -04:00
jfederico ad807b636b Removed reference to helper from LandingController 2016-10-18 17:17:05 -04:00
Zachary Chai df8c265750 add end tag 2016-10-18 16:39:30 -04:00
Jesus Federico caf6d0bcae Merge pull request #10 from jfederico/master
Fixed issue with new meeting url not updated in copiable text
2016-10-18 16:36:10 -04:00
Jesus Federico 4ac239c65d Merge branch 'master' of github.com:blindsidenetworks/greenlight 2016-10-18 20:35:14 +00:00
jfederico 8eab21c2c2 Fixed issue with new meeting url not updated in copiable text 2016-10-18 16:34:46 -04:00
Jesus Federico d9f1af8889 Merge pull request #9 from jfederico/master
Implemented refresh URL
2016-10-18 16:26:29 -04:00
jfederico 875f2d2a12 Merge branch 'master' of github.com:blindsidenetworks/greenlight 2016-10-18 16:26:02 -04:00
jfederico 0d216adc52 Implemented refresh URL 2016-10-18 16:23:52 -04:00
Zachary Chai 421e0c3c37 Merge pull request #8 from zach-chai/fix_links
add links to personal room and root
2016-10-18 16:10:59 -04:00
Zachary Chai b16212a2e9 add links to personal room and root 2016-10-18 16:09:56 -04:00
Zachary Chai 83c9b1b324 Merge pull request #7 from zach-chai/tests
basic tests and user data
2016-10-18 15:42:03 -04:00
Zachary Chai 407e7f23ec basic tests and user data 2016-10-18 15:41:08 -04:00
Zachary Chai 4534cf28ea Merge pull request #6 from zach-chai/auth_landing
personalized rooms page
2016-10-18 15:25:20 -04:00
Zachary Chai 8693ba5860 personalized rooms page 2016-10-18 15:19:16 -04:00
Jesus Federico 14ad57d4d1 Merge pull request #5 from jfederico/master
Encapsulated javascript for landingController
2016-10-18 14:15:27 -04:00
jfederico e9f77b4e2e Encapsulated javascript for landingController 2016-10-18 14:14:37 -04:00
Jesus Federico e1a6effda5 Merge pull request #4 from jfederico/master
Removed code for autoclose as the bbb session will be open in the sam…
2016-10-18 13:57:25 -04:00
jfederico f8ff8cdd28 Removed code for autoclose as the bbb session will be open in the same tab/window 2016-10-18 13:56:54 -04:00
jfederico cd867f9e20 bbb_endpoint and bbb_secret can be configured with environment variables 2016-10-18 13:50:51 -04:00
jfederico c47bcd5aee Fixed typo on password for meeting create 2016-10-18 10:12:04 -04:00
Jesus Federico d10c92497f Merge pull request #3 from jfederico/master
Extended the landing page
2016-10-18 10:08:47 -04:00
jfederico e9caa740aa Merge branch 'master' of github.com:blindsidenetworks/greenlight 2016-10-18 10:03:50 -04:00
jfederico f725b7f1bc Implemented join to BBB first approach 2016-10-17 18:36:56 -04:00
Zachary Chai 352abe78af Merge pull request #2 from zach-chai/devise
Omniauth
2016-10-17 16:21:36 -04:00
Zachary Chai 3eeaacc6f4 add twitter and google oauth login 2016-10-17 15:06:11 -04:00
Zachary Chai 0d73a77f1f omniauth strategy 2016-10-17 14:26:31 -04:00
jfederico 682cbadbf0 Added some style to the landing page 2016-10-17 13:45:24 -04:00
Zachary Chai c32b48213a docker 2016-10-17 10:53:35 -04:00
jfederico f4b8348e43 Added extra gems required for ui and authentication 2016-10-17 10:37:44 -04:00
Jesus Federico 0fc0e27d02 Merge pull request #1 from jfederico/master
Baby steps on landing page
2016-10-17 10:22:07 -04:00
jfederico 3376a929f5 Statics landing page, first approach 2016-10-17 10:21:18 -04:00
jfederico fb5afb7d9b Aded bigbluebutton-api gem 2016-10-17 10:20:08 -04:00
jfederico c318d7c5d8 Added controller/view for landing page 2016-10-14 11:59:21 -04:00
Jesus Federico a15bf5b3a9 first commit 2016-10-13 17:30:58 +00:00