Commit Graph

75 Commits

Author SHA1 Message Date
Zachary Chai 595ff619c8 Merge pull request #22 from zach-chai/recording_previews
recording previews
2016-11-02 16:19:18 -04:00
Zachary Chai ae82c80308 recording previews 2016-11-02 16:18:42 -04:00
Zachary Chai ac6fa7c6b4 Merge pull request #21 from zach-chai/join_form_changes
Join form changes
2016-11-01 17:21:31 -04:00
Zachary Chai 0c4e264d7e set room name in html 2016-11-01 17:18:39 -04:00
Zachary Chai 7da04d3334 remove refresh on specific pages and change join form 2016-11-01 17:04:57 -04:00
Zachary Chai bef04f0465 Merge pull request #20 from zach-chai/move_configuration
application configuration
2016-11-01 16:10:02 -04:00
Zachary Chai 8427547698 application configuration 2016-11-01 16:09:24 -04:00
Zachary Chai a9230616bc Merge pull request #19 from zach-chai/recordings
Recordings
2016-11-01 15:27:30 -04:00
Zachary Chai 15411d76fa only allow room owner to perform recording actions 2016-11-01 15:02:32 -04:00
Zachary Chai e400bf41e8 recording async update 2016-11-01 11:39:26 -04:00
Zachary Chai db9d06b72f add recordings table 2016-10-31 14:12:08 -04:00
Zachary Chai 3871e0129c add recordings api actions 2016-10-28 16:21:44 -04:00
Zachary Chai fdf6f0e2c4 Merge pull request #18 from zach-chai/wait_for_mod
Wait for mod
2016-10-27 13:58:54 -04:00
Zachary Chai b701f2e9a6 wait for moderator with action cable 2016-10-27 13:57:26 -04:00
Zachary Chai 3aeef0a4cf refactor bbb helper and implement wait for mod 2016-10-26 13:41:55 -04:00
Zachary Chai dadaa52387 Merge pull request #17 from zach-chai/redesigned_views
Redesigned views
2016-10-25 11:16:15 -04:00
Zachary Chai f71f46427f cleanup controllers and routes 2016-10-25 10:51:20 -04:00
Zachary Chai d3ad6980d9 redesigned meeting and room page 2016-10-25 10:47:25 -04:00
Zachary Chai 551b64bb59 shared components for redesigned layout 2016-10-25 10:47:21 -04:00
Zachary Chai 3529e97a08 header layout 2016-10-24 16:27:20 -04:00
Zachary Chai 50e98e4bcd Merge pull request #16 from zach-chai/login_provider
login with provider in personal room
2016-10-20 10:23:56 -04:00
Zachary Chai 4ec17344eb login with provider in personal room 2016-10-20 10:16:11 -04:00
Jesus Federico e1ab78ec63 Merge pull request #15 from jfederico/master
Minor fix to UI
2016-10-20 09:57:31 -04:00
jfederico 31a0dd4100 Removed text for sharing the meeting/room 2016-10-20 09:57:04 -04:00
jfederico 45856384d9 Merge branch 'master' of github.com:blindsidenetworks/greenlight 2016-10-20 09:53:35 -04:00
Jesus Federico 5fecb98d0b Input for name should be shown only to anonymous users 2016-10-20 00:13:26 +00:00
Zachary Chai 201a3ca0f5 Merge pull request #14 from zach-chai/username_step
username validations
2016-10-19 16:33:16 -04:00
Zachary Chai 51d9551877 username validations 2016-10-19 16:31:43 -04:00
Jesus Federico d313c5d373 Merge pull request #13 from jfederico/master
Some rework for generalizing code that is used by the two resources
2016-10-19 16:01:23 -04:00
jfederico 36d83b99c6 Changed the routes so we have only 3 locations to configure in nginx 2016-10-19 15:57:03 -04:00
jfederico 12aac189a8 Rework for generalizing some methods 2016-10-19 15:41:15 -04:00
jfederico 8d6904e183 Relocated code for login/logout in meetings 2016-10-19 14:52:23 -04:00
Zachary Chai b6e17b88c7 Merge pull request #12 from zach-chai/username_step
username
2016-10-19 14:32:07 -04:00
Zachary Chai 015dd7cda4 add users controller and intermediate username step 2016-10-19 14:22:16 -04:00
Jesus Federico d26d4a86bd Merge pull request #11 from jfederico/master
Fixes and refactoring to views and controllers
2016-10-19 14:03:17 -04:00
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