Commit Graph

120 Commits (82e8a076c80f5fa366b7fb32fd9edb6981e5436c)

Author SHA1 Message Date
Håvar Aambø Fosstveit 82e8a076c8 Merge branch 'feature-msedge-screensharing' into develop 2018-06-25 13:50:07 +02:00
Håvar Aambø Fosstveit 61fd5a4e4a Added support for screensharing in MS Edge. 2018-06-25 13:49:50 +02:00
Håvar Aambø Fosstveit f7bb0ab738 Merge branch 'msedge-webcam-bugfix' into develop 2018-06-25 13:48:29 +02:00
Håvar Aambø Fosstveit 0648e29770 Fix for failure to get webcams in msedge. 2018-06-25 13:47:57 +02:00
Håvar Aambø Fosstveit 9138a48238 Merge branch 'feature-fullscreen' into develop 2018-06-22 11:46:40 +02:00
Håvar Aambø Fosstveit 3b03b24cc4 Working fullscreen view 2018-06-22 11:45:02 +02:00
Håvar Aambø Fosstveit fa94a62d9d Placed icon and begun work with code. 2018-06-21 15:25:40 +02:00
Håvar Aambø Fosstveit 81fcd136f4 Added handling of ended screensharing by chrome. 2018-06-21 13:22:19 +02:00
Håvar Aambø Fosstveit 0e493dcf0b Merge branch 'feature-screenview' into develop 2018-06-21 12:46:55 +02:00
Håvar Aambø Fosstveit 8df1ff83dc New screenview done for now. 2018-06-21 12:45:30 +02:00
Håvar Aambø Fosstveit 8ee85e6384 Merge branch 'feature-toolarea' into develop 2018-06-21 09:56:21 +02:00
Håvar Aambø Fosstveit c87e006da2 Inital work on screenview. 2018-06-20 15:04:53 +02:00
Håvar Aambø Fosstveit 5168feefe0 Initial work on tool area. Moved chat, settings and participant list into tool area. 2018-06-20 14:23:47 +02:00
Stefan Otto 48cc5f56ed Merge branch 'develop' of https://github.com/havfo/multiparty-meeting into develop 2018-06-19 16:27:56 +02:00
Stefan Otto cd6db5e08d Merge branch 'feature-chat-badge' into develop 2018-06-19 16:27:16 +02:00
Stefan Otto 85750d305f Added chat badge displaying unread messages 2018-06-19 16:25:27 +02:00
Håvar Aambø Fosstveit 71a1369bb3 Merge branch 'feature-settings' into develop 2018-06-18 15:11:21 +02:00
Håvar Aambø Fosstveit d2496eefe5 Fixed icons. 2018-06-18 15:11:02 +02:00
Håvar Aambø Fosstveit 1513042146 Merge branch 'feature-settings' into develop 2018-06-18 15:06:10 +02:00
Håvar Aambø Fosstveit 11bd9d3b52 Fixed some CSS. 2018-06-18 15:05:40 +02:00
Håvar Aambø Fosstveit 5c1de30468 Merge branch 'feature-settings' into develop 2018-06-18 14:54:24 +02:00
Håvar Aambø Fosstveit fd0083506c Changed remote media icons. 2018-06-18 14:53:49 +02:00
Håvar Aambø Fosstveit 45cf120c1d Small changes to css. 2018-06-18 14:49:21 +02:00
Håvar Aambø Fosstveit 071d50e66c Merge branch 'feature-settings' into develop 2018-06-18 14:29:32 +02:00
Håvar Aambø Fosstveit 894009aa6a Added toggle for advanced mode. Show more info and diagnostics. 2018-06-18 14:28:52 +02:00
Håvar Aambø Fosstveit 0be53e4a27 Merge branch 'feature-settings' into develop 2018-06-18 13:41:02 +02:00
Håvar Aambø Fosstveit cee74f9b29 Added login button. 2018-06-18 13:33:56 +02:00
Stefan Otto 6d46a777c0 fix centered settings-icon 2018-06-18 12:08:18 +02:00
Håvar Aambø Fosstveit cac2caa5c0 Some small fixes to resolution and scaling. 2018-06-18 11:06:39 +02:00
Håvar Aambø Fosstveit 24c5929e5b More resolution tests. 2018-06-18 10:18:31 +02:00
Håvar Aambø Fosstveit 7857ae27dd Updated resolution handling. 2018-06-17 23:14:42 +02:00
Håvar Aambø Fosstveit bca6db0e5e Testing some resolution changes. 2018-06-17 22:52:05 +02:00
Håvar Aambø Fosstveit ac922092ea Changed from using state.peers as array. 2018-06-16 22:09:03 +02:00
Håvar Aambø Fosstveit 0696316bf1 Moved some css to global. 2018-06-16 21:00:52 +02:00
Håvar Aambø Fosstveit 18c45ec9f2 Updated styling of settings dialog. 2018-06-16 20:56:41 +02:00
Håvar Aambø Fosstveit fcb15e706d Added support for setting audio input device, not working on linux at the moment. Updated webcam selection. 2018-06-15 23:19:26 +02:00
Håvar Aambø Fosstveit 7e1b391fe1 Started work on settings dialog. Possible to switch camera. 2018-06-15 14:58:01 +02:00
Håvar Aambø Fosstveit 668fa0f37f Merge branch 'feature-mute-participants' into develop 2018-06-15 09:31:58 +02:00
Håvar Aambø Fosstveit c18d982c1b Added support for muting audio and video from participants 2018-06-15 09:29:47 +02:00
Stefan Otto e105670fd9 Merge branch 'feature-oaut2' into develop 2018-06-08 13:49:51 +02:00
Stefan Otto 6ae1a097ae adding some 4:3 aspect fixes, adding httpserver for serving own static files, adding first working of oauth2.0 / openID Connect 2018-06-08 13:47:58 +02:00
Stefan Otto 0e4af79a42 Merge branch 'develop' of https://github.com/havfo/multiparty-meeting into develop 2018-06-08 12:58:06 +02:00
Stefan Otto 6b7914db46 Merge branch 'feature-systemService' into develop 2018-06-05 17:25:37 +02:00
Stefan Otto ce062fb7e9 adding service file for systemd for automatical upstart of the service: this makes sense in future when the server hosts his own static files by himself 2018-06-05 17:25:02 +02:00
Stefan Otto 29dd284348 Merge branch 'develop' of https://github.com/havfo/multiparty-meeting into local develop 2018-04-26 12:17:48 +02:00
Håvar Aambø Fosstveit d3883906ab Deactivate simulcast by default. 2018-04-26 09:34:10 +02:00
Håvar Aambø Fosstveit 84ac401d13 Change to URL handling. Join by /roomname. 2018-04-26 09:27:14 +02:00
Stefan Otto a52a96b13f Switch off simulcast as default until this works better 2018-04-24 18:28:57 +02:00
Stefan Otto cc7e491a90 Fix for last not correctly working merge - sorry for the mess! 2018-04-24 14:51:37 +02:00
Stefan Otto 7dfaeb65b5 Merge branch 'develop' of https://github.com/havfo/multiparty-meeting into develop 2018-04-24 11:10:30 +02:00