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

145 Commits

Author SHA1 Message Date
Anton Georgiev
0d9c2d1472 remove dependency on vh, vw. remove obsolete code. clean up 2016-01-26 18:53:26 +00:00
Ghazi Triki
4f30127003 Ending a breakout room message goes to to bbb-web to be handled then send the response back to the client trgouh akka-apps and bbb-apps. 2016-01-23 18:44:50 +01:00
Ghazi Triki
1dd4ddd6cb Created breakout rooms are now displayed in breakout rooms list. 2016-01-21 20:09:32 +01: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
Ghazi Triki
058a2170ee Added request breakout rooms list feature. 2016-01-15 22:13:53 +01:00
Anton Georgiev
39b7697a4d prevent flooding of akka-fsesls log 2016-01-13 22:54:03 +00:00
Anton Georgiev
b5fafe25ca Removing recording code used in the past for recording to file via FS. obsolete as we now record in red5 2016-01-08 21:58:10 +00:00
Anton Georgiev
23a83ab6e9 destoy deskshare on FS if presenter leaves 2016-01-08 19:07:57 +00:00
Richard Alam
838d6e0ad7 - merge Chad's closed caption work into Ghazi's breakout rooms work 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
 2016-01-08 19:06:42 +00:00
Anton Georgiev
88d969cd45 fix string in common message 2015-12-22 22:50:34 +00:00
Anton Georgiev
8ee6356b5a accommodate late joiners 2015-12-22 16:21:39 +00:00
Chad Pilkey
71f8ff085f first try and adding caption ownership 2015-12-09 14:00:26 -08:00
Chad Pilkey
3036a9740b caption module now tracks TextArea updates 2015-11-23 12:56:52 -08:00
Ghazi Triki
6e9b95e347 BreakoutRoomStarted event finally arrives to the client. 2015-11-20 19:06:11 -02:00
Richard Alam
39d9c5dd15 Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into breakout-rooms-porto-algre-2015 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/BreakoutRoomService.java
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
 2015-11-17 02:19:48 -05:00
Ghazi Triki
16d521c338 Implemented RTMP methods for ListenInOnBreakout and RequestBreakoutJoinURL actions. 2015-11-17 17:39:49 -02:00
Richard Alam
bd8b38a22c - use spray json to decode messages 2015-11-17 02:11:14 -05:00
Ghazi Triki
8b1f0d4bae Added EndAllBreakoutRoomsRequest broadcast from client to bigbluebutton-apps. 2015-11-12 22:24:10 +01:00
Ghazi Triki
f910e95a45 Added more implementations for Breakout Room messages: BreakoutRoomJoinURL, BreakoutRoomStarted, TimeRemainingUpdate and UpdateBreakoutUsers. 2015-11-11 16:47:49 +01:00
Ghazi Triki
0de3e3dd43 Added BreakoutRoomService with createBreakoutRooms method. 2015-11-05 21:44:24 +01:00
Chad Pilkey
2d9d28f638 added a new caption message to push current line 2015-11-03 15:44:26 -08:00
Richard Alam
ea2dbd541a - breakout room incoming message 2015-10-30 21:08:13 +00:00
Richard Alam
923d78719b - send messages to redis 2015-10-30 19:14:35 +00:00
Anton Georgiev
8e407df405 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-1 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bigbluebutton-apps/build.gradle
 2015-10-22 20:46:30 +00:00
Richard Alam
b899eeebcf - distinguish breakout rooms in create meeting request 2015-10-22 19:36:20 +00:00
Richard Alam
cecbc46d1d - create breakout room in bbb-web 2015-10-22 17:13:53 +00:00
Richard Alam
c47272fd2c - refactor how default presentation is downloaded 2015-10-21 20:51:58 +00:00
Richard Alam
9d04103225 - start implementing create breakout room 2015-10-21 15:47:49 +00: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
Chad Pilkey
ad3ba6677c first two initial caption module messages finished 2015-10-15 15:40:23 -07:00
Anton Georgiev
f08cd5262e temp changes 2015-10-13 19:00:50 +00:00
Chad Pilkey
993ac4df1a initial red5 caption message handlers and common messages 2015-09-29 13:15:13 -07:00
Richard Alam
2278ee01ec - upgrade bbb-commons-message version 2015-09-14 21:45:55 +00:00
Richard Alam
44763bf283 - try to fix lock settings 2015-09-14 20:18:27 +00:00
Chad Pilkey
51650fb998 made the init audio and permissions message payloads actually contain something and corrected chatpermission message names 2015-09-11 15:02:28 -07:00
Ghazi Triki
2fb8296ff0 - Fixed emojiStatus not set correctly in server. 
- Upgraded bbb-common-message version.
 2015-08-26 18:51:05 +01:00
Ghazi Triki
988d8cf56c Removed lower hand methods in server applications and replace raise hand by emoji status. 2015-08-25 09:46:00 +01:00
Anton Georgiev
eb57aa7da1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-share-merging 2015-08-24 14:31:00 +00:00
Anton Georgiev
1939dac06c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-share 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/RedisMessageReceiver.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingMessageHandler.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/recorders/WhiteboardEventRedisRecorder.scala
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/WhiteboardKeyUtil.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/DeskshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/PublishWindowManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/ViewerWindowManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/DeskshareService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
 2015-08-21 20:15:37 +00:00
Richard Alam
46ba98f737 - add ping/pong message between different components to verfiy that we have working path 2015-08-20 20:44:40 +00:00
Anton Georgiev
bcfbb7c33a Revert "attempt to accommodate late joiners for ds on flash" 
This reverts commit 8cf051a262.
 2015-08-20 18:06:53 +00:00
Anton Georgiev
8cf051a262 attempt to accommodate late joiners for ds on flash 2015-08-20 16:13:11 +00:00
Richard Alam
282fecf351 - ping/pong message between red5 and bbb-apps 2015-08-19 18:32:07 +00:00
Richard Alam
8be746b4ac - start implementing round-trip pubsub monitoring 2015-08-18 21:51:48 +00:00
Richard Alam
5472548118 - allow custom polling through chat message 2015-08-17 22:40:31 +00:00
Richard Alam
9302532be5 - start implementing custom poll 2015-08-13 22:33:51 +00:00
Richard Alam
4e4270912b - fix issue where deleting presentation doesn't remove the presentation from file upload window 2015-08-11 17:21:09 +00:00
Richard Alam
bc7aadcd22 - create new bbb-commons jar 2015-08-07 19:46:52 +00:00
Maxim Khlobystov
5c0cb9c3d8 Merge branch 'meteor-client-pdf-conversion' of https://github.com/gthacoder/bigbluebutton into development 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/redis/PresentationEventRedisRecorder.scala
 2015-08-06 16:21:31 -04:00
Richard Alam
822b319440 - add number of responders on poll result 2015-07-13 19:18:37 +00:00
Anton Georgiev
15a9e670b8 forward videoWidth, videoHeight to flash client(rtmp) 2015-07-08 16:05:04 +00:00
Richard Alam
a55711af2c - add whiteboardId into shape to be able to determine which page this poll result is related to 2015-07-07 21:36:35 +00:00
Richard Alam
3ed524a34c - upgrade bbb-commons-message version 2015-07-07 21:36:01 +00:00
Richard Alam
5060726035 - format poll result data correctly 2015-07-06 22:12:15 +00:00
Richard Alam
72659e62ac - try displaying poll result as whiteboard shape 2015-07-02 22:16:11 +00:00
Richard Alam
b3c9e2394b - fix webcam stream data into correct format (array) 2015-07-02 18:04:58 +00:00
Anton Georgiev
766fea281d send rtmp broadcast notification to viewers(flash has to handle) 2015-07-02 16:24:53 +00:00
Anton Georgiev
7192079977 send to BBB-Apps vh, vw, samplerate, fps, channels 2015-06-30 18:50:29 +00:00
Anton Georgiev
c926ee0858 set meetingModel flags when FS confirms 2015-06-29 21:13:01 +00:00
Anton Georgiev
0e362e9762 FS deskshare serverside cont'd 2015-06-23 19:45:36 +00:00
Richard Alam
b8128945f4 - add new polling messages 2015-06-22 21:13:11 +00:00
Richard Alam
8b84fd92b4 - implement redis messages for polling 2015-06-19 21:10:25 +00:00
Anton Georgiev
8b161e8217 record command; record messages 2015-06-19 20:38:54 +00:00
Anton Georgiev
bdb56d4884 FS video share/view messages from fs to bbb-apps 2015-06-18 22:07:15 +00:00
Anton Georgiev
a96524a31a move WhiteboardKeyUtil;remove VoiceKeyUtil 2015-06-17 18:24:21 +00:00
Richard Alam
468217200f - fix welcome message bug 
- fix private chat bug
 - start implementing polling
 2015-06-16 19:18:23 +00:00
Richard Alam
e6e7c796ff - add channel to bbb-fsesl 2015-06-10 18:56:10 +00:00
Richard Alam
bc214f3a32 - fix message name 2015-06-10 18:30:05 +00:00
Richard Alam
a585f12a54 - add presentation messages 2015-06-10 17:59:33 +00:00
Richard Alam
198d45489f - remove messages from bbb-apps red5 2015-06-10 17:11:36 +00:00
Richard Alam
17a39a674f - create a common message project 2015-06-10 15:53:07 +00:00
Richard Alam
b89d3b2857 - use bbb-common-message lib 2015-06-10 15:50:06 +00:00
Ghazi Triki
bb09eb6d75 After checking we bumped projects version and Flex locales to 0.9.0 with some fixes 2014-08-13 12:20:10 +01:00
Ghazi Triki
9a794f854a Bumped projects version and Flex locales to 0.9 2014-08-13 10:28:08 +01:00
Ghazi Triki
ac7af7dfea Manually bumped all application version to the correct actual version 0.9.0-dev 2014-07-31 17:42:38 +01:00
Richard Alam
272e46e38d - upgrade version of bbb-commons to 0.8 2011-01-12 09:50:36 -05:00
Richard Alam
f90a03fb8c - add license headers to bbb-common 2010-11-06 10:24:21 -04:00
Marco Calderon
6c84e2c561 Changes: bbb-apps from groovy to java, add recording module and updated events-recorder and bbb-commons 2010-08-02 10:33:36 +00:00
Richard Alam
ec256e7cb7 - upgrading versions from 0.64 to 0.7 2010-07-13 09:42:13 -04:00
Richard Alam
4703f6c5bf - Removing IDE specific files 2010-06-30 11:23:14 -04:00
BigBlueButton
e4fd72681a - adding .gitignore 2010-05-30 03:55:46 +00:00
Richard Alam
84807d1946 - test to see if cron job picks up changes and propagate to google code 2010-05-25 16:58:32 -04:00
Richard Alam
de073873dc - describe bbb-commons 2010-05-25 16:42:22 -04:00
Richard Alam
71442a086e - add README file to test svn sync 2010-05-25 16:18:38 -04:00
Richard Alam
d426fbb06a - add externUserID to participant 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4326 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-14 19:25:48 +00:00
Jeremy Thomerson
c737c7e7f8 add a script to each module that allows me to build / run in dev mode on my vm without having to remember which method I have to build this module in 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4272 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-07 21:53:52 +00:00
Richard Alam
cecbac5f98 - change repo dir to /home/firstuser/dev/repo 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4076 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-31 14:38:43 +00:00
Jeremy Thomerson
55589f9ca0 end meeting API call now kicks everyone from the conference 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3867 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-09 23:33:25 +00:00
Jeremy Thomerson
cef2d9fc2d complete getMeetingInfo API call 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3797 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-05 00:24:15 +00:00
Jeremy Thomerson
500604eb55 getMeetingInfo API call working 
now just need to add more information to it


git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3796 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 23:59:02 +00:00
Jeremy Thomerson
bdb9832e54 work on getMeetingInfo API call 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3795 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 22:41:46 +00:00
Jeremy Thomerson
827a65b647 move some common classes to bbb-common-message for spring integration changes 
This commit simply moves a few of the classes to bbb-common-message and makes all of the related build changes to support this change.
No functionality was changed (at least intentionally).

Next step is to change the current Spring Integration messages (conference started / stopped) to send the whole conference in the message and confirm that this is working as intended.  Then it's easy to add other API calls


git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3791 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 20:51:29 +00:00
Richard Alam
75da58ef1a - modify local repo to /opt/bigbluebutton/repo so it's more generic and match with Hudson 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3781 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 17:16:07 +00:00
Richard Alam
88e2c2febc git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3756 af16638f-c34d-0410-8cfa-b39d5352b314 2010-02-25 20:05:10 +00:00