Commit Graph

18871 Commits

Author SHA1 Message Date
KDSBrowne
d81591e7ce Merge remote-tracking branch 'upstream/v2.0.x-release' into z14-fix-userlist-keyboard-accessibility 2017-11-30 11:17:03 -08:00
Anton Georgiev
28215f1614
Merge pull request #4682 from KDSBrowne/z15-fix-userlist-border-onclick
Disable pointer-events on lists in the userlist
2017-11-30 16:36:01 -02:00
KDSBrowne
8b1e96acb8 fix first item in lists not being selected bug 2017-11-30 09:57:20 -08:00
Anton Georgiev
fca0cfd9bf
Merge pull request #4742 from Tainan404/fix-min/max-error
Readd missing messages.
2017-11-30 12:42:45 -02:00
Tainan Felipe
2afd7b16a0 readd missing messages 2017-11-29 08:48:57 -02:00
Maxim Khlobystov
bc3fd3bc06
Merge pull request #4726 from antobinary/mute-toggle-work
Pass mute boolean in redis msg on mute/unmute user
2017-11-28 15:58:06 -05:00
KDSBrowne
a599bcd7c7 remove the need for .firstChild 2017-11-28 12:10:12 -08:00
Anton Georgiev
edac480963
Merge pull request #4725 from MaximKhlobystov/bulgarian-bug-vol-3
Bulgarian Bug Vol. 3
2017-11-27 19:09:19 -02:00
Anton Georgiev
5e9e3f8cf7
Merge pull request #4729 from riadvice/html-center
Improve bigbluebutton-client/resources/prod/BigBlueButton.html
2017-11-27 13:32:45 -02:00
Ghazi Triki
8a7f31f502 Improve bigbluebutton-client/resources/prod/BigBlueButton CSS styles for "altFlash" div. 2017-11-25 18:33:30 +01:00
Anton Georgiev
64f2613818 send requesterId rather than userId on request to akka-aps 2017-11-24 17:03:17 -05:00
Anton Georgiev
a73f5ec738 send muted boolean on user (un)mute 2017-11-24 17:02:14 -05:00
Maxim Khlobystov
864e71798d Fixed the default locale issue. 2017-11-24 20:26:03 +00:00
Richard Alam
b8684d74d6 Merge branch 'riadvice-meeting-name-display' into v2.0.x-release 2017-11-22 07:56:39 -08:00
Richard Alam
ec9b0d038a Merge branch 'meeting-name-display' of https://github.com/riadvice/bigbluebutton into riadvice-meeting-name-display 2017-11-22 07:52:09 -08:00
Ghazi Triki
1bfeec88bc Fix meeting label width. 2017-11-21 17:45:01 +01:00
Richard Alam
4510e4289a Merge branch 'riadvice-fix-labels' into v2.0.x-release 2017-11-21 08:09:37 -08:00
Ghazi Triki
0204564eda Update font color. 2017-11-21 16:36:31 +01:00
Ghazi Triki
97a738d1af Use a Text component for long ProgresBar label. 2017-11-21 16:24:22 +01:00
Fred Dixon
31be070508
Merge pull request #4702 from riadvice/center-popups
Fix record confirmation popup position.
2017-11-21 08:34:36 -05:00
Ghazi Triki
a90e3ec325 Fix record confirmation popup position. 2017-11-20 22:16:24 +01:00
Anton Georgiev
697f178b8f
Merge pull request #4647 from Tainan404/translate-slide-option
Add localization for slides options
2017-11-20 18:11:37 -02:00
Richard Alam
2e51c76671 Merge branch 'ritzalam-pass-mute-param' into v2.0.x-release 2017-11-20 08:18:26 -08:00
Richard Alam
8f9606e270 Merge branch 'pass-mute-param' of https://github.com/ritzalam/bigbluebutton into ritzalam-pass-mute-param 2017-11-20 08:04:18 -08:00
Richard Alam
e224e12890 Merge branch 'riadvice-center-popups' into v2.0.x-release 2017-11-20 08:02:54 -08:00
Richard Alam
21ae0e17e6 Merge branch 'center-popups' of https://github.com/riadvice/bigbluebutton into riadvice-center-popups 2017-11-20 07:58:11 -08:00
KDSBrowne
54d82d456c use firstchild once instead of 3 2017-11-17 12:54:04 -08:00
Richard Alam
8761f51975
Merge pull request #4688 from kepstin/recording-cleanup
Update gems for security fixes, remove some unused.
2017-11-17 14:40:17 -05:00
Calvin Walton
7362eb1eaf Update gems for security fixes, remove some unused. 2017-11-17 14:36:24 -05:00
Richard Alam
6ff5d0db42 - pass mute param on message so we don't rely on toggling mute/unmute state for users 2017-11-17 08:46:18 -08:00
Tainan Felipe
881a8e153e change name of the variables for goToSlide 2017-11-17 13:54:23 -02:00
KDSBrowne
afb5016f95 remove css duplication 2017-11-17 07:52:28 -08:00
Tainan Felipe
221845349e change name of variables in the presentation-toolbar 2017-11-17 08:54:23 -02:00
Tainan Felipe
0c37aa96df hchange of slide for slideLabel 2017-11-17 08:27:12 -02:00
KDSBrowne
65dca66402 only show box-shadow when list selected in userlist with Tab key 2017-11-16 12:31:12 -08:00
KDSBrowne
5af9e51e30 fix broken userlist keyboard accessibility 2017-11-16 11:45:37 -08:00
Anton Georgiev
d4c20b239d
Merge pull request #4557 from KDSBrowne/pr-4555-redone
[HTML5] - Pr 4555 redone (style update)
2017-11-16 17:20:26 -02:00
KDSBrowne
f4468067aa add margin left to items in userlist 2017-11-16 10:50:40 -08:00
KDSBrowne
9412ce7da1 Merge remote-tracking branch 'upstream/v2.0.x-release' into pr-4555-redone 2017-11-16 10:46:04 -08:00
Ghazi Triki
de97b4fdc9 Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into center-popups
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as
2017-11-16 19:29:21 +01:00
Ghazi Triki
11438c3e74 Center FileUploadWindow differently. 2017-11-16 19:21:39 +01:00
Richard Alam
76f21f7936
Merge pull request #4678 from ritzalam/revert-file-upload-change
Revert "Delay centering popups as FileUploadWindow cannot be directly…
2017-11-16 11:27:03 -05:00
KDSBrowne
2784a53570 add left margin to items in userlist 2017-11-16 08:26:49 -08:00
Richard Alam
90b49bb12e Revert "Delay centering popups as FileUploadWindow cannot be directly centered."
This reverts commit acddb48545.
2017-11-16 08:21:18 -08:00
Richard Alam
a92d4dbd76 Merge branch 'riadvice-center-popups' into v2.0.x-release 2017-11-15 14:12:01 -08:00
Ghazi Triki
acddb48545 Delay centering popups as FileUploadWindow cannot be directly centered. 2017-11-15 18:01:15 +01:00
Fred Dixon
4e59904455
Merge pull request #4672 from antobinary/add-multi-login-html5-flash
Do not send UserLeftVoice on UserLeave - fix for audio state issue on reconnect
2017-11-15 08:36:32 -05:00
Anton Georgiev
a892d9fdd8 do not send UserLeftVoice on UserLeave --fix for audio state issue on reconnect 2017-11-14 17:36:08 -05:00
KDSBrowne
37bd382044 remove margin-bottom from last userlist item 2017-11-14 12:58:54 -08:00
Richard Alam
090906e95a Merge branch 'riadvice-center-popups' into v2.0.x-release 2017-11-14 12:02:06 -08:00