Commit Graph

18764 Commits

Author SHA1 Message Date
Richard Alam
0ac0e76a07 Merge pull request #4375 from ritzalam/fix-escaping-of-metadata-xml
Fix escaping of metadata xml
2017-09-08 16:22:39 -04:00
Richard Alam
b662c1c722 - log exception so we can get info of broken metadata.xml file 2017-09-08 13:18:44 -07:00
Richard Alam
8173c7ef0e - escape text xml properly 2017-09-08 12:32:14 -07:00
Ghazi Triki
5af3ebd001 Switch text center and justify icons. 2017-09-08 18:03:10 +01:00
Richard Alam
627fea172b Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-09-08 08:11:24 -07:00
Richard Alam
337d1940b5 Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-09-08 08:03:31 -07:00
Richard Alam
d54d437e57 Merge pull request #4368 from antobinary/phone-user
Add enablePause="true" for Screenshare
2017-09-08 11:00:45 -04:00
Ghazi Triki
189832e6dc Add a horizontal rule separator above user footer actions. 2017-09-08 11:39:55 +01:00
Ghazi Triki
0f7b8fa990 Make recording button red instead of blue. 2017-09-08 11:07:59 +01:00
Oleksandr Zhurbenko
7e6ad07b76 Added indexes for the html5 Mongo collections 2017-09-07 16:41:03 -07:00
Chad Pilkey
b346eb6479 SharedNotesNameWindow accessible close 2017-09-07 17:48:13 -04:00
Chad Pilkey
c68b8eba73 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into 2.0-accessibility-firstpass 2017-09-07 15:44:35 -04:00
Chad Pilkey
8b6d903c87 fix some tab order issues in the Flash client 2017-09-07 15:44:10 -04: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
Josh
7f2f41f304 fix multiple connections to redis 2017-09-07 13:27:03 -04:00
Ghazi Triki
03dee2456f Show BrowserPermissionHelper at the same position on mac and windows. 2017-09-07 18:21:18 +01:00
Ghazi Triki
663f97dd33 Show record button only if the meeting can be recorded. 2017-09-07 18:18:46 +01:00
Josh
8dc3080731 update webhooks to work with new 2.0 messages 2017-09-07 13:11:43 -04:00
KDSBrowne
bc8718e263 fix line endidngs 2017-09-07 09:47:20 -07:00
Ghazi Triki
9ceb8b227f Make Button and ComboBox font weight normal. 2017-09-07 17:43:06 +01:00
KDSBrowne
21c5ffee8f remove need for separate headerBuilder function 2017-09-07 09:37:13 -07:00
Richard Alam
eabf0ad4f3 Merge pull request #4369 from ritzalam/fix-audio-not-recording
fix issue where audio isn't recording
2017-09-07 12:14:56 -04:00
Richard Alam
987e58e78c - fix issue where audio isn't recording if there is already a user joined listen only before a user
joins full duplex.
2017-09-07 09:11:11 -07:00
Anton Georgiev
5a59abde64 add enablePause="true" for Screenshare 2017-09-07 11:34:38 -04:00
Ghazi Triki
6a6d2f3e38 Improved shared notes UI. 2017-09-07 15:37:27 +01:00
KDSBrowne
13e6357b19 fix line endings 2017-09-07 07:31:19 -07:00
Chad Pilkey
00ddba6de9 accessible close for TitleWindows 2017-09-06 19:31:50 -04:00
Richard Alam
2dc070a721 Merge pull request #4367 from antobinary/phone-user
Adjustments for phone user
2017-09-06 18:07:20 -04:00
Richard Alam
660feead9e Merge pull request #4365 from antobinary/chat-notification
Resolve issue with unread chat notification not displayed
2017-09-06 18:06:14 -04:00
Richard Alam
8ffc05bec1 Merge pull request #4364 from ritzalam/update-locales-sept6-2017
Update locales sept6 2017
2017-09-06 18:05:51 -04:00
Anton Georgiev
609f6fd462 do not promote or demote phone users 2017-09-06 18:01:42 -04:00
Anton Georgiev
f6edf5d6fb eject phone user from voice instead of kicking it 2017-09-06 17:55:44 -04:00
Anton Georgiev
94435bd782 fix to display voice_only user correctly 2017-09-06 17:04:28 -04: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
Anton Georgiev
33b1fed2b2 change timeout to 10ms 2017-09-06 11:37:01 -04:00
Anton Georgiev
78fa8d4412 fix for initial unread chat notification 2017-09-06 11:21:30 -04:00
Richard Alam
e1fcc9ec6a Merge branch 'update-locales-sept6-2017' into bbb-2x-mconf 2017-09-06 07:50:10 -07:00
Richard Alam
cd20b6c2d1 - update locales 2017-09-06 07:49:32 -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