perroned
|
ce41c6798d
|
Merge remote-tracking branch 'anton/meteor-new-auth' into meteor-new-auth
Conflicts:
labs/meteor-client/app/client/views/whiteboard/slide.coffee
labs/meteor-client/app/server/collection_methods/users.coffee
|
2014-10-16 06:15:13 -07:00 |
|
Anton Georgiev
|
ef67843d66
|
fixes for not supporting Template.xxx.yyy = ... inside templates
|
2014-10-15 22:26:27 +00:00 |
|
Maxim Khlobystov
|
fc9d07bddd
|
Removed some unnecessary WhiteboardPaperModel code given that we now use different method to handle non-standard slide dimensions on the whiteboard.
|
2014-10-15 11:06:02 -07:00 |
|
Maxim Khlobystov
|
4f722d608a
|
Made the slide borders adjustable to the size of its container.
|
2014-10-15 10:26:05 -07:00 |
|
Maxim Khlobystov
|
b64e73759b
|
Made cursor redrawn every time it is destroyed on undoing or clearing shapes.
|
2014-10-14 18:50:41 -07:00 |
|
Anton Georgiev
|
631435e57e
|
reduce clutter in js console
|
2014-10-08 21:57:33 +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 |
|