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

11172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
maxdoumit
d9c3f50f47 fix demo12.jsp when camera is disabled 
The following code was returning a null pointer

Element videodockModule = getElementWithAttribute(firstChild, "name", "VideodockModule");
Removing the lines solves the issue and does not load the videodockModule. This issue could have been introduced with a change to the xml client file.

This closes #2713
 2015-10-05 00:52:42 -04:00
Maxim Khlobystov
e9f204b681 Added the ability to clear emoji status. 2015-10-02 18:07:28 -07:00
Chad Pilkey
81ced7193b Only show annotations for the current whiteboard 2015-10-02 15:03:40 -07:00
Chad Pilkey
04ce742fd7 Make sure whiteboard text is published to the correct whiteboardID 2015-10-02 15:02:13 -07:00
Maxim Khlobystov
65a7ac4b70 Implemented emoji status detection. 2015-10-01 15:24:43 -07:00
Maxim Khlobystov
d8ecfd8e04 Added the ability to set emoji status. 2015-10-01 12:41:43 -07:00
Maxim Khlobystov
da50169319 Updated Meteor. 2015-10-01 11:34:00 -07:00
Richard Alam
0744466ce0 Merge pull request #2811 from ritzalam/user-internal-userid-in-voice 
User internal userid in voice
 2015-09-30 16:26:03 -04:00
Richard Alam
5dd139f2f4 - do not user external user id to find user 2015-09-30 20:07:05 +00:00
Richard Alam
93dd5186b4 - user internal user id for user in the voice conf 2015-09-30 18:55:17 +00:00
Ghazi Triki
123bf12798 Updated breakout rooms box style. 2015-09-30 09:27:13 +01:00
Ghazi Triki
6474117fd4 Show the number of users in breakout rooms instead of the room activity. 2015-09-30 09:23:52 +01:00
Ghazi Triki
7565c2277f Display breakout rooms in the users list. 2015-09-29 13:43:46 +01:00
Calvin Walton
5c6788d771 Merge pull request #2809 from kepstin/long-wav-file 
Long wav file
 2015-09-28 14:47:22 -04:00
Calvin Walton
a6d6001040 Convert audio_size to a number before subtracting header size 2015-09-25 14:11:25 -04:00
Calvin Walton
d44b458b49 Need to convert bit_rate to an integer 2015-09-25 14:08:17 -04:00
Calvin Walton
530799776d Fix some reference errors in wav detection 2015-09-25 14:01:30 -04:00
Richard Alam
1179e85b1c Merge pull request #2807 from capilkey/add-messageLength-default 
Add a default message length to avoid issues of missing property
 2015-09-25 10:21:27 -04:00
Chad Pilkey
0627afa2e5 Add a default message length to avoid issues of missing property 2015-09-24 14:17:07 -07:00
Chad Pilkey
4c4d35a760 Merge pull request #2787 from riadvice/chat-message-limit 
The use is able to write a multi-line chat message.
 2015-09-24 17:15:43 -04:00
Richard Alam
a8ceb4648c Merge pull request #2806 from ritzalam/add-more-info-on-logs 
- add more info on logs
 2015-09-24 16:07:27 -04:00
Richard Alam
43c8f9b5ec - add more info on logs 2015-09-24 20:05:48 +00:00
Calvin Walton
1dcd49e180 record-and-playback: Handle FreeSWITCH wav files >4GB 
FreeSWITCH writes wav files >4GB long with incorrect values in the length
field in the header. Recalculate the length based on file size, and ensure
that ffmpeg reads the complete audio file rather than stopping.
 2015-09-24 15:54:20 -04:00
Chad Pilkey
ad03486971 Merge pull request #2804 from OZhurbenko/whiteboard-modifications 
Polling shape correction
 2015-09-24 13:37:34 -04:00
Richard Alam
31a99c6b96 Merge pull request #2805 from antobinary/master 
Simplify html5 redirect #2801
 2015-09-24 13:29:37 -04:00
Anton Georgiev
4253faa426 remove extra condiction 2015-09-24 16:05:41 +00:00
Anton Georgiev
2bd601cc08 simplify html5 redirect #2801 2015-09-24 15:58:17 +00:00
Richard Alam
49014d4b12 Merge pull request #2803 from ritzalam/expire-redis-key 
- expire redis keys for events that are stored even if meeting is no…
 2015-09-23 18:33:08 -04:00
Richard Alam
4d27b460ae - expire redis keys for events that are stored even if meeting is not recorded 2015-09-23 22:31:15 +00:00
Fred Dixon
fa361deff5 Merge pull request #2802 from ffdixon/bump-version 
bump from 1.0.0-dev to 1.0.0-beta
 2015-09-23 18:01:27 -04:00
Richard Alam
54e1452b14 Merge pull request #2801 from antobinary/master 
Only show "OR launch the html5 client" when bbb-html5 is running(or ./start.sh)
 2015-09-23 18:00:18 -04:00
Fred Dixon
536cf68bd6 bump from 1.0.0-dev to 1.0.0-beta 2015-09-23 18:00:16 -04:00
Anton Georgiev
07dfd89dd7 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2015-09-23 21:24:34 +00:00
Anton Georgiev
6cfc16cde5 offer redirect to HTML5 only if available 2015-09-23 21:24:19 +00:00
Richard Alam
281270ec6b Merge pull request #2799 from ritzalam/clean-up-logging 
Clean up logging
 2015-09-23 17:13:28 -04:00
Richard Alam
2f4eae512f - cleanup more logs 2015-09-23 21:01:53 +00:00
Fred Dixon
150e6560b1 Merge pull request #2800 from ffdixon/update-index 
Added Chat, Emoji, and Polling to index page
 2015-09-23 17:01:51 -04:00
Fred Dixon
2051913359 Added Chat, Emoji, and Polling to index page 2015-09-23 17:00:26 -04:00
Richard Alam
a1a82f96d0 - remove printlns to cleanup logs 2015-09-23 20:11:06 +00:00
Richard Alam
ee7ef24397 - change fielname to be the same as on server 2015-09-23 20:04:39 +00:00
Richard Alam
57c8f21eb4 - clean up logging 
- add remote address into log
 2015-09-23 20:04:09 +00:00
Fred Dixon
0f99dfe603 Merge pull request #2798 from bigbluebutton/ffdixon-patch-3 
Update bbb-conf
 2015-09-22 14:51:34 -04:00
Fred Dixon
ddc473105d Update bbb-conf 
Remove reference to rtmps
 2015-09-22 14:51:23 -04:00
Ghazi Triki
03eda0f072 First implementation of the breakout rooms window. 2015-09-22 18:07:00 +01:00
Fred Dixon
3c7236b909 Merge pull request #2797 from capilkey/investigate-locking-more 
Force MediaItemRenderer to update
 2015-09-21 17:51:10 -04:00
Chad Pilkey
77c9c660d2 Merge pull request #2796 from ritzalam/fix-lock-settings 
- make lock settings behave like in 0.9
 2015-09-21 17:25:46 -04:00
Chad Pilkey
e9c0eb23cd rename bbb-client in .project file for better importing 2015-09-21 14:13:32 -07:00
Chad Pilkey
15a2ade0aa Merge remote-tracking branch 'ritzalam/fix-lock-settings' into investigate-locking-more 2015-09-21 13:50:44 -07:00
Chad Pilkey
d0366b2fba Make sure PhoneOptions are initialized before using 2015-09-21 13:46:16 -07:00
Chad Pilkey
6377f86ca1 make sure the user item renderers update when locking changes 2015-09-21 13:45:18 -07:00