BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,579 Commits 13 Branches 260 Tags 1.1 GiB
fa877e8f73
Commit Graph

2101 Commits

Author SHA1 Message Date
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
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
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
Oswaldo Acauan
dd83d213fa Fix missing conversion handlers 2017-09-22 17:43:07 -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
b35b16f642 rename functions to past tense 2017-09-21 10:55:07 -07:00
KDSBrowne
30da581d6d rename user prop to match 2.x 2017-09-21 10:50:06 -07:00
KDSBrowne
b988dadf89 switch relative with absolute import path 2017-09-21 10:40:19 -07:00
KDSBrowne
93d7c9f4ce change variable declaration 2017-09-21 10:21:25 -07:00
KDSBrowne
8418317e03 handle UserEjectedFromMeetingEvtMsg 2017-09-21 09:21:42 -07: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
Anton Georgiev
90db7326b8 Merge pull request #4415 from KDSBrowne/x2.0.9-clear-chat-bug 
[HTML5] - Fix clear chat feature
 2017-09-20 14:13:05 -04:00
Anton Georgiev
e22da926bb Merge pull request #4414 from KDSBrowne/x2.0.8-stun-turn-delete 
[HTML5] - Remove requestStunTurn
 2017-09-19 15:53:08 -04:00
KDSBrowne
2e1fb712a1 use userId instead of username 2017-09-19 12:01:02 -07:00
KDSBrowne
bd8c57eb45 remove log messages 2017-09-19 11:57:08 -07:00
KDSBrowne
6b6d431a5b switch variable positions in object 2017-09-19 11:55:32 -07:00
KDSBrowne
9b3bb04a90 fix clear chat feature 2017-09-19 10:39:13 -07:00
KDSBrowne
4388fc4b0f remove requestStunTurn 2017-09-19 08:42:10 -07:00
KDSBrowne
f385103935 add new line to end of file 2017-09-19 07:55:46 -07:00
KDSBrowne
beff9626bc remove duplicate variable 2017-09-19 07:54:03 -07:00
KDSBrowne
44e2a948eb clean up css 2017-09-19 07:51:18 -07:00
KDSBrowne
d7335ade60 move focus styles to central location 2017-09-19 07:44:42 -07: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
ff4e7bffd0 Fixed a bug with the helper's import 2017-09-18 16:52:20 -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
d57f60fe09 Adjusted publish calls to #4385 2017-09-18 12:18:37 -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
Anton Georgiev
17b4beb545 Merge pull request #4385 from KDSBrowne/x2.0.7-messages 
[HTML5] - header functions update
 2017-09-18 12:00:31 -04: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
KDSBrowne
cd5da84984 make handlePublishError static 2017-09-13 15:57:52 -07:00
KDSBrowne
c7328a5bb7 fix: Expected 'this' to be used by class method 'handlerPublishError' 2017-09-13 13:50:04 -07:00
KDSBrowne
e3ed9aa84d remove need for wrapper function 2017-09-13 12:47:52 -07:00
KDSBrowne
27dbe42189 pass this.pub as a parameter to _publish 2017-09-13 10:01:47 -07:00
KDSBrowne
91718abfba add underscore to indicate private function 2017-09-13 09:10:28 -07:00
KDSBrowne
41b629b232 make publish function private to RedisPubSub2x class 2017-09-13 08:29:23 -07:00
KDSBrowne
4b7d790a57 change variable name 2017-09-12 11:13:27 -07:00
KDSBrowne
571c3763dd add publishVoiceMessage 2017-09-12 10:58:06 -07:00
KDSBrowne
090b3e91c2 add comment to publish 2017-09-12 10:25:41 -07:00
KDSBrowne
72acea229b remove single quotes from variable 2017-09-12 10:01:07 -07:00
KDSBrowne
c987ef6635 add publishSystemMessage 2017-09-12 09:11:08 -07:00
KDSBrowne
39bd590329 rework header creation 2017-09-12 08:52:02 -07:00
Oleksandr Zhurbenko
39ba2d12de Fixed permissions 2017-09-11 12:13:42 -07:00
Oleksandr Zhurbenko
eca8090bac Adjusted the PR 'methods' to #4322 2017-09-11 12:12:39 -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
Anton Georgiev
802b3bb4fb Merge pull request #4322 from KDSBrowne/x2.0-header-functions 
[HTML5] - Add header functions
 2017-09-11 14:00:15 -04:00
KDSBrowne
89de2f771b change parameter name to header 2017-09-11 10:19:06 -07: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
467ffaba49 change log message 2017-09-11 06:46:19 -07:00
KDSBrowne
eeb878649a remove single quotes from variable 2017-09-11 06:42:56 -07:00
Oleksandr Zhurbenko
7e6ad07b76 Added indexes for the html5 Mongo collections 2017-09-07 16:41:03 -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
b0f3ca7a1a remove unused import 2017-09-07 10:41:26 -07:00
KDSBrowne
876097a0f4 fix line endings 2017-09-07 10:38:00 -07:00
KDSBrowne
b2b36254ab remove check from handler add exhaustive check to modifier 2017-09-07 10:33:23 -07:00
KDSBrowne
bc8718e263 fix line endidngs 2017-09-07 09:47:20 -07:00
KDSBrowne
21c5ffee8f remove need for separate headerBuilder function 2017-09-07 09:37:13 -07: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
KDSBrowne
67ab2d5379 alternate solution test 2017-09-06 07:17:46 -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
KDSBrowne
c14e779bb4 add check to payload 2017-09-05 08:53:02 -07:00
Anton Georgiev
718828353e Merge pull request #4321 from Klauswk/fix-acl-inconsistency 
[HTML5] Fix inconsistency inside the ACL, #4310
 2017-09-05 09:54:40 -04: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
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
Oleksandr Zhurbenko
2a91c6aa0b Fixed a bug initial cursor/shape coordinates on page zooming 2017-08-31 18:42:00 -07:00
KDSBrowne
b20859d1c9 fix chat being locked for moderators 2017-08-31 14:49:13 -07:00
KDSBrowne
7a9cb7d04f fix the disabling of chat when locked 2017-08-31 14:29:18 -07:00
KDSBrowne
94e44d6a23 remove unused prop 2017-08-31 13:50:20 -07:00
KDSBrowne
a404cc14d1 remove space typo 2017-08-31 13:47:06 -07:00
KDSBrowne
2f9d4bcc0e move isMeetingLocked condition check to userlist service 2017-08-31 11:12:53 -07:00
Klaus
5bba87525e Fix navigation error mention by kert 2017-08-31 14:03:40 -03:00
Oswaldo Acauan
a2268494e6 Move old files to the 2.0 folder 2017-08-31 09:56:51 -03:00
Oswaldo Acauan
6070a4ea25 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into presentation-uploader-2x 2017-08-31 09:49:59 -03:00
Oleksandr Zhurbenko
28f7f8ad11 Minor fixes and adjustments 2017-08-30 16:12:03 -07:00
Oleksandr Zhurbenko
e4c4f4584d Prevented publishing messages on random clicks for common shapes, and enabled that for pencil 2017-08-30 13:45:47 -07:00
KDSBrowne
c244ef91ec fix line endings 2017-08-30 11:35:40 -07:00
KDSBrowne
a01451f9fd handle LockSettingsInMeetingChangedEvtMsg and fix userlistitem lock notification 2017-08-30 11:00:56 -07:00
KDSBrowne
7cdf031a22 fix typo 2017-08-30 09:33:18 -07:00
KDSBrowne
f31a2df133 implement suggested changes 2017-08-30 09:31:08 -07:00
KDSBrowne
14696a3cff fix lint issue 2017-08-30 08:03:19 -07:00
KDSBrowne
a8137c3054 switch to one function to create headers 2017-08-30 07:58:46 -07:00
Oleksandr Zhurbenko
f78283a17d Fixes 
Hide wb toolbar when there is no slide; fixed cursor's text clipping; fixed exceptions thrown on 'Clear All' by reactive-annotation container; fixed shapes' thickness scaling on zoom; fixed dimensions' data types sent to akka (it doesn't accept Doubles)
 2017-08-29 18:43:55 -07:00
KDSBrowne
b2fcfef145 move if condition 2017-08-29 16:26:43 -07:00
Oleksandr Zhurbenko
e1cf0ad9d5 Rewrite of the cursor component 2017-08-29 13:58:48 -07:00
KDSBrowne
126f4589e1 move if conditions 2017-08-29 12:31:09 -07:00
KDSBrowne
20316be90f add suggested changes 2017-08-29 12:25:01 -07:00
KDSBrowne
82de509c55 fix typo 2017-08-29 07:00:41 -07:00
Klaus
ade47254d3 Fix inconsistency inside the ACL, #4310 2017-08-28 16:48:46 -03:00
KDSBrowne
1ba4be58fd removed unused functions 2017-08-28 09:14:18 -07:00
KDSBrowne
7271be05f8 remove getElementById usage in message-list-item component 2017-08-28 08:30:50 -07:00
KDSBrowne
24bdb2d000 remove getElementById usage in message component 2017-08-28 08:30:50 -07:00
KDSBrowne
92c9af6d96 add functions to create headers 2017-08-28 07:29:26 -07:00
Oleksandr Zhurbenko
5d2b215591 Added timers for the pencil and shape draw listeners and fixed a bug with clearing the Annotations collection 2017-08-27 01:12:27 -07:00
Oleksandr Zhurbenko
1a92a7f6a1 Changed annotations' rendering, refactored draw listeners, adjusted permissions for the publishAnnotation 2017-08-25 15:45:06 -07:00
Oleksandr Zhurbenko
f533b25d69 Improved whiteboard-toolbar and fixed linter warnings 2017-08-24 16:47:20 -07:00
Klaus
4cd5bd26bb Fix WAI-ARIA and lint 2017-08-24 10:15:11 -03:00
Oleksandr Zhurbenko
f3481a7e4b Turned on multi-user drawings 2017-08-23 21:27:41 -07:00
Oleksandr Zhurbenko
321b47abd1 Fixed pencil and text draw listeners for presenters 2017-08-23 20:35:34 -07:00
Klaus
d2b39be2d3 Move the userlist stuff to the right folder 2017-08-23 15:03:50 -03:00
Klaus
bbe4afe3f2 Change jeeung's code to match the rest of code 2017-08-23 14:19:01 -03:00
Klaus
ec458d1b55 Refactor user list 2017-08-23 13:29:21 -03:00
Oleksandr Zhurbenko
af558ff61d Fixed cursor's rendering including smoothing; adjusted cursor's label 2017-08-22 13:20:12 -07:00
Klaus
43d1b0c8d5 Merge remote-tracking branch 'jeeung/implement_set_promote_demote' into html5-refactor-userlist 2017-08-22 15:39:34 -03:00
Klaus
585a079794 Refactor chat list 2017-08-22 10:32:58 -03:00
Oleksandr Zhurbenko
2686c67ee7 Fixed a bug with pencil data not being added to the collection 2017-08-21 17:32:03 -07:00
JaeeunCho
c51764c7f6 changed name to val 2017-08-21 13:04:38 -07:00
JaeeunCho
baa5d519f1 added text-ellipsis and max-width 2017-08-21 10:29:01 -07:00
Oleksandr Zhurbenko
6a04851469 Fixed all the eslint errors under components/presentation 2017-08-20 17:16:39 -07:00
Oleksandr Zhurbenko
aa68421462 Fixed most of lint errors under components/whiteboard 
Except annotation group, which will be changed soon
 2017-08-19 23:32:01 -07:00
Oleksandr Zhurbenko
d5f07a574c Fixed publishShape message for 4 common shapes 
Line, Rectangle, Triangle, Ellipse
 2017-08-18 19:47:31 -07:00
JaeeunCho
73b6054b42 [HTML5] implemented promote/demote user 2017-08-18 11:23:05 -07:00
Klaus
4fa10ec656 Add proptypes and a few more refactors 2017-08-17 11:18:02 -03:00
Oleksandr Zhurbenko
643d55938c Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-08-16 19:24:59 -07:00
Klaus
c87f3054b9 Remove user-actions 2017-08-16 17:25:53 -03:00
Klaus
c32a64c02d a few refactor made 2017-08-16 11:56:31 -03:00
Oleksandr Zhurbenko
76d778d9e5 Fixed 'Clear All' annotations for the multi-user mode 2017-08-15 15:30:11 -07:00
Anton Georgiev
5f1fb7542e Merge pull request #4204 from Klauswk/fix-missing-state 
[HTML5 2.0] Fix Audio Modal on Meeting Join
 2017-08-15 15:11:47 -04:00
Anton Georgiev
f6e8e743e0 Merge pull request #4244 from KDSBrowne/fix-meeting-title 
[HTML5] - Meeting title fix
 2017-08-15 15:11:27 -04:00
KDSBrowne
66d1a3b06a fix meeting title 2017-08-15 10:24:58 -07:00
Klaus
3730891d5f Merge branch 'bbb-2x-mconf' into html5-breakout-2x-fix 2017-08-15 13:08:13 -03:00
Oleksandr Zhurbenko
9035386e76 Added multi-cursors 2017-08-14 17:15:11 -07:00
JaeeunCho
ab81ebfcfd added new line at the end of service.js 2017-08-14 13:05:59 -07:00
JaeeunCho
11d181327c created service.js moved makeCall to service.js 2017-08-14 13:03:37 -07:00
JaeeunCho
1dff7f0ef2 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users 2017-08-14 12:56:56 -07:00
Klaus
dc62d15ad0 Change variable name 2017-08-14 16:19:35 -03:00
Klaus
e996bea1e9 Handling separate redis channel 2017-08-14 15:55:17 -03:00
Klaus
7c12ccb39e Handling meeting end 2017-08-14 15:52:18 -03:00
JaeeunCho
237d1b6ac3 divided code into new container.jsx 2017-08-11 13:32:33 -07:00
Klaus
de6b40a666 Fix counter in breakout notification 2017-08-11 17:17:35 -03:00
Klaus
17dce149d9 fix dropdown going missing 2017-08-11 15:02:26 -03:00
Klaus
babc981867 Messages been correct handle 2017-08-11 14:14:50 -03:00
JaeeunCho
b20ea78e2a fixed conflict 2017-08-10 14:34:21 -07:00
JaeeunCho
8607eff5d6 changed fullScreen to fullscreen 2017-08-10 12:09:16 -07:00