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
..
.meteor	work in progress on subscribing a client for the users changes for a single meeting only	2014-06-19 15:19:32 +00:00
client	Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-merge-private-chat	2014-07-09 15:09:27 +00:00
collections	Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-merge-private-chat	2014-07-09 15:09:27 +00:00
lib	Added private chat and chat tabs functionality. Tab UI is still buggy.	2014-07-09 06:18:52 -07:00
packages	updating ignore files	2014-06-13 12:00:14 -07:00
server	Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-merge-private-chat	2014-07-09 15:09:27 +00:00
.gitignore	Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server	2014-06-12 20:22:42 +00:00
config.coffee	still have to connect bunyan	2014-06-11 19:26:46 +00:00
packages.json	still have to connect bunyan	2014-06-11 19:26:46 +00:00
smart.json	use iron-router only. The UI is displayed AND redis is working on the serverside!	2014-06-18 20:11:29 +00:00
smart.lock	use iron-router only. The UI is displayed AND redis is working on the serverside!	2014-06-18 20:11:29 +00:00