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

1232 Commits

Author SHA1 Message Date
Richard Alam
a4af68377a - finish presentation messages 2015-06-02 17:52:18 +00:00
Richard Alam
00988e2da6 - remove apps from red5 2015-05-28 17:58:35 +00:00
Richard Alam
1f02d3ba06 - move messages into it's own package 2015-05-28 15:39:33 +00:00
Richard Alam
e05a7e4fcf - voice messages 2015-05-27 22:01:47 +00:00
Richard Alam
9d020b0e7d - start converting voice messages 2015-05-27 21:06:44 +00:00
Richard Alam
c083c14135 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/red5/client/PresentationClientMessageSender.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/Util.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
 2015-05-27 15:31:25 +00:00
Anton Georgiev
18c828cb41 -whiteboard redis->red5 2015-05-27 10:41:20 -04:00
Richard Alam
b922fd3437 - start implementing presentation messages 2015-05-26 22:12:45 +00:00
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
Felipe Cecagno
a4d5c2a67b fix the problem where the user shares two cameras, then unshare one of them, and a new user receives hasStream=false for that particular user 2015-01-28 19:18:38 -02:00
Richard Alam
5798f727c5 - add sessionId in user info so we know if user is connected using Red5 or NodeJS 2015-01-23 20:00:13 +00:00
Richard Alam
192a2ccd0d - remove unused code 2015-01-23 19:54:15 +00:00
Richard Alam
0d44571674 - update to latest red5 with local connection ishared object fix 2015-01-13 18:08:03 +00:00
Anton Georgiev
a6d2ecc8a4 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
 2015-01-09 16:32:10 +00:00
Richard Alam
53630e758c Merge branch 'master' into format-logging-when-user-joins-global-audio 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
 2015-01-08 21:19:19 +00:00
Richard Alam
fca1798868 - increase the number of log history 2015-01-08 20:21:47 +00:00
Richard Alam
e1c4edae45 - add more logging to help debug where demo meeting disappears on test-install 2015-01-07 13:39:56 -08:00
Richard Alam
ca9931e2dc - fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1850 2015-01-05 19:59:46 +00:00
Richard Alam
7936ee3e7c - upgrade to red5 1.0.4 release 2014-12-29 10:37:35 -08:00
Richard Alam
8d80e1d527 - try one more time...please make it align! :) 2014-12-16 18:59:44 +00:00
Richard Alam
74f07d4e3a - try to fix indents 2014-12-16 18:54:51 +00:00
Richard Alam
d65fd73e68 - format the log when user joins/leaves global audio 2014-12-16 18:44:59 +00:00
Anton Georgiev
7e3c2f6eb0 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into meteor-ui-less 2014-12-15 20:11:49 +00:00
Richard Alam
ce07751d79 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1837 2014-11-28 14:24:28 -08:00
Anton Georgiev
4172537f24 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into meteor-merge-with-m 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-app.xml
 2014-11-28 20:33:11 +00:00
Chad Pilkey
acde1ef3ed Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into remove-chat-translation 2014-11-26 09:14:18 -08:00
Chad Pilkey
5cbb059aa6 removed all of the old google translate code in apps and client 2014-11-25 15:17:06 -08:00
Leonardo Crauss Daronco
2c63aa6796 Merge remote-tracking branch 'upstream/master' into webhooks 2014-11-24 13:55:55 -02:00
Richard Alam
9f63905a7b Merge pull request #439 from bigbluebutton/cleanup-logging 
- remote logging noise
 2014-11-21 16:44:15 -05:00
Richard Alam
b9b9328151 - remote logging noise 2014-11-20 22:33:25 +00:00
Richard Alam
1d234e13be - for some reason we either (a) get duplicate events for user join from FS or (b) FS-ESL isn't handling 
the event properly. This results in duplicate entries on the user's list when user calls in from the
   phone. Check if a voice user with the same id is already in the voice conference and ignore the second
   event.
 2014-11-20 18:53:09 +00:00
Lucas Zawacki
7d401dab53 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-with-tests 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
 2014-11-14 15:33:17 -02:00
Leonardo Crauss Daronco
81f5a109b6 Merge remote-tracking branch 'upstream/master' into webhooks-2.0 2014-11-14 14:28:35 -02:00
Felipe Cecagno
8a89cd1a71 sending the externalMeetingId from bbb-web to bbb-apps, so bbb-apps can use it on redis pubsub message meeting_created_message 2014-11-11 17:54:17 -02:00
Richard Alam
000ddbd9d7 - add more logging about the connection to red5 2014-11-07 22:09:49 +00:00
Richard Alam
8ba0f1855e - add more loggig 2014-10-29 21:54:33 +00:00
Richard Alam
06d47f6cb6 - extracted the wrong boolean from the message which broke recording 2014-10-29 21:53:23 +00:00
Richard Alam
4ba6b5ef0d - allow start/stop recording when doing autostarting recording 2014-10-21 21:11:46 -07:00
Richard Alam
5af452c39f - start implementing auto start recording 2014-10-20 03:39:44 -07:00
Richard Alam
9c0280c129 - fix txt uri for accessibility 2014-10-20 01:18:13 -07:00
Anton Georgiev
47e3b4eded send a user_left_voice_request when the html5 user clicks on Leave Audio. Right now we just leave it to webrtc to notify the server 2014-09-23 15:22:55 +00:00
Anton Georgiev
bb43a38bed send voiceBridge and duration in get_all_meetings_reply. We need the voiceBridge to join audio 2014-09-19 17:55:59 +00:00
Richard Alam
e313379355 - changed the wrong field to be zero based. Should be the slide field instead of num. 2014-09-15 08:29:15 -07:00
Mateus Dalepiane
f5cb6f4725 Improved multicamera support 
An array is used to store the stream names, instead of using a single string to
store them all.
 2014-09-03 16:28:33 -03:00
Anton Georgiev
4f25f2ced1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merging-html5-with-master 2014-09-02 21:08:03 +00:00
Richard Alam
4bf941b108 - although the page number is not used in whiteboard recording processing, just match the page number with the goto slide event in events.xml 2014-09-02 13:17:28 -07:00
Richard Alam
d5d541a2c5 - subtract 1 from GotoSlideEvent and ResizeAndMoveSlideEvent to events.xml so that the recording is backwards compatible with 0.81 and earlier 2014-09-02 12:44:52 -07:00
Richard Alam
a1ded8fdb5 - add current time on header of JSON messages so we can display the correct time instead of calculating from the timestamp 2014-09-02 11:43:05 -07:00
Anton Georgiev
cf125781db Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merging-html5-with-master 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceService.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala
 2014-09-02 17:54:14 +00:00
Richard Alam
172738534c - fix issue where rectangle shape gets lost when zooming 2014-08-29 08:57:34 -07:00
Richard Alam
84a16cdfe4 - add meeting name and duration on meetingCreated message 2014-08-29 08:56:36 -07:00
Richard Alam
7914c656a4 - missed one are where we are not propagating message from Meeting Actor 2014-08-27 16:46:28 -07:00
Richard Alam
fe5aabd38a - remove meeting from FS list of meetings when meeting is destroyed 2014-08-27 16:03:27 -07:00
Richard Alam
e4bd6b044c - add more logging 2014-08-27 15:29:16 -07:00
Richard Alam
d941b48bb6 - add log when handling user joining voice conference 2014-08-27 14:50:50 -07:00
Richard Alam
d3a4e271ce - add log on FS client when user joins voice conference 2014-08-27 14:30:55 -07:00
Richard Alam
1d26b39ed5 - turn off talking when user is muted or joined listen-only 2014-08-26 13:43:50 -07:00
Richard Alam
6430b73856 - fix displaying of speaker icon when joined in listen only mode 2014-08-26 11:58:26 -07:00
Richard Alam
c2a5c16f4d - there are still some edge cases we can't account for 2014-08-26 10:50:40 -07:00
Richard Alam
29ffe4aca8 - use external user id on join voice only 2014-08-26 10:24:40 -07:00
Richard Alam
9de33f2500 - use external userid on join of voice conf only 2014-08-26 10:24:07 -07:00
Richard Alam
27feed283f - revert change as it's triggering side effects on displaying speaker icons 2014-08-26 09:50:40 -07:00
Richard Alam
fbb20831a1 - fix issue where a user is duplicated when calling in because the 3rd-party app passed an external userid 2014-08-26 09:21:42 -07:00
Richard Alam
95ffcafa85 - add more logging to figure out why were get duplicate entries on user's window 2014-08-26 07:38:07 -07:00
Richard Alam
beb22f55e5 - add more logging to figure out why callers using phone displays multiple times in users window 2014-08-25 10:44:07 -07:00
Richard Alam
260d41d297 - generate goto slide event when sharing a presentation 2014-08-25 08:14:19 -07:00
Richard Alam
edd070ef48 - implement eject user from meeting 2014-08-23 12:00:41 -07:00
Richard Alam
97affb9874 - prevent multiple start/stop audio recording events 2014-08-22 12:47:15 -07:00
Anton Georgiev
22eaddc648 missed this during the merge from bigbluebutton:master 2014-08-21 18:48:58 +00:00
Anton Georgiev
adf20cca7d Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merging-html5-with-master 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala
 2014-08-20 15:24:25 +00:00
Richard Alam
e24e619625 - when user joins voice, see if the meeting is muted and mute user if it is 2014-08-18 12:58:43 -07:00
Richard Alam
b77811d7a6 - mute late user if meeting is muted 2014-08-18 12:23:59 -07:00
Richard Alam
236fd68db1 - send meeting status to client when user joins 2014-08-18 11:19:48 -07:00
Anton Georgiev
f506c964a8 userRaiseHand and userLowerHand is functioning 2014-08-18 15:01:16 +00:00
Richard Alam
485127c7c2 - send meeting muted state to client 2014-08-16 05:13:47 -07:00
Richard Alam
72e7f20def Merge branch 'merge-polling-with-master' into upgrade-to-red5-1.0.3-release 2014-08-15 00:56:46 -07:00
adam-sharpe
8563812446 fixed removing presentation 2014-08-15 12:47:15 -07:00
Chad Pilkey
4fbd70e765 applied a fix to global audio so that leaving notifies clients correctly 2014-08-15 09:24:54 -07:00
Richard Alam
0a718c3f38 - upgrade to latest red5 release 2014-08-14 07:19:59 -07:00
Richard Alam
f97dd3f018 - log whether user is using rtmp/rtmpt connection 2014-08-13 13:22:47 -07:00
Richard Alam
e9b5e5552d - update applet 
- add logging of session id when user disconnects from Red5
 2014-08-13 12:57:37 -07:00
Richard Alam
eb0caa9b3e Merge branch 'merge-polling-with-master' of github.com:bigbluebutton/bigbluebutton into merge-polling-with-master 2014-08-13 12:07:50 -07:00
Richard Alam
b9d6401a9e - mute/unmute all users 
- mute all users except presenter
 2014-08-13 12:07:01 -07:00
Richard Alam
c56fde0c42 Merge pull request #348 from speakserve/unify-version-number 
Unify version number
 2014-08-13 14:17:45 -04: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
Anton Georgiev
404ff72914 use high qulity png conversion for the slide, not just the thumbnail 2014-08-07 20:12:55 +00:00
Richard Alam
b04916fd84 - minor format 
- put recording indicator before meeting name
 2014-08-07 11:04:39 -07:00
Ghazi Triki
1b65bc54f4 fs-esl-client artifact can be resolved when deployed to the local gradle flatDir repository, using version 0.8.2 instead (reverted from commit 316de09ea1) 2014-08-05 08:44:35 +01:00
Ghazi Triki
316de09ea1 fs-esl-client artifact can be resolved when deployed to the local gradle flatDir repository 2014-08-01 10:17:19 +01:00
Richard Alam
fa9e134bea - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1773 2014-07-31 13:32:48 -07: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
Anton Georgiev
f10650d8d8 fix publishing 2014-07-29 15:42:19 +00:00
Anton Georgiev
140795f694 working on mute/unmute events 2014-07-29 15:03:19 +00:00
Richard Alam
26e03af631 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1757 2014-07-28 13:36:51 -07:00
Richard Alam
f08d7d795b - create runnalbe for each task 2014-07-22 14:05:28 -07:00
Richard Alam
7a31901ce6 - create a runnable for each message from redis pubsub 2014-07-22 13:37:45 -07:00
Richard Alam
0d1ec9ecf2 - create a runnable for each message. This insulates our queue handler from exceptions on sending 
which kills our message processor
 2014-07-22 13:28:36 -07:00
Richard Alam
da01326f5f - fix tests 2014-07-22 12:24:24 -07:00
Richard Alam
f1430c1e96 - cleanup 2014-07-21 18:50:03 -07:00
Richard Alam
502a472527 - continue with cleanup 2014-07-21 15:14:48 -07:00