perroned 59bcb84b9d Merge remote-tracking branch 'anton/meteor-rebuild-server' into creating-better-templates ... Conflicts: labs/meteor-client/client/globals.coffee labs/meteor-client/client/main.coffee labs/meteor-client/client/views/whiteboard/whiteboard.html labs/meteor-client/client/whiteboard_models/whiteboard_paper.coffee		2014-08-13 13:56:04 -07:00
..
chat.coffee	Fixing up private chat UI and message filtering issues and making private chat more efficient and got it into a working state again	2014-08-13 11:30:55 -07:00
collections.coffee	adding Presentations collection	2014-07-29 20:57:02 +00:00
meetings.coffee	changed logging style	2014-07-07 18:03:33 +00:00
presentations.coffee	working on displaying the presenter's cursor/pointer	2014-08-11 20:54:16 +00:00
shapes.coffee	moved the code from the whiteboard prototype to the html5 client. Now will start integrating it	2014-07-29 19:23:16 +00:00
slides.coffee	started work on drawing shapes	2014-07-30 21:31:12 +00:00
users.coffee	Fixed up UI stuff, fixed up joining call/muting audio/detecting speaking	2014-08-12 09:25:15 -07:00