Commit Graph

122 Commits

Author SHA1 Message Date
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
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
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
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
Anton Georgiev
0c9a17f308 remove Draw button 2014-07-30 19:42:34 +00:00
Anton Georgiev
e966ae84ca cleaning up 2014-07-30 18:29:02 +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
042ba3cc00 Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client 2014-07-29 10:07:12 -07:00
perroned
bc0b2ccee7 Clear private chat messages when conversation is closed. 2014-07-29 08:04:55 -07:00
perroned
30d96b8229 User raise hand ability since html5 client will be for students/viewers 2014-07-29 07:20:51 -07:00
Anton Georgiev
7730abbeb8 fix for the merge and fix for an issue with get_all_meetings_request not recognized in bbb-apps 2014-07-28 21:01:06 +00:00
Anton Georgiev
3075166fa8 Merge branch 'meteor-merge-private-chat' into meteor-rebuild-server
Conflicts:
	labs/meteor-client/client/views/chat/chat_bar.coffee
2014-07-28 19:56:40 +00:00
perroned
7e8cedc4dc Updated UI to now show whether a user is sharing audio and further whether the user is actually speaking or not. 2014-07-28 10:43:26 -07:00
perroned
4be030ef2f Clear user data when they logout 2014-07-28 08:00:07 -07:00
perroned
3eb2ce47e8 Display header only when user is actually inside 2014-07-24 13:04:53 -07:00
perroned
47c28469d8 Manual merge of meteor-client-change-logout into prototype-metor-client 2014-07-24 11:04:12 -07:00
perroned
62dde1fb8c Restructured logout procedure 2014-07-24 10:56:31 -07:00
perroned
f826215dd7 Now displays when user is actually talking 2014-07-24 09:12:27 -07:00
perroned
44c16be891 Update user list title 2014-07-24 07:42:17 -07:00
perroned
f45abb866b Fixed message scrolling and added some message filtering 2014-07-22 06:33:27 -07:00
perroned
eb7c8d0507 Kicking users now works properly 2014-07-21 08:54:38 -07:00
perroned
3214985e4e Commented code 2014-07-18 07:08:59 -07:00
perroned
7e4b88a5d1 Updated session calls to use amplifies session. data now preserved upon refresh 2014-07-17 13:13:06 -07:00
perroned
11bb0daf89 Fixing up chat tabs... again. 2014-07-17 08:25:56 -07:00
perroned
fdc214dd65 Removed some clutter, fixing up packages and environment 2014-07-16 11:10:27 -07:00
perroned
b72568600d Fixed the view to make private chat sort messages correctly 2014-07-11 09:05:30 -07:00
perroned
9d0c06b086 Fixed messages to display previous messages from before join, display greeting, then display new messages accordingly 2014-07-11 08:53:49 -07:00
perroned
239666d2ef Trying to fix up, still a big mess 2014-07-10 07:36:29 -07:00
perroned
4001373438 Still trying to get the tabs UI working 2014-07-10 06:11:38 -07:00
Anton Georgiev
7ea4571568 coffeescript proper style 2014-07-09 19:09:10 +00:00