Commit Graph

8688 Commits

Author SHA1 Message Date
perroned
c5bc0bface Removing more presenter functionality from viewer branch. 2014-10-14 09:15:01 -07:00
perroned
b043b194b1 Removing presenter functionality from this viewer branch. 2014-10-14 08:51:08 -07:00
perroned
c03f2fd4a1 Merge remote-tracking branch 'maxim/meteor-client-whiteboard' into meteor-new-auth 2014-10-14 06:44:41 -07:00
perroned
f493ac733b Merge remote-tracking branch 'anton/meteor-new-auth' into meteor-new-auth 2014-10-14 06:43:49 -07:00
Maxim Khlobystov
de01ede378 Fixed the issue with whiteboard positioning in the browser window that is not full size. 2014-10-13 14:54:42 -07:00
Anton Georgiev
d65bfa8f55 recovered some functionality for audio (resulting in icons displaying in the html userlist). still have work to do 2014-10-10 21:35:51 +00:00
Anton Georgiev
0594828779 Merge branch 'meteor-client-whiteboard' of github.com:gthacoder/bigbluebutton into meteor-client-whiteboard 2014-10-10 18:51:21 +00:00
Anton Georgiev
939ea5d09f switching slides is back to normal 2014-10-10 18:45:12 +00:00
perroned
5209f8b9e3 Fixed new line character when joining messages. 2014-10-10 10:49:17 -07:00
Anton Georgiev
725583335b Merge branch 'meteor-disconnection-handling' into meteor-new-auth 2014-10-09 20:08:27 +00:00
Anton Georgiev
c7d3d9b9db minor fix for public chat messages 2014-10-09 20:05:29 +00:00
Anton Georgiev
79c40f3c31 Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into meteor-disconnection-handling 2014-10-09 19:56:30 +00:00
perroned
5beacad9f0 Fixed up some methods that weren't updated to use new id method. 2014-10-09 10:43:22 -07:00
perroned
dbd3478605 Cleaned up a bit. 2014-10-09 10:38:06 -07:00
perroned
9247921b1c Fixed muting and unmuting of users. 2014-10-09 10:27:44 -07:00
perroned
7d1afee614 Fixed joining and leaving audio. Muting remaining. 2014-10-09 09:48:27 -07:00
perroned
bc3e0f0ab3 Now use DBID for webrtc calls, and call server methods with updated params. 2014-10-09 09:39:58 -07:00
perroned
f010decbe9 Changed webrtc call to use nginx websocket. 2014-10-09 09:35:39 -07:00
perroned
17b468bc05 Made some code faster in places where we only need the size of the records returned. Take the count directly from the cursor returned instead of turning the cursor into an array first and taking the length. 2014-10-09 06:58:48 -07:00
perroned
dde59de62c Cleaned up UI with a message when you cannot chat with anyone. 2014-10-09 06:45:49 -07:00
Anton Georgiev
add73d17e2 identify disconnection 2014-10-08 22:05:57 +00:00
Anton Georgiev
631435e57e reduce clutter in js console 2014-10-08 21:57:33 +00:00
perroned
ab81ad8440 Removed backslash making a non standard escape character 2014-10-08 13:09:28 -07:00
Anton Georgiev
1a91092c82 cleaning up 2014-10-07 23:22:28 +00:00
Anton Georgiev
76a7e34357 fixed starting a private chat via clicking on the name in Options 2014-10-07 23:16:47 +00:00
Anton Georgiev
da846ac2d5 now the private chat messages are displayed 2014-10-07 23:09:33 +00:00
Anton Georgiev
4a93388c4d private chat using dbid 2014-10-07 23:08:48 +00:00
Anton Georgiev
9a901d56d7 version and date already set here: https://github.com/antobinary/bigbluebutton/blob/exploring-grunt/labs/meteor-client/app/client/main.coffee#L81-L82 2014-10-07 21:47:13 +00:00
Anton Georgiev
7ce7b96acf remove user after bbb-app's acknowledgement 2014-10-07 20:53:25 +00:00
Anton Georgiev
9261898476 fixed logging out 2014-10-07 20:34:03 +00:00
Anton Georgiev
7dccc09608 handle user_left_message 2014-10-07 20:08:36 +00:00
Anton Georgiev
846a59d4c8 Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into meteor-new-auth 2014-10-07 19:52:51 +00:00
Anton Georgiev
866bd4e539 minor things 2014-10-07 19:52:30 +00:00
perroned
2bca7df34d Fixed lowering and raising hands to use database id. 2014-10-07 12:28:54 -07:00
Anton Georgiev
aa270da0d2 fix footer version, date 2014-10-07 18:05:37 +00:00
Anton Georgiev
319a1247a1 Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into meteor-new-auth
Conflicts:
	labs/meteor-client/app/client/globals.coffee
	labs/meteor-client/app/client/views/chat/chat_bar.coffee
	labs/meteor-client/app/collections/chat.coffee
	labs/meteor-client/app/collections/meetings.coffee
	labs/meteor-client/app/collections/presentations.coffee
	labs/meteor-client/app/collections/shapes.coffee
	labs/meteor-client/app/collections/slides.coffee
	labs/meteor-client/app/collections/users.coffee
2014-10-07 17:45:47 +00:00
perroned
9ede339463 Fixed bug so now your name is highlighted and displayed to you in the participants window. 2014-10-07 09:37:37 -07:00
perroned
6d7c3bd72a Exclude yourself from list of participants you can chat with. 2014-10-07 09:36:10 -07:00
perroned
b1100641e5 Fixed function for identifying the current user. 2014-10-07 09:35:45 -07:00
perroned
ea60cef89b Added comment for something we need to fix later. 2014-10-07 09:30:04 -07:00
perroned
b4e6ec2e5d More appropriate message when error in retrieving meeting name. 2014-10-07 09:12:53 -07:00
perroned
fb8cabc445 Fixed login procedure, with help from Anton. 2014-10-07 08:47:46 -07:00
perroned
25cb1b80a0 fixed typo. 2014-10-07 08:44:30 -07:00
perroned
20c7ac5d17 Added a comment explaining a confusing bit of code. 2014-10-07 08:41:18 -07:00
perroned
e65cfb4fba Fixed issue when selecting public chat because it has no unique identifier. 2014-10-07 08:12:53 -07:00
perroned
f745320ece small changes 2014-10-07 06:27:17 -07:00
perroned
5e6981b2ad Exclude another field. 2014-10-07 06:26:38 -07:00
perroned
47b2c8314c removed useless security check. 2014-10-03 11:09:44 -07:00
perroned
06b09e744f Remove sample data. 2014-10-03 10:34:52 -07:00
perroned
d813870f52 Temporary function to retrieve user info. 2014-10-03 10:32:44 -07:00