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 |
|
Anton Georgiev
|
8706792903
|
cleaning up
|
2014-08-12 17:44:32 +00:00 |
|
perroned
|
f880aceba3
|
Fixed up UI stuff, fixed up joining call/muting audio/detecting speaking
|
2014-08-12 09:25:15 -07:00 |
|
Anton Georgiev
|
1e465d66e8
|
we have a moving cursor
|
2014-08-12 16:18:29 +00:00 |
|
Anton Georgiev
|
8e0fc0cf15
|
working on displaying the presenter's cursor/pointer
|
2014-08-11 20:54:16 +00:00 |
|
perroned
|
446f4e5ad9
|
Added menu buttons back to options tab, fixed message scrolling
|
2014-08-11 12:43:49 -07:00 |
|
perroned
|
6db655e1df
|
Fixing chat ui
|
2014-08-11 12:32:42 -07:00 |
|
Anton Georgiev
|
04494aa8a4
|
cleaning up
|
2014-08-11 18:46:10 +00:00 |
|
Anton Georgiev
|
3070bc6682
|
shapes seem to be drawn at the right time. we don"t loop excessively
|
2014-08-11 18:41:03 +00:00 |
|
perroned
|
d6bcf90b3e
|
Lots of UI stuff
|
2014-08-11 09:21:14 -07:00 |
|
Anton Georgiev
|
49b44d3533
|
in the process of separating "shape"
|
2014-08-11 15:56:46 +00:00 |
|
Anton Georgiev
|
0a59398781
|
the server is common for all meetings. We should not clear the collections upon a user's departure. Fixed an error where after logout an html5 user would not be able to enter into a running meeting
|
2014-08-11 15:10:01 +00:00 |
|
Anton Georgiev
|
d1b7a72c0a
|
fixing separation of public from private chat. Now things look alright on the Flash side
|
2014-08-11 14:58:58 +00:00 |
|
perroned
|
ef0168fbf4
|
Added footer, fixed navbars
|
2014-08-08 12:30:28 -07:00 |
|
perroned
|
9aa7e182ec
|
Organized code :)
|
2014-08-08 09:04:04 -07:00 |
|
perroned
|
510905d000
|
Cleaning up UI
|
2014-08-08 08:18:38 -07:00 |
|
perroned
|
8060b0b20d
|
Fixed navbar and removed some unused things
|
2014-08-08 08:12:02 -07:00 |
|
perroned
|
43f3a041f8
|
Outlined changes that need to be made to prevent users from having multiple sessions.
|
2014-08-08 06:09:39 -07:00 |
|
perroned
|
72cd8c1050
|
Made prettier, cleaned up code, removed things in code and UI that arent needed
|
2014-08-07 13:29:13 -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 |
|
perroned
|
903eda589f
|
Major changes to UI and templates
|
2014-08-06 10:46:54 -07:00 |
|
perroned
|
682762cd21
|
First commit
|
2014-08-06 06:03:03 -07:00 |
|
perroned
|
e122e31521
|
Working on whiteboard positioning
|
2014-08-06 05:57:51 -07:00 |
|
Anton Georgiev
|
fea70bda5f
|
using coffeescript 'comprehension'
|
2014-08-05 21:48:11 +00:00 |
|
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 |
|
perroned
|
ed1ca4651e
|
Added lower hand
|
2014-08-05 11:14:19 -07: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 |
|
perroned
|
aff1b175f6
|
Merge branch 'prototype-metor-client' of https://github.com/perroned/bigbluebutton into prototype-metor-client
|
2014-07-31 13:48:24 -07:00 |
|
perroned
|
24918e943b
|
Supressed a lot of debugging
|
2014-07-31 13:31:50 -07:00 |
|
perroned
|
b3430cc09b
|
Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client
|
2014-07-31 13:22:45 -07:00 |
|
perroned
|
2d101e25e3
|
Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client
|
2014-07-31 12:24:37 -07:00 |
|
Anton Georgiev
|
df0d0668c0
|
cleaning up
|
2014-07-31 19:13:00 +00:00 |
|
Anton Georgiev
|
b0cc462953
|
needed to remove another line of obsolete code causing an error
|
2014-07-31 17:42:46 +00:00 |
|
Anton Georgiev
|
627f46f84e
|
was able to display a rectangle on the slide
|
2014-07-31 17:38:54 +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 |
|
perroned
|
1d7e4aed8d
|
Tidying UI
|
2014-07-31 07:29:45 -07:00 |
|
perroned
|
3d402ef11c
|
Adding user accessibility options
|
2014-07-31 07:11:01 -07:00 |
|
Anton Georgiev
|
fdd7c57d03
|
started work on drawing shapes
|
2014-07-30 21:31:12 +00:00 |
|
perroned
|
a15265b0c5
|
More tooltips :)
|
2014-07-30 13:51:54 -07:00 |
|
perroned
|
92eeb16c4b
|
Added more tooltips
|
2014-07-30 13:24:53 -07:00 |
|
perroned
|
39d47318d6
|
Added some tooltips
|
2014-07-30 13:22:23 -07:00 |
|
Anton Georgiev
|
0c9a17f308
|
remove Draw button
|
2014-07-30 19:42:34 +00:00 |
|