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 |
|