Anton Georgiev
|
eea49c7663
|
Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server
Conflicts:
labs/meteor-client/client/main.coffee
labs/meteor-client/client/views/whiteboard/whiteboard.coffee
labs/meteor-client/client/views/whiteboard/whiteboard.html
|
2014-08-05 21:27:15 +00:00 |
|
Anton Georgiev
|
977a7f137c
|
reworking whiteboard.html, set the whiteboard to be displayed by default
|
2014-08-05 21:18:18 +00:00 |
|
Anton Georgiev
|
204acf3c53
|
cleaning up
|
2014-08-05 21:13:51 +00:00 |
|
Anton Georgiev
|
293bec988e
|
displaying shapes again
|
2014-08-05 21:10:56 +00:00 |
|
Anton Georgiev
|
07cec1d020
|
cleaning up
|
2014-08-05 21:07:33 +00:00 |
|
Anton Georgiev
|
327b547014
|
split the whiteboard template so that when the slide info is loaded/modified we trigger an event and rerender the slide template
|
2014-08-05 21:05:31 +00:00 |
|