Commit Graph

8113 Commits

Author SHA1 Message Date
Chad Pilkey
acde1ef3ed Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into remove-chat-translation 2014-11-26 09:14:18 -08:00
Richard Alam
864143253b Merge pull request #441 from mconf/record-notification-config
Recording notification configurable by the config.xml
2014-11-26 10:06:21 -05:00
Richard Alam
465bceb84a Merge pull request #440 from daronco/webhooks
New implementation of the webhooks
2014-11-26 09:52:05 -05:00
Fred Dixon
ca01fb7121 Merge pull request #443 from SenecaCDOT-BigBlueButton/fix-audio-null-ref
Fixed a null reference in WebRTCCallManager
2014-11-25 18:38:48 -05:00
Chad Pilkey
fe09c20911 fixed a null reference in WebRTCCallManager 2014-11-25 15:39:50 -08:00
Chad Pilkey
5cbb059aa6 removed all of the old google translate code in apps and client 2014-11-25 15:17:06 -08:00
Felipe Cecagno
93352a7ea4 make the recording notification alert configurable by the config.xml
the notification shows up to remind the moderator to click the record button and start the recording
2014-11-25 17:50:11 -02:00
Calvin Walton
fd7faf9584 Merge pull request #437 from ern/playback-checkUrl
Update BBB 0.81 compatibility playback files to use the same check as the 0.9 files for video file presence.
2014-11-25 13:33:23 -05:00
ern
7bf4a81039 checkUrl returns true for only 200 status 2014-11-25 13:11:57 -05:00
Leonardo Crauss Daronco
b12ea8252d Webhooks: fix callbacks not being sent for create meeting events
Meeting ID mappings have to be created before the meeting created event is
processed, otherwise they won't generate callbacks to hook registered for
that meetingID only.
2014-11-24 14:34:03 -02:00
Leonardo Crauss Daronco
2c63aa6796 Merge remote-tracking branch 'upstream/master' into webhooks 2014-11-24 13:55:55 -02:00
Leonardo Crauss Daronco
b568560df4 Webhooks: any 2xx status should be taken as successful 2014-11-24 13:01:13 -02:00
Leonardo Crauss Daronco
9366bd766b Move labs/bbb-callback to labs/bbb-webhooks 2014-11-24 12:56:04 -02:00
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
Richard Alam
b9b9328151 - remote logging noise 2014-11-20 22:33:25 +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
ern
8c023cbebd Any 200 status in checkUrl should be valid 2014-11-18 09:00:27 -05: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
Leonardo Crauss Daronco
feaf75901e Webhooks: add a post catcher application for testing 2014-11-14 17:55:44 -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
Leonardo Crauss Daronco
7efb3a18ab Webhooks: trigger callbacks for recording events too 2014-11-14 16:53:46 -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
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
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
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
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