Richard Alam
|
dd6d22ce94
|
Merge branch 'encode-decode-json' of https://github.com/antobinary/bigbluebutton into upgrade-to-scala-2.11
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/Util.java
|
2015-05-26 19:04:03 +00:00 |
|
Richard Alam
|
1f5bce2228
|
- implement layout messages
|
2015-05-26 18:49:53 +00:00 |
|
Richard Alam
|
9a28cbc516
|
- remote chat application (cleanup)
|
2015-05-26 16:58:52 +00:00 |
|
Richard Alam
|
3c14827c27
|
- initialize permissions messages
|
2015-05-26 16:51:04 +00:00 |
|
Anton Georgiev
|
0982e28449
|
accommodate for drawing text shapes
|
2015-05-26 11:58:37 -04:00 |
|
Anton Georgiev
|
1a7c0076a0
|
-whiteboard events red5->redis
|
2015-05-26 11:35:21 -04:00 |
|
Richard Alam
|
f4cbc0ef13
|
- finish users messages
|
2015-05-26 15:29:15 +00:00 |
|
Richard Alam
|
79d48df4cf
|
- implement user messages from red5 to bbb-apps
|
2015-05-26 15:20:10 +00:00 |
|
Richard Alam
|
c603702259
|
Merge branch 'encode-decode-json' of https://github.com/antobinary/bigbluebutton into upgrade-to-scala-2.11
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/GetChatHistory.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/GetChatHistory.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/GetChatHistoryRequestMessage.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
|
2015-05-25 22:14:49 +00:00 |
|
Richard Alam
|
6a8dc89793
|
- determine if message is published or subscribed message type
|
2015-05-25 21:54:46 +00:00 |
|
Richard Alam
|
ee3280af44
|
- organize messages
|
2015-05-25 21:38:11 +00:00 |
|
Richard Alam
|
3619fd4bd9
|
- cleanup
|
2015-05-25 20:38:37 +00:00 |
|
Anton Georgiev
|
33f189c965
|
Merge branch 'upgrade-to-scala-2.11' of https://github.com/ritzalam/bigbluebutton into encode-decode-json
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/Constants.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/Util.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/chat/red5/ChatClientMessageSender.scala
|
2015-05-25 16:32:53 -04:00 |
|
Anton Georgiev
|
bb415779cb
|
-chat reply to redis
|
2015-05-25 16:16:12 -04:00 |
|
Richard Alam
|
55449282b6
|
- split out the client message senders
|
2015-05-25 20:06:59 +00:00 |
|
Richard Alam
|
81cde8c9ff
|
- finish converting users messages
|
2015-05-25 19:36:49 +00:00 |
|
Richard Alam
|
22acfdada1
|
- fix listen only
|
2015-05-25 19:08:16 +00:00 |
|
Richard Alam
|
2570b704d5
|
- get users reply message
|
2015-05-25 18:52:25 +00:00 |
|
Richard Alam
|
d345517482
|
- convert recording messages
|
2015-05-25 17:37:28 +00:00 |
|
Richard Alam
|
163d2ec552
|
- convert meeting state and meeting muted messages
|
2015-05-25 16:14:48 +00:00 |
|
Richard Alam
|
8ad21545b8
|
- convert more voice messages
|
2015-05-25 15:04:13 +00:00 |
|
Richard Alam
|
d52795f66b
|
- add voice messages
|
2015-05-25 14:44:19 +00:00 |
|
Richard Alam
|
96a7bff10e
|
- convert webcam messages
|
2015-05-25 14:08:29 +00:00 |
|
Richard Alam
|
b100862087
|
- convert raise hand messages
|
2015-05-22 22:12:58 +00:00 |
|
Anton Georgiev
|
f1b5fdda73
|
package moved
|
2015-05-22 17:21:37 -04:00 |
|
Anton Georgiev
|
12b8ecf0ac
|
cleaning up
|
2015-05-22 16:45:10 -04:00 |
|
Richard Alam
|
6018ff2290
|
Merge branch 'encode-decode-json' of https://github.com/antobinary/bigbluebutton into upgrade-to-scala-2.11
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationMessageListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/Red5BBBInGw.java
bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
|
2015-05-22 20:41:34 +00:00 |
|
Richard Alam
|
b542cd6382
|
- convert more messages
|
2015-05-22 20:17:57 +00:00 |
|
Anton Georgiev
|
a79c5f4122
|
lock settings to redis
|
2015-05-22 16:12:01 -04:00 |
|
Richard Alam
|
00866892c4
|
- make joining work
|
2015-05-22 18:30:37 +00:00 |
|
Richard Alam
|
97262f721f
|
- restructure messages into package
|
2015-05-22 15:16:40 +00:00 |
|
Richard Alam
|
7ad9e64ec3
|
Merge branch 'encode-decode-json' of https://github.com/antobinary/bigbluebutton into upgrade-to-scala-2.11
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/Red5BBBInGw.java
|
2015-05-21 16:17:47 -07:00 |
|
Anton Georgiev
|
40a45bb09d
|
keep only red5BBBInGW
|
2015-05-21 18:51:31 -04:00 |
|
Anton Georgiev
|
bf60874703
|
more presentation messages to redis
|
2015-05-21 18:15:20 -04:00 |
|
Anton Georgiev
|
5aaa606076
|
goToSlide to redis
|
2015-05-21 17:21:18 -04:00 |
|
Anton Georgiev
|
cfe465c69a
|
use bbbIn and red5In depending on message
|
2015-05-21 16:42:49 -04:00 |
|
Anton Georgiev
|
d30c408ee2
|
presentation through redis part1
|
2015-05-21 13:38:09 -04:00 |
|
Richard Alam
|
9d437302f3
|
- process user left message
|
2015-05-20 16:04:20 -07:00 |
|
Richard Alam
|
aa92b572b3
|
- rename user leaving message
|
2015-05-20 14:11:11 -07:00 |
|
Richard Alam
|
734c5fa956
|
- send user left message through redis
|
2015-05-20 13:51:57 -07:00 |
|
Richard Alam
|
9f95ed0eaf
|
- create red5 redis pubsub message receiver
|
2015-05-20 13:02:02 -07:00 |
|
Richard Alam
|
077e30326e
|
Revert "Revert "Merge branch 'upgrade-to-scala-2.11' of https://github.com/antobinary/bigbluebutton into upgrade-to-scala-2.11""
This reverts commit 11a51995e7.
|
2015-05-20 10:45:24 -07:00 |
|
Richard Alam
|
11a51995e7
|
Revert "Merge branch 'upgrade-to-scala-2.11' of https://github.com/antobinary/bigbluebutton into upgrade-to-scala-2.11"
This reverts commit 117369dcda, reversing
changes made to 6d786f1422.
|
2015-05-20 10:23:06 -07:00 |
|
Richard Alam
|
117369dcda
|
Merge branch 'upgrade-to-scala-2.11' of https://github.com/antobinary/bigbluebutton into upgrade-to-scala-2.11
|
2015-05-20 09:58:59 -07:00 |
|
Richard Alam
|
6d786f1422
|
- process validate token through redis pubsub
|
2015-05-20 09:33:17 -07:00 |
|
Anton Georgiev
|
a0b30d3d4f
|
Merge branch 'upgrade-to-scala-2.11' of https://github.com/ritzalam/bigbluebutton into upgrade-to-scala-2.11
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/Red5BBBInGw.java
|
2015-05-20 11:29:03 -04:00 |
|
Anton Georgiev
|
c9bb7c33f1
|
send chat through redis
|
2015-05-20 11:26:08 -04:00 |
|
Richard Alam
|
3bca899649
|
- send validate token through redis
|
2015-05-20 07:20:15 -07:00 |
|
Richard Alam
|
0e45080d84
|
- wire redis pubsub
|
2015-05-19 10:21:19 -07:00 |
|
Richard Alam
|
4cfe3b5772
|
- add redis pubsub receiver
|
2015-05-15 21:53:37 +00:00 |
|
Richard Alam
|
d8994c0cd8
|
- add detour of red5 messages to BigBlueButtonActor to redis instead of direct method call
|
2015-05-15 21:04:58 +00:00 |
|
Richard Alam
|
23b6297e11
|
- rename package
|
2015-05-15 15:57:20 +00:00 |
|
Richard Alam
|
bf683be215
|
- restructure
|
2015-05-15 15:35:00 +00:00 |
|
Richard Alam
|
503b5dabee
|
- rename package
|
2015-05-15 15:27:48 +00:00 |
|
Richard Alam
|
09b7d5e14e
|
- cleanup
|
2015-05-15 14:27:17 +00:00 |
|
Richard Alam
|
371c7507cc
|
- clean up
|
2015-05-14 20:58:57 +00:00 |
|
Richard Alam
|
362f375180
|
- clean up
|
2015-05-14 20:23:16 +00:00 |
|
Richard Alam
|
8966138d1d
|
- clean up
|
2015-05-13 20:24:57 +00:00 |
|
Richard Alam
|
2999459efc
|
- try adding scheduler but it's not working
|
2015-05-13 20:24:29 +00:00 |
|
Richard Alam
|
3ab2fc6c3a
|
- make fs work
|
2015-05-12 17:47:13 +00:00 |
|
Richard Alam
|
f88f66af61
|
- start bbb
|
2015-05-12 16:45:19 +00:00 |
|
Richard Alam
|
82f2cfcfe4
|
- try to upgrade bbb-apps to using akka
|
2015-05-11 22:24:33 +00:00 |
|
Maxim Khlobystov
|
d03defeb33
|
(merging from Maxim) Implemented switching slides.
Conflicts:
bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-presentation.xml
labs/meteor-client/client/views/whiteboard/whiteboard.coffee
labs/meteor-client/client/views/whiteboard/whiteboard.html
labs/meteor-client/server/redispubsub.coffee
|
2015-05-06 19:55:29 +00:00 |
|
Mateus Dalepiane
|
0662a242aa
|
Merge branch 'bigbluebutton/master' into 090-new-videodock
Conflicts:
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/VideoHolder.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
|
2015-04-29 12:10:41 -03:00 |
|
Mateus Dalepiane
|
1d2f980f85
|
Reset line endings to original
|
2015-04-29 11:12:50 -03:00 |
|
Anton Georgiev
|
70d3c00e74
|
include permissions info in the reply for GetAllMeetingsRequest
|
2015-04-24 21:21:10 +00:00 |
|
Anton Georgiev
|
ff934cf472
|
Merge branch 'master' into listen-only-prototype
|
2015-04-22 14:05:05 +00:00 |
|
perroned
|
554ce1d06b
|
Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call
Conflicts:
bigbluebutton-html5/app/client/main.html
bigbluebutton-html5/app/client/stylesheets/style.less
bigbluebutton-html5/app/client/views/chat/chat_bar.html
|
2015-04-22 06:03:46 -07:00 |
|
Anton Georgiev
|
fa4cd71ff4
|
publishing to redis channel "meeting" instead of handling the event on channel "voice"
|
2015-04-16 19:06:04 +00:00 |
|
Richard Alam
|
933b9d04ef
|
- make a moderator presenter when the current presenter leaves (e.g. disconnected). This way, as long as
there is a moderator in the meeting, there will always be a presenter.
|
2015-04-14 14:40:24 +00:00 |
|
Anton Georgiev
|
fdbc62ccd1
|
Cherry pick Anton's server side listen only. Fix conflicts
|
2015-04-06 05:10:56 -07:00 |
|
Felipe Cecagno
|
71313059e0
|
Merge branch 'meeting-created-params' into meeting-created-params-master
|
2015-03-20 12:39:17 -03:00 |
|
Mateus Dalepiane
|
85497ea6c3
|
Adding information to the event "meeting_created_message"
The following information was added:
+ moderator_pass (Moderator password)
+ viewer_pass (Viewer password)
+ create_time (Create time)
+ create_date (Create date)
|
2015-03-20 12:32:43 -03:00 |
|
Tiago Daniel Jacobs
|
4fff479e03
|
Added lockOnJoinConfigurable property to lock config.
|
2015-03-12 20:52:38 +00:00 |
|
Fred Dixon
|
cf5ab25ca0
|
Revert "Revert "Bbb lock settings fix""
|
2015-03-04 16:47:35 -05:00 |
|
Chad Pilkey
|
34fdfb9f83
|
Revert "Bbb lock settings fix"
|
2015-03-04 11:49:13 -05:00 |
|
Tiago Daniel Jacobs
|
34e2e48be2
|
Merging
|
2015-03-03 06:52:56 +00:00 |
|
Tiago Daniel Jacobs
|
647c0a83bc
|
Code clean up and fixes to lock settings
|
2015-03-03 04:49:56 +00:00 |
|
Tiago Daniel Jacobs
|
95cf0167f2
|
Restored ability to lock/unlock individual users
|
2015-03-03 00:44:34 +00:00 |
|
Tiago Daniel Jacobs
|
bf62dd66a2
|
Fixed mute on start, added lock on join option
|
2015-03-02 18:06:09 +00:00 |
|
Richard Alam
|
e8c61c5356
|
- lower log level on some logs so we can filter
- add a detection when a meeting actor has hung resulting in users not being able to do anything
|
2015-02-26 16:02:21 +00:00 |
|
Anton Georgiev
|
b6bde6fb97
|
removing merging traces for smooth pull req
|
2015-02-19 21:06:01 +00:00 |
|
Anton Georgiev
|
6416469172
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
Conflicts:
bbb-api-demo/src/main/webapp/demoHTML5.jsp
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
|
2015-02-19 20:47:08 +00:00 |
|
Anton Georgiev
|
7911046a70
|
allowing " and \ chars in the chat strings from the HTML5 client
|
2015-02-19 19:29:26 +00:00 |
|
Richard Alam
|
1baf405a31
|
- remove storing of connection as we query the connection from Red5 directly
|
2015-02-18 01:31:32 +00:00 |
|
Anton Georgiev
|
cd0fe0bd58
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2015-02-17 23:47:23 +00:00 |
|
Richard Alam
|
55059a4c60
|
- remote CollectorActor as we don't use it. Found that sometimes it's sendBuffer gets too large and
not sure if the Actor died and isn't processing the messages.
|
2015-02-17 17:01:17 +00:00 |
|
Richard Alam
|
18403d03bc
|
- update red5 to bring in fix for connections not cleanedup properly which may be cause OOM Exception
|
2015-02-11 22:31:23 +00:00 |
|
Richard Alam
|
96e8fde865
|
- change format of logs to add timezone
|
2015-02-09 18:40:31 +00:00 |
|
Anton Georgiev
|
ee4db621fc
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into chat-quotes
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
|
2015-02-03 15:28:35 +00:00 |
|
Anton Georgiev
|
dced2a0902
|
allowing " and \ chars in the chat strings from the HTML5 client
|
2015-02-02 23:33:17 +00:00 |
|
Richard Alam
|
d2a2b4b5db
|
- use the new userid information to identify the red5 connection
|
2015-02-02 19:40:25 +00:00 |
|
Richard Alam
|
b91b7087c5
|
- treat authToken and userid differently. Before, userid and authtoken had the same values.
|
2015-02-02 19:38:18 +00:00 |
|
Richard Alam
|
fd061d82d1
|
- use the userid instead of having sessionid as the sessionid is just a duplicate info
|
2015-02-02 19:37:00 +00:00 |
|
Richard Alam
|
f17ae89b6f
|
- remove duplicate register user as we now only process the register user message from bbb-web not from the client
|
2015-02-02 19:35:50 +00:00 |
|
Richard Alam
|
98c9868bb3
|
- try to fix usr joining sequence
|
2015-01-31 09:39:43 -08:00 |
|
Richard Alam
|
a900eed3ce
|
- start modifying messages to use sessionid to identify user
|
2015-01-30 23:01:48 +00:00 |
|
Anton Georgiev
|
1f7b751ee6
|
user join was not triggering for html5 client users. using the token instead of userID to find the user
|
2015-01-30 22:12:31 +00:00 |
|
Felipe Cecagno
|
9a7bae79a8
|
Merge branch '090-new-videodock' into HEAD
Conflicts:
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
record-and-playback/deploy.sh
|
2015-01-28 20:33:28 -02:00 |
|
Richard Alam
|
332c252b92
|
- fix the presentation text file url
|
2015-01-28 21:52:17 +00:00 |
|