Anton Georgiev
|
df45df31ab
|
Tyler:work in progress on user items
|
2014-11-17 22:44:47 +00:00 |
|
perroned
|
c1fa10e3bf
|
Fix CSS/LESS conflicts, simplified, and organized code.
|
2014-10-28 06:06:38 -07:00 |
|
perroned
|
b043b194b1
|
Removing presenter functionality from this viewer branch.
|
2014-10-14 08:51:08 -07: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 |
|