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
|
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
|
2c8b771056
|
- break voice messages into separate files
|
2017-06-21 17:54:37 -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
|
28b115d742
|
- break down messages
|
2017-06-20 19:15:38 -07:00 |
|
Richard Alam
|
63574cd8bd
|
- split messages
|
2017-06-20 18:57:10 -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
|
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
|
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
|
c6e7a17085
|
sendGetCurrentPollRespMsg with Option[PollVO]
|
2017-06-16 17:03:21 -04:00 |
|
Richard Alam
|
2ce9b95775
|
- some util scripts
|
2017-06-16 10:07:47 -07: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
|
f430c7dce3
|
- create classes for guest policy
|
2017-06-14 14:17:54 -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
|
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 |
|
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
|
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
|
aa99cb45eb
|
- use redis scala to record events to redis instead of jedis
|
2017-06-08 11:16:18 -07:00 |
|
Richard Alam
|
7db33c594b
|
- handle start/stop brocast cam on the client
|
2017-06-07 12:12:30 -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
|
84bfd93701
|
- handle register user message
|
2017-05-29 12:17:25 -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
|
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
|
d305b02a42
|
- rename messages
|
2017-05-19 12:52:52 -07:00 |
|
Richard Alam
|
330faf317d
|
- rename core message
|
2017-05-19 11:37:13 -07:00 |
|
Richard Alam
|
c4c629f699
|
- continue wiring bbb-apps actor system
|
2017-05-16 19:13:06 -07:00 |
|
Richard Alam
|
414a4e0fd9
|
- start wiring bbb-apps actor system
|
2017-05-16 14:58:49 -07:00 |
|
Richard Alam
|
a1071ce7ba
|
- try to wire spring for bbb-apps
|
2017-05-15 12:23:54 -07:00 |
|
Richard Alam
|
a5654804cc
|
- handle bbb-apps messages
|
2017-05-14 16:03:50 -07:00 |
|
Richard Alam
|
c0e4a4d681
|
- handle json message in akka apps
|
2017-05-12 15:33:46 -07:00 |
|
Chad Pilkey
|
a7366d611a
|
normalize annotation thickness to preserve size
|
2017-05-11 20:32:51 -04:00 |
|
Richard Alam
|
0d53d2bf93
|
- fix compile issues
|
2017-05-10 14:24:36 -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 |
|
Chad Pilkey
|
85d525172b
|
rewrote the text tool to be like other annotations and removed redundant processing
|
2017-05-03 18:06:26 -04: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 |
|
Chad Pilkey
|
c97aed4057
|
line smoothing, shape location zoom drift fix, shape drawing efficiency
|
2017-04-21 17:29:31 -04:00 |
|
Richard Alam
|
a9590976c2
|
- allow setting default guest policy for meeting
|
2017-04-18 19:45:32 +00:00 |
|
Richard Alam
|
b8de0c9231
|
- add authorized role to registered user
|
2017-04-17 21:23:17 +00:00 |
|
Richard Alam
|
262c7250c8
|
Merge branch 'master' with bbb-mconf
|
2017-04-17 15:57:31 +00:00 |
|
Richard Alam
|
a5bc64362d
|
- user internal userId instead of external userId in register user message
|
2017-04-12 16:50:54 +00:00 |
|
Richard Alam
|
6537e99981
|
Merge branch 'multiuser-whiteboard' of https://github.com/capilkey/bigbluebutton into merge-multi-user-whiteboard
|
2017-04-06 19:12:42 +00:00 |
|
Chad Pilkey
|
1a78091d01
|
multi-user whiteboard little bit of polish
|
2017-04-05 19:54:40 -04:00 |
|
Chad Pilkey
|
f7b9782ef3
|
multi-user whiteboard clear works
|
2017-04-04 16:43:15 -04:00 |
|
Pedro Beschorner Marin
|
f59e42bb02
|
Merge remote-tracking branch 'bigbluebutton/master' into merging-into-bbb-1.1
|
2017-04-04 20:42:15 +00:00 |
|
Chad Pilkey
|
cc2c461df3
|
first pass as multiuser whiteboard, can mutli draw
|
2017-03-29 20:12:15 -04:00 |
|
Pedro Beschorner Marin
|
c74cc682c4
|
Merge remote-tracking branch 'mconf/mconf'
|
2017-03-20 19:45:59 +00:00 |
|
Ghazi Triki
|
4c4d768883
|
Added new "webcamsOnlyForModerator" parameter for create meeting API.
|
2017-01-02 16:56:32 +01:00 |
|
Pedro Beschorner Marin
|
14b480c8ce
|
Working on avoiding reconnection when ending a meeting by API call
|
2016-12-09 20:33:03 +00:00 |
|
Ghazi Triki
|
59a0f4665d
|
Updated RequestBreakoutJoinURL to return two join urls, the first with redirection enable and the second without redirection.
|
2016-11-21 18:01:22 +01:00 |
|
Felipe Cecagno
|
8f4ca962cc
|
Merge branch 'undo-stack-size' of github.com:pedrobmarin/bigbluebutton into mconf
Conflicts:
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
|
2016-11-20 21:20:16 -02:00 |
|
Felipe Cecagno
|
faba97fdee
|
Merge branch 'inactivity-metadata' of github.com:pedrobmarin/bigbluebutton into mconf
Conflicts:
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
|
2016-11-20 00:41:28 -02:00 |
|
Pedro Beschorner Marin
|
1e014f9298
|
Included metadata reading at server. Setting meeting timeleft and deadline as meta_inactivity-timeleft and meta_inactivity-deadline on create params
|
2016-10-31 16:51:07 +00:00 |
|
Pedro Beschorner Marin
|
5416d01dcc
|
Syncing note if a problem is detected while patching
|
2016-10-26 17:25:49 +00:00 |
|
Pedro Beschorner Marin
|
67189dff4e
|
Sending sharednotes undo and redo status with current documents message as client starts
|
2016-10-24 15:42:45 +00:00 |
|
Richard Alam
|
1e8d7a5229
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into try-to-cleanup-connection
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
|
2016-10-21 19:36:07 +00:00 |
|
Pedro Beschorner Marin
|
ddd1459d4c
|
Refactored sharednotes UNDO operation and implemented REDO
|
2016-10-21 19:33:30 +00:00 |
|
Pedro Beschorner Marin
|
1eb1aea65e
|
More sofisticated control of sharednotes undo button
|
2016-10-20 19:56:57 +00:00 |
|
Pedro Beschorner Marin
|
758adb3b8e
|
First functional version of sharednotes undo operation
|
2016-10-20 17:52:37 +00:00 |
|
Richard Alam
|
5ba3405941
|
- remove defunct connection when client auto-reconnects.
|
2016-10-20 15:08:58 +00:00 |
|
Ghazi Triki
|
415e34fb28
|
Added new property redirectOnJoin to CreateBreakoutRoomsRequest.
|
2016-10-14 21:28:44 +01:00 |
|
Ghazi Triki
|
c694f632ea
|
Added redirect property to RequestBreakoutJoinURL.
|
2016-10-14 20:46:34 +01:00 |
|
Ghazi Triki
|
b078628ad9
|
Store breakout room externalMeetingID to be used for generating join URL.
|
2016-10-13 17:17:47 +01:00 |
|
Ghazi Triki
|
5e002d845e
|
Store breakout room sequence in akka-apps and bbb-web.
|
2016-10-13 12:53:53 +01:00 |
|
Ghazi Triki
|
ff9bc17c15
|
Send sequence number when creating breakout rooms and correctly generate a unique externalMeetingId for breakout rooms.
|
2016-10-12 19:55:20 +01:00 |
|
Ghazi Triki
|
c95d208da7
|
Added sequence property breakout room.
|
2016-10-11 22:13:22 +01:00 |
|
Ghazi Triki
|
f7be426305
|
Breakout rooms refactoring: generated uniques external ID and internal ID.
|
2016-10-11 20:50:51 +01:00 |
|
Ghazi Triki
|
0e72d7523d
|
Make breakout rooms use the selected slide of the current presentation as default presentation.
|
2016-09-28 22:19:48 +01:00 |
|
Chad Pilkey
|
1b72f8b077
|
add property to closed caption transcript model for the locale code
|
2016-08-30 17:10:03 -04:00 |
|
Richard Alam
|
65605ee3f9
|
Merge pull request #3296 from ritzalam/start-pause-stop-screen-sharing-with-webrtc
Stop JWS when flash client dies.
|
2016-08-19 11:23:56 -04:00 |
|
Richard Alam
|
b591106aaa
|
- try to detect if the flash client and the jws app are still alive. If one of them
if dead, end screen sharing.
|
2016-08-18 19:49:32 +00:00 |
|
Richard Alam
|
34d8e2fbb3
|
Merge pull request #3294 from riadvice/breakout-room-logout-fix
Fix for breakout room logout issue
|
2016-08-18 11:55:58 -04:00 |
|
Ghazi Triki
|
6b93bd3130
|
Block user from joining any breakout room until all of them are created.
|
2016-08-18 15:12:57 +01:00 |
|
Richard Alam
|
76e7e6d568
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into start-pause-stop-screen-sharing-with-webrtc
|
2016-08-17 18:44:49 +00:00 |
|
Richard Alam
|
6aab83589a
|
Merge branch 'screenshare-1.1' of https://github.com/antobinary/bigbluebutton into antobinary-screenshare-1.1
Conflicts:
bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/ScreenShareApplication.scala
bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/Screenshare.scala
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/MessageReceiver.as
|
2016-08-17 18:40:28 +00:00 |
|
Anton Georgiev
|
9fb1c343f2
|
server side changes for switching recordType:String to record:Boolean
|
2016-08-11 21:30:06 +00:00 |
|
Anton Georgiev
|
f7cb97737d
|
ask akka-apps if allowed to start screenshare
|
2016-08-11 19:18:56 +00:00 |
|