Commit Graph

137 Commits

Author SHA1 Message Date
Anton Georgiev
821af76933 now user.voiceUser.muted changes to true/false as it is supposed to do 2014-07-29 15:58:32 +00:00
Anton Georgiev
7a03063d52 wait for mute_voice_user_request 2014-07-29 15:55:46 +00: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
Anton Georgiev
7730abbeb8 fix for the merge and fix for an issue with get_all_meetings_request not recognized in bbb-apps 2014-07-28 21:01:06 +00:00
Anton Georgiev
3075166fa8 Merge branch 'meteor-merge-private-chat' into meteor-rebuild-server
Conflicts:
	labs/meteor-client/client/views/chat/chat_bar.coffee
2014-07-28 19:56:40 +00:00
Anton Georgiev
17ae9c1d88 style change 2014-07-28 19:13:36 +00:00
perroned
7e8cedc4dc Updated UI to now show whether a user is sharing audio and further whether the user is actually speaking or not. 2014-07-28 10:43:26 -07:00
perroned
4be030ef2f Clear user data when they logout 2014-07-28 08:00:07 -07:00
perroned
682e4a5dcd Wipe subscriptions after user logout 2014-07-25 09:36:31 -07:00
perroned
47c28469d8 Manual merge of meteor-client-change-logout into prototype-metor-client 2014-07-24 11:04:12 -07:00
perroned
62dde1fb8c Restructured logout procedure 2014-07-24 10:56:31 -07:00
perroned
f826215dd7 Now displays when user is actually talking 2014-07-24 09:12:27 -07:00
perroned
0b931aa7d8 Working on detecting sound while talking 2014-07-24 07:43:46 -07:00
perroned
11bb0daf89 Fixing up chat tabs... again. 2014-07-17 08:25:56 -07:00
Anton Georgiev
884cce7e9b the client will have access only to the meeting they are in so they can see the meeting"s name and record status 2014-07-09 16:06:25 +00:00
Anton Georgiev
3ad1bdd341 Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-merge-private-chat
Conflicts:
	labs/meteor-client/client/globals.coffee
	labs/meteor-client/client/views/chat/chat_bar.coffee
	labs/meteor-client/collections/collections.coffee
	labs/meteor-client/lib/router.coffee
	labs/meteor-client/server/publish.coffee
	labs/meteor-client/server/server.coffee
2014-07-09 15:09:27 +00:00
perroned
098a4c7f81 Added private chat and chat tabs functionality. Tab UI is still buggy. 2014-07-09 06:18:52 -07:00
Anton Georgiev
48010179e5 fixed adding to Slides collection 2014-07-08 17:15:30 +00:00
Anton Georgiev
abddc57c6f worked on slides collection 2014-07-08 15:14:55 +00:00
Anton Georgiev
168eb4e715 adding Slides collection 2014-07-07 20:58:50 +00:00
Anton Georgiev
7aef935771 filter log messages from flooding event types - cursor update, page resizing... 2014-07-07 20:51:33 +00:00
Anton Georgiev
86e90bbdef forgot to publish the Shapes collection 2014-07-07 20:31:18 +00:00
Anton Georgiev
4adef66799 remove redundant meetingId decl 2014-07-07 20:21:36 +00:00
Anton Georgiev
498472969e adding a shape to the collection 2014-07-07 20:17:09 +00:00
Anton Georgiev
c74737d66c adding a Shapes collection 2014-07-07 19:08:24 +00:00
Anton Georgiev
f1416a49a5 on get_presentation_info_reply request shapes 2014-07-07 18:04:47 +00:00
Anton Georgiev
25cbf5af27 fix removing users from Users 2014-07-03 18:44:05 +00:00
Anton Georgiev
f651744da9 handle end of meeting + some cleanup 2014-07-03 18:31:32 +00:00
Anton Georgiev
444aef0b25 Meetings collection, adding to it on Server.start 2014-07-03 15:52:43 +00: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
c40bcece8f cleaning up 2014-07-02 17:57:07 +00:00
Anton Georgiev
773825de73 fixing chat so that we only call Meteor.redisPubSub from within RedisPubSub 2014-07-02 14:47:22 +00:00
Anton Georgiev
dd85764db9 fix user logout 2014-06-27 19:16:04 +00:00
Anton Georgiev
2fb970d9cd adjusting the parameter names so that they match what is recognized on the server 2014-06-27 19:10:11 +00:00
Anton Georgiev
8c61b3fcdc sending on the chat channel 2014-06-27 18:41:25 +00:00
Anton Georgiev
d6851c39a4 when we try to send a chat message from the html5 client we now send a send_public_chat_message_request towards bbb-apps 2014-06-27 17:53:31 +00:00
Anton Georgiev
9ef70b55e9 inserting the chat messages we receive from bbb-apps into the Chat collection 2014-06-27 16:16:17 +00:00
Anton Georgiev
f0a50ce174 introducing Chat collection, clear on start, publish, subscribe, etc 2014-06-27 15:37:33 +00:00
Anton Georgiev
1aacd65e66 clear Users data on startup 2014-06-27 14:38:08 +00:00
Anton Georgiev
08e446e6a0 Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server 2014-06-26 20:28:54 +00:00
Anton Georgiev
8f11be5a8b dealing with users event 2014-06-26 20:11:18 +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
86dfa841bf switched server.js to coffeescript 2014-06-26 18:10:15 +00:00
Anton Georgiev
99bd016cab the first thing we do when we start the Meteor server is to grab the list of active meetings from bbb-apps 2014-06-26 18:09:39 +00:00
perroned
abe150cd88 Added some whitespace 2014-06-24 11:20:18 -07:00
Anton Georgiev
43c1eae0e5 Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server 2014-06-23 17:48:59 +00:00
Anton Georgiev
5532f3c766 implementing user logout 2014-06-23 17:48:11 +00:00
perroned
32ddd86438 Fixed spelling issue 2014-06-23 06:24:12 -07:00
perroned
e53ced5200 Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client 2014-06-20 12:36:00 -07:00
Anton Georgiev
a102a501ed insert more info about the user in the collection 2014-06-20 19:30:37 +00:00
Anton Georgiev
33597fcbe5 added a field username to the Users collection 2014-06-20 15:22:04 +00:00
Anton Georgiev
dd8d10260b following the model meetingId, userId 2014-06-20 14:44:32 +00:00
perroned
01b7fc9111 Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client
Conflicts:
	labs/meteor-client/client/views/users/user_list.coffee
	labs/meteor-client/server/insert-startup-data.js
2014-06-20 07:32:12 -07:00
Anton Georgiev
82b8f9d134 Meteor.users -> Meteor.Users the collection should start with a capital letter 2014-06-19 21:29:52 +00:00
Anton Georgiev
d963078423 get_users_reply populates the collection of users 2014-06-19 21:16:48 +00:00
Anton Georgiev
6d98622d38 handling user_left_message - removing the user from the Meteor.users collection 2014-06-19 20:25:27 +00:00
perroned
1da3dfe3a5 Using realistic data 2014-06-19 10:52:41 -07:00
Anton Georgiev
8d5f3170cc we now subscribe to stay up to date only with our meeting's users 2014-06-19 15:36:51 +00:00
Anton Georgiev
eb5703b5d8 Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server
Conflicts:
	labs/meteor-client/lib/router.coffee
2014-06-19 15:24:20 +00:00
Anton Georgiev
af122d2629 work in progress on subscribing a client for the users changes for a single meeting only 2014-06-19 15:19:32 +00:00
perroned
49a0b715b7 Re-enabled server's startup code 2014-06-19 06:28:34 -07:00
perroned
79e5ae19a2 Added sample chat data 2014-06-19 06:27:44 -07:00
perroned
a38a1f7ca3 Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client 2014-06-19 06:13:56 -07:00
Anton Georgiev
accaa62a29 use iron-router only. The UI is displayed AND redis is working on the serverside! 2014-06-18 20:11:29 +00:00
perroned
eab639e134 Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client 2014-06-18 10:54:03 -07:00
perroned
29488daa9e Added chat data: 2014-06-18 10:53:57 -07:00
Anton Georgiev
ec875e3c1c joining the router for server and client side 2014-06-18 17:34:08 +00:00
Anton Georgiev
10363effc9 join the routing of client and server side 2014-06-18 17:31:42 +00:00
Anton Georgiev
fe464d53af cleaning up 2014-06-17 17:04:58 +00:00
Anton Georgiev
59fbf2ad52 able to add a user to a collection on user_joined_message. 2014-06-17 15:22:12 +00:00
Anton Georgiev
a73bafe41e did some refactoring - we now use a RedisPubSub class 2014-06-13 19:27:26 +00:00
Anton Georgiev
ebdda24f8a sending validate_auth_token message 2014-06-13 18:01:32 +00:00
Anton Georgiev
8b82e03bda the :4000 landing page redirects to the meteor app. We extract the meeting_id, user_id, username, auth_token inside the Meteor app. Added router. 2014-06-12 23:22:58 +00:00
Anton Georgiev
46b8f8a923 Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server
Conflicts:
	labs/meteor-client/smart.json
	labs/meteor-client/smart.lock
2014-06-12 20:22:42 +00:00
perroned
ef0272f768 Fixing up users collection to use meteor's built in users collection, fixed up some meteor-coffeescript compatability issues 2014-06-12 08:12:25 -07:00
Anton Georgiev
c9f8683e0b Merge remote-tracking branch 'perroned/prototype-metor-client' into meteor-rebuild-server 2014-06-11 19:45:02 +00:00
Anton Georgiev
0f680bd4d5 cleaning up 2014-06-11 19:38:47 +00:00
Anton Georgiev
fc9c2adf3e still have to connect bunyan 2014-06-11 19:26:46 +00:00
perroned
e609d2df9f Fixed up some permissions issues 2014-06-11 11:56:04 -07:00
Anton Georgiev
22a31392f4 I think I resolved the coffeescript class structure problem 2014-06-11 17:56:07 +00:00
Anton Georgiev
1ccc24d71c subscribing and publishing (simple version) 2014-06-11 17:12:51 +00:00
Anton Georgiev
46a231c3c0 config is found, redis is found 2014-06-11 16:11:23 +00:00
perroned
26c7050283 Trying to implement css/less from html5, cleaned up code a bit, added functionality to buttons 2014-06-11 08:21:09 -07:00
perroned
4e30f69e81 Added a few buttons that would show up for moderators or presenters 2014-06-10 12:59:58 -07:00
perroned
cb8b0d0e11 basic functionality for users 2014-06-10 12:19:20 -07:00
Richard Alam
1f9fe5cac7 - meteor 2014-06-06 15:19:09 -07:00