code
stringlengths
122
4.99k
label
int64
0
14
diff --git a/tests/e2e/specs/modules/adsense/setup-new-user.test.js b/tests/e2e/specs/modules/adsense/setup-new-user.test.js @@ -36,7 +36,6 @@ const datapointHandlers = { accounts: defaultHandler, alerts: defaultHandler, clients: defaultHandler, - accountStatus: defaultHandler, }; const ADSENSE_ACCOUNT = { @@ -61,8 +60,6 @@ describe( 'setting up the AdSense module', () => { datapointHandlers.alerts( request ); } else if ( request.url().match( 'modules/adsense/data/clients' ) ) { datapointHandlers.clients( request ); - } else if ( request.url().match( 'modules/adsense/data/account-status' ) ) { - datapointHandlers.accountStatus( request ); } else if ( request.url().startsWith( 'https://accounts.google.com/o/oauth2/auth' ) ) { request.respond( { status: 302,
2
diff --git a/src/App/index.js b/src/App/index.js @@ -24,8 +24,7 @@ import { sortArrayByKey } from '../helpers/utils'; class App extends Component { state = { nuxFrequency: true, // determines if we should show the NuxJoinCard - selectModalOpen: this.props.user.uid && - (!this.props.user.username || !this.props.user.email), + selectModalOpen: true, }; componentDidMount = () => {
1
diff --git a/userscript.user.js b/userscript.user.js @@ -64907,15 +64907,20 @@ var $$IMU_EXPORT$$; // https://hayabusa.io/abema/programs/386-48_s0_p25/thumb001.webp // https://hayabusa.io/abema/programs/386-48_s0_p25/thumb001.q100.webp -- is the same as: // https://hayabusa.io/abema/programs/386-48_s0_p25/thumb001.webp?q=100 + // https://hayabusa.io/abema/programs/218-271_s0_p5/thumb001.v1604481062?width=640&height=360&quality=85&format=webp&version=1604481062&fit=fill&background=000000 + // https://hayabusa.io/abema/programs/218-271_s0_p5/thumb001.v1604481062?q=100&quality=100 + // http://hayabusa.io/test/doge.auto return src .replace(/(\/[^/.]*)(?:\.[-a-z]+[0-9]*)*(\.[^/.]*)(?:[?#].*)?$/, "$1$2") + //.replace(/(\.(?:jpe?g|png|webp|gif)|\/thumb[0-9]+\.v[0-9]+)(?:[?#].*)?$/, "$1?q=100&quality=100"); + .replace(/(:\/\/[^/]+\/+[^/]+\/+.*?)(?:[?#].*)?$/, "$1?q=100&quality=100"); //.replace(/(\/adcross\/.*\/[-0-9a-f]{25,})(\.[^/.]*?)(?:[?#].*)?$/, "$1$2") - .replace(/\?[whq]=[0-9]+(?:&(.*))?$/, "?$1") - .replace(/&[whq]=[0-9]+(&.*)?$/, "$1") - .replace(/\?(?:width|height|quality)=[0-9]+(?:&(.*))?$/, "?$1") - .replace(/&(?:width|height|quality)=[0-9]+(&.*)?$/, "$1") - .replace(/\?$/, "") - .replace(/(\.(?:jpe?g|png|webp|gif))(?:\?.*)?/, "$1?q=100&quality=100"); + //.replace(/\?[whq]=[0-9]+(?:&(.*))?$/, "?$1") + //.replace(/&[whq]=[0-9]+(&.*)?$/, "$1") + //.replace(/\?(?:width|height|quality)=[0-9]+(?:&(.*))?$/, "?$1") + //.replace(/&(?:width|height|quality)=[0-9]+(&.*)?$/, "$1") + //.replace(/\?$/, "") + //.replace(/(\.(?:jpe?g|png|webp|gif))(?:\?.*)?/, "$1?q=100&quality=100"); } if (domain === "d13krdvwknzmgv.cloudfront.net" ||
7
diff --git a/userscript.user.js b/userscript.user.js @@ -23914,14 +23914,38 @@ var $$IMU_EXPORT$$; return src.replace(/!.*/, ""); } - if (domain === "img.wallpapersafari.com") { + + if (domain === "img.wallpapersafari.com" || + // https://cdn.wallpapersafari.com/2/15/jLsJPf.jpg + // https://wallpapersafari.com/w/jLsJPf -- original page + domain === "cdn.wallpapersafari.com") { // https://img.wallpapersafari.com/desktop/1536/864/85/66/Na4mby.jpg // https://img.wallpapersafari.com/85/66/Na4mby.jpg // https://img.wallpapersafari.com/img720/12/74/SW1XU0.jpg // https://img.wallpapersafari.com/12/74/SW1XU0.jpg - return src + newsrc = src .replace(/\/img[0-9]+\//, "/") - .replace(/\/desktop\/[0-9]+\/[0-9]+\//, "/"); + .replace(/\/desktop\/+[0-9]+\/+[0-9]+\//, "/"); + if (newsrc !== src) + return newsrc; + + match = src.match(/^[a-z]+:\/\/[^/]+\/+[0-9]+\/+[0-9]+\/+([^/.]+)\.[^/.]+$/); + if (match) { + return { + url: src, + extra: { + page: "https://www.wallpapersafari.com/w/" + match[1] + } + }; + } + } + + if (domain === "mcdn.wallpapersafari.com") { + // https://mcdn.wallpapersafari.com/medium/35/4/UEQyne.jpg + // https://cdn.wallpapersafari.com/35/4/UEQyne.jpg + // https://mcdn.wallpapersafari.com/small/41/65/C0aESe.jpg + // https://cdn.wallpapersafari.com/41/65/C0aESe.jpg + return src.replace(/:\/\/mcdn(\.[^/]*\/)(?:medium|small)\/+/, "://cdn$1"); } if (domain_nosub === "fjcdn.com" && @@ -33210,14 +33234,6 @@ var $$IMU_EXPORT$$; return src.replace(/(:\/\/[^/]*)\/[a-z]+\/+(.\/+.\/+[0-9]+\.)/, "$1/$2"); } - if (domain === "mcdn.wallpapersafari.com") { - // https://mcdn.wallpapersafari.com/medium/35/4/UEQyne.jpg - // https://cdn.wallpapersafari.com/35/4/UEQyne.jpg - // https://mcdn.wallpapersafari.com/small/41/65/C0aESe.jpg - // https://cdn.wallpapersafari.com/41/65/C0aESe.jpg - return src.replace(/:\/\/mcdn(\.[^/]*\/)(?:medium|small)\/+/, "://cdn$1"); - } - if (domain === "m.salon24.pl") { // https://m.salon24.pl/553abc32dac438994478a43018fca202,750,0,0,0.jpg // https://m.salon24.pl/553abc32dac438994478a43018fca202.jpg
7
diff --git a/_layouts/calendar.ics b/_layouts/calendar.ics @@ -6,7 +6,7 @@ X-PUBLISHED-TTL:PT1H {%- for conf in site.data.conferences -%} {% if conf.deadline != "TBA" %} BEGIN:VEVENT -SUMMARY:{{ conf.name }} {{ conf.year }} deadline +SUMMARY:{{ conf.title }} {{ conf.year }} deadline UID:{{ conf.id }} DTSTART;TZID={{ conf.timezone }}:{{ conf.deadline | date: "%Y%m%dT%H%M%S" }} END:VEVENT
1
diff --git a/modules/geo-layers/src/mvt-layer/mvt-layer.js b/modules/geo-layers/src/mvt-layer/mvt-layer.js @@ -13,7 +13,6 @@ const WORLD_SIZE = 512; const defaultProps = { uniqueIdProperty: {type: 'string', value: ''}, highlightedFeatureId: null, - onViewportChange: {type: 'function', optional: true, value: null, compare: false}, loaders: MVTLoader }; @@ -46,10 +45,6 @@ export default class MVTLayer extends TileLayer { if (this.state.data) { super.updateState({props, oldProps, context, changeFlags}); this._setWGS84PropertyForTiles(); - const {tileset} = this.state; - if (changeFlags.viewportChanged && tileset.isLoaded) { - this._onViewportChange(); - } } } @@ -218,17 +213,6 @@ export default class MVTLayer extends TileLayer { return renderedFeatures; } - _onViewportChange() { - const {onViewportChange} = this.props; - if (onViewportChange) { - const {viewport} = this.context; - onViewportChange({ - getRenderedFeatures: this.getRenderedFeatures.bind(this), - viewport - }); - } - } - _setWGS84PropertyForTiles() { const propName = 'dataInWGS84'; const {tileset} = this.state;
2
diff --git a/html/components/autocomplete.stories.js b/html/components/autocomplete.stories.js import { useEffect } from '@storybook/client-api'; import { autocomplete } from './autocomplete'; +import { hugeInput } from '../base/inputs/hugeInput'; import { markdownDocumentationLinkBuilder } from '../../storybook-utilities/markdownDocumentationLinkBuilder'; export default { @@ -158,6 +159,7 @@ defaultStory.story = { export const hugeStory = () => { useEffect(() => { autocomplete(); + hugeInput(); }, []); return ` @@ -234,6 +236,6 @@ export const hugeStory = () => { hugeStory.story = { name: 'Huge', parameters: { - jest: ['autocomplete'], + jest: ['autocomplete', 'hugeInput'], }, };
3
diff --git a/formats/code.js b/formats/code.js @@ -5,15 +5,7 @@ import Inline from '../blots/inline'; import TextBlot from '../blots/text'; -class Code extends Inline { - insertBefore(blot, ref) { - if (blot instanceof TextBlot || blot.statics.blotName === Inline.blotName) { - super.insertBefore(blot, ref); - } else if (blot instanceof Inline) { - blot.moveChildren(this, ref); - } // ignore embeds - } -} +class Code extends Inline {} Code.blotName = 'code'; Code.tagName = 'CODE';
13
diff --git a/Specs/Core/QuaternionSplineSpec.js b/Specs/Core/QuaternionSplineSpec.js @@ -79,9 +79,8 @@ defineSuite([ var time = (times[2] + times[1]) * 0.5; var t = (time - times[1]) / (times[2] - times[1]); - var quads = qs.innerQuadrangles; var actual = qs.evaluate(time); - var expected = Quaternion.squad(points[1], points[2], quads[1], quads[2], t, new Quaternion()); + var expected = Quaternion.slerp(points[1], points[2], t, new Quaternion()); expect(actual).toEqualEpsilon(expected, CesiumMath.EPSILON6); });
3
diff --git a/pages/Advanced Types.md b/pages/Advanced Types.md @@ -483,7 +483,8 @@ declare function aliased(arg: Alias): Alias; declare function interfaced(arg: Interface): Interface; ``` -A second more important difference is that type aliases cannot be extended or implemented from (nor can they extend/implement other types). +Type aliases couldn't be extended or implemented from (nor could they extend/implement other types), in older versions of TypeScript. As of version 2.7, type aliases can be extended. Teams developing React applications sometimes choose to use `Type` aliases over `Interface`. + Because [an ideal property of software is being open to extension](https://en.wikipedia.org/wiki/Open/closed_principle), you should always use an interface over a type alias if possible. On the other hand, if you can't express some shape with an interface and you need to use a union or tuple type, type aliases are usually the way to go.
3
diff --git a/src/components/TextInput/v1/TextInput.md b/src/components/TextInput/v1/TextInput.md @@ -176,10 +176,10 @@ The default valid, invalid and clear icons can be overwritten by passing values ```jsx <div style={{ display: "flex" }}> <div style={{ border: "1px solid #cccccc", flex: "1 1 auto", padding: "1rem" }}> - <TextInput name="example" placeholder="Hint" value="Valid" hasBeenValidated iconClear={<i className="fa fa-legal" />} iconSuccess={<i className="fa fa-thumbs-up" />} /> + <TextInput name="example" placeholder="Hint" value="Valid" hasBeenValidated iconClear={<i className="fas fa-gavel" />} iconSuccess={<i className="fa fa-thumbs-up" />} /> </div> <div style={{ backgroundColor: "#f5f5f5", flex: "1 1 auto", margin: "0 1rem", padding: "1rem" }}> - <TextInput name="example" placeholder="Hint" value="Invalid" errors={["error"]} iconClear={<i className="fa fa-legal" />} iconError={<i className="fa fa-thumbs-down" />} dark /> + <TextInput name="example" placeholder="Hint" value="Invalid" errors={["error"]} iconClear={<i className="fas fa-gavel" />} iconError={<i className="fa fa-thumbs-down" />} dark /> </div> </div> ```
1
diff --git a/_posts/en/newsletters/2020-10-28-newsletter.md b/_posts/en/newsletters/2020-10-28-newsletter.md @@ -167,7 +167,10 @@ answers posted since our last update.* database format (bdb or [sqlite][news120 sqlite]), and whether or not the wallet is a [descriptor][topic descriptors] wallet. -- [C-Lightning #4046][] libplugin: support for sending notifications. FIXME:moneyball +- [C-Lightning #4046][] adds the ability for commands to send notifications + indicating command progress. It is an opt-in feature in order to be + backwards compatible. An example use case is [the original issue][orig_issue] + that prompted the change. - [C-Lightning #4139][] updates the `multifundchannel` RPC with a new `commitment_feerate` parameter that sets the initial feerate for @@ -221,3 +224,4 @@ answers posted since our last update.* [achow wallet blog post]: https://achow101.com/2020/10/0.21-wallets [wallet proposed timeline]: https://github.com/bitcoin/bitcoin/issues/20160 [news120 sqlite]: /en/newsletters/2020/10/21/#bitcoin-core-19077 +[orig_issue]: https://github.com/ElementsProject/lightning/issues/3925
0
diff --git a/src/pages/cart.js b/src/pages/cart.js @@ -56,7 +56,7 @@ const items = [{ @withStyles(styles) class CartPage extends Component { static propTypes = { - classes: PropTypes.string + classes: PropTypes.object } handleCheckOut = () => { @@ -84,7 +84,6 @@ class CartPage extends Component { /> </Grid> <Grid item xs={12} md={3}> - <Typography component="div" variant="body1"> <CartSummary displayShipping="$10.99" displaySubtotal="$275.77" @@ -94,7 +93,6 @@ class CartPage extends Component { <div className={classes.checkoutButtonsContainer}> <CheckoutButtons /> </div> - </Typography> </Grid> <Grid className={classes.customerSupportCopy} item> <Typography paragraph variant="caption">
2
diff --git a/ui/app/components/ens-input.js b/ui/app/components/ens-input.js @@ -109,6 +109,7 @@ EnsInput.prototype.lookupEnsName = function () { log.error(reason) return this.setState({ loadingEns: false, + ensResolution: '0x0000000000000000000000000000000000000000', ensFailure: true, hoverText: reason.message, })
12
diff --git a/devices.js b/devices.js @@ -3117,10 +3117,7 @@ const devices = [ vendor: 'OSRAM', description: 'SMART+ Motion Sensor', supports: 'occupancy, tamper and temperature', - fromZigbee: [ - fz.temperature, - fz.ias_occupancy_alarm_2, - ], + fromZigbee: [fz.temperature, fz.ias_occupancy_alarm_2, fz.ignore_basic_report], toZigbee: [], ota: ota.ledvance, meta: {configureKey: 1},
8
diff --git a/package.json b/package.json "name": "find-and-replace", "main": "./lib/find", "description": "Find and replace within buffers and across the project.", - "version": "0.207.1", + "version": "0.207.2", "license": "MIT", "activationCommands": { "atom-workspace": [
6
diff --git a/articles/users/search.md b/articles/users/search.md @@ -342,7 +342,7 @@ The export request (for all three fields) will be as follows. "queryString": [], "postData": { "mimeType": "application/json", - "text": "{\"connection_id\": \"YOUR_CONNECTION_ID\", \"format\": \"csv\", \"limit\": 5, \"fields\": [{\"name\": \"email\"}, \"name\": \"user_metadata.consent.given\", \"name\": \"user_metadata.consent.date\", \"name\": \"user_metadata.consent.text_details\"]}" + "text": "{\"connection_id\": \"YOUR_CONNECTION_ID\", \"format\": \"csv\", \"limit\": 5, \"fields\": [{\"name\": \"email\"}, {\"name\": \"user_metadata.consent.given\"}, {\"name\": \"user_metadata.consent.date\"}, {\"name\": \"user_metadata.consent.text_details\"}]}" }, "headersSize": -1, "bodySize": -1, @@ -371,7 +371,7 @@ For the same example we used before, the request will be as follows. "queryString": [], "postData": { "mimeType": "application/json", - "text": "{\"connection_id\": \"YOUR_CONNECTION_ID\", \"format\": \"json\", \"limit\": 5, \"fields\": [{\"name\": \"email\"}, \"name\": \"user_metadata.consent\"]}" + "text": "{\"connection_id\": \"YOUR_CONNECTION_ID\", \"format\": \"json\", \"limit\": 5, \"fields\": [{\"name\": \"email\"}, {\"name\": \"user_metadata.consent\"}]}" }, "headersSize": -1, "bodySize": -1,
1
diff --git a/test/jasmine/tests/splom_test.js b/test/jasmine/tests/splom_test.js @@ -1218,6 +1218,22 @@ describe('Test splom update switchboard:', function() { expect(scene.matrixOptions.sizes).toBeCloseToArray([2, 5, 10], 1, msg); expect(gd._fullLayout.xaxis.range) .toBeCloseToArray([0.853, 3.235], 1, 'xrng ' + msg); + + return Plotly.restyle(gd, 'marker.symbol', 'square'); + }) + .then(function() { + var msg = 'after scalar marker.symbol restyle'; + + assertSpies(msg, [ + ['supplyDefaults', 1], + ['doCalcdata', 0], + ['doTicks', 0], + ['clear', 1], + ['update', 1], + ['draw', 1] + ]); + + expect(scene.matrixOptions.marker).not.toBeNull(msg); }) .catch(failTest) .then(done);
0
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml +stages: + - lint + - test + +lint: + stage: lint + script: + - npm ci --ignore-scripts + - npm run --silent lint + only: + - merge_requests + test: stage: test script: npm ci --ignore-scripts && npm run test
0
diff --git a/test/hemera/plugin.spec.js b/test/hemera/plugin.spec.js @@ -476,26 +476,21 @@ describe('Plugin interface', function() { const nats = require('nats').connect(authUrl) const hemera = new Hemera(nats) + const pluginOpts = { test: 5, a: 33 } let plugin = function(hemera, options, next) { - expect(options).to.be.equals({ - a: 33, - test: 5 - }) + expect(options).to.be.equals(pluginOpts) next() } plugin[Symbol.for('name')] = 'myPlugin' plugin[Symbol.for('options')] = { a: 1 } - hemera.use(plugin, { test: 5, a: 33 }) + hemera.use(plugin, pluginOpts) hemera.ready(err => { expect(err).to.not.exists() - expect(hemera.plugins.myPlugin.plugin$.options).to.be.equals({ - a: 33, - test: 5 - }) + expect(hemera.plugins.myPlugin.plugin$.options).to.be.equals(pluginOpts) hemera.close(done) }) })
7
diff --git a/packages/testing-karma-bs/bs-settings.js b/packages/testing-karma-bs/bs-settings.js @@ -49,6 +49,7 @@ module.exports = () => ({ bs_win10_firefox_latest: { base: 'BrowserStack', browser: 'Firefox', + browser_version: '64.0', os: 'Windows', os_version: '10', },
1
diff --git a/lib/datapacktypes/vlocityuilayout.js b/lib/datapacktypes/vlocityuilayout.js @@ -88,12 +88,15 @@ VlocityUILayout.prototype.onDeployFinish = async function(jobInfo) { let currentStatus = await message.evaluate(node => node.innerText); VlocityUtils.log('Activating Classic Card LWC', layoutSourceKey, currentStatus); if (currentStatus === 'DONE') { - VlocityUtils.success('Activated LWC for Card', layoutSourceKey); + VlocityUtils.success('Activated','LWC Activated for Card: ' + layoutSourceKey); break; - } else if (/^ERROR/.test(currentStatus)) { - var missingLWCTrimedError = currentStatus.substring('ERROR:'.length, currentStatus.length); + } else if (/^No MODULE named markup/.test(currentStatus)) { + var missingLWCTrimedError = currentStatus.substring('ERROR:'.length, currentStatus.indexOf('found :')); errorMessage = ' Missing Custom LWC - ' + missingLWCTrimedError; break; + } else if (/^ERROR/.test(currentStatus)) { + errorMessage = ' Error Activating LWC - ' + currentStatus; + break; } } } catch (e) {
9
diff --git a/scripts/build-package.ps1 b/scripts/build-package.ps1 @@ -24,6 +24,11 @@ function build_nodejs_client { # .\nvm-setup.exe /VERYSILENT /SUPRESSMSGBOXES /SP # nvm root .\nvm +cd $Env:USERPROFILE; +Invoke-WebRequest https://raw.githubusercontent.com/jchip/nvm/v1.5.4/install.ps1 -OutFile install.ps1; +.\install.ps1 -nvmhome $Env:USERPROFILE\nvm; +del install.ps1 + build_nodejs_client v10.20.0 build_nodejs_client v12.22.10 build_nodejs_client v14.19.0
4
diff --git a/articles/guides/login/migration-embedded-centralized.md b/articles/guides/login/migration-embedded-centralized.md @@ -21,4 +21,5 @@ You can also find how to implement centralized login in multiple technology stac :::next-steps - [Migrating SPA Applications using Lock 10+ to Centralized Login](/guides/login/migrating-lock-v10-spa) - [Migrating Web Applications using Lock 10+ to Centralized Login](/guides/login/migrating-lock-v10-webapp) +- [Migrating Web Applications using Lock 9 to Centralized Login](/guides/login/migrating-lock-v9-webapp) :::
0
diff --git a/collection-spec/collection-spec.md b/collection-spec/collection-spec.md @@ -4,8 +4,6 @@ The STAC Collection Specification defines a set of common fields to describe a g STAC Collections Specification extends the [STAC Catalog Spec](../catalog-spec/README.md) with additional fields to describe the whole dataset and the included set of items. It shares the same fields and therefore every Collection is also a valid Catalog. Collections can have both parent Catalogs and Collections and child Items, Catalogs and Collections. -A group of STAC Item objects from a single source can share a lot of common metadata. This is especially true with satellite imagery that uses the STAC EO or SAR extension. Rather than including these common metadata fields on every Item, they can be provided in the `properties` of the STAC Collection that the STAC Items belong to. - A STAC Collection can be represented in JSON format. Any JSON object that contains all the required fields is a valid STAC Collection and also a valid STAC Catalog. STAC Collections are meant to be compatible with *OGC API - Features* Collections, but please be aware that OAFeat Collections and STAC Collections originate from different specifications and despite the fact that we try to align them as much as possible be there may be subtle differences in the specifications.
2
diff --git a/README.md b/README.md @@ -145,6 +145,15 @@ By default you can send your requests to `http://localhost:3000/`. Please note t - [schedule](#schedule) (Cloudwatch) - [websocket](#websocket) (API Gateway WebSocket) +### http (API Gateway) +- https://serverless.com/framework/docs/providers/aws/events/apigateway/ + +### schedule (Cloudwatch) +- https://serverless.com/framework/docs/providers/aws/events/schedule/ + +### websocket (API Gateway WebSocket) +- https://serverless.com/framework/docs/providers/aws/events/websocket/ + ## Usage with `invoke` To use `Lambda.invoke` you need to set the lambda endpoint to the serverless-offline endpoint:
0
diff --git a/assets/js/actions/apollo.js b/assets/js/actions/apollo.js @@ -50,6 +50,12 @@ export const setupApolloClient = (getAuthToken, currentOrganizationId) => { case "ChannelShowQuery": store.dispatch(replace("/integrations")) break + case "LabelShowQuery": + store.dispatch(replace("/labels")) + break + case "FunctionShowQuery": + store.dispatch(replace("/functions")) + break default: break }
9
diff --git a/docs/advanced-config/README.md b/docs/advanced-config/README.md # Advanced Configuration -## Best Practice: Use a docker network +## Best Practice: Use a Docker network -For those who have a few of their upstream services running in docker on the same docker -host as NPM, here's a trick to secure things a bit better. By creating a custom docker network, -you don't need to publish ports for your upstream services to all of the docker host's interfaces. +For those who have a few of their upstream services running in Docker on the same Docker +host as NPM, here's a trick to secure things a bit better. By creating a custom Docker network, +you don't need to publish ports for your upstream services to all of the Docker host's interfaces. Create a network, ie "scoobydoo": @@ -13,7 +13,7 @@ docker network create scoobydoo ``` Then add the following to the `docker-compose.yml` file for both NPM and any other -services running on this docker host: +services running on this Docker host: ```yml networks: @@ -44,13 +44,13 @@ networks: Now in the NPM UI you can create a proxy host with `portainer` as the hostname, and port `9000` as the port. Even though this port isn't listed in the docker-compose -file, it's "exposed" by the portainer docker image for you and not available on -the docker host outside of this docker network. The service name is used as the +file, it's "exposed" by the Portainer Docker image for you and not available on +the Docker host outside of this Docker network. The service name is used as the hostname, so make sure your service names are unique when using the same network. ## Docker Healthcheck -The `Dockerfile` that builds this project does not include a `HEALTCHECK` but you can opt in to this +The `Dockerfile` that builds this project does not include a `HEALTHCHECK` but you can opt in to this feature by adding the following to the service in your `docker-compose.yml` file: ```yml @@ -128,7 +128,7 @@ services: ## Disabling IPv6 -On some docker hosts IPv6 may not be enabled. In these cases, the following message may be seen in the log: +On some Docker hosts IPv6 may not be enabled. In these cases, the following message may be seen in the log: > Address family not supported by protocol
1
diff --git a/test/jasmine/bundle_tests/plotschema_test.js b/test/jasmine/bundle_tests/plotschema_test.js @@ -78,6 +78,7 @@ describe('plot schema', function() { function(attr) { if(isValObject(attr)) { expect(deprecatedRoles.indexOf(attr.role) === -1).toBe(true, attr); + expect(attr.role).toBeUndefined(attr); } } ); @@ -232,10 +233,10 @@ describe('plot schema', function() { Object.keys(attr[DEPRECATED]).forEach(function(dAttrName) { var dAttr = attr[DEPRECATED][dAttrName]; - expect(VALTYPES.indexOf(dAttr.valType) !== -1) - .toBe(true, attrString + ': ' + dAttrName); - expect(deprecatedRoles.indexOf(dAttr.role) === -1) - .toBe(true, attrString + ': ' + dAttrName); + var msg = attrString + ': ' + dAttrName; + expect(VALTYPES.indexOf(dAttr.valType) !== -1).toBe(true, msg); + expect(deprecatedRoles.indexOf(dAttr.role) === -1).toBe(true, msg); + expect(dAttr.role).toBeUndefined(msg); }); } }
0
diff --git a/client/components/cards/cardDate.js b/client/components/cards/cardDate.js @@ -187,7 +187,6 @@ class CardStartDate extends CardDate { // if dueAt or endAt exist & are > startAt, startAt doesn't need to be flagged if ((endAt && theDate.isAfter(endAt)) || (dueAt && theDate.isAfter(dueAt))) classes += 'long-overdue'; - else if (theDate.isBefore(now, 'minute')) classes += 'almost-due'; else classes += 'current'; return classes; }
1
diff --git a/services/ingest-file/ingestors/settings.py b/services/ingest-file/ingestors/settings.py @@ -6,7 +6,7 @@ TESTING = False # Document conversion service CONVERT_URL = env.get('UNOSERVICE_URL', 'http://convert-document:3000/convert') CONVERT_URL = env.get('INGESTORS_CONVERT_DOCUMENT_URL', CONVERT_URL) -CONVERT_TIMEOUT = env.to_int('CONVERT_TIMEOUT', 7200) # 2 hrs +CONVERT_TIMEOUT = env.to_int('INGESTORS_CONVERT_TIMEOUT', 7200) # 2 hrs # Enable (expensive!) Google Cloud API OCR_VISION_API = env.to_bool('INGESTORS_OCR_VISION_API', False)
10
diff --git a/package.json b/package.json "@babel/cli": "7.0.0-beta.52", "@babel/core": "7.0.0-beta.52", "@babel/node": "7.0.0-beta.52", - "@babel/plugin-proposal-object-rest-spread": "^7.0.0-beta.52", + "@babel/plugin-proposal-object-rest-spread": "7.0.0-beta.52", "@babel/polyfill": "7.0.0-beta.52", "@babel/preset-env": "7.0.0-beta.52", "@babel/preset-react": "7.0.0-beta.52", "react": "^16.4.1", "react-dom": "^16.4.1", "react-redux": "^5.0.7", - "react-router": "^2.3.0", + "react-router": "^3.2.1", "redux-devtools": "^3.0.0-beta-3", "redux-devtools-dock-monitor": "^1.0.0-beta-3", "redux-devtools-log-monitor": "^1.0.0-beta-3", "typings-tester": "^0.2.2", "webpack": "^4.15.1", "webpack-cli": "^3.0.8", - "webpack-dev-middleware": "^1.12.0", + "webpack-dev-middleware": "^3.1.3", "webpack-dev-server": "^3.1.4", - "webpack-hot-middleware": "^2.19.1" + "webpack-hot-middleware": "^2.22.2" } }
2
diff --git a/magda-web-client/src/Components/Dataset/Add/DatasetAddCommon.ts b/magda-web-client/src/Components/Dataset/Add/DatasetAddCommon.ts @@ -557,7 +557,7 @@ export function createBlankState(user: User): State { }, licenseLevel: "dataset", isPublishing: false, - shouldUploadToStorageApi: true, // TODO: Make configurable + shouldUploadToStorageApi: false, error: null, _createdDate: new Date(), _lastModifiedDate: new Date()
12
diff --git a/content/articles/how-to-add-pure-css-wave-animations-to-your-website/index.md b/content/articles/how-to-add-pure-css-wave-animations-to-your-website/index.md -### Introduction +--- +layout: engineering-education +status: publish +published: true +url: /how-to-add-pure-css-wave-animations-to-your-website/ +title: How To Add Pure CSS Waves To Your Website +description: In this article, we will use pure CSS and HTML to add animations to a website. +author: linchez-maina +date: 2021-12-04T00:00:00-15:20 +topics: [Languages] +excerpt_separator: <!--more--> +images: + + - url: /engineering-education/how-to-add-pure-css-wave-animations-to-your-website/hero.jpg + alt: animations img +--- Adding animations to your website makes it seem livelier and more attractive to your users, increases its presence, and improves conversions. +<!--more--> The downfall of adding animations using JavaScript is that they reduce a website's performance, especially when the developer fails to select an optimized library. However, there is a turnaround to such a problem, and that is using pure CSS and HTML. ### Goal @@ -11,7 +27,7 @@ In this article, we will use pure CSS and HTML to add animations to a website si To follow along with this tutorial, you should have: - A basic knowledge of HTML and CSS. -- Your favourite code editor. +- Your favorite code editor. ### Learning points @@ -31,7 +47,7 @@ CSS animations lets an element gradually change from one CSS configuration style A few of the advantages of using CSS animations, particularly over script-driven animation techniques like JavaScript, include: - Simplicity; you do not have to learn complex programming concepts. -- You let the browser control the animation sequence when you use CSS animations. This optimizes performance and efficiency. The browser achieves this by reducing update times of animations running in tabs that are not visible. +- You let the browser control the animation sequence when using CSS animations. This optimizes performance and efficiency. The browser achieves this by reducing update times of animations running in tabs that are not visible. - Good loading score. CSS animations load well, even under moderate system load. Using JavaScript can often make simple animations load poorly. ### How to Use the CSS Animation Property @@ -44,7 +60,7 @@ You can learn how to configure the animation property using its sub-properties f ### Defining The Animation Order Using The `@Keyframes Rule.` -After you have set your animation's sub-properties, ensuring to give the `animation-duration` priority, you need to define the animation's sequence or appearance. This is done by configuring more than one keyframe using the `@keyframes rule.` +After you have set your animation's sub-properties, ensuring the `animation-duration` priority, you need to define the animation's sequence or appearance. This is done by configuring more than one keyframe using the `@keyframes rule.` You can learn how to use the `@keyfreame rule` from [here](https://www.w3schools.com/cssref/css3_pr_animation-keyframes.asp) @@ -130,7 +146,7 @@ The final set of CSS rules defined for both `<div>` tags is as below: ``` We set it to be just below the first child element. Go on to set the animation property. -- We name the two animations, wave-one, and crests. We set the animation wave-one with the animation-delay property. Additionally, set it to a negative value to allow it to start first. +- We name the two animations, wave-one and crests. We set the animation wave-one with the animation-delay property. Additionally, please set it to a negative value to allow it to start first. ```css animation: wave-one 8s cubic-bezier (0.37, 0.44, 0.64, 0.54) -.124s @@ -250,4 +266,9 @@ Our final website will have a wave animation that moves from right to left. Using HTML and CSS only, we have created a wave animation that is simple to implement and will improve the website's performance. No one ever wants a slow website. Always keep that in mind while creating your website. I hope this tutorial will help you develop an efficient and responsive website. -Thank you for reading this tutorial, Happy Coding! \ No newline at end of file +Thank you for reading this tutorial. + +Happy Coding! + +--- +Peer Review Contributions by: [Miller Juma](/engineering-education/content/authors/miller-juma/)
12
diff --git a/lib/Backend/LowerMDShared.cpp b/lib/Backend/LowerMDShared.cpp @@ -1661,7 +1661,7 @@ LowererMD::Legalize(IR::Instr *const instr, bool fPostRegAlloc) { if (verify) { - AssertMsg(false, "Missing legalization"); + AssertMsg(false, "Invalid Js::OpCode::TEST opnd order. Missing legalization"); return; } instr->SwapOpnds(); @@ -1838,7 +1838,7 @@ void LowererMD::LegalizeDst(IR::Instr *const instr, const LegalForms forms) { if (verify) { - AssertMsg(false, "Missing legalization"); + AssertMsg(false, "Memory reference not legal in dst opnd. Missing legalization"); return; } dst = instr->HoistMemRefAddress(memRefOpnd, Js::OpCode::MOV); @@ -1861,7 +1861,7 @@ void LowererMD::LegalizeDst(IR::Instr *const instr, const LegalForms forms) if (verify) { - AssertMsg(false, "Missing legalization"); + AssertMsg(false, "Dst opnd not legal. Missing legalization"); return; } @@ -1952,7 +1952,7 @@ void LowererMD::LegalizeSrc(IR::Instr *const instr, IR::Opnd *src, const LegalFo } if (verify) { - AssertMsg(false, "Missing legalization"); + AssertMsg(false, "IntConstOpnd doesn't fit in 32 bits. Missing legalization"); return; } // The actual value for inlinee entry instr isn't determined until encoder @@ -1989,10 +1989,11 @@ void LowererMD::LegalizeSrc(IR::Instr *const instr, IR::Opnd *src, const LegalFo } if (verify) { - AssertMsg(false, "Missing legalization"); + AssertMsg(false, "Int64ConstOpnd doesn't fit in 32 bits. Missing legalization"); return; } + Assert(forms & L_Reg); IR::Opnd* regOpnd = IR::RegOpnd::New(src->GetType(), instr->m_func); IR::Instr* moveToReg = IR::Instr::New(Js::OpCode::MOV, regOpnd, src, instr->m_func); instr->InsertBefore(moveToReg); @@ -2017,7 +2018,7 @@ void LowererMD::LegalizeSrc(IR::Instr *const instr, IR::Opnd *src, const LegalFo } if (verify) { - AssertMsg(false, "Missing legalization"); + AssertMsg(false, "AddrOpnd doesn't fit in 32 bits. Missing legalization"); return; } @@ -2041,7 +2042,7 @@ void LowererMD::LegalizeSrc(IR::Instr *const instr, IR::Opnd *src, const LegalFo { if (verify) { - AssertMsg(false, "Missing legalization"); + AssertMsg(false, "Memory reference not legal in src opnd. Missing legalization"); return; } src = instr->HoistMemRefAddress(memRefOpnd, Js::OpCode::MOV); @@ -2070,7 +2071,7 @@ void LowererMD::LegalizeSrc(IR::Instr *const instr, IR::Opnd *src, const LegalFo if (verify) { - AssertMsg(false, "Missing legalization"); + AssertMsg(false, "Src opnd not legal. Missing legalization"); return; }
4
diff --git a/package.json b/package.json "react-dom": "17.0.2", "smile2emoji": "^1.1.6", "three": "^0.133.1", + "troika-three-text": "^0.43.1-alpha.0", "wsrtc": "./packages/wsrtc", "xhr2": "^0.2.1", "yjs": "^13.5.16"
0
diff --git a/thali/install/setUpTests.sh b/thali/install/setUpTests.sh @@ -19,9 +19,9 @@ trap 'log_error $LINENO' ERR cd `dirname $0` cd ../.. REPO_ROOT_DIR=$(pwd) -PROJECT_NAME=${TEST_PROJECT_NAME:-ThaliTest} +PROJECT_NAME=${THALI_TEST_PROJECT_NAME:-ThaliTest} PROJECT_ROOT_DIR=${REPO_ROOT_DIR}/../${PROJECT_NAME} -PROJECT_ID=${TEST_PROJECT_ID:-com.thaliproject.thalitest} +PROJECT_ID=${THALI_TEST_PROJECT_ID:-com.thaliproject.thalitest} # Prepares test project prepare_project()
10
diff --git a/.travis.yml b/.travis.yml @@ -47,14 +47,14 @@ jobs: - env: NAME=NODE_10 node_js: 10 - - - env: NAME=NODE_11 - node_js: 11 script: - yarn test:cover after_success: - .travis/codecoverage.sh + - env: NAME=NODE_11 + node_js: 11 + - env: EMBER_CLI_ENABLE_ALL_EXPERIMENTS=true - env: EMBER_CLI_PACKAGER=true - env: EMBER_CLI_MODULE_UNIFICATION=true
5
diff --git a/lib/carto/gcloud_user_settings.rb b/lib/carto/gcloud_user_settings.rb @@ -13,6 +13,7 @@ module Carto @username = user.username @api_key = user.api_key + if attributes.present? h = attributes.symbolize_keys @service_account = h[:service_account] @bq_public_project = h[:bq_public_project] @@ -21,6 +22,7 @@ module Carto @bq_dataset = h[:bq_dataset] @gcs_bucket = h[:gcs_bucket] end + end def store $users_metadata.hmset(key, *values.to_a)
1
diff --git a/src/core/lib/Base64.mjs b/src/core/lib/Base64.mjs @@ -126,14 +126,14 @@ export function fromBase64(data, alphabet="A-Za-z0-9+/=", returnType="string", r * Base64 alphabets. */ export const ALPHABET_OPTIONS = [ - {name: "Standard: A-Za-z0-9+/=", value: "A-Za-z0-9+/="}, - {name: "URL safe: A-Za-z0-9-_", value: "A-Za-z0-9-_"}, + {name: "Standard (RFC 4648): A-Za-z0-9+/=", value: "A-Za-z0-9+/="}, + {name: "URL safe (RFC 4648 \u00A75): A-Za-z0-9-_", value: "A-Za-z0-9-_"}, {name: "Filename safe: A-Za-z0-9+-=", value: "A-Za-z0-9+\\-="}, {name: "itoa64: ./0-9A-Za-z=", value: "./0-9A-Za-z="}, {name: "XML: A-Za-z0-9_.", value: "A-Za-z0-9_."}, {name: "y64: A-Za-z0-9._-", value: "A-Za-z0-9._-"}, {name: "z64: 0-9a-zA-Z+/=", value: "0-9a-zA-Z+/="}, - {name: "Radix-64: 0-9A-Za-z+/=", value: "0-9A-Za-z+/="}, + {name: "Radix-64 (RFC 4880): 0-9A-Za-z+/=", value: "0-9A-Za-z+/="}, {name: "Uuencoding: [space]-_", value: " -_"}, {name: "Xxencoding: +-0-9A-Za-z", value: "+\\-0-9A-Za-z"}, {name: "BinHex: !-,-0-689@A-NP-VX-Z[`a-fh-mp-r", value: "!-,-0-689@A-NP-VX-Z[`a-fh-mp-r"},
0
diff --git a/articles/support/pre-deployment/tests/recommended.md b/articles/support/pre-deployment/tests/recommended.md @@ -8,12 +8,12 @@ The following tests check to see if you've completed all recommendations (which | Test | Description | | ---- | ----------- | -| Customer Error Page Configured | Configure a Custom Error Page with your application-specific details and corporate branding | -| Customize Guardian Multifactor Page | If you're using Guardian Multifactor Authentication, configure a Custom Hosted Page for Guardian Multifactor with your application details and corporate branding | -| Customize Hosted Login Page | Configure a Custom Hosted Page for Login with your application details and corporate branding | -| Customize Password Reset Page | Configure a Custom Hosted Page for Password Reset with your application details and corporate branding | -| Email Templates Configured | Configure custom email templates with your application specific details and corporate branding | -| Enable MFA for Tenant Administrators | Enable multifactor authentication for tenant administrators | -| Guardian Multifactor or other Multifactor Authentication Providers | Consider multifactor authentication as part of the authentication strategy | -| Redirect Logout URL | Review of the Allowed Redirect Logout URLs for your Clients | +| [Customer Error Page](/hosted-pages/custom-error-pages) Configured | [Configure a Custom Error Page](${manage_url}/#/account) with your application-specific details and corporate branding | +| Customize [Guardian Multifactor Page](/hosted-pages/guardian) | If you're using Guardian Multifactor Authentication, [configure a Custom Hosted Page for Guardian Multifactor](${manage_url}/#/guardian_mfa_page) with your application details and corporate branding | +| Customize [Hosted Login Page](/hosted-pages/login) | [Configure a Custom Hosted Page for Login](${manage_url}/#/login_page) with your application details and corporate branding | +| Customize [Password Reset Page](/hosted-pages/password-reset) | [Configure a Custom Hosted Page for Password Reset](${manage_url}/#/password_reset) with your application details and corporate branding | +| [Email Templates](/email/custom) Configured | [Configure custom email templates](${manage_url}/#/emails) with your application specific details and corporate branding | +| Enable [MFA for Tenant Administrators](/tutorials/manage-dashboard-admins) | [Enable multifactor authentication](${manage_url}/#/account/admins) for tenant administrators | +| [Guardian Multifactor](/multifactor-authentication) or other Multifactor Authentication Providers | Consider [multifactor authentication](${manage_url}/#/guardian) as part of the authentication strategy | +| [Redirect Logout URL](/logout#set-the-allowed-logout-urls-at-the-account-level) | Review the [Allowed Redirect Logout URLs](${manage_url}/#/account/advanced) for your Clients | | Use RS256 Instead of HS256 | Set the JSONWebToken Signature Algorithm to RS256 instead of HS256 | \ No newline at end of file
0
diff --git a/packages/next/pages/_document.tsx b/packages/next/pages/_document.tsx @@ -152,7 +152,7 @@ export class Head extends Component< return files.map((file: string) => { // Only render .css files here - if (!/\.css$/.exec(file)) { + if (!/\.css$/.test(file)) { return null } @@ -516,7 +516,7 @@ export class NextScript extends Component<OriginProps> { : { noModule: true } } - if (files.includes(bundle.file)) return null + if (!/\.js$/.test(bundle.file) || files.includes(bundle.file)) return null return ( <script @@ -542,7 +542,7 @@ export class NextScript extends Component<OriginProps> { return files.map((file: string) => { // Only render .js files here - if (!/\.js$/.exec(file)) { + if (!/\.js$/.test(file)) { return null }
11
diff --git a/src/components/Map/Map.js b/src/components/Map/Map.js @@ -50,9 +50,27 @@ const regionCoordinates = { }; function glAvailable () { - var canvas = document.createElement("canvas"); - var gl = canvas.getContext("webgl") || canvas.getContext("experimental-webgl"); - return (gl && gl instanceof WebGLRenderingContext); + if (!window.WebGLRenderingContext) { + // WebGL is not supported + return false; + } + // WebGL is supported + var canvas = document.createElement("canvas"), + names = ["webgl2", "webgl", "experimental-webgl", "moz-webgl", "webkit-3d"], + context = false; + + for (var i = 0; i < names.length; i++) { + try { + context = canvas.getContext(names[i]); + if (context && typeof context.getParameter == "function") { + // WebGL is enabled + return true; + } + } + catch (e) {} + } + // WebGL is disabled + return false; } const Map: ComponentType<Props> = ({
7
diff --git a/src/views/explore/view.js b/src/views/explore/view.js import React from 'react'; import styled from 'styled-components'; +import { Link } from 'react-router-dom'; +import { Transition, zIndex, Shadow, hexa } from '../../components/globals'; import ViewSegment from '../../components/viewSegment'; import { Button } from '../../components/buttons'; import Search from './components/search'; @@ -38,14 +40,36 @@ export const CommunitySearch = (props: Props) => { } `; + const PrimaryCTA = styled(Button)` + padding: 12px 16px; + font-weight: 700; + font-size: 14px; + border-radius: 12px; + background-color: ${props => props.theme.bg.default}; + background-image: none; + color: ${props => props.theme.brand.alt}; + transition: ${Transition.hover.off}; + z-index: ${zIndex.card}; + + &:hover { + background-color: ${props => props.theme.bg.default}; + color: ${props => props.theme.brand.default}; + box-shadow: ${Shadow.high} ${props => hexa(props.theme.bg.reverse, 0.5)}; + transition: ${Transition.hover.on}; + } + `; + const SecondaryContent = styled(ThisContent)`margin-top: 0;`; - const ThisTagline = styled(Tagline)`margin-bottom: 16px;`; + const ThisTagline = styled(Tagline)`margin-bottom: 0;`; - const SecondaryTagline = styled(ThisTagline)`font-size: 24px;`; + const SecondaryTagline = styled(ThisTagline)` + font-size: 20px; + font-weight: 900; + `; const ThisCopy = styled(Copy)` - font-size: 18px; + font-size: 16px; margin-bottom: 32px; font-weight: 500; text-align: center; @@ -56,7 +80,7 @@ export const CommunitySearch = (props: Props) => { } `; - const SecondaryCopy = styled(ThisCopy)``; + const SecondaryCopy = styled(ThisCopy)`margin-bottom: 16px;`; return ( <ViewSegment goop={3} background="constellations"> @@ -68,11 +92,13 @@ export const CommunitySearch = (props: Props) => { {props.children} {props.currentUser ? ( <SecondaryContent> - <SecondaryTagline>Or create your own community</SecondaryTagline> + <SecondaryTagline>...or create your own community</SecondaryTagline> <SecondaryCopy> Building communities on Spectrum is easy and free forever </SecondaryCopy> - <Button>Button</Button> + <Link to={`/new/community`}> + <PrimaryCTA>Get Started</PrimaryCTA> + </Link> </SecondaryContent> ) : ( <UpsellSignIn redirectPath={props.redirectPath} />
1
diff --git a/src/components/Drawer.js b/src/components/Drawer.js @@ -257,12 +257,11 @@ class Drawer extends React.Component { aria-describedby={this.props['aria-describedby']} aria-labelledby={this.props['aria-labelledby'] || 'mx-drawer-title'} ref={(ref) => (this._component = ref)} - role='dialog' - style={Object.assign({}, styles.component, this.props.style)} role={this.props.role} + style={{ ...styles.component, ...this.props.style }} tabIndex={0} > - <header style={Object.assign({}, styles.header, this.props.headerStyle)}> + <header style={{ ...styles.header, ...this.props.headerStyle }}> <span style={styles.backArrow}> {this.props.showCloseButton && <Button @@ -281,7 +280,7 @@ class Drawer extends React.Component { {menu} </div> </header> - <div style={Object.assign({}, styles.content, this.props.contentStyle)}> + <div style={{ ...styles.content, ...this.props.contentStyle }}> {typeof this.props.children === 'function' ? this.props.children(this._getExposedDrawerFunctions()) : this.props.children} </div> </div>
14
diff --git a/test/functional/specs/C14409.js b/test/functional/specs/C14409.js @@ -20,7 +20,7 @@ test.meta({ TEST_RUN: "Regression" }); -const setConsentToNone = ClientFunction(() => { +const setConsentToOut = ClientFunction(() => { return window.alloy("setConsent", { general: "out" }); }); @@ -43,7 +43,7 @@ test("C14409 - Consenting to no purposes should be persisted.", async () => { }); // apply user consent - await setConsentToNone(); + await setConsentToOut(); await event1.promise;
10
diff --git a/shared/js/background/atb.es6.js b/shared/js/background/atb.es6.js const settings = require('./settings.es6') const parseUserAgentString = require('../shared-utils/parse-user-agent-string.es6') +const load = require('./load.es6') var ATB = (() => { // regex to match ddg urls to add atb params to. @@ -15,33 +16,13 @@ var ATB = (() => { if (!atbSetting || !setAtbSetting) { resolve(null) } - ATB.getSetAtb(atbSetting, setAtbSetting).then((newAtb) => { - if (newAtb !== setAtbSetting) { - settings.updateSetting('set_atb', newAtb) - } - resolve(newAtb) - }) - }) - }, - - getSetAtb: (atbSetting, setAtb) => { - return new Promise((resolve) => { - var xhr = new XMLHttpRequest() - - xhr.onreadystatechange = function () { - if (xhr.readyState === XMLHttpRequest.DONE) { - if (xhr.status === 200) { - let curATB = JSON.parse(xhr.responseText) - resolve(curATB.version) - } - } - } - let randomValue = Math.ceil(Math.random() * 1e7) - let AtbRequestURL = ddgAtbURL + randomValue + '&atb=' + atbSetting + '&set_atb=' + setAtb + let url = ddgAtbURL + randomValue + '&atb=' + atbSetting + '&set_atb=' + setAtbSetting - xhr.open('GET', AtbRequestURL, true) - xhr.send() + load.JSONfromExternalFile(url, (res) => { + settings.updateSetting('set_atb', res.version) + resolve() + }) }) }, @@ -73,33 +54,14 @@ var ATB = (() => { }, setInitialVersions: () => { - if (!settings.getSetting('atb')) { - let versions = ATB.calculateInitialVersions() - if (versions && versions.major && versions.minor) { - settings.updateSetting('atb', `v${versions.major}-${versions.minor}`) - } - } - }, + if (settings.getSetting('atb')) return + + let randomValue = Math.ceil(Math.random() * 1e7) + let url = ddgAtbURL + randomValue - calculateInitialVersions: () => { - let oneWeek = 604800000 - let oneDay = 86400000 - let oneHour = 3600000 - let oneMinute = 60000 - let estEpoch = 1456290000000 - let localDate = new Date() - let localTime = localDate.getTime() - let utcTime = localTime + (localDate.getTimezoneOffset() * oneMinute) - let est = new Date(utcTime + (oneHour * -5)) - let dstStartDay = 13 - ((est.getFullYear() - 2016) % 6) - let dstStopDay = 6 - ((est.getFullYear() - 2016) % 6) - let isDST = (est.getMonth() > 2 || (est.getMonth() === 2 && est.getDate() >= dstStartDay)) && (est.getMonth() < 10 || (est.getMonth() === 10 && est.getDate() < dstStopDay)) - let epoch = isDST ? estEpoch - oneHour : estEpoch - let timeSinceEpoch = new Date().getTime() - epoch - let majorVersion = Math.ceil(timeSinceEpoch / oneWeek) - let minorVersion = Math.ceil(timeSinceEpoch % oneWeek / oneDay) - - return {'major': majorVersion, 'minor': minorVersion} + load.JSONfromExternalFile(url, (res) => { + settings.updateSetting('atb', res.version) + }) }, setAtbValuesFromSuccessPage: (atb) => {
4
diff --git a/demos/sum/mpc.js b/demos/sum/mpc.js */ exports.connect = function (hostname, computation_id, options) { var opt = Object.assign({}, options); + opt.crypto_provider = true; if (node) { // eslint-disable-next-line no-undef
12
diff --git a/tokens/tokens-eth.json b/tokens/tokens-eth.json "blog": "http://emini.cfrn.net", "chat": "https://christiantraders.com", "facebook": "facebook.com/cryptodailyinfo/", - "forum": "https://discordapp.com/channels/432450856319975424/432451525093359618", + "forum": + "https://discordapp.com/channels/432450856319975424/432451525093359618", "github": "github.com/CTGlobal/ChristianTraders", "gitter": "", "instagram": "", "name": "Merculet", "ens_address": "", "website": "https://www.merculet.io", - "logo": { "src": "https://merculet.io/static/image/newimg/logo.png", "width": "356", "height": "366", "ipfs_hash": "" }, + "logo": { + "src": "https://merculet.io/static/image/newimg/logo.png", + "width": "356", + "height": "366", + "ipfs_hash": "" + }, "support": { "email": "[email protected]", "url": "" }, "social": { "blog": "https://medium.com/merculet", "ens_address": "", "website": "https://sgt.selfieyo.com", "logo": { - "src": "https://sgt.selfieyo.com/wp-content/uploads/2018/01/token-new.png", + "src": + "https://sgt.selfieyo.com/wp-content/uploads/2018/01/token-new.png", "width": "400", "height": "400", "ipfs_hash": "" "symbol": "SGT", "address": "0xd248B0D48E44aaF9c49aea0312be7E13a6dc1468", "decimals": 1, - "name": "SGT", + "name": "StatusGenesis", "ens_address": "", "website": "", "logo": {
10
diff --git a/index.js b/index.js @@ -31,8 +31,8 @@ const util = require('./src/util'); * @param {object} [options] * @param {boolean} [options.hideWarnings=false] Set to true to hide warnings from the console. * @param {boolean} [options.fullResult=false] Set to true to get back a full result object with the value, warnings, and errors. - * @param {object} [options.internalOptions] - * @returns {Promise<OpenApiEnforcer>} + * @param {object} [options.componentOptions] Options that get sent along to components. + * @returns {Promise<OpenApi|Swagger>|Promise<Result<OpenApi|Swagger>>} */ async function Enforcer(definition, options) { let openapi; @@ -42,7 +42,7 @@ async function Enforcer(definition, options) { options = Object.assign({}, options); if (!options.hasOwnProperty('hideWarnings')) options.hideWarnings = false; if (!options.hasOwnProperty('fullResult')) options.fullResult = false; - if (!options.hasOwnProperty('internalOptions')) options.internalOptions = {}; + if (!options.hasOwnProperty('componentOptions')) options.componentOptions = {}; const refParser = new RefParser(); definition = util.copy(definition); @@ -63,7 +63,7 @@ async function Enforcer(definition, options) { const validator = major === 2 ? Enforcer.v2_0.Swagger : Enforcer.v3_0.OpenApi; - [ openapi, exception, warnings ] = validator(definition, refParser, options.internalOptions); + [ openapi, exception, warnings ] = validator(definition, refParser, options.componentOptions); } }
10
diff --git a/src/content/en/tools/chrome-devtools/sources.md b/src/content/en/tools/chrome-devtools/sources.md @@ -3,7 +3,7 @@ book_path: /web/tools/_book.yaml description: View and edit files, create Snippets, debug JavaScript, and set up Workspaces in the Sources panel of Chrome DevTools. {# wf_blink_components: Platform>DevTools #} -{# wf_updated_on: 2018-12-19 #} +{# wf_updated_on: 2019-01-30 #} {# wf_published_on: 2018-01-09 #} {% include "web/tools/chrome-devtools/_shared/styles.html" %} @@ -44,10 +44,10 @@ How the **Page** pane is organized: * The third-level, fourth-level, and so on, represent directories and resources that were loaded from that origin. For example, in <b>Figure 1</b> the full path to the resource `devsite-googler-button` is - `developers.google.com/_static/f6e16de9fa/css/devsite-googler-button` + `developers.google.com/_static/19aa27122b/css/devsite-googler-button` [frame]: https://www.w3.org/TR/html401/present/frames.html -[origin]: https://www.w3.org/TR/2011/WD-html5-20110525/origin-0.html +[origin]: https://html.spec.whatwg.org/multipage/origin.html#origin Click a file in the **Page** pane to view its contents in the **Editor** pane. You can view any type of file. For images, you see a preview of the image. @@ -87,7 +87,7 @@ change, then the text `A` would have been logged to the **Console**. <img src="images/edit-js.gif" alt="Editing JavaScript in the Editor pane"/> <figcaption> - <b>Figure 5</b>. Editing JavaScript in the <b>Editor</b> pane + <b>Figure 4</b>. Editing JavaScript in the <b>Editor</b> pane </figcaption> </figure> @@ -114,7 +114,7 @@ any time you need it. DevTools saves the **Snippet** to your file system. <img src="images/snippet.png" alt="A Snippet that inserts the jQuery library into a page."/> <figcaption> - <b>Figure 6</b>. A <b>Snippet</b> that inserts the jQuery library into a page + <b>Figure 5</b>. A <b>Snippet</b> that inserts the jQuery library into a page </figcaption> </figure> @@ -146,7 +146,7 @@ basics of debugging in DevTools. <img src="images/debugging.png" alt="Debugging JavaScript"/> <figcaption> - <b>Figure 7</b>. Debugging JavaScript + <b>Figure 6</b>. Debugging JavaScript </figcaption> </figure>
1
diff --git a/src/locales/en/docs.yml b/src/locales/en/docs.yml @@ -122,7 +122,7 @@ basic-grid: ### Left Navigation Bar - The navigation used on the left of the content section is dynamic, meaning that the subsections of the page currently in use are always shown. There are three parts to the navigation: a link back to the previous level, the navigation header with the title of the current page, and the actual navigation with links to the sub-pages. Its use is described on the Elements Page <a href="/en/hierarchical-navigation.html#01-hierarchical-navigation-04-page-navigation-list">Page Navigation List (Left Sidebar Navigation)</a>. + The navigation used on the left of the content section is dynamic, meaning that the subsections of the page currently in use are always shown. There are three parts to the navigation: a link back to the previous level, the navigation header with the title of the current page, and the actual navigation with links to the sub-pages. Its use is described on the Elements Page <a href="../hierarchical-navigation.html#01-hierarchical-navigation-04-page-navigation-list">Page Navigation List (Left Sidebar Navigation)</a>. ### Content Section
1
diff --git a/CHANGELOG b/CHANGELOG +v0.5.10 + +- Viewconf downloads work on Firefox +- Alert when trying to project a viewport on the same view +- Resize handle positions fixed in Firefox +- Track config button icons fixed in Firefox + v0.5.9 - Labels outside of the bounds of a track - Label colors -- Viewconf downloads work on Firefox v0.5.8
3
diff --git a/docs/documentation/sitespeed.io/continuous-integration/index.md b/docs/documentation/sitespeed.io/continuous-integration/index.md @@ -37,6 +37,9 @@ docker run --privileged -v ${WORKSPACE}:/sitespeed.io sitespeedio/sitespeed.io - ![HTML reports]({{site.baseurl}}/img/html-reports.png) {: .img-thumbnail} + The HTML result pages runs Javascript so you need to change the [Jenkins Content Security Policy](https://wiki.jenkins-ci.org/display/JENKINS/Configuring+Content+Security+Policy) for them to work with the plugin. + + When you start Jenkins make sure to set the environment variable <code>-Dhudson.model.DirectoryBrowserSupport.CSP="sandbox allow-scripts; style-src 'unsafe-inline' *;script-src 'unsafe-inline' *;"</code>. * If you want to break your build, you should generate a JUnit XML and use the built in post task *Publish JUnit test result report*. Make sure to make the budget file available inside the Docker container. In this example we have it inside the Jenkins workspace.
12
diff --git a/assets/js/components/setup/site-verification.js b/assets/js/components/setup/site-verification.js @@ -75,7 +75,7 @@ class SiteVerification extends Component { sendAnalyticsTrackingEvent( 'verification_setup', 'verification_check_true' ); const response = await this.insertSiteVerification( identifier ); - if ( true === response.updated ) { + if ( true === response.verified ) { this.props.siteVerificationSetup( true ); return true; }
3
diff --git a/scss/typography/_pre.scss b/scss/typography/_pre.scss @@ -23,6 +23,7 @@ $siimple-pre-padding: 15px; border-radius: $siimple-default-border-radius; padding: $siimple-pre-padding; margin-bottom: $siimple-default-margin-bottom; + margin-top: 0px; //Pre dark mode &--dark { background-color: siimple-default-color("dark") !important;
12
diff --git a/package.json b/package.json "xmlhttprequest": "1.8.0" }, "dependencies": { - "@tendermint/ui": "0.2.7", + "@tendermint/ui": "0.2.8", "@vue/test-utils": "1.0.0-beta.11", "autosize": "4.0.2", "axios": "0.18.0",
3
diff --git a/src/module/config.js b/src/module/config.js @@ -221,10 +221,12 @@ SFRPG.descriptors = { "mind-affecting": "SFRPG.Descriptors.MindAffecting", "pain": "SFRPG.Descriptors.Pain", "poison": "SFRPG.Descriptors.Poison", + "polymorph": "SFRPG.Descriptors.Polymorph", "radiation": "SFRPG.Descriptors.Radiation", "scrying": "SFRPG.Descriptors.Scrying", "sense-dependent": "SFRPG.Descriptors.SenseDependent", "shadow": "SFRPG.Descriptors.Shadow", + "sonic": "SFRPG.Descriptors.Sonic", "summoning": "SFRPG.Descriptors.Summoning", "teleportation": "SFRPG.Descriptors.Teleportation", "water": "SFRPG.Descriptors.Water",
0
diff --git a/best-practices.md b/best-practices.md @@ -107,7 +107,7 @@ not spatial. This use case is not currently supported by STAC, as we are focused in nature. The [OGC API - Records](https://github.com/opengeospatial/ogcapi-records) is an emerging standard that likely will be able to handle a wider range of data to catalog than STAC. It builds on [OGC API - Features](https://github.com/opengeospatial/ogcapi-features) just like [STAC API](https://github.com/radiantearth/stac-api-spec/) -does. +does. The [collection assets extension](extensions/collection-assets) may also provide an option for some use cases. ## Representing Vector Layers in STAC
0
diff --git a/app/components/Features/Parsl/stakeTable.js b/app/components/Features/Parsl/stakeTable.js @@ -13,12 +13,11 @@ const Parsl = props => { const { stakes, loading, intl, ...clientProps } = props; const { networkAccount, networkIdentity, writerEnabled, pushTransaction } = clientProps; - const refundDelay = 3 * 24 * 3600 * 1000; // 3 days for LIVE, 15 minutes for TEST + const refundDelay = 7 * 24 * 3600; // 7 days for LIVE, 15 minutes for TEST let parslLiquid = 0; let parslStaked = 0; let parslRefund = 0; - let claimTime = 0; let refundTime = 0; const hasStaked = stakes.find(s => s.owner !== 'Refunding'); @@ -32,11 +31,10 @@ const Parsl = props => { } if (hasStaked) { parslStaked = Number(hasStaked.weight.split(' ')[0]); - claimTime = hasStaked.last_claim_time / 1000 + claimDelay; } if (hasRefund) { parslRefund = Number(hasRefund.weight.split(' ')[0]); - refundTime = hasRefund.last_claim_time / 1000 + refundDelay; + refundTime = hasRefund.updated_on + refundDelay; } }
4
diff --git a/src/commands/apps/set-current.ts b/src/commands/apps/set-current.ts @@ -3,7 +3,7 @@ import { AppCenterClient, models, clientCall } from "../../util/apis"; import { out } from "../../util/interaction"; import { toDefaultApp, getUser } from "../../util/profile"; -@help("Set default application for all CLI commands") +@help("Set default application for all CLI commands. Not compatible when authenticating with '--token' or an environment variable. Use environment variable 'MOBILE_CENTER_CURRENT_APP' to set the default app instead.") export default class SetCurrentAppCommand extends Command { constructor(args: CommandArgs) { super(args); @@ -30,6 +30,12 @@ export default class SetCurrentAppCommand extends Command { } const profile = getUser(); + + if (!profile) { + return failure(ErrorCodes.InvalidParameter, + `Could not find a logged in profile, please note that this command is not compatible with the '--token' parameter or the token environment variable.`); + } + profile.defaultApp = newDefault; profile.save(); return success();
7
diff --git a/CHANGELOG.md b/CHANGELOG.md ## 7.11.3 (unreleased) -### Breaking - -### Feature - -- Add a `subrequest` option to the `createContent` action @tiberiuichim @silviubogan - ### Bugfix - On image upload in a block, don't overwrite the global `state.content.data` with new image data @tiberiuichim @silviubogan ### Internal +- Add a `subrequest` option to the `createContent` action @tiberiuichim @silviubogan + ## 7.11.2 (2020-08-28) ### Bugfix
6
diff --git a/assets/js/modules/analytics/components/setup/SetupForm.js b/assets/js/modules/analytics/components/setup/SetupForm.js @@ -33,7 +33,6 @@ import { __ } from '@wordpress/i18n'; import Data from 'googlesitekit-data'; import { Button } from 'googlesitekit-components'; import { - SETUP_FLOW_MODE_LEGACY, SETUP_FLOW_MODE_UA, SETUP_FLOW_MODE_GA4, SETUP_FLOW_MODE_GA4_TRANSITIONAL, @@ -44,7 +43,6 @@ import { import { CORE_USER } from '../../../../googlesitekit/datastore/user/constants'; import { CORE_FORMS } from '../../../../googlesitekit/datastore/forms/constants'; import { isPermissionScopeError } from '../../../../util/errors'; -import SetupFormLegacy from './SetupFormLegacy'; import SetupFormUA from './SetupFormUA'; import SetupFormGA4 from './SetupFormGA4'; import SetupFormGA4Transitional from './SetupFormGA4Transitional'; @@ -94,7 +92,6 @@ export default function SetupForm( { finishSetup } ) { className="googlesitekit-analytics-setup__form" onSubmit={ submitForm } > - { setupFlowMode === SETUP_FLOW_MODE_LEGACY && <SetupFormLegacy /> } { setupFlowMode === SETUP_FLOW_MODE_UA && <SetupFormUA /> } { setupFlowMode === SETUP_FLOW_MODE_GA4 && <SetupFormGA4 /> } { setupFlowMode === SETUP_FLOW_MODE_GA4_TRANSITIONAL && (
2
diff --git a/src/components/textfield/TextField.js b/src/components/textfield/TextField.js @@ -4,6 +4,10 @@ export class TextFieldComponent extends BaseComponent { let info = super.elementInfo(); info.type = 'input'; + if (this.component.hasOwnProperty('spellCheck')) { + info.attr.spellcheck = this.component.spellCheck; + } + if (this.component.mask) { info.attr.type = 'password'; }
9
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -91,7 +91,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - [\#1724](https://github.com/cosmos/voyager/issues/1724) set tabindex attribute to -1 for readonly denom on ModalProposals. tab navgiation now skips element @enyan94 - [\#1277](https://github.com/cosmos/voyager/issues/1277) change name of VmToolBar to ToolBar, update all snapshots and import statements @coreycosman - [\#1432](https://github.com/cosmos/voyager/issues/1432) Moved @tendermint/UI components back into the Voyager repository @faboweb -- Improved the readme @faboweb +- [\#1694](https://github.com/cosmos/voyager/issues/1694) Improved the `README` @faboweb @fedekunze - [\#1792](https://github.com/cosmos/voyager/pull/1792) removed mocked demo mode @fedekunze ### Fixed
7
diff --git a/test/jasmine/tests/modebar_test.js b/test/jasmine/tests/modebar_test.js @@ -136,6 +136,167 @@ describe('ModeBar', function() { ]]); expect(checkBtnAttr(modeBar, 0, 'data-title')).toEqual('0'); }); + + describe('creates a custom button', function() { + function getIconSvg(modeBar) { + if(!modeBar || !modeBar.buttonElements || !modeBar.buttonElements.length > 0) { + return undefined; + } + var button = modeBar.buttonElements[0]; + return d3.select(button).select('svg'); + } + + it('with a Plotly icon', function() { + var modeBar = createModeBar(getMockGraphInfo(), [[ + { + name: 'some button', + click: noop, + icon: Plotly.Icons.home + } + ]]); + + var svg = getIconSvg(modeBar); + expect(svg).toBeDefined(); + var path = svg.select('path'); + expect(path.attr('d')).toBeDefined(); + expect(path.attr('transform')).toBeDefined(); + }); + + it('with a custom icon', function() { + var modeBar = createModeBar(getMockGraphInfo(), [[ + { + name: 'some button', + click: noop, + icon: { + width: 1000, + height: 1000, + path: 'M0,-150 L1000,-150 L500,850 L0,-150 Z', + transform: 'matrix(1 0 0 -1 0 850)', + } + } + ]]); + + var svg = getIconSvg(modeBar); + expect(svg).toBeDefined(); + expect(svg.attr('viewBox')).toBe('0 0 1000 1000'); + var path = svg.select('path'); + expect(path.attr('d')).toBeDefined(); + expect(path.attr('transform')).toEqual('matrix(1 0 0 -1 0 850)'); + }); + + it('with a custom icon with no transform', function() { + var modeBar = createModeBar(getMockGraphInfo(), [[ + { + name: 'some button', + click: noop, + icon: { + width: 1000, + height: 1000, + path: 'M500,0 L1000,1000 L0,1000 L500,0 Z', + } + } + ]]); + + var svg = getIconSvg(modeBar); + expect(svg).toBeDefined(); + expect(svg.attr('viewBox')).toBe('0 0 1000 1000'); + var path = svg.select('path'); + expect(path.attr('d')).toBeDefined(); + expect(path.attr('transform')).toBeNull(); + }); + + it('with a custom icon created by a function', function() { + var modeBar = createModeBar(getMockGraphInfo(), [[ + { + name: 'some button', + click: noop, + icon: function() { + var xmlns = 'http://www.w3.org/2000/svg'; + var icon = document.createElementNS(xmlns, 'svg'); + icon.setAttribute('viewBox', '0 0 1000 1000'); + icon.setAttribute('height', '1em'); + icon.setAttribute('width', '1em'); + icon.setAttribute('class', 'custom-svg'); + var path = document.createElementNS(xmlns, 'path'); + path.setAttribute('d', 'M500,0 L1000,1000 L0,1000 L500,0 Z'); + icon.appendChild(path); + return icon; + } + } + ]]); + + var svg = getIconSvg(modeBar); + expect(svg).toBeDefined(); + expect(svg.attr('viewBox')).toBe('0 0 1000 1000'); + expect(svg.attr('class')).toBe('custom-svg'); + var path = svg.select('path'); + expect(path.attr('d')).toBeDefined(); + expect(path.attr('transform')).toBeNull(); + }); + + it('with a legacy icon config', function() { + var modeBar = createModeBar(getMockGraphInfo(), [[ + { + name: 'some button', + click: noop, + icon: { + width: 1000, + path: 'M0,-150 L1000,-150 L500,850 L0,-150 Z', + ascent: 850, + descent: -150 + } + } + ]]); + + var svg = getIconSvg(modeBar); + expect(svg).toBeDefined(); + expect(svg.attr('viewBox')).toBe('0 0 1000 1000'); + var path = svg.select('path'); + expect(path.attr('d')).toBeDefined(); + expect(path.attr('transform')).toEqual('matrix(1 0 0 -1 0 850)'); + }); + + it('with the spikeline icon', function() { + var modeBar = createModeBar(getMockGraphInfo(), [[ + { + name: 'some button', + click: noop, + icon: Plotly.Icons.spikeline + } + ]]); + + var svg = getIconSvg(modeBar); + expect(svg).toBeDefined(); + expect(svg.attr('viewBox')).toBe('0 0 1000 1000'); + var path = svg.select('path'); + expect(path.attr('d')).toBeDefined(); + expect(path.attr('transform')).toEqual('matrix(1.5 0 0 -1.5 0 850)'); + }); + + it('with the legacy spikelines button config', function() { + var modeBar = createModeBar(getMockGraphInfo(), [[ + { + name: 'toggleSpikelines', + attr: '_cartesianSpikesEnabled', + val: 'on', + click: noop, + icon: { + width: 1000, + path: 'M512 409c0-57-46-104-103-104-57 0-104 47-104 104 0 57 47 103 104 103 57 0 103-46 103-103z m-327-39l92 0 0 92-92 0z m-185 0l92 0 0 92-92 0z m370-186l92 0 0 93-92 0z m0-184l92 0 0 92-92 0z', + ascent: 850, + descent: -150 + } + } + ]]); + + var svg = getIconSvg(modeBar); + expect(svg).toBeDefined(); + expect(svg.attr('viewBox')).toBe('0 0 1000 1000'); + var path = svg.select('path'); + expect(path.attr('d')).toBeDefined(); + expect(path.attr('transform')).toEqual('matrix(1.5 0 0 -1.5 0 850)'); + }); + }); }); describe('modeBar.removeAllButtons', function() {
0
diff --git a/token-metadata/0x1F6DEADcb526c4710Cf941872b86dcdfBbBD9211/metadata.json b/token-metadata/0x1F6DEADcb526c4710Cf941872b86dcdfBbBD9211/metadata.json "symbol": "RTK", "address": "0x1F6DEADcb526c4710Cf941872b86dcdfBbBD9211", "decimals": 18, - "dharmaVerificationStatus": { "dharmaVerificationStatus": "VERIFIED" } \ No newline at end of file -} \ No newline at end of file
3
diff --git a/docs/change-log.md b/docs/change-log.md # Change log +- [v2.0.0](#v113) +- [v1.1.4](#v113) - [v1.1.3](#v113) - [v1.1.2](#v112) - [v1.1.1](#v111) #### Bug fixes - API: `m.route.set()` causes all mount points to be redrawn ([#1592](https://github.com/MithrilJS/mithril.js/pull/1592)) + +--- + +### v1.1.4 + +#### Bug fixes: + - core: don't call `onremove` on the children of components that return null from the view [#1921](https://github.com/MithrilJS/mithril.js/issues/1921) [octavore](https://github.com/octavore) ([#1922](https://github.com/MithrilJS/mithril.js/pull/1922)) ---
5
diff --git a/server/game/player.js b/server/game/player.js @@ -345,14 +345,14 @@ class Player extends Spectator { } shuffleConflictDeck() { - if(this.user) { + if(!this.name === 'Dummy Player') { this.game.addMessage('{0} is shuffling their conflict deck', this); } this.conflictDeck = _(this.conflictDeck.shuffle()); } shuffleDynastyDeck() { - if(this.user) { + if(!this.name === 'Dummy Player') { this.game.addMessage('{0} is shuffling their dynasty deck', this); } this.dynastyDeck = _(this.dynastyDeck.shuffle());
2
diff --git a/includes/Core/Assets/Assets.php b/includes/Core/Assets/Assets.php @@ -336,10 +336,10 @@ final class Assets { $base_url = $this->context->url( 'dist/assets/' ); $dependencies = array(); - $external_assets = $this->get_external_assets(); - foreach ( $external_assets as $asset ) { - $dependencies[] = $asset->get_handle(); - } +// $external_assets = $this->get_external_assets(); +// foreach ( $external_assets as $asset ) { +// $dependencies[] = $asset->get_handle(); +// } $dependencies[] = 'sitekit-commons'; $dependencies[] = 'googlesitekit_admin'; @@ -506,9 +506,9 @@ final class Assets { ); $this->assets = array(); - foreach ( $external_assets as $asset ) { - $this->assets[ $asset->get_handle() ] = $asset; - } +// foreach ( $external_assets as $asset ) { +// $this->assets[ $asset->get_handle() ] = $asset; +// } foreach ( $assets as $asset ) { $this->assets[ $asset->get_handle() ] = $asset; }
8
diff --git a/runtime.js b/runtime.js @@ -1008,6 +1008,7 @@ const _loadPortal = async file => { ]; const center = new THREE.Vector3((extents[1][0] + extents[0][0]) / 2, (extents[1][1] + extents[0][1]) / 2, (extents[1][2] + extents[0][2]) / 2); const size = new THREE.Vector3(extents[1][0] - extents[0][0], extents[1][1] - extents[0][1], extents[1][2] - extents[0][2]); + const color = typeof json.color === 'number' ? json.color : null; const geometries = []; @@ -1070,6 +1071,9 @@ const _loadPortal = async file => { const geometry = BufferGeometryUtils.mergeBufferGeometries(geometries); const material = portalMaterial.clone(); + if (color) { + material.uniforms.uColor.value.setHex(color); + } const portalMesh = new THREE.Mesh(geometry, material); portalMesh.boundingBox = new THREE.Box3( new THREE.Vector3(extents[0][0], extents[0][1], extents[0][2]),
0
diff --git a/packages/api-explorer-ui/package.json b/packages/api-explorer-ui/package.json "pretest": "npm run lint && npm run inspect && npm run prettier", "test": "jest --coverage", "watch": "webpack -w", - "build": "webpack.config.js --config webpack.prod.js" + "build": "webpack --config webpack.prod.js" }, "jest": { "setupFiles": [
1
diff --git a/README.md b/README.md @@ -57,9 +57,24 @@ Instructions for setting up an Android emulator can be found [here](https://deve ### Debugging -iOS: Press Cmd+R to reload \n Cmd+D or shake for dev +The recommended tool for debugging is [React Native Debugger](https://github.com/jhen0409/react-native-debugger) which has built in support for Redux Devtools. -Android: Double tap R on your keyboard to reload,+, shake or press menu button for dev menu. +To install React Native Debugger: + +```bash +brew update && brew cask install react-native-debugger +``` + +Then to debug: + +1. Close any other debugger windows you have open +1. Open the App from your Applications folder +1. Start debugging in the app using one of the following methods: + +| Platform | Command | +| ----------- | --------------------------------------------------------------------------------- | +| **iOS** | Press Cmd+R to reload, Cmd+D or shake for dev. | +| **Android** | Double tap R on your keyboard to reload, shake or press menu button for dev menu. | ## Generating test data
0
diff --git a/src/components/playerController/index.js b/src/components/playerController/index.js @@ -60,7 +60,10 @@ module.exports = class PlayerController { if(this.config.minSessionTime < 1 || this.config.minSessionTime > 60) throw new Error('The playerController.minSessionTime setting must be between 1 and 60 minutes.'); //Running playerlist generator - if(GetConvar('txAdminFakePlayerlist', 'false').trim() === 'yesplz') { + if( + process.env.APP_ENV !== 'webpack' && + GetConvar('txAdminFakePlayerlist', 'false').trim() === 'yesplz' + ){ const PlayerlistGenerator = require('./playerlistGenerator.js'); this.playerlistGenerator = new PlayerlistGenerator(); }
13
diff --git a/server/app.js b/server/app.js @@ -294,6 +294,7 @@ app.get('/edit/:id', asyncHandler(getBrew('edit')), (req, res, next)=>{ app.get('/new/:id', asyncHandler(getBrew('share')), (req, res, next)=>{ sanitizeBrew(req.brew, 'share'); splitTextStyleAndMetadata(req.brew); + req.brew.views = 0; req.brew.title = `CLONE - ${req.brew.title}`; req.ogMeta = { ...defaultMetaTags,
12
diff --git a/README.md b/README.md @@ -49,6 +49,12 @@ Developer documentation is <a href="https://docs.webaverse.com/docs/index">here< User documentation is <a href="https://webaverse.notion.site/User-Docs-3a36b223e39b4f94b3d1f6921a4c297a">here</a> </p> +## Minimum Requirements + +8 GB Hard Drive space +4 vCPUs +8 GB Memory + ## Installation **Important note before you clone this repo:** This repo uses Git submodules.
3
diff --git a/src/kiri/main.js b/src/kiri/main.js meshes: meshArray, opacity: setOpacity, annotate: (id) => { - // add per widget annotation - // for things like extruder and supports - return WIDGETS.filter(w => w.id === id)[0].anno; + let w = WIDGETS.filter(w => w.id === id)[0]; + if (!w) { + console.log(`annotate missing widget ${id}`); + return {}; + } + return (w.anno = w.anno || {}); } }, work: KIRI.work
9
diff --git a/css/livecod-custom.css b/css/livecod-custom.css @@ -6,6 +6,11 @@ h1.title { color: #04253a; } +h1.title > a { + text-decoration: none; + color: inherit; +} + #page-top > header { /* padding: 0 0.75rem; */ }
0
diff --git a/src/style_manager/index.js b/src/style_manager/index.js @@ -270,20 +270,20 @@ module.exports = () => { const opts = { state }; let rule; - if (hasClasses) { - const deviceW = em.getCurrentMedia(); - rule = cssC.get(valid, state, deviceW); - - if (!rule) { // I stop undo manager here as after adding the CSSRule (generally after // selecting the component) and calling undo() it will remove the rule from // the collection, therefore updating it in style manager will not affect it // #268 um.stop(); + + if (hasClasses) { + const deviceW = em.getCurrentMedia(); + rule = cssC.get(valid, state, deviceW); + + if (!rule) { rule = cssC.add(valid, state, deviceW); rule.setStyle(model.getStyle()); model.setStyle({}); - um.start(); } } else if (config.avoidInlineStyle) { rule = cssC.getIdRule(id, opts); @@ -291,6 +291,7 @@ module.exports = () => { } rule && (model = rule); + um.start(); } return model;
5
diff --git a/src/extensions/renderer/base/load-listeners.js b/src/extensions/renderer/base/load-listeners.js @@ -117,7 +117,8 @@ BRp.load = function(){ for( var i = 0; downs && i < downs.length; i++ ){ var down = downs[i]; - if( down.isNode() && down.isParent() ){ + //if any parent node in event hierarchy isn't pannable, reject passthrough + if( down.isNode() && down.isParent() && !down.pannable() ){ allowPassthrough = false; break; }
11
diff --git a/vm.object.spur.js b/vm.object.spur.js @@ -87,6 +87,8 @@ Squeak.Object.subclass('Squeak.ObjectSpur', this.pointers = this.decodePointers(nWords, oops, oopMap, getCharacter); } break; + case 11: // 32 bit array (odd length in 64 bits) + nWords--; case 10: // 32 bit array if (this.sqClass === floatClass) { //These words are actually a Float @@ -105,10 +107,16 @@ Squeak.Object.subclass('Squeak.ObjectSpur', } else if (nWords > 0) { this.words = this.decodeWords(nWords, bits, littleEndian); } - break + break; case 12: // 16 bit array case 13: // 16 bit array (odd length) throw Error("16 bit arrays not supported yet"); + case 20: // 8 bit array, length-4 (64 bit image) + case 21: // ... length-5 + case 22: // ... length-6 + case 23: // ... length-7 + nWords--; + // fall through case 16: // 8 bit array case 17: // ... length-1 case 18: // ... length-2 @@ -116,17 +124,23 @@ Squeak.Object.subclass('Squeak.ObjectSpur', if (nWords > 0) this.bytes = this.decodeBytes(nWords, bits, 0, this._format & 3); break; + case 28: // CompiledMethod, length-4 (64 bit image) + case 29: // ... length-5 + case 30: // ... length-6 + case 31: // ... length-7 + nWords--; + // fall through case 24: // CompiledMethod - case 25: // CompiledMethod - case 26: // CompiledMethod - case 27: // CompiledMethod + case 25: // ... length-1 + case 26: // ... length-2 + case 27: // ... length-3 var rawHeader = this.decodeWords(1, bits, littleEndian)[0]; if (rawHeader & 0x80000000) throw Error("Alternate bytecode set not supported") var numLits = (rawHeader >> 1) & 0x7FFF, oops = this.decodeWords(numLits+1, bits, littleEndian); this.pointers = this.decodePointers(numLits+1, oops, oopMap, getCharacter); //header+lits this.bytes = this.decodeBytes(nWords-(numLits+1), bits, numLits+1, this._format & 3); - break + break; default: throw Error("Unknown object format: " + this._format);
9
diff --git a/saiku-core/saiku-service/src/main/java/org/saiku/repository/MarkLogicRepositoryManager.java b/saiku-core/saiku-service/src/main/java/org/saiku/repository/MarkLogicRepositoryManager.java @@ -55,7 +55,7 @@ public class MarkLogicRepositoryManager implements IRepositoryManager { private ScopedRepo sessionRegistry; private boolean workspaces; - private MarkLogicRepositoryManager(String host, int port, String username, String password, String database, String data, ScopedRepo sessionRegistry, boolean workspaces) { + public MarkLogicRepositoryManager(String host, int port, String username, String password, String database, String data, ScopedRepo sessionRegistry, boolean workspaces) { this.host = host; this.port = port; this.username = username;
11
diff --git a/src/pages/index.js b/src/pages/index.js @@ -118,10 +118,10 @@ const teaserUtils = { text: 'Go To Utilities', ctaVariant: 'button', buttonVariant: 'secondary', - href: '/using-spark/utilities', + href: '/using-spark/foundations/css-utilities', }, media: { - href: '/using-spark/utilities', + href: '/using-spark/foundations/css-utilities', mediaLinkElement: 'a', imgAlt: 'placeholder image', imgSrc: '',
3
diff --git a/assets/js/components/dashboard-sharing/DashboardSharingSettings/Module.js b/assets/js/components/dashboard-sharing/DashboardSharingSettings/Module.js @@ -152,7 +152,6 @@ export default function Module( { moduleSlug, moduleName, ownerUsername } ) { 'googlesitekit-dashboard-sharing-settings__row--disabled': isLocked, } ) } - key={ moduleSlug } > <div className="googlesitekit-dashboard-sharing-settings__column--product"> <ModuleIcon slug={ moduleSlug } size={ 48 } />
2
diff --git a/README.md b/README.md @@ -231,7 +231,7 @@ Features Setup ----- **General** -* Checkout the [`reference-viewer`](../blob/reference-viewer) branch +* Checkout the [`reference-viewer`](../../tree/reference-viewer) branch * Pull the submodule if you want the example assets **Debugging**
1
diff --git a/src/web/containers/Workspace/Workspace.jsx b/src/web/containers/Workspace/Workspace.jsx @@ -268,9 +268,9 @@ class Workspace extends React.Component { </div> </div> <Dropzone - ref="dropzone" styleName="dropzone" disableClick={true} + disablePreview={true} multiple={false} onDragStart={(event) => { }}
12
diff --git a/src/pages/gettingstarted/developers.hbs b/src/pages/gettingstarted/developers.hbs @@ -64,17 +64,29 @@ title: Developers </div> </li> <li class="sprk-u-mvm"> - <p> - Import the pre-render ES6 setup file in your JS build. This must be done in the head tag. - This will bring all the Spark-Core JS into your build. There is also an ES5 version if - preferred. It's located in @sparkdesignsystem/spark-core/es5. - </p> + <p>Spark has two js files that need to be incorporated into your build in order for Spark's behavior to + work.</p> + <ul class="drizzle-b-List drizzle-b-List--nested"> + <li><p><strong>spark-core-prerender</strong> - This file detects if JavaScript is loaded and also sets up the type loader. + It needs to execute its code before the page is rendered and therefore needs to be imported in the head of + the document.</p> <div class="drizzle-c-Command"> <code class="drizzle-CodeHighlight"> import sparkCorePrerender from &quot;@sparkdesignsystem/spark-core/spark-core-prerender&quot;; </code> </div> </li> + <li><p><strong>spark-core</strong> - This file contains the bulk of Spark's behavior and can be loaded after the + page is rendered, best done before the closing body tag.</p> + <div class="drizzle-c-Command"> + <code class="drizzle-CodeHighlight"> + import sparkCore from &quot;@sparkdesignsystem/spark-core/spark-core&quot;; + </code> + </div> + </li> + </ul> + <p>There are also ES5 versions if preferred. They're located in @sparkdesignsystem/spark-core/es5.</p> + </li> <li class="sprk-u-mvm"> <p>Init the Spark Core JS, passing in a config object (optional).</p> <div class="drizzle-c-Command">
3
diff --git a/planet.js b/planet.js import storage from './storage.js'; +import {XRChannelConnection} from './xrrtc.js'; +import Y from './yjs.js'; import { PARCEL_SIZE, SUBPARCEL_SIZE, @@ -8,7 +10,6 @@ import { PLANET_OBJECT_SLOTS, PLANET_OBJECT_SIZE, } from './constants.js'; -import {XRChannelConnection} from './xrrtc.js'; import {loginManager} from './login.js'; import {storageHost, worldsHost} from './constants.js'; import {makePromise} from './util.js'; @@ -523,6 +524,52 @@ let channelConnectionOpen = null; const peerConnections = []; let state = null; +planet.getTrackedObjects = () => { + const objects = state.getArray('objects'); + const objectsJson = objects.toJSON(); + return objectsJson.map(name => state.getMap('object.' + name)); +}; +planet.getTrackedObject = name => { + const objects = state.getArray('objects'); + const objectsJson = objects.toJSON(); + if (!objectsJson.includes(name)) { + objects.push([name]); + } + + return state.getMap('object.' + name); +}; +const _bindState = state => { + const objects = state.getArray('objects'); + let lastObjects = []; + objects.observe(() => { + const nextObjects = objects.toJSON(); + + // const addedObjects = []; + // const removedObjects = []; + for (const name of nextObjects) { + if (!lastObjects.includes(name)) { + // addedObjects.push(name); + /* this.dispatchEvent(new MessageEvent('trackedobjectadd', { + data: name, + })); */ + const trackedObject = planet.getTrackedObject(name); + planet.dispatchEvent(new MessageEvent('trackedobjectadd', { + data: trackedObject, + })); + } + } + /* for (const name of lastObjects) { + if (!nextObjects.includes(name)) { + // removedObjects.push(name); + this.dispatchEvent(new MessageEvent('trackedobjectremove', { + data: name, + })); + } + } */ + + lastObjects = nextObjects; + }); +}; const _connectRoom = async (roomName, worldURL) => { channelConnection = new XRChannelConnection(`wss://${worldURL}`, {roomName}); @@ -716,6 +763,8 @@ const _connectRoom = async (roomName, worldURL) => { delete state[key]; } }); */ + state = channelConnection.state; + _bindState(state); }; planet.transactState = fn => state.transact(fn); @@ -735,6 +784,9 @@ planet.connect = async ({online = true, roomName: rn, url = null} = {}) => { <i class="fal fa-wifi-slash"></i> <div class=label>Disconnect</div> `; + } else { + state = new Y.Doc(); + _bindState(state); } // await _loadStorage(roomName); await _loadLiveState(roomName);
0
diff --git a/src/css/docs/components/docs-workers-examples.css b/src/css/docs/components/docs-workers-examples.css .DocsWorkersExamples { - margin: 2.3rem 0; + margin: 2.5rem 0; display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); grid-gap: var(--docs-content-gap);
7
diff --git a/src/components/About.js b/src/components/About.js @@ -122,8 +122,8 @@ export default () => ( Learn more </Button.link> </Box> - <BackgroundImage scale src="/about_1.jpg" /> - <BackgroundImage scale src="/about_2.jpg" /> + <BackgroundImage aria-label="Students coding" scale src="/about_1.jpg" /> + <BackgroundImage aria-label="Students coding" scale src="/about_2.jpg" /> <Box bg="info" p={[3, 4]}> <Heading.h3 f={4} my={0} caps> The power of a network @@ -180,8 +180,8 @@ export default () => ( Our philosophy </Button.link> </Super> - <BackgroundImage scale src="/about_3.jpg" /> - <BackgroundImage scale src="/about_4.jpg" /> + <BackgroundImage aria-label="Students coding" scale src="/about_3.jpg" /> + <BackgroundImage aria-label="Students coding" scale src="/about_4.jpg" /> <Graph p={[3, 4]}> <Heading.h3 f={4} my={0} caps> Grassroots and growing
12
diff --git a/src/containers/FlightDirector/SetConfig.js b/src/containers/FlightDirector/SetConfig.js @@ -129,9 +129,13 @@ class SetConfig extends Component { .find(s => s.id === selectedSet) .clients.find( c => + c.simulator && c.simulator.id === selectedSimulator && + c.client && c.client.id === clientId && + c.stationSet && c.stationSet.id === selectedStationSet && + c.station && c.station === selectedStation )) || {}
1
diff --git a/src/components/AutoUpdateTime.js b/src/components/AutoUpdateTime.js @@ -25,7 +25,7 @@ class AutoUpdateTime extends PureComponent { this.updateCurrentTime = this.updateCurrentTime.bind(this); this.getTimezoneName = this.getTimezoneName.bind(this); this.state = { - timezone: this.getCurrentUserLocalTime(), + currentUserLocalTime: this.getCurrentUserLocalTime(), }; } @@ -59,12 +59,12 @@ class AutoUpdateTime extends PureComponent { */ getTimezoneName() { // With non-GMT timezone, moment.zoneAbbr() will return the name of that timezone, so we can use it directly. - if (Number.isNaN(Number(this.state.timezone.zoneAbbr()))) { - return this.state.timezone.zoneAbbr(); + if (Number.isNaN(Number(this.state.currentUserLocalTime.zoneAbbr()))) { + return this.state.currentUserLocalTime.zoneAbbr(); } // With GMT timezone, moment.zoneAbbr() will return a number, so we need to display it as GMT {abbreviations} format, ie: GMT +07 - return `GMT ${this.state.timezone.zoneAbbr()}`; + return `GMT ${this.state.currentUserLocalTime.zoneAbbr()}`; } /** @@ -75,10 +75,11 @@ class AutoUpdateTime extends PureComponent { clearTimeout(this.timer); this.timer = null; } - const millisecondsUntilNextMinute = (60 - this.state.timezone.seconds()) * 1000; + const millisecondsUntilNextMinute = + (60 - this.state.currentUserLocalTime.seconds()) * 1000; this.timer = setTimeout(() => { this.setState({ - timezone: this.getCurrentUserLocalTime(), + currentUserLocalTime: this.getCurrentUserLocalTime(), }); }, millisecondsUntilNextMinute); } @@ -90,7 +91,7 @@ class AutoUpdateTime extends PureComponent { {this.props.translate('detailsPage.localTime')} </Text> <Text numberOfLines={1}> - {this.state.timezone.format('LT')} + {this.state.currentUserLocalTime.format('LT')} {' '} {this.getTimezoneName()} </Text>
10
diff --git a/js/webcomponents/bisweb_paravisionapplicationelement.js b/js/webcomponents/bisweb_paravisionapplicationelement.js @@ -35,8 +35,6 @@ const FastClick=require('fastclick'); const ViewerApplicationElement = require('bisweb_mainviewerapplication'); const userPreferences = require('bisweb_userpreferences.js'); const bisgenericio=require('bis_genericio'); -const fs=bisgenericio.getfsmodule(); -const path=bisgenericio.getpathmodule(); const internalmode = require('bisextra').hasinternal; /** @@ -130,12 +128,17 @@ class ParavisionApplicationElement extends ViewerApplicationElement { PARATOOL.importjob(f); } else if (ext==="gz") { this.loadImage(f,0); - } else if (fs.lstatSync(f).isDirectory()) { - PARATOOL.importfiles(f); - } else if ( path.basename(f)==="2dseq") { + } else if ( bisgenericio.getBaseName(f)==="2dseq") { PARATOOL.importfiles(f); } else { + bisgenericio.isDirectory(f).then( (m) => { + if (m===true) + PARATOOL.importfiles(f); + else webutil.createAlert("Can not process file "+f,true); + }).catch( (e) => { + webutil.createAlert("Can not process file "+f,true); + }); } }; webutil.createDragAndCropController(HandleFiles);
2
diff --git a/Makefile b/Makefile @@ -779,17 +779,17 @@ contribs/gmf/build/angular-locale_%.js: github_versions $(EXTERNS_ANGULAR): github_versions mkdir -p $(dir $@) - wget -O $@ https://raw.githubusercontent.com/google/closure-compiler/`grep ^closure-compiler= $< | cut --delimiter = --fields 2`/contrib/externs/angular-1.6.js + wget -O $@ https://raw.githubusercontent.com/google/closure-compiler/master/contrib/externs/angular-1.6.js touch $@ $(EXTERNS_ANGULAR_Q): github_versions mkdir -p $(dir $@) - wget -O $@ https://raw.githubusercontent.com/google/closure-compiler/`grep ^closure-compiler= $< | cut --delimiter = --fields 2`/contrib/externs/angular-1.6-q_templated.js + wget -O $@ https://raw.githubusercontent.com/google/closure-compiler/master/contrib/externs/angular-1.6-q_templated.js touch $@ $(EXTERNS_ANGULAR_HTTP_PROMISE): github_versions mkdir -p $(dir $@) - wget -O $@ https://raw.githubusercontent.com/google/closure-compiler/`grep ^closure-compiler= $< | cut --delimiter = --fields 2`/contrib/externs/angular-1.6-http-promise_templated.js + wget -O $@ https://raw.githubusercontent.com/google/closure-compiler/master/contrib/externs/angular-1.6-http-promise_templated.js touch $@ $(EXTERNS_JQUERY): github_versions
4
diff --git a/articles/connections/database/mysql.md b/articles/connections/database/mysql.md @@ -87,6 +87,8 @@ function login(email, password, callback) { This script connects to a **MySQL** database and executes a query to retrieve the first user with `email == user.email`. With the `bcrypt.compareSync` method, it then validates that the passwords match, and if successful, returns an object containing the user profile information including `id`, `nickname`, and `email`. This script assumes that you have a `users` table containing these columns. You can tweak this script in the editor to adjust it to your own requirements. +You can also [cache connections](/rules/current#cache-expensive-resources) such that it will survive individual execution. + ::: note If you are using [IBM's DB2](https://www.ibm.com/analytics/us/en/technology/db2/) product, [click here](/connections/database/db2-script) for a sample login script. :::
0
diff --git a/articles/client-platforms/angularjs/05-linking-accounts.md b/articles/client-platforms/angularjs/05-linking-accounts.md @@ -81,7 +81,7 @@ Now that the second user is authenticated, the accounts can be linked. $http({ method: 'POST', - url: 'https://${account.clientId}/api/v2/users/' + profile.user_id + '/identities', + url: 'https://${account.namespace}/api/v2/users/' + profile.user_id + '/identities', headers: { Authorization: 'Bearer ' + token }, @@ -216,7 +216,7 @@ You can dissociate a linked account by calling the [unlink a user account](/api/ $http({ method: 'DELETE', - url: 'https://${account.clientId}/api/v2/users/' + profile.user_id + '/identities/' + identity.provider + '/' + identity.user_id, + url: 'https://${account.namespace}/api/v2/users/' + profile.user_id + '/identities/' + identity.provider + '/' + identity.user_id, headers: { Authorization: 'Bearer ' + token }
3
diff --git a/assets/src/libraries/BookDetail.jsx b/assets/src/libraries/BookDetail.jsx @@ -50,7 +50,7 @@ export default class BookDetail extends Component { renderDescription() { return ( <div className="modal-book__description-wrapper"> - {this.props.book.description ? <div className="modal-book__description">{this.props.book.description}</div> : null} + {this.props.book.description && <div className="modal-book__description">{this.props.book.description}</div>} <div className="modal-book__goodreads"> {this.renderGoodReadsLink()} @@ -82,7 +82,7 @@ export default class BookDetail extends Component { <DialogContent className="modal-container"> <div className="modal-book"> <div className="modal-book__image-box"> - {book.image_url ? <img src={book.image_url} alt="Book cover" className="modal-book__image" /> : null} + {book.image_url && <img src={book.image_url} alt="Book cover" className="modal-book__image" />} <div className="modal-book__actions-buttons"> {this.actionButtons()}
14
diff --git a/token-metadata/0x6A27348483D59150aE76eF4C0f3622A78B0cA698/metadata.json b/token-metadata/0x6A27348483D59150aE76eF4C0f3622A78B0cA698/metadata.json "symbol": "BKBT", "address": "0x6A27348483D59150aE76eF4C0f3622A78B0cA698", "decimals": 18, - "dharmaVerificationStatus": { "dharmaVerificationStatus": "VERIFIED" } \ No newline at end of file -} \ No newline at end of file
3
diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile @@ -87,7 +87,7 @@ platform :ios do end desc "Build and Deploy a release to iTunes Connect" - lane :release do + lane :release do |options| # Testflight builds can be promoted to production so # we have to do another build with appstore signing increment_build_number(
0
diff --git a/assets/js/modules/analytics/datastore/accounts.js b/assets/js/modules/analytics/datastore/accounts.js @@ -34,9 +34,9 @@ const RECEIVE_ACCOUNTS = 'RECEIVE_ACCOUNTS'; const RECEIVE_ACCOUNTS_PROPERTIES_PROFILES_COMPLETED = 'RECEIVE_ACCOUNTS_PROPERTIES_PROFILES_COMPLETED'; const RECEIVE_ACCOUNTS_PROPERTIES_PROFILES_FAILED = 'RECEIVE_ACCOUNTS_PROPERTIES_PROFILES_FAILED'; const FETCH_CREATE_ACCOUNT = 'FETCH_CREATE_ACCOUNT'; -const CREATE_ACCOUNT_FINISHED = 'CREATE_ACCOUNT_FINISHED'; -const RECEIVE_CREATE_ACCOUNT_FAILED = 'RECEIVE_CREATE_ACCOUNT_FAILED'; -const CREATE_ACCOUNT_STARTED = 'CREATE_ACCOUNT_STARTED'; +const START_FETCH_CREATE_ACCOUNT = 'START_FETCH_CREATE_ACCOUNT'; +const FINISH_FETCH_CREATE_ACCOUNT = 'FINISH_FETCH_CREATE_ACCOUNT'; +const CATCH_FETCH_CREATE_ACCOUNT = 'CATCH_FETCH_CREATE_ACCOUNT'; export const INITIAL_STATE = { accounts: undefined, @@ -113,7 +113,7 @@ export const actions = { yield { payload: {}, - type: CREATE_ACCOUNT_STARTED, + type: START_FETCH_CREATE_ACCOUNT, }; try { @@ -124,7 +124,7 @@ export const actions = { yield { payload: {}, - type: CREATE_ACCOUNT_FINISHED, + type: FINISH_FETCH_CREATE_ACCOUNT, }; } catch ( error ) { return actions.receiveCreateAccountFailed( { accountName, error } ); @@ -167,7 +167,7 @@ export const actions = { receiveCreateAccountFailed( { error } ) { return { payload: { error }, - type: RECEIVE_CREATE_ACCOUNT_FAILED, + type: CATCH_FETCH_CREATE_ACCOUNT, }; }, }; @@ -221,13 +221,13 @@ export const reducer = ( state, { type, payload } ) => { }; } - case CREATE_ACCOUNT_FINISHED: + case FINISH_FETCH_CREATE_ACCOUNT: return { ...state, isCreatingAccount: false, }; - case RECEIVE_CREATE_ACCOUNT_FAILED: + case CATCH_FETCH_CREATE_ACCOUNT: const { error } = payload; return { ...state, @@ -235,7 +235,7 @@ export const reducer = ( state, { type, payload } ) => { isCreatingAccount: false, }; - case CREATE_ACCOUNT_STARTED: { + case START_FETCH_CREATE_ACCOUNT: { return { ...state, isCreatingAccount: true,
10