BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,226 Commits 13 Branches 260 Tags 1.1 GiB
66392e0a6b
Commit Graph

12226 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Felipe Cecagno
66392e0a6b Merge remote-tracking branch 'mconf/mconf-live0.7.4' into mconf 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
 2016-03-02 00:19:30 -03:00
Lucas Zawacki
480fb7762f Mconf emoji format on the HTML5 client 2016-03-01 23:59:35 -03:00
Lucas Zawacki
9315a596f7 Refactor icons to make it easier to extend and modify 2016-03-01 23:54:16 -03:00
Felipe Cecagno
ebd6be1c02 apply canvas calculation when toolbar or footer are resized or hidden 2016-02-29 14:28:40 -03:00
Chad Pilkey
7fe8f57a50 changed the flash client canvas height to calculated value 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2016-02-29 10:51:06 -03:00
Felipe Cecagno
ba4572a353 fix syntax error on demo_mconf 2016-02-11 17:07:59 -02:00
Felipe Cecagno
bfb2560374 close stream while reading filesystem for getRecordings 2016-02-11 17:07:43 -02:00
Felipe Cecagno
6414d94c1c add download and size/rawSize tags on getRecordings response 2016-02-03 19:09:44 -02:00
Felipe Cecagno
a64a9c5940 remove unnecessary logs; order getRecordings response by recordId, and metadata by meta key 2016-02-03 19:09:16 -02:00
Felipe Cecagno
dd928bf189 update copyright message to 2016 2016-02-03 15:23:37 -02:00
Pedro Beschorner Marin
84bac52c57 Removed identation whitespaces of get-recordings XML when building it. 2016-02-03 13:51:44 -02:00
Pedro Beschorner Marin
38130c8a66 Added CDATA fields to FreeMarker template 2016-02-03 13:51:43 -02:00
Pedro Beschorner Marin
00d378831e FreeMarker template in a separated file 2016-02-03 13:51:42 -02:00
Pedro Beschorner Marin
497930b06d Creating getRecordings XML response with FreeMarker 2016-02-03 13:51:36 -02:00
Felipe Cecagno
cbaee9d990 try to speedup getrecordings, could reduce from 35s to 25s, but it's still not enough; need to better understand where's the bottleneck 2016-02-03 13:47:14 -02:00
Felipe Cecagno
39af3980f9 update java applet with new certificate signed by RNP 2016-02-03 13:34:18 -02:00
Felipe Cecagno
27dc3b56cd Merge remote-tracking branch 'daronco/webhooks-events-audio-video' into mconf-live0.7.4 2016-02-03 13:31:44 -02:00
Pedro Beschorner Marin
376be5f82a Fixed audio connection problem. Maybe this timer made sense when WebRTC audio connection wasnt being transferred after echo check 2016-02-03 13:20:12 -02:00
Felipe Cecagno
301a07773b fix issue with webrtc introduced on latest merge 2016-01-29 15:46:32 -02:00
Felipe Cecagno
d6b9a26e0d fix missing relayTimeout property removed on last merge 2016-01-28 14:37:09 -02:00
Felipe Cecagno
2a3b95daf7 Merge remote-tracking branch 'bigbluebutton/master' into mconf 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
	bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ConnectionFailedEvent.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/maps/FlashCallEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-config/bin/bbb-conf
 2016-01-26 18:33:31 -02:00
Fred Dixon
c3de0a9cde Merge pull request #2976 from bigbluebutton/ffdixon-fix-api-link 
Update demo_footer.jsp with correct link to API docs
 2016-01-25 07:45:42 -05:00
Fred Dixon
941caa06d5 Update demo_footer.jsp 2016-01-25 07:45:18 -05:00
Chad Pilkey
416cbbf7bc Merge pull request #2973 from capilkey/1.0-minor-fixes 
Minor UI changes for the Flash client
 2016-01-22 19:25:19 -05:00
Chad Pilkey
d90643fc77 update the client copyright to 2016 2016-01-22 16:12:54 -08:00
Chad Pilkey
f7f6d81a37 shorten the copyright string in the client footer 2016-01-22 15:53:16 -08:00
Chad Pilkey
4062aa02db significantly reduce the volume of the chat audio cue 2016-01-22 15:02:12 -08:00
Chad Pilkey
a2203ad5e6 unbold the lock settings categories in the popup 2016-01-22 14:52:45 -08:00
Chad Pilkey
d34616d3d2 add separation between chat time and border 2016-01-22 14:50:10 -08:00
Chad Pilkey
75cb6b66cc Merge pull request #2969 from tdj-br/master 
Fixes #2768
 2016-01-22 16:41:14 -05:00
Richard Alam
3273912bd1 Merge pull request #2968 from ritzalam/expire-redis-keys-after-14-days 
Expire redis keys after 14 days
 2016-01-22 14:29:25 -05:00
Richard Alam
5c882386cd Merge pull request #2972 from pedrobmarin/issue-2851 
Avoid scala warning messages
 2016-01-22 14:14:37 -05:00
Pedro Beschorner Marin
8890f46910 - avoid scala warning messages 2016-01-22 19:00:50 +00:00
Richard Alam
78cfccab18 Merge pull request #2971 from pedrobmarin/issue-2851 
Simple modification to avoid multiple start audio recording events
 2016-01-22 13:38:12 -05:00
Pedro Beschorner Marin
086e339653 Simple modification to avoid multiple start audio recording events 2016-01-22 16:43:17 +00:00
Tiago Daniel Jacobs
fc728bf1be Fixes #2768 2016-01-21 22:56:48 -02:00
Richard Alam
5c812984ad Merge pull request #2967 from ritzalam/improve-pdf2swf-conversion 
Improve pdf2swf conversion
 2016-01-21 15:59:10 -05:00
Richard Alam
f501fb5803 - expire redis recording keys after 14 days 2016-01-21 20:43:28 +00:00
Richard Alam
6956ddf723 - do not record events if the meeting is not recorded 2016-01-21 20:42:47 +00:00
Richard Alam
e7a46aa3cf - cleanup formatting 2016-01-21 17:31:25 +00:00
Richard Alam
0b898d0d29 - change how we process upload presentation. Before, an uploaded presentation consumes all of the 
presentation conversion threads. If the presentation takes a lot of time and cpu to convert,
   other uploaded presentations gets queued up and cannot be processed in parallel.
 2016-01-21 17:24:13 +00:00
Leonardo Crauss Daronco
af645999cb Webhooks: use events to keep track of audios and videos in a conference 
Added to the default list of events the events triggered when a user
joins/leaves the voice conference and when shares/unshares a webcam.
 2016-01-21 14:17:15 -02:00
Chad Pilkey
58292b198d Merge pull request #2964 from ritzalam/do-not-reconnect-when-user-kicked 
Do not reconnect when user kicked
 2016-01-20 11:55:49 -05:00
Richard Alam
726e9e1fb0 - change wording on logout window when a user gets kicked out of the meeting. 2016-01-20 15:21:55 +00:00
Felipe Cecagno
a0aff7b3fc Merge pull request #2951 from LucasMFreire/fix-video-windows 
Fixed unclosed video windows bug
 2016-01-19 16:38:56 -02:00
Felipe Cecagno
93620df0b8 implement the same protection we did for publish on view 2016-01-19 16:32:05 -02:00
Richard Alam
36cff83b6f - tell user that he has been ejected from the meeting. 2016-01-19 16:58:14 +00:00
Richard Alam
c66c180040 - make the flash client not attempt to reconnect when the user has been ejected from the meeting. 2016-01-19 16:16:12 +00:00
Fred Dixon
2b06f71031 Merge pull request #2963 from ffdixon/logout-message 
Updated text for logout message:
 2016-01-19 08:58:27 -05:00
Fred Dixon
066749e4ca Updated text for logout message: 2016-01-19 08:57:34 -05:00