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

473 Commits

Author SHA1 Message Date
Felipe Cecagno
3070127a8e Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into record-button 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
 2014-01-15 17:53:10 -02:00
Tiago Daniel Jacobs
8c912df459 Implemented lock settings in bbb-client and bbb-apps. 2014-01-09 03:52:03 -02:00
Felipe Cecagno
bce20f4112 fixed the issue commented on the previous commit, about losing the recording flag when the last participant leaves the room 2013-09-25 01:27:32 -03:00
Felipe Cecagno
33d98bbff2 implemented the record button both client-side and server-side; still needs more work on the processing scripts; still needs to update the record button icons 2013-09-23 18:33:30 -03:00
Richard Alam
c4abeb827f - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1558 2013-06-18 10:47:30 -04:00
Richard Alam
95dd42fb12 - modify ESL connect startup so that it will continue to try to register with ESL 2013-05-19 20:46:20 +00:00
Richard Alam
b378cab70a - simplify handling and sending of events 2013-05-19 04:39:41 +00:00
Richard Alam
b953886ac6 - subscribe to events 2013-05-19 03:54:31 +00:00
Richard Alam
6d8971eda8 - monitor connection every second and connect if not connected 2013-05-19 02:11:30 +00:00
Richard Alam
b37261733e - change esl connection 2013-05-19 01:42:45 +00:00
Richard Alam
870b2b97d9 - force hangup of user when he leaves the meeting. When users call in through the phone, they don't get ejected 
from the meeting when they logout.
 2013-05-29 20:37:09 +00:00
Richard Alam
2800c4f603 - upgrade to red5 r4643 2013-05-18 21:39:53 +00:00
Richard Alam
42afda8f5c - upgrade to red5 r4641 2013-05-14 18:47:23 +00:00
Richard Alam
67185ee9e5 - upgrade to red5 r4639 2013-05-08 19:16:43 +00:00
Richard Alam
0b902805b0 - seems like it's picking the wrong jar 2013-04-30 15:43:56 +00:00
Richard Alam
75fb9c9a09 - upgrade to red5 r4635 to get fix for RTMPT kepp alive 2013-04-30 15:11:28 +00:00
Richard Alam
607d09e7cb - upgrading to latest red5 with fix to rtmpt 2013-04-28 23:38:54 +00:00
Richard Alam
91176431ca - upgrade to red5 r4360 2013-04-28 20:11:19 +00:00
Richard Alam
dfa65a5d91 - upgrade to red5 r4628 2013-04-27 23:07:28 +00:00
Richard Alam
c06334f24d - upgrade to red5 r4627 2013-04-26 20:59:33 +00:00
Richard Alam
5d3bb5fb70 - remove extra parameters when connecting to bbb-apps 2013-03-22 14:48:20 +00:00
Richard Alam
aebc524125 - Fix NPE when removing voice conference when all users have left 2013-03-22 14:16:31 +00:00
Richard Alam
2074ef0d5e - need to clean up scopes properly and try to minimize dependency on scope lifecycle 2013-03-21 20:00:58 +00:00
Richard Alam
c6ac009b86 Merge branch 'master' into upgrade-to-red5-r4597 2013-03-19 18:28:38 +00:00
Richard Alam
0cb6721147 - upgrade to red5 r4599 2013-03-19 18:27:22 +00:00
Richard Alam
d28a7ecf02 - upgrade to red5 r4597 2013-03-18 18:05:35 +00:00
Markos Calderon
9babc757fc fix close cam if it's not available 2013-03-18 12:58:09 -05:00
Richard Alam
02296cf267 - upgrade to red5 r4592 2013-03-11 15:00:48 +00:00
Richard Alam
ece4ef7f1f - BBB now starts properly on red5 r4582. Need a bit more testing though. 2013-03-08 22:49:11 +00:00
Richard Alam
412f44690b - try making sure that the different components execute the lifecycle properly 2013-03-08 22:21:31 +00:00
Richard Alam
7c4326a22e - make bbb start on red5 r4582 2013-03-08 20:39:37 +00:00
Richard Alam
e6da7afcdd - upgrade to red5 r4582 2013-03-07 19:48:03 +00:00
Richard Alam
63a3420b76 Merge branch 'master' into upgrade-to-red5-r4580 2013-03-07 18:42:25 +00:00
Richard Alam
556131dce5 - eject all users from voice conference when meeting ends 2013-03-07 15:19:16 +00:00
Richard Alam
310c283dd1 - initialize shared objects not on roomstart but on room connect 2013-03-06 15:59:40 +00:00
Richard Alam
3c53ceecec - upgrade to red5 r4581 2013-03-06 15:58:56 +00:00
Richard Alam
601afeaae3 - upgrade red5 to r4580 2013-03-04 18:12:07 +00:00
Richard Alam
eadd1e3ef0 - upgrade builds to red5 r4578 2013-03-03 12:34:25 +00:00
Richard Alam
29864cc734 - create and executor to send messages 2013-02-28 19:08:38 +00:00
Richard Alam
99443dc3cb - removing clientID as we don't use the Red5 connect id anymore 2013-02-28 18:27:41 +00:00
Richard Alam
19d2472fd0 - move logback config into resources dir so we don't need to copy it as last step in gradle war 2013-02-28 01:03:31 +00:00
Richard Alam
e3cbd49bae - minor cleanup 2013-02-28 00:27:10 +00:00
Richard Alam
ed64da0f9b - build bbb-apps on red5 r4573 2013-02-27 23:35:16 +00:00
Richard Alam
cc859b94f8 Merge branch 'master' into upgrade-to-red5-r4573 2013-02-26 14:48:01 +00:00
Richard Alam
5f0b2a7ea7 - change logging history from 30 days to 5 days...don't need that much history 2013-02-26 14:08:12 +00:00
Richard Alam
4838840aa5 - upgrading red5 jar 2013-02-25 20:41:50 +00:00
Richard Alam
93311e6464 Merge branch 'master' into merge-master-into-polling-module 
Conflicts:
	bigbluebutton-client/build.xml
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/src/BigBlueButton.mxml
 2013-02-04 19:34:23 +00:00
Richard Alam
8e2e2c83ca Revert "Modified API to be able to map conferences by their name instead of their voiceBridge number. To preserve backwards compatibility is sufficient to pass the voiceBridge number as the conference name in the API call." 
This reverts commit a7156aa0a6.

Command used: git revert a7156aa0a6

Conflicts:

	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
 2013-02-01 17:53:08 +00:00
Richard Alam
77d8df50da - try to figure out why listener doesn't get displayed 2013-02-01 16:35:23 +00:00
Richard Alam
ea8488af38 Merge branch 'master' into external_freeswitch 2013-01-31 22:10:56 +00:00