Commit Graph

14481 Commits

Author SHA1 Message Date
gcampes
52578a2eea Fix rollback settings issue 2017-03-28 17:16:57 -03:00
gcampes
e5e3904597 Merge remote-tracking branch 'upstream/master' into settings-refactor
* upstream/master:
  - try fix broken get recording api call
  Updated bbb-conf --restart to restart bbb-webhooks
  Updated references to systemd units for recording
  Make single click text box tool bigger.
  - cleanup
  - fix issue where GetRecordings API was failing because support of old metadata.xml broke.
  Create text field in the whiteboard with a single click.
  fix issue where client transcripts could get into a bad state
  - update locales
  bbb-conf: Stop all of the new recording units
  add missing import to fix JoinAudio btn
  fix the recording play button to work with devices that have touch and a mouse
  Remove video view border in dark mode.
  Update MainApplicationShell and its footer style when video chat layout is selected.
  Fix "videoDockStyleNoFocusChatLayout" style class border color.
  changes to shortcut keys so they all work in IE
  fix Flash client focus issues when windows are hidden
2017-03-28 17:05:50 -03:00
Richard Alam
5ff3d29ddb Merge pull request #3766 from ritzalam/fix-get-recordings-api
- try fix broken get recording api call
2017-03-28 15:36:21 -04:00
Richard Alam
7fdbc5b293 - try fix broken get recording api call 2017-03-28 19:32:01 +00:00
Fred Dixon
c02320246b Merge pull request #3762 from ffdixon/updates-bbb-record
Updates bbb record
2017-03-28 14:19:17 -05:00
gcampes
1a15f83690 adds settings service 2017-03-28 15:41:48 -03:00
Fred Dixon
cf1a6782ca Updated bbb-conf --restart to restart bbb-webhooks 2017-03-28 12:42:06 -05:00
Fred Dixon
a4457e6d7d Updated references to systemd units for recording 2017-03-28 12:30:07 -05:00
Chad Pilkey
b3ce82330d Merge pull request #3760 from riadvice/whiteboard-text-tool-update
Whiteboard text tool update
2017-03-28 11:51:31 -04:00
Ghazi Triki
79c3e78910 Make single click text box tool bigger. 2017-03-28 08:16:12 +01:00
Fred Dixon
453d7204ce Merge pull request #3758 from capilkey/fix-caption-transcript-null
Fix issue where client transcripts could get into a bad state
2017-03-27 23:00:44 -04:00
Richard Alam
86afdb558b Merge pull request #3759 from ritzalam/fix-get-recordings-api
Fix get recordings api
2017-03-27 17:26:06 -04:00
Richard Alam
158102774b - cleanup 2017-03-27 21:14:18 +00:00
Richard Alam
364f781104 - fix issue where GetRecordings API was failing because support of old metadata.xml broke. 2017-03-27 21:10:24 +00:00
Ghazi Triki
cf8285c36f Create text field in the whiteboard with a single click. 2017-03-27 11:01:17 +01:00
Chad Pilkey
de7dfe66da fix issue where client transcripts could get into a bad state 2017-03-24 18:42:29 -04:00
Richard Alam
2eb332b618 Merge pull request #3757 from ritzalam/update-locales-mar-24-2017
update locales
2017-03-24 16:02:20 -04:00
Richard Alam
cda3668f90 - update locales 2017-03-24 19:59:22 +00:00
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
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
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
gcampes
c7f7d5b58a Merge remote-tracking branch 'upstream/master' into settings-refactor
* upstream/master: (53 commits)
  center modal title
  HTML5 - removed unused imports, fixed variable names
  Added a missing import
  Updated icon sets to the latest
  Moved the recording systemd scripts into the core directory
  record-and-playback: Split rap-worker into separate workers per step.
  cleanup
  audio join - apply structure and style from designs
  "Video Chat" Layout has a dark background, controls are and title are removed in this layout.
  Delete unused layout event class and videconf view.
  HTML5 - changed underscore to lodash
  revert tabIndex change
  add local folder
  remove unused imports
  move handleExitAudio to service
  remove merge conflict
  fix more linting issues
  lint nav settings dropdown container
  remove unused imports
  change function name
  ...
2017-03-24 09:30:41 -03: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
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
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
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
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
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