Commit Graph

62 Commits

Author SHA1 Message Date
Anton Georgiev
f9dc0fdac1 clean Session var on logout 2014-12-05 18:53:53 +00:00
Anton Georgiev
596bacbc09 fixing issue where meetingName was using old value from Session 2014-12-04 21:31:13 +00:00
Anton Georgiev
171f3dccfc reworked the toggle on/off expanding 2014-12-02 22:52:03 +00:00
Anton Georgiev
2073c742b6 could not properly append the width without the ; 2014-12-02 16:23:30 +00:00
Maxim Khlobystov
b58bfb78c2 Fixed the issue with all the tabs re-displayed on refreshing or receiving a new message regardless of the previous tabs state. 2014-11-30 18:39:33 -08:00
Anton Georgiev
de36894cee must clear the chat tabs on logout 2014-11-28 16:41:00 +00:00
Anton Georgiev
7cc9e97730 there is no need currently to hide the navbar on logout 2014-11-27 23:28:06 +00:00
Anton Georgiev
d64e324bf8 remove duplicate def of setInSession 2014-11-27 23:25:06 +00:00
Anton Georgiev
cbe31eb4c0 the reconnect button on logout logs you back in the meeting 2014-11-27 23:24:14 +00:00
Anton Georgiev
b1399a8d40 removed dbid 2014-11-27 22:08:33 +00:00
Anton Georgiev
6ba5d39b93 dbid->userid for chat tabs 2014-11-27 22:02:19 +00:00
Maxim Khlobystov
a2d868643b Merge branch 'master' of https://github.com/antobinary/bigbluebutton into meteor-client-post-summit-merge
Conflicts:
	labs/meteor-client/app/client/globals.coffee
2014-11-26 11:19:28 -08:00
Maxim Khlobystov
8256f78db1 Merge branch 'master' of https://github.com/antobinary/bigbluebutton into meteor-client-viewer
Conflicts:
	labs/meteor-client/app/.meteor/packages
	labs/meteor-client/app/.meteor/versions
	labs/meteor-client/app/client/main.coffee
	labs/meteor-client/app/client/stylesheets/style.css
2014-11-24 13:08:44 -08:00
Maxim Khlobystov
075ca4e18c Moved from client-side-only collection for tracking chat tabs to its Session analogue. 2014-11-21 19:26:02 -08:00
Anton Georgiev
a544329079 not needed anymore 2014-11-21 17:52:14 +00:00
Anton Georgiev
e7b6a48934 not used anywhere 2014-11-21 17:51:44 +00:00
Anton Georgiev
eb05ad18a5 authToken instead of userSecret 2014-11-21 17:45:44 +00:00
Anton Georgiev
f5bda18c49 authToken instead of userSecret 2014-11-21 17:36:21 +00:00
Anton Georgiev
624354e246 use userId instead of the changing dbid 2014-11-21 17:28:50 +00:00
Anton Georgiev
a2bbc548f0 setInSession was defined twice 2014-11-21 17:25:42 +00:00
Anton Georgiev
93f2338dae subscribe using the token 2014-11-21 15:05:03 +00:00
Anton Georgiev
81d8fbde08 function whoami to help during development 2014-11-19 23:22:50 +00:00
Anton Georgiev
0616c593f3 function whoami to help during development 2014-11-19 23:21:12 +00:00
Anton Georgiev
a2d739a113 changed isCurrentUser to use userId 2014-11-19 23:20:34 +00:00
Anton Georgiev
a31246c6f9 join audio, leave audio don't need server side assistance at this point 2014-11-18 22:44:52 +00:00
Anton Georgiev
9c4e7f80e2 reworked userLogout, added secret 2014-11-18 22:03:13 +00:00
Anton Georgiev
0f61fbed24 reworked [un]muting user so it uses userId and userSecret 2014-11-18 19:35:51 +00:00
damaren
690f1a291b added a button in the logout page to redirect the user to the login page 2014-11-14 18:03:45 -02:00
Lucas Zawacki
ca8133070b Write parts of the client using the BBB api bridge methods 2014-11-12 11:30:34 -02:00
Lucas Zawacki
da1558c100 Include sipjs libraries from bbb client 2014-11-11 16:56:39 -02:00
Anton Georgiev
a1e0c62336 switched JSSIP for SIP for WebRTC audio calling. BBB summit - Lucas, Anton 2014-11-11 16:41:33 -02:00
perroned
e4eae36c38 Cleaned code. Fixed extra conversation positioning. 2014-11-06 07:27:43 -08:00
perroned
213eb65ea3 Merge remote-tracking branch 'anton/meteor-disconnection-02' into meteor-new-auth
Conflicts:
	labs/meteor-client/app/client/globals.coffee
2014-11-04 06:20:55 -08:00
perroned
1b33cb2f0e Merge remote-tracking branch 'maxim/meteor-client-viewer' into meteor-new-auth 2014-11-04 06:00:10 -08:00
Maxim Khlobystov
9c8a71746d Made cursor position adjustable to the coordinate system shift caused by zooming. 2014-11-02 14:14:16 -08:00
Anton Georgiev
1a43a4dfed made sendMeetingInfoToClient to be a normal function; cleaning up 2014-10-31 15:25:32 +00:00
Anton Georgiev
5554a0d6b1 user reconnects successfully even if offline for more than x seconds. (needs further verification) 2014-10-30 23:05:28 +00:00
Anton Georgiev
bc812c88e3 client side notification when disconnected/reconnecting 2014-10-30 15:00:45 +00:00
Anton Georgiev
b1f444f0c3 need to return the Users cursor only after the user was added to the collection 2014-10-29 21:58:57 +00:00
perroned
524918ffcc Organized code, added a safe string helper. 2014-10-28 07:24:56 -07:00
Anton Georgiev
09ab585bcc fix indent, lint 2014-10-24 15:09:58 +00:00
perroned
ce41c6798d Merge remote-tracking branch 'anton/meteor-new-auth' into meteor-new-auth
Conflicts:
	labs/meteor-client/app/client/views/whiteboard/slide.coffee
	labs/meteor-client/app/server/collection_methods/users.coffee
2014-10-16 06:15:13 -07:00
Anton Georgiev
b1f361a1ed cleaning up 2014-10-14 22:40:39 +00:00
Anton Georgiev
61da2885a9 fixes for isCurrentUserTalking 2014-10-14 22:38:15 +00:00
Anton Georgiev
d1f5bcab2f joining and leaving audio is working fine now 2014-10-14 21:59:49 +00:00
Anton Georgiev
531b141e7c mute/unmute is working now 2014-10-14 21:20:27 +00:00
Anton Georgiev
97bc187bfc fixed a bug where joining audio on the html5 side would add a user + a few minor changes for isTalking 2014-10-14 20:25:45 +00:00
perroned
b043b194b1 Removing presenter functionality from this viewer branch. 2014-10-14 08:51:08 -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
perroned
5beacad9f0 Fixed up some methods that weren't updated to use new id method. 2014-10-09 10:43:22 -07:00