 Zachary Chai
|
3229f460f7
|
Merge pull request #162 from zach-chai/update_ruby
update ruby to 2.3.4
|
2017-04-11 13:37:33 -04:00 |
|
|
Zachary Chai
|
8173c4a803
|
Merge pull request #161 from zach-chai/room_id_param
override constraints to allow periods in room_id routes param
|
2017-04-11 11:26:07 -04:00 |
|
|
Zachary Chai
|
926396e825
|
Merge pull request #159 from zach-chai/restrict_characters
restrict some characters in meeting name
|
2017-03-26 15:24:44 -04:00 |
|
|
Zachary Chai
|
28e5d064da
|
Merge pull request #158 from zach-chai/override_constraints
override rails meeting id param constraints for routes
|
2017-03-26 15:00:20 -04:00 |
|
|
Zachary Chai
|
6e5fdb8d14
|
Merge pull request #154 from zach-chai/exceptions
enable routes as exceptions app
|
2017-03-21 18:23:21 -04:00 |
|
|
Zachary Chai
|
a7903dddba
|
Merge pull request #153 from zach-chai/error_controller
add errors controller with error pages for 404 500 422
|
2017-03-21 17:40:43 -04:00 |
|
|
Zachary Chai
|
8cf75b6051
|
Merge pull request #152 from zach-chai/meeting_name_strip
strip spaces and newlines from meeting names
|
2017-03-21 14:01:28 -04:00 |
|
|
Zachary Chai
|
ef309eb491
|
Merge pull request #151 from zach-chai/delete_recording
treat 404 as success for deleting recordings
|
2017-03-21 13:20:39 -04:00 |
|
|
Zachary Chai
|
97e1c6840b
|
Merge pull request #150 from zach-chai/bbb_create
rescue on bbb create if meeting already exists
|
2017-03-21 10:41:37 -04:00 |
|
|
Zachary Chai
|
b937018d24
|
Merge pull request #149 from zach-chai/end_meeting
send 200 on end meeting even if not found
|
2017-03-17 16:12:06 -04:00 |
|
|
Zachary Chai
|
89d8c9170e
|
Merge pull request #148 from zach-chai/end_meeting
handle ending meeting when it doesn't exist
|
2017-03-17 15:15:05 -04:00 |
|
|
Zachary Chai
|
59be45c875
|
Merge pull request #147 from zach-chai/check_name_entered
notify user when joining without name provided
|
2017-03-14 17:07:49 -04:00 |
|
|
Zachary Chai
|
8d4aaeff03
|
Merge pull request #146 from zach-chai/tutorial_video
only show tutorial video on root
|
2017-03-14 15:33:42 -04:00 |
|
|
Zachary Chai
|
cce5af3369
|
Merge pull request #145 from zach-chai/better_encoding
Better encoding
|
2017-03-14 14:37:48 -04:00 |
|
|
Zachary Chai
|
1f1da89856
|
Merge pull request #144 from ffdixon/modify-footer
Added link to overview video for GreenLight to footer
|
2017-03-10 10:48:05 -05:00 |
|
|
Zachary Chai
|
b98185b540
|
Merge pull request #143 from alexandrekreis/master
Adding list of participants to post publish script
|
2017-03-07 10:41:39 -05:00 |
|
|
Zachary Chai
|
d9603fccb9
|
Merge pull request #142 from zach-chai/more_testing
more testing and code cleanup
|
2017-03-03 15:34:13 -05:00 |
|
|
Zachary Chai
|
bee42c8148
|
Merge pull request #141 from zach-chai/test_recording_callback
test recording ready callback
|
2017-03-03 14:16:28 -05:00 |
|
|
Zachary Chai
|
736bf89ce0
|
Merge pull request #140 from zach-chai/update_tests
Update tests
|
2017-03-03 10:54:29 -05:00 |
|
|
Zachary Chai
|
3e6cd3a9ed
|
Merge pull request #139 from zach-chai/redirect_help
redirect help to BBB videos
|
2017-03-02 13:45:09 -05:00 |
|
|
Zachary Chai
|
66535e6881
|
Merge pull request #138 from zach-chai/logging
add condensed logging
|
2017-03-02 10:49:51 -05:00 |
|
|
Zachary Chai
|
668886826f
|
Merge pull request #137 from zach-chai/scope_recording_create
scope recording create notifications to room owner only
|
2017-03-02 09:28:56 -05:00 |
|
|
Zachary Chai
|
71505a18d2
|
Merge pull request #136 from zach-chai/update_notification
update user waiting notification to show meeting name
|
2017-02-28 17:54:19 -05:00 |
|
|
Zachary Chai
|
7bb1340fef
|
Merge pull request #135 from zach-chai/fix_delete
Fix delete
|
2017-02-28 10:45:46 -05:00 |
|
|
Zachary Chai
|
c96e5d3ba3
|
Merge pull request #134 from zach-chai/character_limits
meeting and user name character limits
|
2017-02-24 11:08:38 -05:00 |
|
|
Zachary Chai
|
d16470386f
|
Merge pull request #132 from zach-chai/minor_email_change
change email template table styling
|
2017-02-22 17:26:15 -05:00 |
|
|
Zachary Chai
|
a4efa3b3a3
|
Merge pull request #131 from zach-chai/update_email
update recording notification email
|
2017-02-22 14:55:57 -05:00 |
|
|
Zachary Chai
|
55f2041b7c
|
Merge pull request #130 from zach-chai/uri_encode
uri encode webhook URL
|
2017-02-21 13:15:06 -05:00 |
|
|
Zachary Chai
|
4be08f993d
|
Merge pull request #129 from zach-chai/previous_meetings
make previous meetings per room instead of global
|
2017-02-21 11:01:28 -05:00 |
|
|
Zachary Chai
|
38ffce7d10
|
Merge pull request #125 from zach-chai/participants
add participants to recordings table
|
2017-02-21 10:44:43 -05:00 |
|
|
Zachary Chai
|
16a1626130
|
Merge pull request #128 from zach-chai/update_recording_notify
update recording notify to work with new workflow
|
2017-02-17 16:06:47 -05:00 |
|
|
Zachary Chai
|
dbfed8eba4
|
Merge pull request #127 from zach-chai/help
Help page
|
2017-02-16 17:37:08 -05:00 |
|
|
Zachary Chai
|
71bc125a61
|
Merge pull request #126 from zach-chai/fix_notifications
add user waiting notifications back to main room
|
2017-02-16 14:30:35 -05:00 |
|
|
Zachary Chai
|
82df7d209a
|
Merge pull request #124 from zach-chai/button_tooltips
button tooltips
|
2017-02-14 18:20:36 -05:00 |
|
|
Zachary Chai
|
7d227fd383
|
Merge pull request #123 from zach-chai/force_ssl
force SSL
|
2017-02-14 17:37:40 -05:00 |
|
|
Zachary Chai
|
2cc5c9e949
|
Merge pull request #122 from zach-chai/past_meetings_from_recordings
past meetings from recordings
|
2017-02-14 14:30:01 -05:00 |
|
|
Zachary Chai
|
add6a95c4b
|
Merge pull request #120 from zach-chai/updates
Updates
|
2017-02-10 16:56:59 -05:00 |
|
|
Zachary Chai
|
f2dd5df845
|
Merge pull request #119 from zach-chai/recordings_play
recordings play button
|
2017-02-10 09:27:48 -05:00 |
|
|
Zachary Chai
|
a45a704be3
|
Merge pull request #118 from zach-chai/fix_assets
Fix some assets not working in production
|
2017-02-09 11:38:51 -05:00 |
|
|
Zachary Chai
|
adb0314701
|
Merge pull request #117 from zach-chai/update_routes
Update routes to support relative root urls
|
2017-02-07 14:49:23 -05:00 |
|
|
Zachary Chai
|
77c66c5be5
|
Merge pull request #112 from zach-chai/add_license
add license to some files and change comment type in html
|
2017-02-03 16:31:43 -05:00 |
|
|
Zachary Chai
|
aa5d216312
|
Merge pull request #111 from zach-chai/update_mod_message
add invite link to moderator message
|
2017-02-03 16:01:26 -05:00 |
|
|
Zachary Chai
|
e7e792ec94
|
Merge pull request #110 from zach-chai/more_rewording
More rewording
|
2017-02-03 14:49:04 -05:00 |
|
|
Zachary Chai
|
5232fd1ab1
|
Merge pull request #109 from zach-chai/previously_joined
update previously joined meetings on root page
|
2017-02-03 11:59:56 -05:00 |
|
|
Zachary Chai
|
70d2189ee0
|
Merge pull request #108 from bigbluebutton/workflow_redesign
Simplify workflow of starting a meeting
|
2017-02-03 10:54:46 -05:00 |
|
|
Zachary Chai
|
b923367e5c
|
Merge pull request #107 from zach-chai/add_logout
add link to personal room and logout on every landing page
|
2017-02-03 10:22:53 -05:00 |
|
|
Zachary Chai
|
c62424ffb6
|
Merge pull request #106 from zach-chai/move_url_buttons
move url buttons in room below the url
|
2017-02-03 10:00:28 -05:00 |
|
|
Zachary Chai
|
ae7029b5f2
|
Merge pull request #105 from zach-chai/logout_text
replace logout with return to personal room
|
2017-02-02 17:16:43 -05:00 |
|
|
Zachary Chai
|
40add376b2
|
Merge pull request #104 from zach-chai/update_footer
update footer and remove build version
|
2017-02-02 15:49:25 -05:00 |
|
|
Zachary Chai
|
c05ce293df
|
Merge pull request #103 from zach-chai/previous_room_meetings
store previously joined authenticated meetings
|
2017-02-02 15:07:42 -05:00 |
|
|
Zachary Chai
|
126993dc08
|
Merge pull request #102 from zach-chai/recordings
Recordings
|
2017-02-02 11:18:44 -05:00 |
|
|
Zachary Chai
|
cbafd95d19
|
Merge pull request #101 from zach-chai/quick_changes
minor text changes
|
2017-02-02 09:18:33 -05:00 |
|
|
Zachary Chai
|
9cf8042a69
|
Merge pull request #100 from zach-chai/fix_anonymous_meeting
fix anonymouse meetings
|
2017-01-31 17:00:09 -05:00 |
|
|
Zachary Chai
|
051a93e175
|
Merge pull request #99 from zach-chai/recording_updates
Recording updates
|
2017-01-31 16:34:22 -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
|
0ce2a226a7
|
Merge pull request #97 from zach-chai/room_rework
Room rework
|
2017-01-26 16:06:09 -08: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
|
e3e154b99c
|
Merge pull request #95 from zach-chai/home_page_rework
Home page rework
|
2017-01-24 16:26:48 -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
|
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
|
e5932d805b
|
Merge pull request #85 from zach-chai/add_postgres_gem
postgres support
|
2017-01-19 15:13:56 -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
|
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
|
de85c5d1c6
|
Merge pull request #69 from zach-chai/downscale_background_image
downscale background image
|
2016-12-02 17:02:37 -05:00 |
|
|
Zachary Chai
|
692e864434
|
Merge pull request #68 from zach-chai/transfer_bigbluebutton
point docker image to bigbluebutton repo
|
2016-12-02 16:23:19 -05:00 |
|
|
Zachary Chai
|
75fcc5af97
|
Merge pull request #67 from zach-chai/background
Background
|
2016-12-02 15:35:16 -05:00 |
|
|
Zachary Chai
|
773e9689dc
|
Merge pull request #66 from zach-chai/duration
add units to duration header
|
2016-12-02 15:01:37 -05:00 |
|
|
Zachary Chai
|
f63ea9c4b8
|
Merge pull request #63 from zach-chai/join_meeting_name
use the user's name for the bbb meeting name
|
2016-12-01 17:04:21 -05:00 |
|
|
Zachary Chai
|
41c9e7798f
|
Merge pull request #62 from zach-chai/caching_fix
destroy recordings table before caching page
|
2016-12-01 15:38:02 -05:00 |
|
|
Zachary Chai
|
05a7830cc3
|
Merge pull request #61 from zach-chai/updates
remember name for logged out users and other ui updates
|
2016-12-01 11:19:48 -05:00 |
|
|
Zachary Chai
|
44085a6b1a
|
Merge pull request #58 from zach-chai/hide_empty_session_panel
hide joined sessions panel when empty
|
2016-11-30 17:15:50 -05:00 |
|
|
Zachary Chai
|
f0128951f4
|
Merge pull request #56 from erickadbay/dev-erick
Fixed recording duration
|
2016-11-29 17:43:44 -05:00 |
|
|
Zachary Chai
|
f400ca390e
|
Merge pull request #55 from zach-chai/previously_joined_sessions
Previously joined sessions
|
2016-11-29 15:49:38 -05:00 |
|
|
Zachary Chai
|
54347ac11b
|
Merge pull request #54 from erickadbay/dev-erick
Added hover for thumbnails using css
|
2016-11-29 15:36:15 -05:00 |
|
|
Zachary Chai
|
ffddb0e834
|
Merge pull request #53 from zach-chai/tests
add basic tests
|
2016-11-29 15:25:20 -05:00 |
|
|
Zachary Chai
|
a8e2aa37fc
|
Merge pull request #52 from erickadbay/dev-erick
Added LGPL 3.0 license to all source/config files
|
2016-11-29 14:48:40 -05:00 |
|
|
Zachary Chai
|
0088eae7e4
|
Merge pull request #50 from zach-chai/join_as_moderator
all join as moderator in anonymous meeting
|
2016-11-25 12:16:43 -05:00 |
|
|
Zachary Chai
|
77ba8c614b
|
Merge pull request #49 from zach-chai/room_updates
Room updates
|
2016-11-24 18:20:20 -05:00 |
|
|
Zachary Chai
|
40e7540673
|
Merge pull request #48 from zach-chai/minor_redesign
Minor redesign
|
2016-11-24 16:24:24 -05:00 |
|
|
Zachary Chai
|
9ee0fbc038
|
Merge pull request #44 from zach-chai/optional_omniauth
hide oauth login when not configured
|
2016-11-23 14:23:26 -05:00 |
|
|
Zachary Chai
|
c9e339e5e1
|
Merge pull request #43 from zach-chai/fix_url_generate
generate url with ports
|
2016-11-22 18:18:20 -05:00 |
|
|
Zachary Chai
|
e8cf988604
|
Merge pull request #42 from zach-chai/final_prod
easy_deploy_configs
|
2016-11-22 16:56:15 -05:00 |
|
|
Zachary Chai
|
8fc8182672
|
Merge pull request #41 from zach-chai/cleanup
room updates in job
|
2016-11-21 16:35:56 -05:00 |
|
|
Zachary Chai
|
c79ae3c1d6
|
Merge pull request #40 from zach-chai/ui_updates
Ui updates
|
2016-11-21 15:18:50 -05:00 |
|
|
Zachary Chai
|
8b7dc9fc5d
|
Merge pull request #39 from zach-chai/usability
Usability
|
2016-11-17 16:59:11 -05:00 |
|
|
Zachary Chai
|
459740cb36
|
Merge pull request #38 from zach-chai/usability
focus input on load and enter key submits join
|
2016-11-15 17:41:05 -05:00 |
|
|
Zachary Chai
|
878f72cc56
|
Merge pull request #37 from zach-chai/fix_guest_join
fix guest join
|
2016-11-15 16:49:27 -05:00 |
|
|
Zachary Chai
|
dbea6f1f9f
|
Merge pull request #36 from zach-chai/cleanup_meetings
cleanup meetings
|
2016-11-15 14:28:15 -05:00 |
|
|
Zachary Chai
|
e5c31f81c2
|
Merge pull request #34 from zach-chai/coffeescript_classes
coffeescript classes instead of es6
|
2016-11-14 17:35:28 -05:00 |
|
|
Zachary Chai
|
c45e08a821
|
Merge pull request #33 from zach-chai/recordings
recordings table
|
2016-11-14 15:22:33 -05:00 |
|
|
Zachary Chai
|
18a1c0f835
|
Merge pull request #32 from zach-chai/meeting_class
finish meeting class
|
2016-11-10 17:15:56 -05:00 |
|
|
Zachary Chai
|
ef06c4133b
|
Merge pull request #31 from zach-chai/client_i18n
send translated strings to javascript
|
2016-11-10 14:46:55 -05:00 |
|
|
Zachary Chai
|
c32b513d6c
|
Merge pull request #30 from zach-chai/order_recordings
default ordering on recordings
|
2016-11-09 17:30:25 -05:00 |
|
|
Zachary Chai
|
a1f88a6615
|
Merge pull request #29 from zach-chai/dynamic_room_content
Dynamic room content
|
2016-11-09 17:00:54 -05:00 |
|
|
Zachary Chai
|
7068d0b023
|
Merge pull request #28 from zach-chai/oauth_update
oauth update
|
2016-11-09 13:57:33 -05:00 |
|
|
Zachary Chai
|
e093ead683
|
Merge pull request #27 from zach-chai/delete_sync
finish delete recording feature
|
2016-11-08 16:22:51 -05:00 |
|
|
Zachary Chai
|
93b5e9a1b3
|
Merge pull request #26 from zach-chai/dialogs
Dialogs
|
2016-11-08 10:15:21 -05:00 |
|
|
Zachary Chai
|
5a8e6026d9
|
Merge pull request #25 from zach-chai/end_meeting
End meeting
|
2016-11-07 13:30:23 -05:00 |
|
|
Zachary Chai
|
c9aaf2346a
|
Merge pull request #24 from zach-chai/localization
Localization
|
2016-11-03 17:37:48 -04:00 |
|