code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/cmd.js b/cmd.js @@ -19,7 +19,14 @@ const EleventyErrorHandler = require("./src/EleventyErrorHandler");
try {
const EleventyCommandCheckError = require("./src/EleventyCommandCheckError");
const argv = require("minimist")(process.argv.slice(2), {
- string: ["input", "output", "formats", "config", "pathprefix", "port"],
+ string: [
+ "input",
+ "output",
+ "formats",
+ "config",
+ "pathprefix",
+ "port"
+ ],
boolean: [
"quiet",
"version",
| 0 |
diff --git a/screen/wallets/export.js b/screen/wallets/export.js @@ -5,7 +5,7 @@ import { BlueSpacing20, SafeBlueArea, BlueNavigationStyle, BlueText, BlueCopyTex
import PropTypes from 'prop-types';
import Privacy from '../../Privacy';
import Biometric from '../../class/biometrics';
-import { LegacyWallet, LightningCustodianWallet, SegwitBech32Wallet, SegwitP2SHWallet } from '../../class';
+import { LegacyWallet, LightningCustodianWallet, SegwitBech32Wallet, SegwitP2SHWallet, WatchOnlyWallet } from '../../class';
/** @type {AppStorage} */
let BlueApp = require('../../BlueApp');
let loc = require('../../loc');
@@ -96,7 +96,7 @@ export default class WalletExport extends Component {
/>
<BlueSpacing20 />
- {this.state.wallet.type === LightningCustodianWallet.type ? (
+ {this.state.wallet.type === LightningCustodianWallet.type || this.state.wallet.type === WatchOnlyWallet.type ? (
<BlueCopyTextToClipboard text={this.state.wallet.getSecret()} />
) : (
<BlueText style={{ alignItems: 'center', paddingHorizontal: 16, fontSize: 16, color: '#0C2550', lineHeight: 24 }}>
| 11 |
diff --git a/lib/dom_utils.coffee b/lib/dom_utils.coffee @@ -318,6 +318,7 @@ DomUtils =
consumeKeyup: (event, callback = null) ->
@suppressEvent event
keyChar = KeyboardUtils.getKeyCharString event
+ unless event.repeat
handlerStack.push
_name: "dom_utils/consumeKeyup"
keydown: (event) ->
| 8 |
diff --git a/docs/rules/no-empty-glimmer-component-classes.md b/docs/rules/no-empty-glimmer-component-classes.md @@ -8,7 +8,7 @@ This rule will catch and prevent the use of empty backing classes for Glimmer co
This rule aims to disallow the use of empty backing classes for Glimmer components when possible. Template-only Glimmer components where there is no backing class are much faster and lighter-weight than Glimmer components with backing classes, which are much lighter-weight than Ember components. Therefore, you should only have a backing class for a Glimmer component when absolutely necessary.
-In addons, the empty class should be replaced with a `templateOnly` export. This is because addons can't assume `template-only-glimmer-components` is enabled. In apps, remove the backing class entirely until it is actually needed.
+To fix violations of this rule: in apps, remove the backing class entirely until it is actually needed. In in-repo addons, replace the backing class depending on what the host app is doing. That is, if `template-only-glimmer-components` is enabled, you can remove the backing class. Otherwise, replace it with a `templateOnly` export. In other addons, use a `templateOnly` export because you can't assume `template-only-glimmer-components` is enabled.
## Examples
@@ -35,7 +35,9 @@ class MyComponent extends Component {
```js
import templateOnly from '@ember/component/template-only';
-export default templateOnly();
+const MyComponent = templateOnly();
+
+export default MyComponent;
```
## References
| 7 |
diff --git a/.circleci/bin/ecs-deploy.sh b/.circleci/bin/ecs-deploy.sh @@ -59,7 +59,7 @@ for SERVICE in $SERVICES; do
RELEASE_DESCRIPTION="CircleCI build URL: ${CIRCLE_BUILD_URL}"
echo storefront_CIRCLE_SHA1=$storefront_CIRCLE_SHA1
- propel release create --deploy --descr "${RELEASE_DESCRIPTION}" -f ${PROPEL_CONFIG_FILE} --debug
+ propel release create --deploy --descr "${RELEASE_DESCRIPTION}" -f ${PROPEL_CONFIG_FILE}
echo "END PROCESSING SERVICE ${SERVICE}"
| 2 |
diff --git a/docs/4.0/components/pagination.md b/docs/4.0/components/pagination.md @@ -12,14 +12,17 @@ We use a large block of connected links for our pagination, making links hard to
In addition, as pages likely have more than one such navigation section, it's advisable to provide a descriptive `aria-label` for the `<nav>` to reflect its purpose. For example, if the pagination component is used to navigate between a set of search results, an appropriate label could be `aria-label="Search results pages"`.
+[comment]: boosted mod
+Make sure to use class `.has-label` on previous and next links as shown in the example below to use chevron + label layout.
+
{% example html %}
<nav aria-label="Page navigation example">
<ul class="pagination">
- <li class="page-item"><a class="page-link has-label" href="#">Previous</a></li>
+ <li class="page-item"><a class="page-link has-label" href="#">Previous</a></li><!-- boosted mod -->
<li class="page-item"><a class="page-link" href="#">1</a></li>
<li class="page-item"><a class="page-link" href="#">2</a></li>
<li class="page-item"><a class="page-link" href="#">3</a></li>
- <li class="page-item"><a class="page-link has-label" href="#">Next</a></li>
+ <li class="page-item"><a class="page-link has-label" href="#">Next</a></li><!-- boosted mod -->
</ul>
</nav>
{% endexample %}
| 1 |
diff --git a/packages/bitcore-node/src/services/pruning.ts b/packages/bitcore-node/src/services/pruning.ts @@ -152,7 +152,11 @@ export class PruningService {
async clearInvalid(invalidTxids: Array<string>) {
logger.info(`Invalidating ${invalidTxids.length} txids`);
return Promise.all([
+ // Set all invalid txs to conflicting status
this.transactionModel.collection.updateMany({ txid: { $in: invalidTxids } }, { $set: { blockHeight: -3 } }),
+ // Set all coins that were pending to be spent by an invalid tx back to unspent
+ this.coinModel.collection.updateMany({ spentTxid: { $in: invalidTxids } }, { $set: { spentHeight: -2 } }),
+ // Set all coins that were created by invalid txs to conflicting status
this.coinModel.collection.updateMany({ mintTxid: { $in: invalidTxids } }, { $set: { mintHeight: -3 } })
]);
}
| 9 |
diff --git a/app/utils/actor/ClusterLabelAttributesActor.scala b/app/utils/actor/ClusterLabelAttributesActor.scala @@ -25,7 +25,7 @@ class ClusterLabelAttributesActor extends Actor {
val currentTime: Calendar = Calendar.getInstance
var timeOfNextUpdate: Calendar = Calendar.getInstance
timeOfNextUpdate.set(Calendar.HOUR_OF_DAY, 3)
- timeOfNextUpdate.set(Calendar.MINUTE, 0)
+ timeOfNextUpdate.set(Calendar.MINUTE, 30)
timeOfNextUpdate.set(Calendar.SECOND, 0)
// println(timeOfNextUpdate.get(Calendar.DAY_OF_MONTH))
| 3 |
diff --git a/src/discord/shiritori_forever_helper.js b/src/discord/shiritori_forever_helper.js @@ -173,7 +173,16 @@ async function handleAcceptedResult(monochrome, msg, acceptedResult) {
let userScore = 0;
const persistence = monochrome.getPersistence();
const channelID = msg.channel.id;
- await persistence.editData(createKeyForChannel(channelID), (data) => {
+
+ await createMessageForTurnTaken(
+ monochrome,
+ msg.channel.id,
+ msg.author.id,
+ acceptedResult.word,
+ userScore
+ );
+
+ return persistence.editData(createKeyForChannel(channelID), (data) => {
data.previousWordInformation = acceptedResult.word;
if (!data.scores) {
@@ -189,14 +198,6 @@ async function handleAcceptedResult(monochrome, msg, acceptedResult) {
return data;
});
-
- return createMessageForTurnTaken(
- monochrome,
- msg.channel.id,
- msg.author.id,
- acceptedResult.word,
- userScore
- );
}
function tryHandleMessage(monochrome, msg) {
@@ -213,7 +214,7 @@ function tryHandleMessage(monochrome, msg) {
const { previousWordInformation } = data;
return japaneseGameStrategy.tryAcceptAnswer(
msg.content,
- [previousWordInformation]
+ previousWordInformation ? [previousWordInformation] : [],
);
}).then((acceptanceResult) => {
accepted = acceptanceResult.accepted;
@@ -256,17 +257,17 @@ async function sendFirstWord(monochrome, channelID) {
const result = await japaneseGameStrategy.getViableNextResult([]);
const wordInformation = result.word;
- await persistence.editData(createKeyForChannel(channelID), (data) => {
- data.previousWordInformation = wordInformation;
- return data;
- });
-
- return createMessageForTurnTaken(
+ await createMessageForTurnTaken(
monochrome,
channelID,
monochrome.getErisBot().user.id,
wordInformation,
);
+
+ return persistence.editData(createKeyForChannel(channelID), (data) => {
+ data.previousWordInformation = wordInformation;
+ return data;
+ });
}
async function handleEnabledChanged(channelID, newInternalValue) {
@@ -297,6 +298,7 @@ async function handleEnabledChanged(channelID, newInternalValue) {
return data;
});
+ try {
if (changed) {
if (newInternalValue) {
await sendEnabledMessage(monochrome, channelID);
@@ -305,6 +307,9 @@ async function handleEnabledChanged(channelID, newInternalValue) {
await sendDisabledMessage(monochrome, channelID);
}
}
+ } catch (err) {
+ monochrome.getLogger().logFailure(LOGGER_TITLE, 'Error sending shiritoriforever enabled/disabled messages or first word', err);
+ }
}
module.exports = {
| 7 |
diff --git a/scripts/makeUserAdmin.js b/scripts/makeUserAdmin.js @@ -9,7 +9,9 @@ const mongoose = require('mongoose');
const userAddress = process.argv[2];
if (!userAddress) {
- throw new Error('USER_ADDRESS is required and should pass it');
+ console.error('Usage: makeUserAdmin.js USER_ADDRESS');
+ console.error('USER_ADDRESS should be passed as an argument');
+ process.exit(1);
}
const mongoUrl = config.mongodb;
mongoose.connect(mongoUrl);
| 7 |
diff --git a/policies/enforce-document-scope.js b/policies/enforce-document-scope.js @@ -109,8 +109,15 @@ internals.enforceDocumentScopePost = function(model, Log) {
}
//EXPL: the request is for a "list" endpoint
else {
+ //EXPL: Only verify scope if docs are included in the response, otherwise return as authorized.
+ //Ex: If '$count' query parameter is used
+ if (request.response.source.docs) {
result = internals.verifyScope(request.response.source.docs, "read", userScope, Log);
}
+ else {
+ result = { authorized: true };
+ }
+ }
if (result.authorized) {
return next(null, true);
| 1 |
diff --git a/packages/wasm-parser/src/decoder.js b/packages/wasm-parser/src/decoder.js @@ -162,7 +162,7 @@ export function decode(ab: ArrayBuffer, opts: DecoderOpts): Program {
function readF32(): DecodedF32 {
const bytes = readBytes(ieee754.NUMBER_OF_BYTE_F32);
- let value = ieee754.decodeF32(bytes);
+ const value = ieee754.decodeF32(bytes);
if (Math.sign(value) * value === Infinity) {
return {
@@ -173,9 +173,12 @@ export function decode(ab: ArrayBuffer, opts: DecoderOpts): Program {
}
if (isNaN(value)) {
- // NOTE: Hardcoded number of bytes in f32 here
- const sign = bytes[3] >> 7 ? -1 : 1;
- const mantissa = bytes[0] + bytes[1] * 256 + (bytes[2] % 128) * 65536;
+ const sign = bytes[bytes.length - 1] >> 7 ? -1 : 1;
+ let mantissa = 0;
+ for (let i = 0; i < bytes.length - 2; ++i) {
+ mantissa += bytes[i] * 256 ** i;
+ }
+ mantissa += (bytes[bytes.length - 2] % 128) * 256 ** (bytes.length - 2);
return {
value: sign * mantissa,
| 14 |
diff --git a/packages/gallery/src/components/gallery/index.tsx b/packages/gallery/src/components/gallery/index.tsx @@ -92,7 +92,6 @@ export default class BaseGallery extends React.Component<
}
render() {
- console.log('Change production code18');
const { blueprint, typeErrors } = this.state;
if (typeErrors) {
| 2 |
diff --git a/articles/libraries/lock/v11/sending-authentication-parameters.md b/articles/libraries/lock/v11/sending-authentication-parameters.md @@ -32,12 +32,14 @@ var options = {
};
```
-There are different values supported for scope:
+There are different values supported for scope. Keep in mind that JWTs are sent on every API request, so it is desirable to keep them as small as possible:
* `scope: 'openid'`: _(default)_ It will return not only the `access_token`, but also an `id_token` which is a JSON Web Token (JWT). The JWT will only contain the user ID (`sub` claim).
-* `scope: 'openid profile'`: (not recommended): will return all the user attributes in the token. This can cause problems when sending or receiving tokens in URLs (e.g. when using response_type=token) and will likely create an unnecessarily large token(especially with Azure AD which returns a fairly long JWT). Keep in mind that JWTs are sent on every API request, so it is desirable to keep them as small as possible.
+* `scope: 'openid profile'`: will return all the user attributes in the token.
* `scope: 'openid {attr1} {attr2} {attrN}'`: If you want only specific user attributes to be part of the `id_token` (For example: `scope: 'openid name email picture'`). When selecting specific attributes, the attributes chosen are from those available in the user's profile, which will vary from application to application.
+The default `scope` value in Lock 11 is `openid profile email`.
+
For more information about scopes, see the [scopes documentation page](/scopes).
#### Example: retrieve a token with the profile data
| 3 |
diff --git a/package-lock.json b/package-lock.json "name": "metamask-crx",
"version": "0.0.0",
"lockfileVersion": 1,
+ "requires": true,
"dependencies": {
"@babel/code-frame": {
"version": "7.0.0-beta.31",
"@types/react": "*"
}
},
+ "JSONStream": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz",
+ "integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=",
+ "requires": {
+ "jsonparse": "^1.2.0",
+ "through": ">=2.2.7 <3"
+ }
+ },
"abab": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz",
}
},
"eth-contract-metadata": {
- "version": "github:MetaMask/eth-contract-metadata#966a891dd9c79b873fd8968a0155b067ca630502"
+ "version": "github:MetaMask/eth-contract-metadata#2da362052a312dc6c72a7eec116abf6284664f50",
+ "from": "github:MetaMask/eth-contract-metadata#master"
},
"eth-ens-namehash": {
"version": "2.0.8",
}
},
"ethereumjs-util": {
- "version": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9"
+ "version": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
+ "from": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
+ "requires": {
+ "bn.js": "^4.8.0",
+ "create-hash": "^1.1.2",
+ "keccak": "^1.0.2",
+ "rlp": "^2.0.0",
+ "secp256k1": "^3.0.1"
+ }
},
"ethereumjs-vm": {
"version": "2.3.2",
},
"gulp": {
"version": "github:gulpjs/gulp#71c094a51c7972d26f557899ddecab0210ef3776",
+ "from": "github:gulpjs/gulp#4.0",
+ "requires": {
+ "glob-watcher": "^4.0.0",
+ "gulp-cli": "^2.0.0",
+ "undertaker": "^1.0.0",
+ "vinyl-fs": "^3.0.0"
+ },
"dependencies": {
"gulp-cli": {
"version": "2.0.1",
"dev": true,
"optional": true
},
- "JSONStream": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz",
- "integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=",
- "requires": {
- "jsonparse": "^1.2.0",
- "through": ">=2.2.7 <3"
- }
- },
"jsprim": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
"integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
},
- "string_decoder": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
- "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
- "requires": {
- "safe-buffer": "~5.1.0"
- }
- },
"string-length": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz",
"function-bind": "^1.0.2"
}
},
+ "string_decoder": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+ "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+ "requires": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
"stringify-object": {
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.2.2.tgz",
| 13 |
diff --git a/tasks/task_runners.py b/tasks/task_runners.py @@ -81,13 +81,13 @@ class ExportTaskRunner(object):
LOG.debug('Saved task: {0}'.format(format_name))
if ondemand:
- run_task_remote(run_uid)
- db.close_old_connections()
- # run_task_async_ondemand.send(run_uid)
+ # run_task_remote(run_uid)
+ # db.close_old_connections()
+ run_task_async_ondemand.send(run_uid)
else:
- run_task_remote(run_uid)
- db.close_old_connections()
- # run_task_async_scheduled.send(run_uid)
+ # run_task_remote(run_uid)
+ # db.close_old_connections()
+ run_task_async_scheduled.send(run_uid)
return run
@dramatiq.actor(max_retries=0,queue_name='default',time_limit=1000*60*60*6)
| 13 |
diff --git a/generators/entity/prompts.js b/generators/entity/prompts.js @@ -533,6 +533,10 @@ function askForField(done) {
value: 'enum',
name: 'Enumeration (Java enum type)'
},
+ {
+ value: 'UUID',
+ name: 'UUID'
+ },
{
value: 'byte[]',
name: '[BETA] Blob'
| 11 |
diff --git a/token-metadata/0x737F98AC8cA59f2C68aD658E3C3d8C8963E40a4c/metadata.json b/token-metadata/0x737F98AC8cA59f2C68aD658E3C3d8C8963E40a4c/metadata.json "symbol": "AMN",
"address": "0x737F98AC8cA59f2C68aD658E3C3d8C8963E40a4c",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/samples/source/template.html b/samples/source/template.html <!DOCTYPE html>
<html lang="en">
-
<head>
- <meta charset="UTF-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta http-equiv="X-UA-Compatible" content="ie=edge">
+ <meta charset="UTF-8" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+ <meta http-equiv="X-UA-Compatible" content="ie=edge" />
<title>{{ title }}</title>
- <link href="../../assets/styles.css" rel="stylesheet">
+ <link href="../../assets/styles.css" rel="stylesheet" />
<style>
{% if style %}
{% if format == 'vanilla-js' %}
<script src="../../../dist/apexcharts.js"></script>
{% elif format == 'react' %}
- <script crossorigin src="https://unpkg.com/[email protected]/umd/react.production.min.js"></script>
- <script crossorigin src="https://unpkg.com/[email protected]/umd/react-dom.production.min.js"></script>
- <script src="https://unpkg.com/[email protected]/prop-types.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/umd/react.production.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/umd/react-dom.production.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/prop-types.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/babel-core/5.8.34/browser.min.js"></script>
<script src="../../../dist/apexcharts.js"></script>
- <script src="https://unpkg.com/[email protected]/dist/react-apexcharts.iife.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/react-apexcharts.iife.min.js"></script>
{% elif format == 'vue' %}
- <script src="https://unpkg.com/vue/dist/vue.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.min.js"></script>
<script src="../../../dist/apexcharts.js"></script>
<script src="https://cdn.jsdelivr.net/npm/vue-apexcharts"></script>
{% endif %}
<script>
// Replace Math.random() with a pseudo-random number generator to get reproducible results in e2e tests
// Based on https://gist.github.com/blixt/f17b47c62508be59987b
- var _seed = 42;
+ var _seed = 42
Math.random = function() {
- _seed = _seed * 16807 % 2147483647;
- return (_seed - 1) / 2147483646;
- };
+ _seed = (_seed * 16807) % 2147483647
+ return (_seed - 1) / 2147483646
+ }
</script>
{{ scripts|indent(2) }}
</head>
<body>
- {% if format == 'vanilla-js' %}
- {{ html|indent(6) }}
+ {% if format == 'vanilla-js' %} {{ html|indent(6) }}
<script>
{% for chart in charts %}
</script>
{% endif %}
</body>
-
</html>
| 14 |
diff --git a/package-lock.json b/package-lock.json }
},
"acorn": {
- "version": "6.4.0",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz",
- "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==",
+ "version": "6.4.1",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+ "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
"dev": true
},
"adjust-sourcemap-loader": {
"dev": true
},
"kind-of": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
- "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
"dev": true
},
"kleur": {
| 3 |
diff --git a/src/agent/index.js b/src/agent/index.js @@ -2485,10 +2485,10 @@ function interceptRet(target, value) {
if (target.startsWith('java:')) {
return interceptRetJavaExpression(target, value);
}
- const p = ptr(args[0]);
+ const p = ptr(target);
Interceptor.attach(p, {
onLeave (retval) {
- retval.replace(ptr('0'));
+ retval.replace(ptr(value));
}
});
}
| 1 |
diff --git a/token-metadata/0x4FE5851C9af07df9e5AD8217aFAE1ea72737Ebda/metadata.json b/token-metadata/0x4FE5851C9af07df9e5AD8217aFAE1ea72737Ebda/metadata.json "symbol": "OPT",
"address": "0x4FE5851C9af07df9e5AD8217aFAE1ea72737Ebda",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/components/dashboard/Dashboard.js b/src/components/dashboard/Dashboard.js @@ -73,6 +73,7 @@ class Dashboard extends Component<DashboardProps, DashboardState> {
getFeeds = (() => {
const get = () => {
+ log.debug('getFeed initial')
getInitialFeed(this.props.store)
}
return throttle(get, 2000, { leading: true })
| 0 |
diff --git a/token-metadata/0xC6e64729931f60D2c8Bc70A27D66D9E0c28D1BF9/metadata.json b/token-metadata/0xC6e64729931f60D2c8Bc70A27D66D9E0c28D1BF9/metadata.json "symbol": "FLOW",
"address": "0xC6e64729931f60D2c8Bc70A27D66D9E0c28D1BF9",
"decimals": 9,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/server/thread_lib.php b/server/thread_lib.php @@ -76,18 +76,19 @@ SQL;
SELECT r.thread, r.user, u.username
FROM roles r
LEFT JOIN users u ON r.user = u.id
-WHERE r.thread IN ({$thread_id_sql_string})
+WHERE r.thread IN ({$thread_id_sql_string}) AND u.username IS NOT NULL
SQL;
$user_result = $conn->query($user_query);
$users = array();
- while ($row = $result->fetch_assoc()) {
+ while ($row = $user_result->fetch_assoc()) {
$thread_id = $row['thread'];
$user_id = $row['user'];
+ $username = $row['username'];
$thread_infos[$thread_id]['memberIDs'][] = $user_id;
$users[$user_id] = array(
'id' => $user_id,
- 'username' => $row['username'],
+ 'username' => $username,
);
}
| 1 |
diff --git a/userscript.user.js b/userscript.user.js @@ -25930,6 +25930,9 @@ var $$IMU_EXPORT$$;
// https://images.pagina12.com.ar/styles/focal_3_2_960x640/public/2020-07/whatsapp-20image-202020-07-03-20at-2013-18-37.jpeg?itok=-X6G-0N_
// https://images.pagina12.com.ar/2020-07/whatsapp-20image-202020-07-03-20at-2013-18-37.jpeg
domain === "images.pagina12.com.ar" ||
+ // https://wasliestdu.de/dateien/styles/50x50/public/community/31914/profile/img_1636_4.jpg?itok=nMcZvJlb
+ // https://wasliestdu.de/dateien/community/31914/profile/img_1636_4.jpg
+ domain_nowww === "wasliestdu.de" ||
// http://cdn.whodoyouthinkyouaremagazine.com/sites/default/files/imagecache/623px_wide/episode/hewer500.jpg
// http://cdn.whodoyouthinkyouaremagazine.com/sites/default/files/episode/hewer500.jpg
// https://www.telugucinema.com/sites/default/files2/styles/media_gallery_thumbnail/public/amy-jackson-instagram1.jpg?itok=nwFhV2Iy
@@ -58288,7 +58291,18 @@ var $$IMU_EXPORT$$;
amazon_container === "green-img-news-dwango-jp-prod") {
// https://news-img.dwango.jp/uploads/medium/file/000/031/265/31265/md_main_hiki_web.jpg
// https://news-img.dwango.jp/uploads/medium/file/000/031/265/31265/main_hiki_web.jpg -- 2756x1831
- return src.replace(/(\/uploads\/[a-z]+\/file\/.*\/)(?:md|sm|lg)_([^/]*)$/, "$1$2");
+ // https://green-img-news-dwango-jp-prod.s3.amazonaws.com/uploads/medium/file/000/031/265/31265/main_hiki_web.jpg -- same
+ // thanks to nimbuz on discord:
+ // https://news.dwango.jp/idol/56904-2012/photos/279232
+ // https://news-img.dwango.jp/uploads/medium/file/000/279/232/279232/ob00g1x1g4egexzp4op.jpg -- 1280x1920
+ // https://green-img-news-dwango-jp-prod.s3.amazonaws.com/uploads/medium/file/000/279/232/279232/ob00g1x1g4egexzp4op.jpg -- 1414x2121
+ newsrc = src.replace(/(\/uploads\/[a-z]+\/file\/.*\/)(?:md|sm|lg)_([^/]*)$/, "$1$2");
+ if (newsrc !== src)
+ return newsrc;
+
+ newsrc = src.replace(/:\/\/news-img\.dwango\.jp\//, "://green-img-news-dwango-jp-prod.s3.amazonaws.com/");
+ if (newsrc !== src)
+ return newsrc;
}
if (domain_nowww === "getnews.jp") {
@@ -95979,6 +95993,19 @@ var $$IMU_EXPORT$$;
return src.replace(/(\/picboardimg\/+)alt2\/+([0-9]{6}\/+img[0-9]+)s\./, "$1$2.");
}
+ if (domain === "exlibris.azureedge.net") {
+ // https://exlibris.azureedge.net/covers/9783/4424/9266/4/9783442492664s.jpg -- 68x104
+ // https://exlibris.azureedge.net/covers/9783/4424/9266/4/9783442492664m.jpg -- 120x183
+ // https://exlibris.azureedge.net/covers/9783/4424/9266/4/9783442492664l.jpg -- 160x244
+ // https://exlibris.azureedge.net/covers/9783/4424/9266/4/9783442492664xl.jpg -- 260x397
+ // https://exlibris.azureedge.net/covers/9783/4424/9266/4/9783442492664xxl.jpg -- 800x1221
+ // other:
+ // https://exlibris.azureedge.net/cms/7279/Portrait%20Blanca%20Imboden.jpg -- 7360x4912
+ // https://exlibris.azureedge.net/cms/4896/Bild_3AUF30.jpg -- 2238x2082
+ // https://exlibris.azureedge.net/cms/5092/11+12.jpg -- 2480x1754
+ return src.replace(/(\/covers\/+.*\/[0-9]{5,})(?:x?l|[ms])\./, "$1xxl.");
+ }
+
| 7 |
diff --git a/rig.js b/rig.js @@ -208,6 +208,7 @@ class RigManager {
async setLocalAvatarUrl(url, ext) {
// await this.localRigQueue.lock();
+ this.setDefault();
await this.setAvatar(this.localRig, newLocalRig => {
this.clearAvatar();
this.localRig = newLocalRig;
| 12 |
diff --git a/includes/Modules/AdSense.php b/includes/Modules/AdSense.php @@ -715,18 +715,18 @@ tag_partner: "site_kit"
);
case 'same-day-last-week':
return array(
- date( 'Y-m-d', strtotime( '7daysAgo' ) ),
- date( 'Y-m-d', strtotime( '7daysAgo' ) ),
+ date( 'Y-m-d', strtotime( '7 days ago' ) ),
+ date( 'Y-m-d', strtotime( '7 days ago' ) ),
);
case '7-days':
return array(
- date( 'Y-m-d', strtotime( '7daysAgo' ) ),
+ date( 'Y-m-d', strtotime( '7 days ago' ) ),
date( 'Y-m-d', strtotime( 'yesterday' ) ),
);
case 'prev-7-days':
return array(
- date( 'Y-m-d', strtotime( '14daysAgo' ) ),
- date( 'Y-m-d', strtotime( '8daysAgo' ) ),
+ date( 'Y-m-d', strtotime( '14 days ago' ) ),
+ date( 'Y-m-d', strtotime( '8 days ago' ) ),
);
// Intentional fallthrough.
case 'daily-this-month':
@@ -745,13 +745,13 @@ tag_partner: "site_kit"
);
case '28-days':
return array(
- date( 'Y-m-d', strtotime( '28daysAgo' ) ),
+ date( 'Y-m-d', strtotime( '28 days ago' ) ),
date( 'Y-m-d', strtotime( 'yesterday' ) ),
);
case 'prev-28-days':
return array(
- date( 'Y-m-d', strtotime( '56daysAgo' ) ),
- date( 'Y-m-d', strtotime( '29daysAgo' ) ),
+ date( 'Y-m-d', strtotime( '56 days ago' ) ),
+ date( 'Y-m-d', strtotime( '29 days ago' ) ),
);
// Intentional fallthrough.
case 'last-7-days':
| 3 |
diff --git a/src/workingtitle-vcockpits-instruments-airliners/html_ui/Pages/VCockpit/Instruments/Airliners/Shared/WT/VerticalSpeedIndicator.js b/src/workingtitle-vcockpits-instruments-airliners/html_ui/Pages/VCockpit/Instruments/Airliners/Shared/WT/VerticalSpeedIndicator.js @@ -197,7 +197,7 @@ class Jet_PFD_VerticalSpeedIndicator extends HTMLElement {
Utils.RemoveAllChildren(this.cursorSVGGroup);
if (!this.cursorSVGLine)
this.cursorSVGLine = document.createElementNS(Avionics.SVG.NS, "line");
- this.cursorSVGLine.setAttribute("x1", this.cursorPosX1.toString());
+ this.cursorSVGLine.setAttribute("x1", (this.cursorPosX1 + 4).toString());
this.cursorSVGLine.setAttribute("y1", this.cursorPosY1.toString());
this.cursorSVGLine.setAttribute("x2", this.cursorPosX2.toString());
this.cursorSVGLine.setAttribute("y2", this.cursorPosY2.toString());
@@ -215,9 +215,9 @@ class Jet_PFD_VerticalSpeedIndicator extends HTMLElement {
this.cursorSVGGroup.appendChild(this.cursorSVGVerticalLine);
this.centerGroup.appendChild(this.cursorSVGGroup);
let selectedCursorHeight = 12;
- this.selectedCursorOffsetY = selectedCursorHeight * 0.5;
+ this.selectedCursorOffsetY = 0;
this.selectedCursorSVG = document.createElementNS(Avionics.SVG.NS, "path");
- this.selectedCursorSVG.setAttribute("d", "M" + (this.cursorPosX1 - 14) + " 0 l5 0 l0 -5 l13 " + (selectedCursorHeight * 0.5 + 5) + " l-13 " + (selectedCursorHeight * 0.5 + 5) + "l0 -5 l-5 0 l0 " + (-selectedCursorHeight * 0.5) + "Z");
+ this.selectedCursorSVG.setAttribute("d", "M -3 -10 L 9 0 L -3 10 L -3 3 L -6 3 L -6 -3 L -3 -3 L -3 -10 Z");
this.selectedCursorSVG.setAttribute("fill", "cyan");
this.selectedCursorSVG.setAttribute("visibility", "hidden");
this.cursorSVGGroup.appendChild(this.selectedCursorSVG);
@@ -815,16 +815,20 @@ class Jet_PFD_VerticalSpeedIndicator extends HTMLElement {
}
}
}
+
updateSelectedVSpeed(_speed) {
if (this.gradSpeeds && this.selectedCursorSVG) {
let vSpeed = Math.min(this.maxSpeed, Math.max(-this.maxSpeed, _speed));
let height = this.heightFromSpeed(vSpeed);
let posY = 0;
- if (vSpeed >= 0)
+ let rotation = (Math.atan(height / 130) * 180 / Math.PI).toString()
+ if (vSpeed >= 0){
posY = this.cursorPosY2 - height;
- else
+ }else{
posY = this.cursorPosY2 + height;
- this.selectedCursorSVG.setAttribute("transform", "translate(0 " + (posY - this.selectedCursorOffsetY) + ")");
+ rotation = -rotation
+ }
+ this.selectedCursorSVG.setAttribute("transform", "translate(25 " + (posY) + "), rotate(" + rotation + ")");
}
}
| 7 |
diff --git a/jest/setup.js b/jest/setup.js @@ -13,3 +13,14 @@ jest.mock('../src/libs/Notification/PushNotification', () => ({
}));
jest.mock('react-native-blob-util', () => ({}));
+
+// Turn off the console logs for timing events. They are not relevant for unit tests and create a lot of noise
+jest.spyOn(console, 'debug').mockImplementation((...params) => {
+ if (params[0].indexOf('Timing:') === 0) {
+ return;
+ }
+
+ // Send the message to console.log but don't re-used console.debug or else this mock method is called in an infinite loop. Instead, just prefix the output with the word "DEBUG"
+ // eslint-disable-next-line no-console
+ console.log('DEBUG', ...params);
+});
| 8 |
diff --git a/server/game/gamesteps/handlermenuprompt.js b/server/game/gamesteps/handlermenuprompt.js @@ -49,9 +49,8 @@ class HandlerMenuPrompt extends UiPrompt {
return false;
}
- if(this.properties.handlers[arg]()) {
+ this.properties.handlers[arg]();
this.complete();
- }
return true;
}
| 2 |
diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/context/localfilesystem.js b/packages/node_modules/@node-red/runtime/lib/nodes/context/localfilesystem.js @@ -245,7 +245,7 @@ LocalFileSystem.prototype.get = function(scope, key, callback) {
return this.cache.get(scope,key,callback);
}
if(typeof callback !== "function"){
- throw new Error("Callback must be a function");
+ throw new Error("File Store cache disabled - only asynchronous access supported");
}
var storagePath = getStoragePath(this.storageBaseDir ,scope);
loadFile(storagePath + ".json").then(function(data){
@@ -304,7 +304,7 @@ LocalFileSystem.prototype.set = function(scope, key, value, callback) {
}, this.flushInterval);
}
} else if (callback && typeof callback !== 'function') {
- throw new Error("Callback must be a function");
+ throw new Error("File Store cache disabled - only asynchronous access supported");
} else {
self.writePromise = self.writePromise.then(function() { return loadFile(storagePath + ".json") }).then(function(data){
var obj = data ? JSON.parse(data) : {}
| 7 |
diff --git a/assets/js/googlesitekit/datastore/user/authentication.test.js b/assets/js/googlesitekit/datastore/user/authentication.test.js @@ -293,6 +293,7 @@ describe( 'core/user authentication', () => {
expect( grantedScopes ).toEqual( undefined );
} );
} );
+
describe( 'getRequiredScopes', () => {
it( 'uses a resolver get all authentication info', async () => {
fetch
@@ -361,5 +362,50 @@ describe( 'core/user authentication', () => {
expect( requiredScopes ).toEqual( undefined );
} );
} );
+
+ describe( 'needsReauthentication', () => {
+ it( 'dispatches an error if the request fails', async () => {
+ const response = {
+ code: 'internal_server_error',
+ message: 'Internal server error',
+ data: { status: 500 },
+ };
+ fetch
+ .doMockOnceIf( coreUserDataEndpointRegExp )
+ .mockResponseOnce(
+ JSON.stringify( response ),
+ { status: 500 }
+ );
+
+ muteConsole( 'error' );
+ registry.select( STORE_NAME ).needsReauthentication();
+ await subscribeUntil( registry,
+ // TODO: We may want a selector for this, but for now this is fine
+ // because it's internal-only.
+ () => store.getState().isFetchingAuthentication === false,
+ );
+
+ const needsReauthentication = registry.select( STORE_NAME ).needsReauthentication();
+ const error = registry.select( STORE_NAME ).getError();
+
+ expect( fetch ).toHaveBeenCalledTimes( 1 );
+ expect( needsReauthentication ).toEqual( undefined );
+ expect( error ).toEqual( response );
+ } );
+
+ it( 'returns undefined if reauthentication info is not available', async () => {
+ // Create a mock to avoid triggering a network request error.
+ // The return value is irrelevant to the test.
+ fetch
+ .doMockOnceIf( coreUserDataEndpointRegExp )
+ .mockResponseOnce(
+ JSON.stringify( {} ),
+ { status: 200 }
+ );
+ const needsReauthentication = registry.select( STORE_NAME ).needsReauthentication();
+
+ expect( needsReauthentication ).toEqual( undefined );
+ } );
+ } );
} );
} );
| 3 |
diff --git a/compat/test/browser/suspense.test.js b/compat/test/browser/suspense.test.js @@ -939,7 +939,7 @@ describe('suspense', () => {
});
});
- it('should correctly render Suspense components inside Fragments', async () => {
+ it('should correctly render Suspense components inside Fragments', () => {
// Issue #2106.
const [Lazy1, resolve1] = createLazy();
@@ -971,17 +971,22 @@ describe('suspense', () => {
`${loadingHtml}${loadingHtml}${loadingHtml}`
);
- await resolve2(() => <span>2</span>);
- await resolve1(() => <span>1</span>);
+ resolve2(() => <span>2</span>)
+ .then(() => {
+ return resolve1(() => <span>1</span>);
+ })
+ .then(() => {
rerender();
expect(scratch.innerHTML).to.eql(
`<span>1</span><span>2</span>${loadingHtml}`
);
-
- await resolve3(() => <span>3</span>);
+ return resolve3(() => <span>3</span>);
+ })
+ .then(() => {
rerender();
expect(scratch.innerHTML).to.eql(
`<span>1</span><span>2</span><span>3</span>`
);
});
});
+});
| 1 |
diff --git a/avatars/avatars.js b/avatars/avatars.js @@ -1520,6 +1520,8 @@ class Avatar {
this.jumpTime = NaN;
this.flyState = false;
this.flyTime = NaN;
+ this.sitState = false;
+ this.sitTarget = new THREE.Object3D();
}
initializeBonePositions(setups) {
this.shoulderTransforms.spine.position.copy(setups.spine);
@@ -1660,6 +1662,11 @@ class Avatar {
const src2 = jumpAnimation.interpolants[k];
const v2 = src2.evaluate(t2);
+ dst.fromArray(v2);
+ } else if (this.sitState) {
+ const src2 = sittingAnimation.interpolants[k];
+ const v2 = src2.evaluate(1);
+
dst.fromArray(v2);
}
if (this.flyState || (this.flyTime >= 0 && this.flyTime < 1000)) {
| 0 |
diff --git a/components/maplibre/ban-map/index.js b/components/maplibre/ban-map/index.js @@ -12,6 +12,8 @@ import MapLegends from '../map-legends'
import OpenGPS from '../open-gps'
import {
+ positionsCircleLayer,
+ positionsLabelLayer,
adresseCircleLayer,
adresseLabelLayer,
adresseCompletLabelLayer,
@@ -89,6 +91,7 @@ function BanMap({map, isSourceLoaded, popup, address, setSources, setLayers, onS
const [selectedPaintLayer, setSelectedPaintLayer] = useState('certification')
const [isCadastreDisplayable, setIsCadastreDisplayble] = useState(true)
const [isCadastreLayersShown, setIsCadastreLayersShown] = useState(false)
+ const isMultiPositions = address?.positions?.length > 1
const onLeave = useCallback(() => {
if (hoveredFeature) {
@@ -202,8 +205,13 @@ function BanMap({map, isSourceLoaded, popup, address, setSources, setLayers, onS
} else {
map.setFilter('parcelle-highlighted', ['==', ['get', 'id'], ''])
}
+
+ if (isMultiPositions) {
+ map.setFilter('adresse', ['!=', ['get', 'id'], address.id])
+ map.setFilter('adresse-label', ['!=', ['get', 'id'], address.id])
+ }
}
- }, [map, selectedPaintLayer, isCadastreLayersShown, address, isSourceLoaded])
+ }, [map, selectedPaintLayer, isCadastreLayersShown, address, isSourceLoaded, isMultiPositions])
useEffect(() => {
map.off('dragend', handleZoom)
@@ -283,7 +291,9 @@ function BanMap({map, isSourceLoaded, popup, address, setSources, setLayers, onS
adresseLabelLayer,
adresseCompletLabelLayer,
voieLayer,
- toponymeLayer
+ toponymeLayer,
+ positionsLabelLayer,
+ positionsCircleLayer
])
}, [setSources, setLayers])
@@ -313,6 +323,11 @@ function BanMap({map, isSourceLoaded, popup, address, setSources, setLayers, onS
useEffect(() => {
if (isSourceLoaded && map.getLayer('adresse-complet-label') && map.getLayer('adresse-label')) {
if (address && address.type === 'numero') {
+ if (isMultiPositions) {
+ const {id} = address
+ map.setFilter('positions', ['==', ['get', 'id'], id])
+ map.setFilter('positions-label', ['==', ['get', 'id'], id])
+ } else {
const {id} = address
map.setFilter('adresse-complet-label', [
'==', ['get', 'id'], id
@@ -320,6 +335,7 @@ function BanMap({map, isSourceLoaded, popup, address, setSources, setLayers, onS
map.setFilter('adresse-label', [
'!=', ['get', 'id'], id
])
+ }
} else {
map.setFilter('adresse-complet-label', [
'==', ['get', 'id'], ''
@@ -329,7 +345,7 @@ function BanMap({map, isSourceLoaded, popup, address, setSources, setLayers, onS
])
}
}
- }, [map, isSourceLoaded, address, setLayers])
+ }, [map, isSourceLoaded, address, setLayers, isMultiPositions])
return (
<>
| 0 |
diff --git a/src/Services/Air/AirParser.js b/src/Services/Air/AirParser.js @@ -731,7 +731,7 @@ const airGetTicket = function (obj, parseParams = {
processUAPIError.call(this, obj, 'Unable to retrieve ticket');
}
- if (responseMessages.some(({ Type }) => (Type === 'Error'))) {
+ if (responseMessages.some(({ Type, Code }) => (Type === 'Error' && Code !== '12009'))) {
processUAPIError.call(this, obj, 'Unable to retrieve ticket');
}
| 0 |
diff --git a/token-metadata/0xc27A2F05fa577a83BA0fDb4c38443c0718356501/metadata.json b/token-metadata/0xc27A2F05fa577a83BA0fDb4c38443c0718356501/metadata.json "symbol": "TAU",
"address": "0xc27A2F05fa577a83BA0fDb4c38443c0718356501",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/module/chat.js b/module/chat.js @@ -116,7 +116,7 @@ export default function addChatHooks() {
return
}
- m = line.match(/\/(st|status) (t|toggle|on|off|\+|-) ([^ ]+)(@self)?/i)
+ m = line.match(/\/(st|status) +(t|toggle|on|off|\+|-) +([^ ]+)(@self)?/i)
if (!!m) {
let pattern = new RegExp('^' + (m[3].trim().split('*').join('.*').replace(/\(/g, '\\(').replace(/\)/g, '\\)')), 'i') // Make string into a RegEx pattern
let any = false
@@ -165,7 +165,7 @@ export default function addChatHooks() {
return
}
- m = line.match(/\/qty ?([\+-=]\d+)(.*)/i)
+ m = line.match(/\/qty *([\+-=]\d+)(.*)/i)
if (!!m) {
let actor = GURPS.LastActor
if (!actor)
@@ -204,7 +204,7 @@ export default function addChatHooks() {
return
}
- m = line.match(/\/uses ?([\+-=]\w+)?(reset)?(.*)/i)
+ m = line.match(/\/uses *([\+-=]\w+)?(reset)?(.*)/i)
if (!!m) {
let actor = GURPS.LastActor
if (!actor)
@@ -247,7 +247,7 @@ export default function addChatHooks() {
return
}
- m = line.match(/\/([fh]p) ?([+-=]\d+)?(reset)?(.*)/i)
+ m = line.match(/\/([fh]p) *([+-=]\d+)?(reset)?(.*)/i)
if (!!m) {
let actor = GURPS.LastActor
if (!actor)
@@ -289,7 +289,7 @@ export default function addChatHooks() {
return
}
- m = line.match(/\/(tracker|tr|rt|resource)([0123])?(\(([^\)]+)\))? ?([+-=]\d+)?(reset)?(.*)/i)
+ m = line.match(/\/(tracker|tr|rt|resource)([0123])?(\(([^\)]+)\))? *([+-=]\d+)?(reset)?(.*)/i)
if (!!m) {
let actor = GURPS.LastActor
if (!actor)
@@ -342,7 +342,7 @@ export default function addChatHooks() {
}
// /everyone +1 fp or /everyone -2d-1 fp
- m = line.match(/\/(everyone|ev) ([fh]p) ?([+-]\d+d\d*)?([+-=]\d+)?(!)?/i);
+ m = line.match(/\/(everyone|ev) ([fh]p) *([+-]\d+d\d*)?([+-=]\d+)?(!)?/i);
if (!!m && (!!m[3] || !!m[4])) {
if (game.user.isGM) {
let any = false
| 11 |
diff --git a/generators/openapi-client/files.js b/generators/openapi-client/files.js @@ -54,12 +54,19 @@ function writeFiles() {
let command;
if (generatorName === 'spring') {
this.log(chalk.green(`\n\nGenerating java client code for client ${cliName} (${inputSpec})`));
- const cliPackage = `${this.packageName}.client.${_.toLower(cliName)}`;
+ const baseCliPackage = `${this.packageName}.client.`;
+ const cliPackage = `${baseCliPackage}${_.toLower(cliName)}`;
+ const snakeCaseCliPackage = `${baseCliPackage}${_.snakeCase(cliName)}`;
+ const cleanOldDirectory = cliPackage => {
const clientPackageLocation = path.resolve('src', 'main', 'java', ...cliPackage.split('.'));
if (shelljs.test('-d', clientPackageLocation)) {
this.log(`cleanup generated java code for client ${cliName} in directory ${clientPackageLocation}`);
shelljs.rm('-rf', clientPackageLocation);
}
+ };
+
+ cleanOldDirectory(snakeCaseCliPackage);
+ cleanOldDirectory(cliPackage);
JAVA_OPTS = ' -Dmodels -Dapis -DsupportingFiles=ApiKeyRequestInterceptor.java,ClientConfiguration.java ';
| 2 |
diff --git a/web/biswebtest.js b/web/biswebtest.js @@ -131,6 +131,10 @@ var execute_test=function(test) {
}
}
+ let tobj=get_test_object(test);
+ let test_type = tobj['test_type'] || 'image';
+ if (test_type==='registration')
+ params['doreslice']=true;
loadparamfile(paramfile,module.name,params).then( () => {
@@ -161,16 +165,22 @@ var execute_test=function(test) {
};
-const execute_compare=function(module,test) {
-
- return new Promise( (resolve,reject) => {
+let get_test_object=function(test) {
- let testtrue=test.result;
let t=test.test.replace(/\t/g,' ').replace(/ +/g,' ').replace(/-+/g,'').split(' ');
let tobj={ };
for (let i=0;i<t.length;i=i+2) {
tobj[t[i]]=t[i+1];
}
+ return tobj;
+};
+
+const execute_compare=function(module,test) {
+
+ return new Promise( (resolve,reject) => {
+
+ let testtrue=test.result;
+ let tobj=get_test_object(test);
let threshold = tobj['test_threshold'] || 0.01;
let comparison = tobj['test_comparison'] || "maxabs";
@@ -251,7 +261,7 @@ const run_tests=async function(testlist,firsttest=0,lasttest=-1,testname='All')
console.log('Comparing ',name,testname);
if (testname==='All' || testname.toLowerCase()===name.toLowerCase()) {
- main.append(`<P>Running test ${i+1}: ${v.command}<UL><LI>${v.test},${v.result}</LI></P>`);
+ main.append(`<P>Running test ${i+1}: ${v.command}<UL><LI> Test details: ${v.test}</LI><LI> Should pass: ${v.result}</LI></P>`);
console.log(`-------------------------------`);
console.log(`-------------------------------\nRunning test ${i+1}: ${v.command}, ${v.test},${v.result}\n------------------------`);
replacesystemprint(true);
| 3 |
diff --git a/peril/rules/pull-request-on-starter.ts b/peril/rules/pull-request-on-starter.ts @@ -6,7 +6,13 @@ Hey, @${username}
Thank you for your pull request!
- We've moved all our starters over to https://github.com/gatsbyjs/gatsby. Please reopen this there.
+This repo is now a read-only repo that's synced from the main Gatsby monorepo at https://github.com/gatsbyjs/gatsby/.
+
+We've moved all our starters to https://github.com/gatsbyjs/gatsby/tree/master/starters so changes to starters are made there.
+
+Please checkout our contribution docs & recreate your PR against the starter directory in monorepo.
+
+https://www.gatsbyjs.org/contributing/how-to-open-a-pull-request/
Thanks again!
`
| 7 |
diff --git a/contribs/gmf/src/services/datasourcesmanager.js b/contribs/gmf/src/services/datasourcesmanager.js @@ -325,6 +325,12 @@ gmf.DataSourcesManager = class {
ogcServer.urlWfs : undefined;
const wmsUrl = ogcServer ? ogcServer.url : undefined;
+ let wfsOutputFormat = ngeo.DataSource.WFSOutputFormat.GML3;
+ // qgis server only supports GML2 output
+ if (ogcServerType === ngeo.DataSource.OGCServerType.QGISSERVER) {
+ wfsOutputFormat = ngeo.DataSource.WFSOutputFormat.GML2;
+ }
+
// (6) Snapping
const snappable = !!meta.snappingConfig;
const snappingTolerance = meta.snappingConfig ?
@@ -364,6 +370,7 @@ gmf.DataSourcesManager = class {
snappingToEdges,
snappingToVertice,
visible,
+ wfsOutputFormat,
wfsUrl,
wmsIsSingleTile,
wmsUrl,
| 12 |
diff --git a/ReduceClutter.user.js b/ReduceClutter.user.js // @description Revert updates that makes the page more cluttered or less accessible
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 1.30
+// @version 1.30.1
//
// @include https://*stackoverflow.com/*
// @include https://*serverfault.com/*
@@ -332,10 +332,12 @@ ul.comments-list .comment-up-on {
// Strip unnecessary tracking
let trackedElemCount = 0;
- $('.js-gps-track, [data-ga], [data-gps-track]').each(function(i, el) {
+ $('.js-gps-track, [data-ga], [data-gps-track], a[href*="utm_"]').each(function(i, el) {
this.classList.remove('js-gps-track');
el.dataset.ga = '';
el.dataset.gpsTrack = '';
+ el.removeAttribute('data-ga');
+ el.removeAttribute('data-gps-track');
// Specify which query params to remove from link
let params = new URLSearchParams(el.search);
| 2 |
diff --git a/includes/Core/Modules/Module.php b/includes/Core/Modules/Module.php @@ -570,12 +570,12 @@ abstract class Module {
* @param int $offset Days the range should be offset by. Default 1. Used by Search Console where
* data is delayed by two days.
* @param bool $previous Whether to select the previous period. Default false.
- * @param bool $day_align Whether to align the previous period days of the week to current period. Default false.
+ * @param bool $weekday_align Whether to align the previous period days of the week to current period. Default false.
*
* @return array List with two elements, the first with the start date and the second with the end date, both as
* 'Y-m-d'.
*/
- public function parse_date_range( $range, $multiplier = 1, $offset = 1, $previous = false, $day_align = false ) {
+ public function parse_date_range( $range, $multiplier = 1, $offset = 1, $previous = false, $weekday_align = false ) {
preg_match( '*-(\d+)-*', $range, $matches );
$number_of_days = $multiplier * ( isset( $matches[1] ) ? $matches[1] : 28 );
@@ -591,7 +591,7 @@ abstract class Module {
// Check the day of the week alignment.
$previous_day_of_week = gmdate( 'w', strtotime( $date_end ) );
$yesterday_day_of_week = gmdate( 'w', strtotime( 'yesterday' ) );
- if ( $day_align && $previous && $previous_day_of_week !== $yesterday_day_of_week ) {
+ if ( $weekday_align && $previous && $previous_day_of_week !== $yesterday_day_of_week ) {
// Adjust the date to closest period that matches the same days of the week.
$off_by = $number_of_days % 7;
if ( $off_by > 3 ) {
| 10 |
diff --git a/src/schemas/json/prettierrc.json b/src/schemas/json/prettierrc.json {
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Schema for .prettierrc",
- "type": "object",
+ "type": ["object", "string"],
"definitions": {
"optionsDefinition": {
"type": "object",
}
}
},
+ "oneOf": [
+ { "type": "string" },
+ {
+ "type": "object",
"allOf": [
{ "$ref": "#/definitions/optionsDefinition" },
{ "$ref": "#/definitions/overridesDefinition" }
]
}
+ ]
+}
| 11 |
diff --git a/admin-base/materialize/custom/_debugger.scss b/admin-base/materialize/custom/_debugger.scss left: 0;
right: 0;
bottom: 0;
+ overflow: hidden;
background-color: color("blue-grey", "darken-3");
+ .row {
+ height: 100%;
+ }
+ .debugger-levels {
+ height: 100%;
+ overflow: auto;
.collection {
border-color: color("blue-grey", "lighten-4");
.collection-item {
}
}
}
+ }
+ .debugger-object-view {
+ height: 100%;
+ overflow: auto;
+ code pre {
+ font-family: "Inconsolata-g", Consolas, "Source Code Pro", Monaco, Menlo, monospace;
+ }
ul.list-inline {
padding-bottom: 0.75rem;
border-bottom: 1px solid color("blue-grey", "lighten-4");
}
}
}
- code pre {
- font-family: "Inconsolata-g", Consolas, "Source Code Pro", Monaco, Menlo, monospace;
}
&.visible {
bottom: 0;
| 11 |
diff --git a/src/pages/strategy/tabs/locking/locking.js b/src/pages/strategy/tabs/locking/locking.js .addClass("lock_mode_" + ship.sally);
} else {
const icon = $(".ship_icon", shipRow);
- icon.draggable({
+ shipRow.draggable({
helper: () => icon.clone().addClass("ship_icon_dragged").appendTo(".planner_area"),
revert: "invalid",
- containment: $(".planner_area")
+ containment: $(".planner_area"),
+ cursor: "pointer",
+ cursorAt: { left: 18, top: 18 }
});
if(ship.lockPlan !== undefined){
setDroppable() {
$(".drop_area").droppable({
- accept: ".ship_icon",
+ accept: ".ship_item",
addClasses: false,
drop: (event, ui) => {
- const ship = this.getShipById(ui.draggable.closest(".ship_item").data("ship_id"));
+ const ship = this.getShipById(ui.draggable.data("ship_id"));
const boxIndex = $(event.target).data("boxid");
this.switchPlannedLock(ship, boxIndex);
}
| 11 |
diff --git a/articles/clients/client-grant-types.md b/articles/clients/client-grant-types.md @@ -69,6 +69,10 @@ Public Clients, indicated by the `token_endpoint_auth_method` flag set to `none`
* `authorization_code`;
* `refresh_token`.
+::: note
+Public clients **cannot** utilize the `client_credentials` grant type. To add this grant type to a Client, set the `token_endpoint_auth_method` to `client_secret_post` or `client_secret_basic`. Either of these will indicate the Client is confidential, not public.
+:::
+
### Confidential Clients
Confidential Clients, indicated by the `token_endpoint_auth_method` flag set to anything *except* `none`, are those created in the Dashboard for Regular Web Applications or Non-Interactive Clients. Additionally, any Client where `token_endpoint_auth_method` is unspecified is confidential. By default, Confidential Clients are created with the following `grant_types`:
| 0 |
diff --git a/configs/modelica.json b/configs/modelica.json }
},
{
- "url": "https://doc.modelica.org/Modelica%20(?P<version>.*?)/Resources/help(?P<tool>.*?)/ModelicaReference.",
+ "url": "https://doc.modelica.org/Modelica%20(?P<version>.*?)/Resources/help(?P<tool>.*?)/ModelicaReference.html",
"variables": {
"library": [
"ModelicaReference"
}
},
{
- "url": "https://doc.modelica.org/Modelica%20(?P<version>.*?)/Resources/help(?P<tool>.*?)/ModelicaServices.",
+ "url": "https://doc.modelica.org/Modelica%20(?P<version>.*?)/Resources/help(?P<tool>.*?)/ModelicaServices.html",
"variables": {
"library": [
"ModelicaServices"
}
},
{
- "url": "https://doc.modelica.org/Modelica%20(?P<version>.*?)/Resources/help(?P<tool>.*?)/(?P<library>.*?).",
+ "url": "https://doc.modelica.org/Modelica%20(?P<version>.*?)/Resources/help(?P<tool>.*?)/(?P<library>.*?).html",
"variables": {
"library": [
"Modelica",
| 12 |
diff --git a/src/components/nodes/association/association.vue b/src/components/nodes/association/association.vue @@ -36,7 +36,7 @@ export default {
},
methods: {
handleClick() {
- this.$parent.setInspector(this.node.definition, this.inspectorConfig);
+ this.$parent.loadInspector('processmaker-modeler-association', this.node.definition, this);
},
updateShape() {},
completeLink() {
| 14 |
diff --git a/js/models/wallet/Balance.js b/js/models/wallet/Balance.js -import { integerToDecimal } from '../../utils/currency';
+import { integerToDecimal, getCoinDivisibility } from '../../utils/currency';
import BaseModel from '../BaseModel';
export default class extends BaseModel {
@@ -13,8 +13,17 @@ export default class extends BaseModel {
// support the currency as a wallet currency (i.e. no entry in the cryptoCurrencies
// data file). The wallet will list the currency, but it will be marked as
// unsupported.
- confirmed: integerToDecimal(response.confirmed, response.code),
- unconfirmed: integerToDecimal(response.unconfirmed, response.code),
+
+ // TODO: temp use of local coin div until the server provides it
+ // TODO: temp use of local coin div until the server provides it
+ // TODO: temp use of local coin div until the server provides it
+ // TODO: temp use of local coin div until the server provides it
+ // TODO: temp use of local coin div until the server provides it
+ // TODO: temp use of local coin div until the server provides it
+ // TODO: temp use of local coin div until the server provides it
+ // TODO: temp use of local coin div until the server provides it
+ confirmed: integerToDecimal(response.confirmed, getCoinDivisibility(response.code)),
+ unconfirmed: integerToDecimal(response.unconfirmed, getCoinDivisibility(response.code)),
};
}
}
| 4 |
diff --git a/js/webcomponents/bisweb_filetreepanel.js b/js/webcomponents/bisweb_filetreepanel.js @@ -53,8 +53,6 @@ class FileTreePanel extends HTMLElement {
});
-
-
let listElement = this.panel.getWidget();
let biswebElementMenu = $(`<div class='bisweb-elements-menu'></div>`);
biswebElementMenu.css({'margin-top' : '15px'});
@@ -234,8 +232,6 @@ class FileTreePanel extends HTMLElement {
}
- console.log('file tree', fileTree);
-
//if the file tree is empty, display an error message and return
if (fileTree.length === 0) {
bis_webutil.createAlert('No study files could be found in the chosen directory, try a different directory.', false);
@@ -521,6 +517,7 @@ class FileTreePanel extends HTMLElement {
//node is already selected by select_node event handler so nothing to do for selecting a picture
};
+
let handleRightClick = (data) => {
if (data.node.original.type === 'directory') {
this.toggleContextMenuLoadButtons(tree, 'off');
@@ -552,7 +549,6 @@ class FileTreePanel extends HTMLElement {
});
tree.bind('dblclick.jstree', () => {
- //console.log('dblclick', e);
handleDblClick();
});
}
@@ -958,14 +954,20 @@ class FileTreePanel extends HTMLElement {
message : 'Please enter the task number.',
size : 'small',
callback: () => {
- //textbox input should override slider
+ //textbox input should override if it's different
let result = box.find('.tag-input')[0].value || box.find('.bootstrap-task-slider').val();
console.log('result', result);
- let name = selectedValue + '_' + result;
- this.currentlySelectedNode.original.tag = name;
+ let tagName = selectedValue + '_' + result, displayedName = '(' + tagName + ')';
+ this.currentlySelectedNode.original.tag = tagName;
console.log('currently selected node', this.currentlySelectedNode);
- this.currentlySelectedNode.text = '(' + name + ')' + this.currentlySelectedNode.text
+ //update name for underlying data structure and jstree object
+ this.currentlySelectedNode.original.text = displayedName + this.currentlySelectedNode.text
+ this.currentlySelectedNode.text = this.currentlySelectedNode.original.text;
+
+ //update name displayed on file tree panel
+ let tree = this.panel.widget.find('.file-container').jstree();
+ tree.redraw(true);
}
});
| 3 |
diff --git a/build/docs-rtl.js b/build/docs-rtl.js */
const sh = require('shelljs')
-sh.config.fatal = true
+const os = require('os')
+
+if (os.platform === 'win32') {
+ sh.exec('echo Win32')
+ sh.exec('find site/docs/4.1/examples/ -mindepth 1 -maxdepth 1 -type d -name "rtl-*" -exec bash -c \'rm -rf site/docs/4.1/examples/$(basename "{}")/* ; rmdir site/docs/4.1/examples/$(basename "{}")\' ;', (code, stdout, stderr) => {
+ console.log('Exit code:', code)
+ console.log('Program output:', stdout)
+ console.log('Program stderr:', stderr)
+
+ sh.exec('find site/docs/4.1/examples/ -mindepth 1 -maxdepth 1 -type d ! -name "screenshots" -exec bash -c \'mkdir -p site/docs/4.1/examples/rtl-$(basename "{}") ; cp -av "{}"/* site/docs/4.1/examples/rtl-$(basename "{}")/\' ;', (code, stdout, stderr) => {
+ console.log('Exit code:', code)
+ console.log('Program output:', stdout)
+ console.log('Program stderr:', stderr)
+
+ sh.exec('find site/docs/4.1/examples/rtl-* -type f -name "*.html" -exec sed -i \'s/boosted\\.css/boosted-rtl\\.css/gi\' {} ;', (code, stdout, stderr) => {
+ console.log('Exit code:', code)
+ console.log('Program output:', stdout)
+ console.log('Program stderr:', stderr)
+
+ sh.exec('find site/docs/4.1/examples/rtl-* -type f -name "*.html" -exec sed -i \'s/boosted\\.min\\.css/boosted-rtl\\.min\\.css/gi\' {} ;', (code, stdout, stderr) => {
+ console.log('Exit code:', code)
+ console.log('Program output:', stdout)
+ console.log('Program stderr:', stderr)
+
+ sh.exec('find site/docs/4.1/examples/rtl-* -type f -name "*.html" -exec sed -i \'s/html lang="en"/html lang="en" dir="rtl"/gi\' {} ;', (code, stdout, stderr) => {
+ console.log('Exit code:', code)
+ console.log('Program output:', stdout)
+ console.log('Program stderr:', stderr)
+ })
+ })
+ })
+ })
+ })
+} else if (os.platform === 'linux') {
+ sh.exec('echo linux')
sh.exec('find site/docs/4.1/examples/ -mindepth 1 -maxdepth 1 -type d -name "rtl-*" -exec bash -c \'rm -rf site/docs/4.1/examples/$(basename "{}")/* ; rmdir site/docs/4.1/examples/$(basename "{}")\' \\;', (code, stdout, stderr) => {
console.log('Exit code:', code)
console.log('Program output:', stdout)
@@ -40,4 +74,35 @@ sh.exec('find site/docs/4.1/examples/ -mindepth 1 -maxdepth 1 -type d -name "rtl
})
})
})
+} else {
+ sh.exec('echo unknown')
+ sh.exec('find site/docs/4.1/examples/ -mindepth 1 -maxdepth 1 -type d -name "rtl-*" -exec bash -c \'rm -rf site/docs/4.1/examples/$(basename "{}") ; rmdir site/docs/4.1/examples/$(basename "{}")\' ;', (code, stdout, stderr) => {
+ console.log('Exit code:', code)
+ console.log('Program output:', stdout)
+ console.log('Program stderr:', stderr)
+
+ sh.exec('find site/docs/4.1/examples/ -mindepth 1 -maxdepth 1 -type d ! -name "screenshots" -exec bash -c \'mkdir -p site/docs/4.1/examples/rtl-$(basename "{}") ; cp -av "{}" site/docs/4.1/examples/rtl-$(basename "{}")/\' ;', (code, stdout, stderr) => {
+ console.log('Exit code:', code)
+ console.log('Program output:', stdout)
+ console.log('Program stderr:', stderr)
+
+ sh.exec('find site/docs/4.1/examples/rtl-* -type f -name "*.html" -exec sed -i \'s/boosted\\.css/boosted-rtl\\.css/gi\' {} ;', (code, stdout, stderr) => {
+ console.log('Exit code:', code)
+ console.log('Program output:', stdout)
+ console.log('Program stderr:', stderr)
+ sh.exec('find site/docs/4.1/examples/rtl-* -type f -name "*.html" -exec sed -i \'s/boosted\\.min\\.css/boosted-rtl\\.min\\.css/gi\' {} ;', (code, stdout, stderr) => {
+ console.log('Exit code:', code)
+ console.log('Program output:', stdout)
+ console.log('Program stderr:', stderr)
+
+ sh.exec('find site/docs/4.1/examples/rtl-* -type f -name "*.html" -exec sed -i \'s/html lang="en"/html lang="en" dir="rtl"/gi\' {} ;', (code, stdout, stderr) => {
+ console.log('Exit code:', code)
+ console.log('Program output:', stdout)
+ console.log('Program stderr:', stderr)
+ })
+ })
+ })
+ })
+ })
+}
| 1 |
diff --git a/app/controllers/Application.scala b/app/controllers/Application.scala @@ -50,8 +50,8 @@ object Application extends Controller {
private lazy val config = AppUtils.notebookConfig
private lazy val notebookManager = AppUtils.notebookManager
- private val kernelIdToCalcService = collection.mutable.Map[String, CalcWebSocketService]()
- private val kernelIdToObservableActor = collection.mutable.Map[String, ActorRef]()
+ private val kernelIdToCalcService = new collection.concurrent.TrieMap[String, CalcWebSocketService]()
+ private val kernelIdToObservableActor = new collection.concurrent.TrieMap[String, ActorRef]()
private val clustersActor = kernelSystem.actorOf(Props(NotebookClusters(AppUtils.clustersConf)))
private implicit def kernelSystem: ActorSystem = AppUtils.kernelSystem
| 4 |
diff --git a/src/js/Edit/L.PM.Edit.Line.js b/src/js/Edit/L.PM.Edit.Line.js @@ -345,11 +345,11 @@ Edit.Line = Edit.extend({
let nextMarkerIndex;
let prevMarkerIndex;
if(ringIndex > -1) {
- nextMarkerIndex = index + 1 >= this._markers[ringIndex][index].length ? 0 : index + 1;
- prevMarkerIndex = index - 1 < 0 ? this._markers[ringIndex][index].length - 1 : index - 1;
+ nextMarkerIndex = index + 1 >= this._markers[ringIndex].length ? 0 : index + 1;
+ prevMarkerIndex = index - 1 < 0 ? this._markers[ringIndex].length - 1 : index - 1;
} else {
- nextMarkerIndex = index + 1 >= this._markers[index].length ? 0 : index + 1;
- prevMarkerIndex = index - 1 < 0 ? this._markers[index].length - 1 : index - 1;
+ nextMarkerIndex = index + 1 >= this._markers.length ? 0 : index + 1;
+ prevMarkerIndex = index - 1 < 0 ? this._markers.length - 1 : index - 1;
}
// update middle markers on the left and right
@@ -359,13 +359,14 @@ Edit.Line = Edit.extend({
let prevMarkerLatLng;
let nextMarkerLatLng;
+ // console.log(`marker index: ${index}`, `prev: ${prevMarkerIndex}`, `next: ${nextMarkerIndex}`);
+
if(ringIndex > -1) {
- console.log(ringIndex, index, this._markers);
- prevMarkerLatLng = this._markers[ringIndex][prevMarkerIndex].getLatLng();
- nextMarkerLatLng = this._markers[ringIndex][nextMarkerIndex].getLatLng();
+ nextMarkerLatLng = this._markers[ringIndex][prevMarkerIndex].getLatLng();
+ prevMarkerLatLng = this._markers[ringIndex][nextMarkerIndex].getLatLng();
} else {
- prevMarkerLatLng = this._markers[prevMarkerIndex].getLatLng();
- nextMarkerLatLng = this._markers[nextMarkerIndex].getLatLng();
+ nextMarkerLatLng = this._markers[prevMarkerIndex].getLatLng();
+ prevMarkerLatLng = this._markers[nextMarkerIndex].getLatLng();
}
if(marker._middleMarkerNext) {
| 1 |
diff --git a/src/renderer/marketplace/exchanges/exchanges-details.jsx b/src/renderer/marketplace/exchanges/exchanges-details.jsx @@ -23,11 +23,7 @@ const styles = theme => ({
},
title: {
- margin: '20px'
- },
-
- icon: {
- marginLeft: '20px'
+ margin: '20px 20px 20px 12px'
},
header: {
@@ -224,6 +220,12 @@ const styles = theme => ({
leftAlign: {
textAlign: 'left'
},
+ icon: {
+ alignItems: 'center',
+ display: 'flex',
+ height: '44px',
+ marginLeft: '12px'
+ },
defaultIcon: {
alignItems: 'center',
borderRadius: '8px',
@@ -231,10 +233,12 @@ const styles = theme => ({
display: 'flex',
justifyContent: 'center',
maxWidth: '44px',
- width: '44px'
+ padding: '0 8px'
},
generatedIcon: {
- height: '44px'
+ height: 'inherit',
+ maxWidth: '28px',
+ width: '44px'
},
disclaimer: {
margin: '20px auto',
| 1 |
diff --git a/articles/users/guides/bulk-user-imports.md b/articles/users/guides/bulk-user-imports.md @@ -47,7 +47,7 @@ Create a request that contains the following parameters:
|-----------|-------------|
| `users` | [File in JSON format](/users/references/bulk-import-database-schema-examples#file-example) that contains the users to import. |
| `connection_id` | ID of the connection to which users will be inserted. You can retrieve the ID using the [GET /api/v2/connections](/api/management/v2#!/Connections/get_connections) endpoint. |
-| `upsert` | Boolean value; `false` by default. When set to `false`, pre-existing users that match on email address will fail. When set to `true`, pre-existing users that match on email address will be updated, but only with upsertable attributes. For a list of user profile fields that can be upserted during import, see [User Profile Attributes](/users/references/user-profile-structure#user-profile-attributes). |
+| `upsert` | Boolean value; `false` by default. When set to `false`, pre-existing users that match on email address, user id, or username will fail. When set to `true`, pre-existing users that match on any of these fields will be updated, but only with upsertable attributes. For a list of user profile fields that can be upserted during import, see [User Profile Attributes](/users/references/user-profile-structure#user-profile-attributes). |
| `external_id` | Optional user-defined string that can be used to correlate multiple jobs. Returned as part of the job status response. |
| `send_completion_email` | Boolean value; `true` by default. When set to `true`, sends a completion email to all tenant owners when the import job is finished. If you do *not* want emails sent, you must explicitly set this parameter to `false`. |
| 3 |
diff --git a/src/image/roi/creator/fromMaskConnectedComponentLabelingAlgorithm.js b/src/image/roi/creator/fromMaskConnectedComponentLabelingAlgorithm.js @@ -20,7 +20,7 @@ const neighbours8 = [null, null, null, null];
/*
Implementation of the connected-component labeling algorithm
*/
-export default function fromKaskConnectedComponentLabelingAlgorithm(mask, options = {}) {
+export default function fromMaskConnectedComponentLabelingAlgorithm(mask, options = {}) {
const {
allowCorners = false
} = options;
@@ -48,7 +48,7 @@ export default function fromKaskConnectedComponentLabelingAlgorithm(mask, option
const width = mask.width;
const height = mask.height;
const labels = new Array(size);
- const data = new Int16Array(size);
+ const data = new Uint32Array(size);
const linked = new DisjointSet();
let currentLabel = 1;
| 11 |
diff --git a/src/components/RegionTable/RegionTable.js b/src/components/RegionTable/RegionTable.js @@ -63,16 +63,10 @@ const RegionTable: ComponentType<Props> = ({
}
}, [country, nhsRegion, localAuthority]);
- const handleOnLocalAuthorityClick = (r: string) => () => {
- if (layout === 'desktop') {
- setLocalAuthority(r);
- setCountry(null);
- }
- };
-
const handleOnCountryClick = (r: string) => () => {
if (layout === 'desktop') {
setCountry(r);
+ setNhsRegion(null);
setLocalAuthority(null);
}
};
@@ -85,6 +79,14 @@ const RegionTable: ComponentType<Props> = ({
}
};
+ const handleOnLocalAuthorityClick = (r: string) => () => {
+ if (layout === 'desktop') {
+ setCountry(null);
+ setNhsRegion(null);
+ setLocalAuthority(r);
+ }
+ };
+
const { lastUpdatedAt: _, ...countries } = countryData;
const countryKeys = Object.keys(countries);
| 12 |
diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js @@ -176,8 +176,8 @@ function setUpPoliciesAndNavigate(session, currentPath) {
let exitTo;
try {
- const params = new URLSearchParams(currentPath);
- exitTo = params.get('exitTo');
+ const url = new URL(currentPath, CONST.NEW_EXPENSIFY_URL);
+ exitTo = url.searchParams.get('exitTo');
} catch (error) {
// URLSearchParams is unsupported on iOS so we catch th error and
// silence it here since this is primarily a Web flow
| 7 |
diff --git a/source/indexer/test/Indexer.js b/source/indexer/test/Indexer.js @@ -207,7 +207,7 @@ contract('Indexer', async accounts => {
from: aliceAddress,
}
),
- 'SafeMath: subtraction overflow'
+ ' ERC20: transfer amount exceeds balance.'
)
})
@@ -227,7 +227,7 @@ contract('Indexer', async accounts => {
from: aliceAddress,
}
),
- 'SafeMath: subtraction overflow'
+ ' ERC20: transfer amount exceeds allowance.'
)
})
| 3 |
diff --git a/src/encoded/tests/test_post_put_patch.py b/src/encoded/tests/test_post_put_patch.py @@ -130,22 +130,6 @@ def test_patch(content, testapp):
assert res.json['@graph'][0]['simple2'] == 'supplied simple2'
-def test_patch_new_schema_version(content, root, testapp, monkeypatch):
- collection = root['testing_post_put_patch']
- properties = collection.type_info.schema['properties']
-
- url = content['@id']
- res = testapp.get(url)
- assert res.json['schema_version'] == '1'
-
- monkeypatch.setitem(properties['schema_version'], 'default', '2')
- monkeypatch.setattr(collection.type_info, 'schema_version', '2')
- monkeypatch.setitem(properties, 'new_property', {'default': 'new'})
- res = testapp.patch_json(url, {}, status=200)
- assert res.json['@graph'][0]['schema_version'] == '2'
- assert res.json['@graph'][0]['new_property'] == 'new'
-
-
def test_admin_put_protected_link(link_targets, testapp):
res = testapp.post_json(COLLECTION_URL, item_with_link[0], status=201)
url = res.location
| 2 |
diff --git a/src/og/renderer/RendererEvents.js b/src/og/renderer/RendererEvents.js @@ -224,6 +224,9 @@ class RendererEvents extends Events {
this.mouseState.x,
this.mouseState.y
);
+ //
+ // TODO: Replace in some other place with a thought that we do
+ // not need to make unproject when we do not make touching
this.touchState.direction = this.renderer.activeCamera.unproject(
this.touchState.x,
this.touchState.y
| 0 |
diff --git a/client/homebrew/pages/userPage/brewItem/brewItem.jsx b/client/homebrew/pages/userPage/brewItem/brewItem.jsx @@ -7,7 +7,7 @@ const moment = require('moment');
const request = require('superagent');
const googleDriveIcon = require('../../../googleDrive.png');
-const { default: dedentTabs } = require('dedent-tabs');
+const dedent = require('dedent-tabs').default;
const BrewItem = createClass({
getDefaultProps : function() {
@@ -119,10 +119,9 @@ const BrewItem = createClass({
<i className='far fa-file' /> {brew.pageCount}
</span>
}
- <span title={dedentTabs(`
+ <span title={dedent`
Created: ${moment(brew.createdAt).local().format(dateFormatString)}
- Last updated: ${moment(brew.updatedAt).local().format(dateFormatString)}
- `)}>
+ Last updated: ${moment(brew.updatedAt).local().format(dateFormatString)}`}>
<i className='fas fa-sync-alt' /> {moment(brew.updatedAt).fromNow()}
</span>
{this.renderGoogleDriveIcon()}
| 10 |
diff --git a/assets/js/modules/thank-with-google/components/setup/SetupMain.js b/assets/js/modules/thank-with-google/components/setup/SetupMain.js /**
* External dependencies
*/
+import { useCallback } from '@wordpress/element';
import PropTypes from 'prop-types';
/**
@@ -42,7 +43,8 @@ import SetupPublicationActive from './SetupPublicationActive';
import SetupPublicationActionRequired from './SetupPublicationActionRequired';
import SetupPublicationPendingVerification from './SetupPublicationPendingVerification';
import StoreErrorNotices from '../../../../components/StoreErrorNotices';
-const { useSelect } = Data;
+import { useRefocus } from '../../../../hooks/useRefocus';
+const { useDispatch, useSelect } = Data;
export default function SetupMain( { finishSetup } ) {
const hasErrors = useSelect( ( select ) =>
@@ -55,6 +57,20 @@ export default function SetupMain( { finishSetup } ) {
select( MODULES_THANK_WITH_GOOGLE ).getCurrentPublication()
);
+ const { resetPublications } = useDispatch( MODULES_THANK_WITH_GOOGLE );
+
+ const reset = useCallback( () => {
+ // Do not reset if the publication ID has already been set.
+ if ( publicationID ) {
+ return;
+ }
+
+ resetPublications();
+ }, [ publicationID, resetPublications ] );
+
+ // Reset all fetched data when user re-focuses window.
+ useRefocus( reset, 15000 );
+
let viewComponent;
if ( hasErrors ) {
| 4 |
diff --git a/docs/reference.rst b/docs/reference.rst @@ -716,7 +716,7 @@ Runs another TagUI flow. Checks the flow's folder.
comment
###################
-Adds a comment.
+Adds a comment. If you are inside a code block, for example an if condition or for loop, be sure to indent your comment accordingly to let TagUI run correctly after it converts into JavaScript code.
.. code-block:: none
| 7 |
diff --git a/userscript.user.js b/userscript.user.js @@ -64908,6 +64908,7 @@ var $$IMU_EXPORT$$;
// thanks to fireattack on github: https://github.com/qsniyg/maxurl/issues/98
// https://hayabusa.io/abema/programs/386-48_s0_p25/thumb002.q85.w200.h114.v1534496588.webp
// https://hayabusa.io/abema/programs/386-48_s0_p25/thumb002.webp
+ // https://hayabusa.io/abema/programs/386-48_s0_p25/thumb002.webp?q=100&quality=100
// https://hayabusa.io/adcross/adx/abm/2b9ad238-8730-4909-a55a-ad82ed28490b.png?w=484&h=272
// https://hayabusa.io/adcross/adx/abm/2b9ad238-8730-4909-a55a-ad82ed28490b.png
// https://hayabusa.io/abema/programs/12-20_s0_p25/thumb002.png?w=242&h=136
@@ -64917,6 +64918,7 @@ var $$IMU_EXPORT$$;
// https://hayabusa.io/makuake/upload/temporary/2926/detail/detail_2926_1543415491.jpeg?width=640&quality=95&format=jpeg&ttl=31536000&force
// https://hayabusa.io/makuake/upload/temporary/2926/detail/detail_2926_1543415491.jpeg?q=100&quality=100
// https://hayabusa.io/openrec-image/thumbnails/12009/1200829/origin/6/captured_5511.q95.w350.ttl604800.headercache300.jpeg?q=100&quality=100
+ // https://hayabusa.io/openrec-image/thumbnails/12009/1200829/origin/6/captured_5511.width100.height100.quality100.jpeg
// https://hayabusa.io/openrec-image/thumbnails/12009/1200829/origin/6/captured_5511.jpeg?q=100&quality=100
// https://hayabusa.io/makuake/upload/project/4248/main_4248.fit-scale.jpeg?q=100&quality=100
// https://hayabusa.io/makuake/upload/project/4248/main_4248.jpeg?q=100&quality=100
@@ -64925,11 +64927,53 @@ var $$IMU_EXPORT$$;
// 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?q=100&quality=100&format=webp
// https://hayabusa.io/abema/programs/218-271_s0_p5/thumb001.v1604481062?q=100&quality=100
+ // https://hayabusa.io/abema/programs/218-271_s0_p5/thumb001?q=100&quality=100 -- png
// http://hayabusa.io/test/doge.auto
// http://hayabusa.io/test/doge.auto?q=100&quality=100
+
+ var queries = get_queries(src);
+ var basename = src.replace(/.*\/([^/?#]+)(?:[?#].*)?$/, "$1");
+ var splitted = basename.split(".");
+ var newsplitted = [];
+
+ array_foreach(splitted, function(x, i) {
+ if (i === 0) {
+ newsplitted.push(x);
+ return;
+ }
+
+ if (i === splitted.length - 1) {
+ if (/^(jpe?g|png|gif|webp|auto)$/.test(x)) {
+ newsplitted.push(x);
+ return;
+ }
+ }
+
+ var kv = x.match(/^(width|height|quality|ttl|headercache|fit|background|format|[hwqv])-?([0-9a-z]+)$/);
+ if (!kv) {
+ newsplitted.push(x);
+ return;
+ }
+
+ var key = kv[1];
+ var value = kv[2];
+
+ if (!(key in queries))
+ queries[key] = value;
+ });
+
+ queries.q = 100;
+ queries.quality = 100;
+
+ if (queries.format === "webp")
+ delete queries.format;
+
+ return keep_queries(add_queries(src.replace(/\/[^/]+(?:[?#].*)?$/, "/" + newsplitted.join(".")), queries), ["q", "quality", "format"]);
return src
- .replace(/(\/[^/.]*)(?:\.[-a-z]+[0-9]*)*(\.[^/.]*)(?:[?#].*)?$/, "$1$2")
+ //.replace(/(\/[^/.]*)(?:\.[-a-z]+[0-9]*)*(\.[^/.]*)(?:[?#].*)?$/, "$1$2")
+ .replace(/(\/[^/.]+)(?:\.(?:[hwqv]|width|height|quality|ttl|headercache|fit|background|format)-?[0-9a-z]+)*(\.(?:jpe?g|png|webp|gif))?([?#].*)?$/, "$1$2$3")
//.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")
| 7 |
diff --git a/src/js/base/core/env.js b/src/js/base/core/env.js @@ -9,17 +9,17 @@ const isSupportAmd = typeof define === 'function' && define.amd; // eslint-disab
*/
function isFontInstalled(fontName) {
const testFontName = fontName === 'Comic Sans MS' ? 'Courier New' : 'Comic Sans MS';
- const $tester = $('<div>').css({
- position: 'absolute',
- left: '-9999px',
- top: '-9999px',
- fontSize: '200px',
- }).text('mmmmmmmmmwwwwwww').appendTo(document.body);
+ const testText = 'mmmmmmmmmmwwwww';
+ const testSize = '200px';
- const originalWidth = $tester.css('fontFamily', testFontName).width();
- const width = $tester.css('fontFamily', fontName + ',' + testFontName).width();
+ var canvas = document.createElement('canvas');
+ var context = canvas.getContext('2d');
- $tester.remove();
+ context.font = testSize + " '" + testFontName + "'";
+ const originalWidth = context.measureText(testText).width;
+
+ context.font = testSize + " '" + fontName + "', '" + testFontName + "'";
+ const width = context.measureText(testText).width;
return originalWidth !== width;
}
| 14 |
diff --git a/grocy.openapi.json b/grocy.openapi.json },
"shopping_location_id": {
"type": "integer"
+ },
+ "userfields": {
+ "type": "object",
+ "description": "Key/value pairs of userfields"
}
},
"example": {
"enable_tare_weight_handling": "0",
"tare_weight": "0.0",
"not_check_stock_fulfillment_for_recipes": "0",
- "shopping_location_id": null
+ "shopping_location_id": null,
+ "userfields": null
}
},
"QuantityUnit": {
},
"plural_forms": {
"type": "string"
+ },
+ "userfields": {
+ "type": "object",
+ "description": "Key/value pairs of userfields"
}
},
"example": {
"description": null,
"row_created_timestamp": "2019-05-02 20:12:25",
"name_plural": "Pieces",
- "plural_forms": null
+ "plural_forms": null,
+ "userfields": null
}
},
"Location": {
"row_created_timestamp": {
"type": "string",
"format": "date-time"
+ },
+ "userfields": {
+ "type": "object",
+ "description": "Key/value pairs of userfields"
}
},
"example": {
"id": "2",
"name": "0",
"description": null,
- "row_created_timestamp": "2019-05-02 20:12:25"
+ "row_created_timestamp": "2019-05-02 20:12:25",
+ "userfields": null
}
},
"ShoppingLocation": {
"row_created_timestamp": {
"type": "string",
"format": "date-time"
+ },
+ "userfields": {
+ "type": "object",
+ "description": "Key/value pairs of userfields"
}
},
"example": {
"id": "2",
"name": "0",
"description": null,
- "row_created_timestamp": "2019-05-02 20:12:25"
+ "row_created_timestamp": "2019-05-02 20:12:25",
+ "userfields": null
}
},
"StockLocation": {
"row_created_timestamp": {
"type": "string",
"format": "date-time"
+ },
+ "userfields": {
+ "type": "object",
+ "description": "Key/value pairs of userfields"
}
}
},
"row_created_timestamp": {
"type": "string",
"format": "date-time"
+ },
+ "userfields": {
+ "type": "object",
+ "description": "Key/value pairs of userfields"
}
}
},
"row_created_timestamp": {
"type": "string",
"format": "date-time"
+ },
+ "userfields": {
+ "type": "object",
+ "description": "Key/value pairs of userfields"
}
}
},
"row_created_timestamp": {
"type": "string",
"format": "date-time"
+ },
+ "userfields": {
+ "type": "object",
+ "description": "Key/value pairs of userfields"
}
}
},
| 0 |
diff --git a/packages/app/src/components/Admin/ImportData/GrowiArchive/ErrorViewer.jsx b/packages/app/src/components/Admin/ImportData/GrowiArchive/ErrorViewer.jsx import React from 'react';
+
import PropTypes from 'prop-types';
-import { withTranslation } from 'react-i18next';
+import { useTranslation } from 'react-i18next';
import { Modal, ModalHeader, ModalBody } from 'reactstrap';
import { withUnstatedContainers } from '../../../UnstatedUtils';
@@ -42,9 +43,15 @@ ErrorViewer.propTypes = {
errors: PropTypes.arrayOf(PropTypes.object),
};
+const ErrorViewerWrapperFc = (props) => {
+ const { t } = useTranslation();
+
+ return <ErrorViewer t={t} {...props} />;
+};
+
/**
* Wrapper component for using unstated
*/
-const ErrorViewerWrapper = withUnstatedContainers(ErrorViewer, []);
+const ErrorViewerWrapper = withUnstatedContainers(ErrorViewerWrapperFc, []);
-export default withTranslation()(ErrorViewerWrapper);
+export default ErrorViewerWrapper;
| 14 |
diff --git a/stats.js b/stats.js @@ -31,7 +31,7 @@ export var Stats = function () {
msDiv.appendChild( msText );
var msTexts = [];
- var nLines = 11;
+ var nLines = 13;
for(var i = 0; i < nLines; i++){
msTexts[i] = document.createElement( 'div' );
msTexts[i].style.cssText = 'color:white;background-color:rgba(0,0,0,0.3);font-family:Helvetica,Arial,sans-serif;font-size:13px;line-height:15px';
@@ -69,8 +69,8 @@ export var Stats = function () {
msTexts[i++].textContent = "Geometries: " +webGLRenderer.info.memory.geometries;
msTexts[i++].textContent = "Textures: " + webGLRenderer.info.memory.textures;
- // msTexts[i++].textContent = "== Render ======";
- // msTexts[i++].textContent = "Calls: " + webGLRenderer.info.render.calls;
+ msTexts[i++].textContent = "== Render =====";
+ msTexts[i++].textContent = "Draw Calls: " + webGLRenderer.info.render.calls;
// msTexts[i++].textContent = "Triangles: " + webGLRenderer.info.render.triangles;
frames = 0;
lastTime = Date.now();
@@ -78,3 +78,4 @@ export var Stats = function () {
}
}
};
+
\ No newline at end of file
| 0 |
diff --git a/dapp/src/components/Nav.js b/dapp/src/components/Nav.js @@ -70,7 +70,7 @@ const DappLinks = ({ dapp, page }) => {
page === 'stake' ? 'selected' : ''
}`}
>
- {fbt('Stake OGN', 'Stake OGN')}
+ {fbt('Earn OGN', 'Earn OGN')}
</a>
</Link>
)}
| 10 |
diff --git a/metaversefile-api.js b/metaversefile-api.js @@ -150,6 +150,7 @@ const localPlayer = new LocalPlayer({
localPlayer.position.y = initialPosY;
localPlayer.updateMatrixWorld();
const remotePlayers = new Map();
+const npcs = [];
class ErrorBoundary extends React.Component {
constructor(props) {
@@ -492,6 +493,9 @@ metaversefile.setApi({
useRemotePlayers() {
return Array.from(remotePlayers.values());
},
+ useNpcs() {
+ return npcs;
+ },
useLoaders() {
return loaders;
},
| 0 |
diff --git a/lib/api/protocol/url.js b/lib/api/protocol/url.js @@ -37,7 +37,8 @@ module.exports = class Action extends ProtocolAction {
if (this.settings.output) {
spinner = ora({
text: `Loading url: ${url}\n`,
- prefixText: ' '
+ prefixText: ' ',
+ discardStdin: false
}).start();
}
| 12 |
diff --git a/articles/support/index.md b/articles/support/index.md @@ -68,3 +68,62 @@ In addition to the Auth0 Community, paid subscribers can create a private ticket
[Learn more about creating tickets with Support Center](/support/tickets)
Critical Production issues should always be reported via the [Support Center](https://support.auth0.com/) for fastest response.
+
+## Ticket Response Times
+
+Ticket response times will vary based on your support plan (shown below). Note that customers on non-paying trial or free subscriptions are not eligible for a support plan and should utilize the [Auth0 Community](https://ask.auth0.com).
+
+<table class="table">
+ <thead>
+ <tr>
+ <th></th>
+ <th>Standard Support</th>
+ <th>Enterprise Support</th>
+ <th>Preferred Support</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <th>Subscription Plan</th>
+ <td>Developer, Developer Pro. Legacy plans: Gold, Silver and Home Grown</td>
+ <td>Enterprise</td>
+ <td>Enterprise with Preferred Support Option</td>
+ </tr>
+ <tr>
+ <th><a href="#support-hours">Support Hours</a></th>
+ <td>Standard: 24 hours per day, Monday - Friday</td>
+ <td>Standard: 24 hours per day, Monday - Friday / Critical Outage: 24 Hours Per Day, 7 days per week, 365 days per year</td>
+ <td>Standard: 24 hours per day, Monday - Friday / Critical Outage: 24 Hours Per Day, 7 days per week, 365 days per year</td>
+ </tr>
+ <tr>
+ <th>First Response Time Target</th>
+ <td>2 Business Days</td>
+ <td>Standard: 3 business hours / Critical Outage: 1 hour</td>
+ <td>Standard: 1 business hour / Critical Outage: 1 hour</td>
+ </tr>
+ <tr>
+ <th>Subsequent Response Time Target</th>
+ <td>Standard: 2 business days</td>
+ <td>Standard: 1 business day / Critical Outage: ongoing within support hours</td>
+ <td>Standard: 1 business hour / Critical Outage: ongoing within support hours</td>
+ </tr>
+ <tr>
+ <th>Ticket Response Channels</th>
+ <td class="warning">Support Center</td>
+ <td class="success">Support Center, chat, web conference</td>
+ <td class="success">Support Center, chat, web conference</td>
+ </tr>
+ <tr>
+ <th><a href="/onboarding/sprint#sprint-benefits-by-support-plan">Onboarding Experience</a></th>
+ <td>Self-service in app and email</td>
+ <td>Sprint</td>
+ <td>Sprint Preferred</td>
+ </tr>
+ <tr>
+ <th><a href="/onboarding/sprint#what-happens-after-the-sprint-program-finishes-">Ongoing Customer Success Engagement</a> </th>
+ <td>Not Included</td>
+ <td>Customer Success Team </td>
+ <td>Allocated Customer Success Manager</td>
+ </tr>
+ </tbody>
+</table>
| 0 |
diff --git a/lib/global-admin/addon/security/authentication/azuread/template.hbs b/lib/global-admin/addon/security/authentication/azuread/template.hbs </div>
<hr/>
<div class="row">
- <div class="col span-4">
+ <div class="col span-12">
<h3>{{t 'authPage.azuread.enabled.general.header'}}</h3>
<div>
<b>{{t 'authPage.azuread.configure.tenantId.label'}}: </b> <span class="text-muted">{{azureADConfig.tenantId}}</span>
<div>
<b>{{t 'authPage.azuread.configure.domain.label'}}: </b> <span class="text-muted">{{azureADConfig.domain}}</span>
</div>
- <div>
- <b>{{t 'authPage.azuread.configure.adminAccountUsername.label'}}: </b> <span class="text-muted">{{azureADConfig.adminAccountUsername}}</span>
- </div>
</div>
</div>
</section>
| 2 |
diff --git a/lib/create/deployment.js b/lib/create/deployment.js @@ -20,7 +20,7 @@ async function open(req, res) {
const [{ data: repository }, { data: branches }, { data: tags }] = await Promise.all([
gitHubUser.client.repos.get({ owner, repo }),
gitHubUser.client.repos.listBranches({ owner, repo }),
- gitHubUser.client.gitdata.getTags({ owner, repo }),
+ gitHubUser.client.request('GET /repos/:owner/:repo/git/refs/tags', { owner, repo }),
]);
const { trigger_id } = req.body;
| 14 |
diff --git a/source/swap/contracts/Swap.sol b/source/swap/contracts/Swap.sol @@ -506,7 +506,6 @@ contract Swap is ISwap, Ownable, EIP712 {
revert NonceAlreadyUsed(nonce);
}
- _signatoryMinimumNonce[signatory];
_nonceGroups[signatory][groupKey] = group | (uint256(1) << indexInGroup);
}
| 2 |
diff --git a/packages/yoroi-extension/app/components/wallet/send/WalletSendFormRevamp.js b/packages/yoroi-extension/app/components/wallet/send/WalletSendFormRevamp.js @@ -661,12 +661,8 @@ export default class WalletSendForm extends Component<Props, State> {
onUpdateMemo(memo: string) {
const isValid = isValidMemoOptional(memo);
- if (isValid) {
this.props.updateMemo(memo);
- this.setState({ memo, invalidMemo: false })
- } else {
- this.setState({ invalidMemo: true })
- }
+ this.setState({ memo, invalidMemo: !isValid })
}
_nextStepButton(
| 11 |
diff --git a/app/scripts/tokens/ethTokens.json b/app/scripts/tokens/ethTokens.json },
{
"address": "0x386Faa4703a34a7Fdb19Bec2e14Fd427C9638416",
- "symbol": "DoBETacceptBET(DCA)",
- "decimals": 18,
+ "symbol": "DCA (doBETacceptBET)",
+ "decimal": 18,
"type": "default"
},
{
| 10 |
diff --git a/js/webview/swipeEvents.js b/js/webview/swipeEvents.js @@ -18,7 +18,7 @@ function onSwipeGestureFinish () {
// swipe to the left to go forward
if (horizontalMouseMove - beginningScrollRight > 150 && Math.abs(horizontalMouseMove / verticalMouseMove) > 2.5) {
- if (beginningScrollRight < 10 || horizontalMouseMove - beginningScrollRight > 800) {
+ if (beginningScrollRight < 10) {
resetCounters()
ipc.sendToHost('goForward')
}
@@ -26,7 +26,7 @@ function onSwipeGestureFinish () {
// swipe to the right to go backwards
if (horizontalMouseMove + beginningScrollLeft < -150 && Math.abs(horizontalMouseMove / verticalMouseMove) > 2.5) {
- if (beginningScrollLeft < 10 || horizontalMouseMove + beginningScrollLeft < -800) {
+ if (beginningScrollLeft < 10) {
resetCounters()
ipc.sendToHost('goBack')
}
| 7 |
diff --git a/.gitignore b/.gitignore @@ -17,13 +17,13 @@ node_modules/
*.map
.sass-cache
-extension/
-app/
+### folders built by preact or gulp
+/build/
+/extension/
+/app/
-build
src/lib/vue-sequence-bundle.*.js
extension-*.zip
.firebase
size-plugin.json
extension.zip
-!src/extension
| 14 |
diff --git a/src/encoded/audit/experiment.py b/src/encoded/audit/experiment.py @@ -407,15 +407,18 @@ def audit_experiment_control_out_of_date_analysis(value, system):
for bam_file in derived_from_bams:
if bam_file['dataset']['accession'] != value['accession'] and \
is_outdated_bams_replicate(bam_file):
+ assembly_detail = ''
+ if bam_file.get('assembly'):
+ assembly_detail = ' for {} assembly '.format(bam_file['assembly'])
detail = 'Experiment {} '.format(value['@id']) + \
- 'processed files are using alignment files from a control ' + \
- 'replicate that is out of date.'
+ 'processed files are using alignment file {} '.format(
+ bam_file['@id']) + assembly_detail + \
+ 'from a control replicate that is out of date.'
yield AuditFailure('out of date analysis', detail, level='INTERNAL_ACTION')
return
def is_outdated_bams_replicate(bam_file):
-
if 'lab' not in bam_file or bam_file['lab'] != '/labs/encode-processing-pipeline/' or \
'dataset' not in bam_file or 'original_files' not in bam_file['dataset']:
return False
@@ -492,8 +495,7 @@ def audit_experiment_out_of_date_analysis(value, system):
uniform_pipeline_flag = False
- #>>> TOTO modify this mess of a conditions >>>>>
- for bam_file in alignment_files:
+ '''for bam_file in alignment_files:
if bam_file['lab'] == '/labs/encode-processing-pipeline/':
uniform_pipeline_flag = True
break
@@ -505,6 +507,12 @@ def audit_experiment_out_of_date_analysis(value, system):
if bam_file['lab'] == '/labs/encode-processing-pipeline/':
uniform_pipeline_flag = True
break
+ '''
+ for bam_file in alignment_files + transcriptome_alignments + not_filtered_alignments:
+ if bam_file['lab'] == '/labs/encode-processing-pipeline/':
+ uniform_pipeline_flag = True
+ break
+
if uniform_pipeline_flag is False:
return
alignment_derived_from = get_derived_from_files_set(alignment_files, 'fastq', False)
| 1 |
diff --git a/contribs/gmf/src/controllers/abstractdesktop.js b/contribs/gmf/src/controllers/abstractdesktop.js @@ -75,6 +75,9 @@ gmf.module.value('ngeoQueryOptions', {
'limit': 20
});
+gmf.module.value('ngeoMeasurePrecision', 3);
+gmf.module.value('ngeoMeasureDecimals', 0);
+
/**
* Desktop application abstract controller.
| 12 |
diff --git a/contributors.json b/contributors.json "xxx32": {
"country": "India",
"name": "Aarushi"
+ },
+ "prateekcode":{
+ "country": "India",
+ "name": "Prateek",
+ "linkedin": "https://www.linkedin.com/in/pratiekray/",
+ "twitter": "https://twitter.com/pratiekray"
}
}
| 3 |
diff --git a/packages/idyll-compiler/.babelrc.js b/packages/idyll-compiler/.babelrc.js @@ -6,7 +6,7 @@ module.exports = {
'env',
{
loose: true,
- modules: 'commonjs',
+ modules: BABEL_ENV === 'cjs' || NODE_ENV === 'test' ? 'commonjs' : false,
},
],
],
| 4 |
diff --git a/js/webviewGestures.js b/js/webviewGestures.js @@ -124,7 +124,7 @@ webviews.bindIPC('wheel-event', function (webview, tabId, e) {
}
return {left, right}
})()
- `, false, function (result) {
+ `, false).then(function (result) {
if (beginningScrollLeft === null || beginningScrollRight === null) {
beginningScrollLeft = result.left
beginningScrollRight = result.right
| 1 |
diff --git a/src/public/target/sections/KnownDrugs/Section.js b/src/public/target/sections/KnownDrugs/Section.js @@ -119,7 +119,7 @@ const getPage = (rows, page, pageSize) => {
const Section = ({ ensgId }) => {
const [page, setPage] = useState(0);
const [pageSize, setPageSize] = useState(10);
- const [globalFilter, setGlobalFilter] = useState(null);
+ const [globalFilter, setGlobalFilter] = useState('');
const { data, loading, fetchMore } = useQuery(KNOWN_DRUGS_QUERY, {
variables: {
@@ -137,11 +137,7 @@ const Section = ({ ensgId }) => {
const { count, rows = [], cursor } = data?.target?.knownDrugs ?? {};
- const handleTableAction = ({
- page: newPage,
- pageSize,
- globalFilter: newGlobalFilter,
- }) => {
+ const handleTableAction = ({ page: newPage, pageSize, newGlobalFilter }) => {
// only fetchMore when there's a new global filter or there are no more
// rows in the rows array
if (
@@ -158,6 +154,15 @@ const Section = ({ ensgId }) => {
updateQuery: (prev, { fetchMoreResult }) => {
const prevRows = prev.target.knownDrugs.rows;
const newRows = fetchMoreResult?.target?.knownDrugs?.rows;
+ if (fetchMoreResult.target.knownDrugs === null) {
+ prev.target.knownDrugs = {
+ rows: [],
+ };
+ setPage(newGlobalFilter !== globalFilter ? 0 : newPage);
+ setPageSize(pageSize);
+ setGlobalFilter(newGlobalFilter);
+ return prev;
+ }
setPage(newGlobalFilter !== globalFilter ? 0 : newPage);
setPageSize(pageSize);
setGlobalFilter(newGlobalFilter);
| 12 |
diff --git a/token-metadata/0x93eCD2ecDFb91aB2fEe28A8779A6adfe2851cda6/metadata.json b/token-metadata/0x93eCD2ecDFb91aB2fEe28A8779A6adfe2851cda6/metadata.json "symbol": "LBURST",
"address": "0x93eCD2ecDFb91aB2fEe28A8779A6adfe2851cda6",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/scripts/build_index.js b/scripts/build_index.js @@ -313,9 +313,13 @@ function mergeItems() {
} else if (tree === 'operators') {
name = tags.operator || tags.brand;
// seed operators (for a file that we copied over from the 'brand' tree) // todo: remove?
- if (!tags.operator && tags.brand) tags.operator = tags.brand;
- if (!tags['operator:wikidata'] && tags['brand:wikidata']) tags['operator:wikidata'] = tags['brand:wikidata'];
- if (!tags['operator:wikipedia'] && tags['brand:wikipedia']) tags['operator:wikipedia'] = tags['brand:wikipedia'];
+ Object.keys(tags).forEach(osmkey => {
+ if (/brand/.test(osmkey)) { // convert `brand`->`operator`, `brand:ru`->`operator:ru`, etc.
+ let newkey = osmkey.replace('brand', 'operator');
+ if (!tags[newkey]) tags[newkey] = tags[osmkey];
+ }
+ });
+
} else if (tree === 'transit') {
name = tags.network;
| 7 |
diff --git a/token-metadata/0x1E18821E69B9FAA8e6e75DFFe54E7E25754beDa0/metadata.json b/token-metadata/0x1E18821E69B9FAA8e6e75DFFe54E7E25754beDa0/metadata.json "symbol": "KIMCHI",
"address": "0x1E18821E69B9FAA8e6e75DFFe54E7E25754beDa0",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/README.md b/README.md @@ -75,14 +75,13 @@ make scenario3-setup
make scenario3-run-client
```
-The `lib/ag-solo/vats/` directory contains the source code for all the Vats
-created in the solo vat-machine. The actual filenames are enumerated in
-`lib/ag-solo/init-basedir.js`, so if you add a new Vat, be sure to add it to
-`init-basedir.js` too.
+[`lib/ag-solo/vats/vat-demo.js`](lib/ag-solo/vats/vat-demo.js) contains the code running a vat with the Pixel Gallery Demo.
-The objects added to `home` are created in `lib/ag-solo/vats/bootstrap.js`.
+Also, as part of `make scenario3-setup`, `bin/ag-solo init <directory>` get called and all the content of the [`vats`](lib/ag-solo/vats) directory gets copied to the `<directory>`
-The REPL handler is in `lib/ag-solo/vats/vat-http.js`.
+The objects added to `home` are created in [`lib/ag-solo/vats/bootstrap.js`](lib/ag-solo/vats/bootstrap.js).
+
+The REPL handler is in [`lib/ag-solo/vats/vat-http.js`](lib/ag-solo/vats/vat-http.js).
The HTML frontend code is pure JS/DOM (no additional libraries yet), in
`lib/ag-solo/html/index.html` and `lib/ag-solo/html/main.js`.
| 7 |
diff --git a/test/unit/specs/scripts/time.spec.js b/test/unit/specs/scripts/time.spec.js -import time from "scripts/time"
-import mockValues from "test/unit/helpers/mockValues.js"
-const delegates = mockValues.candidates
-import { stakingTxs } from "../store/json/txs"
-const unbondingTransaction = stakingTxs[3]
+import { getUnbondTimeFromTX } from "scripts/time"
+
+const wrongTransactionType = {
+ type: "cosmos-sdk/MsgSend",
+ value: {
+ from_address: "cosmos1",
+ to_address: "cosmos2",
+ amount: [{ denom: "fabocoins", amount: "1234" }]
+ },
+ key:
+ 'cosmos-sdk/MsgSend_undefined_{"from_address":"cosmos1","to_address":"cosmos2","amount":[{"denom":"fabocoins","amount":"1234"}]}',
+ blockNumber: 150,
+ time: new Date("2018-07-01"),
+ fees: { amount: "0", denom: "ATOM" },
+ group: "banking",
+ liquidDate: null
+}
+
+const unbondingTransaction = {
+ type: "cosmos-sdk/MsgUndelegate",
+ value: {
+ delegator_address: "cosmos3",
+ validator_address: "cosmos4",
+ amount: { denom: "uatom", amount: "50000" }
+ },
+ key:
+ 'cosmos-sdk/MsgUndelegate_2019-07-31T09:22:23.054Z_{"delegator_address":"cosmos1jq9mc3kp4nnxwryr09fpqjtrwya8q5q480zu0e","validator_address":"cosmosvaloper1vrg6ruw00lhszl4sjgwt5ldvl8z0f7pfp5va85","amount":{"denom":"uatom","amount":"50000"}}',
+ blockNumber: 1248479,
+ time: "2019-07-31T09:22:23.054Z",
+ memo: "",
+ fees: { denom: "uatom", amount: "4141" },
+ group: "staking"
+}
+
+const constantDate = new Date()
describe(`time helper`, () => {
describe(`getUnbondingTime`, () => {
it(`should return NaN with wrong transactions`, () => {
- const address = delegates[0].operator_address
expect(
- time.getUnbondingTime(stakingTxs[1], {
- [address]: [
+ getUnbondTimeFromTX(wrongTransactionType, {
+ [`cosmosxyz`]: [
{
creation_height: `170`,
completion_time: new Date().toISOString()
@@ -21,10 +50,9 @@ describe(`time helper`, () => {
})
it(`should return NaN for unbonding transactions when height does not match`, () => {
- const address = delegates[0].operator_address
expect(
- time.getUnbondingTime(unbondingTransaction, {
- [address]: [
+ getUnbondTimeFromTX(unbondingTransaction, {
+ [`cosmos4`]: [
{
creation_height: `171`,
completion_time: new Date().toISOString()
@@ -35,17 +63,16 @@ describe(`time helper`, () => {
})
it(`should return time for unbonding transactions when height match`, () => {
- const address = delegates[0].operator_address
expect(
- time.getUnbondingTime(unbondingTransaction, {
- [address]: [
+ getUnbondTimeFromTX(unbondingTransaction, {
+ [`cosmos4`]: [
{
- creation_height: `569`,
- completion_time: new Date(Date.now()).toISOString()
+ creation_height: `1248479`,
+ completion_time: constantDate
}
]
})
- ).toBe(42000)
+ ).toEqual(constantDate)
})
})
})
| 3 |
diff --git a/sql/oracle/oracle.sql b/sql/oracle/oracle.sql @@ -12,6 +12,8 @@ CREATE TABLE dashboard_board (
category_id NUMBER DEFAULT NULL,
board_name varchar2(100) NOT NULL,
layout_json CLOB,
+ create_time TIMESTAMP DEFAULT sysdate,
+ update_time TIMESTAMP DEFAULT sysdate,
CONSTRAINT dashboard_board_pk PRIMARY KEY (board_id)
);
@@ -166,8 +168,6 @@ CREATE TABLE dashboard_board_param (
user_id varchar2(50) NOT NULL,
board_id number NOT NULL,
config CLOB,
- create_time TIMESTAMP DEFAULT sysdate,
- update_time TIMESTAMP DEFAULT sysdate,
CONSTRAINT dashboard_board_param_pk PRIMARY KEY (board_param_id)
);
| 3 |
diff --git a/web/kiri/filter/FDM/FolgerTech.FT5 b/web/kiri/filter/FDM/FolgerTech.FT5 {
"pre":[
+ "M117 Heating",
"M104 S{temp} T0 ; set extruder temperature",
"M140 S{bed_temp} T0 ; set bed temperature",
"G90 ; set absolute positioning mode",
"M190 S{bed_temp} T0 ; wait for bed to reach target temp",
"M109 S{temp} T0 ; wait for extruder to reach target temp",
"G0 Z0.25 ; position 0.25mm over bed",
+ "M117 Purge Nozzle",
"G1 X100 E30 F600 ; purge 30mm from extruder",
"M201 X1000 Y1000 Z100 E2000 ; max accel",
"M204 P1000 T2000 ; default accel",
"M205 X5 ; max xy jerk"
],
"post":[
+ "M117 Done",
"M107 ; turn off filament cooling fan",
"M104 S0 T0 ; turn off extruder",
"M140 S0 T0 ; turn off bed",
"M84 ; disable stepper motors"
],
"cmd":{
- "fan_power": "M106 S{fan_speed}"
+ "fan_power": "M106 S{fan_speed}",
+ "progress": "{progress}% layer {layer}"
},
"settings":{
"origin_center": false,
| 3 |
diff --git a/src/ui/KeyboardShortcuts.hx b/src/ui/KeyboardShortcuts.hx @@ -102,7 +102,7 @@ class KeyboardShortcuts {
}
//
#if !lwedit
- addCommand("reloadProject", "mod-r", function() {
+ addCommand("reloadProject", "modw-r", function() {
if (Project.current != null) {
Project.current.reload();
}
| 11 |
diff --git a/package.json b/package.json "corejs-typeahead": "1.2.1",
"coveralls": "3.0.2",
"css-loader": "2.1.0",
- "d3": "^5.7.0",
+ "d3": "5.7.0",
"ejs-loader": "0.3.1",
"eslint": "5.2.0",
"eslint-config-openlayers": "11.0.0",
| 4 |
diff --git a/package.json b/package.json {
"name": "prettier-atom",
"main": "./dist/main.js",
- "version": "0.46.0",
+ "version": "0.47.0",
"description": "Atom plugin for formatting JavaScript using prettier with (optional) prettier-eslint integration",
"keywords": [
"atom",
| 6 |
diff --git a/components/Vote/VoteResult.js b/components/Vote/VoteResult.js @@ -68,7 +68,9 @@ const VoteResult = ({ votings, elections, vt, t }) =>
formattedCount: countFormat(result.count)
})
}))
- const emptyVotes = data.result.options.find(result => !result.option).count
+
+ const empty = data.result.options.find(result => !result.option)
+ const emptyVotes = empty ? empty.count : 0
const { eligible, submitted } = data.turnout
@@ -111,7 +113,9 @@ const VoteResult = ({ votings, elections, vt, t }) =>
count: numNotElected
})
}))
- const emptyVotes = data.result.candidacies.find(result => !result.candidacy).count
+
+ const empty = data.result.candidacies.find(result => !result.candidacy)
+ const emptyVotes = empty ? empty.count : 0
const { eligible, submitted } = data.turnout
| 9 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.