Commit Graph

1911 Commits

Author SHA1 Message Date
Tainan Felipe
19723f3da1 change id of the intl 2017-11-30 08:29:52 -02:00
Tainan Felipe
488f9eacc3 Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-design 2017-11-29 09:32:39 -02:00
KDSBrowne
a599bcd7c7 remove the need for .firstChild 2017-11-28 12:10:12 -08:00
Augusto Bennemann
5d2a78a5ce HTML5 video iOS support 2017-11-28 17:31:36 -02:00
Tainan Felipe
f5cf9c5893 Fix user list dropdown bug when making user presenter 2017-11-28 15:20:47 -02:00
Oswaldo Acauan
a5024f3b7b Add toast notification for meteor call errors 2017-11-28 10:29:11 -02:00
Oswaldo Acauan
807bd99f82 Fix stuck state on conversion failure 2017-11-28 10:26:00 -02:00
Oswaldo Acauan
e8de534964 Add error handling on presentation upload and covnersion 2017-11-27 15:44:45 -02:00
Oleksandr Zhurbenko
1d6aee1826 Fixed a bug with the dropdown list separator not being displayed in Firefox 2017-11-24 19:15:49 -08:00
Oleksandr Zhurbenko
28772e51ed Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-11-24 18:55:19 -08:00
Maxim Khlobystov
864e71798d Fixed the default locale issue. 2017-11-24 20:26:03 +00:00
prlanzarin
fdca5356c3 Finished making bbb-webrtc-sfu answer in single path
Started standardizing video and screenshare RPC messages

Video now uses redis message routing
2017-11-24 18:59:40 +00:00
Tainan Felipe
e9f7bbf760 add CSS variable to border 2017-11-24 09:08:23 -02:00
Tainan Felipe
8eaa48fe69 re-added message when user leaves a meeting 2017-11-24 08:52:03 -02:00
Oleksandr Zhurbenko
3c02dc1811 Added a workaround for a bug with focus in FF 57 and 58
see https://bugzilla.mozilla.org/show_bug.cgi?id=1409113
2017-11-23 15:47:36 -08:00
Tainan Felipe
c7c58fea51 remove whitespace and changes in package.json 2017-11-23 15:40:38 -02:00
Tainan Felipe
d15bb139bb refactor emoji menu 2017-11-23 15:20:27 -02:00
Tainan Felipe
5b6a291658 Merge branch 'toast-breakout-ends' of https://github.com/Tainan404/bigbluebutton into toast-breakout-ends 2017-11-23 11:03:09 -02:00
Tainan Felipe
545d9e158b altered id of the intl message 2017-11-23 11:00:41 -02:00
Tainan Felipe
5f66e79263 linter fixes 2017-11-23 09:49:10 -02:00
Oswaldo Acauan
861cf0f2ef Fix upload for files with same name 2017-11-22 12:47:27 -02:00
Tainan Felipe
cdfe58e542 removed console.log add accidentallyy 2017-11-22 11:28:11 -02:00
Tainan Felipe
37440e11f1 Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-breakout-ends 2017-11-22 11:11:21 -02:00
Oleksandr Zhurbenko
866f9308b9 Added support for touch events on iOS devices 2017-11-21 16:51:40 -08:00
Tainan Felipe
6845aed0e0 localize message from when clear the chat 2017-11-21 16:31:53 -02:00
Tainan Felipe
0d25ba5ae7 add blue color on emoji menu for ethe emoji selected 2017-11-21 08:50:20 -02:00
Tainan Felipe
9fc130b640 add opacity in icon button with hover 2017-11-21 08:35:21 -02: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
KDSBrowne
54d82d456c use firstchild once instead of 3 2017-11-17 12:54:04 -08:00
Gabriel Carvalho de Campes
207d117a4e Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor-bugfixes 2017-11-17 17:19:56 -02:00
Gabriel Carvalho de Campes
74bb2bb5e8 fix permission overlay positioning, localizes messages 2017-11-17 17:01:52 -02:00
Tainan Felipe
03cdc155df increased size of font of send button 2017-11-17 16:57:39 -02:00
prlanzarin
248dc7fa08 Fixed HTML5 video API import
Added chrome extension ID to HTML5 screenshare call
2017-11-17 18:55:59 +00:00
Tainan Felipe
73a0b7c7cb fix <br> that no appeared in welcome message 2017-11-17 14:07:22 -02: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
a4986cb5b7 fix distance between dropdown and button on public chat 2017-11-17 13:38:07 -02:00
Gabriel Carvalho de Campes
effb21fc1f Changes and enhancements on audio, wIP 2017-11-17 09:52:48 -02:00
Tainan Felipe
221845349e change name of variables in the presentation-toolbar 2017-11-17 08:54:23 -02:00
Tainan Felipe
64fb3fc920 Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-design 2017-11-17 08:11:46 -02:00
Oleksandr Zhurbenko
bd26e17185 Added touch events support for the text shape, except Safari 2017-11-16 15:14:43 -08: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
Tainan Felipe
e7a8520f32 remove negative margin of the dropdown separrator 2017-11-16 17:33:06 -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
Oleksandr Zhurbenko
b3061dda91 Adjusted the getTranformedSvgPoint func 2017-11-16 09:51:24 -08:00
Tainan Felipe
1f7a3f062b align button by the flexbox 2017-11-16 15:25:38 -02:00
KDSBrowne
2784a53570 add left margin to items in userlist 2017-11-16 08:26:49 -08:00
Gabriel Carvalho de Campes
36c9d85749 Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-11-16 09:13:47 -02:00
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