BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,514 Commits 13 Branches 260 Tags 1.1 GiB
401b76dda0
Commit Graph

9514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
9f63905a7b Merge pull request #439 from bigbluebutton/cleanup-logging 
- remote logging noise
 2014-11-21 16:44:15 -05:00
Richard Alam
45c4a889db Merge pull request #438 from bigbluebutton/fix-duplicate-user-entries 
- for some reason we either (a) get duplicate events for user join from...
 2014-11-21 16:44:03 -05:00
Anton Georgiev
6af440d219 cleaning up 2014-11-21 20:57:36 +00:00
Anton Georgiev
0e7f9e8bb3 delete the users from the collection on meeting end 2014-11-21 20:51:37 +00:00
Anton Georgiev
fe858d3888 when a user leaves the meeting mark the user as offline instead of removing from the collection 2014-11-21 20:29:07 +00:00
Anton Georgiev
b01e8e5418 cleaning up router.coffee 2014-11-21 18:02:53 +00: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
c0b9ba37ee we no longer use getMyInfo() 2014-11-21 17:35:04 +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
a003365d35 redoing the router with authToken 2014-11-21 17:07:16 +00:00
Anton Georgiev
93f2338dae subscribe using the token 2014-11-21 15:05:03 +00:00
Maxim Khlobystov
9629fcbc9f Customized the Confirm Logout box. 2014-11-20 19:15:29 -08:00
Anton Georgiev
261066c8ae use authToken for subscribing 2014-11-20 23:35:30 +00:00
Richard Alam
b9b9328151 - remote logging noise 2014-11-20 22:33:25 +00:00
Anton Georgiev
a504be308c multi is false by default 2014-11-20 22:01:26 +00:00
Anton Georgiev
1a8019edfc removed html reporter 2014-11-20 21:36:18 +00:00
Anton Georgiev
ecacf5010b on regiser user add the user to the collection. on userjoin update the user 2014-11-20 21:32:51 +00:00
Anton Georgiev
0bf242900d authToken is now different than userid 2014-11-20 19:09:41 +00:00
Richard Alam
1d234e13be - for some reason we either (a) get duplicate events for user join from FS or (b) FS-ESL isn't handling 
the event properly. This results in duplicate entries on the user's list when user calls in from the
   phone. Check if a voice user with the same id is already in the voice conference and ignore the second
   event.
 2014-11-20 18:53:09 +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
4ab88b2a32 added the meetingId when searching for the user 2014-11-19 20:47:37 +00:00
Anton Georgiev
9e628b0282 put the disconnection handling code back in place 2014-11-19 20:14:19 +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
004b6d40ba we don't need to send user_join_voice_request or user_leave_voice_request. It's automatic 2014-11-18 19:54:46 +00:00
Anton Georgiev
0f61fbed24 reworked [un]muting user so it uses userId and userSecret 2014-11-18 19:35:51 +00:00
Anton Georgiev
45e1eb1ac3 lint of users.coffee 2014-11-18 16:28:00 +00:00
Anton Georgiev
058fa24437 Merge branch 'meteor-client-tests' of github.com:gthacoder/bigbluebutton into meteor-working-on-permissions 
Conflicts:
	labs/meteor-client/app/.meteor/packages
	labs/meteor-client/app/.meteor/versions
 2014-11-18 15:55:29 +00:00
Anton Georgiev
759ee46ca4 removing html-reporter 2014-11-18 15:49:47 +00:00
Anton Georgiev
51f070bccf shortened the message 
(not sure why but we were getting an error with the previous version of the message)
 2014-11-18 15:47:43 +00:00
ern
8c023cbebd Any 200 status in checkUrl should be valid 2014-11-18 09:00:27 -05:00
Anton Georgiev
4bfc8d4d41 Merge branch 'master' of github.com:antobinary/bigbluebutton into testing-version-006 2014-11-17 22:48:00 +00:00
Anton Georgiev
df45df31ab Tyler:work in progress on user items 2014-11-17 22:44:47 +00:00
Anton Georgiev
a9ebc858c1 the sip library was renamed 2014-11-17 22:02:17 +00:00
Maxim Khlobystov
f1bbcb2a49 Cleaning up. 2014-11-17 13:49:46 -08:00
Maxim Khlobystov
c4b352d87b Made all the Jasmine suites disabled by default. 2014-11-17 13:40:19 -08:00
Anton Georgiev
5b06e60d0f Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2014-11-17 21:36:27 +00:00
Maxim Khlobystov
fb1bc92ada Removed a file containing a sample server-side unit test. 2014-11-17 13:31:32 -08:00
Maxim Khlobystov
b5a8fdd172 Removed Velocity HTML reporter. 2014-11-17 13:26:31 -08:00
Fred Dixon
16bbf72efd Merge pull request #436 from mconf/improving-client-checks 
Client check - fixing a bug introduced by last commit
 2014-11-16 19:37:45 -05:00
Felipe Cecagno
6a402c0c11 fixing a bug introduced by last commit 2014-11-16 20:14:17 -02:00
Fred Dixon
298a0e4525 Merge pull request #435 from mconf/improving-client-checks 
Client check - improvements to the webrtc related tests
 2014-11-16 17:06:02 -05:00
Felipe Cecagno
08e521ed9f improved the client check so now it uses sip.js and bbb_webrtc_bridge_sip.js from the bigbluebutton-client, so it's going to be easier to maintain; included some new callbacks on bigbluebutton-client related to the websockets; just after the webrtc test, the connection is closed 2014-11-16 19:53:37 -02:00
Anton Georgiev
0d730be024 Merge pull request #1 from damaren/logout-to-login-redirect 
added a button in the logout page to redirect the user to the login page
 2014-11-14 15:36:05 -05:00