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

9157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Leonardo Crauss Daronco
81f5a109b6 Merge remote-tracking branch 'upstream/master' into webhooks-2.0 2014-11-14 14:28:35 -02:00
Leonardo Crauss Daronco
8fc251c55b Webhooks: follow redirects on callback calls, up to 10 times 2014-11-14 14:26:29 -02:00
Leonardo Crauss Daronco
536decff7c Webhooks: use winston for logging and rotate log files 2014-11-14 14:12:37 -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
Leonardo Crauss Daronco
6260f26101 Webhooks: adjustments for the app when running in production 2014-11-14 11:58:12 -02:00
Leonardo Crauss Daronco
31666bc7fb Webhooks: add config files for upstart and monit 2014-11-14 11:23:04 -02:00
Leonardo Crauss Daronco
592a2f92dd Webhooks: add an extra app to print events from a meeting 
Utility app to help a user find out the events that happen in a meeting.
 2014-11-14 11:07:16 -02:00
Leonardo Crauss Daronco
329a1ff959 Webhooks: local config, docs and improve how the checksum is calculated 
The way the checksum is calculated now is more similar to the other API calls,
specially setConfigXML. It uses the content type 'application/x-www-form-urlencoded'
so the information in the post body doesn't have to be converted from/to
js/string, preventing possible checksum errors in different programming
languages.
 2014-11-14 11:05:20 -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
Fred Dixon
9c0f91a560 Merge pull request #431 from kepstin/recording-updates 
Delete the 'slides' processing scripts
 2014-11-13 12:21:52 -02:00
Leonardo Crauss Daronco
6dbcf1bab2 Webhooks: rename MeetingIDMap to IDMapping 2014-11-13 12:15:20 -02:00
Leonardo Crauss Daronco
14641d1a3b Webhooks: expire mappings for inactive meetings 
If a meeting has no events for too long (24 hours), remove the meeting
mapping to prevent too much data from being stored forever on redis.
 2014-11-13 12:03:42 -02:00
Anton Georgiev
0f3a877402 modified the url for routing to the sign in page 2014-11-13 08:46:39 -05:00
Calvin Walton
3e8019f5a0 Delete the 'slides' processing scripts 
The slides processing scripts have never been updated for 0.9.0 events,
and probably never will be. They're still using older video/audio
processing apis that have poor sync, too. Just remove them.

The playback support files will still be installed, to allow recordings
from old BigBlueButton servers to be copied to a 0.9.0 server.
 2014-11-13 11:15:43 -02:00
Richard Alam
4e6208b0cd Merge pull request #420 from SenecaCDOT-BigBlueButton/add-layout-translation 
Add layout translation
 2014-11-13 07:09:31 -05:00
Maxim Khlobystov
425c2b533b Added unit tests for the server side private methods used to add/remove slides. 2014-11-12 19:42:17 -08:00
Maxim Khlobystov
b9462e4f2a Got rid of the spec related to deletePrivateChatMessages() (the method didn't exist anymore). 2014-11-12 18:50:21 -08:00
Anton Georgiev
f9ed2a23b5 (not complete) on meteor 1.0 2014-11-12 16:04:03 -05:00
Fred Dixon
49e553d160 Merge pull request #429 from ffdixon/check-updates 
Added support for client system check in bbb-conf
 2014-11-12 19:02:45 -02:00
Anton Georgiev
623136670a Merge branch 'merge-with-tests' of github.com:lfzawacki/bigbluebutton into merge-with-tests 
Conflicts:
	labs/meteor-client/app/.meteor/packages
 2014-11-12 16:00:44 -05:00
Fred Dixon
2f238d0e5e Added support for client system check in bbb-conf 
bbb-conf now
  - prints out the host in /var/www/bigbluebutton/check/config.xml
  - updates above config.xml with sudo bbb-conf --setip
 2014-11-12 16:00:21 -05:00