Commit Graph

15 Commits

Author SHA1 Message Date
perroned
2f4960e5b2 Newlines between flash and html5 2015-02-11 11:43:46 -08:00
perroned
949c40b618 translate incoming and outgoing multiline messages 2015-02-10 08:29:52 -08:00
Anton Georgiev
46a4a57481 adjusted some tests 2014-12-22 21:21:30 +00:00
Anton Georgiev
f84def84a7 working on clearing the collections after a meeting ends 2014-12-22 19:43:27 +00:00
Anton Georgiev
3c12be30b5 cleaning up 2014-11-27 00:01:40 +00:00
Anton Georgiev
f5a3c987b1 added a condition. cleaning up 2014-11-26 23:57:39 +00:00
Anton Georgiev
f2760f3ef8 chat with authToken+userid instead of userSecret+dbid 2014-11-26 22:49:21 +00:00
Lucas Zawacki
3f6cc062a9 Merge winston logging
Conflicts:
	labs/meteor-client/app/.meteor/packages
	labs/meteor-client/app/lib/router.coffee
	labs/meteor-client/app/server/collection_methods/chat.coffee
	labs/meteor-client/app/server/collection_methods/users.coffee
	labs/meteor-client/app/server/redispubsub.coffee
	labs/meteor-client/app/smart.json
	labs/meteor-client/app/smart.lock
2014-11-12 13:18:09 -02:00
perroned
5c7f8a8379 Removing deleting private conversations. 2014-10-28 07:35:54 -07:00
perroned
142d78ffb4 Working on deleting conversations. 2014-10-21 11:11:22 -07:00
perroned
b322d747fa Merge remote-tracking branch 'anton/testing-version-04' into meteor-new-auth 2014-10-21 05:24:12 -07:00
perroned
12cd22e805 Fixing up deleting conversations. 2014-10-21 05:22:54 -07:00
Anton Georgiev
baa40e441b temporarily reduce the amount of logging 2014-10-16 20:31:15 +00:00
Anton Georgiev
c7d3d9b9db minor fix for public chat messages 2014-10-09 20:05:29 +00:00
Anton Georgiev
319a1247a1 Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into meteor-new-auth
Conflicts:
	labs/meteor-client/app/client/globals.coffee
	labs/meteor-client/app/client/views/chat/chat_bar.coffee
	labs/meteor-client/app/collections/chat.coffee
	labs/meteor-client/app/collections/meetings.coffee
	labs/meteor-client/app/collections/presentations.coffee
	labs/meteor-client/app/collections/shapes.coffee
	labs/meteor-client/app/collections/slides.coffee
	labs/meteor-client/app/collections/users.coffee
2014-10-07 17:45:47 +00:00