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

8893 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
damaren
7a004601b8 the two files that should have been in the last commit 2014-11-14 18:18:47 -02: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
Richard Alam
3ab963fa48 Merge pull request #434 from mconf/improving-client-checks 
Minor change at the sip test
 2014-11-14 14:19:10 -05:00
Felipe Cecagno
3679674134 fixed the sip test changed since the last pull request, also adding more details when a rtmp connection is not successfully established 2014-11-14 17:09:51 -02:00
Lucas Zawacki
df8dda5d5f Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2014-11-14 16:01:31 -02:00
Lucas Zawacki
7d401dab53 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-with-tests 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
 2014-11-14 15:33:17 -02:00
Richard Alam
f53ec0262c Merge pull request #433 from mconf/improving-client-checks 
Improving client checks
 2014-11-14 12:22:27 -05:00
Felipe Cecagno
ff46c8d833 removed the Succeeded status message 2014-11-14 15:10:10 -02:00
Felipe Cecagno
ad7765dedb Merge branch 'improving-client-checks' of github.com:mconf/bigbluebutton into improving-client-checks 2014-11-14 15:04:50 -02:00
Pedro Beschorner Marin
c2c7b43d3c Added priority sort and some locale refactor 2014-11-14 14:56:53 -02:00
Felipe Cecagno
a16faf320b Merge branch 'improving-client-checks' of github.com:mconf/bigbluebutton into improving-client-checks 2014-11-14 14:55:48 -02:00
Felipe Cecagno
2433e659d7 added a script to generate a random file, that should be used later on the client check 2014-11-14 14:54:41 -02:00
Lucas Zawacki
92584c1cad Merge branch 'merge-with-tests' of https://github.com/antobinary/bigbluebutton into merge-with-tests 2014-11-14 14:31:53 -02:00
Felipe Cecagno
89d79201c9 using a bigger image for the download test; providing immediate feedback about the download speed for the user, with incremental changes; reduced the precision of the ping test; set the mail button to open the client e-mail on a blank page 2014-11-14 14:29:05 -02:00
Anton Georgiev
9ef7ad5edc using roles and predefined permissions per role for raising/lowering hand 2014-11-14 11:00:55 -05:00
Chad Pilkey
d79654a3fe Merge pull request #432 from ritzalam/upgrade-to-red5-nov-4-2014 
Upgrade to latest Red5 (e1da8d0ccaa06a461f2e0674603de17ae0b03f1a)
 2014-11-14 10:53:37 -05:00
Calvin Walton
213dc07c19 Merge pull request #428 from mconf/rap-publish-events 
Rap publish events
 2014-11-14 12:08:44 -02:00
Richard Alam
ee4e5f1a47 Merge branch 'master' into upgrade-to-red5-nov-4-2014 2014-11-14 03:49:14 -08:00
Pedro Beschorner Marin
7064aae077 Email body function 2014-11-14 09:36:49 -02:00
Felipe Cecagno
1c143c74a1 refactored rap-worker so variable names make more sense than before 2014-11-13 23:10:22 -02:00
Pedro Beschorner Marin
8c2908b1b2 Merged with my modifications 2014-11-13 19:20:19 -02:00
Lucas Zawacki
0a92c0e138 Merge branch 'merge-with-tests' of https://github.com/antobinary/bigbluebutton into merge-with-tests 2014-11-13 18:54:46 -02:00
Lucas Zawacki
6721e3395f Add velocity:core and velocity:html-report back and mock logging 2014-11-13 18:53:54 -02:00
Anton Georgiev
826b6658a7 remove moderator condition 2014-11-13 15:52:42 -05:00
Anton Georgiev
c275778b19 using the userSecret to control the permissions for raise/lower hand 2014-11-13 15:04:51 -05:00
Pedro Beschorner Marin
110b72f6c1 Refactored the config email and added a version field 2014-11-13 17:03:26 -02:00
Felipe Cecagno
6d4f1192da added proper java check; extracted some strings to the localization file; cleanup 2014-11-13 16:35:02 -02:00
Maxim Khlobystov
bbbb51a8a5 Added the first set of integration tests for the whiteboard template. 2014-11-13 16:06:45 -02:00
Maxim Khlobystov
367b6eb3f5 Improved the quality of usersList rendering specs and added some new test cases. 
Conflicts:
	labs/meteor-client/app/tests/jasmine/client/integration/templates/usersList/usersListSpec.js
 2014-11-13 16:06:24 -02:00
Pedro Beschorner Marin
abf099a0e7 Refresh and email buttons in main view and corrected some layout issues 2014-11-13 16:01:53 -02:00
Pedro Beschorner Marin
fd9b8bb2bc Refactored MainViewMediator dataProvider and added administrator email in config.xml 2014-11-13 15:59:22 -02:00
Anton Georgiev
65d858e737 added an alphanumeric userSecret with length 10 symbols 2014-11-13 12:54:50 -05:00
Pedro Beschorner Marin
2aa08a5d33 Adding email button files 2014-11-13 15:50:48 -02:00
Pedro Beschorner Marin
e8456c7ce5 Adding refresh button files 2014-11-13 15:48:40 -02:00
Lucas Zawacki
2bb32218fa Merge branch 'meteor-client-tests' of https://github.com/gthacoder/bigbluebutton into merge-with-tests 
Conflicts:
	labs/meteor-client/app/tests/jasmine/server/unit/CollectionMethodsSpec.js
 2014-11-13 15:28:51 -02:00
Lucas Zawacki
0b3e1e570e Using iron-router params.query syntax in router.coffee 2014-11-13 12:29:27 -02:00