KDSBrowne
2d876550db
merge with master
2017-03-23 07:16:47 -07:00
Ghazi Triki
313de26ddb
Fix "videoDockStyleNoFocusChatLayout" style class border color.
2017-03-23 14:40:03 +01:00
Chad Pilkey
4515c08654
changes to shortcut keys so they all work in IE
2017-03-22 19:53:12 -04:00
Chad Pilkey
5fd7384b4f
fix Flash client focus issues when windows are hidden
2017-03-22 19:51:44 -04:00
perroned
cb124961a2
Connect to /verto endpoint
2017-03-22 22:20:15 +00:00
Fred Dixon
ba37d106ea
Merge pull request #3746 from kepstin/parallel-rap-worker
...
record-and-playback: Split rap-worker into separate workers per step.
2017-03-22 18:03:07 -04:00
Calvin Walton
dd23536c84
record-and-playback: Split rap-worker into separate workers per step.
...
The purpose of this is to ensure that the recording processing with make
visible forwards progress, by ensuring that different steps in the
recording pipeline don't block each-other.
This fixes:
- recordings being processed prevent archiving new recordings from running
- recordings can't be published until all pending recording processing
completes
It does allow recording archive, sanity, process, publish steps to run in
parallel with each other, but at most one recording will be in each step at
a time. (I.e. while one recording is being processed, a different recording
can be published). This may potentially increase CPU usage for some users.
If you expect this to be a problem, you can set resource controls (see
`man systemd.resource-control`) on the bbb_record_core.slice systemd unit.
2017-03-22 17:20:29 -04:00
Anton Georgiev
a1f3d48819
cleanup
2017-03-22 16:52:41 -04:00
Ubuntu
a096e25a72
Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2
2017-03-22 20:37:41 +00:00
Anton Georgiev
18508b2632
audio join - apply structure and style from designs
2017-03-22 16:10:49 -04:00
Chad Pilkey
e9258c77bf
Merge pull request #3743 from riadvice/black-video-chat-layout
...
Make "Video Chat" layout background dark
2017-03-22 15:57:38 -04:00
Richard Alam
bbe6a9c41d
Merge pull request #3726 from riadvice/breakout-rooms-improve-for-viewer
...
Breakout rooms improve for viewer role
2017-03-22 15:05:45 -04:00
Ghazi Triki
a416f8cb8c
"Video Chat" Layout has a dark background, controls are and title are removed in this layout.
2017-03-22 17:34:11 +01:00
Ghazi Triki
4ecc88ed08
Delete unused layout event class and videconf view.
2017-03-22 14:55:54 +01:00
Anton Georgiev
6dab18333f
Merge pull request #3733 from Gcampes/dropdown-mobile-fix
...
[HTML5] Fix dropdowns on mobile
2017-03-22 09:42:40 -04:00
gcampes
8582c18be9
Merge conflicts
2017-03-22 10:00:37 -03:00
JaeeunCho
75dbfc23b6
HTML5 - changed underscore to lodash
2017-03-21 14:52:10 -07:00
perroned
c64c97b582
Html5 clean up
2017-03-21 21:46:41 +00:00
JaeeunCho
b81957da43
HTML5 - fixed conflict
2017-03-21 13:29:46 -07:00
perroned
47c6e3fe69
Puts back resolution values into screen constraints
2017-03-21 17:14:36 +00:00
perroned
8c338f42d2
Fixes bug with call not always going through x2
2017-03-21 17:00:58 +00:00
Anton Georgiev
5575d32438
Merge pull request #3730 from KDSBrowne/action-buttons-center
...
Actions Bar Positioning
2017-03-21 12:18:46 -04:00
Anton Georgiev
09833f6c22
Merge pull request #3740 from antobinary/br-kick
...
[HTML5] Handle properly 'Cancel' on breakout room invitation. Drop unused packages
2017-03-21 12:10:41 -04:00
Anton Georgiev
55ce33e7bb
revert tabIndex change
2017-03-21 12:09:44 -04:00
Anton Georgiev
5f283a7311
Merge pull request #3678 from KDSBrowne/Fullscreen-Label-Change
...
HTML5 - Fullscreen Label Change
2017-03-21 11:53:13 -04:00
KDSBrowne
ceeb66ceed
Merge remote-tracking branch 'upstream/master' into Fullscreen-Label-Change
2017-03-21 08:50:09 -07:00
perroned
3dfb5bba43
Fixes bug with call not always going through
2017-03-21 15:42:14 +00:00
Ubuntu
529bec5eac
Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2
2017-03-21 15:21:44 +00:00
KDSBrowne
c7c44c4c63
add local folder
2017-03-21 07:46:41 -07:00
KDSBrowne
8f76ec495c
remove unused imports
2017-03-21 07:35:09 -07:00
KDSBrowne
7479570a8c
move handleExitAudio to service
2017-03-21 07:29:54 -07:00
KDSBrowne
96212a1045
remove merge conflict
2017-03-21 07:17:53 -07:00
KDSBrowne
79e1d0bcbe
fix more linting issues
2017-03-21 06:56:38 -07:00
KDSBrowne
25f745cf32
lint nav settings dropdown container
2017-03-21 06:52:59 -07:00
KDSBrowne
1234325a02
remove unused imports
2017-03-21 06:44:14 -07:00
KDSBrowne
d92a0f5188
change function name
2017-03-21 06:41:13 -07:00
perroned
ffea5cf785
Cleans up
2017-03-20 19:02:59 +00:00
Anton Georgiev
2223172612
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into br-kick
2017-03-20 14:44:51 -04:00
Anton Georgiev
6d325297ee
remove unused packages
2017-03-20 14:37:55 -04:00
Anton Georgiev
a183595d73
improve check for dismiss object
2017-03-20 14:33:32 -04:00
gcampes
acb8b1155b
Merge conflicts
2017-03-20 15:00:04 -03:00
Anton Georgiev
b54b4290a6
Merge pull request #3736 from oswaldoacauan/refactor-auth-flow
...
[HTML5] Refactor of the authentication flow, localization and other improvements
2017-03-20 13:17:05 -04:00
JaeeunCho
823c667cac
HTML5 - changed session method to props
2017-03-17 11:25:41 -07:00
Ubuntu
4da7d6d03f
Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2
2017-03-17 15:55:23 +00:00
JaeeunCho
eb176e77ac
HTML5 - changed session and variables name
2017-03-17 08:27:37 -07:00
Oswaldo Acauan
72dc94ab31
Remove old Kicked screen in favor of the new error screen
2017-03-17 14:38:18 +00:00
Oswaldo Acauan
2090883b03
Refactor Auth logout and credentials getter
2017-03-17 14:23:00 +00:00
KDSBrowne
ed8fdf6f89
remove the else block
2017-03-16 17:29:58 -07:00
KDSBrowne
c6e08c5518
improve adding and removing of events
2017-03-16 17:06:34 -07:00
KDSBrowne
d2405d4c61
pass props down from createContainer
2017-03-16 16:30:46 -07:00
