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

1231 Commits

Author SHA1 Message Date
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
Richard Alam
884a6d4bd8 - starting cleanup unnecessary logs 2014-07-21 14:12:37 -07:00
Richard Alam
930c6d881b - slowly cleaning up debug logs 2014-07-18 13:28:09 -07:00
Richard Alam
8f7941de33 - minor cleanup 2014-07-18 11:26:46 -07:00
Richard Alam
4c41140193 - do not sync layout to others automatically 2014-07-17 10:48:23 -07:00
Richard Alam
412e2c51a6 - a little cleanup 2014-07-16 13:12:10 -07:00
Richard Alam
6e12f5be11 - send mute voice user command to redis pubsub 2014-07-05 02:38:15 -07:00
Anton Georgiev
39d62e1d4a now get_all_meetings_reply returns info about meetingName and recorded status 2014-07-03 15:30:06 +00:00
Anton Georgiev
1cec101920 obtaining meetingName from MeetingActor 2014-07-03 14:36:20 +00:00
Anton Georgiev
a781a91d69 implemented listeners for send_public_chat_message_request and send_private_chat_message_request 2014-06-27 18:41:07 +00:00
Anton Georgiev
7b5866cf1e we get information about all the meetings on starting up the Meteor server 2014-06-26 19:54:24 +00:00
Anton Georgiev
67778ef63a now I am actually sending the get_all_meetings_reply message and am not just dispatching it in the log. 2014-06-26 18:08:10 +00:00
Anton Georgiev
1ea7668fb2 cleaning up 2014-06-25 20:17:59 +00:00
Anton Georgiev
58ac5653cf adding functionality to provide an array of the meetingIds for all meetings on the server. We are to use this in the HTML5 client so we can maintain have the information about all meetings ready when a user joins via an HTML5 client 2014-06-25 20:08:21 +00:00
Richard Alam
c78fdab2a8 - don't use FS Event timestamp for start/stop recording event 2014-06-12 13:40:57 -07:00
Richard Alam
97262dfba5 - make recording process work 2014-06-12 12:31:24 -07:00
Richard Alam
702c57ebab - apply lock settings 2014-06-11 13:00:53 -07:00
Anton Georgiev
ebb0424856 Merge branch 'prototype-meteor-client' of https://github.com/bigbluebutton/bigbluebutton into prototype-meteor-client 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
 2014-06-09 14:51:59 +00:00
Anton Georgiev
d25ac63362 worked on dispatching a request for whiteboard shapes and waiting for reply 2014-06-04 15:14:23 +00:00
Anton Georgiev
3b9e50f2d0 adding a whiteboard listener 2014-06-04 15:12:49 +00:00
Anton Georgiev
42832891d6 rearranging 2014-06-03 21:12:37 +00:00
Anton Georgiev
7d85751a43 fix indent + clean up 2014-06-03 17:09:11 +00:00
Anton Georgiev
daea03df05 altered the flow of events. we first receive the get users reply and then we join the meeting. checks have been introduced to see if the user added to the list has the correct fields 2014-06-02 21:40:23 +00:00
Richard Alam
c806b4364f - continue modifyng the layout module to sync with others when windows are resized 2014-05-30 13:54:40 -07:00
Richard Alam
39fa4f2db1 - modify how we send lock and broadcast layout from client 2014-05-30 11:08:47 -07:00
Anton Georgiev
29a51efa71 send the presentation info 2014-05-30 16:29:56 +00:00
Richard Alam
4cfd877f37 Merge branch 'merge-polling-with-master' into broadcast-layout 2014-05-29 14:09:34 -07:00
Richard Alam
e7dcf3c4bf - fix compile issue 2014-05-29 13:55:01 -07:00
Anton Georgiev
e7584d23d3 logging out a user - looks good in flash, will have to add a few things for html5 2014-05-29 19:55:32 +00:00
Richard Alam
efd66699f0 - get it to compile 2014-05-29 12:02:55 -07:00
Richard Alam
04c271996d Merge branch 'broadcast-layout' of github.com:mconf/bigbluebutton into broadcast-layout 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutService.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/layout/LayoutApp.scala
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/events/LayoutEvent.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/LayoutService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/MessageReceiver.as
 2014-05-29 11:21:01 -07:00
Felipe Cecagno
5821c32372 implemented the new button broadcast layout, which will send to all viewers the moderator's current layout; the lock button and broadcast button only affect viewers, not moderators 2014-05-29 12:19:40 -03:00
Richard Alam
8221f219d0 - pass list of users to sync 2014-05-29 07:28:55 -07:00
Richard Alam
224bea1f5f - sync layout with viewers 2014-05-29 07:06:44 -07:00
Richard Alam
e254787276 - add layout to lock settings 2014-05-28 12:25:28 -07:00
Anton Georgiev
5bcd1e9dcd we do not expect requests for users or chathistory. These replies are automatically sent on successful validation 2014-05-28 18:44:19 +00:00
Richard Alam
f87933cf76 - try to inject layout change when layout option is changed in lock settings 2014-05-27 19:00:38 -07:00
Anton Georgiev
8ed7146753 provoking chatHistory message 2014-05-27 21:41:52 +00:00
Anton Georgiev
46df19c38a trying to join user and populate userlist, chatHistory, presentation, whiteboard on successful validation 2014-05-27 21:12:13 +00:00
Richard Alam
32e90ae8e5 - move lock settings info to bbb-apps from client 2014-05-27 13:14:34 -07:00
Anton Georgiev
6a301f4357 public chat messages are displayed, emitted, received...; right now each chat message is displayed twice (both in the flash and html5 clients). 2014-05-26 14:24:56 +00:00
Anton Georgiev
e63ce2074d Merge branch 'merge-polling-with-master' of https://github.com/bigbluebutton/bigbluebutton into merge-polling-with-master 2014-05-23 17:36:09 +00:00
Richard Alam
87b776ad58 - fix sending of lock settings to server 2014-05-23 08:47:13 -07:00
Anton Georgiev
54ffccf8ac get_chat_history, get_chat_history_reply. The history should be displaying properly but I should first fix sending a chat message. Otherwise the history will remain empty 2014-05-22 21:52:36 +00:00
Anton Georgiev
3b6331997f cleaning up 2014-05-22 21:50:51 +00:00
Richard Alam
5c844ffeee - send lock settings to server 2014-05-22 11:41:59 -07:00
Anton Georgiev
2ce8eab68c Merge branch 'implement-lock-settings' of https://github.com/bigbluebutton/bigbluebutton into merge-polling-with-master 2014-05-22 18:20:46 +00:00
Anton Georgiev
b7b075ce71 work on user_joined_event prior to get_users_request 2014-05-22 18:20:21 +00:00
Richard Alam
52f0e5e00a - require only meetingid and userid for join_user message 2014-05-22 11:12:20 -07:00
Richard Alam
1b8fa657ce - send lock settings from server to client 2014-05-22 08:30:46 -07:00
Anton Georgiev
28ad6da463 fix indents 2014-05-22 15:20:46 +00:00
Richard Alam
0e29e7fc45 - start implementing lock settings 2014-05-21 15:06:38 -07:00
Richard Alam
4a4241ee78 - make sure create, register user and validate are in correct sequence 2014-05-21 13:56:37 -07:00
Richard Alam
f266067e1a - display message to user when auth token is invalid 2014-05-21 18:42:49 +00:00
Anton Georgiev
aa85b3343d fixing indentations 2014-05-21 14:31:55 +00:00
Anton Georgiev
f66bb034d9 register user 2014-05-21 14:30:51 +00:00
Richard Alam
653c12ef0e - fix param names 2014-05-16 20:54:50 +00:00
Richard Alam
3a3f0ec9e3 Merge branch 'merge-polling-with-master' of github.com:antobinary/bigbluebutton into merge-polling-with-master 2014-05-16 19:16:34 +00:00
Richard Alam
391dc9be5a - fix listen-only in get users reply 2014-05-16 17:26:51 +00:00
Richard Alam
5686b6871c - finish global audio...display speaker icon beside user's name when joined in listen-only mode 2014-05-16 15:24:22 +00:00
Richard Alam
6bc09111c0 - handle message correctly 2014-05-15 20:26:54 -07:00
Richard Alam
7e4edcae65 - handle user connected/disconnected to/from global audio 2014-05-15 22:21:47 +00:00
Anton Georgiev
c5f5b635b5 receives validate_auth_token_reply 2014-05-15 20:42:54 +00:00
Richard Alam
e46280c1bd - filter out global audio user so we won't display it on the user's list 2014-05-14 20:56:18 +00:00
Richard Alam
42fcfe1055 Merge branch 'merging-global-audio' of github.com:mconf/bigbluebutton into merge-global-audio 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
 2014-05-12 10:39:25 -07:00
Richard Alam
473c9941b4 - handle validate token message from node app 2014-05-11 12:30:58 -07:00
Richard Alam
283a3fa3eb - modify messages 2014-05-09 17:49:01 -07:00
Richard Alam
1e9c6e233e - receive messages in bbb-apps 2014-05-09 22:21:07 +00:00
Richard Alam
8dfe46bfba - changing message format between bbb-web and bbb-apps 2014-05-09 21:21:21 +00:00
Richard Alam
6403c53f27 - send more user messages to redis pubsub 2014-05-09 18:45:41 +00:00
Richard Alam
63b3aaf095 - publish the events into redis so nodejs app will be able to receive them 2014-05-08 21:48:40 +00:00
Richard Alam
04f49c29e6 - fix user an dmeeting messages 2014-05-08 19:52:35 +00:00
Richard Alam
e915c72331 - start formatting json messages for users and meeting 2014-05-07 21:42:32 +00:00
Richard Alam
3244383a7e - format whiteboard json messages 2014-05-07 19:03:11 +00:00
Richard Alam
fb7d220ac8 - fix chat and presentation messages 2014-05-07 18:05:20 +00:00
Richard Alam
7eb3ba3911 - handle get chat history message from another app (e.g. html5 client) 
- cleanup chat message format
 2014-05-07 15:22:28 +00:00
Richard Alam
5d07bb007f - don't record message when meeting isn't being recorded 2014-05-06 19:04:48 +00:00
Richard Alam
001ec076da - try to store recorded event into list instead of hasmap 2014-05-06 17:58:58 +00:00
Richard Alam
4a624b845b - convert timestamp to use monotonic clock 2014-05-05 21:43:38 +00:00
Richard Alam
ca089d6af0 - minor cleanup 2014-05-05 18:35:01 +00:00
Richard Alam
f30dd78f5e - put apps into their own channel 2014-05-05 18:33:39 +00:00
Richard Alam
d31192a588 - allow muting and unmuting of phone user 2014-05-02 19:11:26 +00:00
Richard Alam
84aaf27c35 - remove phone user from list when user hangs up 2014-05-02 18:54:44 +00:00
Richard Alam
1ed551b923 - change default dispatcher 2014-05-01 15:26:24 +00:00
Richard Alam
3b31ecfa60 Merge branch 'connect-bbb-apps-html5' of github.com:antobinary/bigbluebutton into connect-bbb-apps-html5 2014-05-01 15:24:47 +00:00
Anton Georgiev
ba4d0fb63e push the messages instead of outputing them on the console 2014-04-30 17:41:56 +00:00
Anton Georgiev
63dd66669b switched a few more messages to print instead of dispatching 2014-04-30 17:41:01 +00:00
Richard Alam
75d908625c - setup messaging classes 2014-04-30 15:53:27 +00:00
Richard Alam
6aaf071987 - remove test message 2014-04-28 20:11:26 +00:00
Anton Georgiev
664b882ccb switched all variables to CamelCase 2014-04-28 15:49:22 +00:00
Anton Georgiev
042c1ad937 updating 2014-04-24 18:41:44 +00:00
Anton Georgiev
f207c6fa16 Listener for some participants' events 2014-04-24 18:30:44 +00:00
Anton Georgiev
867c9fdb46 chat messages on channel "bigbluebutton:meeting:anton" are handled in bigbluebutton-apps and appear inside the flash client 2014-04-23 22:35:40 +00:00
Anton Georgiev
fe8d969093 some work on listener for private/public chat messages 2014-04-23 20:54:03 +00:00
Felipe Cecagno
92eac1e988 Merge branch 'global-audio' into merge-global-audio 
Most of the client implementation is going to be rewritten on next commits.
 2014-04-23 16:13:40 -03:00
Richard Alam
f785c06e83 Merge branch 'connect-bbb-apps-html5' of github.com:bigbluebutton/bigbluebutton into connect-bbb-apps-html5 2014-04-22 19:22:23 +00:00
Richard Alam
daf1f662b9 - add some TODO comment 2014-04-22 19:21:57 +00:00
Richard Alam
1337de5ed2 - create doc for messages 2014-04-19 12:53:08 -07:00
Richard Alam
f4de100179 - fix compile problem 2014-04-19 09:22:51 -07:00
Richard Alam
12921b1e24 Merge branch 'connect-bbb-apps-html5' into merge-with-upgrade-red5-branch 2014-04-18 17:21:44 -07:00
Richard Alam
4a428a4c5c - format all messages 2014-04-18 15:08:37 -07:00
Richard Alam
402994cfea - more messages 2014-04-18 13:28:33 -07:00
Richard Alam
4dd173b963 - continue with messages 2014-04-18 10:52:04 -07:00
Richard Alam
125c22c102 - format messages 2014-04-18 10:31:15 -07:00
Richard Alam
69e2cbc303 - slowly transform messages 2014-04-18 09:57:51 -07:00
Richard Alam
f530d45f27 - add more message names 2014-04-18 09:23:40 -07:00
Richard Alam
be9ef0a681 - create message name constants 2014-04-17 19:46:41 -07:00
Richard Alam
08a4650b82 - add more messages 2014-04-17 18:45:44 -07:00
Richard Alam
95614166b0 - format more messages 2014-04-17 18:01:47 -07:00
Richard Alam
c66c252e24 - start to format messages 2014-04-17 17:37:40 -07:00
Richard Alam
25bd559473 - remove some debug logs 2014-04-17 17:50:20 +00:00
Richard Alam
5a95138dd3 Merge branch 'bbb-apps-message-logging' into connect-bbb-apps-html5 2014-04-16 18:36:03 +00:00
Anton Georgiev
c09fa735c4 instead of printing the dispatched messages, we will push them to a list 2014-04-16 17:09:44 +00:00
Richard Alam
7328d21099 - remote log dependency 2014-04-14 12:55:21 -07:00
Richard Alam
7970495c58 - try to fix why BBB apps isn't starting 2014-04-14 10:44:25 -07:00
Anton Georgiev
bfd3da083a fixed users[] in GetUsersReply 2014-04-11 20:27:33 +00:00
Anton Georgiev
30605a7afe fixed msg.shapes for GetWhiteboardShapesReply 2014-04-11 19:05:21 +00:00
Anton Georgiev
1b80e53582 worked on complex structures - history, settings, etc... 2014-04-11 17:40:11 +00:00
Anton Georgiev
1c8917cbc4 Commented out logging for mouse moves. Commented out lines causing errors 2014-04-10 18:20:28 +00:00
Anton Georgiev
26b8a9645a minor changes in the debugging messages 2014-04-09 21:08:36 +00:00
Anton Georgiev
1729ab06df minor formatting fixes 2014-04-09 20:50:36 +00:00
Anton Georgiev
d7f4dad7df "OUT" messages are now in place too. 2014-04-09 20:43:09 +00:00
Anton Georgiev
3bab42b4d1 all "IN" messages are in place now 2014-04-09 16:53:19 +00:00
Anton Georgiev
d3787a6266 working on improving the logging for events (DISPATCHING) 2014-04-08 22:01:55 +00:00
Richard Alam
bee1320463 Merge branch 'merge-polling-with-master' into connect-bbb-apps-html5 
Conflicts:
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
 2014-04-08 19:07:37 +00:00
Richard Alam
3bd5840e3c - make bbb-apps compile 2014-04-08 18:37:51 +00:00
Anton Georgiev
2d89a73c0c Merge branch 'addMsgLib' of /home/ubuntu/dev/antonHtml5/bigbluebutton into connect-bbb-apps-html5 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/RedisMessagingService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/ConversionUpdatesProcessor.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardService.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
	bigbluebutton-web/grails-app/conf/UrlMappings.groovy
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
	bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
	bigbluebutton-web/ivy.xml
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/SwfSlidesGenerationProgressNotifier.java
 2014-04-08 15:55:04 +00:00
Anton Georgiev
ab6922b329 user_left_event in channel bigbluebutton:meeting:anton results in the leaving of the flash client user with that name 2014-04-07 21:33:37 +00:00
Anton Georgiev
efc89524de user_joined_event in pubsub on channel bigbluebutton:meeting:anton results in the user added to the userlist in the flash client 2014-04-07 21:17:04 +00:00
Anton Georgiev
fcc8379e90 added a listener for participants (user join, user leave) events. Worked on redirecting json messages of the new format to their proper handler 2014-04-07 18:43:29 +00:00
Richard Alam
e709ff4fbd - build with red5 1.0.2-M1 2014-04-07 17:31:49 +00:00
Richard Alam
17868b5dba - try to upgrade to red5 1.0.2-M1. Need to fix compile and startup issues 2014-04-05 09:22:01 -07:00
Richard Alam
00974ecaae - send proper name when recording chat 2014-04-04 20:42:29 +00:00
Richard Alam
cdffdf4062 - fix typo 2014-04-04 20:41:58 +00:00
Richard Alam
16b9935ce3 - setup collecting of incoming and outgoing messages 2014-04-04 19:12:08 +00:00
Richard Alam
f8d8079f59 - make sure to record the EndAndKickAllEvent 2014-04-04 14:51:14 +00:00
Anton Georgiev
b0f8719480 user_left_event: when a user leaves an additional event is now dispatched - of the structure supported by the html5 client 2014-04-02 18:18:37 +00:00
Anton Georgiev
7bfdf6de7a at this stage joining of a user via flash can be updated(displayed) on the html5 client! (kind of hard-coded) 2014-04-01 21:57:52 +00:00
Richard Alam
1a9857d493 - start/stop FS recording when first user joins and last user leaves the voice conference 2014-04-01 20:10:26 +00:00
Richard Alam
aeb15546e9 - send start/stop recording to FS 2014-04-01 18:18:47 +00:00
Anton Georgiev
fdff666836 @Richard: I am attempting to trigger a joined_event_message to be sent and to be handled by Node 2014-04-01 15:11:06 +00:00
Anton Georgiev
83bfd513b7 substituted some of the hard-coded values with values from the msg object 2014-03-24 19:03:34 +00:00
Anton Georgiev
edf31e2724 whiteboad_draw_event message sent and the html5 client handles it. have to modify the channel the message is sent to. in the html5 client performed a check to see if header.name is whiteboard_draw_event and if yes overwrote the channel to bigbluebutton:bridge 2014-03-24 16:14:41 +00:00
Anton Georgiev
65cd93ec1a created a WhiteboardEventRedisPublisher. When I draw in the flash client I get a simple json message in the console of the html5 client 2014-03-21 20:21:20 +00:00
Anton Georgiev
0b5330e0d1 added a chat event listener. Now a simple chat json injected into pubsub will be displayed in the red5 console and will go through the listener "ChatMessageListener.java" 2014-03-21 17:59:54 +00:00
Richard Alam
102cd186d7 - hook up whiteboard recorder 2014-03-12 19:43:39 +00:00
Richard Alam
e5eb48a90f - fix recording 2014-03-12 18:37:11 +00:00
Richard Alam
d89459f938 - formatting cleanup 2014-03-11 17:58:26 -04:00
Richard Alam
31926bd26d - implement end and destroy meeting 2014-03-10 21:38:03 +00:00
Richard Alam
86abffc79b - add timer to check meeting duration 2014-03-09 14:41:24 -04:00
Richard Alam
6ec6553534 - send end meeting message from bbb-web 2014-03-09 00:05:43 -05:00
Richard Alam
e27274bf8c - use wb id instead of pres/pagenumber for whiteboard 
- the whiteboard id matches presId/page id for the current page
 2014-03-06 16:37:03 +00:00
Richard Alam
50f1b272f1 - continue making changes to whiteboard 2014-03-05 22:20:34 +00:00
Richard Alam
6b855aa351 - start refactoring whiteboard 2014-03-05 21:43:35 +00:00
Richard Alam
2f9650d1d3 - fix uploading of presentation 2014-03-05 19:54:32 +00:00
Richard Alam
bc5f60923c - figure out why we can't get to the next page 2014-03-03 21:41:18 +00:00
Richard Alam
89e2f6363a - display presentation page 2014-03-03 18:39:04 +00:00
Richard Alam
10b4b6ee3a - fix compile issues 2014-02-28 19:26:58 +00:00
Richard Alam
d15e8c3a5b - continue cleaning up presentation 2014-02-27 21:41:25 +00:00
Richard Alam
feb49951a5 - add presentation ids to presentation conversion 2014-02-27 17:23:44 +00:00
Richard Alam
dcfe856f46 - fix issue where users show up as joined voice when a client loads 2014-02-24 19:24:23 +00:00
Richard Alam
8a2990284e - cleanup and formatting 2014-02-21 20:02:54 +00:00
Richard Alam
4fc48da1b2 - change user joining sequence 2014-02-20 21:39:29 +00:00
Richard Alam
02e3e8cbc3 - set up flow for validating auth token when user joins 2014-02-20 18:01:55 +00:00
Richard Alam
6159029711 - cleanup 2014-02-19 21:54:15 +00:00
Richard Alam
e05d310908 - removing dependency on FS userid to manage voice for each user 2014-02-19 19:23:17 +00:00
Richard Alam
ae36cb7997 - try to fix why we can't handle user leaving voice 2014-02-18 19:07:07 -05:00
Richard Alam
f4ac082d06 - add userid in mute and talking message 2014-02-14 17:06:13 -05:00
Richard Alam
67b591001a - move users model 2014-02-14 15:42:20 -05:00
Richard Alam
57ec10a241 - more clean up 2014-02-13 21:13:34 +00:00
Richard Alam
2ba79f49a0 - more cleanup of unused code 2014-02-13 20:35:42 +00:00
Richard Alam
dec6ad2ee2 - remove polling and whiteboard unused code 2014-02-13 19:59:52 +00:00
Richard Alam
5caa551a05 - implement start/stop voice recording 2014-02-13 19:05:32 +00:00
Richard Alam
06cc0127aa - fix recording of events 2014-02-13 18:25:17 +00:00
Richard Alam
0bd25997a9 - implement start/stop recording. 
- TODO: alert doesn't popup when clicking on the record button
 2014-02-12 18:25:28 -05:00
Richard Alam
6cef7ecdac - fix share webcam 2014-02-12 15:27:10 -05:00
Richard Alam
d967f86750 - fix get users reply message 2014-02-12 12:33:28 -05:00
Richard Alam
9325aeb7aa - fix issue where we are not getting events from FS 2014-02-12 10:30:46 -05:00
Richard Alam
0f59af0aad - fix voice users commands and events 
- TODO: figure out why we are not receiving mute/talk events from FS ESL
 2014-02-11 22:45:24 -05:00
Richard Alam
f071e65235 - finally! got presentation to work...needs some cleanup 2014-02-11 14:52:13 -05:00
Richard Alam
e30ef32867 - now sending correct messages to client 2014-02-11 13:33:14 -05:00
Richard Alam
dcd5e0e8ec - modify how we store whiteboard shapes as latecomers are not getting any shapes for the current page 2014-02-10 23:00:01 +00:00
Richard Alam
858f1fef88 - try to figure out why whiteboard history isn't working 2014-02-10 21:48:24 +00:00
Richard Alam
5552583bbe - fix typo as it's driving CHad nuts :) 2014-02-10 21:21:15 +00:00
Richard Alam
1f080c78e0 - now late comers can display current presentation page 2014-02-10 19:39:05 +00:00
Richard Alam
03d4b05217 - continue fixing presentation. Looks like it synchs. Need to fix why 
current page of presentation doesn't display for late comer.
 2014-02-09 15:51:05 -05:00
Richard Alam
0993a06af3 - fix issue where in goto page, the previous page is still marked as current page 2014-02-09 15:17:42 -05:00
Richard Alam
d4b02df765 - fix go to slide message 2014-02-08 19:51:46 -05:00
Richard Alam
f12ec75377 - slowly making presentation work again 2014-02-08 17:56:13 -05:00
Richard Alam
aa8f68076f - try to figure out logging 
- send presentation messages as JSON
 2014-02-08 15:29:12 -05:00
Richard Alam
ff333b9232 - handle get presentation info message 2014-02-08 14:20:05 -05:00
Richard Alam
9fa2ca2e38 - fix presentation conversion message 2014-02-07 22:35:52 -05:00
Richard Alam
1c5c3cbdf3 - try to fix presentation messages 2014-02-07 17:23:11 -05:00
Richard Alam
cf321098ac - try to get presentation working again 2014-02-07 14:14:28 -05:00
Richard Alam
307e9856c4 - breakdonw presentation messages into spearate messages 2014-02-07 09:10:14 -05:00
Richard Alam
f70d82f1ca - fix message handling issue 2014-02-06 16:17:40 -05:00
Richard Alam
06d03298c4 - wire app voice conference service 2014-02-06 15:00:31 -05:00
Richard Alam
c2bda20c82 - implement handling of FS ESL messages 2014-01-17 16:25:14 -05:00
Richard Alam
5037c4472c - propagate voice user join event 2014-01-17 04:13:45 -05:00
Richard Alam
8a74d3a41a - fix compile issues 2014-01-16 23:19:23 -05:00
Richard Alam
973237f6ca - fix compile issue 2014-01-16 18:40:05 -05:00
Richard Alam
5b583368ff - fix some compile errors 2014-01-16 17:12:15 -05:00