10
index 0000000..bebeb36
--- /dev/null
+++ b/test/request/defaults.js
@@ -0,0 +1,52 @@
+
+var fs = require('fs'),
+ path = require('path');
+var Purest = require('../../lib/provider'),
+ providers = require('../../config/providers');
+var image = path.resolve(__dirname, '../fixtures/cat.png');
+
+
+describe('defaults', function () {
+ require('../utils/credentials');
+ var cred = {
+ app:require('../../config/app'),
+ user:require('../../config/user')
+ };
+ var p = {};
+ before(function () {
+ for (var name in providers) {
+ var provider = providers[name];
+ p[name] = new Purest(provider.__provider.oauth
+ ? {provider:name, key:cred.app[name].key, secret:cred.app[name].secret}
+ : {provider:name});
+ }
+ });
+
+ it('set defaults', function (done) {
+ var defaults = {
+ oauth: {
+ consumer_key:cred.app.twitter.key,
+ consumer_secret:cred.app.twitter.secret,
+ token:cred.user.twitter.token,
+ token_secret:cred.user.twitter.secret
+ }
+ };
+ var twitter = new Purest({provider:'twitter', defaults:defaults})
+ twitter.query()
+ .select('users/show')
+ .where({screen_name:'mightymob'})
+ .request(function (err, res, body) {
+ debugger;
+ if (err) return error(err, done);
+ body.id.should.equal(1504092505);
+ body.screen_name.should.equal('mightymob');
+ done();
+ });
+ });
+});
+
+function error (err, done) {
+ return (err instanceof Error)
+ ? done(err)
+ : (console.log(err) || done(new Error('Network error!')));
+}
6
--- a/huggle/definitions_prod.hpp
+++ b/huggle/definitions_prod.hpp
@@ -16,10 +16,10 @@
typedef char byte_ht;
-#define HUGGLE_VERSION "3.1.5"
+#define HUGGLE_VERSION "3.1.6"
#define HUGGLE_BYTE_VERSION_MAJOR 0x3
#define HUGGLE_BYTE_VERSION_MINOR 0x1
-#define HUGGLE_BYTE_VERSION_RELEASE 0x5
+#define HUGGLE_BYTE_VERSION_RELEASE 0x6
// Version of mediawiki that we do support
#define HUGGLE_SUPPORTED_MEDIAWIKI_VERSION "1.25"
1701
--- a/packages/ember-runtime/lib/system/core_object.js
+++ b/packages/ember-runtime/lib/system/core_object.js
@@ -180,7 +180,13 @@ function makeCtor() {
} else if (length === 1) {
this.init(arguments[0]);
} else {
- this.init.apply(this, arguments);
+ // v8 bug potentially incorrectly deopts this function: https://code.google.com/p/v8/issues/detail?id=3709
+ // we may want to keep this arround till this ages out on mobile
+ var args = new Array(length);
+ for (var x = 0; x < length; x++) {
+ args[x] = arguments[x];
+ }
+ this.init.apply(this, args);
}
m.proto = proto;
5
--- a/css/RS.css
+++ b/css/RS.css
@@ -1,15 +1,15 @@
-
-#rainbowsafari {
- left: 0;
- right: 0;
- top: 0;
- height: 100px;
- z-index: 99999999999;
- position: fixed;
- content: "";
- display: block;
- -webkit-transform: translateY(-99.99px);
- /* Add your own styling after this to customize RainbowSarari */
- background-color: RED;
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+ #rainbowsafari {
+ left: 0;
+ right: 0;
+ top: 0;
+ height: 100px;
+ z-index: 99999999999;
+ position: fixed;
+ content: "";
+ display: block;
+ -webkit-transform: translateY(-99.99px);
+ /* Add your own styling after this to customize RainbowSarari */
+ background-color: RED;
+ }
}
-
3
--- a/spec/setup.js
+++ b/spec/setup.js
@@ -9,10 +9,13 @@ var resetApp = require('./helpers/fixtures').resetApp;
beforeEach(function(done) {
getToken(function() {
resetApp(function() {
- browser.get('/');
- browser.executeScript('sessionStorage.clear();localStorage.clear();');
- protractor.getInstance().waitForAngular();
- done();
+ browser.driver.getCurrentUrl().then(function(url) {
+ if (url.indexOf('data:') !== 0) {
+ browser.executeScript('sessionStorage.clear();localStorage.clear();');
+ protractor.getInstance().waitForAngular();
+ }
+ done();
+ });
});
});
});
3
--- a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp
@@ -277,6 +277,9 @@ void ClangTidyDiagnosticConsumer::finalizeLastError() {
void ClangTidyDiagnosticConsumer::HandleDiagnostic(
DiagnosticsEngine::Level DiagLevel, const Diagnostic &Info) {
+ // Count warnings/errors.
+ DiagnosticConsumer::HandleDiagnostic(DiagLevel, Info);
+
if (DiagLevel == DiagnosticsEngine::Note) {
assert(!Errors.empty() &&
"A diagnostic note can only be appended to a message.");
8
--- a/functions/enqueues.php
+++ b/functions/enqueues.php
@@ -3,14 +3,22 @@
/*
Google CDN jQuery with a local fallback
See http://www.wpcoke.com/load-jquery-from-cdn-with-local-fallback-for-wordpress/
+
+NOTE: If this theme has trouble getting jQuery form Google (or from the browser cashe), do this:
+-- uncomment line 12 and instead comment-out line 13
+-- uncomment line 18 and instead comment-out line 19
+
+ALTERNATIVELY, seeing that WordPress is updating its onboard jQuery frequently these days, you may prefer to use that instead (see http://matthewruddy.com/using-jquery-with-wordpress/)
*/
-if( !is_admin()){
- $url = 'http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js';
+if (!is_admin()){
+// $url = 'http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js';
+ $url = '//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js';
$test_url = @fopen($url,'r');
if($test_url !== false) {
function load_external_jQuery() {
wp_deregister_script('jquery');
- wp_register_script('jquery', 'http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js');
+// wp_register_script('jquery', 'http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js');
+ wp_register_script('jquery', '//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js');
wp_enqueue_script('jquery');
}
add_action('wp_enqueue_scripts', 'load_external_jQuery');
@@ -24,30 +32,40 @@ function load_local_jQuery() {
}
}
-function bst_enqueues()
-{
- wp_register_style('bootstrap-css', get_template_directory_uri() . '/css/bootstrap.min.css', false, null);
- wp_enqueue_style('bootstrap-css');
+/*
+Using WordPress's onboard jQuery
+See http://matthewruddy.com/using-jquery-with-wordpress/
+
+If you decide to remove or comment out the "Google CDN jQuery with a local fallback" stuff above, then simply un-comment
+the "wp_enqueue_script( 'jquery' );" line below.
+*/
+
+function bst_enqueues() {
+
+ //wp_enqueue_script( 'jquery' );
+
+ wp_register_style('bootstrap-css', get_template_directory_uri() . '/css/bootstrap.min.css', false, null);
+ wp_enqueue_style('bootstrap-css');
wp_register_style('bst-css', get_template_directory_uri() . '/css/bst.css', false, null);
- wp_enqueue_style('bst-css');
+ wp_enqueue_style('bst-css');
wp_register_script('modernizr', get_template_directory_uri() . '/js/modernizr-2.6.2.min.js', false, null, true);
- wp_enqueue_script('modernizr');
+ wp_enqueue_script('modernizr');
- wp_register_script('html5shiv.js', get_template_directory_uri() . '/js/html5shiv.js', false, null, true);
- wp_enqueue_script('html5shiv.js');
+ wp_register_script('html5shiv.js', get_template_directory_uri() . '/js/html5shiv.js', false, null, true);
+ wp_enqueue_script('html5shiv.js');
wp_register_script('respond', get_template_directory_uri() . '/js/respond.min.js', false, null, true);
- wp_enqueue_script('respond');
+ wp_enqueue_script('respond');
wp_register_script('bootstrap-js', get_template_directory_uri() . '/js/bootstrap.js', false, null, true);
- wp_enqueue_script('bootstrap-js');
+ wp_enqueue_script('bootstrap-js');
- wp_register_script('bst-js', get_template_directory_uri() . '/js/bst.js', false, null, true);
- wp_enqueue_script('bst-js');
+ wp_register_script('bst-js', get_template_directory_uri() . '/js/bst.js', false, null, true);
+ wp_enqueue_script('bst-js');
- if (is_singular() && comments_open() && get_option('thread_comments')) {
+ if (is_singular() && comments_open() && get_option('thread_comments')) {
wp_enqueue_script('comment-reply');
}
}
81
--- a/rts/Game/UI/GuiHandler.cpp
+++ b/rts/Game/UI/GuiHandler.cpp
@@ -2119,11 +2119,9 @@ Command CGuiHandler::GetCommand(int mouseX, int mouseY, int buttonHint, bool pre
}
}
- int a = 0; // limit the number of max commands possible to send to avoid overflowing the network buffer
- for (std::vector<BuildInfo>::iterator bpi = buildPos.begin(); bpi != --buildPos.end() && a < 200; ++bpi) {
- ++a;
- Command c = bpi->CreateCommand(CreateOptions(button));
- if (!preview) {
+ if (!preview) {
+ for (auto bpi = buildPos.cbegin(); bpi != --buildPos.cend(); ++bpi) {
+ Command c = bpi->CreateCommand(CreateOptions(button));
GiveCommand(c);
}
}
786
index 0000000..f3fd6a0
--- /dev/null
+++ b/Casks/laullon-gitx.rb
@@ -0,0 +1,14 @@
+cask :v1 => 'laullon-gitx' do
+ version '0.8.4'
+ sha256 'c5f4088497abf5a219bb7bde4fae643fec61647be25bf836fd679567dcabd7df'
+
+ url "https://github.com/downloads/laullon/gitx/GitX-L_v#{version}.zip"
+ appcast 'http://gitx.laullon.com/appcast.xml',
+ :sha256 => '7ce5197de931145d75c57c2171fba559481e79e23bedd58ec107b476731f693b'
+ homepage 'http://gitx.laullon.com/'
+ license :oss
+ tags :name => 'GitX (L)'
+
+ app 'GitX.app'
+ binary 'GitX.app/Contents/Resources/gitx'
+end
117
--- a/ckan/controllers/home.py
+++ b/ckan/controllers/home.py
@@ -111,7 +111,7 @@ def index(self):
if msg:
h.flash_notice(msg, allow_html=True)
- # START OF DIRTYNESS
+ # START OF DIRTINESS
def get_group(id):
def _get_group_type(id):
"""
@@ -178,7 +178,7 @@ def db_to_form_schema(group_type=None):
c.group_package_stuff = dirty_cached_group_stuff
- # END OF DIRTYNESS
+ # END OF DIRTINESS
return base.render('home/index.html', cache_force=True)
def license(self):
83
+index b4ea91e..61f2885 100644
--- a/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
+++ b/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
-@@ -68,7 +68,10 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash;
+@@ -68,7 +68,9 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash;
// Parse zone.tab table, assume lists all installed zones, if not will need to read directories
static QTzTimeZoneHash loadTzTimeZones()
{
- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
-+ QString path = getenv("TZDIR");
-+ path += "/zone.tab";
++ QString path = qgetenv("TZDIR") + "/zone.tab";
+ if (!QFile::exists(path))
+ path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
if (!QFile::exists(path))
path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
+@@ -559,12 +561,17 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId)
+ if (!tzif.open(QIODevice::ReadOnly))
+ return;
+ } else {
+- // Open named tz, try modern path first, if fails try legacy path
+- tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
++ // Try TZDIR first
++ QString zoneinfoDir = qgetenv("TZDIR") + "/" + QString::fromLocal8Bit(ianaId);
++ tzif.setFileName(zoneinfoDir);
+ if (!tzif.open(QIODevice::ReadOnly)) {
+- tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));
+- if (!tzif.open(QIODevice::ReadOnly))
+- return;
++ // Open named tz, try modern path first, if fails try legacy path
++ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
++ if (!tzif.open(QIODevice::ReadOnly)) {
++ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));
++ if (!tzif.open(QIODevice::ReadOnly))
++ return;
++ }
+ }
+ }
+
8
--- a/system/application/views/welcome.php
+++ b/system/application/views/welcome.php
@@ -5,7 +5,7 @@
<table class="dashboard-summary-table">
<tbody>
<tr>
- <td><div>Welcome back, <strong><?php echo $this->config->item('account_name'); ?> !</strong></div></td>
+ <td><div>Welcome back, <strong><?php echo $this->config->item('account_name'); ?>!</strong></div></td>
</tr>
<tr>
<td><div>Account for Financial Year <strong><?php echo date_mysql_to_php_display($this->config->item('account_fy_start')) . " - " . date_mysql_to_php_display($this->config->item('account_fy_end')); ?></strong></div></td>
250
--- a/common/lib/xmodule/xmodule/video_module/video_module.py
+++ b/common/lib/xmodule/xmodule/video_module/video_module.py
@@ -58,22 +58,25 @@
# 3. Try to import, catch the exception on failure, and check for the existence
# of edxval_api before invoking it in the code.
# 4. Make edxval an XBlock Runtime Service
+# 5. Only try to import edxval if Django is already active (configured)
#
# (1) is a longer term goal. VideoModule should be made into an XBlock and
# extracted from edx-platform entirely. But that's expensive to do because of
# the various dependencies (like templates). Need to sort this out.
# (2) is explicitly discouraged.
-# (3) is what we're doing today. The code is still functional when called within
+# (3) is what were doing. The code is still functional when called within
# the context of the LMS, but does not cause failure on import when running
# standalone tests. Most VideoModule tests tend to be in the LMS anyway,
# probably for historical reasons, so we're not making things notably worse.
# (4) is one of the next items on the backlog for edxval, and should get rid
# of this particular import silliness. It's just that I haven't made one before,
# and I was worried about trying it with my deadline constraints.
-try:
+# (5) is what we're doing since upgrading to Django 1.5, since the import was
+# raising a new ImproperlyConfigured exception during preprocess_assets, during
+# which edxval is available for import but Django settings were not configured.
+edxval_api = None
+if settings.configured:
import edxval.api as edxval_api
-except ImportError:
- edxval_api = None
log = logging.getLogger(__name__)
_ = lambda text: text
340
--- a/static/src/javascripts/projects/common/modules/gallery/lightbox.js
+++ b/static/src/javascripts/projects/common/modules/gallery/lightbox.js
@@ -522,7 +522,7 @@ define([
if (match) { // index specified so launch lightbox at that index
url.pushUrl(null, document.title, galleryId, true); // lets back work properly
lightbox.loadGalleryfromJson(images, parseInt(match[1], 10));
- } else if (galleryHash) {
+ } else if (galleryHash.indexOf('#img-') !== -1 || !isNaN(galleryHash.substr(1))) {
// Temporary if statement for a few weeks to allow us to switch to prefixed block-ids
if (galleryHash.indexOf('#img-') !== -1) {
hashIndex = galleryHash.substr(5);
3
--- a/reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/Quest.java
+++ b/reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/Quest.java
@@ -715,11 +715,9 @@ else if (aboxMode.equals(QuestConstants.VIRTUAL)) {
SQLDialectAdapter sqladapter = SQLAdapterFactory.getSQLDialectAdapter(parameter);
if (isSemIdx()) {
- datasourceQueryGenerator = new SQLGenerator(metadata,
- sqladapter, sqlGenerateReplace, dataRepository.getUriMap());
+ datasourceQueryGenerator = new SQLGenerator(metadata, sqladapter, sqlGenerateReplace, dataRepository.getUriMap());
} else {
- datasourceQueryGenerator = new SQLGenerator(metadata,
- sqladapter, sqlGenerateReplace);
+ datasourceQueryGenerator = new SQLGenerator(metadata, sqladapter, sqlGenerateReplace);
}
@@ -766,8 +764,9 @@ else if (aboxMode.equals(QuestConstants.VIRTUAL)) {
unfolder.applyTMappings(reformulationReasoner, true);
// Adding ontology assertions (ABox) as rules (facts, head with no body).
- unfolder.addABoxAssertionsAsFacts(inputOntology.getClassAssertions());
- unfolder.addABoxAssertionsAsFacts(inputOntology.getPropertyAssertions());
+ unfolder.addClassAssertionsAsFacts(inputOntology.getClassAssertions());
+ unfolder.addObjectPropertyAssertionsAsFacts(inputOntology.getObjectPropertyAssertions());
+ unfolder.addDataPropertyAssertionsAsFacts(inputOntology.getDataPropertyAssertions());
// Adding data typing on the mapping axioms.
unfolder.extendTypesWithMetadata(reformulationReasoner);
11
--- a/source/main.c
+++ b/source/main.c
@@ -13,7 +13,7 @@
#include "netloader.h"
bool brewMode = false;
-u32 sdmcCurrent = 0;
+u8 sdmcCurrent = 0;
u64 nextSdCheck = 0;
menu_s menu;
@@ -151,7 +151,7 @@ int main()
initErrors();
initMenu(&menu);
- u32 sdmcPrevious = 0;
+ u8 sdmcPrevious = 0;
FSUSER_IsSdmcDetected(NULL, &sdmcCurrent);
if(sdmcCurrent == 1)
{
320
--- a/tests/unit/customizations/test_cloudtrail.py
+++ b/tests/unit/customizations/test_cloudtrail.py
@@ -108,6 +108,24 @@ def test_s3_create(self):
s3.DeleteBucket.assert_not_called()
+ args, kwargs = s3.CreateBucket.call_args
+ self.assertNotIn('create_bucket_configuration', kwargs)
+
+ def test_s3_create_non_us_east_1(self):
+ # Because this is outside of us-east-1, it should create
+ # a bucket configuration with a location constraint.
+ s3 = self.subscribe.s3
+ s3.endpoint.region_name = 'us-west-2'
+
+ self.subscribe.setup_new_bucket('test', 'logs')
+
+ args, kwargs = s3.CreateBucket.call_args
+ self.assertIn('create_bucket_configuration', kwargs)
+
+ bucket_config = kwargs['create_bucket_configuration']
+ self.assertEqual(bucket_config['LocationConstraint'],
+ 'us-west-2')
+
def test_s3_create_already_exists(self):
with self.assertRaises(Exception):
self.subscribe.setup_new_bucket('test2', 'logs')
3
--- a/adb/services.c
+++ b/adb/services.c
@@ -301,8 +301,10 @@ static int create_subproc_raw(const char *cmd, const char *arg0, const char *arg
#if ADB_HOST
#define SHELL_COMMAND "/bin/sh"
+#define ALTERNATE_SHELL_COMMAND ""
#else
#define SHELL_COMMAND "/system/bin/sh"
+#define ALTERNATE_SHELL_COMMAND "/sbin/sh"
#endif
#if !ADB_HOST
@@ -351,12 +353,21 @@ static int create_subproc_thread(const char *name, const subproc_mode mode)
arg0 = "-c"; arg1 = name;
}
+ const char* shell_command;
+ struct stat filecheck;
+ if (stat(ALTERNATE_SHELL_COMMAND, &filecheck) == 0) {
+ shell_command = ALTERNATE_SHELL_COMMAND;
+ }
+ else {
+ shell_command = SHELL_COMMAND;
+ }
+
switch (mode) {
case SUBPROC_PTY:
- ret_fd = create_subproc_pty(SHELL_COMMAND, arg0, arg1, &pid);
+ ret_fd = create_subproc_pty(shell_command, arg0, arg1, &pid);
break;
case SUBPROC_RAW:
- ret_fd = create_subproc_raw(SHELL_COMMAND, arg0, arg1, &pid);
+ ret_fd = create_subproc_raw(shell_command, arg0, arg1, &pid);
break;
default:
fprintf(stderr, "invalid subproc_mode %d\n", mode);
3
--- a/js/sandwiches/view/SandwichesEquationNode.js
+++ b/js/sandwiches/view/SandwichesEquationNode.js
@@ -109,9 +109,7 @@ define( function( require ) {
arrowNode.centerY = leftNode.centerY;
// right-hand side is a sandwich, whose image changes based on coefficients of the ingredients
- assert && assert( reaction.products.length === 1 );
- this.sandwich = reaction.products[0]; // @private
- var sandwichNode = new SubstanceNode( this.sandwich.nodeProperty );
+ var sandwichNode = new SubstanceNode( reaction.sandwich.nodeProperty );
this.substanceNodes.push( sandwichNode );
sandwichNode.centerX = arrowNode.right + ARROW_X_SPACING + ( maxSandwichSize.width / 2 );
sandwichNode.centerY = arrowNode.centerY;
@@ -127,6 +125,7 @@ define( function( require ) {
sandwichNode.visible = reaction.isReaction();
noReactionNode.visible = !sandwichNode.visible;
};
+ this.sandwich = reaction.sandwich; // @private see dispose
this.sandwich.nodeProperty.link( this.sandwichNodePropertyObserver );
options.children = [ leftNode, arrowNode, sandwichNode, noReactionNode ];
91
--- a/example/walk-history.js
+++ b/example/walk-history.js
@@ -1,6 +1,5 @@
var nodegit = require('../'),
- path = require('path'),
- sort = nodegit.Revwalk.SORT;
+ path = require('path');
// This code walks the history of the master branch and prints results
// that look very similar to calling `git log` from the command line
@@ -9,7 +8,7 @@ nodegit.Repository.open(path.resolve(__dirname, '../.git')).then(function(repo)
return repo.getMaster();
}).then(function(branch){
// History returns an event.
- var history = branch.history(SORT.TIME);
+ var history = branch.history(nodegit.Revwalk.SORT.TIME);
// History emits 'commit' event for each commit in the branch's history
history.on('commit', function(commit) {