Commit Graph

3385 Commits

Author SHA1 Message Date
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
Oleksandr Zhurbenko
380c67f18f Merge pull request #4538 from MaximKhlobystov/khmer-locale-fix
[HTML5 Client] Khmer locale fix
2017-10-21 21:31:14 -04:00
Maxim Khlobystov
6dd484db4f Indentations cleanup. 2017-10-21 21:30:24 -04:00
Oswaldo Acauan
8af4d227db Fix notification service exports 2017-10-20 17:27:00 -02:00
Oswaldo Acauan
11908b8ecf Fix file extension and turn eslint rule off 2017-10-20 17:09:01 -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
Maxim Khlobystov
03eced3236 Updated locales. 2017-10-20 15:17:52 +00:00
gcampes
029a13d2a0 better error handling, code cleanup 2017-10-20 08:11:51 -02:00
Maxim Khlobystov
a11e695756 Made sure the fix for escaping backslashes is applied when you run the Transifex for all locales at once. 2017-10-19 20:58:47 +00:00
Maxim Khlobystov
f455ec97bd Updated the Khmer labels (doesn't break anymore). 2017-10-19 20:29:30 +00:00
Maxim Khlobystov
c44bd1c7fd Fixed the Transifex script to make sure it preserve escaping backslashes in the JSON file supplied by Transifex. 2017-10-19 20:24:36 +00: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
Oswaldo Acauan
cbc3ea9e36 Add handlers for recording messages 2017-10-19 08:44:41 -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
Oswaldo Acauan
317335d359 Revert caret for the react-tostify package 2017-10-18 17:38:53 -02:00
Joao Siebel
da9e2ef3a4 Fix function name in updateVoiceUser 2017-10-18 10:30:33 -02:00
gcampes
d1bc675465 changes setdevices to bridge 2017-10-17 17:16:42 -02:00
Oswaldo Acauan
c801ad8996 Fix the version of react-toastify util we update to react 16 2017-10-13 15:24:58 -03: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
Oswaldo Acauan
0dd371087b Fix logClient method name 2017-10-13 11:49:48 -03: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
Anton Georgiev
8e6e450195 Merge pull request #4514 from OZhurbenko/merge-2.0-1.1-api
[HTML5] - Follow up on 2.0 -> 1.1 api merge
2017-10-12 21:17:47 -03:00
Tainan Felipe
98b23640fd solve bug no disppear modal presentation-upload 2017-10-12 21:12:00 -03:00
Joao Siebel
8b8456a1ac Closes breakout room modal when the breakout room are closed 2017-10-12 19:39:03 -03:00
gcampes
03be5d9e59 changes join listen only 2017-10-12 18:39:32 -03:00
gcampes
f89e189a88 fixes listenonly issue 2017-10-12 16:22:10 -03:00
Oleksandr Zhurbenko
430ddc0d3b Removing unnecessary 2x from the collections, publishers, subscriptions and logs 2017-10-12 12:07:02 -07: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
Tainan Felipe
e74c44dd9d fix errors linter 2017-10-12 14:02:46 -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
KDSBrowne
31b9a17e2c add new line 2017-10-12 09:17:20 -07:00
KDSBrowne
5d6a273a57 add missing en.json strings 2017-10-12 09:14:05 -07:00
gcampes
5ad95faffc changes verto bridge. WIP 2017-10-12 12:04:34 -03:00
gcampes
6b44504e5d Adds timeout to transfer, fix css, remove logs 2017-10-12 11:49:50 -03:00
Anton Georgiev
af9f1e4dd3 Merge pull request #4506 from KDSBrowne/z01-update-locale-files
[HTML5] - add translation files from Transifex
2017-10-12 10:17:28 -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
1ec0c11fe4 Permissions fix 2017-10-11 19:01:07 -07:00
Oleksandr Zhurbenko
015ca3d719 Changed imports and removed 'initializeCursor.js' since it's not needed 2017-10-11 19:00:28 -07:00
Oleksandr Zhurbenko
70b3a14aec Moved meetingDestruction to where it is supposed to be 2017-10-11 18:15:13 -07:00
Oleksandr Zhurbenko
2e61493a0c Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into merge-2.0-1.1-api 2017-10-11 18:12:09 -07:00
Oleksandr Zhurbenko
337f53e72b Moved files up to api/ 2017-10-11 18:09:35 -07:00
Oleksandr Zhurbenko
854ca6b409 Moved voice-users, whiteboard-multi-user, auddio and bbb 2017-10-11 18:07:27 -07:00
Oleksandr Zhurbenko
37fb59ffcc Merged 2.0 and 1.1 users api 2017-10-11 18:02:23 -07:00
Oleksandr Zhurbenko
b8a4dbb278 Merged 2.0 and 1.1 slides api 2017-10-11 17:59:35 -07:00
Oleksandr Zhurbenko
ea029e552e Adjusted naming 2017-10-11 17:56:34 -07:00
Oleksandr Zhurbenko
ad071d4edb Merged 2.0 and 1.1 annotations -> shapes api 2017-10-11 17:52:57 -07:00
Oleksandr Zhurbenko
75315d5b44 Changed the modifier's name 2017-10-11 17:41:50 -07:00
Oleksandr Zhurbenko
0e58027486 Merged 2.0 and 1.1 presentations api 2017-10-11 17:40:51 -07:00
Oleksandr Zhurbenko
d2e1ab842e Merged 2.0 and 1.1 polls api 2017-10-11 17:33:57 -07:00
Oleksandr Zhurbenko
82603d8ad5 Permissions fix 2017-10-11 15:18:48 -07:00
Oleksandr Zhurbenko
eb75c6d9fb Merged 2.0 and 1.1 meetings api 2017-10-11 15:17:42 -07:00
Oleksandr Zhurbenko
48d4736c71 Renamed deskshare to screenshare 2017-10-11 14:53:02 -07:00
Oleksandr Zhurbenko
bfa6541f96 Merged 2.0 and 1.1 screenshare apis 2017-10-11 14:52:19 -07:00
Oleksandr Zhurbenko
3f8e24c12e Merged 2.0 and 1.1 cursor apis 2017-10-11 14:34:23 -07:00
gcampes
79e7bc1909 adds missing code to bridge 2017-10-11 18:30:38 -03:00
Oleksandr Zhurbenko
47d9b53cc2 Merged 2.0 and 1.1 breakouts, chat, and captions 2017-10-11 14:25:18 -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
a850d1c9c1 Merge pull request #4494 from oswaldoacauan/redis-queue-rewrite
[HTML5] Redis class refactor
2017-10-11 17:40:28 -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
KDSBrowne
5d80b29ca5 add traslations from Trasifex 2017-10-11 12:06:33 -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
KDSBrowne
4a82fdf6c6 remove important flags and add color constant 2017-10-11 11:06:28 -07: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
Anton Georgiev
3af2969311 Merge pull request #4499 from antobinary/fix-emoji
[HTML5 client] Add missing states in emoji button icon change
2017-10-11 14:31:07 -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
Oswaldo Acauan
7935cbff01 Fix file permissions 2017-10-11 12:35:43 -03:00
Oswaldo Acauan
10fff502f7 Add comment about redis.js 2017-10-11 12:34:56 -03:00
Oswaldo Acauan
c08f6a9c4f Fix file permissions 2017-10-11 12:22:08 -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
Anton Georgiev
3f1fd9e459 Merge pull request #4496 from MaximKhlobystov/underscore-locales-fix
[HTML5 Client] Fix for locales containing `_`
2017-10-11 10:54:08 -03:00
Anton Georgiev
3b8c410a3c rearrange normalized emojis to match order of emoji definition 2017-10-11 10:09:47 -03:00
Anton Georgiev
50970b6cb3 fixes to change-emoji-button-on-emoji-change 2017-10-11 10:06:23 -03:00
KDSBrowne
a2cd4222d2 Merge branch 'v2.0.x-release' into z01-style-updates 2017-10-11 05:39:05 -07:00
gcampes
f8c50b8ef7 wire up audio errors to notifications. WIP 2017-10-11 09:05:57 -03:00
Anton Georgiev
351a0e43cb Merge pull request #4470 from KDSBrowne/xx-07-allow-html5-modorator
[HTML5] -Allow HTML5 Moderator
2017-10-11 09:04:54 -03:00
Anton Georgiev
6c1526fec2 Merge pull request #4462 from KDSBrowne/xx-06-toggle-element-color-change
[HTML5] - Change toggle-switch  on/off state colors
2017-10-11 08:58:57 -03:00
Oleksandr Zhurbenko
bbe1f99527 Improvements 2017-10-10 16:20:52 -07:00
Tainan Felipe
50cc876cf7 fix errors linter 2017-10-10 19:08:51 -03:00
Oleksandr Zhurbenko
8b5a53a59a Moved pencil_chunk_size to the config
... And adjusted the way we fetch annotation statuses from the config
2017-10-10 14:50:11 -07: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
Oswaldo Acauan
3e5dacdaf1 Change meetingQueue delete 2017-10-10 15:30:45 -03:00
gcampes
02cdcb2562 changes to styles and texts in audio flow 2017-10-10 15:03:29 -03:00
Oswaldo Acauan
d8ed7e23ee Remove debug message 2017-10-10 14:50:06 -03:00
Oswaldo Acauan
80a318309c Implement multi queues and async messages on Redis class 2017-10-10 14:43:42 -03:00
Anton Georgiev
66f8be63d2 Merge pull request #4475 from oswaldoacauan/fix-token-security
[HTML5] Add a check for the passed credentials agains the token in Acl
2017-10-10 12:48:41 -04:00
KDSBrowne
d9ae121130 remove wrapping body in an object 2017-10-10 08:05:16 -07:00
Anton Georgiev
f50fb6aea8 modify format of TURN server config for webrtc 2017-10-10 11:12:35 -03:00
Tainan Felipe
5393051d9d fix errors linter 2017-10-10 10:06:34 -03:00
KDSBrowne
ac4181cc09 change focused state border thickness to 2px 2017-10-10 05:47:34 -07:00
Oleksandr Zhurbenko
1ab85be722 Permissions 2017-10-09 18:55:53 -07:00
Oleksandr Zhurbenko
4d8233fe10 Fix for the pencil Mongo additions 2017-10-09 18:30:29 -07:00
gcampes
fae131732b changes audiocontext on ios 2017-10-09 18:23:05 -03:00
gcampes
317c3e5ee9 changes to bridge and audio components. WIP 2017-10-09 17:48:10 -03:00
Oswaldo Acauan
96ea918919 Fix file permissions 2017-10-09 17:20:27 -03:00
Oswaldo Acauan
73d4607288 Skip checkToken in client calls 2017-10-09 15:53:45 -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
7d664c8be7 Add a check for the passed credentials agains the token in Acl 2017-10-09 09:49:07 -03:00
Anton Georgiev
a9e9ac31e8 Merge pull request #4471 from MaximKhlobystov/default-locale-setting
[HTML5] Fix for the default locale in the Settings modal's selector (a.k.a. "Bulgarian bug").
2017-10-06 15:18:27 -04:00
KDSBrowne
584f7e4bc8 add checks to handler 2017-10-06 11:12:33 -07:00
Oswaldo Acauan
d049c982a0 Fix user-list scroll styles 2017-10-06 15:11:19 -03:00
Maxim Khlobystov
d1f6d7c4e0 Replaced double quotes with single ones in the YAML file. 2017-10-06 18:05:30 +00:00
KDSBrowne
d89f0e511f Merge branch 'v2.0.x-release' into xx-07-allow-html5-modorator 2017-10-06 11:02:17 -07:00
KDSBrowne
9da39339cd remove unused checks 2017-10-06 10:56:56 -07: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
KDSBrowne
d70bfdb337 remove code duplication 2017-10-06 10:52:14 -07:00
Oswaldo Acauan
38c8ff4abc Update emoji menu to use emoji constants 2017-10-06 13:49:46 -03:00
Maxim Khlobystov
5f79db2554 Fixed the issue with the Bulgarian locale always displaying as a default one in the Settings modal. 2017-10-06 16:29:52 +00:00
KDSBrowne
36ebec64c5 change modifier name 2017-10-06 09:16:55 -07:00
KDSBrowne
fc4b0dbcb1 add changeRole handler call to changeRole modifier 2017-10-06 09:10:23 -07:00
KDSBrowne
5c1ff8efbc fix promoted users not being able to execute moderator actions 2017-10-06 08:18:27 -07: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
KDSBrowne
b20ab84abd make changeRole.js return publishUserMessage 2017-10-06 06:31:56 -07:00
KDSBrowne
58ab2f974d add missing locale string 2017-10-06 06:29:16 -07:00
KDSBrowne
4191ce56ed set allowHTML5Moderator to true 2017-10-06 06:27:45 -07: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
KDSBrowne
4ac9f0de9a change toggle-switch colors 2017-10-05 12:21:11 -07: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
KDSBrowne
d689e7d166 fix isVoiceUser prop in mappedUser service 2017-10-04 11:45:58 -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
f635dbf2ae remove import and function call 2017-10-04 08:45:05 -07:00
KDSBrowne
d347864b19 update removeUser modifier props 2017-10-04 08:22:56 -07:00
KDSBrowne
7225590c05 fix userEjected modifier and change if condition 2017-10-04 07:57:16 -07:00
KDSBrowne
e241d6bf68 remove unused voice-user method 2017-10-04 07:39:13 -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
Anton Georgiev
7932ebd938 Merge pull request #4413 from KDSBrowne/x2.0.6-custom-button-focus
[HTML5] - Custom Element Focus Styles
2017-10-03 16:21:25 -04:00
KDSBrowne
83d4474b51 remove if statment and unused imports 2017-10-03 13:03:18 -07:00
KDSBrowne
078e8b579a remove Logger messages and switch allowHTML5Moderator to false 2017-10-03 12:38:59 -07:00
Oswaldo Acauan
ef5eefc786 Revert wrong isLocked mapping 2017-10-03 16:26:32 -03:00
Oswaldo Acauan
32632151d5 Fix bug when user wasnt in voiceConf 2017-10-03 16:22:26 -03:00
KDSBrowne
af4676ea38 pass userId to publishUserMessage 2017-10-03 12:20:03 -07:00
KDSBrowne
2d62b79165 switch to correct event name 2017-10-03 12:12:19 -07: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
3eed1ec1c0 remove voice user check in userEjected.js 2017-10-03 08:45:36 -07:00
KDSBrowne
fdb38bb89c remove console logs 2017-10-03 08:28:49 -07:00
KDSBrowne
9bad8d8d5d add kickVoiceUser and fix presenter assign bug 2017-10-03 08:25:56 -07:00
KDSBrowne
67a621c6c5 add focus-border-offset css variable 2017-10-02 13:39:04 -07:00
KDSBrowne
0b50594b91 remove cal funtion 2017-10-02 13:36:37 -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
Anton Georgiev
5c071756a0 Merge pull request #4438 from KDSBrowne/xx-04-logoutURL-issue
[HTML5] - logoutRouteHandler Fix
2017-10-02 13:33:54 -04: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
KDSBrowne
3b6aed34ae check for voice user and remove if exists 2017-09-29 11:58:24 -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
b2d78b4f8a remove unused callback function 2017-09-29 09:21:04 -07:00
KDSBrowne
6bb93ff6fd clean up css, remove duplications 2017-09-29 07:54:24 -07:00
Oswaldo Acauan
c186840c3c Fix current presentation being unset 2017-09-29 11:13:54 -03:00
Oswaldo Acauan
0e10fa2aa6 Fix typo 2017-09-29 11:10:35 -03:00
Oswaldo Acauan
43685f84d3 Fix intl propType and linter 2017-09-29 11:03:08 -03:00
gcampes
82e62ee2a6 fix to sip bridge 2017-09-29 10:59:30 -03:00
gcampes
a26f622ba9 gets audio to work 2017-09-29 10:58:13 -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
Oswaldo Acauan
19e3075dec Add missing body check 2017-09-29 10:50:46 -03:00
Oswaldo Acauan
a5135f28e6 Renamte presentationChange handler 2017-09-29 10:50:05 -03:00
Oswaldo Acauan
c8042ce65b Rename handlers from change to set to match akka 2017-09-29 10:42: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
54efe44345 Rename share method to set to match akka 2017-09-29 10:29:55 -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
7f5d5b8064 Change defaultFileName check to match config 2017-09-29 09:44:36 -03:00
Oswaldo Acauan
15b10b2374 Remove constraint for not deleting the current presentation 2017-09-29 09:43:49 -03:00
Oswaldo Acauan
bc6283e722 Remove constraint for not deleting the current presentation 2017-09-29 09:41:45 -03:00
Oswaldo Acauan
27b89361c0 Add missing check 2017-09-29 09:40:40 -03:00
Oswaldo Acauan
e699c342b6 Add missing suported mimes 2017-09-29 09:31:38 -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
a60b7e26a6 add kickUser method 2017-09-28 10:41:02 -07:00
KDSBrowne
10c75afe99 switch handler, modifier and collection prop to ejected 2017-09-27 14:20:22 -07:00
KDSBrowne
3633b460d4 clean up code with suggestion 2017-09-27 08:03:31 -07:00
KDSBrowne
3e7aab2bdd add http:// to logoutURL if its not there 2017-09-27 06:56:40 -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
KDSBrowne
b26b1973f7 add new line to end of file 2017-09-26 13:53:59 -07:00
KDSBrowne
ad1b2b930c remove variable duplication 2017-09-26 13:45:38 -07:00
Anton Georgiev
0b6a7082ff Merge pull request #4431 from OZhurbenko/slide-change-fix
HTML5 - fix for the bug with the current Slide being unset
2017-09-26 16:39:05 -04:00
Oleksandr Zhurbenko
b02cbb3208 Removed redundand brackets 2017-09-26 13:36:47 -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
76808b3e7d Fixed a bug with the current slide being unset 2017-09-25 17:00: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
Anton Georgiev
91f912ce4b Merge pull request #4416 from OZhurbenko/mongo-indexing
Added indexes for the html5 Mongo collections
2017-09-25 15:57:07 -04: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
31223e86ec remove nested user and voiceUser keys 2017-09-25 08:57:39 -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