code
stringlengths
122
4.99k
label
int64
0
14
diff --git a/src/components/stepThree/index.js b/src/components/stepThree/index.js @@ -278,7 +278,7 @@ export class stepThree extends React.Component { mutators={{ ...arrayMutators }} initialValues={{ walletAddress: tierStore.tiers[0].walletAddress, - minCap: '', + minCap: 0, gasPrice: gasPriceStore.gasPricesInGwei[0], whitelistEnabled: "no", tiers: this.initialTiers
12
diff --git a/token-metadata/0x960b236A07cf122663c4303350609A66A7B288C0/metadata.json b/token-metadata/0x960b236A07cf122663c4303350609A66A7B288C0/metadata.json "symbol": "ANT", "address": "0x960b236A07cf122663c4303350609A66A7B288C0", "decimals": 18, - "dharmaVerificationStatus": { "dharmaVerificationStatus": "VERIFIED" } \ No newline at end of file -} \ No newline at end of file
3
diff --git a/token-metadata/0xC9634DA9B1EEfd1CB3d88b598A91Ec69E5afe4E4/metadata.json b/token-metadata/0xC9634DA9B1EEfd1CB3d88b598A91Ec69E5afe4E4/metadata.json "symbol": "MUM", "address": "0xC9634DA9B1EEfd1CB3d88b598A91Ec69E5afe4E4", "decimals": 0, - "dharmaVerificationStatus": { "dharmaVerificationStatus": "VERIFIED" } \ No newline at end of file -} \ No newline at end of file
3
diff --git a/assets/js/googlesitekit/datastore/user/authentication.js b/assets/js/googlesitekit/datastore/user/authentication.js @@ -76,7 +76,7 @@ export const actions = { /** * Stores connection info received from the REST API. * - * @since 1.5.0 + * @since n.e.x.t * @private * @param {Object} authentication Authentication info from the API. * @return {Object} Redux-style action. @@ -89,6 +89,7 @@ export const actions = { type: RECEIVE_AUTHENTICATION, }; }, + }; export const controls = { @@ -152,7 +153,7 @@ export const selectors = { * ``` * * @private - * @since 1.8.0 + * @since n.e.x.t * * @param {Object} state Data store's state. * @return {Object|undefined} User authentication info. @@ -167,7 +168,7 @@ export const selectors = { * Returns `true` if the user is authenticated, `false` if * not. Returns `undefined` if the authentication info is not available/loaded. * - * @since 1.8.0 + * @since n.e.x.t * * @param {Object} state Data store's state. * @return {boolean|undefined} Site connection status. @@ -184,7 +185,7 @@ export const selectors = { * Returns an array of granted scopes or undefined * if authentication info is not available/loaded. * - * @since 1.8.0 + * @since n.e.x.t * * @param {Object} state Data store's state. * @return {Array|undefined} Array of granted scopes @@ -201,7 +202,7 @@ export const selectors = { * Returns an array of required scopes or undefined * if authentication info is not available/loaded. * - * @since 1.8.0 + * @since n.e.x.t * * @param {Object} state Data store's state. * @return {Array|undefined} Array of granted scopes
2
diff --git a/packages/bitcore-node/src/models/walletAddress.ts b/packages/bitcore-node/src/models/walletAddress.ts @@ -101,12 +101,16 @@ export class WalletAddressModel extends BaseModel<IWalletAddress> { }) ), { ordered: false }; - this.push(addressBatch); - callback(); + } catch (err) { - callback(err); + // Ignore duplicate keys, they may be half processed + if (err.code !== 11000) { + return callback(err); } } + this.push(addressBatch); + callback(); + } } class UpdateCoinsStream extends Transform {
9
diff --git a/packages/growi-commons/.devcontainer/devcontainer.json b/packages/growi-commons/.devcontainer/devcontainer.json // https://github.com/microsoft/vscode-dev-containers/tree/v0.117.1/containers/javascript-node-12-mongo // If you want to run as a non-root user in the container, see .devcontainer/docker-compose.yml. { - "name": "GROWI-Dev", + "name": "GROWI-Commons-Dev", "dockerComposeFile": "docker-compose.yml", "service": "node", "workspaceFolder": "/workspace/growi-commons",
10
diff --git a/articles/api-auth/passwordless.md b/articles/api-auth/passwordless.md @@ -4,6 +4,8 @@ title: Passwordless authentication (OIDC-conformant) # OIDC-conformant Passwordless Authentication +<%= include('./tutorials/adoption/_about.md') %> + Auth0 currently does not support an [OIDC-conformant](/api-auth/tutorials/adoption) passwordless authentication mechanism. OIDC-conformant clients will not be able to use the new authentication pipeline or request API access tokens.
0
diff --git a/config/environments/development.js.example b/config/environments/development.js.example @@ -118,7 +118,7 @@ var config = { user: "publicuser", password: "public", host: '127.0.0.1', - port: 6432 + port: 5432 } ,mapnik_version: undefined ,mapnik_tile_format: 'png8:m=h'
4
diff --git a/Source/Core/OrientedBoundingBox.js b/Source/Core/OrientedBoundingBox.js @@ -392,7 +392,7 @@ import Rectangle from './Rectangle.js'; // This results in a better fit than the obb approach for smaller rectangles, which orients with the rectangle's center normal. var planeOrigin = Cartesian3.fromRadians(centerLongitude, latitudeNearestToEquator, maximumHeight, ellipsoid, scratchPlaneOrigin); planeOrigin.z = 0.0; // center the plane on the equator to simpify plane normal calculation - var isPole = planeOrigin.x < CesiumMath.EPSILON10 && planeOrigin.y < CesiumMath.EPSILON10; + var isPole = Math.abs(planeOrigin.x) < CesiumMath.EPSILON10 && Math.abs(planeOrigin.y) < CesiumMath.EPSILON10; var planeNormal = !isPole ? Cartesian3.normalize(planeOrigin, scratchPlaneNormal) : Cartesian3.UNIT_X; var planeYAxis = Cartesian3.UNIT_Z; var planeXAxis = Cartesian3.cross(planeNormal, planeYAxis, scratchPlaneXAxis);
7
diff --git a/packages/cx/src/widgets/form/Slider.js b/packages/cx/src/widgets/form/Slider.js @@ -313,7 +313,7 @@ class SliderComponent extends VDOM.Component { let { data, widget } = instance; if ((widget.showFrom && widget.showTo) || !data.wheel) return; - e.preventDefault(); + // e.preventDefault(); <- wheel is a passive event listener, so preventDefault() is not allowed e.stopPropagation(); let increment = e.deltaY > 0 ? this.getIncrement() : -this.getIncrement();
2
diff --git a/src/pages/RequestCallPage.js b/src/pages/RequestCallPage.js @@ -95,11 +95,11 @@ const defaultProps = { class RequestCallPage extends Component { constructor(props) { super(props); - const {fName, lName} = this.getFirstAndLastName(props.myPersonalDetails); + const {firstName, lastName} = this.getFirstAndLastName(props.myPersonalDetails); this.state = { - firstName: fName, + firstName, hasFirstNameError: false, - lastName: lName, + lastName, phoneNumber: this.getPhoneNumber(props.user.loginList) || '', phoneExtension: '', phoneExtensionError: '', @@ -200,6 +200,8 @@ class RequestCallPage extends Component { * so we return empty strings instead. * @param {String} login * @param {String} displayName + * @param {String} firstName + * @param {String} lastName * * @returns {Object} */ @@ -209,28 +211,23 @@ class RequestCallPage extends Component { firstName, lastName, }) { - let fName; - let lName; - - if (firstName && lastName) { - fName = firstName; - lName = lastName; - } else if (Str.removeSMSDomain(login) === displayName) { - fName = ''; - lName = ''; - } else { + if (firstName || lastName) { + return {firstName: firstName || '', lastName: lastName || ''}; + } + if (Str.removeSMSDomain(login) === displayName) { + return {firstName: '', lastName: ''}; + } + const firstSpaceIndex = displayName.indexOf(' '); const lastSpaceIndex = displayName.lastIndexOf(' '); - if (firstSpaceIndex === -1) { - fName = displayName; - lName = ''; - } else { - fName = displayName.substring(0, firstSpaceIndex); - lName = displayName.substring(lastSpaceIndex); - } + return {firstName: displayName, lastName: ''}; } - return {fName, lName}; + + return { + firstName: displayName.substring(0, firstSpaceIndex).trim(), + lastName: displayName.substring(lastSpaceIndex).trim(), + }; } getWaitTimeMessageKey(minutes) {
9
diff --git a/js/jsgif/GIFEncoder.js b/js/jsgif/GIFEncoder.js var len/*int*/ = pixels.length; var nPix/*int*/ = len / 3; indexedPixels = []; + var initColorTab = new Set(); + var k = 0; + for (var j = 0; j < nPix; j++) { + initColorTab.add(((pixels[k++] & 0xff) << 16) + ((pixels[k++] & 0xff) << 8) + (pixels[k++] & 0xff)); + if (initColorTab.length > 256) + break; + } + if (initColorTab.length > 256) { + palSize = 7; var nq/*NeuQuant*/ = new NeuQuant(pixels, len, sample); // initialize quantizer colorTab = nq.process(); // create reduced palette // map image pixels to new palette - var k/*int*/ = 0; + k/*int*/ = 0; for (var j/*int*/ = 0; j < nPix; j++) { var index/*int*/ = nq.map(pixels[k++] & 0xff, pixels[k++] & 0xff, pixels[k++] & 0xff); usedEntry[index] = true; indexedPixels[j] = index; } + } else { + colorTab = Array.from(initColorTab); + k = 0; + for (var j/*int*/ = 0; j < nPix; j++) { + var index/*int*/ = colorTab.indexOf(((pixels[k++] & 0xff) << 16) + ((pixels[k++] & 0xff) << 8) + (pixels[k++] & 0xff)); + usedEntry[index] = true; + indexedPixels[j] = index; + } + var doConcat = function doConcat(prev, curr, cIndex, cArray) { return prev.concat((curr >>> 16),(curr >>> 8) & 0xff,curr & 0xff); } + colorTab = colorTab.reduce(doConcat, []); + palSize = Math.ceil(Math.log2(colorTab.length / 3)) - 1; + } pixels = null; colorDepth = 8; - palSize = 7; // get closest match to transparent color if specified if (transparent != null) { transIndex = findClosest(transparent); var writePalette = function writePalette()/*void*/ { out.writeBytes(colorTab); - var n/*int*/ = (3 * 256) - colorTab.length; + var n/*int*/ = (3 * Math.pow(2,palSize+1)) - colorTab.length; for (var i/*int*/ = 0; i < n; i++) out.writeByte(0); }
7
diff --git a/character-controller.js b/character-controller.js @@ -558,6 +558,7 @@ class InterpolatedPlayer extends Player { crouch: new BinaryInterpolant(() => this.hasAction('crouch'), avatarInterpolationTimeDelay, avatarInterpolationNumFrames), activate: new BinaryInterpolant(() => this.hasAction('activate'), avatarInterpolationTimeDelay, avatarInterpolationNumFrames), use: new BinaryInterpolant(() => this.hasAction('use'), avatarInterpolationTimeDelay, avatarInterpolationNumFrames), + aim: new BinaryInterpolant(() => this.hasAction('aim'), avatarInterpolationTimeDelay, avatarInterpolationNumFrames), narutoRun: new BinaryInterpolant(() => this.hasAction('narutoRun'), avatarInterpolationTimeDelay, avatarInterpolationNumFrames), fly: new BinaryInterpolant(() => this.hasAction('fly'), avatarInterpolationTimeDelay, avatarInterpolationNumFrames), jump: new BinaryInterpolant(() => this.hasAction('jump'), avatarInterpolationTimeDelay, avatarInterpolationNumFrames), @@ -574,6 +575,7 @@ class InterpolatedPlayer extends Player { crouch: new FixedTimeStep(timeDiff => {this.actionBinaryInterpolants.crouch.snapshot(timeDiff);}, avatarInterpolationFrameRate), activate: new FixedTimeStep(timeDiff => {this.actionBinaryInterpolants.activate.snapshot(timeDiff);}, avatarInterpolationFrameRate), use: new FixedTimeStep(timeDiff => {this.actionBinaryInterpolants.use.snapshot(timeDiff);}, avatarInterpolationFrameRate), + aim: new FixedTimeStep(timeDiff => {this.actionBinaryInterpolants.aim.snapshot(timeDiff);}, avatarInterpolationFrameRate), narutoRun: new FixedTimeStep(timeDiff => {this.actionBinaryInterpolants.narutoRun.snapshot(timeDiff);}, avatarInterpolationFrameRate), fly: new FixedTimeStep(timeDiff => {this.actionBinaryInterpolants.fly.snapshot(timeDiff);}, avatarInterpolationFrameRate), jump: new FixedTimeStep(timeDiff => {this.actionBinaryInterpolants.jump.snapshot(timeDiff);}, avatarInterpolationFrameRate), @@ -590,6 +592,7 @@ class InterpolatedPlayer extends Player { crouch: new BiActionInterpolant(() => this.actionBinaryInterpolants.crouch.get(), 0, crouchMaxTime), activate: new UniActionInterpolant(() => this.actionBinaryInterpolants.activate.get(), 0, activateMaxTime), use: new InfiniteActionInterpolant(() => this.actionBinaryInterpolants.use.get(), 0), + aim: new InfiniteActionInterpolant(() => this.actionBinaryInterpolants.aim.get(), 0), narutoRun: new InfiniteActionInterpolant(() => this.actionBinaryInterpolants.narutoRun.get(), 0), fly: new InfiniteActionInterpolant(() => this.actionBinaryInterpolants.fly.get(), 0), jump: new InfiniteActionInterpolant(() => this.actionBinaryInterpolants.jump.get(), 0), @@ -636,6 +639,7 @@ class UninterpolatedPlayer extends Player { crouch: new BiActionInterpolant(() => this.hasAction('crouch'), 0, crouchMaxTime), activate: new UniActionInterpolant(() => this.hasAction('activate'), 0, activateMaxTime), use: new InfiniteActionInterpolant(() => this.hasAction('use'), 0), + aim: new InfiniteActionInterpolant(() => this.hasAction('aim'), 0), narutoRun: new InfiniteActionInterpolant(() => this.hasAction('narutoRun'), 0), fly: new InfiniteActionInterpolant(() => this.hasAction('fly'), 0), jump: new InfiniteActionInterpolant(() => this.hasAction('jump'), 0),
0
diff --git a/src/renderer/selfkey-id/main/components/selfkey-id-overview.jsx b/src/renderer/selfkey-id/main/components/selfkey-id-overview.jsx @@ -70,6 +70,9 @@ const styles = theme => ({ '& .file-icon': { marginRight: '15px' } + }, + button: { + marginBottom: '16px' } }); @@ -476,6 +479,7 @@ class SelfkeyIdOverviewComponent extends Component { size="large" color="secondary" onClick={this.handleAddAttribute} + className={classes.button} > Add Information </Button> @@ -604,6 +608,7 @@ class SelfkeyIdOverviewComponent extends Component { size="large" color="secondary" onClick={this.handleAddDocument} + className={classes.button} > Add Documents </Button>
1
diff --git a/assets/js/modules/analytics/datastore/profiles.test.js b/assets/js/modules/analytics/datastore/profiles.test.js @@ -24,7 +24,6 @@ import { STORE_NAME } from './constants'; import { createTestRegistry, muteFetch, - subscribeUntil, unsubscribeFromAll, untilResolved, } from 'tests/js/utils'; @@ -63,7 +62,7 @@ describe( 'modules/analytics profiles', () => { { body: fixtures.createProfile, status: 200 } ); - registry.dispatch( STORE_NAME ).createProfile( accountID, propertyID, { profileName } ); + await registry.dispatch( STORE_NAME ).createProfile( accountID, propertyID, { profileName } ); // Ensure the proper body parameters were sent. expect( fetchMock ).toHaveFetched( @@ -75,12 +74,6 @@ describe( 'modules/analytics profiles', () => { } ); - await subscribeUntil( registry, - () => ( - registry.select( STORE_NAME ).getProfiles( accountID, propertyID ) - ), - ); - const profiles = registry.select( STORE_NAME ).getProfiles( accountID, propertyID ); expect( profiles ).toMatchObject( [ fixtures.createProfile ] ); } ); @@ -158,11 +151,7 @@ describe( 'modules/analytics profiles', () => { ); expect( initialProfiles ).toEqual( undefined ); - await subscribeUntil( registry, - () => ( - registry.select( STORE_NAME ).getProfiles( testAccountID, testPropertyID ) !== undefined - ), - ); + await untilResolved( registry, STORE_NAME ).getProfiles( testAccountID, testPropertyID ); const profiles = registry.select( STORE_NAME ).getProfiles( testAccountID, testPropertyID ); @@ -205,9 +194,7 @@ describe( 'modules/analytics profiles', () => { const testPropertyID = fixtures.profiles[ 0 ].webPropertyId; // eslint-disable-line sitekit/camelcase-acronyms registry.select( STORE_NAME ).getProfiles( testAccountID, testPropertyID ); - await subscribeUntil( registry, - () => registry.select( STORE_NAME ).isDoingGetProfiles( testAccountID, testPropertyID ) === false - ); + await untilResolved( registry, STORE_NAME ).getProfiles( testAccountID, testPropertyID ); expect( fetchMock ).toHaveFetchedTimes( 1 );
2
diff --git a/native/chat/compose-thread.react.js b/native/chat/compose-thread.react.js @@ -66,6 +66,7 @@ import { iosKeyboardHeight } from '../dimensions'; const tagInputProps = { placeholder: "username", autoFocus: true, + returnKeyType: "go", }; const segmentedPrivacyOptions = ['Public', 'Secret']; @@ -241,6 +242,10 @@ class InnerComposeThread extends React.PureComponent<Props, State> { </View> ); } + const inputProps = { + ...tagInputProps, + onSubmitEditing: this.onPressCreateThread, + }; const content = ( <React.Fragment> <View style={[ @@ -256,7 +261,7 @@ class InnerComposeThread extends React.PureComponent<Props, State> { onChangeText={this.setUsernameInputText} onHeightChange={this.onTagInputHeightChange} labelExtractor={this.tagDataLabelExtractor} - inputProps={tagInputProps} + inputProps={inputProps} ref={this.tagInputRef} /> </View> @@ -346,6 +351,21 @@ class InnerComposeThread extends React.PureComponent<Props, State> { } onPressCreateThread = () => { + if (this.state.userInfoInputArray.length === 0) { + Alert.alert( + "Chatting to yourself?", + "Are you sure you want to create a thread containing only yourself?", + [ + { text: 'Cancel', style: 'cancel' }, + { text: 'Confirm', onPress: this.dispatchNewChatThreadAction }, + ], + ); + } else { + this.dispatchNewChatThreadAction(); + } + } + + dispatchNewChatThreadAction = () => { this.props.dispatchActionPromise( newThreadActionTypes, this.newChatThreadAction(),
9
diff --git a/packages/app/src/server/service/config-loader.ts b/packages/app/src/server/service/config-loader.ts @@ -392,7 +392,6 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = { default: null, }, OIDC_TIMEOUT_MULTIPLIER: { -<<<<<<< HEAD ns: 'crowi', key: 'security:passport-oidc:TimeoutMultiplier', type: ValueType.NUMBER, @@ -402,17 +401,6 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = { ns: 'crowi', key: 'security:passport-oidc:DiscoveryRetries', type: ValueType.NUMBER, -======= - ns: 'crowi', - key: 'security:passport-oidc:TimeoutMultiplier', - type: ValueType.NUMBER, - default: 1.5, - }, - OIDC_DISCOVERY_RETRIES: { - ns: 'crowi', - key: 'security:passport-oidc:DiscoveryRetries', - type: ValueType.NUMBER, ->>>>>>> f954030e6fa5c18db8fa92230f43e65ad193ab42 default: 3, }, S3_REFERENCE_FILE_WITH_RELAY_MODE: {
13
diff --git a/src/pages/signin/PasswordForm.js b/src/pages/signin/PasswordForm.js @@ -47,7 +47,7 @@ class PasswordForm extends React.Component { constructor(props) { super(props); this.validateAndSubmitForm = this.validateAndSubmitForm.bind(this); - this.reset = this.reset.bind(this); + this.resetPassword = this.resetPassword.bind(this); this.state = { formError: false, @@ -79,7 +79,10 @@ class PasswordForm extends React.Component { this.setState({password: ''}, this.inputPassword.clear); } - reset() { + /** + * Trigger the reset password flow and ensure the 2FA input field is reset to avoid it being permanently hidden + */ + resetPassword() { this.setState({twoFactorAuthCode: ''}, this.input2FA.clear); Session.resetPassword(); }
7
diff --git a/README.md b/README.md # Contribute -[![Stories in Ready](https://badge.waffle.io/wfcd/genesis.png?label=ready&title=Ready)](http://waffle.io/wfcd/genesis) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/genesis-discord/localized.svg)](https://crowdin.com/project/genesis-discord) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/2e0ada11fe724aaea15f5fdb97eaf781)](https://www.codacy.com/app/aliasfalse/genesis?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=WFCD/genesis&amp;utm_campaign=Badge_Grade) [![Greenkeeper badge](https://badges.greenkeeper.io/WFCD/genesis.svg)](https://greenkeeper.io/) @@ -85,12 +84,6 @@ TWITTER_BEARER_TOKEN | Twitter App-only Bearer token | 'AAAAAasddfasd' | N\A Honestly too many to put here - -## Throughput - -[![Throughput Graph](https://graphs.waffle.io/wfcd/genesis/throughput.svg)](https://waffle.io/wfcd/genesis/metrics/throughput) - - ## License [![License: Apache 2.0](https://img.shields.io/badge/license-Apache%202.0-green.svg)](https://opensource.org/licenses/Apache-2.0)
2
diff --git a/lib/utils/getServerlessConfigFile.test.js b/lib/utils/getServerlessConfigFile.test.js @@ -81,6 +81,7 @@ describe('#getServerlessConfigFile()', () => { const cwd = process.cwd(); process.chdir(tmpDirPath); return expect(getServerlessConfigFile()).to.be.fulfilled + .then(result => result) .catch((ex) => { process.chdir(cwd); throw ex
1
diff --git a/scenes/treehouse.scn b/scenes/treehouse.scn 1 ], "start_url": "https://webaverse.github.io/machine-gun/" + }, + { + "position": [ + -6, + 0, + 25 + ], + "quaternion": [ + 0, + 0.702, + 0, + 0.712 + ], + "scale": [ + 1, + 1, + 1 + ], + "start_url": "https://webaverse.github.io/dummy/" } ] }
0
diff --git a/server/migrations/20170410074258-initial-data.js b/server/migrations/20170410074258-initial-data.js @@ -12,6 +12,8 @@ exports.up = function(r, conn) { r.tableCreate('directMessageThreads').run(conn), r.tableCreate('users').run(conn), r.tableCreate('notifications').run(conn), + r.tableCreate('subscriptions').run(conn), + r.tableCreate('invoices').run(conn), r.tableCreate('usersCommunities').run(conn), r.tableCreate('usersChannels').run(conn), r.tableCreate('usersDirectMessageThreads').run(conn), @@ -21,6 +23,18 @@ exports.up = function(r, conn) { Promise.all([ // index user by username r.table('users').indexCreate('username', r.row('username')).run(conn), + // index subscriptions by userId + r + .table('subscriptions') + .indexCreate('userId', r.row('userId')) + .run(conn), + // index invoices by userId + r.table('invoices').indexCreate('userId', r.row('userId')).run(conn), + // index invoices by communityId + r + .table('invoices') + .indexCreate('communityId', r.row('communityId')) + .run(conn), // indexes on usersCommunities join table r .table('usersCommunities') @@ -117,6 +131,8 @@ exports.down = function(r, conn) { r.tableDrop('directMessageThreads').run(conn), r.tableDrop('reactions').run(conn), r.tableDrop('notifications').run(conn), + r.tableCreate('subscriptions').run(conn), + r.tableCreate('invoices').run(conn), r.tableDrop('usersCommunities').run(conn), r.tableDrop('usersChannels').run(conn), r.tableDrop('usersDirectMessageThreads').run(conn),
12
diff --git a/README.md b/README.md @@ -109,21 +109,24 @@ const state = { ### Actions -The way to change the state is via actions. An action is a unary function (accepts a single argument) expecting a payload. The payload can be anything you want to pass into the action. +The only way to change the state is via actions. An action is a function that takes a payload as its only argument. The payload can be anything you want to pass into the action. To update the state, an action must return a partial state object. The new state will be the result of a shallow merge between this object and the current state. -To update the state, an action must return a partial state object. An action can also return a function that takes the current state and actions and returns a partial state object. Under the hood, Hyperapp wires every function from your actions to schedule a view redraw whenever the state changes. +Instead of returning a partial state object directly, an action can return a function that takes the current state and actions as arguments and returns a partial state object. ```js const actions = { + set: value => ({count: value}), down: value => state => ({ count: state.count - value }), up: value => state => ({ count: state.count + value }) } ``` -If you mutate the state within an action and return it, the view will not be redrawn as you expect. This is because state updates are always immutable. When you return a partial state object from an action, the new state will be the result of a shallow merge between this object and the current state. +Each state argument is a separate and distinct clone of the current state. Therefore state updates are always immutable. Immutability enables time-travel debugging, helps prevent introducing hard-to-track-down bugs by making state changes more predictable, and allows cheap memoization of components using shallow equality === checks. Immutability enables time-travel debugging, helps prevent introducing hard-to-track-down bugs by making state changes more predictable, and allows cheap memoization of components using shallow equality <samp>===</samp> checks. +Do not mutate the state object argument within an action and return it: the results are not what you expect. + #### Asynchronous Actions Actions used for side effects (writing to databases, sending a request to a server, etc.) don't need to have a return value. You may call an action from within another action or callback function. Actions which return a Promise, <samp>undefined</samp> or <samp>null</samp> will not trigger redraws or update the state. @@ -181,6 +184,15 @@ setInterval(main.up, 250, 1) setInterval(main.down, 500, 1) ``` +Including an action returning the state argument can be useful, and does not schedule a redraw: + +```jsx +const actions = { + getState: () => state => state +} +``` + + ### View Every time your application state changes, the view function is called so that you can specify how you want the DOM to look based on the new state. The view returns your specification in the form of a plain JavaScript object known as a virtual DOM and Hyperapp takes care of updating the actual DOM to match it.
7
diff --git a/packages/rekit-core/core/app.js b/packages/rekit-core/core/app.js @@ -9,7 +9,11 @@ const plugin = require('./plugin'); function getProjectData() { const plugins = plugin.getPlugins('app.getProjectData'); - if (plugins.length) return _.last(plugins).app.getProjectData(); + if (plugins.length) { + const prjData = {}; + plugins.forEach(p => Object.assign(prjData, p.app.getProjectData())); + return prjData; + } return readDir(paths.map('src')); }
11
diff --git a/guide/preparations/README.md b/guide/preparations/README.md @@ -67,4 +67,4 @@ And that's it! With all the necessities installed, you're almost ready to start ## Installing a linter -While you are coding, you may find that you run into numerous syntax errors, or just code in an inconsistent style. It's highly urged that you install a linter to ease these troubles. While code editors generally are able to point out syntax errors, with a linter, you can coerce your coding to be in a specific style as you define in the configuration. While this is not required, it's strongly reccommended. [Click here for the linter guide!](/preparations/setting-up-a-linter) \ No newline at end of file +While you are coding, you may find that you run into numerous syntax errors, or just code in an inconsistent style. It's highly urged that you install a linter to ease these troubles. While code editors generally are able to point out syntax errors, with a linter, you can coerce your coding to be in a specific style as you define in the configuration. While this is not required, it's strongly recommended. [Click here for the linter guide!](/preparations/setting-up-a-linter)
1
diff --git a/lib/config/plan-tester/src/test/usage-test.js b/lib/config/plan-tester/src/test/usage-test.js @@ -16,6 +16,13 @@ const uris = memoize(() => }) ); +const colorize = (obj) => util.inspect(obj, { + colors: true, + compact: true, + depth: null, + breakLength: process.stdout.columns +}); + describe('usage tests', () => { let usageDocs; @@ -32,10 +39,12 @@ describe('usage tests', () => { let calls = 0; /* eslint-disable no-unused-expressions */ const callFinished = (error, response) => { + const msg = `Response code: ${response.statusCode} body: ${colorize(response.body)}`; + expect(error).not.to.exist; - expect(response.statusCode).to.eq(201); + expect(response.statusCode, msg).to.eq(201); if (response.body) - expect(response.body.error).to.not.exist; + expect(response.body.error, msg).to.not.exist; if (++calls === usageDocs.length) done(); @@ -55,12 +64,7 @@ describe('usage tests', () => { expect(error).not.to.exist; expect(response.statusCode).to.eq(200); - console.log(util.inspect(response.body, { - color: true, - compact: true, - depth: null, - breakLength: process.stdout.columns - })); + console.log(colorize(response.body)); if (++calls === orgs.length) done();
7
diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -70,18 +70,18 @@ workflows: jobs: - build: filters: - tags: - only: /.*/ + branches: + only: master - test: requires: - build filters: - tags: - only: /.*/ + branches: + only: master - deploy: requires: - build - test filters: - tags: - only: /.*/ \ No newline at end of file + branches: + only: master \ No newline at end of file
8
diff --git a/content/guides/references/advanced-installation.md b/content/guides/references/advanced-installation.md @@ -5,13 +5,13 @@ title: Advanced Installation ## Environment variables | Name | Description | -| -------------------------------- | -------------------------------------------------------------------------------------------------------------------- | +| -------------------------------- | --------------------------------------------------------------------------------------------- | | `CYPRESS_INSTALL_BINARY` | [Destination of Cypress binary that's downloaded and installed](#Install-binary) | -| `CYPRESS_DOWNLOAD_MIRROR` | [Downloads the Cypress binary though a mirror server](#Mirroring) | +| `CYPRESS_DOWNLOAD_MIRROR` | [Downloads the Cypress binary through a mirror server](#Mirroring) | +| `CYPRESS_DOWNLOAD_PATH_TEMPLATE` | [Allows generating a custom URL to download the Cypress binary from](#Download-path-template) | | `CYPRESS_CACHE_FOLDER` | [Changes the Cypress binary cache location](#Binary-cache) | | `CYPRESS_RUN_BINARY` | [Location of Cypress binary at run-time](#Run-binary) | | `CYPRESS_VERIFY_TIMEOUT` | Overrides the timeout duration for the `verify` command. The default value is 30000. | -| `CYPRESS_DOWNLOAD_PATH_TEMPLATE` | Allows to specify custom download url. Replaces ${endpoint}, ${version}, ${platform}, ${arch} with respective values | | ~~CYPRESS_SKIP_BINARY_INSTALL~~ | <Badge type="danger">removed</Badge> use `CYPRESS_INSTALL_BINARY=0` instead | | ~~CYPRESS_BINARY_VERSION~~ | <Badge type="danger">removed</Badge> use `CYPRESS_INSTALL_BINARY` instead | @@ -155,16 +155,6 @@ for all available platforms. https://download.cypress.io/desktop/3.0.0?platform=win32&arch=x64 ``` -When setting -`CYPRESS_DOWNLOAD_PATH_TEMPLATE='${endpoint}/${platform}-${arch}/cypress.zip'` -environment variable, then a custom download url is used, where -${endpoint}, -${platform}, ${arch} are replaced with respective values. - -```text -https://download.cypress.io/desktop/3.0.0/win32-x64/cypress.zip -``` - ## Mirroring If you choose to mirror the entire Cypress download site, you can specify @@ -180,6 +170,50 @@ CYPRESS_DOWNLOAD_MIRROR="https://www.example.com" cypress install Cypress will then attempt to download a binary with this format: `https://www.example.com/desktop/:version?platform=p` +## Download path template + +Starting with Cypress 9.3.0, you can use the `CYPRESS_DOWNLOAD_PATH_TEMPLATE` +environment variable to download the Cypress binary from a custom URL that's +generated based on endpoint, version, platform and architecture. + +**The following replacements are supported:** + +- `${endpoint}` is replaced with `https://download.cypress.io/desktop/:version`. + If `CYPRESS_DOWNLOAD_MIRROR` is set, its value is used instead of + `https://download.cypress.io` (note that the `/desktop` remains!) +- `${platform}` is replaced with the platform the installation is running on + (e.g. `win32`, `linux`, `darwin`) +- `${arch}` is replaced with the architecture the installation is running on + (e.g. `x64`, `arm64`) +- Starting with Cypress 10.6.0, `${version}` is replaced with the version number + that's being installed (e.g. `10.11.0`) + +**Examples:** + +To install the binary from a download mirror that matches the exact file +structure of `https://cdn.cypress.io` (works for Cypress 9.3.0 or newer): + +```shell +export CYPRESS_DOWNLOAD_MIRROR=https://cypress-download.local +export CYPRESS_DOWNLOAD_PATH_TEMPLATE='${endpoint}/${platform}-${arch}/cypress.zip' +# Example of a resulting URL: https://cypress-download.local/desktop/10.11.0/linux-x64/cypress.zip +``` + +To install the binary from a download server with a custom file structure (works +for Cypress 10.6.0 or newer): + +```shell +export CYPRESS_DOWNLOAD_PATH_TEMPLATE='https://software.local/cypress/${platform}/${arch}/${version}/cypress.zip' +# Example of a resulting URL: https://software.local/cypress/linux/x64/10.11.0/cypress.zip +``` + +To define `CYPRESS_DOWNLOAD_PATH_TEMPLATE` in `.npmrc`, put a backslash before +every `$` (works for Cypress 9.5.3 or newer): + +```ini +CYPRESS_DOWNLOAD_PATH_TEMPLATE=\${endpoint}/\${platform}-\${arch}/cypress.zip +``` + ## Using a custom certificate authority (CA) Cypress can be configured to use the `ca` and `cafile` options from your NPM
7
diff --git a/vis/js/list.js b/vis/js/list.js @@ -268,11 +268,20 @@ list.fit_list_height = function() { let title_height = $("#subdiscipline_title").outerHeight(true); let title_image_height = $("#title_image").outerHeight(true) || 0; + // the real height after the react elements are rendered + let showHideBtnHeight = 34; + let filterSortHeight = 68.4; + + if (!mediator.modern_frontend_enabled) { + showHideBtnHeight = $("#show_hide_button").outerHeight(true); + filterSortHeight = $("#explorer_options").outerHeight(true); + } + paper_list_avail_height = Math.max(title_height, title_image_height) + $("#headstart-chart").outerHeight(true) - - $("#show_hide_button").outerHeight(true) - - $("#explorer_options").outerHeight(true) + - showHideBtnHeight + - filterSortHeight + ($(".legend").outerHeight(true) || 0) - PAPER_LIST_CORRECTION - (parseInt($("#papers_list").css("padding-top"), 10) || 0)
1
diff --git a/src/components/Match/AbilityBuildTable.jsx b/src/components/Match/AbilityBuildTable.jsx @@ -26,7 +26,7 @@ const standardizeLevel = (skilledAt, obj) => { const convertArrayToKeys = (obj, fieldName = '') => ({ ...obj, - ...obj[fieldName].reduce( + ...(obj[fieldName] || []).reduce( (acc, cur, index) => ({ ...acc, [`ability_upgrades_arr_${standardizeLevel(index, obj) + 1}`]: cur,
9
diff --git a/packages/manager/apps/telecom/src/components/sidebar/sidebar.config.js b/packages/manager/apps/telecom/src/components/sidebar/sidebar.config.js @@ -250,6 +250,8 @@ angular 'telecom_sidebar_actions_menu_internet_otb', ), href: URLS.overTheBox.FR, + target: '_blank', + extrnal: true, }, ] : []),
1
diff --git a/mobile/src/screens/partnerWelcome.js b/mobile/src/screens/partnerWelcome.js @@ -6,6 +6,7 @@ import { fbt } from 'fbt-runtime' import { connect } from 'react-redux' import SafeAreaView from 'react-native-safe-area-view' import { SvgUri } from 'react-native-svg' +import get from 'lodash.get' import OriginButton from 'components/origin-button' import CommonStyles from 'styles/common' @@ -51,7 +52,14 @@ class PartnerWelcomeScreen extends Component { const url = `${COFNIG_BASE_URL}/campaigns.json` console.log(`fetching config from ${url}`) - const resp = await fetch(url) + + let resp + try { + resp = await fetch(url) + } catch (err) { + console.error(err) + return this.next() + } if (resp.status !== 200) { console.warn('originprotocol.com did not return 200') @@ -79,13 +87,23 @@ class PartnerWelcomeScreen extends Component { return null } - const logoURL = `${BASE_URL}${config.partner.logo}` + const logo = get(config, 'partner.logo') + + let logoURL, + height = 90, + width = 190 + if (typeof logo === 'object') { + height = logo.height || 90 + width = logo.width || 190 + logoURL = `${BASE_URL}${logo.uri}` + } else { + logoURL = `${BASE_URL}${logo}` + } - // TODO: Need to deal with size differences const logoImage = logoURL.endsWith('svg') ? ( - <SvgUri width="190" height="90" uri={logoURL} /> + <SvgUri width={width} height={height} uri={logoURL} /> ) : ( - <Image style={{ width: 90, height: 160 }} source={{ uri: logoURL }} /> + <Image style={{ width, height }} source={{ uri: logoURL }} /> ) return ( @@ -135,14 +153,15 @@ const styles = StyleSheet.create({ welcomeMessage: {}, welcome: { fontFamily: 'Lato', - fontSize: 18 + fontSize: 18, + marginTop: 45, + marginBottom: 45 }, reward: { width: 255, height: 90, borderRadius: 10, backgroundColor: '#00004c', - marginTop: 45, marginLeft: 35 }, rewardText: {
5
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml @@ -9,6 +9,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 + - uses: fregante/setup-git-token@v1 + with: + token: ${{ secrets.GITHUB_TOKEN }} - name: Setup Node.js uses: actions/setup-node@v1
6
diff --git a/src/lime/graphics/ImageBuffer.hx b/src/lime/graphics/ImageBuffer.hx @@ -65,7 +65,7 @@ class ImageBuffer public var src(get, set):Dynamic; /** - The stride, or number of data values per row in the image data + The stride, or number of data values (in bytes) per row in the image data **/ public var stride(get, never):Int; @@ -221,6 +221,6 @@ class ImageBuffer @:noCompletion private function get_stride():Int { - return width * 4; + return width * bitsPerPixel / 8; } }
7
diff --git a/generators/server/templates/_build.gradle b/generators/server/templates/_build.gradle @@ -433,20 +433,6 @@ if (project.hasProperty('nodeInstall')) { npmVersion = '4.1.2' download = true } - - // Workaround for https://github.com/srs/gradle-node-plugin/issues/134 - task installLocalNpm { - def npmVersion = '' - def packageFile = file( new File( (File) node.nodeModulesDir, 'node_modules/npm/package.json' ) ) - if (packageFile.exists()) { - def json = new JsonSlurper().parseText(packageFile.text) - npmVersion = json.version - } - if (npmVersion != node.npmVersion) { - npmInstall.dependsOn 'npm_install_npm@' + node.npmVersion - } - } - npmInstall.dependsOn installLocalNpm } <%_ } _%>
2
diff --git a/website/src/_posts/2019-04-liftoff-07.md b/website/src/_posts/2019-04-liftoff-07.md @@ -7,7 +7,7 @@ series: 30 Days to Liftoff seriesSuffix: 'of 30' --- -Welcome to Day 7 of our ongoing thirty-day blog post challenge toward the **Uppy 1.0 release on April 25!**. With the weekend behind us and all batteries fully recharged, we're ready to start hacking away again at the forest of To Do's that lies in front of us. +Welcome to Day 7 of our ongoing thirty-day blog post challenge toward the **Uppy 1.0 release on April 25**! With the weekend behind us and all batteries fully recharged, we're ready to start hacking away again at the forest of To Do's that lies in front of us. We still have some updates from the end of last week to share with you, and our team is already working hard today on fixing issues and making improvements. So let's jump into it!
1
diff --git a/js/background.js b/js/background.js @@ -215,6 +215,7 @@ chrome.webRequest.onBeforeRequest.addListener( if(!tabs[e.tabId]){ tabs[e.tabId] = {'trackers': {}, "total": 0, 'url': e.url, "dispTotal": 0} + updateBadge(e.tabId, tabs[e.tabId].dispTotal); } if(!settings.getSetting('extensionIsEnabled')){ @@ -274,6 +275,7 @@ function updateBadge(tabId, numBlocked){ chrome.tabs.onUpdated.addListener(function(id, info, tab) { if(tabs[id] && info.status === "loading" && tabs[id].status !== "loading"){ tabs[id] = {'trackers': {}, "total": 0, "dispTotal": 0, 'url': tab.url, "status": "loading"}; + updateBadge(id, 0); } else if(tabs[id] && info.status === "complete"){ tabs[id].status = "complete";
3
diff --git a/src/components/OfflineWithFeedback.js b/src/components/OfflineWithFeedback.js @@ -28,6 +28,12 @@ const propTypes = { // eslint-disable-next-line react/forbid-prop-types errors: PropTypes.object, + /** Predetermine whether there are errors, so that we don't have to pass all the errors if we aren't rendering them */ + hasErrors: PropTypes.bool, + + /** Whether we should show the error messages */ + shouldShowErrorMessages: PropTypes.bool, + /** A function to run when the X button next to the error is clicked */ onClose: PropTypes.func, @@ -49,6 +55,8 @@ const propTypes = { const defaultProps = { pendingAction: null, errors: null, + hasErrors: false, + shouldShowErrorMessages: true, onClose: () => {}, style: [], errorRowStyles: [], @@ -73,7 +81,7 @@ function applyStrikeThrough(children) { } const OfflineWithFeedback = (props) => { - const hasErrors = !_.isEmpty(props.errors); + const hasErrors = props.hasErrors || !_.isEmpty(props.errors); const isOfflinePendingAction = props.network.isOffline && props.pendingAction; const isUpdateOrDeleteError = hasErrors && (props.pendingAction === 'delete' || props.pendingAction === 'update'); const isAddError = hasErrors && props.pendingAction === 'add'; @@ -93,7 +101,7 @@ const OfflineWithFeedback = (props) => { {children} </View> )} - {hasErrors && ( + {(hasErrors && props.shouldShowErrorMessages) && ( <View style={StyleUtils.combineStyles(styles.offlineFeedback.error, props.errorRowStyles)}> <DotIndicatorMessage messages={props.errors} type="error" /> <Tooltip text={props.translate('common.close')}>
11
diff --git a/api/models/channelSettings.js b/api/models/channelSettings.js @@ -110,7 +110,7 @@ export const resetChannelJoinToken = (id: string) => { type UpdateInput = { channelId: string, - slackChannelId: ?string, + slackChannelId: string, eventType: 'THREAD_CREATED', }; export const updateChannelSlackBotConnection = async ({ @@ -137,7 +137,7 @@ export const updateChannelSlackBotConnection = async ({ if (!settings.slackSettings) { settings.slackSettings = { botConnection: { - [botConnectionKey()]: slackChannelId, + [botConnectionKey()]: slackChannelId.length > 0 ? slackChannelId : null, }, }; newSettings = Object.assign({}, settings); @@ -145,7 +145,8 @@ export const updateChannelSlackBotConnection = async ({ newSettings = Object.assign({}, settings, { slackSettings: { botConnection: { - [botConnectionKey()]: slackChannelId, + [botConnectionKey()]: + slackChannelId.length > 0 ? slackChannelId : null, }, }, });
12
diff --git a/src/components/AuthCompany/index.js b/src/components/AuthCompany/index.js @@ -384,8 +384,7 @@ export default class Index extends PureComponent { style={{ marginBottom: '16px' }} /> <iframe - // src={`${marketUrl}/certification/login`} - src={`http://0.0.0.0:8090/certification/login?enterprise_alias=${enterprise_alias}&enterprise_id=${enterprise_id}&real_name=${real_name}`} + src={`${marketUrl}/certification/login?enterprise_alias=${enterprise_alias}&enterprise_id=${enterprise_id}&real_name=${real_name}`} style={{ width: '100%', height: '400px'
1
diff --git a/public/index_greenlight.html b/public/index_greenlight.html if (j && j.success && j.response && j.response.peered==false) { peer.style.display = 'block' peer.disabled = false - } // PEERED BUT NOT ACTIVE - if (j && j.success && j.response && j.response.peered && j.response.active==false && confirmations < 8) { + } else if (j && j.success && j.response && j.response.peered && confirmations < 8) { pending.style.display = 'block' // CHANNEL CREATED if (j.response.channel_point) { chanpoint.innerHTML = 'TXID: ' + txid + '\n Confirmations: ' + confirmations + '/8' } + // ACTIVE AFTER 8 CONFS ONLY } else if (j && j.success && j.response && j.response.peered && j.response.active) { conn.style.display = 'block' qr.style.display = 'flex'
8
diff --git a/public/index.html b/public/index.html const urlBarHeight = 256; const urlBarWorldWidth = 3; const urlBarWorldHeight = urlBarWorldWidth * urlBarHeight / urlBarWidth; - const urlBarMesh = (() => { + const menuMesh = (() => { const object = new THREE.Object3D(); - const planeMesh = (() => { + const urlMesh = (() => { const canvas = document.createElement('canvas'); canvas.width = urlBarWidth; canvas.height = urlBarHeight; return mesh; })(); - object.add(planeMesh); - object.planeMesh = planeMesh; + object.add(urlMesh); + object.urlMesh = urlMesh; object.plane = new THREE.Plane(); object.leftLine = new THREE.Line3(); return object; })(); - // urlBarMesh.position.set(2, 1, 1); - urlBarMesh.position.set(0, 1, -1); - scene.add(urlBarMesh); + // menuMesh.position.set(2, 1, 1); + menuMesh.position.set(0, 1, -1); + scene.add(menuMesh); const keyboardMesh = (() => { const object = new THREE.Object3D(); keyboardMesh.updateMatrixWorld(); keyboardMesh.visible = true; - urlBarMesh.scale.y = scaleY; - urlBarMesh.updateMatrixWorld(); - urlBarMesh.visible = true; + menuMesh.scale.y = scaleY; + menuMesh.updateMatrixWorld(); + menuMesh.visible = true; } else { const visible = keyboardMesh.planeMesh.scale.y > 0.5; keyboardMesh.visible = visible; - urlBarMesh.visible = visible; + menuMesh.visible = visible; keyboardMeshAnimation = null; } }; const _updateIntersections = () => { keyboardMesh.update(); - urlBarMesh.update(); + menuMesh.update(); const gamepads = navigator.getGamepads(); let urlCoords = null; if (!intersectionPoint) { - intersectionPoint = urlBarMesh.visible ? controllerMesh.ray.intersectPlane(urlBarMesh.plane, localVector) : null; + intersectionPoint = menuMesh.visible ? controllerMesh.ray.intersectPlane(menuMesh.plane, localVector) : null; if (intersectionPoint) { - const leftIntersectionPoint = urlBarMesh.leftLine.closestPointToPoint(intersectionPoint, true, localVector2); + const leftIntersectionPoint = menuMesh.leftLine.closestPointToPoint(intersectionPoint, true, localVector2); - const topIntersectionPoint = urlBarMesh.topLine.closestPointToPoint(intersectionPoint, true, localVector3); + const topIntersectionPoint = menuMesh.topLine.closestPointToPoint(intersectionPoint, true, localVector3); - const xFactor = topIntersectionPoint.distanceTo(urlBarMesh.topLine.start) / urlBarWorldWidth; - const yFactor = leftIntersectionPoint.distanceTo(urlBarMesh.leftLine.start) / urlBarWorldHeight; + const xFactor = topIntersectionPoint.distanceTo(menuMesh.topLine.start) / urlBarWorldWidth; + const yFactor = leftIntersectionPoint.distanceTo(menuMesh.leftLine.start) / urlBarWorldHeight; const distance = controllerMesh.ray.origin.distanceTo(intersectionPoint); if (xFactor > 0 && xFactor <= 0.99 && yFactor > 0 && yFactor <= 0.99 && distance < 1) { .applyEuler(localEuler) ); - urlBarMesh.position + menuMesh.position .copy(camera.position) .add( localVector localEuler.x = 0; localEuler.z = 0; keyboardMesh.rotation.copy(localEuler); - urlBarMesh.rotation.copy(localEuler); + menuMesh.rotation.copy(localEuler); const endValue = opening ? 1 : 0; const now = Date.now(); } if (closestIndex !== -1) { urlCursor = closestIndex; - urlBarMesh.planeMesh.updateText(); + menuMesh.urlMesh.updateText(); } } } if (urlCursor > 0) { urlText = urlText.slice(0, urlCursor - 1) + urlText.slice(urlCursor); urlCursor--; - urlBarMesh.planeMesh.updateText(); + menuMesh.urlMesh.updateText(); } } else if (code === 46) { // delete if (urlCursor < urlText.length) { urlText = urlText.slice(0, urlCursor) + urlText.slice(urlCursor + 1); - urlBarMesh.planeMesh.updateText(); + menuMesh.urlMesh.updateText(); } } else if (code === 32) { // space urlText = urlText.slice(0, urlCursor) + ' ' + urlText.slice(urlCursor); urlCursor++; - urlBarMesh.planeMesh.updateText(); + menuMesh.urlMesh.updateText(); } else if (code === 13) { // enter _goUrl(); } else if ( // nothing } else if (code === 37) { // left urlCursor = Math.max(urlCursor - 1, 0); - urlBarMesh.planeMesh.updateText(); + menuMesh.urlMesh.updateText(); } else if (code === 39) { // right urlCursor = Math.min(urlCursor + 1, urlText.length); - urlBarMesh.planeMesh.updateText(); + menuMesh.urlMesh.updateText(); } else if (code === 38) { // up urlCursor = 0; - urlBarMesh.planeMesh.updateText(); + menuMesh.urlMesh.updateText(); } else if (code === 40) { // down urlCursor = urlText.length; - urlBarMesh.planeMesh.updateText(); + menuMesh.urlMesh.updateText(); } else if (code === -1) { // nothing } else { } urlText = urlText.slice(0, urlCursor) + c + urlText.slice(urlCursor); urlCursor++; - urlBarMesh.planeMesh.updateText(); + menuMesh.urlMesh.updateText(); } }; const _goUrl = () => {
10
diff --git a/assets/js/components/user-input/UserInputQuestionnaire.js b/assets/js/components/user-input/UserInputQuestionnaire.js @@ -249,7 +249,6 @@ export default function UserInputQuestionnaire() { ) } next={ nextCallback } nextLabel={ nextLabel } - back={ backCallback } error={ error } > <UserInputSelectOptions
2
diff --git a/articles/rules/current/redirect.md b/articles/rules/current/redirect.md @@ -111,6 +111,7 @@ function(user, context, callback) { context.redirect = { url: "https://example.com/change-pw?token=" + token }; + return callback(null, user, context); } } else { // User has been redirected to /continue?token=..., password change must be validated
0
diff --git a/semantics-3.0/Semantics.hs b/semantics-3.0/Semantics.hs @@ -258,14 +258,14 @@ data ReduceWarning = ReduceNoWarning deriving (Eq,Ord,Show) -data ReduceResult = Reduced ReduceWarning ReduceEffect State Contract +data ReduceStepResult = Reduced ReduceWarning ReduceEffect State Contract | NotReduced | AmbiguousSlotIntervalReductionError deriving (Eq,Ord,Show) -- | Carry a step of the contract with no inputs -reduceContractStep :: Environment -> State -> Contract -> ReduceResult +reduceContractStep :: Environment -> State -> Contract -> ReduceStepResult reduceContractStep env state contract = case contract of Refund -> case refundOne (accounts state) of @@ -311,15 +311,15 @@ reduceContractStep env state contract = case contract of in Reduced warn ReduceNoPayment newState cont -data QuiescenceResult = ContractQuiescent [ReduceWarning] [Payment] State Contract - | QRAmbiguousSlotIntervalError +data ReduceResult = ContractQuiescent [ReduceWarning] [Payment] State Contract + | RRAmbiguousSlotIntervalError deriving (Eq,Ord,Show) -- | Reduce a contract until it cannot be reduced more -reduceContractUntilQuiescent :: Environment -> State -> Contract -> QuiescenceResult +reduceContractUntilQuiescent :: Environment -> State -> Contract -> ReduceResult reduceContractUntilQuiescent env state contract = let reductionLoop - :: Environment -> State -> Contract -> [ReduceWarning] -> [Payment] -> QuiescenceResult + :: Environment -> State -> Contract -> [ReduceWarning] -> [Payment] -> ReduceResult reductionLoop env state contract warnings payments = case reduceContractStep env state contract of Reduced warning effect newState cont -> let @@ -329,7 +329,7 @@ reduceContractUntilQuiescent env state contract = let ReduceWithPayment payment -> payment : payments ReduceNoPayment -> payments in reductionLoop env newState cont newWarnings newPayments - AmbiguousSlotIntervalReductionError -> QRAmbiguousSlotIntervalError + AmbiguousSlotIntervalReductionError -> RRAmbiguousSlotIntervalError -- this is the last invocation of reductionLoop, so we can reverse lists NotReduced -> ContractQuiescent (reverse warnings) (reverse payments) state contract @@ -385,7 +385,7 @@ applyAllInputs env state contract inputs = let -> ApplyAllResult applyAllLoop env state contract inputs warnings payments = case reduceContractUntilQuiescent env state contract of - QRAmbiguousSlotIntervalError -> ApplyAllAmbiguousSlotIntervalError + RRAmbiguousSlotIntervalError -> ApplyAllAmbiguousSlotIntervalError ContractQuiescent warns pays curState cont -> case inputs of [] -> ApplyAllSuccess (warnings ++ warns) (payments ++ pays) curState cont (input : rest) -> case applyInput env curState input cont of
10
diff --git a/core/lib/actions/Message.js b/core/lib/actions/Message.js @@ -63,6 +63,12 @@ export class Message extends Action { willApply () { if (typeof this.message !== 'undefined') { + // Check if the old format is being use and translate it to the new one + if (this.message.Title && this.message.Subtitle && this.message.Message) { + this.message.title = this.message.Title; + this.message.subtitle = this.message.Subtitle; + this.message.body = this.message.Message; + } return Promise.resolve (); } else { FancyError.show ( @@ -100,13 +106,6 @@ export class Message extends Action { } apply () { - // Check if the old format is being use and translate it to the new one - if (this.message.Title && this.message.Subtitle && this.message.Message) { - this.message.title = this.message.Title; - this.message.subtitle = this.message.Subtitle; - this.message.body = this.message.Message; - } - $_(`${Monogatari.selector} [data-screen="game"] #components`).append (Monogatari.component ('MESSAGE').render (this.message.title, this.message.subtitle, this.message.body)); $_(`${Monogatari.selector} [data-ui="messages"]`).addClass ('animated');
5
diff --git a/edit.js b/edit.js @@ -185,25 +185,6 @@ for (const handMesh of handMeshes) { scene.add(handMesh); } */ -/* const tetrehedronGeometry = (() => { - const geometry = new THREE.TetrahedronBufferGeometry(0.2, 0); - const barycentrics = new Float32Array(geometry.attributes.position.array.length); - let barycentricIndex = 0; - for (let i = 0; i < geometry.attributes.position.array.length; i += 9) { - barycentrics[barycentricIndex++] = 1; - barycentrics[barycentricIndex++] = 0; - barycentrics[barycentricIndex++] = 0; - barycentrics[barycentricIndex++] = 0; - barycentrics[barycentricIndex++] = 1; - barycentrics[barycentricIndex++] = 0; - barycentrics[barycentricIndex++] = 0; - barycentrics[barycentricIndex++] = 0; - barycentrics[barycentricIndex++] = 1; - } - geometry.setAttribute('barycentric', new THREE.BufferAttribute(barycentrics, 3)); - return geometry; -})(); */ - const itemMeshes = []; const addItem = async (position, quaternion) => { const u = 'assets/mat.glb';
2
diff --git a/extensions/projection/json-schema/schema.json b/extensions/projection/json-schema/schema.json "null" ] }, - "proj:proj4":{ - "title":"Coordinate Reference System in PROJ4 format", - "type":[ - "string", - "null" - ] - }, "proj:wkt2":{ "title":"Coordinate Reference System in WKT2 format", "type":[
2
diff --git a/package.json b/package.json "lodash": "^4.17.11", "loglevel": "^1.6.1", "loglevel-message-prefix": "^3.0.0", - "mgrs": "^1.0.0", "moment": "^2.22.2", "moment-timezone": "^0.5.23", "ngeohash": "^0.6.0",
2
diff --git a/snomed-interaction-components/js/snomed-interaction-components-2.1.js b/snomed-interaction-components/js/snomed-interaction-components-2.1.js @@ -9416,8 +9416,7 @@ function conceptDetails(divElement, conceptId, options) { $("#" + panel.divElement.id + "-configButton").removeAttr("disabled"); panel.setupOptionsPanel(); - }, - function() { + }).fail(function() { loadDesriptionsPanel(firstMatch); $("#" + panel.divElement.id + "-configButton").removeAttr("disabled");
9
diff --git a/physx.js b/physx.js @@ -919,6 +919,25 @@ const physxWorker = (() => { w.removeGeometryPhysics = (physics, id) => { moduleInstance._removeGeometryPhysics(physics, id); }; + w.addCapsuleGeometryPhysics = (physics, position, quaternion, radius, halfHeight, id, ccdEnabled) => { + const allocator = new Allocator(); + const p = allocator.alloc(Float32Array, 3); + const q = allocator.alloc(Float32Array, 4); + + position.toArray(p); + quaternion.toArray(q); + + moduleInstance._addCapsuleGeometryPhysics( + physics, + p.byteOffset, + q.byteOffset, + radius, + halfHeight, + id, + +ccdEnabled, + ); + allocator.freeAll(); + }; w.addBoxGeometryPhysics = (physics, position, quaternion, size, id, dynamic) => { const allocator = new Allocator(); const p = allocator.alloc(Float32Array, 3);
0
diff --git a/server/src/typeDefs/targeting.js b/server/src/typeDefs/targeting.js @@ -111,9 +111,9 @@ const schema = gql` } `; -function getClassValue({ systemId, class: className, key }) { +function getClassValue({ systemId, class: classId, key }) { const system = App.systems.find(s => s.id === systemId); - const targetClass = system.classes.find(c => c.id === className); + const targetClass = system.classes.find(c => c.id === classId); if (targetClass) { return targetClass[key]; } @@ -153,25 +153,25 @@ const resolver = { }, TargetingContact: { name(rootValue) { - getClassValue({ ...rootValue, key: "name" }); + return getClassValue({ ...rootValue, key: "name" }); }, size(rootValue) { - getClassValue({ ...rootValue, key: "size" }); + return getClassValue({ ...rootValue, key: "size" }); }, icon(rootValue) { - getClassValue({ ...rootValue, key: "icon" }); + return getClassValue({ ...rootValue, key: "icon" }); }, picture(rootValue) { - getClassValue({ ...rootValue, key: "picture" }); + return getClassValue({ ...rootValue, key: "picture" }); }, speed(rootValue) { - getClassValue({ ...rootValue, key: "speed" }); + return getClassValue({ ...rootValue, key: "speed" }); }, quadrant(rootValue) { - getClassValue({ ...rootValue, key: "quadrant" }); + return getClassValue({ ...rootValue, key: "quadrant" }); }, moving(rootValue) { - getClassValue({ ...rootValue, key: "moving" }); + return getClassValue({ ...rootValue, key: "moving" }); } }, Query: {
1
diff --git a/deployment/build-s3-dist.sh b/deployment/build-s3-dist.sh @@ -94,9 +94,9 @@ echo "[Init] Copying templates to global-s3-assets/" echo "------------------------------------------------------------------------------" # Copying main templates to global assets directory -cp build/templates/public.json $template_dist_dir/aws-qnabot-main.template -cp build/templates/public-vpc-support.json $template_dist_dir/aws-qnabot-vpc.template -cp build/templates/master.json $template_dist_dir/aws-qnabot-extended.template +cp build/templates/public.json $template_dist_dir/qnabot-on-aws-main.template +cp build/templates/public-vpc-support.json $template_dist_dir/qnabot-on-aws-vpc.template +cp build/templates/master.json $template_dist_dir/qnabot-on-aws-extended.template # Copying nested templates to global assets directory for the benefit of cfn_nag finding the # nested templates
3
diff --git a/app/assets/stylesheets/deep-insights/themes/scss/map/_embed.scss b/app/assets/stylesheets/deep-insights/themes/scss/map/_embed.scss @@ -115,20 +115,20 @@ $cEmbedTabs-Shadow: rgba(0, 0, 0, 0.24); .CDB-Embed-legends { .CDB-Legends-canvas { display: block !important; - border-radius: 0; position: relative; top: 0; left: 0; width: 100%; height: 100%; max-height: none; + border-radius: 0; box-shadow: none; } .CDB-Legends-canvasInner { - border-radius: 0; height: 100%; max-height: none; + border-radius: 0; } }
2
diff --git a/modules/experimental-layers/src/path-outline-layer/path-outline-layer.js b/modules/experimental-layers/src/path-outline-layer/path-outline-layer.js @@ -33,7 +33,7 @@ const FS_CODE = `\ `; const defaultProps = { - getZLevel: object => object.zLevel | 0 + getZLevel: {type: 'accessor', value: 0} }; export default class PathOutlineLayer extends PathLayer { @@ -136,7 +136,7 @@ export default class PathOutlineLayer extends PathLayer { attribute.value = pathTesselator._updateAttribute({ target: attribute.value, size: 1, - getValue: (object, index) => getZLevel(object, index) || 0 + getValue: (object, index) => [getZLevel(object, index) || 0] }); } }
0
diff --git a/config/environments/config.js b/config/environments/config.js @@ -253,7 +253,7 @@ var config = { // - running an standalone server without any dependency on external services inlineExecution: false, // where the SQL API is running, it will use a custom Host header to specify the username. - endpoint: 'http://127.0.0.1:8080/api/v2/sql/job', + endpoint: 'http://' + process.env.CARTO_WINDSHAFT_ANALYSIS_HOST + ':' + process.env.CARTO_WINDSHAFT_ANALYSIS_PORT + '/api/v2/sql/job', // the template to use for adding the host header in the batch api requests hostHeaderTemplate: '{{=it.username}}.localhost.lan' },
14
diff --git a/physics-manager.js b/physics-manager.js @@ -82,6 +82,10 @@ const setSitState = newSitState => { }; physicsManager.setSitState = setSitState; +const sitTarget = new THREE.Object3D(); +const getSitTarget = () => sitTarget; +physicsManager.getSitTarget = getSitTarget; + const physicsObjects = {}; const physicsUpdates = []; const _makePhysicsObject = (position, quaternion) => ({
0
diff --git a/site/ssl.md b/site/ssl.md @@ -262,9 +262,12 @@ ssl_options.cacertfile = /path/to/ca_certificate.pem ssl_options.certfile = /path/to/server_certificate.pem ssl_options.keyfile = /path/to/server_key.pem ssl_options.verify = verify_peer -ssl_options.fail_if_no_peer_cert = false +ssl_options.fail_if_no_peer_cert = true </pre> +This configuration will also perform [peer certificate chain verification](#peer-verification) +so clients clients without any certificates will be rejected. + It is possible to completely disable regular (non-TLS) listeners. Only TLS-enabled clients would be able to connect to such a node, and only if they use the correct port: @@ -278,7 +281,7 @@ ssl_options.cacertfile = /path/to/ca_certificate.pem ssl_options.certfile = /path/to/server_certificate.pem ssl_options.keyfile = /path/to/server_key.pem ssl_options.verify = verify_peer -ssl_options.fail_if_no_peer_cert = false +ssl_options.fail_if_no_peer_cert = true </pre> TLS settings can also be configured using the [classic config format](/configure.html#erlang-term-config-file): @@ -291,7 +294,7 @@ TLS settings can also be configured using the [classic config format](/configure {certfile, "/path/to/server_certificate.pem"}, {keyfile, "/path/to/server_key.pem"}, {verify, verify_peer}, - {fail_if_no_peer_cert, false}]} + {fail_if_no_peer_cert, true}]} ]} ]. </pre>
4
diff --git a/src/client/js/components/PageComment/Comment.jsx b/src/client/js/components/PageComment/Comment.jsx @@ -287,6 +287,7 @@ Comment.propTypes = { comment: PropTypes.object.isRequired, growiRenderer: PropTypes.object.isRequired, + editBtnClicked: PropTypes.func.isRequired, deleteBtnClicked: PropTypes.func.isRequired, replyList: PropTypes.array, };
12
diff --git a/token-metadata/0xD6a55C63865AffD67E2FB9f284F87b7a9E5FF3bD/metadata.json b/token-metadata/0xD6a55C63865AffD67E2FB9f284F87b7a9E5FF3bD/metadata.json "symbol": "ESH", "address": "0xD6a55C63865AffD67E2FB9f284F87b7a9E5FF3bD", "decimals": 18, - "dharmaVerificationStatus": { "dharmaVerificationStatus": "VERIFIED" } \ No newline at end of file -} \ No newline at end of file
3
diff --git a/source/background/library/archives.js b/source/background/library/archives.js @@ -383,41 +383,10 @@ export async function saveSource(sourceID) { if (!source) { throw new Error(`Unable to save source: No unlocked source found for ID: ${sourceID}`); } - // await vaultManager.interruptAutoUpdate(async () => { - // if (await source.localDiffersFromRemote()) { - - // } - // }); - return getVaultManager() - .then(vaultManager => { - const source = vaultManager.getSourceForID(sourceID); - if (!source) { - throw new Error(`Unable to save source: No unlocked source found for ID: ${sourceID}`); - } - const { workspace } = source; - return vaultManager.interruptAutoUpdate(() => - workspace - .localDiffersFromRemote() - .then(differs => { - if (differs) { - log.info(` -> Remote source differs, will merge before save: ${sourceID}`); - } else { - log.info(` -> Remote source is the same, no merge/save necessary: ${sourceID}`); - } - return differs ? workspace.mergeFromRemote().then(() => true) : false; - }) - .then(shouldSave => { - // (shouldSave ? workspace.save() : null) - if (!shouldSave) { - return null; - } - return workspace.save().then(() => { - log.info(` -> Saved source: ${sourceID}`); + await vaultManager.interruptAutoUpdate(async () => { + log.info(`Saving source: ${sourceID}`); + await source.save(); }); - }) - ); - }) - .then(updateContextMenu); } export function sendCredentialsToTab(sourceID, entryID, signIn) {
4
diff --git a/webui/src/Page/Survey.elm b/webui/src/Page/Survey.elm @@ -833,7 +833,7 @@ viewLikertSurveyTitle survey = Zipper.current survey.questions questionNumber = - currentQuestion.id + toString currentQuestion.orderNumber totalQuestions = List.length (Zipper.toList survey.questions) @@ -843,7 +843,7 @@ viewLikertSurveyTitle survey = in div [ class "row" ] [ div [ class "col-lg ", style [ ( "text-align", "center" ) ] ] - [ h3 [ class "" ] [ text ("Question " ++ (toString questionNumber) ++ " of " ++ (toString totalQuestions)) ] + [ h3 [ class "" ] [ text ("Question " ++ questionNumber ++ " of " ++ (toString totalQuestions)) ] , h4 [] [ text questionTitle ] ] ]
1
diff --git a/game.js b/game.js @@ -67,18 +67,27 @@ const _getGrabbedObject = i => { return result; }; -const _unwearAppIfHasSitComponent = (player) => { +const _isActionableOnSittableApp = (player, actionType) => { + let isActionable = true; + const wearActions = player.getActionsByType('wear'); for (const wearAction of wearActions) { const instanceId = wearAction.instanceId; const app = metaversefileApi.getAppByInstanceId(instanceId); const hasSitComponent = app.hasComponent('sit'); if (hasSitComponent) { + const actionable = app.getComponent(actionType + 'able'); + if (!actionable) { + isActionable = false; + } else { app.unwear(); } } } + return isActionable; +} + // returns whether we actually snapped function updateGrabbedObject(o, grabMatrix, offsetMatrix, {collisionEnabled, handSnapEnabled, physx, gridSnap}) { grabMatrix.decompose(localVector, localQuaternion, localVector2); @@ -1411,11 +1420,13 @@ class GameManager extends EventTarget { time: 0, }; - _unwearAppIfHasSitComponent(localPlayer); + const isFlyable = _isActionableOnSittableApp(localPlayer, 'fly'); + if (isFlyable) { localPlayer.setControlAction(flyAction); } } + } isCrouched() { const localPlayer = playersManager.getLocalPlayer(); return localPlayer.hasAction('crouch'); @@ -1492,9 +1503,9 @@ class GameManager extends EventTarget { ensureJump(trigger) { const localPlayer = playersManager.getLocalPlayer(); - _unwearAppIfHasSitComponent(localPlayer); + const isJumpable = _isActionableOnSittableApp(localPlayer, 'jump'); - if (!localPlayer.hasAction('jump') && !localPlayer.hasAction('fly') && !localPlayer.hasAction('fallLoop') && !localPlayer.hasAction('swim')) { + if (isJumpable && !localPlayer.hasAction('jump') && !localPlayer.hasAction('fly') && !localPlayer.hasAction('fallLoop') && !localPlayer.hasAction('swim')) { const newJumpAction = { type: 'jump', trigger:trigger,
0
diff --git a/css/tarteaucitron.css b/css/tarteaucitron.css @@ -754,6 +754,9 @@ div.amazon_product { .tarteaucitronLine .tarteaucitronAllow, .tarteaucitronLine .tarteaucitronDeny { opacity: 0.4; } +#tarteaucitronServices_mandatory button.tarteaucitronAllow { + opacity: 1; +} div#tarteaucitronInfo { display: block!important;
12
diff --git a/token-metadata/0x78a685E0762096ed0F98107212e98F8C35A9D1D8/metadata.json b/token-metadata/0x78a685E0762096ed0F98107212e98F8C35A9D1D8/metadata.json "symbol": "DAP", "address": "0x78a685E0762096ed0F98107212e98F8C35A9D1D8", "decimals": 10, - "dharmaVerificationStatus": { "dharmaVerificationStatus": "VERIFIED" } \ No newline at end of file -} \ No newline at end of file
3
diff --git a/app/builtin-pages/views/workspaces.js b/app/builtin-pages/views/workspaces.js @@ -59,6 +59,13 @@ async function loadCurrentWorkspace () { } else { workspaceInfo = null } + + // set the current diff node to the first revision + if (workspaceInfo && workspaceInfo.revisions.length) { + const firstRev = workspaceInfo.revisions[0] + currentDiffNode = firstRev + diff = await beaker.workspaces.diff(0, currentWorkspaceName, firstRev.path) + } render() }
12
diff --git a/components/tabs/panel.jsx b/components/tabs/panel.jsx @@ -53,10 +53,11 @@ Panel.propTypes = { * This object is merged with the default props object on every render. * * `withErrorIcon`: This text is for the error icon that will be placed next to the `<Tab />` title */ + /* deepscan-disable REACT_USELESS_PROP_TYPES */ assistiveText: PropTypes.shape({ - // deepscan-disable-line REACT_USELESS_PROP_TYPES withErrorIcon: PropTypes.string, }), + /* deepscan-enable REACT_USELESS_PROP_TYPES */ }; export default Panel;
8
diff --git a/src/renderer/map/MapCanvasRenderer.js b/src/renderer/map/MapCanvasRenderer.js @@ -649,22 +649,24 @@ class MapCanvasRenderer extends MapRenderer { if (map.getPitch() <= map.options['maxVisualPitch'] || !map.options['fog']) { return; } - const ctx = this.context; - const r = Browser.retina ? 2 : 1; - const clipExtent = map.getContainerExtent(); - let top = (map.height - map._getVisualHeight(75) * r); + const fogThickness = 30, + r = Browser.retina ? 2 : 1; + const ctx = this.context, + clipExtent = map.getContainerExtent(); + let top = (map.height - map._getVisualHeight(75)) * r; if (top < 0) top = 0; - const bottom = clipExtent.ymin * r; - const h = Math.ceil(bottom - top); - const color = map.options['fogColor'].join(); - const gradient = ctx.createLinearGradient(0, top, 0, bottom + h * 0.3); + const bottom = clipExtent.ymin * r, + h = Math.ceil(bottom - top), + color = map.options['fogColor'].join(); + const gradient = ctx.createLinearGradient(0, top, 0, bottom + fogThickness); + const landscape = 1 - fogThickness / (h + fogThickness); gradient.addColorStop(0, `rgba(${color}, 0)`); gradient.addColorStop(0.3, `rgba(${color}, 0.3)`); - gradient.addColorStop(0.8, `rgba(${color}, 1)`); + gradient.addColorStop(landscape, `rgba(${color}, 1)`); gradient.addColorStop(1, `rgba(${color}, 0)`); ctx.beginPath(); ctx.fillStyle = gradient; - ctx.fillRect(0, top, Math.ceil(clipExtent.getWidth()) * r, h * 1.3); + ctx.fillRect(0, top, Math.ceil(clipExtent.getWidth()) * r, Math.ceil(h + fogThickness)); } _getAllLayerToRender() {
3
diff --git a/src/angular/projects/spark-core-angular/src/lib/components/sprk-footer/sprk-footer.component.spec.ts b/src/angular/projects/spark-core-angular/src/lib/components/sprk-footer/sprk-footer.component.spec.ts @@ -12,32 +12,6 @@ describe('SparkFooterComponent', () => { let component: SparkFooterComponent; let fixture: ComponentFixture<SparkFooterComponent>; let element: HTMLElement; - const siteLinkCols: object = { - heading: 'cats', - siteLinks: { text: 'Item 1', href: '/alerts', analytics: 'test' } - }; - const feedbackLinks: object = { - icon: 'bell', - text: 'Item 1', - href: '/alerts', - analytics: 'test' - }; - const socialLinks: object = { - icon: 'bell', - href: '/alerts', - analytics: 'test' - }; - const navLinks: object = { - text: 'Item 1', - href: '/alerts', - analytics: 'test' - }; - const badges: object = { - href: '/alerts', - analytics: 'test', - alt: 'test', - src: 'test' - }; beforeEach(async(() => { TestBed.configureTestingModule({ @@ -73,20 +47,7 @@ describe('SparkFooterComponent', () => { component.additionalClasses = 'sprk-u-pam sprk-u-man'; fixture.detectChanges(); expect(component.getClasses()).toEqual( - 'sprk-o-Box sprk-o-Stack sprk-o-Stack--large sprk-u-pam sprk-u-man' + 'sprk-o-Stack sprk-u-pam sprk-u-man' ); }); - - it('should add the correct classes if additionalClassesBadges has a value', () => { - component.additionalClassesBadges = 'sprk-u-pam sprk-u-man'; - fixture.detectChanges(); - expect(component.getClassesBadges()).toEqual( - 'sprk-o-Stack__item sprk-u-pam sprk-u-man' - ); - }); - - it('should add the correct classes if additionalClassesBadges does not have a value', () => { - fixture.detectChanges(); - expect(component.getClassesBadges()).toEqual('sprk-o-Stack__item'); - }); });
3
diff --git a/src/DevChatter.Bot.Web/wwwroot/js/wasteful-game/wasteful.js b/src/DevChatter.Bot.Web/wwwroot/js/wasteful-game/wasteful.js @@ -14,8 +14,8 @@ const hangryRed = '#ff0000'; export class Wasteful { /** - * @param {HTMLCanvasElement} canvas - * @param {object} hub + * @param {HTMLCanvasElement} canvas canvas to draw on + * @param {object} hub server to send messages to */ constructor(canvas, hub) { this._mouseDownHandle = this._onMouseDown.bind(this); @@ -37,8 +37,8 @@ export class Wasteful { /** * @public - * @param {{displayName: string, userId: string}} userInfo - * @param {Array<{string, number}>} startingItems + * @param {{displayName: string, userId: string}} userInfo details of the player + * @param {Array<{string, number}>} startingItems starting items for the player */ startGame(userInfo, startingItems) { if (this._isRunning) { @@ -74,7 +74,7 @@ export class Wasteful { /** * @public - * @returns {Grid} + * @returns {Grid} the grid object */ get grid() { return this._grid; @@ -82,7 +82,7 @@ export class Wasteful { /** * @public - * @returns {EntityManager} + * @returns {EntityManager} the entity manager */ get entityManager() { return this._entityManager; @@ -90,7 +90,7 @@ export class Wasteful { /** * @public - * @returns {Player} + * @returns {Player} the player */ get player() { return this._player; @@ -98,7 +98,7 @@ export class Wasteful { /** * @public - * @returns {Level} + * @returns {Level} current level number */ get level() { return this._level; @@ -208,7 +208,7 @@ export class Wasteful { /** * @private - * @param {object} event + * @param {object} event event args */ _onMouseDown(event) { this._lastMouseTarget = event.target; @@ -216,7 +216,7 @@ export class Wasteful { /** * @private - * @param {object} event + * @param {object} event event args */ _onKeyDown(event) { if(this._lastMouseTarget !== this._canvas) {
1
diff --git a/resources/views/laravel-tags/v2/advanced-usage/using-your-own-tag-model.md b/resources/views/laravel-tags/v2/advanced-usage/using-your-own-tag-model.md @@ -19,6 +19,8 @@ class YourModel extends Model Then you need to override the `tags()` method from the same trait to tell Laravel that it still needs to look for `tags_id` column for tags relation instead of `your_tag_model_id`: ``` +use Illuminate\Database\Eloquent\Relations\MorphToMany; + public function tags(): MorphToMany { return $this
4
diff --git a/articles/support/matrix.md b/articles/support/matrix.md @@ -14,7 +14,7 @@ Auth0 provides support in alignment with the [Terms of Service](https://auth0.co Official support provided by Auth0 is limited to the languages, platforms, versions, and technologies specifically listed as such on this page. Anything that is *not* listed, or listed as **community-supported**, is ineligible for Auth0 support. -In the event that you have questions involving unsupported items, you may post your question on the Auth0 public forum. +In the event that you have questions involving unsupported items, you may post your question on the [Auth0 public forum](https://community.auth0.com/). For community-supported items, you can seek assistance by contacting the developers responsible for those items (such as submitting issues on the GitHub repositories for the specific libraries or software development kits (SDKs)).
0
diff --git a/docs/creating-a-plugin.md b/docs/creating-a-plugin.md @@ -198,11 +198,13 @@ This works inside `async` event handlers as well. ## Publishing a plugin -The [`name` property in `package.json`](https://docs.npmjs.com/files/package.json#name) should start with -`netlify-plugin-` (such as `netlify-plugin-example` or `@scope/netlify-plugin-example`). It should match the plugin -`name` field. - -It is recommended for the GitHub repository to be named like this as well. - -The [`keywords` property in `package.json`](https://docs.npmjs.com/files/package.json#keywords) and the -[GitHub topics](https://github.com/topics) should contain the `netlify` and `netlify-plugin` keywords. +The following properties in `package.json` should be added: + +- [`name`](https://docs.npmjs.com/files/package.json#name) should start with `netlify-plugin-` (such as + `netlify-plugin-example` or `@scope/netlify-plugin-example`). It should match the plugin `name` field. It is + recommended for the GitHub repository to be named like this as well. +- [`keywords`](https://docs.npmjs.com/files/package.json#keywords) should contain the `netlify` and `netlify-plugin` + keywords. The same applies to [GitHub topics](https://github.com/topics). This helps users find your plugin. +- [`repository`](https://docs.npmjs.com/files/package.json#repository) and + [`bugs`](https://docs.npmjs.com/files/package.json#bugs) should be defined. Those are displayed to users when an error + occurs inside your plugin.
7
diff --git a/test/TemplateRenderNunjucksTest.js b/test/TemplateRenderNunjucksTest.js @@ -545,6 +545,40 @@ test("Nunjucks Async Paired Shortcode", async (t) => { ); }); +test("Nunjucks Nested Async Paired Shortcode", async (t) => { + t.plan(3); + + let tr = getNewTemplateRender("njk", "./test/stubs/"); + tr.engine.addPairedShortcode( + "postfixWithZach", + function (content, str) { + // Data in context + t.is(this.page.url, "/hi/"); + + return new Promise(function (resolve) { + setTimeout(function () { + resolve(str + content + "Zach"); + }); + }); + }, + true + ); + + t.is( + await tr._testRender( + "{% postfixWithZach name %}Content{% postfixWithZach name2 %}Content{% endpostfixWithZach %}{% endpostfixWithZach %}", + { + name: "test", + name2: "test2", + page: { + url: "/hi/", + }, + } + ), + "testContenttest2ContentZachZach" + ); +}); + test("Nunjucks Paired Shortcode without args", async (t) => { let tr = getNewTemplateRender("njk", "./test/stubs/"); tr.engine.addPairedShortcode("postfixWithZach", function (content) {
0
diff --git a/packages/create-snowpack-app/templates/app-template-11ty/.eleventy.js b/packages/create-snowpack-app/templates/app-template-11ty/.eleventy.js module.exports = function (eleventyConfig) { eleventyConfig.setTemplateFormats([ // Templates: - "html", - "njk", - "md", + 'html', + 'njk', + 'md', // Static Assets: - "css", - "svg", - "png", - "jpg", - "jpeg", + 'css', + 'jpeg', + 'jpg', + 'png', + 'svg', + 'woff', + 'woff2', ]); - eleventyConfig.addPassthroughCopy("static"); + eleventyConfig.addPassthroughCopy('static'); return { dir: { - input: "_template", - includes: "../_includes", - output: "_output", + input: '_template', + includes: '../_includes', + output: '_output', }, }; };
0
diff --git a/css/bookmarkManager.css b/css/bookmarkManager.css #searchbar .tag.suggested { background: transparent; border-style: dotted; - border-color: rgba(0, 0, 0, 0.1); + border-color: rgba(0, 0, 0, 0.125); } .dark-theme #searchbar .tag.suggested { - border-color: rgba(255, 255, 255, 0.225); + border-color: rgba(255, 255, 255, 0.3); } #searchbar .tag + .tag { border-radius: 3px; background: transparent; color: inherit; - border: 1px rgba(0,0,0, 0.1) solid; + border: 1px rgba(0,0,0, 0.125) solid; opacity: 0.8; } .tag-edit-area .tag + .tag-input { margin-left: 0.5em; } .dark-theme .tag-edit-area .tag-input { - border-color: rgba(255, 255, 255, 0.225); + border-color: rgba(255, 255, 255, 0.3); } .dark-theme .tag-edit-area .tag-input::-webkit-input-placeholder { color: rgba(255, 255, 255, 0.66);
7
diff --git a/docs/MIGRATION_GUIDE_0.14.md b/docs/MIGRATION_GUIDE_0.14.md @@ -261,7 +261,49 @@ module.exports = { }); ``` +## 6. Use the new built-in logger instead of custom logger. +The whole logging function has been rewritten in this version. It means, it has a lot of new features, but the configuration of loggers has contains breaking changes. +**Old way to use an external logger** +```js +// moleculer.config.js +module.exports = { + logger: bindings => pino.child(bindings), +}; +``` + +**New way to use external logger** +```js +// moleculer.config.js +module.exports = { + logger: "Pino", +}; +``` + +or + +```js +// moleculer.config.js +module.exports = { + logger: { + type: "Pino", + options: { + // Logging level + level: "info", + + pino: { + // More info: http://getpino.io/#/docs/api?id=options-object + options: null, + + // More info: http://getpino.io/#/docs/api?id=destination-sonicboom-writablestream-string + destination: "/logs/moleculer.log", + } + } + } +}; +``` + +>[Read more about new logging feature](https://moleculer.services/docs/0.14/logging.html) **:tada: Well, you are done! :clap:**
3
diff --git a/js/gateio.js b/js/gateio.js @@ -171,7 +171,6 @@ module.exports = class gateio extends ccxt.gateio { } async authenticate () { - this.checkRequiredCredentials (); const url = this.urls['api']['ws']; const requestId = this.milliseconds (); const signature = this.hmac (requestId.toString (), this.secret, 'sha512', 'base64'); @@ -198,6 +197,7 @@ module.exports = class gateio extends ccxt.gateio { } async watchBalance (params = {}) { + this.checkRequiredCredentials (); const url = this.urls['api']['ws']; const client = this.client (url); if (!(this.safeValue (client.subscriptions, 'authenticated', false))) { @@ -230,6 +230,7 @@ module.exports = class gateio extends ccxt.gateio { } async watchOrders (params = {}) { + this.checkRequiredCredentials (); await this.loadMarkets (); const url = this.urls['api']['ws']; const client = this.client (url);
5
diff --git a/src/internal/input.js b/src/internal/input.js @@ -169,7 +169,7 @@ export function read(input) { return rewriteInput(source, inputDir); } -export function readChildren(input) { +export function readPaths(input) { const children = []; if (input !== "-") {
10
diff --git a/docs/layers/scatterplot-layer.md b/docs/layers/scatterplot-layer.md @@ -161,7 +161,7 @@ The rgba color of each object, in `r, g, b, [a]`. Each component is in the 0-255 * Default: `1` -The width of the outline of the object in pixels. +The width of the outline of each object, in meters. * If a number is provided, it is used as the outline width for all objects. * If a function is provided, it is called on each object to retrieve its outline width.
3
diff --git a/errors.yaml b/errors.yaml @@ -39,7 +39,7 @@ errors: - code: not_found description: "The requested resources could not be found." - code: payload_too_large - description: "The payload sent to the server was too large. Check out this [guide](https://docs.meilisearch.com/guides/advanced_guides/configuration.html#options) to customize the maximum payload size accepted by MeiliSearch." + description: "The payload sent to the server was too large. Check out this [guide](https://docs.meilisearch.com/guides/advanced_guides/configuration.html#payload-limit-size) to customize the maximum payload size accepted by MeiliSearch." - code: unretrievable_document description: "The document exists in store, but there was an error retrieving it. This probably comes from an inconsistent state in the database." - code: search_error
1
diff --git a/weapons-manager.js b/weapons-manager.js @@ -1888,6 +1888,10 @@ const itemSpecs = [ "name": "camera", "start_url": "https://avaer.github.io/camera/index.js" }, + { + "name": "cityscape", + "start_url": "https://raw.githubusercontent.com/metavly/cityscape/master/manifest.json" + }, ]; const itemsEl = document.getElementById('items'); for (const itemSpec of itemSpecs) {
0
diff --git a/app/helpers/samples_helper.rb b/app/helpers/samples_helper.rb @@ -37,7 +37,7 @@ module SamplesHelper attributes = %w[sample_name uploader upload_date overall_job_status runtime_seconds total_reads nonhost_reads nonhost_reads_percent total_ercc_reads subsampled_fraction quality_control compression_ratio reads_after_star reads_after_trimmomatic reads_after_priceseq reads_after_cdhitdup reads_after_idseq_dedup - host_genome notes + host_organism notes insert_size_median insert_size_mode insert_size_median_absolute_deviation insert_size_min insert_size_max insert_size_mean insert_size_standard_deviation insert_size_read_pairs] if include_all_metadata @@ -77,7 +77,7 @@ module SamplesHelper # reads_after_cdhitdup required for backwards compatibility reads_after_cdhitdup: (derived_output[:summary_stats] || {})[:reads_after_cdhitdup] || '', reads_after_idseq_dedup: (derived_output[:summary_stats] || {})[:reads_after_idseq_dedup] || '', - host_genome: derived_output && derived_output[:host_genome_name] ? derived_output[:host_genome_name] : '', + host_organism: derived_output && derived_output[:host_genome_name] ? derived_output[:host_genome_name] : '', notes: db_sample && db_sample[:sample_notes] ? db_sample[:sample_notes] : '', insert_size_median: pipeline_run && pipeline_run.insert_size_metric_set && pipeline_run.insert_size_metric_set.median ? pipeline_run.insert_size_metric_set.median : '', insert_size_mode: pipeline_run && pipeline_run.insert_size_metric_set && pipeline_run.insert_size_metric_set.mode ? pipeline_run.insert_size_metric_set.mode : '',
10
diff --git a/circle.yml b/circle.yml @@ -5,13 +5,10 @@ machine: node: version: 7.5.0 - environment: - COVERALLS_REPO_TOKEN: cptV1A70KJcrp2KvsAKcct7kHytmE7uq9 - COVERALLS_PARALLEL: true notify: webhooks: - - url: https://coveralls.io/webhook?repo_token=cptV1A70KJcrp2KvsAKcct7kHytmE7uq9 + - url: https://coveralls.io/webhook?repo_token=$COVERALLS_REPO_TOKEN dependencies: pre:
4
diff --git a/src/components/TableFilter.js b/src/components/TableFilter.js @@ -247,7 +247,7 @@ class TableFilter extends React.Component { <MenuItem value={filterValue} key={filterIndex + 1}> <Checkbox checked={filterList[index].indexOf(filterValue) >= 0 ? true : false} - value={filterValue !== null ? filterValue.toString() : ''} + value={filterValue != null ? filterValue.toString() : ''} className={classes.checkboxIcon} classes={{ root: classes.checkbox,
9
diff --git a/activity/urls.py b/activity/urls.py @@ -93,11 +93,11 @@ urlpatterns = [ # rest framework # enable the admin: path('admin/doc/', include('django.contrib.admindocs.urls')), path('admin/', admin.site.urls), - path('<selected_countries>/', + path('<slug:selected_countries>/', views.index, name='index'), # index - path('dashboard/<program_id>/', + path('dashboard/<int:program_id>/', activityviews.index, name='home_dashboard'), # base template for layout @@ -138,7 +138,7 @@ urlpatterns = [ # rest framework path('accounts/user/password_update/', views.change_password, name='change_password'), # accounts - path('accounts/organization/<org_id>/', + path('accounts/organization/<int:org_id>/', views.switch_organization, name='switch_organization'), path('accounts/profile/', views.profile, name='profile'), path('accounts/admin_dashboard/', views.admin_dashboard, @@ -163,15 +163,15 @@ urlpatterns = [ # rest framework path('bookmark_list', BookmarkList.as_view(), name='bookmark_list'), path('bookmark_add', BookmarkCreate.as_view(), name='bookmark_add'), - path('bookmark_update/<pk>/', + path('bookmark_update/<slug:pk>/', BookmarkUpdate.as_view(), name='bookmark_update'), - path('bookmark_delete/<pk>/', + path('bookmark_delete/<slug:pk>/', BookmarkDelete.as_view(), name='bookmark_delete'), # Auth backend URL's path('', include(('django.contrib.auth.urls', "django.contrib.auth"), namespace='auth')), - path('activate/<uidb64>/<token>/', + path('activate/<slug:uidb64>/<slug:token>/', views.activate_acccount, name='activate'), path('oauth/', include('social_django.urls', namespace='social')),
0
diff --git a/client/components/settings/peopleBody.js b/client/components/settings/peopleBody.js @@ -567,9 +567,9 @@ Template.newUserPopup.events({ const isAdmin = templateInstance.find('.js-profile-isadmin').value.trim(); const isActive = templateInstance.find('.js-profile-isactive').value.trim(); const email = templateInstance.find('.js-profile-email').value.trim(); - const importUsernames = templateInstance - .find('.js-import-usernames') - .value.trim(); + const importUsernames = Users.parseImportUsernames( + templateInstance.find('.js-import-usernames').value, + ); Meteor.call( 'setCreateUser',
1
diff --git a/src/js/controllers/correspondentDevice.js b/src/js/controllers/correspondentDevice.js @@ -1886,7 +1886,7 @@ angular.module('copayApp.controllers').controller('correspondentDeviceController replace: true, link: function (scope, ele, attrs) { scope.$watch(attrs.dynamic, function(html) { - ele.html(html.replace(/(^|>)(.*?)(<|$)/g, function (str, closing_bracket, between, opening_bracket) { + ele.html((html || '').replace(/(^|>)(.*?)(<|$)/g, function (str, closing_bracket, between, opening_bracket) { if (!between.match(/\W/)) return str; return closing_bracket + '<span ng-non-bindable>' + between + '</span>' + opening_bracket;
9
diff --git a/assets/js/components/surveys/SurveyQuestionSingleSelectChoice.js b/assets/js/components/surveys/SurveyQuestionSingleSelectChoice.js @@ -54,7 +54,7 @@ const SurveyQuestionSingleSelectChoice = ( { <Input onChange={ ( event ) => setWriteIn( - event.target.value?.slice( + event.target.value.slice( 0, MAXIMUM_CHARACTER_LIMIT )
2
diff --git a/components/Questionnaire/RangeQuestion.js b/components/Questionnaire/RangeQuestion.js @@ -148,8 +148,11 @@ class RangeQuestion extends Component { return ( <div {...styles.sliderWrapper}> - { value === null && // catch clicks on slider thumb to set default value - <div {...styles.mouseCatcher} onClick={() => this.handleChange(defaultValue)} /> + { (value === null) && // catch clicks on slider thumb to set default value + <div + {...styles.mouseCatcher} + onMouseEnter={() => this.handleChange(defaultValue)} + /> } <input {...(value === null ? sliderDefault : styles.slider)}
12
diff --git a/src/plugins/clear_button/plugin.scss b/src/plugins/clear_button/plugin.scss &.form-select .clear-button, &.single .clear-button{ + + @if variable-exists(select-padding-dropdown-item-x) { + right: $select-padding-dropdown-item-x; + } + @else{ right: calc(#{$select-padding-x} - #{$select-padding-item-x} + 2rem); } + } &.focus.has-items .clear-button, &:not(.disabled):hover.has-items .clear-button{
4
diff --git a/articles/logs/index.md b/articles/logs/index.md @@ -70,7 +70,7 @@ If you would like to store log data longer than the time period offered by your You can use the Management API v2 to retrieve your logs using the [/api/v2/logs](/api/v2#!/Logs/get_logs) endpoint, which suports two types of consumption: [by checkpoint](/logs#get-logs-by-checkpoint) or [by search criteria](#get-logs-by-search-criteria). -::: info +::: note We highly recommend using [the checkpoint approach](/logs#get-logs-by-checkpoint) to export logs to the external system of your choice and perform any search or analysis there, as logs stored in our system are subject to [the retention period](/logs#how-long-is-log-file-data-available). You can use any of the [Export Auth0 logs to an external service](/extensions#export-auth0-logs-to-an-external-service) extensions to export the logs to the system of your choice (like Sumo Logic, Splunk or Loggly). :::
1
diff --git a/articles/libraries/_includes/_embedded_sso.md b/articles/libraries/_includes/_embedded_sso.md ### SSO with embedded authentication -Embedded login scenarios are not able to reliably provide SSO, because of a variety of factors (such as types of clients, differing browsers, differing domains, and others). For this reason, Auth0's recommendation is that any client applications which **require** SSO should use [universal login](/hosted-pages/login) rather than embedded login. +Apps with embedded login must meet two criteria in order to have SSO. -Our recommendation is to use [universal login](/hosted-pages/login) instead. This recommendation is a requirement if you have multiple domains or use [third-party applications](/clients/client-types#third-party-client). +1. Both of the clients attempting SSO must be [first-party clients](/clients/client-types#first-party-client). SSO with third party clients will not work. +1. They need to make use of [custom domains](/custom-domains) and have both the applications which intend to have SSO as well as the Auth0 tenant on the same domain. Traditionally, Auth0 domains are in the format `foo.auth0.com`, but custom domains allow you to use the same domain for both the applications in question and your Auth0 tenant, preventing the risk of CSRF attacks. + +Our recommendation is to use [universal login](/hosted-pages/login) instead of setting up SSO in embedded login scenarios. Universal login is the most reliable and stable way to perform SSO, and is the only way to do so if you must use multiple domains for your applications, or use [third-party clients](/clients/client-types#third-party-client).
3
diff --git a/tests/test_Court.py b/tests/test_Court.py @@ -445,7 +445,6 @@ class TestCourt(unittest.TestCase): self.havvenCheckFeePeriodRollover(DUMMY) fast_forward(fee_period + 1) self.havvenCheckFeePeriodRollover(DUMMY) - self.havvenAdjustFeeEntitlement(voter, voter, self.havvenBalance(voter)) # Begin a confiscation motion against the suspect. vote_index_0 = self.get_motion_index(self.beginConfiscationMotion(owner, suspects[0])) self.assertTrue(self.voting(vote_index_0)) @@ -478,7 +477,6 @@ class TestCourt(unittest.TestCase): self.havvenCheckFeePeriodRollover(DUMMY) fast_forward(fee_period + 1) self.havvenCheckFeePeriodRollover(DUMMY) - self.havvenAdjustFeeEntitlement(voter, voter, self.havvenBalance(voter)) # Begin a confiscation motion against the suspect. vote_index_0 = self.get_motion_index(self.beginConfiscationMotion(owner, suspects[0])) self.assertTrue(self.voting(vote_index_0))
2
diff --git a/tests/service/data-util.service.spec.ts b/tests/service/data-util.service.spec.ts @@ -20,8 +20,6 @@ import { TestBed, inject } from '@angular/core/testing'; import { JhiDataUtils } from '../../src/service/data-util.service'; -describe('Data Utils service test', () => { - describe('Data Utils Service Test', () => { beforeEach(() => { TestBed.configureTestingModule({ @@ -123,4 +121,3 @@ describe('Data Utils service test', () => { }); }); -});
2
diff --git a/package.json b/package.json "main": "index.js", "private": true, "scripts": { - "build": "npm run remove-dist && npm run build:production && npm run build:static", + "build": "npm run build:production && npm run build:static", "build:production": "webpack -p --mode=production", "build:test": "webpack -p --mode=production --include-tests", - "build:dev": "npm run remove-dist && npm run build:static && webpack --mode=development --debug --devtool cheap-source-map --output-pathinfo", + "build:dev": "webpack --mode=development --debug --devtool cheap-source-map --output-pathinfo && npm run build:static", "build:static": "gulp svg imagemin", "dev": "npm run build:dev && npm run build:static", "dev-zip": "npm run build:dev && gulp release", - "watch": "npm run remove-dist && npm run build:static && webpack --watch --mode=development --debug --devtool cheap-module-eval-source-map --output-pathinfo", + "watch": "webpack --watch --mode=development --debug --devtool cheap-module-eval-source-map --output-pathinfo && npm run build:static", "release-zip": "npm run build && gulp release", - "remove-dist": "rm -rf dist/*", "test": "webpack --mode=production --display=none && bundlesize", "test:visualtest": "npm run build:static && start-server-and-test storybook http-get://localhost:9001 backstopjs", "test:visualapprove": "backstop approve --config=tests/backstop/config.js",
2
diff --git a/sources/us/fl/polk.json b/sources/us/fl/polk.json "protocol": "ESRI", "conform": { "format": "geojson", - "number": "HouseNumber", + "number": "Add_Number", "unit": "Unit", - "street": "PrimaryName", - "city": "T_MailingCityNm", - "postcode": "Zip" + "street": [ + "St_Name", + "St_PosTyp", + "St_PosDir" + ], + "postcode": "Post_Code" } }
4
diff --git a/workshops/Connect/README.md b/workshops/Connect/README.md @@ -19,7 +19,7 @@ Choose **Connect** from the **Tools** menu. It will walk you through: - Creating an Amazon Connect instance - Downloading and importing a contact flow -- Importing a corresponding sample question and answer bank. +- Importing a corresponding sample question and answer bank # Enhancing QnABot within Amazon Connect
2
diff --git a/src/builders/query/launch-query.js b/src/builders/query/launch-query.js @@ -100,7 +100,15 @@ module.exports = q => { query['rocket.fairings.reused'] = (q.fairings_reuse === 'true'); } if (q.capsule_reuse) { - query['reuse.capsule'] = (q.capsule_reuse === 'true'); + query['rocket.second_stage.payloads.reused'] = (q.capsule_reuse === 'true'); + query.$or = [ + { + 'rocket.second_stage.payloads.payload_type': 'Dragon 1.1', + }, + { + 'rocket.second_stage.payloads.payload_type': 'Crew Dragon', + }, + ]; } if (q.ship) { query.ships = q.ship;
3
diff --git a/react-ui/components/PageRouter.js b/react-ui/components/PageRouter.js @@ -15,7 +15,7 @@ export const PageRouter = () => { return html` <${React.Fragment}> <${NavBar} /> - <${Router} basepath='${window.locationSubdirectory}/' > + <${Router} > <${MyProfile} path="${window.locationSubdirectory}/"/> <${MyProfile} path="${window.locationSubdirectory}/profile/:view"/> <${Settings} path="${window.locationSubdirectory}/settings" />
2