Граф коммитов

13917 Коммитов

Автор SHA1 Сообщение Дата
Morris Jobke b59b28e7c0
Properly remove peer and add placeholder for promoted speaker
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 03:26:48 +01:00
Jan-Christoph Borchardt 4cd138e5e3 fix CSS syntax
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 03:19:14 +01:00
Morris Jobke c23e76a82e
properly change DOM elements to promote user
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 03:18:52 +01:00
Jan-Christoph Borchardt 5639c5f485 fix layout for 1on1 calls
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 03:17:34 +01:00
Lukas Reschke d979c930e1
Add mapping table
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-17 02:56:10 +01:00
Lukas Reschke d1147f7af9
Merge branch 'master' of https://github.com/nextcloud/spreed 2016-11-17 02:44:15 +01:00
Lukas Reschke 742aaec2f9
Promote speaker
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-17 02:44:08 +01:00
Morris Jobke ce18d7458a
do not update participants class if the same
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 02:35:51 +01:00
Jan-Christoph Borchardt d99c6b7d15 CSS cleanup
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 02:27:57 +01:00
Lukas Reschke 80dbb1134f
Merge branch 'master' of https://github.com/nextcloud/spreed 2016-11-17 02:25:27 +01:00
Lukas Reschke d28b4fbab9
Add participant class number
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-17 02:25:11 +01:00
Morris Jobke 7d028c2fbf
Fix message signaling for speaker promotion
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 02:24:00 +01:00
Morris Jobke 3b25adbfdc
Add code to promote speaker
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 02:18:48 +01:00
Jan-Christoph Borchardt 9ce26ebad4 switch to flexbox for real
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 02:17:32 +01:00
Jan-Christoph Borchardt 2d5d6bc552 switch to flexbox
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 02:11:08 +01:00
Lukas Reschke cfa12f23d5 Merge pull request #108 from nextcloud/reorder-for-jan
Move into same div
2016-11-17 02:04:24 +01:00
Lukas Reschke ca3eb209ab
Move into same div
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-17 02:04:05 +01:00
Jan-Christoph Borchardt a652a6cf20 make current speaker large
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 02:00:11 +01:00
Jan-Christoph Borchardt 2061342e8a fix video not showing in 1on1 call
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 01:58:25 +01:00
Jan-Christoph Borchardt dcd0cec2db prepare for flexbox
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 01:49:05 +01:00
Roeland Jago Douma 426228d5c1 Merge pull request #107 from nextcloud/fix_logerrors
Make sure there are no undefined index warnings
2016-11-17 01:36:30 +01:00
Jan-Christoph Borchardt c415042d7c fix layout bottom row
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 01:26:59 +01:00
Lukas Reschke 7273ccafa3
If the peer is still disconnected after 5 seconds
we close the video connection.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-17 01:21:34 +01:00
Jan-Christoph Borchardt 9fd1e1f89d break layout
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 01:15:13 +01:00
Lukas Reschke 075bb0a7b8
Log the connection state after 5 seconds
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-17 01:11:25 +01:00
Roeland Jago Douma 0c52c1a848
Make sure there are no undefined index warnings
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-17 00:54:31 +01:00
Lukas Reschke 0e7b791cb8
Merge branch 'master' of https://github.com/nextcloud/spreed 2016-11-17 00:53:58 +01:00
Lukas Reschke 7f272db823
Revert "Recreate peer if connection failed"
This reverts commit 1fe0ccb906.
2016-11-17 00:51:22 +01:00
Jan-Christoph Borchardt b49e39bfa2 more layout fixes for certain numbers of groups
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 00:45:28 +01:00
Lukas Reschke 1fe0ccb906
Recreate peer if connection failed
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-17 00:43:59 +01:00
Lukas Reschke e7e88bf981
Merge branch 'master' of https://github.com/nextcloud/spreed 2016-11-17 00:35:33 +01:00
Lukas Reschke 46c637eebd 1280x720
🚀
2016-11-17 00:30:17 +01:00
Jan-Christoph Borchardt 9b29d9d39b adjusting size of camera preview for group calls
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 00:23:17 +01:00
Jan-Christoph Borchardt 1e43c21de7 even more layout fixes
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 00:18:07 +01:00
Jan-Christoph Borchardt d0e80e7bdd more small layout fixes for participant numbers
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 00:13:58 +01:00
Jan-Christoph Borchardt 97b0152ae2 ellipsize names
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 00:13:58 +01:00
Roeland Jago Douma f21ea999fb Merge pull request #105 from nextcloud/fix_eslint
Fix eslint
2016-11-17 00:05:46 +01:00
Jan-Christoph Borchardt fb51d24b2c fix content layout
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 00:02:04 +01:00
Lukas Reschke d6807e06b0 Merge pull request #104 from nextcloud/use_state_of_webrtc
The webrtc library already keeps state lets use that
2016-11-16 23:59:30 +01:00
Roeland Jago Douma 37dcc6c6cd
The webrtc library already keeps state lets use that
The webrtc lib already holds the video and audio state (of the local
video). We should make use of this to avoid getting out of sync for
whatever reason.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-16 23:58:25 +01:00
Roeland Jago Douma 5c8485f686
Fix eslint
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-16 23:57:18 +01:00
Lukas Reschke 0255dffa4e
Fix adduser 2016-11-16 23:45:58 +01:00
Lukas Reschke d735c2a008
Use unique session IDs and some more patches
- Uses displayname instead of UID
- Uses unique session ID so we can reconnect and change rooms

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-16 23:39:00 +01:00
Roeland Jago Douma acf4f7e378
The webrtc library already keeps state lets use that
The webrtc lib already holds the video and audio state (of the local
video). We should make use of this to avoid getting out of sync for
whatever reason.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-16 22:49:56 +01:00
Jan-Christoph Borchardt 716cca9758 fix readability of name
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-16 17:44:07 +01:00
Lukas Reschke 000b2259b7
Set timeout to 30 seconds and use JS for disconnecting
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-16 17:38:11 +01:00
Jan-Christoph Borchardt b4b238825b Merge pull request #95 from nextcloud/leave-room
Add leave room functionality.
2016-11-16 17:17:04 +01:00
Jan-Christoph Borchardt 3daf333153 fix layout for 3 participants and 5 or 6
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-16 17:09:28 +01:00
Jan-Christoph Borchardt 9f7092419b add shadow to make participant name readable on bright background
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-16 16:50:28 +01:00
Jan-Christoph Borchardt aae08a3dde fix layout for 4
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-16 16:32:02 +01:00