Commit Graph

1911 Commits

Author SHA1 Message Date
Oleksandr Zhurbenko
cc457661ce Prevented wb toolbar from triggering focus on touch events
To make it work well with the text shape, which always keeps the focus. And we don't want the keyboard to jump if you decide to change the font settings on the fly
2017-11-15 16:34:50 -08:00
KDSBrowne
37bd382044 remove margin-bottom from last userlist item 2017-11-14 12:58:54 -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
Tainan Felipe
1e53a17522 changed color value by css variable and fix variable declared wrong 2017-11-13 13:44:01 -02:00
Tainan Felipe
cb46c8f70c fix design issues
fix design issues
2017-11-13 10:58:04 -02:00
prlanzarin
f43b77c19f Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu
Conflicts:
	bigbluebutton-html5/imports/startup/client/base.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
	bigbluebutton-html5/imports/ui/components/app/container.jsx
	bigbluebutton-html5/imports/ui/components/screenshare/service.js
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
	bigbluebutton-html5/imports/ui/components/video-dock/container.jsx
	bigbluebutton-html5/private/locales/en.json bigbluebutton-html5/server/main.js
2017-11-11 03:41:37 +00:00
prlanzarin
76f09e16ad Adding checks to show screenshare and video overlays according to config file 2017-11-11 01:36:55 +00:00
prlanzarin
2166b56304 Added toggle options for kurento video/screensharing in the HTML5 config yaml
Also made cam button respond to those config values
2017-11-10 21:08:40 +00:00
Oleksandr Zhurbenko
1472dbf39e Added touch events support for all common shapes (rectangle, triangle, ellipse, line) 2017-11-09 15:51:09 -08:00
KDSBrowne
ff7371683d fix icon alignment 2017-11-09 09:17:49 -08:00
KDSBrowne
3264ee26f2 replace pixel values with variables 2017-11-09 09:03:32 -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
Oleksandr Zhurbenko
450f2b2c89 Added touch events support for pencil 2017-11-08 16:47:29 -08:00
KDSBrowne
d9fedcc8ca remove btnFocus mixin and add styles to button component 2017-11-08 11:42:37 -08:00
Gabriel Carvalho de Campes
92b1081186 add permission overlay on audio 2017-11-08 16:41:15 -02:00
KDSBrowne
75c445b582 rename color variables in palette.scss 2017-11-08 08:42:13 -08:00
KDSBrowne
a9e11c2149 remove customUserlistItemFocus and add styles to %list-item 2017-11-07 11:07:11 -08:00
KDSBrowne
9e82e80cd8 rename customBtnFocus and replace borders with box-shadow 2017-11-07 08:52:55 -08:00
KDSBrowne
1850bc782c remove customLinkFocus and replace with elementFocus 2017-11-07 08:06:31 -08:00
KDSBrowne
3af605571c remove customListItemFocus and add focus style to dropdown list 2017-11-07 07:52:18 -08:00
KDSBrowne
1a5d6c5ae4 rename customInputFocus and replace borders 2017-11-06 13:14:58 -08:00
KDSBrowne
4a413ae135 rename customListFocus and remove borders 2017-11-06 12:58:17 -08:00
Oleksandr Zhurbenko
561709644d Fixed a bug with props in the polling container 2017-11-06 10:24:10 -08:00
prlanzarin
050d4c29bf Moved HTML5 video adjustment to a separate script 2017-11-06 15:42:00 +00:00
prlanzarin
e96fc385f1 Handling HTML5 screensharing stop
The action bar stop button is temporary
2017-11-06 15:39:55 +00:00
Oleksandr Zhurbenko
9934d90fff Integrated babel-plugin-react-remove-properties for Selenium tests 2017-11-04 00:38:44 -07:00
Tainan Felipe
d2b29f8d29 add return in componentwillReceiveProps 2017-11-02 14:47:49 -02:00
Anton Georgiev
1fdd1f1353
Merge pull request #4585 from Gcampes/end-meeting-fix
Fix issue that prevented end meeting button to appear
2017-11-02 12:40:12 -02:00
Anton Georgiev
8b80d7e9c2
Merge pull request #4621 from Tainan404/fix-upload-percentage
[HTML 5] Rounds upload percentage, localize messages in presentation uploader
2017-11-02 11:03:03 -02:00
Anton Georgiev
63eb812f85
Merge pull request #4578 from OZhurbenko/meteor-react-16-update
React 16 and packages update
2017-11-02 10:41:45 -02:00
Gabriel Carvalho de Campes
333916e59a Merge remote-tracking branch 'upstream/v2.0.x-release' into end-meeting-fix 2017-11-02 10:38:06 -02:00
Gabriel Carvalho de Campes
e55ee0d28e fix listen only dead end on permissions denied 2017-11-02 10:10:01 -02:00
Oleksandr Zhurbenko
e883995379 Breaking proptypes validation, sorry, any questions to @oswaldoacauan 2017-11-01 13:11:35 -07:00
Tainan Felipe
9db759074f moved intl messages to locales/en 2017-11-01 14:37:44 -02:00
KDSBrowne
2de6540f89 fix audio modal close Btn scroll bug 2017-11-01 09:35:46 -07:00
KDSBrowne
900c20f86a move and convert focus styles to mixins 2017-11-01 09:01:55 -07:00
Gabriel Carvalho de Campes
c9d7c9cae4
fix endmeeting handler with incorrect name 2017-11-01 13:47:14 -02:00
KDSBrowne
26129e7141 Merge remote-tracking branch 'upstream/v2.0.x-release' into z10-convert-styles-mixins 2017-11-01 08:10:13 -07:00
Tainan Felipe
c1df1da3c4 rounds the file upload percentage 2017-11-01 10:19:18 -02:00
Anton Georgiev
8853d562ce
Merge pull request #4497 from Gcampes/audio-refactor
[HTML5] Refactor Audio
2017-10-31 15:39:37 -02:00
Gabriel Carvalho de Campes
2cca0c1724 change device selector key generation 2017-10-31 15:34:06 -02:00
Tainan Felipe
016777728e remove toast notification of app container 2017-10-31 14:50:03 -02:00
Tainan Felipe
6cbd83e51d show audio modal when breakout room ends 2017-10-31 14:46:14 -02:00
Gabriel Carvalho de Campes
fde5d56d87 change ask permissions timing, small code fixes 2017-10-31 08:53:06 -02:00
Joao Siebel
86264dcb11 Read allowModeratorToUnmuteAudio property from config 2017-10-30 17:15:43 -02:00
Joao Siebel
4a0fedce3d Remove the unmute flag from config, fix mute and unmute options for listen only user and check server-side 2017-10-30 16:27:17 -02:00
Tainan Felipe
e1ca9950a1 add chat push notification and refactor audio notification 2017-10-30 08:34:28 -02:00
Anton Georgiev
f5d65b8983
Merge pull request #4577 from Gcampes/kick-user-meeting-end
Remove user on meeting end
2017-10-27 21:19:20 -02:00
Gabriel Carvalho de Campes
ba019e52db fix issue preventing end meeting button to appear 2017-10-27 15:08:43 -02:00
Anton Georgiev
970205f92d Merge pull request #4556 from jfsiebel/fix-user-list-mute-unmute-logic
fix allowedToMuteAudio and allowedToUnmuteAudio logic and created action
2017-10-27 12:01:14 -02:00
Gabriel Carvalho de Campes
144705ce9b change func call to a variable 2017-10-27 11:44:42 -02:00
Gabriel Carvalho de Campes
436e7df7d4 removes unused css, removes unneeded code 2017-10-27 11:19:24 -02:00
Gabriel Carvalho de Campes
9bb0248957 fix logout issue on meeting end 2017-10-26 16:45:03 -02:00
Gabriel Carvalho de Campes
cf73251feb Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-26 16:26:19 -02:00
Gabriel Carvalho de Campes
81f35bac4f Fix concerns from review 2017-10-26 15:14:56 -02:00
Tainan Felipe
19f38f9419 add chat notification 2017-10-26 15:14:50 -02:00
Joao Siebel
d349150bae add moderatorUnmute feature in HTML5 client 2017-10-26 10:50:55 -02:00
Oleksandr Zhurbenko
df3325e42f Fixed a bug introduced in #4524 2017-10-25 16:12:17 -07:00
Oleksandr Zhurbenko
6dabe055d8 bug fixes; CSS animation package update; updated package-lock; fixed permissions; 2017-10-25 16:11:06 -07:00
Anton Georgiev
f7ba155f97 Merge pull request #4524 from oswaldoacauan/patch-3
[HTML5] Fix logClient method name
2017-10-24 17:04:38 -02:00
Anton Georgiev
967be17440 Merge pull request #4521 from Tainan404/fix-presenter-modal-bug
[HTML5] Fix presentation upload modal  bug
2017-10-24 17:02:47 -02:00
Anton Georgiev
9f2b364710 Merge pull request #4553 from OZhurbenko/fix-settings-cancel
[HTML5] - Fix for Settings not being closed
2017-10-24 16:58:40 -02:00
KDSBrowne
a8142287fa adjust public chat option button position 2017-10-24 09:16:57 -07:00
KDSBrowne
6996aa833e move css variables to chat-dropdown styles.scss 2017-10-24 09:08:57 -07:00
KDSBrowne
c8a38377a5 use absolute import 2017-10-24 09:07:27 -07:00
KDSBrowne
7eb9e420d5 add aria lable to public chat options btn 2017-10-24 09:07:08 -07:00
KDSBrowne
bc0ded7bec remove unneeded div element 2017-10-24 09:06:29 -07:00
KDSBrowne
445522a8dd add variables for css values 2017-10-24 09:06:04 -07:00
KDSBrowne
bc0434b6e0 fix oval focus ring on public chat more btn 2017-10-24 09:05:46 -07:00
KDSBrowne
336a1b24a0 add round focus ring to chat more button 2017-10-24 09:05:07 -07:00
KDSBrowne
2621039e16 update userListItems and menuItems focus styles 2017-10-24 08:59:07 -07:00
Joao Siebel
8a534f14b1 fix allowedToMuteAudio and allowedToUnmuteAudio logic and created action 2017-10-24 13:35:47 -02:00
gcampes
d32330b208 Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-24 11:19:58 -02:00
Oswaldo Acauan
e76459be65 Merge remote-tracking branch 'upstream/v2.0.x-release' into patch-3 2017-10-24 11:11:18 -02:00
Oswaldo Acauan
fda223e81d Merge remote-tracking branch 'upstream/v2.0.x-release' into patch-3 2017-10-24 11:01:58 -02:00
Oswaldo Acauan
45d604c63d Refactor logger from client to server 2017-10-24 10:58:46 -02:00
Tainan Felipe
8e2f29e667 changed assign of the function 2017-10-24 08:52:44 -02:00
Oswaldo Acauan
28c19ec82d Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications 2017-10-24 07:57:52 -02:00
Oleksandr Zhurbenko
a2c635d094 Fixed a bug with Settings not being closed when click Cancel 2017-10-23 16:19:02 -07:00
Anton Georgiev
eb9dd49b75 Merge pull request #4551 from Tainan404/fix-errors-linter
[HTML5] Fix issue introduced on #4488
2017-10-23 15:53:32 -02:00
Tainan Felipe
02c617da68 solve error in nav-bar component 2017-10-23 14:26:56 -02:00
Tainan Felipe
da608da325 fix merge issue 2017-10-23 14:15:55 -02:00
Tainan Felipe
1469791bc7 solve merge issues 2017-10-23 13:50:31 -02:00
Tainan Felipe
5ac96e6979 solve merge issues 2017-10-23 13:47:14 -02:00
Oswaldo Acauan
1dcfb9e3fa Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications 2017-10-23 13:31:33 -02:00
Anton Georgiev
4566d82a2a Merge pull request #4488 from Tainan404/fix-errors-linter
[HTML5] Fix errors linter
2017-10-23 12:27:38 -02:00
Tainan Felipe
896883ecd9 remove comment in recording-indicator component 2017-10-23 12:01:00 -02:00
gcampes
ff35ad9602 delete unused files, cleanup code 2017-10-23 10:41:09 -02:00
Oswaldo Acauan
f17faf6d75 Fix closeToast warning 2017-10-23 10:25:05 -02:00
Oswaldo Acauan
8af4d227db Fix notification service exports 2017-10-20 17:27:00 -02:00
Oswaldo Acauan
9f910fa26e Move hoc and service to separate dir's 2017-10-20 17:01:07 -02:00
Oswaldo Acauan
a26e20d76b Fix wrong prop name record => recording 2017-10-20 17:00:34 -02:00
gcampes
029a13d2a0 better error handling, code cleanup 2017-10-20 08:11:51 -02:00
gcampes
c600a78fea Merge remote-tracking branch 'oswaldo/toast-notifications' into audio-refactor 2017-10-19 09:45:06 -02:00
Oswaldo Acauan
27ba271f56 Fix condition for duplicated notification 2017-10-19 09:44:09 -02:00
gcampes
3bd709c629 Merge remote-tracking branch 'oswaldo/toast-notifications' into audio-refactor 2017-10-19 09:39:50 -02:00
Oswaldo Acauan
ebfed7795e Add notification when recording start/stop 2017-10-19 08:45:07 -02:00
Tainan Felipe
2b880141fb changed icon for breakout room notification 2017-10-19 08:39:42 -02:00
Oswaldo Acauan
0686a596e9 Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications 2017-10-19 08:07:42 -02:00
gcampes
b15322e7f2 Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-18 17:42:49 -02:00
gcampes
1dda597fca Toast notifications on audio and overall changes 2017-10-18 17:40:01 -02:00
Tainan Felipe
114689d284 add toast notification for ended breakout room 2017-10-18 17:24:26 -02:00
gcampes
d1bc675465 changes setdevices to bridge 2017-10-17 17:16:42 -02:00
Tainan Felipe
376261f09d add notify finish breakout room 2017-10-13 18:33:24 -03:00
prlanzarin
07f50252bb Properly close webrtc peers when sharing webcam 2017-10-13 21:13:41 +00:00
Anton Georgiev
f1de51595d Merge pull request #4515 from OZhurbenko/fix-warnings-assign-presenter
[HTML5] - Fix for the React console warnings
2017-10-13 14:06:31 -03:00
Augusto Bennemann
ec941bacab Improve video reconnection 2017-10-13 13:50:48 +00:00
gcampes
2ae020ba9a Merge remote-tracking branch 'oswaldo/toast-notifications' into audio-refactor-notifications 2017-10-13 10:43:27 -03:00
Tainan Felipe
873d227819 Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter 2017-10-13 10:35:38 -03:00
Oleksandr Zhurbenko
b3572cec3a Changed the way the object is assigned 2017-10-12 17:20:27 -07:00
Tainan Felipe
98b23640fd solve bug no disppear modal presentation-upload 2017-10-12 21:12:00 -03:00
Augusto Bennemann
39c72f98f9 Better resize algorithm for resizing videos 2017-10-12 23:04:35 +00:00
Joao Siebel
8b8456a1ac Closes breakout room modal when the breakout room are closed 2017-10-12 19:39:03 -03:00
Augusto Bennemann
a5e6c63f74 Add support to Safari 11 on Kurento utils; WS message queue; Remove bower components 2017-10-12 20:00:08 +00:00
gcampes
f89e189a88 fixes listenonly issue 2017-10-12 16:22:10 -03:00
Oswaldo Acauan
c1ee189d57 Fix message propType 2017-10-12 16:03:48 -03:00
Oswaldo Acauan
b8261123d0 Add toast notifications 2017-10-12 15:53:33 -03:00
Tainan Felipe
4bda76c5bb Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter 2017-10-12 15:36:52 -03:00
gcampes
fafbba06cb Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-12 13:58:39 -03:00
Anton Georgiev
4acecd358c Merge pull request #4505 from OZhurbenko/merge-2.0-1.1-api
[HTML5] - Merged 2.0 and 1.1 api folders
2017-10-12 13:45:46 -03:00
gcampes
6b44504e5d Adds timeout to transfer, fix css, remove logs 2017-10-12 11:49:50 -03:00
Anton Georgiev
0824bc1471 Merge pull request #4503 from oswaldoacauan/user-list-scroll-bg
[HTML5] Fix user-list scroll shadow and message list max height
2017-10-12 09:53:42 -03:00
gcampes
ceea7b7ed6 Implements audio transfer from echo test 2017-10-12 09:50:23 -03:00
Oleksandr Zhurbenko
015ca3d719 Changed imports and removed 'initializeCursor.js' since it's not needed 2017-10-11 19:00:28 -07:00
gcampes
3cba60201e Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-11 18:22:36 -03:00
gcampes
f943e5dd08 changes error handlers in audio 2017-10-11 18:04:10 -03:00
Anton Georgiev
c06ebab63b Merge pull request #4502 from KDSBrowne/z01-style-updates
[HTML5] - Update focus styles
2017-10-11 16:12:33 -03:00
Oleksandr Zhurbenko
21dcafb047 Fixed some of the console warning happenning when user is a moderator and he opens user-list/chat 2017-10-11 12:11:04 -07:00
Anton Georgiev
aa39361360 Merge pull request #4483 from OZhurbenko/presenter-functionality-2x
Fix for the Pencil Mongo additions
2017-10-11 15:22:39 -03:00
Oswaldo Acauan
34106e6de4 Fix user list messages max height 2017-10-11 15:11:48 -03:00
Tainan Felipe
d6a6ff5eca remove .scss extension and changed path 2017-10-11 14:54:00 -03:00
Anton Georgiev
7c4e4a61d9 Merge pull request #4501 from antobinary/hide-lock-settings
[HTML5 client] Temporarily hide moderator view of lock settings
2017-10-11 14:31:23 -03:00
Oswaldo Acauan
2bebe4262a Fix user-list scroll background 2017-10-11 14:28:34 -03:00
KDSBrowne
392d819905 apply new focus style to message input 2017-10-11 10:27:43 -07:00
Anton Georgiev
ac93460ba7 temporarily hide moderator view of lock settings 2017-10-11 13:51:41 -03:00
Tainan Felipe
c12a3f173b revert modal fullscreen 2017-10-11 12:06:29 -03:00
Tainan Felipe
a667e3d05b Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter 2017-10-11 11:46:16 -03:00
gcampes
f8c50b8ef7 wire up audio errors to notifications. WIP 2017-10-11 09:05:57 -03:00
Tainan Felipe
50cc876cf7 fix errors linter 2017-10-10 19:08:51 -03:00
Maxim Khlobystov
6146f391f0 Made sure the locales that contain underscore are displayed properly when shown as current language in the Settings window. 2017-10-10 20:56:33 +00:00
gcampes
675c890961 fixes typo 2017-10-10 16:10:36 -03:00
gcampes
02cdcb2562 changes to styles and texts in audio flow 2017-10-10 15:03:29 -03:00
prlanzarin
67da01e81c Merge remote-tracking branch 'gutobenn/html5-kurento-screenshare-presenter' into html5-video-screenshare 2017-10-10 17:10:03 +00:00
Tainan Felipe
5393051d9d fix errors linter 2017-10-10 10:06:34 -03:00
Oleksandr Zhurbenko
4d8233fe10 Fix for the pencil Mongo additions 2017-10-09 18:30:29 -07:00
gcampes
317c3e5ee9 changes to bridge and audio components. WIP 2017-10-09 17:48:10 -03:00
Anton Georgiev
98e00a8056 Merge pull request #4464 from oswaldoacauan/qa-design
[HTML5] Fix some style issues
2017-10-09 14:12:13 -04:00
Oswaldo Acauan
d049c982a0 Fix user-list scroll styles 2017-10-06 15:11:19 -03:00
Anton Georgiev
bb1960ef6a Merge pull request #4469 from Gcampes/fix-breakout-close
[HTML5] - Fix Breakout tab not closing
2017-10-06 13:56:22 -04:00
Oswaldo Acauan
38c8ff4abc Update emoji menu to use emoji constants 2017-10-06 13:49:46 -03:00
Oswaldo Acauan
29117285ef Merge remote-tracking branch 'upstream/v2.0.x-release' into qa-design 2017-10-06 11:59:07 -03:00
gcampes
189760d393 fix breakout not closing on end 2017-10-06 11:58:21 -03:00
Anton Georgiev
edf569f479 Merge pull request #4466 from OZhurbenko/presenter-functionality-2x
HTML5 - Fix for an incorrectly displayed pop-up in the UserList
2017-10-06 10:00:36 -04:00
Oleksandr Zhurbenko
6639ee5e8e Fixed incorrectly displayed dropdown in the user list, if it was scrolled down 2017-10-05 14:46:46 -07:00
Oswaldo Acauan
1e3470c136 Fix unread button styles 2017-10-05 17:49:02 -03:00
Oswaldo Acauan
37569a5158 Update more icon and rotate it 90deg 2017-10-05 17:21:33 -03:00
Oswaldo Acauan
30bf1b4425 Change chat-dropdown icon and vertical align it with the title 2017-10-05 17:13:29 -03:00
Oswaldo Acauan
901552abad Add collapse style for system messages 2017-10-05 16:58:49 -03:00
Maxim Khlobystov
03c94bba73 Dropped the file extension from the stylesheet name. 2017-10-05 19:40:38 +00:00
Maxim Khlobystov
350bbdfcc9 Added a comment to not forget about the push notifications setting. 2017-10-05 19:21:57 +00:00
Maxim Khlobystov
a7798f6c1a Fixed some ESLint errors. 2017-10-05 19:18:30 +00:00
Maxim Khlobystov
c3ba004bec Hidden Push Notifications setting's UI until it is implemented. 2017-10-05 19:06:28 +00:00
Anton Georgiev
af0e0ff5a0 Merge pull request #4460 from KDSBrowne/xx-05-avatar-voiceUser-notification
[HTML5] Avatar indicator bug's
2017-10-05 13:02:13 -04:00
Oswaldo Acauan
360d8d12b2 Remove user list title 2017-10-05 11:52:34 -03:00
Oswaldo Acauan
a34ec8eb0d Update chat list item text color 2017-10-05 11:47:35 -03:00
Oswaldo Acauan
0ec0121648 User avatar styles update 2017-10-05 11:43:08 -03:00
gcampes
40795950c2 updates to the audio manager 2017-10-04 17:49:11 -03:00
KDSBrowne
d4b8706926 fix talking style being shown when muted 2017-10-04 12:08:33 -07:00
Anton Georgiev
6b1a29eab4 Merge pull request #4426 from OZhurbenko/presenter-functionality-2x
HTML5 - Whiteboard/Presentation fixes, improvements, refactoring
2017-10-04 14:05:03 -04:00
Anton Georgiev
0bc3490ecc Merge pull request #4419 from KDSBrowne/xx-03-kick-user-bug
[HTML5] - Handle UserEjectedFromMeetingEvtMsg
2017-10-04 11:47:07 -04:00
KDSBrowne
7225590c05 fix userEjected modifier and change if condition 2017-10-04 07:57:16 -07:00
Oleksandr Zhurbenko
ab95c87f48 Fixed wb toolbar console warnings cause by improper props validation 2017-10-03 14:28:44 -07:00
gcampes
81a430039d add echo test component. WIP 2017-10-03 17:42:10 -03:00
KDSBrowne
0838e21674 change css classes to SASS placeholders 2017-10-03 11:00:04 -07:00
Oleksandr Zhurbenko
76bcdd55d6 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-10-03 10:34:10 -07:00
KDSBrowne
9bad8d8d5d add kickVoiceUser and fix presenter assign bug 2017-10-03 08:25:56 -07:00
KDSBrowne
97aca5ee91 re apply userlist focus styles 2017-10-02 12:49:26 -07:00
KDSBrowne
10f95f11e1 fix merge conflicts 2017-10-02 12:37:51 -07:00
Oswaldo Acauan
230a2d5263 Fix silent changes caused by the old pr revert 2017-10-02 11:12:58 -03:00
gcampes
37456c9db4 updates do sip bridge 2017-09-29 17:42:34 -03:00
Oswaldo Acauan
89c2947d78 Merge remote-tracking branch 'upstream/v2.0.x-release' into presentation-manager-merge 2017-09-29 17:32:31 -03:00
KDSBrowne
bc0647ad50 fix merge conflicts 2017-09-29 12:04:27 -07:00
Anton Georgiev
7c5683c866 Merge pull request #4291 from Klauswk/html5-refactor-userlist
[HTML5 2.0] Refactor UserList Components
2017-09-29 14:08:12 -04:00
Oswaldo Acauan
4063ae548b Remove debug code 2017-09-29 14:47:16 -03:00
Oswaldo Acauan
f8421d4a62 Fix setPresentation on newly uploaded files 2017-09-29 14:44:18 -03:00
KDSBrowne
6bb93ff6fd clean up css, remove duplications 2017-09-29 07:54:24 -07:00
Oswaldo Acauan
43685f84d3 Fix intl propType and linter 2017-09-29 11:03:08 -03:00
gcampes
6d0d6f6651 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into audio-refactor 2017-09-29 10:52:12 -03:00
Oswaldo Acauan
bb94ed6b25 Remove unused defaultProps 2017-09-29 10:51:41 -03:00
Oswaldo Acauan
4ac554af56 Fix typo 2017-09-29 10:51:17 -03:00
gcampes
d15f0e1183 linter autofix 2017-09-29 10:42:08 -03:00
gcampes
cbb897b23f audio connects. WIP 2017-09-29 10:38:10 -03:00
Oswaldo Acauan
2a7fd5ba4d Rename share method to set to match akka 2017-09-29 10:01:01 -03:00
Oswaldo Acauan
979514f7f1 Fix dropzone not being shown after a file drop 2017-09-29 09:50:20 -03:00
Oswaldo Acauan
d4af5bb028 Remove constraint for not deleting the current presentation 2017-09-29 09:49:42 -03:00
Oswaldo Acauan
15b10b2374 Remove constraint for not deleting the current presentation 2017-09-29 09:43:49 -03:00
Oswaldo Acauan
3e24a5e2a4 Update chat styles 2017-09-29 09:13:49 -03:00
Oswaldo Acauan
bcc6e20af2 Update system messages styles 2017-09-28 16:42:10 -03:00
Oswaldo Acauan
909af38fc3 Update chat notification style 2017-09-28 16:18:04 -03:00
Oswaldo Acauan
0300b854d5 Update emoji icon status when selected 2017-09-28 15:58:25 -03:00
KDSBrowne
9cd6b31743 fix focus ring for round buttons 2017-09-28 11:51:17 -07:00
Oswaldo Acauan
5f78235133 Update button styles 2017-09-28 15:32:51 -03:00
Klaus
b947e27086 Fix makeCall from component, and user.isLocked from mapUser 2017-09-28 15:19:57 -03:00
KDSBrowne
10c75afe99 switch handler, modifier and collection prop to ejected 2017-09-27 14:20:22 -07:00
Oleksandr Zhurbenko
6e2beab03a Fixed a bug with the multi-user cursors not being displayed if there is no presenter cursor 2017-09-26 14:52:08 -07:00
Oleksandr Zhurbenko
b3723c34d4 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-26 14:08:41 -07:00
Anton Georgiev
fe7130473d Merge pull request #4418 from KDSBrowne/xx-02-mute-show-bug
[HTML5] - Mute button fix
2017-09-26 16:30:38 -04:00
Oswaldo Acauan
a3f74842b4 Bug fixes 2017-09-26 16:45:33 -03:00
gcampes
152527d1ab Merge remote-tracking branch 'upstream/bbb-2x-mconf' into audio-refactor 2017-09-26 14:25:11 -03:00
KDSBrowne
32187d446a rename service import and remove constants 2017-09-25 18:18:08 -07:00
Oleksandr Zhurbenko
ce04cfb83b Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-25 16:48:03 -07:00
Oleksandr Zhurbenko
f80d0bc083 Linting and moved whiteboard resize events into HoC
Thus we won't clutter the code with unrelated events and can easily switch to a ResizeObserver when it is implemented by the browsers
2017-09-25 16:45:44 -07:00
Oswaldo Acauan
3a4745d590 Fix error while changing the current presentation 2017-09-25 17:49:54 -03:00
gcampes
62fe06516f Change audio modal styles and structure. WIP 2017-09-25 17:28:36 -03:00
KDSBrowne
cad085a495 add kicked prop 2017-09-25 11:38:36 -07:00
KDSBrowne
9a145c64a8 fix set properties and client kicked condition 2017-09-25 11:32:09 -07:00
KDSBrowne
00ac3b1a54 move functions to service and rename callback 2017-09-25 08:39:56 -07:00
KDSBrowne
baa1f0955e change function signature line length 2017-09-25 07:13:14 -07:00
Oleksandr Zhurbenko
8b48dc692e Bug fix for the slide pushing toolbar case in multi-user in firefox 2017-09-23 18:40:42 -07:00
Oleksandr Zhurbenko
e0a7bfc9fa Refactored whiteboard-toolbar 2017-09-22 23:27:55 -07:00
Oswaldo Acauan
cca1e58167 Move default presentation name to config file 2017-09-22 17:49:11 -03:00
Oswaldo Acauan
43c2102adf Fix conversion status messages 2017-09-22 17:45:31 -03:00
Oswaldo Acauan
36699bedb1 Merge remote-tracking branch 'upstream/master' into presentation-manager-merge 2017-09-22 15:11:48 -03:00
Klaus
97d2f6d3e5 Rollback to the right locales 2017-09-22 14:51:47 -03:00
Klaus
ccf4b1ba21 Fix locales problems 2017-09-22 14:23:25 -03:00
Klaus
b3dd84505e Change statuses and remove .scss suffix 2017-09-22 14:03:14 -03:00
gcampes
b17f2ebe41 fix proptypes for intl 2017-09-22 11:33:12 -03:00
Klaus
f6e0785e6f Missing relative path style 2017-09-22 11:31:05 -03:00
Klaus
4d51e0c045 Fix unsplited styles and code duplicated 2017-09-22 11:24:24 -03:00
Oleksandr Zhurbenko
4073501a28 Made actions import more clear to read 2017-09-21 17:18:15 -07:00
Oleksandr Zhurbenko
4a4a3d5574 Moved hex_to_int and int_to_hex functions to imports/utils 2017-09-21 16:52:43 -07:00
Oleksandr Zhurbenko
e054358947 Created a whiteboard config and moved static values there 2017-09-21 16:44:32 -07:00
Oleksandr Zhurbenko
d19814dc55 Prevented html5 from throwing exceptions if the slide file doesn't exist 2017-09-21 14:02:50 -07:00
gcampes
56e9fedb45 removes console.log 2017-09-21 15:51:58 -03:00
gcampes
06400c7034 fix breakout logout 2017-09-21 15:50:21 -03:00
Klaus
29922c896a Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-refactor-userlist 2017-09-21 15:40:18 -03:00
KDSBrowne
83adf4200f remove unneeded if condition 2017-09-21 08:03:42 -07:00
KDSBrowne
c6647dfc95 mute button wont render for listenOnly users 2017-09-20 17:42:35 -07:00
Oleksandr Zhurbenko
a46469557f Minor corrections and improvements based on the #4345 reviews 2017-09-20 14:34:22 -07:00
KDSBrowne
119fa04be1 remove transitions and clean up css 2017-09-20 14:29:43 -07:00
Oleksandr Zhurbenko
2b10d5c1a7 Fixed based on the review of #4345 2017-09-20 14:05:17 -07:00
KDSBrowne
a756b90e72 fix audio modal back Btn icon color 2017-09-20 12:52:23 -07:00
KDSBrowne
d25ae89dfb does not show userlist border when children selected with mouse 2017-09-20 12:40:16 -07:00
Augusto Bennemann
d0592a7acb HTML5 video: share and unshare buttons 2017-09-20 00:12:10 -03:00
gcampes
ea637a1e49 first changes to audio components and services. WIP 2017-09-19 16:31:04 -03:00
Augusto Bennemann
1c938440e1 HTML5 Video: Adjust videos when a stream stops; Receive all the streams when joining a meeting 2017-09-19 13:29:48 -03:00
KDSBrowne
d7335ade60 move focus styles to central location 2017-09-19 07:44:42 -07:00
Augusto Bennemann
2067c50c55 HTML5 video for bbb2.0 2017-09-19 10:53:27 -03:00
Oleksandr Zhurbenko
f3a17e74a8 Removed unused properteties from the slide object 2017-09-18 17:18:20 -07:00
Oleksandr Zhurbenko
838382b6f9 Moved presentation overlays' rendering to a separate function 2017-09-18 16:54:52 -07:00
Oleksandr Zhurbenko
537175dad2 Moved part of the presentation display calculations to the server side 2017-09-18 15:20:44 -07:00
Oleksandr Zhurbenko
c9552247b2 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-18 12:08:14 -07:00
KDSBrowne
f20f432e74 add focus to chat links 2017-09-18 09:55:10 -07:00
KDSBrowne
e78e59e659 add focus style to device selectors 2017-09-18 09:43:21 -07:00
KDSBrowne
a470bfb58f add border size variable and clean up css 2017-09-18 09:23:15 -07:00
Oleksandr Zhurbenko
9e1c8a4fb7 Permissions fix
Can't afford WebStorm :-(
2017-09-17 19:01:48 -07:00
Oleksandr Zhurbenko
c7d737e9b8 Improvements based on the PR review 2017-09-17 18:58:37 -07:00
KDSBrowne
ae443a8430 add custom focus to select elements 2017-09-15 12:25:45 -07:00
KDSBrowne
b88179a9e7 remove outline from fullscreen modal 2017-09-15 11:29:56 -07:00
KDSBrowne
bc48e7352d remove transition, switch color code to variable 2017-09-15 11:05:24 -07:00
KDSBrowne
69c2b195f5 remove css important rule 2017-09-15 09:00:11 -07:00
KDSBrowne
2815cf9ce1 add custom focus styles 2017-09-15 08:12:58 -07:00
Augusto Bennemann
31f2e1cac7 HTML5 ScreenShare Presenter 2017-09-12 17:47:06 -03:00
KDSBrowne
72acea229b remove single quotes from variable 2017-09-12 10:01:07 -07:00
Oleksandr Zhurbenko
43b3b89c6a Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-11 12:11:03 -07:00
Augusto Bennemann
1aa5cc5235 HTML5 ScreenShare Viewer
HTML5 ScreenShare Viewer
2017-09-11 13:40:56 -03:00
Anton Georgiev
bf35fa7a4c Merge pull request #4354 from KDSBrowne/x2.0.1-fix-lock-issue-userlist
[HTML5] - Fix Userlist Lock Notification
2017-09-11 12:07:17 -04:00
KDSBrowne
eeb878649a remove single quotes from variable 2017-09-11 06:42:56 -07:00
KDSBrowne
ef6d3059a7 fix lint issue 2017-09-07 12:06:48 -07:00
Oswaldo Acauan
c0307e36a6 Presentation Uploader to 2.0 2017-09-07 15:18:14 -03:00
KDSBrowne
13e6357b19 fix line endings 2017-09-07 07:31:19 -07:00
KDSBrowne
5a6183dc34 fix undefined check 2017-09-06 12:57:24 -07:00
KDSBrowne
9193ae8849 handle UserLockedInMeetingEvtMsg 2017-09-06 12:53:07 -07:00
Oleksandr Zhurbenko
251bd22738 PR review fixes 2017-09-06 12:36:52 -07:00
KDSBrowne
31cf7aea42 check for specific meeting id 2017-09-06 11:32:29 -07:00
KDSBrowne
fd9a4cd98e fix bug in undefined check 2017-09-06 11:13:24 -07:00
KDSBrowne
d34f138b56 check if lock settings are undefined 2017-09-06 10:50:48 -07:00
KDSBrowne
572bb0b8d3 remove ternary operation 2017-09-06 09:08:26 -07:00
Oleksandr Zhurbenko
9ee75331bf Removed an unnecessary rule 2017-09-05 19:02:23 -07:00
Oleksandr Zhurbenko
65da71c12a Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-05 18:53:51 -07:00
Oleksandr Zhurbenko
3014b26439 PR review fixes 2017-09-05 18:36:15 -07:00
Oleksandr Zhurbenko
b12e0b84a9 Using previously saved draw settings for the initial wb toolbar values 2017-09-05 15:55:18 -07:00
Oleksandr Zhurbenko
3c750575cf Fixed font-size normalization for the text-shape 2017-09-05 15:47:13 -07:00
Anton Georgiev
a68222dfff Merge pull request #4181 from JaeeunCho/destroy_meeting_users
[HTML5 2.0] End meeting by moderator
2017-09-05 09:54:19 -04:00
Anton Georgiev
50c7974a30 Merge pull request #4323 from KDSBrowne/x2.0-replace-getElementById-instances
[HTML5] - Replace Instances of getElementById
2017-09-05 09:51:57 -04:00
JaeeunCho
7a01c61639 fixed isModerator() 2017-09-01 13:00:55 -07:00
JaeeunCho
99ea26c584 added isModerator at service.js 2017-09-01 12:37:14 -07:00
JaeeunCho
ede90b8a40 removed unused line at css 2017-09-01 11:39:17 -07:00
JaeeunCho
43f6fd9c03 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users 2017-09-01 11:22:45 -07:00
Augusto Bennemann
5ec827e17d HTML5 video with kurento (port) 2017-09-01 12:26:57 -03:00
Anton Georgiev
d60e06e28f Merge pull request #4221 from JaeeunCho/change_localeId_to_camelCase
[HTML5] changed string id to camelCase
2017-09-01 10:05:50 -04:00