Anton Georgiev
|
71a062af95
|
Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates
Conflicts:
labs/meteor-client/client/globals.coffee
labs/meteor-client/client/main.coffee
labs/meteor-client/client/views/whiteboard/whiteboard.html
labs/meteor-client/client/whiteboard_models/whiteboard_paper.coffee
|
2014-08-15 15:49:18 +00:00 |
|
perroned
|
753ec4dd1b
|
Added recording status and matching icons
|
2014-08-14 10:26:15 -07:00 |
|
perroned
|
59bcb84b9d
|
Merge remote-tracking branch 'anton/meteor-rebuild-server' into creating-better-templates
Conflicts:
labs/meteor-client/client/globals.coffee
labs/meteor-client/client/main.coffee
labs/meteor-client/client/views/whiteboard/whiteboard.html
labs/meteor-client/client/whiteboard_models/whiteboard_paper.coffee
|
2014-08-13 13:56:04 -07:00 |
|
Anton Georgiev
|
9d5000e636
|
Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates
Conflicts:
labs/meteor-client/client/globals.coffee
labs/meteor-client/client/main.coffee
labs/meteor-client/client/views/whiteboard/whiteboard.html
labs/meteor-client/client/whiteboard_models/whiteboard_paper.coffee
|
2014-08-12 18:53:50 +00:00 |
|
perroned
|
ef0168fbf4
|
Added footer, fixed navbars
|
2014-08-08 12:30:28 -07:00 |
|
perroned
|
eb5ef9cd08
|
Unifying layouts and modules. Making everything look better and look the same. Reducing code and making it easier to add modules.
|
2014-08-07 09:02:35 -07:00 |
|
Anton Georgiev
|
fea70bda5f
|
using coffeescript 'comprehension'
|
2014-08-05 21:48:11 +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
|
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 |
|
perroned
|
17e4ea629f
|
Fixed some errors
|
2014-08-01 08:01:44 -07:00 |
|
Anton Georgiev
|
c8de68eaca
|
now the slide is displayed when we first load the page
|
2014-08-01 14:54:48 +00:00 |
|
perroned
|
d5ab7d1009
|
Added toggle for whiteboard visibility
|
2014-08-01 06:51:45 -07:00 |
|
Anton Georgiev
|
df0d0668c0
|
cleaning up
|
2014-07-31 19:13:00 +00:00 |
|
Anton Georgiev
|
9205fcef60
|
fixing the calling of displaySlide, displayShapeOnSlide. Removing code referring to globals... (left over from the Express version)
|
2014-07-31 17:34:52 +00:00 |
|
Anton Georgiev
|
7fe1eb8e1e
|
splitting the displaying of slide and shapes into separate functions and calling them via Spacebar
|
2014-07-31 15:16:47 +00:00 |
|
Anton Georgiev
|
fdd7c57d03
|
started work on drawing shapes
|
2014-07-30 21:31:12 +00:00 |
|
Anton Georgiev
|
0c9a17f308
|
remove Draw button
|
2014-07-30 19:42:34 +00:00 |
|
Anton Georgiev
|
d25df88be4
|
rough: displays the slide
|
2014-07-30 17:06:29 +00:00 |
|
Anton Georgiev
|
a57e8e61bc
|
got the slideId
|
2014-07-30 15:20:29 +00:00 |
|
Anton Georgiev
|
cd7ea270df
|
moved the code from the whiteboard prototype to the html5 client. Now will start integrating it
|
2014-07-29 19:23:16 +00:00 |
|
perroned
|
ac61ea7a24
|
Added sample whiteboard entry
|
2014-06-23 12:51:54 -07:00 |
|