Commit Graph

18317 Commits

Author SHA1 Message Date
KDSBrowne
c7328a5bb7 fix: Expected 'this' to be used by class method 'handlerPublishError' 2017-09-13 13:50:04 -07:00
Fred Dixon
59444dadc7 Merge pull request #4395 from joshua-arts/fix-playback-length-units
Convert playback length to minutes when writing to XML.
2017-09-13 16:39:45 -04:00
KDSBrowne
e3ed9aa84d remove need for wrapper function 2017-09-13 12:47:52 -07:00
Josh
a25c9ba740 convert playback length to minutes when writing to xml 2017-09-13 15:34:37 -04:00
Fred Dixon
b6f42dc8da Merge pull request #4370 from joshua-arts/2.0-webhook-fixes
Update webhooks module to support new messages in 2.0.
2017-09-13 14:35:21 -04:00
Richard Alam
4e89b08fa3 Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-09-13 11:02:00 -07:00
Richard Alam
3c9c078781 Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-09-13 10:57: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
Richard Alam
732c769b32 Merge branch 'joshua-arts-fix-getRecordings-response' into bbb-2x-mconf 2017-09-13 08:58:20 -07:00
Richard Alam
136566d0d9 Merge branch 'fix-getRecordings-response' of https://github.com/joshua-arts/bigbluebutton into joshua-arts-fix-getRecordings-response 2017-09-13 08:55:59 -07:00
Ghazi Triki
274e7f9560 Bind download presentation button layout inclusion to its visibility. 2017-09-13 16:50:58 +01:00
Josh
cc2a3f055a remove recording tag from getRecordings resp 2017-09-13 11:50:39 -04:00
Richard Alam
8457aaa767 Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-09-13 08:43:45 -07:00
Ghazi Triki
fadc2558ce Revert back to thin icons in AudioSelectionWindow. 2017-09-13 16:35:59 +01:00
KDSBrowne
41b629b232 make publish function private to RedisPubSub2x class 2017-09-13 08:29:23 -07:00
Ghazi Triki
53ed8f3e93 Remove browser helper image when the webcam is detected. 2017-09-13 14:56:58 +01:00
Ghazi Triki
11568de672 Update the maximum number of breakout rooms from 5 to 8. 2017-09-13 12:31:45 +01: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
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
KDSBrowne
72acea229b remove single quotes from variable 2017-09-12 10:01:07 -07: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
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
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
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
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