Fred Dixon
a53df17ec7
Merge pull request #3756 from kepstin/bbb-conf-rap-stop
...
bbb-conf: Stop all of the new recording units
2017-03-24 15:19:01 -04:00
Calvin Walton
1fe52cc24f
bbb-conf: Stop all of the new recording units
2017-03-24 15:17:29 -04:00
Ubuntu
5e0a5f019c
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into perroned-merge-webrtc-screenshare-2
2017-03-24 19:14:21 +00:00
Richard Alam
c13bd7255d
Merge pull request #3747 from capilkey/1.1-accessibility-fixes-3
...
More accessibility fixes for 1.1
2017-03-24 14:51:14 -04:00
Calvin Walton
ca41cb606a
Merge pull request #3752 from capilkey/fix-3694
...
Fix #3694
2017-03-24 14:25:31 -04:00
Anton Georgiev
ff8f78b2fa
Merge pull request #3754 from KDSBrowne/joinAudio-button-fix
...
[HTML5] - JoinAudio btn fix
2017-03-24 11:04:56 -04:00
KDSBrowne
507393a09b
add missing import to fix JoinAudio btn
2017-03-24 07:56:08 -07:00
KDSBrowne
eb3ac219e9
fix merge conflicts
2017-03-24 07:25:25 -07:00
Fred Dixon
f1ea606432
Merge pull request #3750 from riadvice/black-video-chat-layout
...
Black video chat layout update
2017-03-24 10:04:39 -04:00
Anton Georgiev
6b8e9146c7
Merge pull request #3751 from antobinary/audio-1
...
[HTML5] Modify the looks of the audio modal to match designs
2017-03-24 08:21:41 -04:00
Anton Georgiev
bd409e3919
Merge pull request #3749 from OZhurbenko/icons-update
...
Icons update and a missing import
2017-03-23 18:56:45 -04:00
Anton Georgiev
937f020ca1
center modal title
2017-03-23 18:50:30 -04:00
Chad Pilkey
1e4baeaffa
fix the recording play button to work with devices that have touch and a mouse
2017-03-23 15:38:28 -04:00
Anton Georgiev
8e9cba0f24
Merge pull request #3703 from JaeeunCho/close
...
HTML5 - Session for close private chat
2017-03-23 15:16:21 -04:00
KDSBrowne
4b2928f2fb
remove span element
2017-03-23 12:13:09 -07:00
JaeeunCho
fd08d99b6f
HTML5 - removed unused imports, fixed variable names
2017-03-23 12:02:40 -07:00
JaeeunCho
aa2615b52b
Merge remote-tracking branch 'upstream/master' into close
2017-03-23 11:59:54 -07:00
KDSBrowne
d6bdbeb448
add aria-label for unread messages
2017-03-23 11:26:44 -07:00
Ghazi Triki
7de860d3da
Remove video view border in dark mode.
2017-03-23 18:38:37 +01:00
Ghazi Triki
596f752ff1
Update MainApplicationShell and its footer style when video chat layout is selected.
2017-03-23 18:28:21 +01:00
Oleksandr Zhurbenko
0120e3cfe2
Added a missing import
2017-03-23 09:19:02 -07:00
Oleksandr Zhurbenko
a42c817a41
Updated icon sets to the latest
...
Contains a fixed icon for the audio modal
2017-03-23 09:15:33 -07:00
Fred Dixon
2864945208
Merge pull request #3748 from ffdixon/move-recording
...
Moved the recording systemd scripts into the core directory for recording scripts
2017-03-23 11:38:35 -04:00
Fred Dixon
cd491c67b6
Moved the recording systemd scripts into the core directory
2017-03-23 10:36:10 -05:00
KDSBrowne
e1bdeffa46
add missing import to fix JoinAudio Btn
2017-03-23 07:34:59 -07:00
KDSBrowne
c4c9ce5577
fix lint issues
2017-03-23 07:31:54 -07:00
KDSBrowne
918684b6c7
change variable name
2017-03-23 07:22:02 -07:00
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