BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,180 Commits 13 Branches 260 Tags 1.1 GiB
e054358947
Commit Graph

18180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oleksandr Zhurbenko
e054358947 Created a whiteboard config and moved static values there 2017-09-21 16:44:32 -07:00
Oleksandr Zhurbenko
d19814dc55 Prevented html5 from throwing exceptions if the slide file doesn't exist 2017-09-21 14:02:50 -07:00
Oleksandr Zhurbenko
a46469557f Minor corrections and improvements based on the #4345 reviews 2017-09-20 14:34:22 -07:00
Oleksandr Zhurbenko
2b10d5c1a7 Fixed based on the review of #4345 2017-09-20 14:05:17 -07:00
Oleksandr Zhurbenko
f3a17e74a8 Removed unused properteties from the slide object 2017-09-18 17:18:20 -07:00
Oleksandr Zhurbenko
838382b6f9 Moved presentation overlays' rendering to a separate function 2017-09-18 16:54:52 -07:00
Oleksandr Zhurbenko
ff4e7bffd0 Fixed a bug with the helper's import 2017-09-18 16:52:20 -07:00
Oleksandr Zhurbenko
537175dad2 Moved part of the presentation display calculations to the server side 2017-09-18 15:20:44 -07:00
Oleksandr Zhurbenko
d57f60fe09 Adjusted publish calls to #4385 2017-09-18 12:18:37 -07:00
Oleksandr Zhurbenko
c9552247b2 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-18 12:08:14 -07:00
Anton Georgiev
17b4beb545 Merge pull request #4385 from KDSBrowne/x2.0.7-messages 
[HTML5] - header functions update
 2017-09-18 12:00:31 -04:00
Anton Georgiev
4a148ebfce Merge pull request #4383 from KDSBrowne/x2.0.8-fix-undefined-chat-prop 
[HTML5] - Fix Chat bug
 2017-09-18 11:57:40 -04:00
Richard Alam
455915cdb0 Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-09-18 07:29:42 -07:00
Ghazi Triki
9251114bed Show between 3 and 6 files in uploaded presentations list. 2017-09-18 15:11:36 +01:00
Ghazi Triki
a702ba076d Wider media column. 2017-09-18 14:25:16 +01:00
Ghazi Triki
1d2fab5a84 Dot not display microphone button above webcam when the user is in listenOnly mode. 2017-09-18 08:57:44 +01:00
Ghazi Triki
88722cfef5 Clean up flex imports. 2017-09-18 08:51:08 +01:00
Ghazi Triki
6400c5f2f4 Fixed audio windows labels. 2017-09-18 07:36:33 +01:00
Oleksandr Zhurbenko
9e1c8a4fb7 Permissions fix 
Can't afford WebStorm :-(
 2017-09-17 19:01:48 -07:00
Oleksandr Zhurbenko
c7d737e9b8 Improvements based on the PR review 2017-09-17 18:58:37 -07:00
Ghazi Triki
8aea9bc85b Better visibility management for presentation buttons and fix poll choices box to get full width. 2017-09-15 22:26:48 +01:00
Fred Dixon
23b5a2de65 Merge pull request #4406 from joshua-arts/fix-getRecordings-prettyprint 
Convert getRecordings XML to a String.
 2017-09-15 12:30:48 -04:00
Josh
7a3a5dbadc convert to string 2017-09-15 12:27:46 -04: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
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