Anton Georgiev
6efde7e2aa
Merge branch 'meteor-improving-login' into testing-version-005
2014-11-12 09:15:36 -05:00
Anton Georgiev
7b2ea01b30
Merge branch 'meteor-sip' of github.com:lfzawacki/bigbluebutton into testing-version-005
...
Conflicts:
labs/meteor-client/app/client/globals.coffee
2014-11-12 08:57:59 -05:00
Leonardo Crauss Daronco
fd90a46563
Webhooks: implement the API method to list available hooks
2014-11-12 11:38:00 -02:00
Lucas Zawacki
ca8133070b
Write parts of the client using the BBB api bridge methods
2014-11-12 11:30:34 -02:00
Leonardo Crauss Daronco
79609fadb2
Webhooks: use more "hook" and less "subscription" for consistency
...
It now creates and destroys hooks instead of creating and removing
subscriptions.
2014-11-12 11:28:49 -02:00
Anton Georgiev
4727737691
moved the re-subscription to users to be at the end because on / it was stopping the subscription to the other collections. As a result we were not able to send a chat message immediately after login. We had to refresh first
2014-11-12 08:15:13 -05:00
Calvin Walton
961898c1e9
Add delay before recording archiving to workaround Red5 race
...
Right now there is a possibility that the rap-worker process might
see the recording.done file (written by bbb-web) prior to Red5 having
completed writing the video files to disk.
This happens most often when a meeting end api request is sent while a
webcam is visible.
Add a delay (currently 2 minutes) before the archive scripts are run
to work around the issue. Real fix is far more complicated...
2014-11-12 11:13:57 -02:00
Fred Dixon
79f4ffb7f8
Merge pull request #422 from mconf/improving-client-checks
...
Improved client checks -- looks good Felipe.
2014-11-12 11:04:30 -02:00
Felipe Cecagno
739287bce0
added a nginx config file so anybody can run the client check from a dev environment
2014-11-12 10:54:38 -02:00
Felipe Cecagno
9a8e299648
changed the client check output dir from bin-release/ to check/
2014-11-12 10:54:13 -02:00
Leonardo Crauss Daronco
c25082bafa
Wehbooks: hooks can now subscribe to a single meeting
...
Hooks can be global, to receive events from all meetings, or can receive
events for a single meeting. Depends on whether the meetingID parameter is
informed or not in the hooks/subscribe API call.
Also improved the log messages a bit.
2014-11-12 10:53:49 -02:00
Felipe Cecagno
740d61f205
fixed the build.xml so ant works in a clean environment
2014-11-12 10:53:38 -02:00
Anton Georgiev
0fe03afa28
on / updates the dbid
2014-11-12 07:53:36 -05:00
Felipe Cecagno
21f0ea139a
renamed BBBClientCheck.html to index.html; moved the locale to outside the src directory (mxml warning)
2014-11-12 10:53:02 -02:00
Felipe Cecagno
535604b8b6
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into improving-client-checks
2014-11-12 10:38:00 -02:00
Maxim Khlobystov
68d1f4aea6
Added more unit tests to cover shapes.coffee.
2014-11-11 18:28:13 -08:00
Fred Dixon
1ef484ba95
Aligned URL path for config.xml with install directory
2014-11-11 17:00:05 -05:00
Leonardo Crauss Daronco
31fe86c19d
Webhooks: keep a mapping of internal and external meeting IDs
2014-11-11 18:48:23 -02:00
Richard Alam
1422510537
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2014-11-11 12:22:23 -08:00
Leonardo Crauss Daronco
7b37c8e8b6
Merge remote-tracking branch 'mconf/external-meeting-id-into-apps' into webhooks-2.0
2014-11-11 17:57:35 -02:00
Anton Georgiev
201de6e202
(not complete)on login the user is allowed to proceed towards the client only if added to the collection (i.e. if validation succeeded).
2014-11-11 14:54:28 -05:00
Felipe Cecagno
8a89cd1a71
sending the externalMeetingId from bbb-web to bbb-apps, so bbb-apps can use it on redis pubsub message meeting_created_message
2014-11-11 17:54:17 -02:00
Leonardo Crauss Daronco
e884643ac0
Webhooks: fix callbacks being called multiple times
2014-11-11 17:54:00 -02:00
Leonardo Crauss Daronco
4e72d53b94
Webhooks: sign callback calls with a checksum
...
Simple signature done initially in a way similar to how bbb-web does it.
2014-11-11 17:36:01 -02:00
Fred Dixon
0df34bcb82
Merge pull request #421 from SenecaCDOT-BigBlueButton/add-mobile-demo
...
Updated the mobile demo to work with the upcoming BBB AIR Mobile app
2014-11-11 17:35:45 -02:00
Chad Pilkey
a7c4e6fd43
updated the mobile demo to work with the upcoming BBB AIR Mobile app
2014-11-11 11:32:19 -08:00
Pedro Beschorner Marin
d2cda28761
Merge branch 'improving-client-checks' of https://github.com/mconf/bigbluebutton into improving-client-checks
2014-11-11 17:31:54 -02:00
Chad Pilkey
e2f71bec3a
changed two of the layout names
2014-11-11 11:29:34 -08:00
Pedro Beschorner Marin
3c4b980ace
Bugfix: removing event listeners and closing netconnections
2014-11-11 17:16:16 -02:00
Lucas Zawacki
da1558c100
Include sipjs libraries from bbb client
2014-11-11 16:56:39 -02:00
Leonardo Crauss Daronco
e070f3c5c5
Webhooks: block multiple subscriptions to the same callback URL
...
Will allow only one subscription to a given callback URL. If trying to
subscribe again to the same URL, will return success but with a message
saying the callback URL is duplicated, very similar to the response of
create when called multiple times.
2014-11-11 16:56:15 -02:00
Leonardo Crauss Daronco
6fc50f0a7e
Webhooks: use hooks in memory when generating callback calls
2014-11-11 16:43:41 -02:00
Lucas Zawacki
a54348a908
Use hostname instead of host on javascript webrtc bridge client code
...
This prevents it from appending the port number when a request is made from
the HTML5 client
2014-11-11 16:42:45 -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
Felipe Cecagno
ca1fbb136d
cleanup; using a config.xml template, and added some logic in the build.xml to set config.xml with the proper host IP
2014-11-11 16:33:25 -02:00
Chad Pilkey
a23cd2a7c9
added translation of the default layout definitions
2014-11-11 10:26:10 -08:00
Chad Pilkey
3b34e53efe
Reenable the LayoutChangeEvent
2014-11-11 09:53:54 -08:00
Leonardo Crauss Daronco
dae00ac668
Webhooks: implement subscribe and unsubscribe API calls
...
Saving subscriptions to a local database for now.
2014-11-11 15:48:36 -02:00
Felipe Cecagno
7ce57fbc46
implemented the policy request on deskshare service, to support check on port 9123 by the client checker
2014-11-11 15:47:54 -02:00
Leonardo Crauss Daronco
cbc144b5cc
Webhooks: add config file for nginx
...
To proxy API calls to the webhooks app.
2014-11-11 15:07:43 -02:00
Leonardo Crauss Daronco
21d9d8ae96
Webhooks: basic routes and checksum calculation
2014-11-11 15:07:05 -02:00
Richard Alam
b467572fdb
- put sending of rtp packet to fs in another thread
2014-11-11 08:11:32 -08:00
Fernando Bottin
7719fa2002
Added specs to test addPresentationToCollection() and remotePresentationToCollection().
2014-11-11 12:16:13 -02:00
Leonardo Crauss Daronco
7f8eb12f77
Webhooks app will now have a web server, reorganizing it
...
It will receive API calls to deal with web hooks to make it independent from
other components such as bbb-web.
2014-11-11 11:58:28 -02:00
Anton Georgiev
f561ba0eb8
this is where we should handle validate_auth_token_reply
2014-11-11 08:38:39 -05:00
Richard Alam
c5cc60ff41
Merge pull request #419 from SenecaCDOT-BigBlueButton/mangle-firefox-sdp-c
...
Added a SDP hack for Firefox to replace the 0.0.0.0 in the c line
2014-11-11 08:32:37 -05:00
Leonardo Crauss Daronco
8c8c93beb7
Webhooks: overall improvements in comments and prints
2014-11-11 11:20:55 -02:00
Anton Georgiev
fc2f560b7a
simplified version to work with (no disconnection handling code)
2014-11-11 07:18:07 -05:00
Chad Pilkey
ffae6e2f20
added a SDP hack for Firefox to replace the 0.0.0.0 in the c line
2014-11-11 03:52:11 -08:00
Felipe Cecagno
7667abc106
a few tweaks on the client check page: build.xml downloads the image for the download speed test, config doesn't have someone's IP address (just like a config.xml.template), securityError on port check doesn't throw an exception anymore
2014-11-11 09:25:56 -02:00