Commit Graph

14988 Commits

Author SHA1 Message Date
Anton Georgiev
3641a8a760 Merge branch 'audio-restructuring' of github.com:antobinary/bigbluebutton into audio-restructuring 2017-03-27 10:56:50 -04: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
KDSBrowne
93d1aed4c3 remove unneeded variable 2017-03-24 12:27:45 -07:00
Ubuntu
e6796bf3ea Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-24 19:25:47 +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
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
3107f3cae3 move audio-notifications under audio/ 2017-03-24 12:38:49 -04:00
Anton Georgiev
8bb1386699 moved audio-modal and audio-settings under audio/ 2017-03-24 12:01:35 -04:00
KDSBrowne
1edb4ec736 remove console log 2017-03-24 08:37:33 -07:00
KDSBrowne
a633492b98 move user and presenter views to main render function 2017-03-24 08:34:45 -07:00
Anton Georgiev
feac446be4 moved audio-menu under audio/ 2017-03-24 11:34:03 -04:00
Anton Georgiev
d7eb3ba3a6 remove listen-only component 2017-03-24 11:26:18 -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
Anton Georgiev
8ca0fc1eb3 moved audio-settings under audio/ 2017-03-24 10:55:42 -04:00
KDSBrowne
c26965e794 make actions button display only for Presenter 2017-03-24 07:49:38 -07:00
Anton Georgiev
e007a60e7d Merge branch 'audio-ui-touches' into audio-restructuring 2017-03-24 10:46:46 -04:00
KDSBrowne
eb3ac219e9 fix merge conflicts 2017-03-24 07:25:25 -07:00
Anton Georgiev
5e36c97213 adjust audio modal ui 2017-03-24 10:24:23 -04: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
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
Anton Georgiev
d585e2f882 moved audio-test component under audio/ 2017-03-23 09:19:44 -04:00
Anton Georgiev
a2e0029c65 drop Audio tab from settings 2017-03-23 08:53:04 -04:00
Chad Pilkey
4515c08654 changes to shortcut keys so they all work in IE 2017-03-22 19:53:12 -04:00