perroned e1e12fe3c6 Merge remote-tracking branch 'maxim/meteor-client-messages-better-templates' into creating-better-templates ... Conflicts: labs/meteor-client/client/views/chat/chat_bar.html		2014-08-15 12:17:37 -07:00
..
.meteor	Removed duplicate bootstrap packages, fixing up UI issues now to compensate	2014-08-15 09:37:43 -07:00
client	Merge remote-tracking branch 'maxim/meteor-client-messages-better-templates' into creating-better-templates	2014-08-15 12:17:37 -07:00
collections	Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates	2014-08-15 15:49:18 +00:00
lib	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
packages	moved the code from the whiteboard prototype to the html5 client. Now will start integrating it	2014-07-29 19:23:16 +00:00
server	Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates	2014-08-15 15:49:18 +00:00
.gitignore	Merging in persistent sorage solution	2014-07-18 07:30:46 -07:00
config.coffee	working on mute/unmute events	2014-07-29 15:03:19 +00:00
packages.json	still have to connect bunyan	2014-06-11 19:26:46 +00:00
smart.json	moved the code from the whiteboard prototype to the html5 client. Now will start integrating it	2014-07-29 19:23:16 +00:00
smart.lock	moved the code from the whiteboard prototype to the html5 client. Now will start integrating it	2014-07-29 19:23:16 +00:00