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
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
Leonardo Crauss Daronco
66bfbeb1bc Webhooks: use external meeting ID as key in the mappings 
It changes less than the internal meeting ID. An application can subscribe
to an external ID and use the hook for several different meetings that will
have the same external ID but different internal IDs.
 2014-11-12 18:27:21 -02:00
Chad Pilkey
f78b234d0a Updated defaultLayout to match the localized key 2014-11-12 15:17:16 -05:00
Leonardo Crauss Daronco
5e141d324c Webhooks: better intervals for retying failed callbacks 
Will try again a number of times for about 5min and then give up. On giving
up, the hook is removed.
And a few fixes for saving and loading data on redis.
 2014-11-12 18:07:29 -02:00
Lucas Zawacki
81f0665738 Merge with testing and update to meteor only packages 2014-11-12 17:34:12 -02:00
Felipe Cecagno
0cefee5534 now the rap scripts publish to redis pubsub (channel bigbluebutton:from-rap) when a rap phase begins and ends - it includes archive, sanity, post_archive, process, post_process, publish and post_publish; if there's more than one workflow, it should work without any modification 2014-11-12 17:28:33 -02:00
Felipe Cecagno
f52a0299a6 fixed the deploy script used to deploy the rap dev environment 2014-11-12 17:21:54 -02:00
Felipe Cecagno
b451b4cf84 removed god code on the record scripts 2014-11-12 17:20:10 -02:00
Richard Alam
a3527a1387 Merge branch 'master' into upgrade-to-red5-nov-4-2014 2014-11-12 10:59:22 -08:00
Richard Alam
c30604bb3f Merge branch 'investigate-ping-pong-timers' into upgrade-to-red5-nov-4-2014 2014-11-12 10:59:12 -08:00
Fred Dixon
cc35627f1c Merge pull request #427 from ffdixon/check-updates 
Fixed typo in check.nginx
 2014-11-12 16:45:30 -02:00
Fred Dixon
31f7f194ec Fixed typo in check.nginx 2014-11-12 13:39:38 -05:00
Lucas Zawacki
87421be943 Merge branch 'meteor-client-tests' of https://github.com/gthacoder/bigbluebutton into testing-version-005 
Conflicts:
	labs/demos/views/index.html
	labs/meteor-client/app/server/collection_methods/meetings.coffee
 2014-11-12 16:38:18 -02:00
Leonardo Crauss Daronco
6d63f2f299 Webhooks: persist data to redis 
Save hooks and meetingID mappings to redis and get them back when the
application starts.
Still missing a way to remove old data in case the app loses events (e.g.
a hook for a specific meeting might stay on redis forever if the app
lost the meeting_destroyed event).
 2014-11-12 16:35:25 -02:00
Fred Dixon
9cdc47d16d Merge pull request #426 from kepstin/recording-updates-2 
Load bigbluebutton.yml from current path
 2014-11-12 16:30:34 -02:00
Calvin Walton
30fdd13af8 Load bigbluebutton.yml from current path 2014-11-12 16:25:52 -02:00
Fred Dixon
cbcb6d30dc Merge pull request #425 from ffdixon/check-updates 
Updated ActionScript files with LGPL License
 2014-11-12 16:16:48 -02:00
Fred Dixon
e77efdd192 Updated ActionScript files with LGPL License 2014-11-12 13:14:25 -05:00
Anton Georgiev
2b819c2499 Merge branch 'testing-version-005' of github.com:lfzawacki/bigbluebutton into testing-version-005 
Conflicts:
	labs/meteor-client/app/.meteor/packages
	labs/meteor-client/app/smart.json
	labs/meteor-client/app/smart.lock
 2014-11-12 13:14:21 -05:00
Fred Dixon
48b9c5a01d Merge pull request #403 from kepstin/recording-updates-2 
Version the playback files for the presentation recording format
 2014-11-12 16:02:13 -02:00
Calvin Walton
98efa28316 Add a script to handle updating links in existing recordings 
This adds the version number to the playback links so that
recordings select the correct version-specific playback support
files.

This script may be run automatically during upgrade; in that
case it should be run like

.../bbb-0.9-beta-recording-update --quiet

After copying recordings from an old BigBlueButton server, you
may want to manually re-run the script, and it takes the option
--force to recheck all recordings even if it has previously been
run.
 2014-11-12 15:54:45 -02:00
Lucas Zawacki
7e763b7219 Remove unused js files and move api_bridge to the client/lib 2014-11-12 15:17:23 -02:00
Anton Georgiev
b18b8a2d0e install external-file-loader via mrt 2014-11-12 12:01:19 -05:00
Maxim Khlobystov
ae48d72dc3 Merge branch 'meteor-client-viewer' into meteor-client-tests 
Conflicts:
	labs/meteor-client/app/.meteor/packages
 2014-11-12 08:51:14 -08:00
Lucas Zawacki
284ce6bbaf Add winston client and correct logging path 
Conflicts:
	labs/meteor-client/app/client/main.coffee
	labs/meteor-client/app/smart.json
	labs/meteor-client/app/smart.lock
 2014-11-12 14:37:55 -02:00
Lucas Zawacki
3f6cc062a9 Merge winston logging 
Conflicts:
	labs/meteor-client/app/.meteor/packages
	labs/meteor-client/app/lib/router.coffee
	labs/meteor-client/app/server/collection_methods/chat.coffee
	labs/meteor-client/app/server/collection_methods/users.coffee
	labs/meteor-client/app/server/redispubsub.coffee
	labs/meteor-client/app/smart.json
	labs/meteor-client/app/smart.lock
 2014-11-12 13:18:09 -02:00
Leonardo Crauss Daronco
bfdae8f204 Webhooks: store meeting ID mappings in a global model 2014-11-12 13:07:54 -02:00
Anton Georgiev
ffab06751c we have the .coffee now 2014-11-12 09:58:24 -05:00
Fred Dixon
f625115091 Merge pull request #424 from ffdixon/check-updates 
Moved from labs subdirectory to main level of BigBlueButton repository; reformatted check.nginx
 2014-11-12 12:34:54 -02:00
Fred Dixon
e84a65d986 Moved from labs; reformatted check.nginx 2014-11-12 09:22:50 -05:00
Fred Dixon
fd06539c43 Merge pull request #423 from kepstin/recording-updates 
Add delay before recording archiving to workaround Red5 race
 2014-11-12 12:18:32 -02:00
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