Commit Graph

841 Commits

Author SHA1 Message Date
Anton Georgiev
570f482d4c
Merge pull request #10144 from vitormateusalmeida/layout-manager-2
Add Layout Context and Layout Manager
2020-07-29 10:00:59 -04:00
Anton Georgiev
b87b619fdd
Merge pull request #9964 from KDSBrowne/dev2.3-raise-hand-toast
Improve toast notification for raised hands
2020-07-28 10:29:21 -04:00
Vitor Mateus De Almeida
ed8b3adb0b Merge remote-tracking branch 'upstream/develop' into layout-manager-2 2020-07-23 16:54:50 -03:00
Mohamed Amine Ben Salah
a51105fab3 fix shared notes automated test 2020-07-20 18:19:24 -03:00
Vitor Mateus De Almeida
34108014f9 Fix exceptions and layout size when panels change 2020-07-20 16:22:41 -03:00
KDSBrowne
600c41142a Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into dev2.3-raise-hand-toast 2020-07-16 11:59:38 +00:00
Anton Georgiev
21b6def708
Revert "Replace unsafe react lifecycle methods" 2020-07-15 15:52:34 -04:00
Anton Georgiev
7535e6fa59
Revert "Create layout context and add a layout manager" 2020-07-15 12:44:59 -04:00
Anton Georgiev
b9b4490d8c
Merge branch 'develop' into layout 2020-07-14 10:32:24 -04:00
Anton Georgiev
e48306431a
Merge pull request #9498 from Tainan404/issue-8744
Replace unsafe react lifecycle methods
2020-07-14 10:30:37 -04:00
Vitor Mateus De Almeida
880963e0e7 Merge remote-tracking branch 'upstream/develop' into layout 2020-07-06 13:36:38 -03:00
Pedro Beschorner Marin
526f79e8f2 Merge remote-tracking branch 'bigbluebutton/v2.2.x-release' into bigbluebutton/develop 2020-06-30 18:15:18 -03:00
KDSBrowne
c70a58c1ff add status notification component 2020-06-30 02:43:20 +00:00
Anton Georgiev
e22856d29e prevent triggers of unmute others caused by incorrect state 2020-06-26 18:51:01 +00:00
KDSBrowne
c47ff6026d fix position of shared note unread indicator 2020-06-22 13:48:52 +00:00
Vitor Mateus De Almeida
2454440a8d Fix exceptions and layout size when panels change 2020-06-20 02:46:10 -03:00
KDSBrowne
4386248c9b remove chat option for dial in users 2020-06-17 12:37:09 +00:00
Joao Siebel
3e95ed0e4b Merge remote-tracking branch 'upstream/v2.2.x-release' into merge-2.2 2020-06-16 16:40:56 -03:00
Anton Georgiev
6da65c3c84
Merge pull request #9802 from KDSBrowne/2.2-typeError-fix
fix TypeError: event.path is undefined
2020-06-10 09:28:57 -04:00
Anton Georgiev
ac6fd2824c
Merge branch 'develop' into 2.3-audio-stats 2020-05-26 12:36:15 -04:00
Tainan Felipe
e1573bded9 Merge remote-tracking branch 'upstream/develop' into issue-8744 2020-05-26 11:44:20 -03:00
Anton Georgiev
c9e996de21 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 17:32:24 +00:00
Anton Georgiev
ca9ae8d861 cleanup 2020-05-22 10:55:11 -04:00
KDSBrowne
274335cc9d add checkbox toremove user modal 2020-05-22 10:47:03 -04:00
Anton Georgiev
e7917994d5 add banUser field in EjectUserFromMeetingCmdMsgBody 2020-05-22 10:45:28 -04:00
Anton Georgiev
c290c9ee60 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into ban-eject-user 2020-05-21 16:54:31 -04:00
Anton Georgiev
1874cf8392 Add visuals for banning vs ejecting user 2020-05-21 16:40:08 -04:00
Anton Georgiev
e08ee31338
Merge pull request #9629 from KDSBrowne/issue-9569
Update shared note item style
2020-05-21 15:06:45 -04:00
Anton Georgiev
be81b20ff1
Merge pull request #9632 from antobinary/lock-breakouts
Do not display "Lock viewers" option in breakouts
2020-05-21 14:57:21 -04:00
Anton Georgiev
33156f8bc5 Do not display "Lock viewers" option in breakouts 2020-05-21 14:55:32 -04:00
Anton Georgiev
201fa2902e Only provide modOnlyMessage to moderators. Promoted mod requires refresh to see it 2020-05-20 15:56:44 -04:00
Pedro Beschorner Marin
73085ee88c Avoid guest promotion 2020-05-20 09:34:53 -03:00
KDSBrowne
2637685c1c update shared note item style 2020-05-19 13:58:00 +00:00
Pedro Beschorner Marin
22c8eee0c7 Connection status first commit 2020-05-14 10:32:55 -03:00
KDSBrowne
75270e20f8 fix TypeError: event.path is undefined 2020-05-13 12:53:55 +00:00
Anton Georgiev
4e636a2396
Merge pull request #9518 from KDSBrowne/issue-9511
Change shared notes lock behavior
2020-05-12 17:55:48 -04:00
KDSBrowne
43a9f04edf localise string 2020-05-12 21:34:07 +00:00
KDSBrowne
26143e5889 prevent user item unlock affecting shared notes 2020-05-12 21:21:56 +00:00
KDSBrowne
4c23e060bf add username to remove confirmation title / update modal description 2020-05-12 21:04:07 +00:00
KDSBrowne
c28b0108ea prevent user item displaying as locked for shared notes lock 2020-05-12 19:43:10 +00:00
KDSBrowne
5f4676ec63 show lock by moderator label on shared notes 2020-05-12 19:07:01 +00:00
Anton Georgiev
ee3175cf86
Merge pull request #9408 from KDSBrowne/2.2-fix-selected-user
Set correct state in user list for selected user onClick
2020-05-11 12:55:29 -04:00
Tainan Felipe
851189f3c1 Merge remote-tracking branch 'upstream/develop' into issue-8744 2020-05-11 11:42:03 -03:00
KDSBrowne
2ca54d69f4 add remove user confirmation 2020-05-07 14:32:15 +00:00
Anton Georgiev
cc79c4b6ae merge 2.2.10 into 2.3 2020-05-05 19:52:44 +00:00
Tainan Felipe
6e43f262da Move unique ids to constructor 2020-05-05 13:33:28 -03:00
KDSBrowne
f9fa2f36dd set correct state for selected user on click 2020-05-04 13:40:13 +00:00
Fred Dixon
f4b7287960
Merge pull request #9365 from KDSBrowne/2.2-prevent-dup-user-styles
Prevent multiple users displaying as selected in user list
2020-04-30 19:49:24 -04:00
KDSBrowne
dffe1b1747 prevent multiple users displaying as selected in userlist 2020-04-30 23:26:17 +00:00
Anton Georgiev
722ffa5d07 disable private chat initiation in breakouts 2020-04-30 17:50:34 -04:00