perroned
|
ab81ad8440
|
Removed backslash making a non standard escape character
|
2014-10-08 13:09:28 -07:00 |
|
Anton Georgiev
|
1a91092c82
|
cleaning up
|
2014-10-07 23:22:28 +00:00 |
|
Anton Georgiev
|
76a7e34357
|
fixed starting a private chat via clicking on the name in Options
|
2014-10-07 23:16:47 +00:00 |
|
Anton Georgiev
|
da846ac2d5
|
now the private chat messages are displayed
|
2014-10-07 23:09:33 +00:00 |
|
Anton Georgiev
|
846a59d4c8
|
Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into meteor-new-auth
|
2014-10-07 19:52:51 +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 |
|
Anton Georgiev
|
3905e45de7
|
moving the meteor files into an app folder so that grunt can reside in the root without breaking meteor
|
2014-10-02 16:16:34 +00:00 |
|