Anton Georgiev
|
da846ac2d5
|
now the private chat messages are displayed
|
2014-10-07 23:09:33 +00:00 |
|
Anton Georgiev
|
4a93388c4d
|
private chat using dbid
|
2014-10-07 23:08:48 +00:00 |
|
Anton Georgiev
|
9a901d56d7
|
version and date already set here: https://github.com/antobinary/bigbluebutton/blob/exploring-grunt/labs/meteor-client/app/client/main.coffee#L81-L82
|
2014-10-07 21:47:13 +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
|
aa270da0d2
|
fix footer version, date
|
2014-10-07 18:05:37 +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 |
|