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

11349 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
14aabf9da6 - allow joining breakout room 2015-10-19 19:00:21 +00:00
Richard Alam
07a95c6702 Merge pull request #2842 from kepstin/long-wav 
Recording: Also tell ffmpeg to ignore the length of the intermediate wave file
 2015-10-19 14:04:13 -04:00
Ghazi Triki
516740bc88 Removed polling shorcuts from ShortcutHelpWindow. 2015-10-19 18:33:33 +01:00
Chad Pilkey
9da9a8efb2 Merge pull request #2846 from OZhurbenko/master 
Chat improvements
 2015-10-16 17:59:24 -04:00
Oleksandr Zhurbenko
b53d6454b1 Fixed a bug where horizontal scrolling appeared when users got long chat messages in mobile views 2015-10-16 14:49:06 -07:00
Oleksandr Zhurbenko
f963798952 Resetting resized input box after switching from landscape to portrait on desktop 2015-10-16 14:38:20 -07:00
Richard Alam
8beff5f717 Merge pull request #2843 from ritzalam/update-deskhare-jar 
- new jar signed with cert that expires on oct 30, 2017
 2015-10-16 15:48:10 -04:00
Richard Alam
5e190e9578 - new jar signed with cert that expires on oct 30, 2017 2015-10-16 19:47:01 +00:00
Richard Alam
9696b0246b - add dependencies 2015-10-16 19:23:33 +00:00
perroned
30332602ed Made ahandlers for picking up orientation switching 2015-10-16 12:00:23 -07:00
Oleksandr Zhurbenko
f552f8a4cc Restricted textbox resizing to landscape only 2015-10-16 12:00:16 -07:00
Felipe Cecagno
7069a4a6d7 Recording: Also tell ffmpeg to ignore the length of the intermediate wav file 2015-10-16 14:09:32 -04:00
Richard Alam
6b1f727117 - add name to test 2015-10-16 14:44:31 +00:00
Richard Alam
3db1299059 - start implementing breakout room messages 
- use class to serialize/deserialize JSON
 - add test to message classes
 2015-10-15 23:05:19 +00:00
Calvin Walton
b4e3561fa6 Update Firefox 41 hang workaround for 41.0.2 2015-10-15 14:05:12 -04:00
Ghazi Triki
99f6ab2499 Minor CSS fixes. 2015-10-10 14:30:39 +01:00
Ghazi Triki
eb5371d90c Improved presentation backButton and forwardButton buttons styles. 2015-10-10 12:37:32 +01:00
Fred Dixon
b802076f01 Merge pull request #2831 from antobinary/audio-fix 
html5 client - update welcome message for 1.0-beta
 2015-10-09 13:07:29 -04:00
Richard Alam
fa72b06500 Merge pull request #2826 from riadvice/presentation-upload-status 
Presentation upload returns a 200 HTTP status.
 2015-10-09 12:48:57 -04:00
Anton Georgiev
35f3266988 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-fix 2015-10-09 15:37:04 +00:00
Anton Georgiev
a3e7721db9 update welcome message 2015-10-09 15:36:56 +00:00
Richard Alam
36fe1b0806 Merge pull request #2830 from ritzalam/allow-changing-loglevels 
Allow changing loglevels
 2015-10-08 15:14:11 -04:00
Richard Alam
e8e8eb8955 - clean up formatting 2015-10-08 19:10:43 +00:00
Richard Alam
197669ebc4 - add a timeout when to expect response to validate token. If we don't get a response, 
log it. This might mean that we run into issue where the reply from server isn't
   getting propagated back into the client.
 2015-10-08 18:28:25 +00:00
Richard Alam
e5ed0e4713 - add logging to trace messages in order to debug lost messages between server to client 2015-10-08 18:27:33 +00:00
Richard Alam
f4d094adc0 - allow changing the debug level without restarting red5 2015-10-08 18:26:22 +00:00
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
Ghazi Triki
96aa42e5c2 Presentation upload returns a 200 HTTP status. 2015-10-07 14:17:04 +01: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