Commit Graph

823 Commits

Author SHA1 Message Date
Vitor Mateus De Almeida
880963e0e7 Merge remote-tracking branch 'upstream/develop' into layout 2020-07-06 13:36:38 -03:00
Vitor Mateus De Almeida
2454440a8d Fix exceptions and layout size when panels change 2020-06-20 02:46:10 -03: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
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
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
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
KDSBrowne
5c9c5808ae add message string / fix hand notification not working on android 2020-03-24 13:40:06 +00:00
KDSBrowne
6a1b40fa98 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into issue-8544 2020-03-19 14:22:02 +00:00
KDSBrowne
d9f3cd0d34 add notification tab to settings modal 2020-03-19 14:19:40 +00:00
Anton Georgiev
05bd6070bd
Merge pull request #8200 from KDSBrowne/issue-7146
Sort private chat messages by last activity
2020-03-09 11:50:18 -04:00
Anton Georgiev
3754d0ab6f Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-master-feb-28-2020 2020-02-28 17:47:06 -05:00
Anton Georgiev
addc5f2ea8
Merge pull request #8647 from pedrobmarin/user-list-text-overflow
Fix user-list item text-overflow
2020-02-28 11:05:14 -05:00
KDSBrowne
4e045283f4 move remove user option to bottom of dropdown menu 2020-02-27 15:17:24 +00:00
Mohamed Amine Ben Salah
d2db75e9bb adds join Breakoutrooms Test Spec 2020-02-21 15:06:05 -03:00
Pedro Beschorner Marin
8ccd24aefb Fix user-list item text-overflow 2020-02-18 18:31:58 -03:00
Pedro Beschorner Marin
5e3d039ec9
Fixed localization id 2020-02-14 12:12:36 -03:00
Mohamed Amine Ben Salah
a7df0393c7 added Check presence Test spec to user.test.js 2020-02-07 15:05:28 -03:00
Pedro Beschorner Marin
1d87949d65 Unify user-list content style 2020-02-06 16:46:21 -03:00
Anton Georgiev
c8ae008485
Merge pull request #8436 from pedrobmarin/note-notification
Fix shared notes notification
2020-01-07 16:32:12 -05:00
Pedro Beschorner Marin
b0690f6837 Fix shared notes notification 2019-12-16 18:06:41 -03:00
Tainan Felipe
9194f383bb Fix spacing in note button 2019-12-09 16:30:15 -03:00
Anton Georgiev
1561c7dbea
Merge pull request #8330 from KDSBrowne/who-is-talking
Add mute functionality to talking indicator
2019-11-19 11:56:06 -05:00
KDSBrowne
4ba3136ec2 fix closed captions position for RTL in userlist 2019-11-14 13:44:00 +00:00
Anton Georgiev
42d640f3e2 Merge branch 'issue7791-add-support-to-new-parameters-name' of github.com:diegobenetti/bigbluebutton into test-7805 2019-11-05 11:59:00 -05:00