code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/contracts/Exchanger.sol b/contracts/Exchanger.sol @@ -73,6 +73,7 @@ contract Exchanger is Owned, MixinResolver, IExchanger {
uint public constant MAX_EXCHANGE_FEE_RATE = 1e18 / 10;
bytes32 private constant SYNTH_EXCHANGE_FEE_RATE = "synth_exchange_fee_rate";
+ bytes32 private constant TRADING_REWARD_RECORDS_ENABLED = "trading_reward_records_enabled";
bytes32 private constant CONTRACT_NAME = "Exchanger";
@@ -387,18 +388,31 @@ contract Exchanger is Owned, MixinResolver, IExchanger {
_processTradingRewards(fee, originator);
}
+ function enableTradingRewardRecords(bool enabled) external onlyOwner {
+ flexibleStorage().setBoolValue(
+ CONTRACT_NAME,
+ TRADING_REWARD_RECORDS_ENABLED,
+ enabled
+ );
+
+ emit TradingRewardsEnabled(enabled);
+ }
+
function _emitTrackingEvent(bytes32 trackingCode) internal {
ISynthetixInternal(address(synthetix())).emitExchangeTracking(trackingCode);
}
function _processTradingRewards(uint fee, address originator) internal {
if (fee > 0 && originator != address(0)) {
+ bool isTradingRewardsEnabled = flexibleStorage().getBoolValue(
+ CONTRACT_NAME,
+ TRADING_REWARD_RECORDS_ENABLED
+ );
+
+ if (isTradingRewardsEnabled) {
address tradingRewardsAddress = address(tradingRewards());
- // Record trading reward fees if TradingRewards contract address is not 0x1
- bool isTradingRewardsActive = tradingRewardsAddress != address(1);
- if (isTradingRewardsActive) {
- // Also, avoid reverting the exchange if the call fails
+ // Avoid reverting if the call fails
// solhint-disable-next-line
(bool success, ) = tradingRewardsAddress.call(
abi.encodeWithSelector(ITradingRewards(0).recordExchangeFeeForAccount.selector, fee, originator)
@@ -807,6 +821,7 @@ contract Exchanger is Owned, MixinResolver, IExchanger {
event PriceDeviationThresholdUpdated(uint threshold);
event WaitingPeriodSecsUpdated(uint waitingPeriodSecs);
event ExchangeFeeUpdated(bytes32 synthKey, uint newExchangeFeeRate);
+ event TradingRewardsEnabled(bool enabled);
event ExchangeEntryAppended(
address indexed account,
| 4 |
diff --git a/test/Air/AirParser.test.js b/test/Air/AirParser.test.js @@ -41,10 +41,9 @@ describe('#AirParser', () => {
.then((result) => {
expect(result).to.be.an('object');
expect(result).to.have.all.keys([
- 'type', 'uapi_ur_locator', 'uapi_reservation_locator', 'pnr', 'platingCarrier',
+ 'uapi_ur_locator', 'uapi_reservation_locator', 'pnr', 'platingCarrier',
'ticketingPcc', 'issuedAt', 'fareCalculation', 'priceInfo', 'passengers', 'tickets',
]);
- expect(result.type).to.equal('airTicketDocument');
expect(result.uapi_ur_locator).to.match(/^[A-Z0-9]{6}$/i);
expect(result.uapi_reservation_locator).to.match(/^[A-Z0-9]{6}$/i);
expect(result.pnr).to.match(/^[A-Z0-9]{6}$/i);
| 3 |
diff --git a/includes/Modules/Analytics.php b/includes/Modules/Analytics.php @@ -1001,61 +1001,6 @@ final class Analytics extends Module
$profile = new Google_Service_Analytics_Profile();
$profile->setName( __( 'All Web Site Data', 'google-site-kit' ) );
return $profile = $this->get_service( 'analytics' )->management_profiles->insert( $data['accountID'], $data['propertyID'], $profile );
- case 'POST:settings':
- return function() use ( $data ) {
- $option = $data->data;
- $is_new_property = false;
-
- if ( isset( $option['accountID'], $option['propertyID'] ) ) {
- if ( '0' === $option['propertyID'] ) {
- $is_new_property = true;
- $restore_defer = $this->with_client_defer( false );
- $property = new Google_Service_Analytics_Webproperty();
- $property->setName( wp_parse_url( $this->context->get_reference_site_url(), PHP_URL_HOST ) );
- try {
- $property = $this->get_service( 'analytics' )->management_webproperties->insert( $option['accountID'], $property );
- } catch ( Exception $e ) {
- $restore_defer();
- return $this->exception_to_error( $e, $data->datapoint );
- }
- $restore_defer();
- /* @var Google_Service_Analytics_Webproperty $property Property instance. */
- $option['propertyID'] = $property->getId();
- $option['internalWebPropertyID'] = $property->getInternalWebPropertyId();
- }
- if ( isset( $option['profileID'] ) ) {
- if ( '0' === $option['profileID'] ) {
- $restore_defer = $this->with_client_defer( false );
- $profile = new Google_Service_Analytics_Profile();
- $profile->setName( __( 'All Web Site Data', 'google-site-kit' ) );
- try {
- $profile = $this->get_service( 'analytics' )->management_profiles->insert( $option['accountID'], $option['propertyID'], $profile );
- } catch ( Exception $e ) {
- $restore_defer();
- return $this->exception_to_error( $e, $data->datapoint );
- }
- $restore_defer();
- $option['profileID'] = $profile->id;
- }
-
- // Set default profile for new property.
- if ( $is_new_property ) {
- $restore_defer = $this->with_client_defer( false );
- $property = new Google_Service_Analytics_Webproperty();
- $property->setDefaultProfileId( $option['profileID'] );
- try {
- $property = $this->get_service( 'analytics' )->management_webproperties->patch( $option['accountID'], $option['propertyID'], $property );
- } catch ( Exception $e ) {
- $restore_defer();
- return $this->exception_to_error( $e, $data->datapoint );
- }
- $restore_defer();
- }
- }
- }
- $this->get_settings()->merge( $option );
- return $this->get_settings()->get();
- };
case 'GET:tag-permission':
return function() use ( $data ) {
if ( ! isset( $data['propertyID'] ) ) {
| 2 |
diff --git a/config/sidebar.yml b/config/sidebar.yml @@ -398,6 +398,43 @@ articles:
hidden: true
- title: Work with Tokens
url: /organizations/using-tokens
+ - title: Configure Organizations
+ url: /organizations/configure-organizations
+ children:
+ - title: Create Organizations
+ url: /organizations/create-organizations
+ - title: Delete Organizations
+ url: /organizations/delete-organizations
+ - title: Define Organization Behavior
+ url: /organizations/define-organization-behavior
+ - title: Enable Connections
+ url: /organizations/enable-connections
+ - title: Disable Connections
+ url: /organizations/disable-connections
+ - title: Invite Members
+ url: /organizations/invite-members
+ - title: Send Membership Invitations
+ url: /organizations/send-membership-invitations
+ - title: Grant Just-In-Time Membership
+ url: /organizations/grant-just-in-time-membership
+ - title: Assign Members Directly
+ url: /organizations/assign-members
+ - title: Remove Members Directly
+ url: /organizations/remove-members
+ - title: Add Roles to Members
+ url: /organizations/add-member-roles
+ - title: Remove Roles from Members
+ url: /organizations/remove-member-roles
+ - title: Retrieve Organizations
+ url: /organizations/retrieve-organizations
+ - title: Retrieve Connections
+ url: /organizations/retrieve-connections
+ - title: Retrieve Members
+ url: /organizations/retrieve-members
+ - title: Retrieve User's Membership
+ url: /organizations/retrieve-user-membership
+ - title: Retrieve Member Roles
+ url: /organizations/retrieve-member-roles
- title: Authorization
url: /authorization
children:
@@ -465,43 +502,6 @@ articles:
- title: Child Tenant Request Process
url: /dev-lifecycle/child-tenants
hidden: true
- - title: Organization Configuration
- url: /organizations
- children:
- - title: Create Organizations
- url: /organizations/create-organizations
- - title: Delete Organizations
- url: /organizations/delete-organizations
- - title: Define Organization Behavior
- url: /organizations/define-organization-behavior
- - title: Enable Connections
- url: /organizations/enable-connections
- - title: Disable Connections
- url: /organizations/disable-connections
- - title: Invite Members
- url: /organizations/invite-members
- - title: Send Membership Invitations
- url: /organizations/send-membership-invitations
- - title: Grant Just-In-Time Membership
- url: /organizations/grant-just-in-time-membership
- - title: Assign Members Directly
- url: /organizations/assign-members
- - title: Remove Members Directly
- url: /organizations/remove-members
- - title: Add Roles to Members
- url: /organizations/add-member-roles
- - title: Remove Roles from Members
- url: /organizations/remove-member-roles
- - title: Retrieve Organizations
- url: /organizations/retrieve-organizations
- - title: Retrieve Connections
- url: /organizations/retrieve-connections
- - title: Retrieve Members
- url: /organizations/retrieve-members
- - title: Retrieve User's Membership
- url: /organizations/retrieve-user-membership
- - title: Retrieve Member Roles
- url: /organizations/retrieve-member-roles
- title: Application Configuration
url: /get-started/dashboard/application-settings
children:
| 5 |
diff --git a/src/core/preprocessor.js b/src/core/preprocessor.js @@ -4,19 +4,19 @@ import { Debug } from './debug.js';
const TRACEID = 'Preprocessor';
// accepted keywords
-const KEYWORD = /([ ]*)+#(ifn?def|if|endif|else|elif|define|undef)/g;
+const KEYWORD = /[ \t]*#(ifn?def|if|endif|else|elif|define|undef)/g;
// #define EXPRESSION
-const DEFINE = /define[ ]+([^\n]+)\r?(?:\n|$)/g;
+const DEFINE = /define[ \t]+([^\n]+)\r?(?:\n|$)/g;
// #undef EXPRESSION
-const UNDEF = /undef[ ]+([^\n]+)\r?(?:\n|$)/g;
+const UNDEF = /undef[ \t]+([^\n]+)\r?(?:\n|$)/g;
// #ifdef/#ifndef SOMEDEFINE, #if EXPRESSION
-const IF = /(ifdef|ifndef|if)[ ]*([^\r\n]+)\r?\n/g;
+const IF = /(ifdef|ifndef|if)[ \t]*([^\r\n]+)\r?\n/g;
// #endif/#else or #elif EXPRESSION
-const ENDIF = /(endif|else|elif)([ ]+[^\r\n]+)?\r?(?:\n|$)/g;
+const ENDIF = /(endif|else|elif)([ \t]+[^\r\n]+)?\r?(?:\n|$)/g;
// identifier
const IDENTIFIER = /([\w-]+)/;
@@ -83,7 +83,7 @@ class Preprocessor {
let match;
while ((match = KEYWORD.exec(source)) !== null) {
- const keyword = match[2];
+ const keyword = match[1];
switch (keyword) {
case 'define': {
| 7 |
diff --git a/tasks/noci_test.sh b/tasks/noci_test.sh #! /bin/bash
EXIT_STATE=0
+root=$(dirname $0)/..
-# tests that aren't run on CI
+# tests that aren't run on CI (yet)
# jasmine specs with @noCI tag
npm run test-jasmine -- --tags=noCI --nowatch || EXIT_STATE=$?
# mapbox image tests take too much resources on CI
-npm run test-image -- mapbox_* --queue || EXIT_STATE=$?
+
+# since the update to [email protected], we must use 'new' image-exporter
+# as mapbox-gl versions >0.22.1 aren't supported on [email protected] used in the
+# 'old' image server
+$root/../image-exporter/bin/plotly-graph-exporter.js $root/test/image/mocks/mapbox_* \
+ --plotly $root/build/plotly.js \
+ --mapbox-access-token "pk.eyJ1IjoiZXRwaW5hcmQiLCJhIjoiY2luMHIzdHE0MGFxNXVubTRxczZ2YmUxaCJ9.hwWZful0U2CQxit4ItNsiQ" \
+ --output-dir $root/test/image/baselines/ \
+ --verbose
exit $EXIT_STATE
| 3 |
diff --git a/src/server/system_services/system_store.js b/src/server/system_services/system_store.js @@ -6,6 +6,13 @@ const util = require('util');
const mongodb = require('mongodb');
const EventEmitter = require('events').EventEmitter;
const system_schema = require('./schemas/system_schema');
+const cluster_schema = require('./schemas/cluster_schema');
+const role_schema = require('./schemas/role_schema');
+const account_schema = require('./schemas/account_schema');
+const bucket_schema = require('./schemas/bucket_schema');
+const tieringpolicy_schema = require('./schemas/tiering_policy_schema');
+const tier_schema = require('./schemas/tier_schema');
+const pools_schema = require('./schemas/pool_schema');
const P = require('../../util/promise');
const dbg = require('../../util/debug_module')(__filename);
const js_utils = require('../../util/js_utils');
@@ -18,7 +25,7 @@ const mongo_client = require('../../util/mongo_client');
const COLLECTIONS = [{
name: 'clusters',
- schema: system_schema,
+ schema: cluster_schema,
mem_indexes: [{
name: 'cluster_by_server',
key: 'owner_secret'
@@ -49,7 +56,7 @@ const COLLECTIONS = [{
}],
}, {
name: 'roles',
- schema: system_schema,
+ schema: role_schema,
mem_indexes: [{
name: 'roles_by_account',
context: 'system',
@@ -66,7 +73,7 @@ const COLLECTIONS = [{
db_indexes: [],
}, {
name: 'accounts',
- schema: system_schema,
+ schema: account_schema,
mem_indexes: [{
name: 'accounts_by_email',
key: 'email'
@@ -82,7 +89,7 @@ const COLLECTIONS = [{
}],
}, {
name: 'buckets',
- schema: system_schema,
+ schema: bucket_schema,
mem_indexes: [{
name: 'buckets_by_name',
context: 'system',
@@ -100,7 +107,7 @@ const COLLECTIONS = [{
}],
}, {
name: 'tieringpolicies',
- schema: system_schema,
+ schema: tieringpolicy_schema,
mem_indexes: [{
name: 'tiering_policies_by_name',
context: 'system',
@@ -118,7 +125,7 @@ const COLLECTIONS = [{
}],
}, {
name: 'tiers',
- schema: system_schema,
+ schema: tier_schema,
mem_indexes: [{
name: 'tiers_by_name',
context: 'system',
@@ -136,7 +143,7 @@ const COLLECTIONS = [{
}],
}, {
name: 'pools',
- schema: system_schema,
+ schema: pools_schema,
mem_indexes: [{
name: 'pools_by_name',
context: 'system',
| 4 |
diff --git a/_Courses/data-and-apis/1.1-fetch.md b/_Courses/data-and-apis/1.1-fetch.md @@ -4,6 +4,7 @@ video_number: 1
date: 2019-05-17
video_id: tc8DU14qX6I
repository: https://github.com/CodingTrain/Intro-to-Data-APIs-JS
+can_contribute: true
---
This video is client-side only and covers the web fetch() API, loading image data and focusing on handling asynchronous events with Promises (async / await).
| 11 |
diff --git a/src/wallet/Transfer.js b/src/wallet/Transfer.js @@ -105,9 +105,7 @@ export default class Transfer extends Component {
</div>
<div className="form-group">
<a
- rel="noopener noreferrer"
href={url}
- target="_blank"
className="btn btn-success btn-lg"
>
<FormattedMessage id="continue" />
| 2 |
diff --git a/backend/lost/api/user/login_manager.py b/backend/lost/api/user/login_manager.py @@ -82,5 +82,6 @@ class LoginManager():
user.email = user_info['mail']
user.first_name = user_info['givenName']
user.last_name = user_info['sn']
+ user.is_external=True
self.dbm.save_obj(user)
return user
\ No newline at end of file
| 12 |
diff --git a/src/architecture/architect.js b/src/architecture/architect.js @@ -115,19 +115,13 @@ var architect = {
/**
* Creates a multilayer perceptron (MLP)
*
- * @todo Create `@param` tags
- * @todo Add `@param` tag types
- * @todo Add `@param` tag descriptions
- * @todo Add `@param` tag defaults
- * @todo Document `@param` tag "optional" or "required"
- *
- * @param {...number} layerNeurons
+ * @param {...number} layerNeurons At least 3 numbers: input layer, hidden layer(s), output layer
*
* @example
- * // Input layer: 2 neurons, Hidden layer: 3 neurons, Output layer: 1 neuron
+ * // Input 2 neurons, Hidden layer: 3 neurons, Output: 1 neuron
* let myPerceptron = new architect.Perceptron(2,3,1);
*
- * // Deep multilayer perceptron | Input: 2 neurons, 4 Hidden layers: 10 neurons, Output: 1 neuron
+ * // Input: 2 neurons, 4 Hidden layers: 10 neurons, Output: 1 neuron
* let myPerceptron = new architect.Perceptron(2, 10, 10, 10, 10, 1);
*
* @returns {Network} Feed forward neural network
| 7 |
diff --git a/generators/upgrade/index.js b/generators/upgrade/index.js @@ -121,11 +121,7 @@ module.exports = class extends BaseGenerator {
};
}
- _gitCheckout(branch, options, callback) {
- if (typeof options === 'function') {
- callback = options;
- options = {};
- }
+ _gitCheckout(branch, options = {}) {
const args = ['checkout', '-q', branch];
if (options.force) {
args.push('-f');
@@ -133,7 +129,6 @@ module.exports = class extends BaseGenerator {
const gitCheckout = this.gitExec(args, { silent: this.silent });
if (gitCheckout.code !== 0) this.error(`Unable to checkout branch ${branch}:\n${gitCheckout.stderr}`);
this.success(`Checked out branch "${branch}"`);
- callback();
}
_upgradeFiles(callback) {
@@ -442,13 +437,11 @@ module.exports = class extends BaseGenerator {
? ` and ${this.blueprints.map(bp => bp.name + bp.version).join(', ')} `
: '';
this._regenerate(this.currentJhipsterVersion, blueprintInfo, () => {
- this._gitCheckout(this.sourceBranch, () => {
- // consider code up-to-date
+ this._gitCheckout(this.sourceBranch);
recordCodeHasBeenGenerated();
});
});
});
- });
};
const createUpgradeBranch = () => {
@@ -473,8 +466,7 @@ module.exports = class extends BaseGenerator {
},
checkoutUpgradeBranch() {
- const done = this.async();
- this._gitCheckout(UPGRADE_BRANCH, done);
+ this._gitCheckout(UPGRADE_BRANCH);
},
updateJhipster() {
@@ -528,8 +520,7 @@ module.exports = class extends BaseGenerator {
},
checkoutSourceBranch() {
- const done = this.async();
- this._gitCheckout(this.sourceBranch, { force: true }, done);
+ this._gitCheckout(this.sourceBranch, { force: true });
},
mergeChangesBack() {
| 2 |
diff --git a/bot/src/common/quiz/card_strategies.js b/bot/src/common/quiz/card_strategies.js @@ -44,10 +44,11 @@ function removeSpoilerTags(answerCandidate) {
}
function answerCompareConvertKana(card, answerCandidate) {
- const convertedAnswerCandidate = convertToHiragana(removeSpoilerTags(answerCandidate));
- for (let i = 0; i < card.answer.length; ++i) {
- const correctAnswer = card.answer[i];
- if (convertToHiragana(correctAnswer).localeCompare(convertedAnswerCandidate, 'en', { sensitivity: 'base' }) === 0) {
+ let convertedAnswerCandidate = convertToHiragana(removeSpoilerTags(answerCandidate));
+ let correctAnswersLowercase = arrayToLowerCase(card.answer);
+ for (let i = 0; i < correctAnswersLowercase.length; ++i) {
+ let correctAnswer = correctAnswersLowercase[i];
+ if (convertToHiragana(correctAnswer) === convertedAnswerCandidate) {
return i;
}
}
| 13 |
diff --git a/fs.js b/fs.js @@ -171,12 +171,12 @@ function writeFile(path:string, data:string | Array<number>, encoding:?string):P
return Promise.reject('Invalid argument "path" ')
if(encoding.toLocaleLowerCase() === 'ascii') {
if(!Array.isArray(data))
- Promise.reject(new Error(`Expected "data" is an Array when encoding is "ascii", however got ${typeof data}`))
+ return Promise.reject(new Error(`Expected "data" is an Array when encoding is "ascii", however got ${typeof data}`))
else
return RNFetchBlob.writeFileArray(path, data, false);
} else {
if(typeof data !== 'string')
- Promise.reject(new Error(`Expected "data" is a String when encoding is "utf8" or "base64", however got ${typeof data}`))
+ return Promise.reject(new Error(`Expected "data" is a String when encoding is "utf8" or "base64", however got ${typeof data}`))
else
return RNFetchBlob.writeFile(path, encoding, data, false);
}
@@ -188,12 +188,12 @@ function appendFile(path:string, data:string | Array<number>, encoding:?string):
return Promise.reject('Invalid argument "path" ')
if(encoding.toLocaleLowerCase() === 'ascii') {
if(!Array.isArray(data))
- Promise.reject(new Error(`Expected "data" is an Array when encoding is "ascii", however got ${typeof data}`))
+ return Promise.reject(new Error(`Expected "data" is an Array when encoding is "ascii", however got ${typeof data}`))
else
return RNFetchBlob.writeFileArray(path, data, true);
} else {
if(typeof data !== 'string')
- Promise.reject(new Error(`Expected "data" is a String when encoding is "utf8" or "base64", however got ${typeof data}`))
+ return Promise.reject(new Error(`Expected "data" is a String when encoding is "utf8" or "base64", however got ${typeof data}`))
else
return RNFetchBlob.writeFile(path, encoding, data, true);
}
| 1 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,22 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master
where X.Y.Z is the semver of most recent plotly.js release.
+## [1.43.2] -- 2019-01-08
+
+First 2019 release.
+
+### Fixed
+- Fix `uirevision` behavior for `gl3d`, `geo` and `mapbox` subplots [#3394]
+- Fix `reversescale` behavior for `surface`, `mesh3d` and `streamtube`
+ traces (bug introduced in 1.43.0) [#3418]
+- Fix modebar hover styling (bug introduced in 1.43.0) [#3397]
+- Fix horizontal `box` / `violin` hover label misalignment under
+ `hovermode:'closest'` [#3401]
+- Fix `ohlc` and `candlestick` hover for traces with empty items [#3366]
+- Fix `surface` trace `visible` logic [#3365]
+- Fix `mesh3d` trace `visible` logic [#3369]
+
+
## [1.43.1] -- 2018-12-21
### Fixed
| 3 |
diff --git a/assets/js/components/settings/SettingsActiveModule/index.test.js b/assets/js/components/settings/SettingsActiveModule/index.test.js @@ -34,7 +34,6 @@ import {
act,
} from '../../../../../tests/js/test-utils';
import { CORE_MODULES } from '../../../googlesitekit/modules/datastore/constants';
-import { MODULES_ANALYTICS } from '../../../modules/analytics/datastore/constants';
describe( 'SettingsModule', () => {
const SettingsModuleWithWrapper = ( { slug = 'analytics' } ) => (
@@ -94,7 +93,6 @@ describe( 'SettingsModule', () => {
),
},
] );
- registry.dispatch( MODULES_ANALYTICS ).receiveGetSettings( {} );
} );
it( 'should display SettingsViewComponent when on module view route', () => {
| 2 |
diff --git a/_src/index.pug b/_src/index.pug @@ -10,7 +10,7 @@ block content
section.container
h1.lead Oaklanders deserve to know what is in the budget and how it is made.
- p.lead Open Budget: Oakland takes current and past budget data published by the City of Oakland and sums up the information in easy-to-read charts. We want to help Oaklanders look at their city's budget themselves. Data analysts, students, and others who want to know more about the budget data can check out the #[a(href='https://github.com/openoakland/openbudgetoakland/wiki/API-Documentation') Open Budget: Oakland API].
+ p.lead Open Budget: Oakland takes current and past budget data published by the City of Oakland and sums up the information in easy-to-read charts. We want to help people look at the city's budget themselves. To learn more, check out the #[a(href='https://github.com/openoakland/openbudgetoakland/wiki/API-Documentation') Open Budget: Oakland API].
//- See Oakland's #[a(href='/budget-visuals.html') previous budgets], as well as the city's #[a(href='https://www.oaklandca.gov/documents/fiscal-year-2019-20-to-2023-24-five-year-financial-forecast' target='_blank') five-year forecast].
.row.main
@@ -28,7 +28,7 @@ block content
div
h3.blurb__title Re-imagining Public Safety
- p Every member of the City Council voted on July 28, 2020, to create The Re-imagining Public Safety Task Force. The task force will look at how money might be spent helping and healing people in trouble instead of citing them for breaking the law or for arguing with the police.
+ p The City Council voted to create The Re-imagining Public Safety Task Force on July 28, 2020. The task force will look at how money might be spent helping and healing people in trouble instead of citing them.
//-p
a.twitter-timeline(height=700, href='https://twitter.com/search?q=%23OAKbudget', data-widget-id='324560527676276736') Tweets about "#OAKbudget"
| 7 |
diff --git a/edit.html b/edit.html <div class=key>Enter</div>
<div class=label>Move</div>
</div>
+ <div class="key-helper">
+ <div class=key>F</div>
+ <div class=label>Grab</div>
+ </div>
<div class="key-helper">
<div class=key>Backspace</div>
<div class=label>Delete</div>
| 0 |
diff --git a/javascript/components/RasterSource.js b/javascript/components/RasterSource.js @@ -10,6 +10,10 @@ const MapboxGL = NativeModules.MGLModule;
export const NATIVE_MODULE_NAME = 'RCTMGLRasterSource';
+const isTileTemplateUrl = url =>
+ url &&
+ (url.includes('{z}') || url.includes('{bbox-') || url.includes('{quadkey}'));
+
/**
* RasterSource is a map content source that supplies raster image tiles to be shown on the map.
* The location of and metadata about the tiles are defined either by an option dictionary
@@ -73,9 +77,9 @@ class RasterSource extends AbstractSource {
constructor(props) {
super(props);
- if (props.url && props.url.includes('{z}')) {
+ if (isTileTemplateUrl(props.url)) {
console.warn(
- 'RasterSource `url` property contains a tile URL template string. Please use `tileUrlTemplates` instead.',
+ `RasterSource 'url' property contains a Tile URL Template, but is intended for a StyleJSON URL. Please migrate your VectorSource to use: \`tileUrlTemplates=["${props.url}"]\` instead.`,
);
}
}
@@ -86,7 +90,7 @@ class RasterSource extends AbstractSource {
// Swapping url for tileUrlTemplates to provide backward compatiblity
// when RasterSource supported only tile url as url prop
- if (url && url.includes('{z}')) {
+ if (isTileTemplateUrl(url)) {
tileUrlTemplates = [url];
url = undefined;
}
| 7 |
diff --git a/src/actions/datafiles.js b/src/actions/datafiles.js @@ -38,7 +38,7 @@ export function fetchDataFile(filename) {
};
}
-export function putDataFile(filename, data, source) {
+export function putDataFile(filename, data, source = "editor") {
return (dispatch, getState) => {
let payload = {};
if (source == "editor") {
| 12 |
diff --git a/templates/workflow/stakeholder_form.html b/templates/workflow/stakeholder_form.html {% extends "base.html" %}
-{% block bread_crumb %}
-{% endblock %}
-{% block page_title %}
+{% block content %}
+
<div class="container">
<!-- Sub navigation -->
<div class="sub-navigation">
<div class="sub-navigation-actions">
<div class="sub-nav-item">
<span style="float: right;"><a onclick="newPopup('https://docs.google.com/document/d/1fX8hC-UxEd1YcXbf7gIkh5WH_ZPQYuhMB9q4uJNmMec/','Form Help/Guidance'); return false;" href="#" class="btn btn-sm btn-info">Form Help/Guidance</a></span>
-
-
- {% endblock %}
-
-
-{% block content %}
+</div>
+</div>
+</div>
<script type="text/javascript" src="{{ STATIC_URL }}js/select2.min.js"></script>
<link href="{{ STATIC_URL }}css/select2.min.css" rel="stylesheet" />
{% csrf_token %}
{% load crispy_forms_tags %}
{% crispy form %}
+</div>
{% endblock content %}
-</div>
| 7 |
diff --git a/core/algorithm-builder/environments/nodejs/wrapper/package.json b/core/algorithm-builder/environments/nodejs/wrapper/package.json "author": "",
"license": "ISC",
"dependencies": {
- "@hkube/nodejs-wrapper": "^2.0.19"
+ "@hkube/nodejs-wrapper": "^2.0.20"
},
"devDependencies": {}
}
\ No newline at end of file
| 3 |
diff --git a/src/app/lib/ensure-array.js b/src/app/lib/ensure-array.js @@ -2,7 +2,9 @@ const ensureArray = (...args) => {
if (args.length === 0 || args[0] === undefined || args[0] === null) {
return [];
}
-
+ if (args.length === 1) {
+ return [].concat(args[0]);
+ }
return [].concat(args);
};
| 1 |
diff --git a/articles/custom-domains/index.md b/articles/custom-domains/index.md ---
title: Custom Domains
description: How to map custom domains
-beta: true
toc: true
---
# Custom Domains
@@ -10,10 +9,6 @@ Auth0 allows you to map the domain for your tenant to a custom domain of your ch
Using custom domains with universal login is the most seamless and secure experience for developers and end users. For more information, please see our docs on [universal login](/hosted-pages/login).
-::: warning
-Custom Domains is a beta feature available only for paying public-cloud tenants [with their environment tag set as **Development**](/dev-lifecycle/setting-up-env).
-:::
-
## Prerequisites
You'll need to register and own the domain name to which you're mapping your Auth0 domain.
| 2 |
diff --git a/core/algorithm-builder/.travis.yml b/core/algorithm-builder/.travis.yml @@ -15,7 +15,6 @@ before_install:
- docker run -d -p 9000:9000 --name minio1 -e "MINIO_ACCESS_KEY=AKIAIOSFODNN7EXAMPLE" -e "MINIO_SECRET_KEY=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY" minio/minio server /data
install:
- npm ci
- - apt-get -y apt-rdepends
script:
- npm run lint && npm run test:cov
after_script: "npm run coverage"
| 13 |
diff --git a/assets/js/modules/analytics/datastore/accounts.test.js b/assets/js/modules/analytics/datastore/accounts.test.js @@ -395,9 +395,6 @@ describe( 'modules/analytics accounts', () => {
registry.dispatch( CORE_USER ).receiveUserInfo( { email: '[email protected]' } );
- expect( registry.select( STORE_NAME ).getAccountTicketTermsOfServiceURL() ).toMatchQueryParameters( {
- provisioningSignup: 'false',
- } );
expect( registry.select( STORE_NAME ).getAccountTicketTermsOfServiceURL() ).toEqual( 'https://analytics.google.com/analytics/web/?provisioningSignup=false&authuser=test%40gmail.com#/termsofservice/test-account-ticket-id' );
} );
} );
| 7 |
diff --git a/activity/views.py b/activity/views.py @@ -424,7 +424,7 @@ def register_organization(request):
activity_user=user,
organization=org,
)
- group = Group.objects.get(name='Org Admin')
+ group = Group.objects.get(name='Owner')
user_org_access.groups.add(group)
return redirect('/')
| 3 |
diff --git a/package.json b/package.json "prettier": "yarn workspaces run prettier",
"link-cli": "node ./scripts/link-cli.js",
"lint-fix": "yarn workspaces run lint-fix",
- "lint-check": "cd packages/marshal && yarn lint-check && cd ../SwingSet && yarn lint-check && cd ../ERTP && yarn lint-check && cd ../zoe && yarn lint-check && cd ../acorn-eventual-send && yarn lint-check && cd ../eventual-send && yarn lint-check && cd ../transform-eventual-send && yarn lint-check && cd ../tame-metering && yarn lint-check && cd ../transform-metering && yarn lint-check && cd ../default-evaluate-options && yarn lint-check && cd ../evaluate && yarn lint-check && cd ../bundle-source && yarn lint-check && cd ../captp && yarn lint-check && cd ../swingset-runner && yarn lint-check && cd ../simple-swing-store && yarn lint-check && cd ../lmdb-swing-store && yarn lint-check",
- "lint-check-all": "yarn workspaces run lint-check",
+ "lint-check": "yarn workspaces run lint-check",
"test": "yarn workspaces run test",
"build": "yarn workspaces run build"
}
| 4 |
diff --git a/sources/us/tx/montgomery.json b/sources/us/tx/montgomery.json "unit": {
"function": "regexp",
"field": "PropertyAd",
- "pattern": "^(?:\\d+(?:\\s+1/2)?)(?:-(\\d+)|(\\A\\Z)|-?((?:[A-Z]/)*[A-Z]))\\b"
+ "pattern": "^(?:\\d+(?:\\s+1/2)?)(-\\d+|-?(?:[A-Z]/)*[A-Z])\\b"
},
"city": {
"function": "regexp",
"expected": {
"number": "23207",
"street": "DECKER PRAIRIE ROSEHILL RD",
- "unit": "2",
+ "unit": "-2",
"city": "MAGNOLIA",
"region": "TX",
"postcode": "77355"
"expected": {
"number": "20111",
"street": "PLANTATION CREEK DR",
- "unit": "A",
+ "unit": "-A",
"city": "PORTER",
"region": "TX",
"postcode": "77365"
"expected": {
"number": "37019",
"street": "HICKORY RIDGE RD",
- "unit": "A/B",
+ "unit": "-A/B",
"city": "MAGNOLIA",
"region": "TX",
"postcode": "77354"
"expected": {
"number": "410",
"street": "DANIELS ST",
- "unit": "A/B/C",
+ "unit": "-A/B/C",
"city": "WILLIS",
"region": "TX",
"postcode": "77378"
| 13 |
diff --git a/elements/NotificationDialog.js b/elements/NotificationDialog.js @@ -62,7 +62,7 @@ class NotificationDialog extends Dialog {
index++;
}
}
- if (index >= 0) {
+ if (found && index >= 0) {
this.close(this.choices[index]);
handled = true;
}
| 8 |
diff --git a/includes/Modules/Subscribe_With_Google/EditPost.php b/includes/Modules/Subscribe_With_Google/EditPost.php @@ -121,7 +121,7 @@ final class EditPost {
$swg_nonce = sanitize_key( $_POST[ $nonce_key ] );
// Verify settings nonce.
- if ( ! wp_verify_nonce( sanitize_key( $swg_nonce ), Key::from( 'saving_settings' ) ) ) {
+ if ( ! wp_verify_nonce( $swg_nonce, Key::from( 'saving_settings' ) ) ) {
return;
}
| 2 |
diff --git a/OurUmbraco/Community/Banner/Controllers/BannersController.cs b/OurUmbraco/Community/Banner/Controllers/BannersController.cs @@ -20,7 +20,7 @@ namespace OurUmbraco.Community.Banner.Controllers
public ActionResult Render(int id)
{
var page = Umbraco.TypedContent(id);
- if (page != null && page.DocumentTypeAlias == "Community")
+ if (page != null)
{
var vm = new Banners();
var banners = _bannerService.GetBannersByPage(page);
@@ -29,6 +29,7 @@ namespace OurUmbraco.Community.Banner.Controllers
vm.Collection = banners;
vm.Location = _locationService.GetLocationByIp(Request.UserHostAddress);
}
+
return PartialView("Home/Banners", vm);
}
| 2 |
diff --git a/apps.json b/apps.json "shortName":"Notifications",
"icon": "notify.png",
"version":"0.11",
- "description": "Provides a replacement for the `Notifications (default)` `notify` module that is used by applications to display notifications fullscreen. This may not fully restore the screen after on some apps. See `Notifications (default)` for more information about the notify module.",
+ "description": "Provides a replacement for the `Notifications (default)` `notify` module. This version is used by applications to display notifications fullscreen. This may not fully restore the screen after on some apps. See `Notifications (default)` for more information about the notify module.",
"tags": "widget,b2",
"type": "notify",
"storage": [
| 3 |
diff --git a/token-metadata/0x8400D94A5cb0fa0D041a3788e395285d61c9ee5e/metadata.json b/token-metadata/0x8400D94A5cb0fa0D041a3788e395285d61c9ee5e/metadata.json "symbol": "UBT",
"address": "0x8400D94A5cb0fa0D041a3788e395285d61c9ee5e",
"decimals": 8,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/mode/fdm/export.js b/src/mode/fdm/export.js if (lr) {
let angle = 2 * Math.asin(dist/(2*lr.r));
radFault = Math.abs(angle) > Math.PI * 2 / arcRes; // enforce arcRes(olution)
- if (arcQ.center) {
- arcQ.rSum = arcQ.center.reduce( function (t, v) { return t + v.r }, 0 );
- let avg = arcQ.rSum / arcQ.center.length;
- radFault = radFault || Math.abs(avg - lr.r) / avg > arcDev; // eliminate sharps and flats when local rad is out of arcDev(iation)
- }
+ // if (arcQ.center) {
+ // arcQ.rSum = arcQ.center.reduce( function (t, v) { return t + v.r }, 0 );
+ // let avg = arcQ.rSum / arcQ.center.length;
+ // radFault = radFault || Math.abs(avg - lr.r) / avg > arcDev; // eliminate sharps and flats when local rad is out of arcDev(iation)
+ // }
} else {
radFault = true;
}
// check center point delta
arcQ.xSum = arcQ.center.reduce( function (t, v) { return t + v.x }, 0 );
arcQ.ySum = arcQ.center.reduce( function (t, v) { return t + v.y }, 0 );
+ arcQ.rSum = arcQ.center.reduce( function (t, v) { return t + v.r }, 0 );
let dx = cc.x - arcQ.xSum / arcQ.center.length;
let dy = cc.y - arcQ.ySum / arcQ.center.length;
dc = Math.sqrt(dx * dx + dy * dy);
return;
}
if (arcQ.length > 4) {
+ // ondebug({arcQ});
let vec1 = new THREE.Vector2(arcQ[1].x - arcQ[0].x, arcQ[1].y - arcQ[0].y);
let vec2 = new THREE.Vector2(arcQ.center[0].x - arcQ[0].x, arcQ.center[0].y - arcQ[0].y);
+ let gc = vec1.cross(vec2) < 0 ? 'G2' : 'G3';
let from = arcQ[0];
let to = arcQ.peek();
arcQ.xSum = arcQ.center.reduce( function (t, v) { return t + v.x }, 0 );
arcQ.ySum = arcQ.center.reduce( function (t, v) { return t + v.y }, 0 );
arcQ.rSum = arcQ.center.reduce( function (t, v) { return t + v.r }, 0 );
let cl = arcQ.center.length;
- let cc = {x:arcQ.xSum/cl, y:arcQ.ySum/cl, z:arcQ[0].z, r:arcQ.rSum/cl};
+ let cc;
+
+ let angle = BASE.util.thetaDiff(
+ Math.atan2((from.y - arcQ.ySum / cl), (from.x - arcQ.xSum / cl)),
+ Math.atan2((to.y - arcQ.ySum / cl), (to.x - arcQ.xSum / cl)),
+ gc === "G2"
+ );
+
+ if (Math.abs(angle) <= 3 * Math.PI / 4) {
+ cc = BASE.util.center2pr(from, to, arcQ.rSum / cl, gc === "G3");
+ }
+
+ if (!cc) {
+ cc = {x:arcQ.xSum/cl, y:arcQ.ySum/cl, z:arcQ[0].z, r:arcQ.rSum/cl};
+ }
+
// first arc point
emitQrec(from);
// console.log(arcQ.slice(), arcQ.center);
if (extrudeAbs) {
emit = outputLength;
}
- let gc = vec1.cross(vec2) < 0 ? 'G2' : 'G3';
// XYR form
// let pre = `${gc} X${to.x.toFixed(decimals)} Y${to.y.toFixed(decimals)} R${cc.r.toFixed(decimals)} E${emit.toFixed(decimals)}`;
// XYIJ form
| 7 |
diff --git a/src/request_list.js b/src/request_list.js @@ -62,8 +62,8 @@ const ensureUniqueKeyValid = (uniqueKey) => {
* @param {Object} options
* @param {Array} options.sources An array of sources for the `RequestList`. Its contents can either be just plain objects,
* defining at least the 'url' property, or instances of the `Request` class. See the
- * <a href="https://www.apify.com/docs/sdk/apify-runtime-js/latest#Request">Request class documentation</a>
- * for available properties. Additionally a `requestsFromUrl` property may be used instead of `url`,
+ * <a href="#Request">Request class documentation</a> for available properties.
+ * Additionally a `requestsFromUrl` property may be used instead of `url`,
* which will instruct the `RequestList` to download the sources from the given URL.
* URLs will be parsed from the received response.
* ```javascript
| 7 |
diff --git a/scripts/npm-audit-fix.sh b/scripts/npm-audit-fix.sh git clone https://github.com/AgoricBot/harden.git
cd harden
git remote add upstream https://github.com/Agoric/harden.git
+git remote set-url origin https://AgoricBot:[email protected]/AgoricBot/harden.git
git fetch upstream
git checkout master
git rebase upstream/master
git config user.email "[email protected]"
git config user.name "AgoricBot"
+git config --global hub.protocol https
hub push origin master
+
+if git ls-remote --heads --exit-code origin npm-audit-fix ; then
+ git push --delete origin npm-audit-fix
+fi
+
git checkout -b npm-audit-fix
if npm audit ; then
@@ -29,9 +36,6 @@ cd ..
if [ "$files_changed" = true ] ; then
git add .
git commit -m "results of running npm audit fix"
- git remote set-url origin https://AgoricBot:[email protected]/AgoricBot/harden.git
git push origin npm-audit-fix
hub pull-request --no-edit --base Agoric/harden:master
fi
-
-git push --delete origin npm-audit-fix
| 11 |
diff --git a/generators/entity/index.js b/generators/entity/index.js @@ -365,6 +365,11 @@ class EntityGenerator extends BaseBlueprintGenerator {
if (!['sql', 'mongodb', 'couchbase', 'neo4j'].includes(context.databaseType)) {
this.entityConfig.pagination = 'no';
}
+
+ if (this.entityConfig.jpaMetamodelFiltering && (context.databaseType !== 'sql' || context.service === 'no')) {
+ this.warning('Not compatible with jpaMetamodelFiltering, disabling');
+ this.entityConfig.jpaMetamodelFiltering = false;
+ }
},
configureFields() {
@@ -781,7 +786,9 @@ class EntityGenerator extends BaseBlueprintGenerator {
}
}
if (otherEntityData) {
- this._copyFilteringFlag(otherEntityData, relationship, { ...otherEntityData, databaseType: context.databaseType });
+ if (relationship.jpaMetamodelFiltering === undefined) {
+ relationship.jpaMetamodelFiltering = otherEntityData.jpaMetamodelFiltering;
+ }
}
// Load in-memory data for root
if (relationship.relationshipType === 'many-to-many' && relationship.ownerSide) {
@@ -1078,21 +1085,6 @@ class EntityGenerator extends BaseBlueprintGenerator {
}
}
- /**
- * Copy Filtering Flag
- *
- * @param {any} from - from
- * @param {any} to - to
- * @param {any} context - generator context
- */
- _copyFilteringFlag(from, to, context = this) {
- if (context.databaseType === 'sql' && context.service !== 'no') {
- to.jpaMetamodelFiltering = from.jpaMetamodelFiltering;
- } else {
- to.jpaMetamodelFiltering = false;
- }
- }
-
/**
* Load an entity configuration file into context.
*/
@@ -1118,8 +1110,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
context.readOnly = data.readOnly || false;
context.embedded = data.embedded || false;
context.entityAngularJSSuffix = data.angularJSSuffix;
-
- this._copyFilteringFlag(data, context, context);
+ context.jpaMetamodelFiltering = data.jpaMetamodelFiltering;
context.useMicroserviceJson = context.useMicroserviceJson || data.microserviceName !== undefined;
if (context.applicationType === 'gateway' && context.useMicroserviceJson) {
| 2 |
diff --git a/Specs/Scene/ModelExperimental/MaterialPipelineStageSpec.js b/Specs/Scene/ModelExperimental/MaterialPipelineStageSpec.js @@ -10,6 +10,8 @@ import {
Resource,
ResourceCache,
ShaderBuilder,
+ Cartesian4,
+ Cartesian3,
} from "../../../Source/Cesium.js";
import ModelLightingOptions from "../../../Source/Scene/ModelExperimental/ModelLightingOptions.js";
import createScene from "../../createScene.js";
@@ -232,6 +234,61 @@ describe(
});
});
+ it("adds specular glossiness uniforms without defaults", function () {
+ return loadGltf(boomBoxSpecularGlossiness).then(function (gltfLoader) {
+ var components = gltfLoader.components;
+ var primitive = components.nodes[0].primitives[0];
+
+ // Alter PBR parameters so that defaults are not used.
+ var specularGlossiness = primitive.material.specularGlossiness;
+ specularGlossiness.diffuseFactor = new Cartesian4(0.5, 0.5, 0.5, 0.5);
+ specularGlossiness.specularFactor = new Cartesian3(0.5, 0.5, 0.5, 0.5);
+
+ var shaderBuilder = new ShaderBuilder();
+ var uniformMap = {};
+ var renderResources = {
+ shaderBuilder: shaderBuilder,
+ uniformMap: uniformMap,
+ lightingOptions: new ModelLightingOptions(),
+ renderStateOptions: {},
+ };
+
+ MaterialPipelineStage.process(
+ renderResources,
+ primitive,
+ mockFrameState
+ );
+ expectShaderLines(shaderBuilder._fragmentShaderParts.uniformLines, [
+ "uniform sampler2D u_diffuseTexture;",
+ "uniform vec4 u_diffuseFactor;",
+ "uniform sampler2D u_specularGlossinessTexture;",
+ "uniform vec3 u_specularFactor;",
+ "uniform float u_glossinessFactor;",
+ ]);
+
+ expectShaderLines(shaderBuilder._fragmentShaderParts.defineLines, [
+ "USE_SPECULAR_GLOSSINESS",
+ "HAS_DIFFUSE_TEXTURE",
+ "TEXCOORD_DIFFUSE v_texCoord_0",
+ "HAS_DIFFUSE_FACTOR",
+ "HAS_SPECULAR_GLOSSINESS_TEXTURE",
+ "TEXCOORD_SPECULAR_GLOSSINESS v_texCoord_0",
+ "HAS_SPECULAR_FACTOR",
+ "HAS_GLOSSINESS_FACTOR",
+ ]);
+
+ var expectedUniforms = {
+ u_diffuseTexture: specularGlossiness.diffuseTexture.texture,
+ u_diffuseFactor: specularGlossiness.diffuseFactor,
+ u_specularGlossinessTexture:
+ specularGlossiness.specularGlossinessTexture.texture,
+ u_specularFactor: specularGlossiness.specularFactor,
+ u_glossinessFactor: specularGlossiness.glossinessFactor,
+ };
+ expectUniformMap(uniformMap, expectedUniforms);
+ });
+ });
+
it("enables PBR lighting for metallic roughness materials", function () {
return loadGltf(boomBox).then(function (gltfLoader) {
var components = gltfLoader.components;
| 7 |
diff --git a/app/components/Features/HorusPay/stakeTable.js b/app/components/Features/HorusPay/stakeTable.js @@ -45,14 +45,34 @@ const HorusPay = props => {
pushTransaction(transaction,props.history);
};
+ const handleRefund = (stake) => {
+ const transaction = [
+ {
+ account: 'horustokenio',
+ name: 'refundhorus',
+ data: {
+ owner: networkIdentity.name,
+ },
+ },
+ ];
+ pushTransaction(transaction,props.history);
+ };
+
let totalHorusStake = 0;
const data = stakes.map(stake => {
totalHorusStake += Number(stake.horus_weight.split(' ')[0]);
+ const refundTime = new Date((stake.time_initial+604800)*1000);
return {
...stake,
actions: stake.to === 'Refunding' ? (
- <div className="actions-right">Available on {(new Date((stake.time_initial+604800)*1000)).toLocaleString()}</div>
+ refundTime < Date.now() ? (
+ <div className="actions-right"><Button
+ onClick={() => {handleRefund(stake)}}
+ color="success">Refund</Button></div>
+ ) : (
+ <div className="actions-right">Available on {refundTime.toLocaleString()}</div>
+ )
) : (
<div className="actions-right">
<Button
| 0 |
diff --git a/updates/2017-08-07.yml b/updates/2017-08-07.yml added:
-
- title: "Integrate Azure API Management Service with Auth0"
+ title: "Secure AWS API Gateway Endpoints Using Custom Authorizers"
tags:
- - azure
+ - aws
- api
- - microsoft
+ - api-gatway
- tutorials
description: |
- A [new tutorial](https://auth0.com/docs/integrations/azure-api-gateway) was added on how to use Auth0 to secure APIs managed by Azure's API Gateway.
\ No newline at end of file
+ A [new tutorial](https://auth0.com/docs/integrations/aws-api-gateway) was added on how to secure your API Gateway APIs using custom authorizers that handle Auth0 access tokens.
\ No newline at end of file
| 0 |
diff --git a/src/components/Validator.js b/src/components/Validator.js @@ -152,7 +152,7 @@ export const Validator = {
const re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
// Allow emails to be valid if the component is pristine and no value is provided.
- return (component.pristine && !value) || re.test(value);
+ return !value || re.test(value);
}
},
date: {
| 11 |
diff --git a/src/index.js b/src/index.js this.$hooks = merge({created: noop, mounted: noop, updated: noop, destroyed: noop}, opts.hooks);
this.$methods = opts.methods || {};
this.$components = merge(opts.components || {}, components);
- this.$dom = {type: this.$el.nodeName, children: [], node: this.$el};
+ this.$dom = {};
this.$destroyed = false;
/* ======= Listen for Changes ======= */
| 12 |
diff --git a/rig-aux.js b/rig-aux.js @@ -12,10 +12,10 @@ class RigAux {
}
addWearable(o) {
const wearComponent = o.components.find(c => c.type === 'wear');
- const {position = [0, 0, 0], quaternion = [0, 0, 0, 1], scale = [1, 1, 1]} = wearComponent;
+ const {position = [0, 0, 0], quaternion = [0, 0, 0, 1], scale = [1, 1, 1], bone = 'Chest'} = wearComponent;
const update = now => {
const {localRig} = rigManager;
- const chest = localRig.modelBones.Chest;
+ const chest = localRig.modelBones[bone];
localMatrix.compose(localVector.fromArray(position), localQuaternion.fromArray(quaternion), localVector2.fromArray(scale))
.premultiply(chest.matrixWorld)
.decompose(o.position, o.quaternion, o.scale);
| 0 |
diff --git a/README.md b/README.md @@ -411,15 +411,9 @@ nlp(`Couldn't Itchy share his pie with Scratchy?`).debug()
</a>
</td>
<td>
- <a href="http://slack.compromise.cool/">
- <img src="https://cloud.githubusercontent.com/assets/399657/21956671/a30cbc82-da53-11e6-82d6-aaaaebc0bc93.jpg"/>
- <div> Slack group </div>
- </a>
- </td>
- <td>
- <a href="http://nlpcompromise.us12.list-manage2.com/subscribe?u=d5bd9bcc36c4bef0fd5f6e75f&id=8738c1f5ef">
- <img src="https://cloud.githubusercontent.com/assets/399657/21956670/a30be6e0-da53-11e6-9aaf-52a10b8c3195.jpg"/>
- <div> Mailing-list </div>
+ <a href="https://gitter.im/nlpcompromise/community">
+ <img src="https://user-images.githubusercontent.com/399657/59966943-33e22a80-94f1-11e9-87cf-0eec2428bea4.png"/>
+ <div> Gitter chat </div>
</a>
</td>
<td>
| 14 |
diff --git a/yarn.lock b/yarn.lock @@ -4713,11 +4713,11 @@ mongodb@^2.2.31:
readable-stream "2.2.7"
mongodb@^3.0.1:
- version "3.6.3"
- resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.6.3.tgz#eddaed0cc3598474d7a15f0f2a5b04848489fd05"
- integrity sha512-rOZuR0QkodZiM+UbQE5kDsJykBqWi0CL4Ec2i1nrGrUI3KO11r6Fbxskqmq3JK2NH7aW4dcccBuUujAP0ERl5w==
+ version "3.5.9"
+ resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.5.9.tgz#799b72be8110b7e71a882bb7ce0d84d05429f772"
+ integrity sha512-vXHBY1CsGYcEPoVWhwgxIBeWqP3dSu9RuRDsoLRPTITrcrgm1f0Ubu1xqF9ozMwv53agmEiZm0YGo+7WL3Nbug==
dependencies:
- bl "^2.2.1"
+ bl "^2.2.0"
bson "^1.1.4"
denque "^1.4.1"
require_optional "^1.0.1"
| 13 |
diff --git a/src/serialize/function.js b/src/serialize/function.js import { matchDomain, getDomain, type CrossDomainWindowType, type DomainMatcher } from 'cross-domain-utils/src';
import { ZalgoPromise } from 'zalgo-promise/src';
-import { uniqueID, isRegex } from 'belter/src';
+import { uniqueID, isRegex, arrayFrom } from 'belter/src';
import { serializeType, type CustomSerializedType } from 'universal-serialize/src';
import { MESSAGE_NAME, WILDCARD, SERIALIZATION_TYPE } from '../conf';
@@ -39,6 +39,33 @@ function lookupMethod(source : CrossDomainWindowType, id : string) : ?StoredMeth
return methods[id] || proxyWindowMethods.get(id);
}
+function stringifyArguments(args : $ReadOnlyArray<mixed> = []) : string {
+ return arrayFrom(args).map(arg => {
+ if (typeof arg === 'string') {
+ return `'${ arg }'`;
+ }
+ if (arg === undefined) {
+ return 'undefined';
+ }
+ if (arg === null) {
+ return 'null';
+ }
+ if (typeof arg === 'boolean') {
+ return arg.toString();
+ }
+ if (Array.isArray(arg)) {
+ return '[ ... ]';
+ }
+ if (typeof arg === 'object') {
+ return '{ ... }';
+ }
+ if (typeof arg === 'function') {
+ return '() => { ... }';
+ }
+ return `<${ typeof arg }>`;
+ }).join(', ');
+}
+
function listenForFunctionCalls({ on, send } : { on : OnType, send : SendType }) : CancelableType {
return globalStore('builtinListeners').getOrSet('functionCalls', () => {
return on(MESSAGE_NAME.METHOD, { domain: WILDCARD }, ({ source, origin, data } : { source : CrossDomainWindowType, origin : string, data : Object }) => {
@@ -77,7 +104,7 @@ function listenForFunctionCalls({ on, send } : { on : OnType, send : SendType })
// $FlowFixMe
if (err.stack) {
// $FlowFixMe
- err.stack = `Remote call to ${ name }()\n\n${ err.stack }`;
+ err.stack = `Remote call to ${ name }(${ stringifyArguments(data.args) }) failed\n\n${ err.stack }`;
}
throw err;
@@ -157,7 +184,7 @@ export function deserializeFunction<T>(source : CrossDomainWindowType | ProxyWin
// $FlowFixMe
if (__DEBUG__ && originalStack && err.stack) {
// $FlowFixMe
- err.stack = `Remote call to ${ name }() failed\n\n${ err.stack }\n\n${ originalStack }`;
+ err.stack = `Remote call to ${ name }(${ stringifyArguments(arguments) }) failed\n\n${ err.stack }\n\n${ originalStack }`;
}
throw err;
});
| 7 |
diff --git a/src/ide.js b/src/ide.js @@ -44,6 +44,7 @@ D.IDE=function(){'use strict'
CloseWindow:function(x){
var w=ide.wins[x.win];if(w){w.closePopup&&w.closePopup();w.vt.clear();w.container&&w.container.close()}
delete ide.wins[x.win];ide.wins[0].focus()
+ ide.WSEwidth=ide.wsew
},
OpenWindow:function(ee){
if(!ee['debugger']&&D.el&&process.env.RIDE_EDITOR){
@@ -82,6 +83,7 @@ D.IDE=function(){'use strict'
q.addChild(p);q.callDownwards('setSize');p=q}
}
p.addChild({type:'component',componentName:'win',componentState:{id:w},title:ee.name})
+ ide.WSEwidth=ide.wsew
tc?ide.wins[0].scrollCursorIntoView():ide.wins[0].cm.scrollTo(si.left,si.top)
},
ShowHTML:function(x){
@@ -177,6 +179,14 @@ D.IDE=function(){'use strict'
ide.block=function(){blk++}
ide.unblock=function(){--blk||rrd()}
ide.tracer=function(){var tc;for(var k in ide.wins){var w=ide.wins[k];if(w.tc){tc=w;break}};return tc}
+ Object.defineProperty(ide, 'WSEwidth', {
+ get:function() {
+ var comp=this.gl.root.getComponentsByName('wse')[0];
+ return comp&&comp.container&&comp.container.width},
+ set:function(w){
+ var comp=this.gl.root.getComponentsByName('wse')[0];
+ comp&&comp.container&&comp.container.setSize(w)}
+ })
//language bar
var ttid //tooltip timeout id
@@ -243,6 +253,7 @@ D.IDE=function(){'use strict'
sctid=setTimeout(function(){
eachWin(function(w){w.updSize();w.cm.refresh();w.updGutters&&w.updGutters();w.restoreScrollPos()})
},50)
+ ide.wsew=ide.WSEwidth;
})
gl.on('itemDestroyed',function(x){ide.wins[0].saveScrollPos()})
gl.on('tabCreated',function(x){
@@ -277,7 +288,7 @@ D.IDE=function(){'use strict'
row.addChild(p,0,true);row.callDownwards('setSize');p=row}
p.addChild({type:'component',componentName:'wse',title:'Workspace Explorer'},0)
D.ide.wins[0].cm.scrollTo(si.left,si.top)
- var comp=gl.root.getComponentsByName('wse')[0];comp&&comp.container&&comp.container.setSize(200)
+ D.ide.WSEwidth=D.ide.wsew=200;
}
D.prf.wse(updWSE);D.prf.wse()&&setTimeout(updWSE,500)
D.mac&&setTimeout(function(){ide.wins[0].focus()},500) //OSX is stealing our focus. Let's steal it back! Bug #5
| 12 |
diff --git a/token-metadata/0x86965A86539e2446F9e72634CEfCA7983CC21a81/metadata.json b/token-metadata/0x86965A86539e2446F9e72634CEfCA7983CC21a81/metadata.json "symbol": "YFIS",
"address": "0x86965A86539e2446F9e72634CEfCA7983CC21a81",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/libs/imageManipulator/index.js b/src/libs/imageManipulator/index.js @@ -10,15 +10,15 @@ import _ from 'underscore';
*/
function sizeFromAngle(width, height, angle) {
const radians = (angle * Math.PI) / 180;
- let c = Math.cos(radians);
- let s = Math.sin(radians);
- if (s < 0) {
- s = -s;
+ let sine = Math.cos(radians);
+ let cosine = Math.sin(radians);
+ if (cosine < 0) {
+ cosine = -cosine;
}
- if (c < 0) {
- c = -c;
+ if (sine < 0) {
+ sine = -sine;
}
- return {width: (height * s) + (width * c), height: (height * c) + (width * s)};
+ return {width: (height * cosine) + (width * sine), height: (height * sine) + (width * cosine)};
}
/**
| 10 |
diff --git a/package-lock.json b/package-lock.json "ansi-regex": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
- "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
- "optional": true
+ "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
},
"aproba": {
"version": "1.2.0",
"balanced-match": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
- "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
- "optional": true
+ "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
},
"brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
- "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
"code-point-at": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
- "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
- "optional": true
+ "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
},
"concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
- "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
- "optional": true
+ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
},
"console-control-strings": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
- "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
- "optional": true
+ "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
},
"core-util-is": {
"version": "1.0.2",
"inherits": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
- "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
- "optional": true
+ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
},
"ini": {
"version": "1.3.5",
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
- "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
- "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
"minimist": {
"version": "0.0.8",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
- "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
- "optional": true
+ "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
},
"minipass": {
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz",
"integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==",
- "optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
- "optional": true,
"requires": {
"minimist": "0.0.8"
}
"number-is-nan": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
- "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
- "optional": true
+ "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
},
"object-assign": {
"version": "4.1.1",
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
- "optional": true,
"requires": {
"wrappy": "1"
}
"safe-buffer": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
- "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
- "optional": true
+ "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
},
"safer-buffer": {
"version": "2.1.2",
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
- "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
- "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
"wrappy": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
- "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
- "optional": true
+ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
},
"yallist": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
- "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
- "optional": true
+ "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k="
}
}
},
| 3 |
diff --git a/token-metadata/0xBcc66ed2aB491e9aE7Bf8386541Fb17421Fa9d35/metadata.json b/token-metadata/0xBcc66ed2aB491e9aE7Bf8386541Fb17421Fa9d35/metadata.json "symbol": "SKULL",
"address": "0xBcc66ed2aB491e9aE7Bf8386541Fb17421Fa9d35",
"decimals": 4,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/tests/e2e/specs/dashboard/surveys.test.js b/tests/e2e/specs/dashboard/surveys.test.js /**
* WordPress dependencies
*/
-import { activatePlugin, visitAdminPage } from '@wordpress/e2e-test-utils';
+import { visitAdminPage } from '@wordpress/e2e-test-utils';
/**
* Internal dependencies
@@ -34,7 +34,6 @@ import surveyResponse from '../../../../assets/js/components/surveys/__fixtures_
describe( 'dashboard surveys', () => {
beforeAll( async () => {
await setupSiteKit();
- await activatePlugin( 'e2e-tests-user-tracking-opt-in' );
await page.setRequestInterception( true );
useRequestInterception( ( request ) => {
| 2 |
diff --git a/developer-guides/face-recognition.md b/developer-guides/face-recognition.md ---
description: Describes the Face Recognition process as part of GoodDollar identification process
+This document describes the FR process on the following parts: GoodDapp (client side), GoodServer (server side)
---
-# Face Recognition
+# Face Recognition - DAPP side
## High level description
@@ -26,7 +27,7 @@ The Face Recognition process includes the following steps:
-## Low level technical description
+## Low level technical description - GoodDapp
The Face Recognition files are located under: https://github.com/GoodDollar/GoodDAPP/tree/master/src/components/dashboard/FaceRecognition
### Dashboard Integration
@@ -80,3 +81,32 @@ Mainly contains the `capture` method which recieves the streaming video track fr
Please note, Currently, it is not supported as a react native component out of the box and will have to be translated into proper native components (The <Video/> tag is web only)
{% endhint %}
Contains a Video tag and methods that handles the actual video capture of the user.
+
+
+
+## Low level technical description - GoodServer
+Recall that, on the server under _/verify/facerecognition_, the face recognition process is triggered by calling _liveness_ test, and then _search_ test with the user capture data, to verify the user is a real user and haven't been registered to Zoom & GoodDollar before (it is not duplicated). In case both pass, the user is whitelisted on the GoodDollar contract.
+
+Both verification tests (_liveness_ & _search_) are done by calling from the server to Zoom (FaceTech) API's.
+
+### VerificationAPI.js
+Contains the endpoint code for _/verify/facerecognition_ endpoint.
+Responsible for the following actions:
+1. Receive the uploaded capture data: facemap,auditTrailImage, enrollmentIdentifier and sessionId, using `upload.any()` middleware provided by _multer_ npm package.
+
+2. Load the files that were automatically stored by multer middleware
+3. call verifyUser() which performs face recognition process (see below)
+4. cleanup loaded files after verifying the user
+5. in case user is verified, whitelist the user in the Admin Wallet contract, and update the user on the GD storage as verified.
+
+### Verification.js
+This module contains a method called `verifyUser(user: UserRecord, verificationData: any): Promise<boolean>` which recieves the active user that needs to pass face recognition, and the face recognition data.
+It:
+1. Prepares Liveness & Search request
+2. Caling Zoom Livness & Search API (using Helper class) to verify the user is alive, and that the user has no duplicates.
+
+The testing is gradual. Livness must pass first, then duplicates test. Once both passed, the user is enrolled to Zoom database, in order to be available for the next _search_ actions.
+
+This module is using `zoomClient.js` and `faceRecognitionHelper.js`, which are straight forward and self explanatory.
+
+
| 0 |
diff --git a/src/system-production.js b/src/system-production.js @@ -19,7 +19,7 @@ if (isBrowser || isWorker) {
global.System.register = function () {
if (register)
register.apply(this, arguments);
- System.register.apply(this, arguments);
+ System.register.apply(System, arguments);
};
}
}
| 1 |
diff --git a/src/components/auth/AuthTorus.js b/src/components/auth/AuthTorus.js @@ -103,7 +103,7 @@ const AuthTorus = ({ screenProps, navigation, styles, store }) => {
}
//user doesnt exists start signup
- fireEvent(SIGNUP_STARTED, { source })
+ fireEvent(SIGNUP_STARTED, { source, provider })
navigation.navigate(redirectTo, { torusUser })
//Hack to get keyboard up on mobile need focus from user event such as click
| 0 |
diff --git a/src/traces/bar/plot.js b/src/traces/bar/plot.js @@ -191,8 +191,8 @@ function plot(gd, plotinfo, cdModule, traceLayer, opts, makeOnCompleteCallback)
d3.round(Math.round(v) - offset, 2) : v;
}
- function expandToVisible(v, vc, hideZeroHeight) {
- if(hideZeroHeight && v === vc) return v;
+ function expandToVisible(v, vc, hideZeroSpan) {
+ if(hideZeroSpan && v === vc) return v;
// if it's not in danger of disappearing entirely,
// round more precisely
| 10 |
diff --git a/edit.js b/edit.js @@ -9,7 +9,6 @@ import {XRPackage, pe, renderer, scene, camera, floorMesh, proxySession, getReal
import {downloadFile, readFile, bindUploadFileButton} from 'https://static.xrpackage.org/xrpackage/util.js';
import {wireframeMaterial, getWireframeMesh, meshIdToArray, decorateRaycastMesh, VolumeRaycaster} from './volume.js';
import './gif.js';
-import {contractsHost, makeCredentials} from 'https://flow.webaverse.com/flow.js';
const apiHost = 'https://ipfs.exokit.org/ipfs';
const presenceEndpoint = 'wss://presence.exokit.org';
| 2 |
diff --git a/angular/projects/spark-angular/src/lib/components/inputs/sprk-input-container/sprk-input-container.component.ts b/angular/projects/spark-angular/src/lib/components/inputs/sprk-input-container/sprk-input-container.component.ts @@ -4,18 +4,23 @@ import { SprkFieldErrorDirective } from '../../../directives/inputs/sprk-field-e
import { SprkInputDirective } from '../../../directives/inputs/sprk-input/sprk-input.directive';
import { SprkLabelDirective } from '../../../directives/inputs/sprk-label/sprk-label.directive';
+/**
+ *
+ */
@Component({
selector: 'sprk-input-container',
template: `
- <div [ngClass]="getClasses()">
- <ng-content select="[sprkLabel]"></ng-content>
- <ng-content select="[sprkInput]"></ng-content>
+ <div [ngClass]="getClasses()" [attr.data-id]="idString">
+ <ng-content></ng-content>
<ng-content select="[sprk-select-icon]"></ng-content>
+ <ng-content select="[sprk-input-icon]"></ng-content>
<ng-content select="sprk-selection-item-container"></ng-content>
+ <ng-content select="sprk-checkbox-item"></ng-content>
<ng-content select="[sprkHelperText]"></ng-content>
<ng-content select="[sprkFieldError]"></ng-content>
+ <ng-content select="[afterSprkInput]"></ng-content>
</div>
- `
+ `,
})
export class SparkInputContainerComponent implements OnInit {
/**
@@ -25,6 +30,24 @@ export class SparkInputContainerComponent implements OnInit {
*/
@Input()
additionalClasses: string;
+ /**
+ * This will be used to determine the variant of
+ * the checkbox item.
+ */
+ @Input()
+ variant: 'huge' | undefined;
+
+ /**
+ * The value supplied will be assigned
+ * to the `data-id` attribute on the
+ * component. This is intended to be
+ * used as a selector for automated
+ * tools. This value should be unique
+ * per page.
+ */
+ @Input()
+ idString: string;
+
/**
* Expects a space separated string
* of classes to be added to the
@@ -39,12 +62,14 @@ export class SparkInputContainerComponent implements OnInit {
*/
@ContentChild(SprkLabelDirective, { static: true })
label: SprkLabelDirective;
+
/**
* This component expects a child input element
* with the `sprkInput` directive.
*/
@ContentChild(SprkInputDirective, { static: true })
input: SprkInputDirective;
+
/**
* This component expects a child element
* with the `sprkFieldError` directive.
@@ -72,7 +97,7 @@ export class SparkInputContainerComponent implements OnInit {
const classArray: string[] = ['sprk-b-InputContainer'];
if (this.additionalClasses) {
- this.additionalClasses.split(' ').forEach(className => {
+ this.additionalClasses.split(' ').forEach((className) => {
classArray.push(className);
});
}
@@ -87,7 +112,7 @@ export class SparkInputContainerComponent implements OnInit {
if (this.input && this.error) {
this.input.ref.nativeElement.setAttribute(
'aria-describedby',
- this.error_id
+ this.error_id,
);
this.error.ref.nativeElement.id = this.error_id;
}
| 3 |
diff --git a/src/encoded/search.py b/src/encoded/search.py @@ -1237,7 +1237,7 @@ def audit(context, request):
# Don't use these groupings for audit matrix
x_grouping = matrix['x']['group_by']
y_groupings = audit_list_field
- no_audits_groupings = ['no.error', 'no.not_compliant', 'no.warning']
+ no_audits_groupings = ['no.audit.error', 'no.audit.not_compliant', 'no.audit.warning']
#y_groupings.append("no.error")
#y_groupings.append("no.not_compliant")
#y_groupings.append("no.warning")
@@ -1299,7 +1299,7 @@ def audit(context, request):
aggs.update({
- "no.error": {
+ "no.audit.error": {
"missing": {
"field": "audit.ERROR.category"
},
@@ -1310,7 +1310,7 @@ def audit(context, request):
"size": 0
}
},
- "no.not_compliant": {
+ "no.audit.not_compliant": {
"missing": {
"field": "audit.NOT_COMPLIANT.category"
},
@@ -1321,7 +1321,7 @@ def audit(context, request):
"size": 0
}
},
- "no.warning": {
+ "no.audit.warning": {
"missing": {
"field": "audit.WARNING.category"
},
@@ -1449,9 +1449,10 @@ def audit(context, request):
summary = []
for xbucket in x_buckets:
summary.append(counts.get(xbucket['key'], 0))
- aggregations[group_by] = outer_bucket[group_by]
+ aggregations[group_by] = outer_bucket[group_by]['assay_title']
aggregations[group_by]['assay_title'] = summary
+
summarize_buckets(
result['matrix'],
aggregations['matrix']['x']['buckets'],
@@ -1471,16 +1472,35 @@ def audit(context, request):
# The following lines organize the no audit data into the same format as the audit data
# so auditmatrix.js can treat it the same way
- no_audits_dict = {}
- no_audits_list = []
- no_audits_temp = {}
- no_audits_temp = aggregations['matrix']['no.audits']
- no_audits_temp['key'] = "experiments with no red audits"
- no_audits_list.append(no_audits_temp)
- no_audits_dict['buckets'] = no_audits_list
+ no_audits_error_dict = {}
+ no_audits_error_list = []
+ no_audits_error_temp = {}
+ no_audits_error_temp = aggregations['matrix']['no.audit.error']
+ no_audits_error_temp['key'] = "experiments with no red audits"
+ no_audits_error_list.append(no_audits_error_temp)
+ no_audits_error_dict['buckets'] = no_audits_error_list
+
+ no_audits_nc_dict = {}
+ no_audits_nc_list = []
+ no_audits_nc_temp = {}
+ no_audits_nc_temp = aggregations['matrix']['no.audit.not_compliant']
+ no_audits_nc_temp['key'] = "experiments with no red or orange audits"
+ no_audits_nc_list.append(no_audits_nc_temp)
+ no_audits_nc_dict['buckets'] = no_audits_nc_list
+
+ no_audits_warning_dict = {}
+ no_audits_warning_list = []
+ no_audits_warning_temp = {}
+ no_audits_warning_temp = aggregations['matrix']['no.audit.warning']
+ no_audits_warning_temp['key'] = "experiments with no red or orange or yellow audits"
+ no_audits_warning_list.append(no_audits_warning_temp)
+ no_audits_warning_dict['buckets'] = no_audits_warning_list
+
# Replaces 'no.audits' in aggregations['matrix'] with the correctly formatted 'no.audits' data
- aggregations['matrix']['no.audits'] = no_audits_dict
+ aggregations['matrix']['no.audit.error'] = no_audits_error_dict
+ aggregations['matrix']['no.audit.not_compliant'] = no_audits_nc_dict
+ aggregations['matrix']['no.audit.warning'] = no_audits_warning_dict
# Formats all audit categories into readable/usable format for auditmatrix.js
bucket_audit_category_list = []
| 0 |
diff --git a/templates/data-explorer.js b/templates/data-explorer.js @@ -274,7 +274,7 @@ export default class DataExplorer extends Morph {
}
async renderTreeType() {
- const radialTree = await lively.create(visualizationComponents[this.selectedVisualizationType]);
+ const vis = await lively.create(visualizationComponents[this.selectedVisualizationType]);
const nameField = this.settingsVisualization[0].selection.value;
const childField = this.settingsVisualization[1].selection.value;
@@ -296,8 +296,8 @@ export default class DataExplorer extends Morph {
console.log('failed to find value value');
}
- radialTree.style.width = '100%';
- radialTree.style.height = '100%';
+ vis.style.width = '100%';
+ vis.style.height = '100%';
const renamedObject = deepMapKeys({data: this.data}, key => (mapShortToLong[key] || key))
@@ -306,8 +306,8 @@ export default class DataExplorer extends Morph {
children: renamedObject.data,
};
- radialTree.setTreeData(data);
- this.visualizationEL.appendChild(radialTree);
+ vis.setTreeData(data);
+ this.visualizationEL.appendChild(vis);
}
livelyMigrate(other) {
| 10 |
diff --git a/src/modules/repository/implementation/sequelize/sequelize-repository.js b/src/modules/repository/implementation/sequelize/sequelize-repository.js @@ -267,19 +267,22 @@ class SequelizeRepository {
}
async getAllPeerRecords(blockchain, filterLastSeen) {
- return this.models.shard.findAll({
+ const query = {
where: {
blockchain_id: {
[Sequelize.Op.eq]: blockchain,
},
- last_seen: filterLastSeen
- ? {
- [Sequelize.Op.gte]: Sequelize.col('last_dialed'),
- }
- : undefined,
},
raw: true,
- });
+ };
+
+ if (filterLastSeen) {
+ query.where.last_seen = {
+ [Sequelize.Op.gte]: Sequelize.col('last_dialed'),
+ };
+ }
+
+ return this.models.shard.findAll(query);
}
async getPeerRecord(peerId, blockchain) {
| 1 |
diff --git a/src/js/services/wallet-history.service.js b/src/js/services/wallet-history.service.js function addEarlyTransactions(walletId, cachedTxs, newTxs) {
var cachedTxIndexFromId = {};
- cachedTxs.forEach(function forCachedTx(tx){
- cachedTxIndexFromId[tx.txid] = true;
+ cachedTxs.forEach(function forCachedTx(tx, txIndex){
+ cachedTxIndexFromId[tx.txid] = txIndex;
});
var confirmationsUpdated = false;
* @param {function(error, txs)} cb - txs is always an array, may be empty
*/
function getCachedTxHistory(walletId, cb) {
- console.log('txhistory updateLocalTxHistoryByPage()');
+ console.log('txhistory getCachedTxHistory()');
storageService.getTxHistory(walletId, function onGetTxHistory(err, txHistoryString){
if (err) {
return cb(err, []);
}
function updateLocalTxHistoryByPage(wallet, getLatest, flushCacheOnNew, cb) {
- console.log('txhistory updaetLocalTxHistoryByPage()');
+ console.log('txhistory updateLocalTxHistoryByPage()');
if (flushCacheOnNew) {
fetchTxHistoryByPage(wallet, 0, function onFetchTxHistory(err, txs){
if (err) {
| 9 |
diff --git a/source/views/controls/RichTextView.js b/source/views/controls/RichTextView.js @@ -14,7 +14,7 @@ import { lookupKey, isClickModified } from '../../dom/DOMEvent';
import DropTarget from '../../drag-drop/DropTarget';
import * as DragEffect from '../../drag-drop/DragEffect';
import { loc } from '../../localisation/LocaleController';
-import { isIOS, isApple } from '../../ua/UA';
+import { isIOS, isApple, isAndroid } from '../../ua/UA';
import View from '../View';
import ViewEventsController from '../ViewEventsController';
import ScrollView from '../containers/ScrollView';
@@ -54,16 +54,7 @@ const urlRegExp =
const popOver = new PopOverView();
const TOOLBAR_HIDDEN = 0;
-const TOOLBAR_INLINE = 1;
-const TOOLBAR_AT_SELECTION = 2;
-const TOOLBAR_AT_TOP = 3;
-
-const hiddenFloatingToolbarLayout = {
- top: 0,
- left: 0,
- maxWidth: '100%',
- transform: 'translate3d(-100vw,0,0)',
-};
+const TOOLBAR_AT_TOP = 1;
const URLPickerView = Class({
@@ -143,7 +134,7 @@ const RichTextView = Class({
// ---
- showToolbar: isIOS ? TOOLBAR_AT_SELECTION : TOOLBAR_AT_TOP,
+ showToolbar: isIOS || isAndroid ? TOOLBAR_HIDDEN : TOOLBAR_AT_TOP,
fontFaceOptions: function () {
return [
[ loc( 'Default' ), null ],
@@ -362,49 +353,6 @@ const RichTextView = Class({
// ---
- floatingToolbarLayout: hiddenFloatingToolbarLayout,
-
- hideFloatingToolbar: function () {
- this.set( 'floatingToolbarLayout', hiddenFloatingToolbarLayout );
- }.on( 'cursor' ),
-
- showFloatingToolbar () {
- if ( this.get( 'showToolbar' ) !== TOOLBAR_AT_SELECTION ) {
- return;
- }
- const range = this.get( 'editor' ).getSelection();
- let node = isIOS ? range.endContainer : range.startContainer;
- if ( node.nodeType !== 1 /* Node.ELEMENT_NODE */ ) {
- node = node.parentNode;
- }
- const position = getPosition( node, this.get( 'layer' ) );
- this.set( 'floatingToolbarLayout', {
- top: 0,
- left: 0,
- maxWidth: '100%',
- transform: 'translate3d(0,' + (
- isIOS ?
- position.top + position.height + 10 :
- position.top -
- this.get( 'toolbarView' ).get( 'pxHeight' ) - 10
- ) + 'px,0)',
- });
- },
-
- showFloatingToolbarIfSelection: function () {
- const toolbarIsVisible =
- this.get( 'floatingToolbarLayout' ) !==
- hiddenFloatingToolbarLayout;
- if ( !toolbarIsVisible && this.get( 'isTextSelected' ) ) {
- this.showFloatingToolbar();
- }
- // (You might think 'select' was the right event to hook onto, but that
- // causes trouble as it shows the toolbar while the mouse is still down,
- // which gets in the way of the selection. So mouseup it is.)
- }.on( 'mouseup', 'keyup' ),
-
- // ---
-
getIcon () {
return null;
},
@@ -1201,8 +1149,6 @@ const RichTextView = Class({
});
RichTextView.TOOLBAR_HIDDEN = TOOLBAR_HIDDEN;
-RichTextView.TOOLBAR_INLINE = TOOLBAR_INLINE;
-RichTextView.TOOLBAR_AT_SELECTION = TOOLBAR_AT_SELECTION;
RichTextView.TOOLBAR_AT_TOP = TOOLBAR_AT_TOP;
export default RichTextView;
| 2 |
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js b/packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js @@ -200,7 +200,7 @@ RED.typeSearch = (function() {
dialog.hide();
searchResultsDiv.hide();
}
- refreshTypeList();
+ refreshTypeList(opts);
addCallback = opts.add;
closeCallback = opts.close;
RED.events.emit("type-search:open");
@@ -254,21 +254,29 @@ RED.typeSearch = (function() {
return 1;
}
}
- function refreshTypeList() {
+ function applyFilter(filter,type,def) {
+ return !filter ||
+ (
+ (!filter.type || type === filter.type) &&
+ (!filter.input || def.inputs > 0) &&
+ (!filter.output || def.outputs > 0)
+ )
+ }
+ function refreshTypeList(opts) {
var i;
searchResults.editableList('empty');
searchInput.searchBox('value','');
selected = -1;
var common = [
'inject','debug','function','change','switch'
- ];
+ ].filter(function(t) { return applyFilter(opts.filter,t,RED.nodes.getType(t)); });
var recentlyUsed = Object.keys(typesUsed);
recentlyUsed.sort(function(a,b) {
return typesUsed[b]-typesUsed[a];
});
recentlyUsed = recentlyUsed.filter(function(t) {
- return common.indexOf(t) === -1;
+ return applyFilter(opts.filter,t,RED.nodes.getType(t)) && common.indexOf(t) === -1;
});
var items = [];
@@ -313,9 +321,11 @@ RED.typeSearch = (function() {
searchResults.editableList('addItem', item);
}
for (i=0;i<items.length;i++) {
+ if (applyFilter(opts.filter,items[i].type,items[i].def)) {
items[i].i = index++;
searchResults.editableList('addItem', items[i]);
}
+ }
setTimeout(function() {
selected = 0;
searchResults.children(":first").addClass('selected');
| 11 |
diff --git a/public/office.web.js b/public/office.web.js @@ -25,16 +25,10 @@ $(() => {
}
function showUserInRoom(user, room) {
- var userView = $(`#${user.id}`).length;
- if (userView == 0) {
- userView = $(`<img width="50px" id="${user.id}"src="${user.imageUrl}">`);
- } else {
- userView = $(`#${user.id}`).detach();
- }
var userView = $(`#${user.id}`).length;
if (userView == 0) {
- userView = $(`<img width="50px" id="${user.id}"src="${user.imageUrl}">`);
+ userView = $(`<img title="${user.name}" width="50px" id="${user.id}"src="${user.imageUrl}">`);
} else {
userView = $(`#${user.id}`).detach();
}
| 7 |
diff --git a/tools/package_extension.sh b/tools/package_extension.sh @@ -55,9 +55,13 @@ To build them, run ./lib/build_libs.sh
The userscript has the following changes applied (to conserve space):
* All comments within bigimage() have been removed (comments are nearly always test cases, and currently comprise ~2MB of the userscript's size)
+ * It removes useless rules, such as: if (false && ...
+ * It removes pieces of code only used for development, marked by imu:begin_exclude and imu:end_exclude
* Unneeded strings within the strings object have been removed
-This is performed by: node ./tools/remcomments.js userscript.user.js nowatch
+This version is identical to the version offered on Greasyfork (or userscript_smaller.user.js in the Github repository).
+
+This is generated by: node ./tools/remcomments.js userscript.user.js nowatch
To build the extension, run: ./package_extension.sh
* This also runs the remcomments command above.
| 7 |
diff --git a/build_wikidata.js b/build_wikidata.js @@ -168,6 +168,7 @@ function processEntities(result) {
// Get the claim value, considering any claim rank..
+// - disregard any claimes with an end date qualifier in the past
// - disregard any claims with "deprecated" rank
// - accept immediately any claim with "preferred" rank
// - return the latest claim with "normal" rank
@@ -175,12 +176,26 @@ function getClaimValue(entity, prop) {
if (!entity.claims) return;
if (!entity.claims[prop]) return;
- let value, c;
+ let value;
for (let i = 0; i < entity.claims[prop].length; i++) {
- c = entity.claims[prop][i];
+ let c = entity.claims[prop][i];
if (c.rank === 'deprecated') continue;
if (c.mainsnak.snaktype !== 'value') continue;
+ // skip if we find an end time qualifier - P582
+ let ended = false;
+ let qualifiers = (c.qualifiers && c.qualifiers.P582) || [];
+ for (let j = 0; j < qualifiers.length; j++) {
+ let q = qualifiers[j];
+ if (q.snaktype !== 'value') continue;
+ let enddate = wdk.wikidataTimeToDateObject(q.datavalue.value.time);
+ if (new Date() > enddate) {
+ ended = true;
+ break;
+ }
+ }
+ if (ended) continue;
+
value = c.mainsnak.datavalue.value;
if (c.rank === 'preferred') return value; // return immediately
}
| 8 |
diff --git a/scenes/battalion.scn b/scenes/battalion.scn 6
],
"start_url": "https://webaverse.github.io/dreadnought/"
+ },
+ {
+ "position": [
+ -150,
+ 20,
+ 300
+ ],
+ "start_url": "https://webaverse.github.io/dreadnought/"
}
]
}
| 0 |
diff --git a/OurUmbraco.Client/src/scss/elements/_videos.scss b/OurUmbraco.Client/src/scss/elements/_videos.scss background: #a3db78;
border-radius: 15px;
z-index: 5;
- margin-right: 5px;
+ margin-top: 3px;
+ margin-right: 3px;
font-size: 11px;
padding: 2px 7px;
}
| 1 |
diff --git a/player/js/animation/AnimationItem.js b/player/js/animation/AnimationItem.js @@ -493,6 +493,8 @@ AnimationItem.prototype.destroy = function (name) {
this._cbs = null;
this.onEnterFrame = this.onLoopComplete = this.onComplete = this.onSegmentStart = this.onDestroy = null;
this.renderer = null;
+ this.imagePreloader = null;
+ this.projectInterface = null;
};
AnimationItem.prototype.setCurrentRawFrameValue = function(value){
| 2 |
diff --git a/app/middlewares/connection-params.js b/app/middlewares/connection-params.js @@ -5,7 +5,7 @@ module.exports = function connectionParams (userDatabaseService) {
userDatabaseService.getConnectionParams(user, apikeyToken, authenticated,
function (err, userDbParams, authDbParams, userLimits) {
if (req.profiler) {
- req.profiler.done('setDBAuth');
+ req.profiler.done('getConnectionParams');
}
if (err) {
| 7 |
diff --git a/examples/modal/stories.jsx b/examples/modal/stories.jsx @@ -12,6 +12,8 @@ import Timepicker from '../../components/time-picker';
import Datepicker from '../../components/date-picker';
import Button from '../../components/button';
+import ComboboxBase from '../combobox/base';
+
import ModalCustomParentNode from './modal-custom-parent-node';
@@ -43,41 +45,6 @@ const modalContent = (
</div>
</div>
- {/*
- */}
- <Lookup
- className="slds-m-bottom--large"
- emptyMessage="No Accounts Found"
- hasError={false}
- iconName="account"
- label="Account Name"
- onChange={action('change')}
- onSelect={action('selected')}
- options={[
- { label: 'Paddy\'s Pub' },
- { label: 'Tyrell Corp' },
- { label: 'Paper St. Soap Company' },
- { label: 'Nakatomi Investments' },
- { label: 'Acme Landscaping' },
- { label: 'Acme Construction' }
- ]}
- />
-
- <MenuPicklist
- className="slds-m-bottom--large"
- label="Lead Source"
- onSelect={(option) => { action('selected: ', option.label); }}
- options={[
- { label: 'Third Party Program', value: 'A0' },
- { label: 'Cold Call', value: 'B0' },
- { label: 'LinkedIn', value: 'C0' },
- { label: 'Direct Mail', value: 'D0' },
- { label: 'Other', value: 'E0' }
- ]}
- placeholder="Select Lead Source"
- value="B0"
- />
-
<div className="slds-form-element slds-m-vertical--large">
<label className="slds-form-element__label" htmlFor="amount">Amount</label>
<div className="slds-form-element__control">
@@ -96,6 +63,25 @@ const modalContent = (
/>
</div>
+ <div className="slds-form-element slds-m-bottom--large">
+ <ComboboxBase />
+ </div>
+
+ <MenuPicklist
+ className="slds-m-bottom--large"
+ label="Lead Source"
+ onSelect={(option) => { action('selected: ', option.label); }}
+ options={[
+ { label: 'Third Party Program', value: 'A0' },
+ { label: 'Cold Call', value: 'B0' },
+ { label: 'LinkedIn', value: 'C0' },
+ { label: 'Direct Mail', value: 'D0' },
+ { label: 'Other', value: 'E0' }
+ ]}
+ placeholder="Select Lead Source"
+ value="B0"
+ />
+
<div className="slds-m-bottom--large">
<Timepicker
onDateChange={() => { action('time is selected'); }}
| 14 |
diff --git a/appjs/logicjavascript.js b/appjs/logicjavascript.js @@ -14938,10 +14938,11 @@ function solvesphere_shell() {
var atemp = "";
var areatemp = "";
var voltemp = "";
+ var th = (R - r)
var vol = 1.33 * 3.14 * ((R * R * R) - (r * r * r));
var area = 4 * 3.14 * ((R * R) + (r * r));
if ((R != "") && (r != "")) {
- atemp += "\\[Shell \\space thickness \\space of \\space Spherical \\space shell \\space \\newline " + R + "-" + r + "\\ = " + eval(String(aop)) + "\\]";
+ atemp += "\\[Shell \\space thickness \\space of \\space Spherical \\space shell \\space \\newline " + R + "-" + r + "\\ = " + eval(String(th)) + "\\]";
aoutput.innerHTML = atemp;
voltemp += "\\[Volume \\space of \\space Spherical \\space shell \\space \\newline \\frac{4}{3} \\times \\pi (" + R + "^3-" + r + "^3 )" + "\\ = " + eval(String(vol)).toFixed(2) + "\\]";
voloutput.innerHTML = voltemp;
| 1 |
diff --git a/src/locale/nl.js b/src/locale/nl.js @@ -5,6 +5,21 @@ const locale = {
weekdays: 'Zondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrijdag_Zaterdag'.split('_'),
months: 'Januari_Februari_Maart_April_Mei_Juni_Juli_Augustus_September_Oktober_November_December'.split('_'),
ordinal: n => `${n}.`
+ relativeTime = {
+ future: 'over %s',
+ past: '%s geleden',
+ s: 'een paar seconden',
+ m: 'een minuut',
+ mm: '%d minuten',
+ h: 'een uur',
+ hh: '%d uren',
+ d: 'een dag',
+ dd: '%d dagen',
+ M: 'een maand',
+ MM: '%d maanden',
+ y: 'een jaar',
+ yy: '%d jaren'
+ }
}
dayjs.locale(locale, null, true)
| 0 |
diff --git a/app/models/user/VersionTable.scala b/app/models/user/VersionTable.scala @@ -45,7 +45,7 @@ object VersionTable {
}
/**
- * Reads in Google Maps API key from google_maps_api_key.txt (ask Mikey Saugstad for the file if you don't have it)
+ * Read in Google Maps API key from google_maps_api_key.txt (ask Mikey Saugstad for the file if you don't have it).
*
* @return
*/
| 3 |
diff --git a/src/traces/treemap/plot.js b/src/traces/treemap/plot.js @@ -103,10 +103,6 @@ function plotOne(gd, cd, element, transitionOpts) {
return;
}
- if(!trace.pathbar.visible) {
- selAncestors.remove();
- }
-
var isRoot = helpers.isHierarchyRoot(entry);
var hasTransition = !fullLayout.uniformtext.mode && helpers.hasTransition(transitionOpts);
@@ -631,5 +627,7 @@ function plotOne(gd, cd, element, transitionOpts) {
hasTransition: hasTransition,
strTransform: strTransform
});
+ } else {
+ selAncestors.remove();
}
}
| 5 |
diff --git a/lib/converters/v2.0.0/converter-v2-to-v1.js b/lib/converters/v2.0.0/converter-v2-to-v1.js @@ -212,6 +212,7 @@ _.assign(Builders.prototype, {
* @returns {Object} - The converted body options.
*/
dataOptions: function (item) {
+ if (item.request && item.request.body) {
let bodyOptions = item.request.body.options;
if (!bodyOptions) {
@@ -229,6 +230,7 @@ _.assign(Builders.prototype, {
}
return bodyOptions;
+ } else return undefined;
},
/**
| 9 |
diff --git a/lib/NormalModule.js b/lib/NormalModule.js @@ -154,6 +154,7 @@ class NormalModule extends Module {
this.errors.push(new ModuleError(this, error));
},
exec: (code, filename) => {
+ // @ts-ignore Argument of type 'this' is not assignable to parameter of type 'Module'.
const module = new NativeModule(filename, this);
// @ts-ignore _nodeModulePaths is deprecated and undocumented Node.js API
module.paths = NativeModule._nodeModulePaths(this.context);
| 1 |
diff --git a/avatar-cruncher.js b/avatar-cruncher.js @@ -16,7 +16,9 @@ class AttributeLayout {
this.depth = 0;
}
}
-const crunchAvatarModel = model => {
+const crunchAvatarModel = (model, options = {}) => {
+ const textureSize = options.textureSize ?? 4096;
+
const _makeAttributeLayoutsFromGeometry = geometry => {
const attributes = geometry.attributes;
const attributeLayouts = [];
@@ -307,15 +309,21 @@ const crunchAvatarModel = model => {
const _drawAtlases = () => {
const _drawAtlas = atlas => {
const canvas = document.createElement('canvas');
- canvas.width = atlas.width;
- canvas.height = atlas.height;
+ const canvasSize = Math.min(atlas.width, textureSize);
+ const canvasScale = canvasSize / atlas.width;
+ canvas.width = canvasSize;
+ canvas.height = canvasSize;
const ctx = canvas.getContext('2d');
atlas.bins.forEach(bin => {
bin.rects.forEach(rect => {
const {x, y, width: w, height: h, data: {image, groups}} = rect;
// draw the image in the correct box on the canvas
- ctx.drawImage(image, 0, 0, image.width, image.height, x, y, w, h);
+ const tx = x * canvasScale;
+ const ty = y * canvasScale;
+ const tw = w * canvasScale;
+ const th = h * canvasScale;
+ ctx.drawImage(image, 0, 0, image.width, image.height, tx, ty, tw, th);
// const testUv = new THREE.Vector2(Math.random(), Math.random());
for (const group of groups) {
@@ -327,9 +335,9 @@ const crunchAvatarModel = model => {
localVector2D.fromArray(geometry.attributes.uv.array, uvIndex * 2);
localVector2D.multiply(
- localVector2D2.set(w/atlas.width, h/atlas.height)
+ localVector2D2.set(tw/canvasSize, th/canvasSize)
).add(
- localVector2D2.set(x/atlas.width, y/atlas.height)
+ localVector2D2.set(tx/canvasSize, ty/canvasSize)
);
localVector2D.toArray(geometry.attributes.uv.array, uvIndex * 2);
| 0 |
diff --git a/UserlinkTooltips.user.js b/UserlinkTooltips.user.js // @description Display reputation in tooltip upon user link mouseover
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 1.3.3
+// @version 1.3.4
//
// @include https://*stackoverflow.com/*
// @include https://*serverfault.com/*
function processUserlinks() {
- // Only userlinks without title and from same hostname
+ // Only userlinks without title and from same hostname, and not a channel user
userlinks = $('#content a[href*="/users/"]')
- .filter((i, el) => el.title === '' && typeof el.dataset.rep === 'undefined' && el.href.includes(location.hostname))
+ .filter((i, el) => el.title === '' && typeof el.dataset.rep === 'undefined' && el.href.includes(location.hostname) && !el.href.includes('/c/'))
.each(function(i, el) {
const id = (el.href.match(/-?\d+/) || ['']).pop();
el.dataset.uid = id; // set computed data-uid
| 8 |
diff --git a/packages/cx/src/widgets/form/LookupField.js b/packages/cx/src/widgets/form/LookupField.js @@ -34,6 +34,8 @@ import { List } from "../List";
import { Selection } from "../../ui/selection/Selection";
import { HighlightedSearchText } from "../HighlightedSearchText";
import { autoFocus } from "../autoFocus";
+import { bind } from "../../ui";
+import { isAccessorChain } from "../../data/createAccessorModelProxy";
export class LookupField extends Field {
declareData() {
@@ -64,20 +66,27 @@ export class LookupField extends Field {
if (!this.bindings) {
let b = [];
- if (this.value && this.value.bind)
+ if (this.value) {
+ if (isAccessorChain(this.value)) this.value = bind(this.value);
+ if (this.value.bind)
b.push({
key: true,
local: this.value.bind,
remote: `$option.${this.optionIdField}`,
set: this.value.set,
});
+ }
- if (this.text && this.text.bind)
+ if (this.text) {
+ if (isAccessorChain(this.text)) this.value = bind(this.text);
+ if (this.text.bind)
b.push({
local: this.text.bind,
remote: `$option.${this.optionTextField}`,
set: this.text.set,
});
+ }
+
this.bindings = b;
}
| 11 |
diff --git a/includes/Core/Modules/Module_Sharing_Settings.php b/includes/Core/Modules/Module_Sharing_Settings.php @@ -104,9 +104,9 @@ class Module_Sharing_Settings extends Setting {
/**
* Gets the settings after filling in default values.
*
- * {@inheritDoc}
- *
* @since n.e.x.t
+ *
+ * @return array Value set for the option, or registered default if not set.
*/
public function get() {
$settings = parent::get();
| 14 |
diff --git a/src/screens/community/container/communityContainer.js b/src/screens/community/container/communityContainer.js @@ -21,8 +21,6 @@ const CommunityContainer = ({ children, navigation, currentAccount, pinCode, isL
useEffect(() => {
getCommunity(tag)
.then((res) => {
- //TODO: manipulate community data here to force make member of team
- res.team[0][0] = 'demo.com';
setData(res);
})
.catch((e) => {
@@ -32,13 +30,22 @@ const CommunityContainer = ({ children, navigation, currentAccount, pinCode, isL
useEffect(() => {
if (data) {
+ //check and set user role
+ let _hasTeamRole = false;
+ if (data.team && currentAccount) {
+ const member = data.team.find((m) => m[0] === currentAccount.username);
+ const role = member ? member[1] : userRole;
+ _hasTeamRole = !!member;
+ setUserRole(role);
+ }
+
getSubscriptions(currentAccount.username)
.then((result) => {
if (result) {
const _isSubscribed = result.some((item) => item[0] === data.name);
setIsSubscribed(_isSubscribed);
- if (_isSubscribed && userRole === 'guest') {
+ if (_isSubscribed && !_hasTeamRole) {
//if userRole default value is not overwritten,
//means user is not a part of community core team, so setting as member
setUserRole('member');
@@ -48,13 +55,6 @@ const CommunityContainer = ({ children, navigation, currentAccount, pinCode, isL
.catch((e) => {
console.log(e);
});
-
- //check and set user role
- if (data.team && currentAccount) {
- const member = data.team.find((m) => m[0] === currentAccount.username);
- const role = member ? member[1] : userRole;
- setUserRole(role);
- }
}
}, [data]);
| 7 |
diff --git a/Source/Renderer/modernizeShader.js b/Source/Renderer/modernizeShader.js @@ -51,9 +51,9 @@ define([
return wholeSource;
}
- function setAdd(variable, set1) {
- if (set1.indexOf(variable) === -1) {
- set1.push(variable);
+ function setAdd(variable, set) {
+ if (set.indexOf(variable) === -1) {
+ set.push(variable);
}
}
| 10 |
diff --git a/packages/yoroi-extension/app/api/ada/transactions/shelley/transactions.js b/packages/yoroi-extension/app/api/ada/transactions/shelley/transactions.js @@ -707,19 +707,22 @@ function _newAdaUnsignedTxFromUtxo(
packCandidate.assets.length >= 1 &&
packCandidate.assets.every(({ assetId }) => changeTokenIdSet.has(assetId))
) {
+ if (
addUtxoInput(
txBuilder,
undefined,
packCandidate,
false,
{ networkId: protocolParams.networkId }
- );
+ ) === AddInputResult.VALID
+ ) {
usedUtxos.push(packCandidate);
packed = true;
break;
}
}
+ }
if (oneExtraInput && !packed) {
// We've added all the assets we need, but we add one extra.
// Set the flag so that the adding loop stops after this extra one is added.
| 9 |
diff --git a/README.md b/README.md 
-
+
# SpaceX Data REST API
@@ -29,69 +29,83 @@ GET https://api.spacexdata.com/v2/launches/latest
```json
{
- "flight_number":54,
+ "flight_number": 55,
"launch_year": "2018",
- "launch_date_unix":1517433900,
- "launch_date_utc":"2018-01-31T21:25:00Z",
- "launch_date_local":"2018-01-31T16:25:00-05:00",
+ "launch_date_unix": 1517941800,
+ "launch_date_utc": "2018-02-06T18:30:00Z",
+ "launch_date_local": "2018-02-06T13:30:00-05:00",
"rocket": {
- "rocket_id":"falcon9",
- "rocket_name":"Falcon 9",
+ "rocket_id": "falconheavy",
+ "rocket_name": "Falcon Heavy",
"rocket_type": "FT",
"first_stage": {
"cores": [
{
- "core_serial":"B1032",
+ "core_serial": "B1033",
+ "reused": false,
+ "land_success": false,
+ "landing_type": "ASDS",
+ "landing_vehicle": "OCISLY"
+ },
+ {
+ "core_serial": "B1025",
+ "reused": true,
+ "land_success": true,
+ "landing_type": "RTLS",
+ "landing_vehicle": "LZ-1"
+ },
+ {
+ "core_serial": "B1023",
"reused": true,
"land_success": true,
- "landing_type":"Ocean",
- "landing_vehicle":null
+ "landing_type": "RTLS",
+ "landing_vehicle": "LZ-1"
}
]
},
"second_stage": {
"payloads": [
{
- "payload_id":"GovSat-1",
+ "payload_id": "Tesla Roadster",
"reused": false,
"customers": [
- "GovSat"
+ "SpaceX"
],
"payload_type": "Satellite",
- "payload_mass_kg":4000,
+ "payload_mass_kg": null,
"payload_mass_lbs": null,
- "orbit":"GTO"
+ "orbit": "Heliocentric orbit"
}
]
}
},
"telemetry": {
- "flight_club":null
+ "flight_club": "https://www.flightclub.io/result?code=FHD1"
},
"reuse": {
- "core":true,
- "side_core1":false,
- "side_core2":false,
+ "core": false,
+ "side_core1": true,
+ "side_core2": true,
"fairings": false,
"capsule": false
},
"launch_site": {
- "site_id":"ccafs_slc_40",
- "site_name":"CCAFS SLC 40",
- "site_name_long":"Cape Canaveral Air Force Station Space Launch Complex 40"
+ "site_id": "ksc_lc_39a",
+ "site_name": "KSC LC 39A",
+ "site_name_long": "Kennedy Space Center Historic Launch Complex 39A"
},
"launch_success": true,
"links": {
- "mission_patch":"https://i.imgur.com/UJTbQ1f.png",
- "reddit_campaign":"https://www.reddit.com/r/spacex/comments/7olw86/govsat1_ses16_launch_campaign_thread/",
- "reddit_launch":"https://www.reddit.com/r/spacex/comments/7tvtbh/rspacex_govsat1_official_launch_discussion/",
+ "mission_patch": "https://i.imgur.com/24OyAPQ.png",
+ "reddit_campaign": "https://www.reddit.com/r/spacex/comments/7hjp03/falcon_heavy_demo_launch_campaign_thread/",
+ "reddit_launch": "https://www.reddit.com/r/spacex/comments/7vg63x/rspacex_falcon_heavy_test_flight_official_launch/",
"reddit_recovery": null,
- "reddit_media":"https://www.reddit.com/r/spacex/comments/7tzzwy/rspacex_govsat1_media_thread_videos_images_gifs/",
- "presskit":"http://www.spacex.com/sites/spacex/files/govsat1presskit.pdf",
- "article_link":"https://spaceflightnow.com/2018/01/31/spacex-rocket-flies-on-60th-anniversary-of-first-u-s-satellite-launch/",
- "video_link":"https://www.youtube.com/watch?v=ScYUA51-POQ"
+ "reddit_media": "https://www.reddit.com/r/spacex/comments/7vimtm/rspacex_falcon_heavy_test_flight_media_thread/",
+ "presskit": "http://www.spacex.com/sites/spacex/files/falconheavypresskit_v1.pdf",
+ "article_link": "",
+ "video_link": "https://www.youtube.com/watch?v=wbSwFU6tY1c"
},
- "details":"Reused booster from the classified NROL-76 mission in May 2017. Following a successful experimental ocean landing that used three engines, the booster unexpectedly remained intact; Elon Musk stated in a tweet that SpaceX will attempt to tow the booster to shore."
+ "details": "The launch was a success, and the side boosters landed simultaneously at adjacent ground pads. Drone ship landing of the central core is unconfirmed. Final burn to heliocentric mars-earth orbit is expected after the second stage and payload pass through the Van Allen belts, followed by payload separation."
}
```
| 3 |
diff --git a/token-metadata/0x1C95b093d6C236d3EF7c796fE33f9CC6b8606714/metadata.json b/token-metadata/0x1C95b093d6C236d3EF7c796fE33f9CC6b8606714/metadata.json "symbol": "BOMB",
"address": "0x1C95b093d6C236d3EF7c796fE33f9CC6b8606714",
"decimals": 0,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/.eslintrc.json b/.eslintrc.json "no-multi-str": 2,
"no-promise-executor-return": "off",
"no-irregular-whitespace": 2,
+ "@typescript-eslint/no-empty-function": "off",
"comma-dangle": "off",
"max-len": "off",
"func-names": "off",
| 11 |
diff --git a/src/encoded/tests/test_schema_file.py b/src/encoded/tests/test_schema_file.py @@ -105,6 +105,24 @@ def file_content_error(testapp, experiment, award, lab, replicate, platform1):
return item
[email protected]
+def file_no_platform(testapp, experiment, award, lab, replicate):
+ item = {
+ 'dataset': experiment['@id'],
+ 'replicate': replicate['@id'],
+ 'lab': lab['@id'],
+ 'file_size': 345,
+ 'award': award['@id'],
+ 'file_format': 'fastq',
+ 'run_type': 'single-ended',
+ 'output_type': 'reads',
+ "read_length": 36,
+ 'md5sum': '99378c852c5be68251cbb125ffcf045a',
+ 'status': 'in progress'
+ }
+ return item
+
+
def test_file_post(file_no_replicate):
assert file_no_replicate['biological_replicates'] == []
@@ -165,3 +183,12 @@ def test_with_paired_end_1_2(testapp, file_no_error):
file_no_error.update({'file_format': 'sra'})
res = testapp.post_json('/file', file_no_error, expect_errors=True)
assert res.status_code == 201
+
+
+def test_fastq_no_platform(testapp, file_no_platform, platform1):
+ res = testapp.post_json('/file', file_no_platform, expect_errors=True)
+ assert res.status_code == 422
+ file_no_platform.update({'platform': platform1['uuid']})
+ print (file_no_platform)
+ res = testapp.post_json('/file', file_no_platform, expect_errors=True)
+ assert res.status_code == 201
| 0 |
diff --git a/lib/parse-base-url.js b/lib/parse-base-url.js @@ -22,11 +22,11 @@ function parseBaseURL (_url, options) {
}
if (_.has(options, 'prefix')) {
- index = options.prefix + index
+ index = (options.prefix || '') + index
}
if (_.has(options, 'suffix')) {
- index += options.suffix
+ index += (options.suffix || '')
}
return {
| 9 |
diff --git a/src/Dialog/DialogTitle.spec.js b/src/Dialog/DialogTitle.spec.js @@ -32,9 +32,15 @@ describe('<DialogTitle />', () => {
assert.strictEqual(wrapper.hasClass(classes.root), true, 'should have the root class');
});
- it('should render children', () => {
+ it('should render JSX children', () => {
const children = <p className="test">Hello</p>;
const wrapper = shallow(<DialogTitle>{children}</DialogTitle>);
assert.strictEqual(wrapper.childAt(0).equals(children), true);
});
+
+ it('should render string children as given string', () => {
+ const children = 'Hello';
+ const wrapper = shallow(<DialogTitle>{children}</DialogTitle>);
+ assert.strictEqual(wrapper.childAt(0).props().children, children);
+ });
});
| 0 |
diff --git a/src/main/resources/spring-security-jdbc.xml b/src/main/resources/spring-security-jdbc.xml <security:intercept-url pattern="/js/**" access="permitAll"/>
<security:intercept-url pattern="/login**" access="permitAll"/>
<security:intercept-url pattern="/css/**" access="permitAll"/>
+ <security:intercept-url pattern="/fonts/**" access="permitAll"/>
+ <security:intercept-url pattern="/imgs/**" access="permitAll"/>
<security:intercept-url pattern="/**" access="!anonymous"/>
<security:form-login login-page="/login.do" username-parameter="username" password-parameter="password"
default-target-url="/starter.html" always-use-default-target="true"/>
| 3 |
diff --git a/modules/@apostrophecms/schema/ui/apos/components/AposSchema.vue b/modules/@apostrophecms/schema/ui/apos/components/AposSchema.vue -->
<template>
<div class="apos-schema">
- <div v-for="field in schema" :key="field.name">
+ <div
+ v-for="field in schema" :key="field.name"
+ :data-apos-field="field.name"
+ >
<component
v-show="displayComponent(field.name)"
v-model="fieldState[field.name]"
| 12 |
diff --git a/includes/Core/Assets/Assets.php b/includes/Core/Assets/Assets.php @@ -340,23 +340,15 @@ final class Assets {
foreach ( $external_assets as $asset ) {
$dependencies[] = $asset->get_handle();
}
- $dependencies[] = 'sitekit-vendor';
$dependencies[] = 'sitekit-commons';
$dependencies[] = 'googlesitekit_admin';
// Register plugin scripts.
$assets = array(
- new Script(
- 'sitekit-vendor',
- array(
- 'src' => $base_url . 'js/vendor.js',
- )
- ),
new Script(
'sitekit-commons',
array(
'src' => $base_url . 'js/commons.js',
- 'dependencies' => array( 'sitekit-vendor' ),
'before_print' => function( $handle ) use ( $base_url ) {
$url_polyfill = (
'/*googlesitekit*/ ( typeof URL === \'function\') || ' .
| 2 |
diff --git a/articles/support/index.md b/articles/support/index.md @@ -4,3 +4,26 @@ description: Explains the different types of support options provided by Auth0.
---
# Support Options
+
+## Support Options Overview
+
+Auth0 offers the following support plans:
+
+<table class="table">
+ <tr>
+ <th>No Support</th>
+ <td>Auth0 does *not* provide support to customers with a **free** subscription.</td>
+ </tr>
+ <tr>
+ <th>Standard Support</th>
+ <td>For customers with a paid (non-Enterprise) subscription plan or those in the initial trial period.</td>
+ </tr>
+ <tr>
+ <th>Enterprise Support</th>
+ <td>For customers with an Enterprise subscription plan.</td>
+ </tr>
+ <tr>
+ <th>Preferred Support</th>
+ <td>For customers with an Enterprise subscription plan that have added the Preferred Support option.</td>
+ </tr>
+</table>
| 0 |
diff --git a/src/components/general/inventory/Inventory.jsx b/src/components/general/inventory/Inventory.jsx @@ -42,6 +42,11 @@ const objects = {
start_url: 'https://webaverse.github.io/bow/',
level: 9,
},
+ /* {
+ name: 'Silk',
+ start_url: './metaverse_modules/silk/',
+ level: 1,
+ }, */
],
};
| 0 |
diff --git a/lib/node_modules/@stdlib/math/base/dist/t/cdf/README.md b/lib/node_modules/@stdlib/math/base/dist/t/cdf/README.md @@ -16,7 +16,7 @@ The [cumulative distribution function][cdf] (CDF) for a [t distribution][t] rand
<!-- </equation> -->
-where `v > 0` is the degrees of freedom. In the definition, `Beta( x; a, b )` denotes the lower incomplete beta function and `Beta( a, b )` the [beta function][beta].
+where `v > 0` is the degrees of freedom. In the definition, `Beta( x; a, b )` denotes the lower incomplete beta function and `Beta( a, b )` the [beta function][beta-function].
</section>
@@ -116,7 +116,7 @@ for ( i = 0; i < 10; i++ ) {
<section class="links">
-[beta]: https://en.wikipedia.org/wiki/Beta_function
+[beta-function]: https://en.wikipedia.org/wiki/Beta_function
[cdf]: https://en.wikipedia.org/wiki/Cumulative_distribution_function
[t]: https://en.wikipedia.org/wiki/Student%27s_t-distribution
| 14 |
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js @@ -213,6 +213,10 @@ function updateReportWithNewAction(reportID, reportAction) {
return;
}
+ // If the comment came from Concierge let's not show a notification since we already show one for expensify.com
+ if (lodashGet(reportAction, 'actorEmail') === '[email protected]') {
+ return;
+ }
console.debug('[LOCAL_NOTIFICATION] Creating notification');
LocalNotification.showCommentNotification({
reportAction,
| 8 |
diff --git a/src/framework/application.js b/src/framework/application.js @@ -1323,7 +1323,7 @@ pc.extend(pc, function () {
// create tick function to be wrapped in closure
var makeTick = function (_app) {
var app = _app;
- return function () {
+ return function (timestamp) {
if (! app.graphicsDevice)
return;
@@ -1332,7 +1332,7 @@ pc.extend(pc, function () {
// have current application pointer in pc
pc.app = app;
- var now = pc.now();
+ var now = timestamp || pc.now();
var ms = now - (app._time || now);
var dt = ms / 1000.0;
dt *= app.timeScale;
| 4 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.