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

511 Commits

Author SHA1 Message Date
Chad Pilkey
76026da06c moved caption messages to 2.0 format 2017-06-26 15:00:32 -04:00
Richard Alam
9dc41437e8 - handle user left 2017-06-26 10:34:22 -07:00
Richard Alam
dfa1557116 - display default presentation 2017-06-26 07:24:38 -07:00
Richard Alam
f7376e11c0 - get presentation info 2017-06-25 16:11:29 -07:00
Richard Alam
2931b719c6 - get presentation info 2017-06-25 13:26:37 -07:00
Richard Alam
9317cdfcc0 Merge branch 'capilkey-move-presentation-messages-2x' into merge-presentation 2017-06-25 11:25:23 -07:00
Richard Alam
34cab65b2e Merge branch 'move-presentation-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-presentation-messages-2x 2017-06-24 15:46:22 -07:00
Richard Alam
dd175bee89 - mute user 2017-06-24 14:56:06 -07:00
Richard Alam
ae4fc536b1 - fix use leaving voice conf 2017-06-24 06:47:19 -07:00
Richard Alam
77da487c60 - handle user muted and talking messages 2017-06-23 18:14:55 -07:00
Richard Alam
002a447273 - user talking message 2017-06-23 15:18:30 -07:00
Richard Alam
ceb4d74e55 - handle user join and left voice conference 2017-06-23 14:34:05 -07:00
Anton Georgiev
9a0a4d5669 work on displaying poll result annotation in flash client 2017-06-23 17:26:53 -04:00
Richard Alam
7ffd1a80bd - assign presenter when no presenter present 2017-06-23 11:12:17 -07:00
Chad Pilkey
1c226fd3af 2.0 presentation message work, presentation conversion msgs in bbb-web missing 2017-06-23 13:27:56 -04:00
Richard Alam
c4616f1ce0 - load modules after validate token 2017-06-22 14:42:10 -07:00
Richard Alam
c41b9b9a7a - display users list 2017-06-21 13:32:37 -07:00
Richard Alam
281108b1ab - send waitForApproval for guest on validate token 2017-06-21 10:49:08 -07:00
Richard Alam
30bafd7983 - try using new user data instead of BBBUser 2017-06-21 09:41:59 -07:00
Richard Alam
582cdf07ec - fix compile issue due to breaking of messages 2017-06-21 08:05:49 -07:00
Richard Alam
71d8b26ec1 - fake user generator so we can populate meeting with fake users for development 2017-06-20 13:44:26 -07:00
Ghazi Triki
46556a8405 Add Layout server messages for V2. 2017-06-20 17:14:46 +01:00
Richard Alam
bd46c386fc Merge branch 'bbb-2x-mconf' into refactor-client 2017-06-19 13:28:51 -07:00
Richard Alam
d0343b40d2 - delay processing of pre-uploaded presentation to make sure that meeting has been created before 
presentation conversion has completed.
 2017-06-19 13:04:07 -07:00
Richard Alam
bb8944570b - fix validate auth token race condition where the validate auto token is sent to the meeting before 
the meeting has been created
 2017-06-19 12:34:53 -07:00
Richard Alam
6021bb93c9 - send users, voice users, webcams on validate auth token 2017-06-19 11:21:51 -07:00
Ghazi Triki
5fc84b50f0 Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into breakout-rooms-2x-messages 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/UserJoinMeetingReqMsgHdlr.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala
#	bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/MessageBody.scala
#	bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
 2017-06-19 17:46:46 +01:00
Ghazi Triki
c7c39989a3 Added all breakout rooms events handlers in akka-bbb-apps project. 2017-06-19 16:57:36 +01:00
Richard Alam
e80a3de440 - put message into it's own sender 2017-06-17 19:28:43 -07:00
Richard Alam
e7ffcbfbe7 - merging latest bbb-2x-mconf 2017-06-16 18:12:29 -07:00
Richard Alam
5c76f413bb Merge branch '2.0-Polls' of https://github.com/antobinary/bigbluebutton into antobinary-2.0-Polls 2017-06-16 17:38:06 -07:00
Richard Alam
dc1c1e8b9e Merge branch 'move-whiteboard-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-whiteboard-messages-2x 2017-06-16 17:18:50 -07:00
Chad Pilkey
f3ab70f060 convert whiteboard messages to the 2.0 method and remove old 2017-06-16 18:09:25 -04:00
Anton Georgiev
522227da51 startPoll does not need to return anything. Avoid .get 2017-06-16 17:19:09 -04:00
Anton Georgiev
b3c323bdc7 cleanup 2017-06-16 17:05:12 -04:00
Anton Georgiev
c6e7a17085 sendGetCurrentPollRespMsg with Option[PollVO] 2017-06-16 17:03:21 -04:00
Anton Georgiev
b61fe6faaf send events straight to meeting eventBus 2017-06-16 14:54:38 -04:00
Anton Georgiev
77b78a1ae7 Polls 2.0 - the rest of the messages 2017-06-16 12:01:14 -04:00
Anton Georgiev
882b4215d4 added Polls model, StartPollReqMsg and StartPollRespMsg 2017-06-16 11:51:07 -04:00
Richard Alam
5c84354715 - try to consolidate meeting state in one place 2017-06-15 19:09:32 -07:00
Richard Alam
596800e8d9 - breakdown handlers 2017-06-14 13:49:28 -07:00
Ghazi Triki
1e3f91bb6e Improve code and replace deprecated parts. 2017-06-14 15:11:38 +01:00
Richard Alam
326ba5e481 - put message into it's own hdlr 2017-06-13 19:26:04 -07:00
Richard Alam
b677b4490f - partially convert some messages 2017-06-13 14:42:02 -07:00
Ghazi Triki
ed939d74a7 Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into breakout-rooms-2x-messages 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgDeserializer.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/LiveMeeting.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala
#	bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala
 2017-06-13 17:58:46 +01:00
Richard Alam
0c189059ff - see if we can simplify routing of deserialized message 
- user TypeTag instead of Manifest
 2017-06-12 18:15:17 -07:00
Richard Alam
55209b0685 - simplify deserializing of messages 2017-06-12 14:12:28 -07:00
Ghazi Triki
0478a3f658 First pass moving breakout rooms messages to v2 format. 2017-06-12 20:32:10 +01:00
Richard Alam
c0cc7138b3 - add new user joined voice event message 2017-06-12 11:39:53 -07:00
Richard Alam
de0001bb74 - webcam streams model 2017-06-11 18:07:19 -07:00
Richard Alam
35b449b199 - create new status models 2017-06-10 11:11:22 -07:00
Richard Alam
4727eb8e8e - send messages from fs to akka apps 2017-06-09 11:04:17 -07:00
Richard Alam
1ccf71cad7 - add new voice conf messages 2017-06-08 17:55:27 -07:00
Richard Alam
9b9b93c779 - record new messages 2017-06-08 13:11:46 -07:00
Richard Alam
b3e5bd1c37 - remove jedis dependecy 2017-06-08 11:29:44 -07:00
Richard Alam
aa99cb45eb - use redis scala to record events to redis instead of jedis 2017-06-08 11:16:18 -07:00
Richard Alam
b6f1b6447d - start refactoring recording service 2017-06-07 14:48:33 -07:00
Richard Alam
7e14c133b3 - send start/stop broadcasting webcam from client to server 
- send webcam broadcast started/stopped event from server to client
 2017-06-07 11:08:46 -07:00
Richard Alam
5ef4dd9e88 - change how we deserialize message so we can log errors 
- add helper methods to add routing info for messages
 - add a way to deserialize message from client
 2017-06-06 14:25:40 -07:00
Richard Alam
7f9809459c - try to simpify deserializer 2017-05-31 11:50:59 -07:00
Richard Alam
2999e71530 - remove meeting model 2017-05-29 18:59:00 -07:00
Richard Alam
47b0ada045 - track meeting status 2017-05-29 14:41:37 -07:00
Richard Alam
84bfd93701 - handle register user message 2017-05-29 12:17:25 -07:00
Richard Alam
bd83dc012e - fix test 2017-05-28 18:12:52 -07:00
Richard Alam
240176ca32 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into move-java-classes-from-bbb-web-to-bbb-common-web 2017-05-27 18:30:50 -07:00
Richard Alam
272df3c23d - send message to client 2017-05-26 20:00:33 -07:00
Richard Alam
73ec6bb25d - implement validate auth token 2017-05-26 10:04:38 -07:00
Chad Pilkey
09ec1e6151 first pass at multi whiteboard cursors 2017-05-25 23:45:27 -04:00
Richard Alam
18cce3a818 - send and handle meeting created event 2017-05-25 14:34:46 -07:00
Richard Alam
72f7272eb7 - handle create meeting request message 2017-05-25 13:02:26 -07:00
Richard Alam
e56a758c5f - send create message from bbb-web 2017-05-24 15:19:03 -07:00
Richard Alam
467598ffd2 - turn off keep alive message 2017-05-23 17:36:05 -07:00
Richard Alam
d30b5c4aac - start up the client 2017-05-19 20:00:20 -07:00
Richard Alam
aeb4445453 - finish wiring up actor system for bbb-apps 2017-05-17 08:20:01 -07:00
Richard Alam
f610e4e2ce Merge branch 'move-java-classes-from-bbb-web-to-bbb-common-web' of github.com:ritzalam/bigbluebutton into move-java-classes-from-bbb-web-to-bbb-common-web 2017-05-12 15:34:54 -07:00
Richard Alam
c0e4a4d681 - handle json message in akka apps 2017-05-12 15:33:46 -07:00
Richard Alam
a077748c57 - start setup akka system for bbb-apps 2017-05-12 13:11:28 -07:00
Richard Alam
76a6d99ca3 - move java classes from bbb-web into bbb-common-web 2017-05-10 13:22:50 -07:00
Richard Alam
0c200871da - add Jackson Json dependencies 2017-05-09 14:19:22 -07:00
Richard Alam
422ee08ea1 - setup tests 2017-05-09 11:47:44 -07:00
Richard Alam
2aa12e9301 - comment out println 2017-05-08 12:57:32 -07:00
Richard Alam
ddf5eb9caa - upgrade dependencies versions 2017-05-08 12:43:19 -07:00
Richard Alam
a97dd6ec58 Merge pull request #16 from pedrobmarin/life-cycle-management 
Moving the meeting life cycle management from bbb-web to akka-apps
 2017-05-04 10:22:06 -04:00
Richard Alam
b1740ebec5 Merge pull request #17 from capilkey/multi-user-2.0-take3 
Updates to make the text tool work
 2017-05-04 10:21:39 -04:00
Chad Pilkey
85d525172b rewrote the text tool to be like other annotations and removed redundant processing 2017-05-03 18:06:26 -04:00
Pedro Beschorner Marin
66a12c9c7a Moving the meeting life cycle management from bbb-web to akka-apps 2017-05-03 17:02:16 +00:00
Richard Alam
401d0f8b78 - minor restructure 2017-04-28 14:21:37 -07:00
Richard Alam
cce0fdd0be - add chat models 2017-04-28 14:20:46 -07:00
Richard Alam
9a2c017375 - modify some handlers 2017-04-27 08:37:37 -07:00
Richard Alam
0262ee97fc - access registered users through RegisteredUsers object 2017-04-26 10:47:41 -07:00
Richard Alam
859e161729 - manipulate users through Users object 2017-04-26 10:31:29 -07:00
Richard Alam
488b038731 - hardcode test results 2017-04-25 13:34:30 -07:00
Richard Alam
c94fe7a9c6 - switch from java map to scala immutable map 2017-04-25 13:21:08 -07:00
Richard Alam
c5edabd33d - use lenses when changing case class values 2017-04-25 13:20:41 -07:00
Richard Alam
2fd18e7c09 Merge branch 'multi-user-2.0' of https://github.com/capilkey/bigbluebutton into bbb-2.x-dev-mconf 2017-04-25 11:21:34 -07:00
Richard Alam
e61220e933 Merge branch 'bbb-2.x-dev' of github.com:ritzalam/bigbluebutton into bbb-2.x-dev-mconf 2017-04-25 11:06:31 -07:00
Richard Alam
d4950a769d - fix assign presenter 2017-04-21 15:39:43 -07:00
Richard Alam
77c4b6fae8 - checng how polling module handle messages 2017-04-21 14:51:32 -07:00
Chad Pilkey
c97aed4057 line smoothing, shape location zoom drift fix, shape drawing efficiency 2017-04-21 17:29:31 -04:00
Richard Alam
d7f7ccbee9 - remove inGW from live meeting 2017-04-21 09:01:28 -07:00