Commit Graph

18848 Commits

Author SHA1 Message Date
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
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
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
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
Richard Alam
a5269c8eda Merge branch 'center-popups' of https://github.com/riadvice/bigbluebutton into riadvice-center-popups 2017-11-14 11:49:01 -08:00
Anton Georgiev
51652fc790
Merge pull request #4669 from jfsiebel/add-moderator-unmute-config
add moderatorUnmute feature in HTML5 client
2017-11-14 16:49:41 -02:00
KDSBrowne
d83747d842 remove visible browser scrollbar 2017-11-14 09:02:44 -08:00
KDSBrowne
3b8a721068 change users focus border to match hover color 2017-11-14 08:53:44 -08:00
KDSBrowne
ea86c2936e center chat list item label 2017-11-14 08:31:43 -08:00
Anton Georgiev
b6befb3ae0
Merge pull request #4601 from Tainan404/notification-chat-message
Add toast notification for new chat messages and uncomment settings for chat notifications.
2017-11-14 13:50:25 -02:00
KDSBrowne
4dd7b539df remove unused focus mixin import 2017-11-14 07:50:02 -08:00
KDSBrowne
1c16768cb1 eliminate focus and hover style css duplication 2017-11-14 07:41:03 -08:00
KDSBrowne
f170967d2a add hover style to userlist user and chat items 2017-11-14 07:34:53 -08:00
Tainan Felipe
66c8807f6e change of formattedMessage for formatMessage 2017-11-14 08:41:51 -02:00
KDSBrowne
ff7371683d fix icon alignment 2017-11-09 09:17:49 -08:00
KDSBrowne
5e037eb64d replace values in focus mixin with variables 2017-11-09 09:13:14 -08:00
KDSBrowne
40435c925c Merge branch 'z11-focus-style-refactor' of https://github.com/KDSBrowne/bigbluebutton into z11-focus-style-refactor 2017-11-09 09:04:38 -08:00
KDSBrowne
3264ee26f2 replace pixel values with variables 2017-11-09 09:03:32 -08:00
KDSBrowne
c3f7c5e666 replace pixel values with variables 2017-11-09 08:54:20 -08:00
KDSBrowne
6f7328fa70 reduce gaps between userlist items 2017-11-09 08:37:41 -08:00
Tainan Felipe
7318370a7e Add localization for slides options 2017-11-09 13:45:24 -02:00
KDSBrowne
d9fedcc8ca remove btnFocus mixin and add styles to button component 2017-11-08 11:42:37 -08:00
KDSBrowne
75c445b582 rename color variables in palette.scss 2017-11-08 08:42:13 -08:00
Fred Dixon
3d5ffed888
Merge pull request #4640 from riadvice/fix-presentation-context-menu
Fix presentation context menu when switching locale
2017-11-08 08:11:07 -05:00
KDSBrowne
a9e11c2149 remove customUserlistItemFocus and add styles to %list-item 2017-11-07 11:07:11 -08:00
Ghazi Triki
cc6718007a Center popups and alerts when the application is resized. 2017-11-07 17:57:35 +01:00
KDSBrowne
9e82e80cd8 rename customBtnFocus and replace borders with box-shadow 2017-11-07 08:52:55 -08:00