BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,414 Commits 13 Branches 260 Tags 1.1 GiB
b8a765f10d
Commit Graph

222 Commits

Author SHA1 Message Date
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
Maxim Khlobystov
f9a483561e Meteor client detects URLs inside messages received (from either Meteor or Flash). Outgoing messages are being parsed and re-rendered to be compatible with Flash client. 2014-08-01 10:38:48 -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
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
Maxim Khlobystov
3b10e80342 XX:00 bug in timestamps was fixed. 2014-07-28 11:04:40 -07: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
Maxim Khlobystov
e2fd5f5202 Chat message timestamp is fixed (converted from Epoch time to 24-hour clock). 2014-07-22 18:38:52 -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
Anton Georgiev
3ad1bdd341 Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-merge-private-chat 
Conflicts:
	labs/meteor-client/client/globals.coffee
	labs/meteor-client/client/views/chat/chat_bar.coffee
	labs/meteor-client/collections/collections.coffee
	labs/meteor-client/lib/router.coffee
	labs/meteor-client/server/publish.coffee
	labs/meteor-client/server/server.coffee
 2014-07-09 15:09:27 +00:00
perroned
098a4c7f81 Added private chat and chat tabs functionality. Tab UI is still buggy. 2014-07-09 06:18:52 -07:00
perroned
8bc9ace261 Make tabs reappear 2014-07-07 08:31:29 -07:00
perroned
adb7dbc77c working on private chat tabs 2014-07-07 08:30:17 -07:00
perroned
d0d4227d17 Made a tab creation helper 2014-07-04 08:00:46 -07:00
Anton Georgiev
52202527a8 use the user's username when sending a chat message 2014-07-03 20:39:47 +00:00
perroned
1b01ce8666 Added private chat creation and UI 2014-07-03 10:56:16 -07:00
Anton Georgiev
3fa27ae11a Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server 
Conflicts:
	labs/meteor-client/client/globals.coffee
 2014-07-02 19:10:12 +00:00
Anton Georgiev
22785c12bc cleaning up. The client side can only see one meeting 2014-07-02 17:13:00 +00:00
perroned
775d4ef0eb Added comments for future changes - 2 2014-07-02 09:23:30 -07:00
perroned
5c326e0cd6 Added comments for future changes 2014-07-02 09:21:33 -07:00
perroned
a85a706d1d Updated templates to new message format, the chat now displays real messages 2014-07-02 09:17:05 -07:00
perroned
a8defa1c30 Changes 2014-07-02 08:41:12 -07:00
Anton Georgiev
5ea58dfb23 fixing user logout 2014-07-02 15:09:55 +00:00
Anton Georgiev
d599a782a3 cleaning up 2014-06-27 19:47:16 +00:00
perroned
2beb2868b1 commented 2014-06-27 12:29:07 -07:00
Anton Georgiev
2fb970d9cd adjusting the parameter names so that they match what is recognized on the server 2014-06-27 19:10:11 +00:00
Anton Georgiev
d6851c39a4 when we try to send a chat message from the html5 client we now send a send_public_chat_message_request towards bbb-apps 2014-06-27 17:53:31 +00:00
Anton Georgiev
9a9c80efab when we press Enter, the chat message enters the collection 2014-06-27 17:31:01 +00:00
perroned
d53e340f28 Fixed bug in sending message, missing parentheses 2014-06-27 10:22:56 -07:00
perroned
8a213f6354 stress the current user 2014-06-27 06:59:31 -07:00
perroned
50e746e5da Fixed bug where help link changed current page, now opens new tab 2014-06-26 13:15:31 -07:00
perroned
090c5ae595 Fixed issue with no server version being displayed 2014-06-26 13:11:31 -07:00
perroned
f270f74903 Implemented auto scrolling to the bottom of the chat messages window, building chat message to send to server 2014-06-26 12:58:58 -07:00
perroned
2123998bcb Changed some toggles, fixed up some UI, more chat functionality 2014-06-26 10:13:19 -07:00
perroned
46cdeafabb Cleaned up lots of code, changed toggles to server calls 2014-06-26 08:14:43 -07:00
perroned
8971b21a90 Added some comments 2014-06-26 08:13:29 -07:00
perroned
7ac36b1cf6 Tidy up, more chat UI, log out user info to check for duplicates' 2014-06-25 11:51:16 -07:00
perroned
efb2177b2b Fixing up some UI 2014-06-25 07:04:04 -07:00
perroned
30bae7c80f Recreating chat UI 2014-06-25 06:28:15 -07:00
perroned
806bf90b4c Some tidying up and making things more proper 2014-06-24 11:39:32 -07:00
perroned
3eb07aec15 Fixed a bug when switching panes 2014-06-24 11:36:22 -07:00
perroned
34e62b838e Moved function 2014-06-24 11:11:51 -07:00
perroned
13df1b475b Working on chat UI 2014-06-24 11:11:26 -07:00
perroned
067463b866 beginning work on the chat UI 2014-06-24 06:46:42 -07:00
perroned
c282b46b4c Cleaning up the code a bit, placed rendering logic inside individual templates to be a bit neater 2014-06-23 12:54:17 -07:00
perroned
ac61ea7a24 Added sample whiteboard entry 2014-06-23 12:51:54 -07:00
perroned
c76378edff Added logout page 2014-06-23 12:11:57 -07:00
perroned
6005ea000e Fixed kicking users... for now, until things change again 2014-06-23 10:20:08 -07:00
perroned
63a3a4c737 Created a helper and rewrote logic to determine if user is sharing audio/video 2014-06-23 09:58:30 -07:00
perroned
70714bd320 Fixed some helpers and templates to match data format 2014-06-23 06:22:30 -07:00
perroned
466787ab47 Added new line feeds to files 2014-06-23 06:21:03 -07:00
perroned
b63a1cb549 Fixed setPresenter helper 2014-06-23 06:17:19 -07:00
perroned
01b7fc9111 Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client 
Conflicts:
	labs/meteor-client/client/views/users/user_list.coffee
	labs/meteor-client/server/insert-startup-data.js
 2014-06-20 07:32:12 -07:00
Anton Georgiev
82b8f9d134 Meteor.users -> Meteor.Users the collection should start with a capital letter 2014-06-19 21:29:52 +00:00
perroned
4e3dc04573 Removed 'sign in as...' buttons 2014-06-19 11:13:52 -07:00
perroned
124068a590 Use data from session now 2014-06-19 10:52:08 -07:00
perroned
eeb4558f92 Beginning chat system 2014-06-19 06:29:48 -07:00
perroned
6e1ec8f200 Updated more buttons to templates. Still trying to clean up code 2014-06-17 08:47:26 -07:00
perroned
18e729eaf1 Fixed some queries 2014-06-17 08:46:49 -07:00
perroned
1280a4dccf Changed button html to template 2014-06-17 08:08:34 -07:00
perroned
9f34755d88 Updated query based on available data 2014-06-17 08:08:07 -07:00
perroned
096892264d Formatting data into table cells 2014-06-16 12:11:55 -07:00
perroned
c52bef4e3c Formatting data into table cells 2014-06-16 12:11:22 -07:00
perroned
c12942aa45 Added scrolling in user's list 2014-06-16 11:31:44 -07:00
perroned
abdf769a2f Using bootstrap classes for layouts 2014-06-16 10:47:55 -07:00
perroned
4352bc2721 Restructured page layouts. There has to be a better way to do this. Spacebars is a pain 2014-06-16 10:47:16 -07:00
perroned
c20e7e2d1b Shortened some code. Added special handlers allowing for mods to edit another's user's data 2014-06-16 10:45:17 -07:00
perroned
1948e7c7a2 Removed uneeded functions to a different more appropriate scope 2014-06-13 11:17:58 -07:00
perroned
d0747c9418 Added iron router 2014-06-13 09:22:30 -07:00
perroned
8cabd766dc Some prettying up a bit with bootstrap 2014-06-12 12:12:09 -07:00
perroned
ef0272f768 Fixing up users collection to use meteor's built in users collection, fixed up some meteor-coffeescript compatability issues 2014-06-12 08:12:25 -07:00
perroned
21d9c7799f Migrating to coffeescript 2014-06-12 07:08:55 -07:00
perroned
2978ba1eed Fixed a bug with presenters and deletion 2014-06-12 06:18:40 -07:00
perroned
e609d2df9f Fixed up some permissions issues 2014-06-11 11:56:04 -07:00
perroned
740a3056e0 Implementing pseudo log in, to alter view based on user' 2014-06-11 11:52:58 -07:00
perroned
b86c9c8cce Added user toggles. And made them only accessible to individual user (i.e. moderator should only be able to turn off a students webcam and mic, not on 2014-06-11 09:11:07 -07:00
perroned
26c7050283 Trying to implement css/less from html5, cleaned up code a bit, added functionality to buttons 2014-06-11 08:21:09 -07:00
perroned
4e30f69e81 Added a few buttons that would show up for moderators or presenters 2014-06-10 12:59:58 -07:00
perroned
19ba6f37e2 Just a few comments 2014-06-10 12:26:42 -07:00
perroned
cb8b0d0e11 basic functionality for users 2014-06-10 12:19:20 -07:00
Richard Alam
1f9fe5cac7 - meteor 2014-06-06 15:19:09 -07:00