Commit Graph

18438 Commits

Author SHA1 Message Date
KDSBrowne
69c2b195f5 remove css important rule 2017-09-15 09:00:11 -07:00
Fred Dixon
143d23ed8f Merge pull request #4403 from joshua-arts/fix-getRecordings-prettyprint
No longer pretty print when generating getRecordings XML.
2017-09-15 11:57:35 -04:00
Fred Dixon
1030844aa5 Merge pull request #4404 from riadvice/2x-client-theme
Set rtlEnabled to false by default
2017-09-15 11:57:14 -04:00
Ghazi Triki
1b5133a959 Set rtlEnabled to false by default and clean up unused config.xml properties. 2017-09-15 16:52:21 +01:00
Josh
1b08b26113 fix conflicts 2017-09-15 11:48:31 -04:00
Josh
ace8eac1cf no longer pretty print getRecordings response 2017-09-15 11:40:26 -04:00
KDSBrowne
2815cf9ce1 add custom focus styles 2017-09-15 08:12:58 -07:00
Fred Dixon
ff6d2ca5bc Merge pull request #4402 from riadvice/2x-client-theme
[Flash 2.0] - Fix window title truncation issue
2017-09-15 09:56:20 -04:00
Ghazi Triki
1b2d228647 Update spark labels to have fixed width in pixels making word wrapping work correctly. 2017-09-15 14:36:13 +01:00
Chad Pilkey
b4f2fad93b Merge pull request #4401 from capilkey/block-edge-webrtc
Use bowser for MS Edge detection
2017-09-14 14:18:32 -04:00
Chad Pilkey
e1da68a3ab use bowser for msedge detection 2017-09-14 14:14:43 -04:00
Richard Alam
a81dc2740b Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-09-14 10:41:04 -07:00
Richard Alam
98a974cf77 Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-09-14 10:25:50 -07:00
Richard Alam
31996d4bef Merge pull request #4399 from kepstin/bbb-20-rec-fixes
Handle recordings that have an unmatched DeskshareStartedEvent
2017-09-14 13:24:45 -04:00
Ghazi Triki
de20b697d5 Fix RTL styles. 2017-09-14 16:47:19 +01:00
Ghazi Triki
284401e6de Added special icons for RTL layout. 2017-09-14 15:53:13 +01:00
Ghazi Triki
8d75b4e399 [Experimental] - Added "rtlEnabled" feature as option to change layout direction for RTL languages. 2017-09-14 14:37:38 +01:00
KDSBrowne
cd5da84984 make handlePublishError static 2017-09-13 15:57:52 -07:00
Fred Dixon
04ce336ff0 Merge pull request #4396 from capilkey/block-edge-webrtc
Block WebRTC on Edge
2017-09-13 18:12:30 -04:00
Chad Pilkey
06377b6a25 hide edge webrtc because it's incompatible 2017-09-13 17:46:52 -04:00
Calvin Walton
3f1fb1dc31 Handle recordings that have an unmatched DeskshareStartedEvent
The previous code looked for stop events and tried to find their
associated start event. This obviously doesn't work if there was
no stop event. But if there was a start event, we need to show the
deskshare… so rework to code to try to find the matching stop to each
start instead, and use the end of the meeting if no matching stop was
found.
2017-09-13 17:17:17 -04:00
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