Commit Graph

18028 Commits

Author SHA1 Message Date
Richard Alam
2e6a5a8426 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-group-chat 2017-09-12 12:02:01 -07:00
Richard Alam
ea8995b828 Merge pull request #4380 from capilkey/upgrade-sipjs-0.7.8
Upgrade sip.js to 0.7.8
2017-09-12 13:20:56 -04:00
Fred Dixon
4a9b6ec8fd Merge pull request #4379 from ritzalam/fix-xss
fix passive xss
2017-09-12 13:01:09 -04:00
Fred Dixon
48ad57c584 Merge pull request #4382 from riadvice/2x-client-theme
[Flash 2.0] - Upload TitleWindow popups
2017-09-12 13:00:39 -04:00
Ghazi Triki
3c16f4d93e Fully display presentation upload error message. 2017-09-12 16:45:35 +01:00
Ghazi Triki
cc8e41bc16 Hide the vertical separator in MainToolbar when the logo is not displayed. 2017-09-12 15:33:38 +01:00
Ghazi Triki
3b6a182603 Put always in top the close button in TitleWindow component. 2017-09-12 15:33:11 +01:00
Ghazi Triki
4487ff3d2c Display all text in LogoutWindow by replacing width with minWidth. 2017-09-12 11:18:48 +01:00
Ghazi Triki
31fe04180a Add missing locale for retry presnetation upload. 2017-09-12 11:18:13 +01:00
Fred Dixon
44982b0b5a Merge pull request #4381 from bigbluebutton/ffdixon-patch-1
Update bigbluebutton-release to 2.0.0-beta
2017-09-11 21:03:34 -04:00
Fred Dixon
daf67c2f00 Update bigbluebutton-release 2017-09-11 21:03:19 -04:00
Chad Pilkey
73d394bf31 updated sipjs to the latest release 0.7.8 2017-09-11 20:49:04 -04:00
Richard Alam
9e906bd671 - fix passive xss 2017-09-11 14:38:09 -07:00
Richard Alam
b55010615e Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-09-11 14:27:51 -07:00
Ghazi Triki
d8e0e16e54 Make possible to upload a new file after an error and update the file upload progress bar. 2017-09-11 21:40:01 +01:00
Anton Georgiev
9599ed9374 Merge pull request #4320 from MaximKhlobystov/selenium-browser-versions
[HTML5 Client] Test Update: Support for browser versioning + Code optimization
2017-09-11 14:08:02 -04: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
Richard Alam
39f3654edb Merge branch 'capilkey-2.0-accessibility-firstpass' into bbb-2x-mconf 2017-09-11 08:32:41 -07:00
Richard Alam
eaffc9b2b9 Merge branch '2.0-accessibility-firstpass' of https://github.com/capilkey/bigbluebutton into capilkey-2.0-accessibility-firstpass 2017-09-11 07:57:57 -07: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
Chad Pilkey
e6def71a2c refix the presentation back/forward enable state for a third time 2017-09-11 00:47:25 -04:00
Chad Pilkey
0a6f588004 set the label correctly on the audible chat notification 2017-09-11 00:46:18 -04:00
Chad Pilkey
cb30d56844 tab order fixes 2017-09-11 00:45:39 -04:00
Richard Alam
4b20567d17 - refactor handlers 2017-09-09 06:59:12 -07:00
Richard Alam
b9837cb48a Merge branch 'bbb-2x-mconf' into implement-group-chat 2017-09-08 13:24:35 -07:00
Richard Alam
142eb36f63 Merge pull request #4374 from riadvice/2x-client-theme
Switch text center and justify icons.
2017-09-08 16:23:11 -04:00
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
Richard Alam
9b5f652b1c - try to extract logger 2017-09-08 12:25:45 -07:00
Ghazi Triki
5af3ebd001 Switch text center and justify icons. 2017-09-08 18:03:10 +01:00
Richard Alam
c2ec376918 Merge branch 'bbb-2x-mconf' into implement-group-chat 2017-09-08 08:13:10 -07: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
Richard Alam
8e610bbd22 - refactor handlers 2017-09-07 19:14:08 -07:00
Richard Alam
7f83fe3ea8 - modify polls 2017-09-07 18:00:32 -07:00
Richard Alam
c7c26f637b - convert screenshare to not use traits 2017-09-07 15:04:50 -07:00
Richard Alam
2a3315f185 - remove parens 2017-09-07 14:50:30 -07:00
Chad Pilkey
b346eb6479 SharedNotesNameWindow accessible close 2017-09-07 17:48:13 -04:00
Richard Alam
9a5c11aceb - remove traits from closed caption 2017-09-07 14:30:43 -07:00
Richard Alam
02289d0828 - do not use traits for handlers 2017-09-07 14:14:30 -07:00
Richard Alam
81acf00079 - change access type to string 2017-09-07 13:21:09 -07:00
Richard Alam
e0161b8da8 - implement group chat message handlers 2017-09-07 12:51:19 -07: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