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

11118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
c995a7a587 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into support-multiple-logins 2015-10-08 14:34:02 +00:00
Richard Alam
d2d8d9de21 Merge pull request #2828 from riadvice/fix-max-upload-pages 
Fix max upload pages
 2015-10-07 18:02:12 -04:00
Ghazi Triki
f969b8c753 Implemented processPresentationConversionError method in PresentationClientMessageSender, this method was accidentally left empty after the messaging refactoring in 1.0. 2015-10-07 22:55:27 +01:00
Richard Alam
d89a34209d - make presentation api use session 2015-10-07 21:44:01 +00:00
Ghazi Triki
3078f8ea40 Setting the correct number of builder analysed pages in sendFailedToCountPageMessage of paPdfToSwfSlidesGenerationService, the value should be is set from the CountingPageException not from UploadedPresentation. 2015-10-07 22:12:33 +01:00
Richard Alam
c5b5b11725 - check if user has sessionToken 2015-10-07 20:34:37 +00:00
Richard Alam
c182f85403 - use sessionToekn on signOut API call 2015-10-07 16:09:31 +00:00
Richard Alam
f7f3177e0a Merge pull request #2827 from antobinary/audio-fix 
html5client: Fix recent audio issues
 2015-10-07 11:33:48 -04:00
Anton Georgiev
8a6c713237 while in audio display exit audio 2015-10-07 15:21:25 +00:00
Anton Georgiev
a38f5b642a Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-fix 2015-10-07 15:10:55 +00:00
Anton Georgiev
0f5c19e13b reset userAgent and callerIdName so we can switch between audio joining modes 2015-10-07 15:09:08 +00:00
Richard Alam
4eee51bd00 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into support-multiple-logins 2015-10-07 14:01:04 +00:00
Richard Alam
e44056cd5d Merge pull request #2825 from ritzalam/add-external-userid-in-log 
- log external user id
 2015-10-06 18:27:45 -04:00
Richard Alam
894b59b687 - log external user id 2015-10-06 22:26:47 +00:00
Richard Alam
bcfe18d0d9 - use sessionToken to get configxml 2015-10-06 22:18:56 +00:00
Richard Alam
7968273501 - pass sessionToken to get configXML from bbb-web 2015-10-06 21:08:01 +00:00
Richard Alam
5b0facd058 Merge pull request #2824 from perroned/html5-client-https-audio 
Load JS libraries over HTTPS. Only allow exiting of audio while in call.
 2015-10-06 17:06:46 -04:00
perroned
99e0b75997 Simplify loading protocol process for libraries 2015-10-06 12:56:50 -07:00
perroned
3a738caa90 Load libraries from same protocl as page was served from 2015-10-06 12:48:34 -07:00
perroned
9f69fc4105 Merge remote-tracking branch 'bbb/master' into html5-client-https-audio 2015-10-06 12:42:37 -07:00
Richard Alam
91fbc8c10c Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into support-multiple-logins 2015-10-06 19:02:52 +00:00
Richard Alam
e53ed90859 Merge pull request #2823 from ritzalam/fix-demo11-api-example 
- convert all external ids in js api into internal user ids as using…
 2015-10-06 15:00:33 -04:00
Richard Alam
9260705ab9 - add js lib that parses chat messages and converts urls (fixes issue 2692) 2015-10-06 18:58:54 +00:00
Richard Alam
5e034a2b1f Merge pull request #2820 from capilkey/add-dots-to-reconnect 
Added scrolling dots to the reconnect popup
 2015-10-06 14:00:01 -04:00
Richard Alam
a2cf908425 - convert all extarnal ids in js api into internal user ids as using external user ids breaks when 
a user joins twice into the meeting
 2015-10-06 17:57:39 +00:00
Richard Alam
885a39fac5 Merge pull request #2821 from gthacoder/meteor-client-userlist-emojis 
Emojis for HTML5 client.
 2015-10-06 11:44:03 -04:00
Maxim Khlobystov
4b14abfc9d Slightly changed the color palette for FAB. 2015-10-06 08:15:08 -07:00
Maxim Khlobystov
d5fddab14d Cleaning up. 2015-10-06 08:10:38 -07:00
Richard Alam
6cf23b5511 - try to figure out why we get into infinite loop when calculating dependencies 2015-10-06 14:45:58 +00:00
perroned
9e9002b6bd When in audio only display exit button, remove join for other method 2015-10-05 13:46:54 -07:00
Richard Alam
e2533f1f0c - load config.xml first before doing anything else 2015-10-05 20:06:35 +00:00
Chad Pilkey
6f69330b77 Added scrolling dots to the reconnect popup 2015-10-05 12:26:44 -07:00
Anton Georgiev
8093ec3a66 adapt to internal userId (same for html5 as externalId) 2015-10-05 19:19:36 +00:00
perroned
343bcf86d0 Load external JS libraries using HTTPS 2015-10-05 12:07:14 -07:00
Maxim Khlobystov
5b97d359b3 Changed the color palette for the floating action button to use the existing colors. 2015-10-05 11:45:35 -07:00
Maxim Khlobystov
426adee719 Prevented the FAB from triggering on clicking invisible buttons. 2015-10-05 11:34:10 -07:00
Maxim Khlobystov
4231de1f51 Made FAB disappear smoothly after user clicks one of its buttons. 2015-10-05 10:02:52 -07:00
Richard Alam
83e2d3c146 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into support-multiple-logins 2015-10-05 16:01:59 +00:00
Richard Alam
85de6a9844 Merge pull request #2819 from ritzalam/update-locales-oct-5-2015 
- update to latest locales (oct 5, 2015)
 2015-10-05 12:01:09 -04:00
Richard Alam
c3aa194e00 - update to latest locales (oct 5, 2015) 2015-10-05 15:59:07 +00:00
Fred Dixon
c9c107014d Update index.html 2015-10-05 11:44:47 -04:00
Richard Alam
50a55481f5 Merge branch 'master' into support-multiple-logins 2015-10-05 15:33:33 +00:00
Richard Alam
f20b919ec2 Merge pull request #2818 from kepstin/ff-41-0-1-hang-workaround 
Workaround Firefox 41.0.1 hang on Windows
 2015-10-05 11:32:43 -04:00
Richard Alam
93ba04ce4c Merge pull request #2814 from capilkey/fix-2810 
Fix 2810
 2015-10-05 11:32:34 -04:00
Calvin Walton
dbd79cebb5 Workaround Firefox 41.0.1 hang on Windows 
On this particular browser, switch the Flash embed window mode to "opaque"
instead of "window". This causes buttons and right-click to be somewhat
unresponsive, but is still better than a complete browser hang.

The browser versions that the workaround is applied to is extremely limited,
because of the sideeffects.
 2015-10-05 11:26:31 -04:00
Richard Alam
23383c8db4 - add scala worksheet for testing 2015-10-05 15:23:06 +00:00
Richard Alam
3918dd3238 - try to figure out when configXml gets loaded 2015-10-05 15:22:39 +00:00
Richard Alam
0681da3fd3 Merge pull request #2815 from maxdoumit/master 
fix demo12.jsp when camera is disabled
 2015-10-05 11:19:34 -04:00
Fred Dixon
74173226cb Merge pull request #2817 from bigbluebutton/Update-index-html 
Update index.html
 2015-10-05 10:55:56 -04:00
Fred Dixon
d8cd5f7edd Update index.html 
Changed footer to show 1.0-beta
 2015-10-05 10:55:49 -04:00