Commit Graph

220 Commits (78004742348c0431acd2e81a72e8726cb9874790)

Author SHA1 Message Date
Stefan Otto 7800474234
Merge pull request #28 from torjusti/fix/server-refactor
[WIP] Use Express instead of custom server, passport for auth and refactor server files

Remember: config.example.js changed!
2018-07-23 13:51:35 +02:00
Torjus 8b99f07854 Tear out login in progress logic 2018-07-23 13:47:46 +02:00
Torjus 4f0140ea36 Fix authorization logic 2018-07-23 13:26:05 +02:00
Torjus 6bdc29682b Use module.exports, not exports 2018-07-23 12:26:50 +02:00
Torjus 3a24e0b3ad Remove unused callback endpoint 2018-07-23 12:23:41 +02:00
Torjus bdfc8384fa Update config.example.js 2018-07-23 12:23:19 +02:00
Torjus 313ce81685 Fix linting errors, export mediasoup server 2018-07-23 12:22:14 +02:00
Torjus f44bde4ef4 Use Express instead of custom server, passport for auth and refactor server 2018-07-23 12:09:15 +02:00
Stefan Otto 0ac5f05c01
Merge pull request #27 from torjusti/fix/sidebar-redux
Ensure sidebar settings state is not reset on sidebar toggle
2018-07-23 11:07:39 +02:00
Torjus 0260186c65 Ensure sidebar settings state is not reset on sidebar toggle 2018-07-23 10:14:00 +02:00
Stefan Otto 4431a40297
Merge pull request #26 from torjusti/feat/filmstrip
Filmstrip view
2018-07-23 09:42:05 +02:00
Torjus 7239dffad5 Always vertically center the big film in Filmstrip view 2018-07-23 09:29:11 +02:00
Torjus 32366163db Never clear big film in Filmstrip view 2018-07-23 09:27:01 +02:00
Torjus 86f0d56f00 Center films in filmstrip 2018-07-20 16:51:48 +02:00
Torjus e4f29b298b Force Filmstrip video to take as much space as possible 2018-07-20 16:44:21 +02:00
Torjus e49cdcf88e Move Me to the top of the screen to accomodate for the Filmstrip view 2018-07-20 11:10:24 +02:00
Torjus b9f4b6a812 Ensure Filmstrip is always at the bottom of the page 2018-07-20 10:53:11 +02:00
Torjus bab4f420fd Add mode switch (democratic, filmstrip) to settings 2018-07-20 10:49:03 +02:00
Torjus 0c3eb4f154 Make Settings inputs controlled 2018-07-20 10:16:32 +02:00
Torjus d4e65e0c1b Fix Filmstrip border colors 2018-07-20 09:55:26 +02:00
Torjus f6aee44df6 Add overlay to the Filmstrip and scrollbar for horizontal overflow 2018-07-20 09:52:16 +02:00
Torjus 076441e2b5 Continue improving Filmstrip styling 2018-07-19 16:29:11 +02:00
Torjus c03d55b181 Do not use separate directory for Filmstrip 2018-07-19 15:13:25 +02:00
Torjus cab3032f8f Add some very basic styling to the Filmstrip 2018-07-19 15:07:33 +02:00
Torjus ef2d8a4105 Add basic skeleton for a Filmstrip view 2018-07-19 13:47:14 +02:00
Stefan Otto b25f2eb012
Merge pull request #24 from torjusti/feat/app-fullscreen
Fine-tune fullscreen functionality
2018-07-19 10:36:12 +02:00
Torjus 21337bc1ef Use the generic black background for FullView 2018-07-19 10:23:29 +02:00
Torjus fb6db175b8 Merge branch 'develop' of github.com:havfo/multiparty-meeting into feat/app-fullscreen
* 'develop' of github.com:havfo/multiparty-meeting:
  Fix number of boxes being counted in updateDimensions
  fix: fullscreenbutton on screenshare
  rollback updateDimensions to counting video elements instead of peers(needed fixes screensharing)
2018-07-19 10:19:27 +02:00
Torjus 9c2d7bbce2 Fix linting in Sidebar 2018-07-19 10:04:46 +02:00
Torjus f518833deb Move Sidebar CSS into separate file 2018-07-19 10:04:19 +02:00
Torjus a26cf2fa14 Add global fullscreen toggle button 2018-07-19 10:01:34 +02:00
Torjus 88f59214e6 Move Sidebar into a separate component 2018-07-19 09:31:47 +02:00
Torjus 209fccbfc3 Tear out old fullscreen functionality 2018-07-19 09:14:07 +02:00
Stefan Otto ae8e906f27 Merge branch 'develop' of https://github.com/havfo/multiparty-meeting into develop 2018-07-19 09:09:39 +02:00
Stefan Otto e4c48f28f4 Merge branch 'fix-updateDimensions' into develop 2018-07-19 09:08:32 +02:00
Stefan Otto dcae531673
Merge pull request #21 from torjusti/fix-updateDimensions
Fix number of boxes being counted in updateDimensions
2018-07-19 09:06:05 +02:00
Torjus a5457ecac1 Fix number of boxes being counted in updateDimensions 2018-07-18 16:29:33 +02:00
Stefan Otto f49f02d016 fix: fullscreenbutton on screenshare 2018-07-18 15:21:19 +02:00
Stefan Otto dcca301d82 rollback updateDimensions to counting video elements instead of peers(needed fixes screensharing) 2018-07-18 15:20:22 +02:00
Stefan Otto 065b85be25
Merge pull request #19 from torjusti/feat/chat-images
[WIP] Add images to chat
2018-07-18 15:10:20 +02:00
Torjus 73f608aa50 Do not attempt setting own profile picture as peer picture 2018-07-18 15:02:40 +02:00
Torjus 02099054b3 Merge branch 'develop' of github.com:havfo/multiparty-meeting into feat/chat-images
* 'develop' of github.com:havfo/multiparty-meeting:
  fix: unread badge is number not bool
  Just to make toolarea a little bit less ugly
  microphone indicator changes opacity with volume level
  hark running now on producers and consumers directly instead on PeerView component, now we can send audiolevel events into more places ...
  Fix fade-out animation running on page load
2018-07-18 14:52:31 +02:00
Torjus 48b2668f0b Consistent avatar styling in chat and users tabs 2018-07-18 14:46:19 +02:00
Torjus a1fad12b5c Merge develop and remove comments 2018-07-18 14:45:36 +02:00
Torjus 89465e71f9 Add profile pic spreading to protoo server 2018-07-18 14:23:34 +02:00
Torjus 1275e6fef4 Style chat pictures 2018-07-18 14:15:06 +02:00
Torjus 3a43443011 Add avatars to user list 2018-07-18 13:59:52 +02:00
Torjus c416d0c402 Add images to chat 2018-07-18 12:00:55 +02:00
Stefan Otto 62412caad2 Merge branch 'fix-unread-number' into develop 2018-07-18 11:35:04 +02:00
Stefan Otto 2a8d19ad56 fix: unread badge is number not bool 2018-07-18 11:34:30 +02:00