Zachary Chai
9667e3757b
fix recording update channel and routes
2017-01-31 11:42:47 -05:00
Zachary Chai
c70ad42d8b
Merge pull request #98 from zach-chai/multi_meeting_rooms
...
Multi meeting rooms
2017-01-31 11:15:25 -05:00
Zachary Chai
a06ba91596
fix tests
2017-01-31 11:08:21 -05:00
Zachary Chai
9a55ac9376
cleanup old websockets on page load
2017-01-31 11:01:34 -05:00
Zachary Chai
d67663fbf1
multi meeting rooms
2017-01-27 18:12:36 -05:00
Zachary Chai
0ce2a226a7
Merge pull request #97 from zach-chai/room_rework
...
Room rework
2017-01-26 16:06:09 -08:00
Zachary Chai
5180a99c32
allow meeting name separately when joining from room
2017-01-26 18:59:25 -05:00
Zachary Chai
066755c56c
add invite and join to room
2017-01-26 18:03:42 -05:00
Zachary Chai
31a8c0ea66
Merge pull request #96 from zach-chai/home_page_rework2
...
Home page rework2
2017-01-26 07:55:52 -08:00
Zachary Chai
ac74041aca
create components for new layout
2017-01-26 10:42:42 -05:00
Zachary Chai
540ab7d369
URI encode meeting name and only show invite/join when a name is entered
2017-01-26 09:34:05 -05:00
Zachary Chai
e3e154b99c
Merge pull request #95 from zach-chai/home_page_rework
...
Home page rework
2017-01-24 16:26:48 -05:00
Zachary Chai
f7363df80e
remove unused style
2017-01-24 16:21:38 -05:00
Zachary Chai
d7cd9eb8bb
update javascript and neaten up layout
2017-01-24 16:13:12 -05:00
Zachary Chai
b30acae006
refactor meeting object naming
2017-01-24 14:25:25 -05:00
Zachary Chai
e339dcd5b7
rework home layout
2017-01-24 14:15:20 -05:00
Zachary Chai
1c54f3cc6f
Merge pull request #93 from zach-chai/change_paperclip_icon
...
change paperclip to clipboard icon
2017-01-24 11:15:52 -05:00
Zachary Chai
f5a1ce5a6c
Merge pull request #92 from zach-chai/update_readme
...
update readme and env
2017-01-24 10:41:04 -05:00
Zachary Chai
fff39bd777
change paperclip to clipboard icon
2017-01-24 10:31:05 -05:00
Zachary Chai
bcd012bef5
update readme and env
2017-01-24 10:27:36 -05:00
Zachary Chai
15760ebf0b
Merge pull request #87 from zach-chai/update_login_text
...
update login logout text
2017-01-20 18:04:07 -05:00
Zachary Chai
2d0ca5f16b
update login logout text
2017-01-20 16:46:51 -05:00
Fred Dixon
afce542431
Merge pull request #86 from zach-chai/login_updates
...
Login updates
2017-01-20 15:10:49 -05:00
Zachary Chai
ca79ba6317
style login description
2017-01-20 14:46:52 -05:00
Zachary Chai
9057948750
oauth signin buttons per provider spec
2017-01-20 14:34:30 -05:00
Zachary Chai
3039bd168b
create separate page for login
2017-01-19 19:33:06 -05:00
Zachary Chai
ceeafa3208
move signup area
2017-01-19 17:54:52 -05:00
Zachary Chai
e5932d805b
Merge pull request #85 from zach-chai/add_postgres_gem
...
postgres support
2017-01-19 15:13:56 -05:00
Zachary Chai
3a3b054786
postgres support
2017-01-19 15:09:34 -05:00
Zachary Chai
dcc20f875c
Merge pull request #84 from zach-chai/fix_build_script
...
fix dockerfile refernce in build image script
2017-01-17 19:37:16 -05:00
Zachary Chai
489e09c93a
fix dockerfile refernce in build image script
2017-01-17 19:35:01 -05:00
Zachary Chai
1cc0010ceb
Merge pull request #82 from zach-chai/update_docker_dev
...
create dockerfile for dev and update compose
2017-01-17 13:48:41 -05:00
Zachary Chai
cef36d112c
create dockerfile for dev and update compose
2017-01-17 11:29:10 -05:00
Fred Dixon
bc6eb444ce
Merge pull request #81 from daronco/issue-78
...
Don't ask for a name in the landing page, redir to the room/meeting
2017-01-11 12:24:52 -05:00
Leonardo Crauss Daronco
b6cb7add17
Reuse variable in landing.js
2017-01-11 15:02:09 -02:00
Leonardo Crauss Daronco
b8c4ffe80b
Don't ask for a name in the landing page, redir to the room/meeting
...
Instead of asking the user for a name in the landing page, it just
redirects to the room/meeting page, where the user is asked to enter a
name. If the user is signed in, no redirect is necessary and the user's
name is used automatically.
2017-01-11 14:55:39 -02:00
Fred Dixon
b82f693bff
Merge pull request #80 from daronco/fix-missing-smtp_from
...
Fix missing 'smtp_from' variable when notifications are turned off
2017-01-06 15:08:09 -05:00
Fred Dixon
d030605748
Merge pull request #79 from ffdixon/config-updates
...
Updates to Docerfile and env for documentation
2017-01-06 14:47:27 -05:00
Fred Dixon
d49e2e539e
Updates to Docerfile and env for documentation
2017-01-06 13:46:08 -06:00
Leonardo Crauss Daronco
78abef12af
Fix missing 'smtp_from' variable when notifications are turned off
...
Application would break in production because Rails.config.smtp_from
was not set if GREENLIGHT_MAIL_NOTIFICATIONS was false.
2017-01-06 17:45:29 -02:00
Fred Dixon
e988f5e5dd
Update en-us.yml
...
Make the text more consistent by using the term meeting instead of session
2017-01-06 13:02:07 -05:00
Fred Dixon
76acc9d331
Merge pull request #75 from erickadbay/dev-erick
...
Fix for when User with encrypted_id is not found
2016-12-19 16:54:30 -04:00
Erick Kad-Bay
a9ff1c7d9a
Fix for when User with encrypted_id is not found
2016-12-19 15:44:58 -05:00
Fred Dixon
520aacf302
Merge pull request #74 from daronco/summit-9
...
Several improvements made during the Summit IX
2016-12-11 11:35:36 -05:00
Leonardo Crauss Daronco
219ea625e0
Use a different banner image for personal rooms
2016-12-09 15:43:38 -02:00
Leonardo Crauss Daronco
87bccb1204
Require browser notification permissions only when the user signs in
...
The only notification right now is for signed in users that are viewing
their room's page, so request permission only in this case.
2016-12-09 15:18:41 -02:00
Leonardo Crauss Daronco
bf7d087f45
Show a browser notification when a user is waiting to join a room
...
The owner of a room receives a browser notification if he has the page open
and another person tries to join his room.
2016-12-09 13:52:53 -02:00
Leonardo Crauss Daronco
6726504ec3
Add timeago js library to show in the start_time of recordings
2016-12-09 11:50:09 -02:00
Leonardo Crauss Daronco
04ae45e4f4
Use 'unpublished' instead of 'inaccessible'
2016-12-09 10:26:28 -02:00
Leonardo Crauss Daronco
f763d8394e
Add flag to enable/disable mail notifications
2016-12-08 18:55:41 -02:00
