code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/src/modules/spotify.js b/src/modules/spotify.js },
// See: https://developer.spotify.com/web-api/using-scopes/
+ scope_delim: ' ',
scope: {
basic: '',
photos: '',
// See: https://developer.spotify.com/web-api/endpoint-reference/
get: {
me: '/v1/me',
- 'me/following': '/v1/me/following',
+ 'me/following': '/v1/me/following?type=artist', // Only 'artist' is supported
// Because tracks, albums and playlist exist on spotify, the tracks are considered
// the resource for the 'me/likes' endpoint
// Response handlers
wrap: {
me: formatUser,
- 'me/following': formatFollowees(),
+ 'me/following': formatFollowees,
'me/like': formatTracks
},
function formatUser(o) {
if (o.id) {
o.name = o.display_name;
- o.thumbnail = o.images[0].url;
+ o.thumbnail = o.images.length ? o.images[0].url : null;
o.picture = o.thumbnail;
- o.email = o.emailAddress;
}
return o;
}
function paging(res) {
- if ('next' in res) {
+ if (res && 'next' in res) {
res.paging = {
next: res.next
};
| 9 |
diff --git a/src/og/layer/KML.js b/src/og/layer/KML.js @@ -101,7 +101,6 @@ export class KML extends Vector {
_AGBRtoRGBA(agbr) {
if (agbr === undefined)
return(undefined);
-console.dir("YYYY", agbr, agbr.length);
if (agbr.length != 8)
return(undefined);
| 2 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,13 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master
where X.Y.Z is the semver of most recent plotly.js release.
+## [1.29.3] -- 2017-07-27
+
+### Fixed
+- Fix `groupby` / `filter` interactions when filter includes `target` data
+ [#1892]
+
+
## [1.29.2] -- 2017-07-26
### Fixed
| 3 |
diff --git a/README.md b/README.md @@ -125,7 +125,7 @@ For further reference, please read the [glTF 2.0: Appendix B: BRDF Implementatio
The following sections do summarize the important shader code.
```
-vec3 specularContribution = D * Vis * G;
+vec3 specularContribution = D * Vis * F;
vec3 diffuseContribution = (1.0 - F) * diffuse;
```
| 1 |
diff --git a/test/unit/components/email-confirmation-modal.test.jsx b/test/unit/components/email-confirmation-modal.test.jsx @@ -28,7 +28,7 @@ describe('Modal', () => {
isOpen
/>, {context: {store: defaultStore}}
);
- expect(component.find('div.modal-right-content').text()).toContain(testEmail);
+ expect(component.find('div.modal-text-content').text()).toContain(testEmail);
});
test('Clicking on Text changes to tips page', () => {
| 4 |
diff --git a/articles/troubleshoot/guides/generate-har-files.md b/articles/troubleshoot/guides/generate-har-files.md @@ -55,7 +55,7 @@ Before sending the HAR file to Auth0, ensure that you remove or obfuscate any se
### Internet Explorer
1. Close all __InPrivate__ windows in Internet Explorer.
-2. Open a __new InPrivate__ window in Firefox (**ctrl-shift-P**.)
+2. Open a __new InPrivate__ window in Internet Explorer (**ctrl-shift-P**.)
3. Go to __Tools > F12 Developer Options > Network__.
4. Ensure **Clear entries on navigate** is switched off.
5. Visit the page and complete the steps that trigger the issue.
| 2 |
diff --git a/articles/hooks/extensibility-points/pre-user-registration.md b/articles/hooks/extensibility-points/pre-user-registration.md @@ -78,10 +78,7 @@ The default response object every time the Hook runs is as follows:
If you specify `app_metadata` and `user_metadata` in the response object, Auth0 adds this information to the new user.
::: note
-Metadata property names must not:
-
-* Start with the `$` character;
-* Contain the `.` character.
+Metadata property names must not start with the `$` character or contain the `.` character.
:::
### Testing Your Hook
| 2 |
diff --git a/scripts/filterToRule.js b/scripts/filterToRule.js @@ -19,6 +19,7 @@ program
.option('-o, --output <name>', 'Output file name')
.option('-c, --combine <path>', 'Path of trackers file to combine with')
.option('-t, --ruleType <name>', 'Type of filtes, rules or whitelist')
+ .option('--test', 'Run parser tests')
.parse(process.argv)
if (!(program.file && program.output)) {
@@ -66,6 +67,7 @@ function runTests () {
let rule = parseFilter(f.toLowerCase())
assert(_.isEqual(tests[f], rule), `Parsed: ${JSON.stringify(rule)}, Expected: ${JSON.stringify(tests[f])}`)
})
+ console.log('All tests passed')
}
function combineWithTrackers (rulesToAdd) {
| 3 |
diff --git a/oai-pmh/xerteobjects.php b/oai-pmh/xerteobjects.php @@ -72,17 +72,24 @@ function get_meta_data($template_id, $creator_user_name="", $template_type_name=
$xerteMetaObj->author = (string)$xml['metaAuthor'];
else
$xerteMetaObj->author = $config['institute'];
- //if (isset($xml['category'])) {
- $xerteMetaObj->domain = "Afbouw, hout en onderhoud";// (string)$xml['category'];
- $xerteMetaObj->domainId = "3ed67cca-37f6-4d7b-b1eb-872f6671caf7";
- $xerteMetaObj->domainSource = "https://vdex.kennisnet.nl/kennisnetset/2015.01/mbo_opleidingsdomeinen_studierichtingen-knset.xml";
- //}
- //else
- // $xerteMetaObj->domain = 'unknown';
- if (isset($xml['subcategory']))
- $xerteMetaObj->subdomain = (string)$xml['subcategory'];
+ if (isset($xml['category'])) {
+ // query oai_categories
+ $q = "select * from {$xerte_toolkits_site->datatabase_table_prefix}oai_categories where label=?";
+ $params = array((string)$xml["category"]);
+ $cat = db_query_one($q, $params);
+ if ($cat !== false) {
+ $xerteMetaObj->domain = $cat["label"];
+ $xerteMetaObj->domainId = $cat["taxon"];
+ $xerteMetaObj->domainSource = $cat["source_url"];
+ }
+ else
+ {
+ $xerteMetaObj->domain = 'unknown';
+ }
+ }
else
- $xerteMetaObj->subdomain = 'unknown';
+ $xerteMetaObj->domain = 'unknown';
+
$xerteMetaObj->language = (string)$xml['language'];
$xerteMetaObj->publisher = $config['institute'];
| 4 |
diff --git a/index.html b/index.html </div>
<div class="helper right">
<div class=chat id=chat>
- <div class=messages id=chat-messages>
- <div class=message>
- <div class=name>avaer: </div>
- <div class=text>Lol</div>
- </div>
- </div>
+ <div class=messages id=chat-messages></div>
<input type=text class=input id=chat-input>
</div>
<div class="keys">
| 2 |
diff --git a/lib/CetusCycle.js b/lib/CetusCycle.js @@ -84,7 +84,9 @@ class CetusCycle extends WorldstateObject {
getCurrentCetusCycle() {
const now = Date.now();
- let millisLeft = this.timeDate.fromNow(this.bountiesEndDate);
+ const bountiesClone = this.bountiesEndDate;
+ bountiesClone.setSeconds(0);
+ let millisLeft = this.timeDate.fromNow(bountiesClone);
const secondsToNightEnd = (millisLeft / 1000).toFixed(0);
const dayTime = secondsToNightEnd > nightTime;
| 12 |
diff --git a/index.d.ts b/index.d.ts @@ -623,14 +623,16 @@ declare namespace i18next {
t: TFunction;
}
- type TFunction = <
+ interface TFunction {
+ <
TResult extends string | object | Array<string | object> | undefined | null = string,
TKeys extends string | TemplateStringsArray = string,
TInterpolationMap extends object = StringMap
>(
key: TKeys | TKeys[],
options?: TOptions<TInterpolationMap> | string,
- ) => TResult;
+ ): TResult;
+ }
interface Resource {
[language: string]: ResourceLanguage;
| 11 |
diff --git a/src/utils/gaa.js b/src/utils/gaa.js @@ -1479,6 +1479,26 @@ export class GaaMetering {
callSwg((subscriptions) => {
subscriptions.init(productId);
+ subscriptions.setOnLoginRequest(() =>
+ GaaMetering.handleLoginRequest(
+ handleLoginPromise,
+ unlockArticleIfGranted
+ )
+ );
+
+ subscriptions.setOnNativeSubscribeRequest(() => showPaywall());
+
+ subscriptions.setOnEntitlementsResponse((googleEntitlementsPromise) =>
+ GaaMetering.setEntitlements(
+ googleEntitlementsPromise,
+ allowedReferrers,
+ unlockArticle,
+ handleSwGEntitlement,
+ showGoogleRegwall,
+ showPaywall
+ )
+ );
+
if ('granted' in userState && 'grantReason' in userState) {
unlockArticleIfGranted();
} else if (GaaMetering.isArticleFreeFromPageConfig_()) {
@@ -1501,26 +1521,6 @@ export class GaaMetering {
}
});
}
-
- subscriptions.setOnLoginRequest(() =>
- GaaMetering.handleLoginRequest(
- handleLoginPromise,
- unlockArticleIfGranted
- )
- );
-
- subscriptions.setOnNativeSubscribeRequest(() => showPaywall());
-
- subscriptions.setOnEntitlementsResponse((googleEntitlementsPromise) =>
- GaaMetering.setEntitlements(
- googleEntitlementsPromise,
- allowedReferrers,
- unlockArticle,
- handleSwGEntitlement,
- showGoogleRegwall,
- showPaywall
- )
- );
});
// Show the Google registration intervention.
| 12 |
diff --git a/spec/services/carto/user_metadata_export_service_spec.rb b/spec/services/carto/user_metadata_export_service_spec.rb @@ -986,7 +986,7 @@ describe Carto::UserMetadataExportService do
id: "d881e0f1-cf35-4c35-b44a-6dc31608a435",
oauth_app_id: "d4e6ab84-3e69-42ee-a957-86c8017e0544",
user_id: "5be8c3d4-49f0-11e7-8698-bc5ff4c95cd0",
- scopes: ["datasets:r:test1", "datasets:rw:trees", "datasets:rw:test1"],
+ scopes: ["datasets:r:test1", "datasets:rw:test2"],
created_at: "2018-11-16T14:31:46+00:00",
updated_at: "2018-11-17T16:41:56+00:00"
}]
| 7 |
diff --git a/src/server/service/config-manager.js b/src/server/service/config-manager.js @@ -32,7 +32,7 @@ class ConfigManager {
debug('ConfigManager#loadConfigs', this.configObject);
// cache all config keys
- this.configKeys = this.getAllConfigKeys();
+ this.setConfigKeys();
}
/**
@@ -82,7 +82,7 @@ class ConfigManager {
/**
* generate an array of config keys from this.configObject
*/
- getAllConfigKeys() {
+ getConfigKeys() {
// type: fromDB, fromEnvVars
const types = Object.keys(this.configObject);
let namespaces = [];
@@ -112,6 +112,10 @@ class ConfigManager {
return keys;
}
+ setConfigKeys() {
+ this.configKeys = this.getConfigKeys();
+ }
+
/**
* get a config specified by namespace & key from configs loaded from the database
*
@@ -178,6 +182,7 @@ class ConfigManager {
await this.configModel.bulkWrite(queries);
await this.loadConfigs();
+ this.setConfigKeys();
}
/**
| 12 |
diff --git a/src/TicketitServiceProvider.php b/src/TicketitServiceProvider.php @@ -149,8 +149,10 @@ class TicketitServiceProvider extends ServiceProvider
}
});
- // Send notification when ticket status is modified
+
Ticket::updating(function ($modified_ticket) {
+
+ // Send notification when ticket status is modified
if (Setting::grab('status_notification')) {
$original_ticket = Ticket::find($modified_ticket->id);
if ($original_ticket->status_id != $modified_ticket->status_id || $original_ticket->completed_at != $modified_ticket->completed_at) {
@@ -158,6 +160,8 @@ class TicketitServiceProvider extends ServiceProvider
$notification->ticketStatusUpdated($modified_ticket, $original_ticket);
}
}
+
+ // Send notification when agent is modified
if (Setting::grab('assigned_notification')) {
$original_ticket = Ticket::find($modified_ticket->id);
if ($original_ticket->agent->id != $modified_ticket->agent->id) {
@@ -169,7 +173,7 @@ class TicketitServiceProvider extends ServiceProvider
return true;
});
- // Send notification when ticket status is modified
+ // Send notification when ticket is created
Ticket::created(function ($ticket) {
if (Setting::grab('assigned_notification')) {
$notification = new NotificationsController();
| 7 |
diff --git a/test/jasmine/tests/parcoords_test.js b/test/jasmine/tests/parcoords_test.js @@ -145,6 +145,28 @@ describe('parcoords initialization tests', function() {
});
});
+ it('\'line.color\' should convert typed arrays to normal arrays', function() {
+ var fullTrace = _supply({
+ dimensions: [{
+ range: [1, 5],
+ label: 'A',
+ values: [1, 4, 3]
+ }, {
+ range: [1, 5],
+ label: 'B',
+ values: [3, 1.5, 2],
+ }, {
+ range: [1, 5],
+ label: 'C',
+ values: [2, 4, 1],
+ }],
+ line: {
+ color: new Int32Array([0, 1, 2])
+ }
+ });
+ expect(Array.isArray(fullTrace.line.color) === true).toEqual(true);
+ });
+
it('\'domain\' specification should have a default', function() {
var fullTrace = _supply({});
expect(fullTrace.domain).toEqual({x: [0, 1], y: [0, 1]});
| 0 |
diff --git a/test/cfn/Dockerfile b/test/cfn/Dockerfile @@ -34,6 +34,6 @@ RUN apt-get install -y \
python-virtualenv
RUN pip install awscli
-RUN curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash - && \
+RUN curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash - && \
apt-get install -y nodejs
| 3 |
diff --git a/packages/vulcan-ui-material/lib/components/forms/base-controls/mixins/component.jsx b/packages/vulcan-ui-material/lib/components/forms/base-controls/mixins/component.jsx @@ -73,6 +73,8 @@ export default {
cleanProps: function (props) {
const removedFields = [
+ 'arrayField',
+ 'arrayFieldSchema',
'beforeComponent',
'afterComponent',
'addonAfter',
@@ -122,7 +124,8 @@ export default {
'formComponents',
'autoValue',
'minCount',
- 'maxCount'
+ 'maxCount',
+ 'visibleItemIndex'
];
return _omit(props, removedFields);
| 7 |
diff --git a/content/projects/cmints.md b/content/projects/cmints.md @@ -15,15 +15,15 @@ startertemplaterepo: cmints/multi-lang-starter
[CMintS](https://cmints.io/) is a CMS and Static Site Generator for single and
multi-language websites creation.
-You can learn more about CMintS at [https://cmints.io/](https://cmints.io/).
-It's an open source project and every related repository can be found in the
-[CMintS GitHub organization](https://github.com/cmints).
+Learn more about CMintS at [https://cmints.io/](https://cmints.io/). It's an
+open source project and every related repository can be found in the [CMintS
+GitHub organization](https://github.com/cmints).
You can either install CMintS globally as it's described in the [installation
-documentation](https://cmints.io/documentation) or by installing it locally,
+documentation](https://cmints.io/documentation) or as a local dependency,
following the [Quick Start tutorial](https://cmints.io/en/quick-start).
-You can also find Single and Multi lanuguage website starters at
+Single and multi-language website starters can be found at
[https://single.cmints.io/](https://single.cmints.io/) and
[https://multi.cmints.io/](https://multi.cmints.io/) accordingly.
@@ -53,4 +53,4 @@ use EJS or a regular HTML.
[Integrate your project with the
Crowdin](https://cmints.io/en/documentation/i18n/crowdin) and start translating
-your website right away with the help of translation community.
+your website right away with the help of the translation community.
| 7 |
diff --git a/assets/js/modules/adsense/components/setup/v2/SetupAccountSite/Ready.js b/assets/js/modules/adsense/components/setup/v2/SetupAccountSite/Ready.js @@ -102,12 +102,7 @@ export default function Ready( { site, finishSetup } ) {
'google-site-kit'
);
- uiProps.description = existingTag
- ? __(
- 'Site Kit recommends enabling auto ads. If your existing AdSense setup relies on individual ad units, you can proceed without enabling auto ads.',
- 'google-site-kit'
- )
- : __(
+ uiProps.description = __(
'To start serving ads via Site Kit, you need to activate auto ads first. Go to AdSense and enable auto ads for your site.',
'google-site-kit'
);
@@ -119,6 +114,11 @@ export default function Ready( { site, finishSetup } ) {
};
if ( existingTag ) {
+ uiProps.description = __(
+ 'Site Kit recommends enabling auto ads. If your existing AdSense setup relies on individual ad units, you can proceed without enabling auto ads.',
+ 'google-site-kit'
+ );
+
uiProps.secondaryButton = {
label: __(
'Proceed without enabling auto ads',
| 2 |
diff --git a/articles/extensions/user-import-export.md b/articles/extensions/user-import-export.md @@ -46,3 +46,23 @@ There are two ways of using this extension:
* Search for and export some (or all) of you Auth0 database users
Both use cases are explained in further detail below.
+
+### Import Users
+
+By default, any time you open the extension, you'll see the **User Import** screen (if you're on the export screen, you can return to this screen by click **Import** in the left-hand navigation bar).
+
+
+
+To import your users, drag and drop a valid JSON file ([schema and examples here](/tutorials/bulk-importing-users-into-auth0)) onto the area that says **Drop your file here, or click to select**. Alternatively, you can click on this area to browse your files and select the appropriate JSON file. The JSON file should contain the list of users that you are planning to import.
+
+Select the database connection for which your users will be imported. Please make sure that the connection you choose has been enabled for at least one client.
+
+
+
+Click **Start Importing Users** to begin the import process.
+
+When done, you'll see the following **Completed** message.
+
+
+
+Once you've imported your users, you can manage them individually using the [Users section of the Dashboard](${manage_url/#/users})
| 0 |
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
- node-version: [ 16.9.0 ]
+ node-version: [ 16.9.x ]
steps:
- uses: actions/checkout@v3
@@ -21,5 +21,5 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- - run: npm ci
+ - run: npm install
- run: npm run lint
\ No newline at end of file
| 4 |
diff --git a/documentation/md/style.md b/documentation/md/style.md @@ -449,7 +449,8 @@ When a taxi edge would be impossible to draw along the regular turning plan ---
* `rightward` : Bundle outgoers righwards.
* `leftward` : Bundle outgoers leftwards.
* **`taxi-turn`** : The distance along the primary axis where the first turn is applied.
- * This value may be an absolute distance - positive number (e.g. `20px`) to indicate distance from the source or negative number (e.g. `-20px`) to indicate distance from the target or it may be a relative distance between the source and target (e.g. `50%`).
+ * This value may be an absolute distance (e.g. `20px`) or it may be a relative distance between the source and target (e.g. `50%`).
+ * A negative value may be specified to indicate a distance in the oppostite, target to source direction (e.g. `-20px`).
* Note that bundling may not work with an explicit direction (`upward`, `downward`, `leftward`, or `rightward`) in tandem with a turn distance specified in percent units.
* **`taxi-turn-min-distance`** : The minimum distance along the primary axis that is maintained between the nodes and the turns.
* This value only takes on absolute values (e.g. `5px`).
| 4 |
diff --git a/package.json b/package.json "update:testnet": "npx dotenv-cli -e .env.testnet -- flow project deploy --network=testnet -f flow.json -f flow.testnet.json --update",
"dev:reset": "cross-env node .ki-scripts/reset.js",
"postinstall": "npx lerna exec npm install",
+ "heroku-postbuild": "npx lerna exec npm install && npx lerna exec npm run build",
"start": "node api/dist/index.js"
},
"repository": {
| 0 |
diff --git a/lib/Runtime/Language/i386/AsmJsJitTemplate.cpp b/lib/Runtime/Language/i386/AsmJsJitTemplate.cpp @@ -520,10 +520,18 @@ namespace Js
int savedEbp = (int)savedEbpPtr;
FunctionBody* body = func->GetFunctionBody();
Js::FunctionEntryPointInfo * entryPointInfo = body->GetDefaultFunctionEntryPointInfo();
+ //CodeGenDone status is set by TJ
+ if ((entryPointInfo->IsNotScheduled() || entryPointInfo->IsCodeGenDone()) && !PHASE_OFF(BackEndPhase, body) && !PHASE_OFF(FullJitPhase, body))
+ {
const uint32 minTemplatizedJitRunCount = (uint32)CONFIG_FLAG(MinTemplatizedJitRunCount);
if ((entryPointInfo->callsCount >= minTemplatizedJitRunCount || body->IsHotAsmJsLoop()))
{
- WAsmJs::JitFunctionIfReady(func, 9999);
+ if (PHASE_TRACE1(AsmjsEntryPointInfoPhase))
+ {
+ Output::Print(_u("Scheduling %s For Full JIT at callcount:%d\n"), body->GetDisplayName(), entryPointInfo->callsCount);
+ }
+ GenerateFunction(body->GetScriptContext()->GetNativeCodeGenerator(), body, func);
+ }
}
void* constTable = body->GetConstTable();
constTable = (void*)(((Var*)constTable)+AsmJsFunctionMemory::RequiredVarConstants-1);
| 13 |
diff --git a/edit.js b/edit.js @@ -145,6 +145,7 @@ const highlightMesh = new THREE.Mesh(
})
);
highlightMesh.visible = false;
+highlightMesh.packageMesh = null;
highlightScene.add(highlightMesh);
const _makeTextMesh = (text, fontSize) => {
@@ -275,6 +276,7 @@ const wristMenu = (() => {
};
object.update = () => {
highlightMesh.visible = false;
+ highlightMesh.packageMesh = null;
raycaster.ray.origin.copy(ray.position);
raycaster.ray.direction.set(0, 0, -1).applyQuaternion(ray.quaternion);
@@ -285,6 +287,7 @@ const wristMenu = (() => {
intersectObject.getWorldQuaternion(highlightMesh.quaternion);
intersectObject.getWorldScale(highlightMesh.scale);
highlightMesh.visible = true;
+ highlightMesh.packageMesh = intersectObject.parent;
}
};
@@ -490,19 +493,23 @@ function animate(timestamp, frame) {
const _loadGamepad = i => {
const inputSource = inputSources[i];
if (inputSource) {
- // const xrGamepad = xrState.gamepads[inputSource.handedness === 'right' ? 1 : 0];
let pose, gamepad;
if ((pose = frame.getPose(inputSource.targetRaySpace, renderer.xr.getReferenceSpace())) && (gamepad = inputSource.gamepad)) {
localMatrix.fromArray(pose.transform.matrix)
.decompose(ray.position, ray.quaternion, ray.scale);
- // _scaleMatrixPQS(pose.transform.matrix, xrGamepad.position, xrGamepad.orientation);
}
}
};
// _loadGamepad(0);
_loadGamepad(1);
wristMenu.update();
+ if (dragMesh) {
+ dragMesh.matrix.copy(dragMesh.startMatrix)
+ .premultiply(localMatrix2.getInverse(dragMesh.startRayMatrix))
+ .premultiply(ray.matrixWorld)
+ .decompose(dragMesh.position, dragMesh.quaternion, dragMesh.scale);
+ }
}
// packages
@@ -1152,10 +1159,20 @@ renderer.domElement.addEventListener('mousemove', e => {
}
});
+let dragMesh = null;
renderer.domElement.addEventListener('mousedown', e => {
if (!transformControlsHovered) {
_setSelectTarget(hoverTarget);
}
+ if (highlightMesh.packageMesh) {
+ dragMesh = highlightMesh.packageMesh.clone(true);
+ dragMesh.startMatrix = highlightMesh.packageMesh.matrixWorld.clone();
+ dragMesh.startRayMatrix = ray.matrixWorld.clone();
+ scene.add(dragMesh);
+ }
+});
+renderer.domElement.addEventListener('mouseup', e => {
+ dragMesh = null;
});
const runMode = document.getElementById('run-mode');
| 0 |
diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/theme.js b/packages/node_modules/@node-red/editor-api/lib/editor/theme.js @@ -327,10 +327,9 @@ module.exports = {
themeContext.header.url = themePlugin.header.url || themeContext.header.url
}
}
- if(theme.codeEditor) {
+ theme.codeEditor = theme.codeEditor || {}
theme.codeEditor.options = Object.assign({}, themePlugin.monacoOptions, theme.codeEditor.options);
}
- }
activeThemeInitialised = true;
}
return themeContext;
| 11 |
diff --git a/src/Api.js b/src/Api.js @@ -320,7 +320,7 @@ class Api {
* @param {string} path
*/
setPublicPath(path) {
- this.Mix.options.publicPath = new this.Mix.File(path)
+ this.Mix.options.publicPath = this.Mix.publicPath = new this.Mix.File(path)
.parsePath()
.pathWithoutExt;
| 12 |
diff --git a/src/dom_components/index.js b/src/dom_components/index.js @@ -528,7 +528,9 @@ module.exports = () => {
view = {},
isComponent,
extend,
- extendView
+ extendView,
+ extendFn = [],
+ extendFnView = []
} = methods;
const compType = this.getType(type);
const extendType = this.getType(extend);
@@ -543,11 +545,26 @@ module.exports = () => {
? extendViewType.view
: typeToExtend.view;
+ // Function for extending source object methods
+ const getExtendedObj = (fns, target, srcToExt) =>
+ fns.reduce((res, next) => {
+ const fn = target[next];
+ const parentFn = srcToExt.prototype[next];
+ if (fn && parentFn) {
+ res[next] = function(...args) {
+ parentFn.bind(this)(...args);
+ fn.bind(this)(...args);
+ };
+ }
+ return res;
+ }, {});
+
// If the model/view is a simple object I need to extend it
if (typeof model === 'object') {
methods.model = modelToExt.extend(
{
...model,
+ ...getExtendedObj(extendFn, model, modelToExt),
defaults: {
...modelToExt.prototype.defaults,
...(result(model, 'defaults') || {})
@@ -563,7 +580,10 @@ module.exports = () => {
}
if (typeof view === 'object') {
- methods.view = viewToExt.extend({ ...view });
+ methods.view = viewToExt.extend({
+ ...view,
+ ...getExtendedObj(extendFnView, view, viewToExt)
+ });
}
if (compType) {
| 7 |
diff --git a/userscript.user.js b/userscript.user.js @@ -11712,7 +11712,7 @@ var $$IMU_EXPORT$$;
},
scroll_override_page: {
name: "Override scroll outside of popup",
- description: "Scroll events performed outside of the popup are still acted on",
+ description: "Scrolling outside of the popup will also be overriden by the script",
requires: "action:popup",
category: "popup",
subcategory: "behavior"
| 7 |
diff --git a/generators/utils.js b/generators/utils.js @@ -267,11 +267,16 @@ function replaceTranslation(body, generator) {
// match is now the next match, in array form and our key is at index 2, index 1 is replace target.
const key = match[2];
const target = match[1];
+ const limit = match[4]; // string indicating validation limit (e.g. "{ max: 4 }")
const jsonData = geti18nJson(key, generator);
let keyValue = jsonData !== undefined ? deepFind(jsonData, key) : undefined;
if (!keyValue) {
keyValue = deepFind(jsonData, key, true); // dirty fix to get placeholder as it is not in proper json format, name has a dot in it. Assuming that all placeholders are in similar format
}
+ if (limit) {
+ // Replace "{{ placeholder }}" with numeric limit
+ keyValue = keyValue.replace(/{{.+}}/, /{.+:\s(.+)\s}/.exec(limit)[1]);
+ }
body = body.replace(target, keyValue !== undefined ? `"${keyValue}"` : defultReplaceText);
}
| 14 |
diff --git a/src/serialize/function.js b/src/serialize/function.js @@ -157,7 +157,7 @@ export function deserializeFunction<T>(source : CrossDomainWindowType | ProxyWin
// $FlowFixMe
if (__DEBUG__ && originalStack && err.stack) {
// $FlowFixMe
- err.stack = `${ err.stack }\n\n${ originalStack }`;
+ err.stack = `Remote call to ${ name }() failed\n\n${ err.stack }\n\n${ originalStack }`;
}
throw err;
});
| 7 |
diff --git a/packages/openneuro-server/datalad/dataset.js b/packages/openneuro-server/datalad/dataset.js @@ -149,9 +149,24 @@ const fileUrl = (datasetId, path, filename) => {
*/
export const addFile = (datasetId, path, file) => {
// Cannot use superagent 'request' due to inability to post streams
- return new Promise(async (resolve, reject) => {
- const { filename, stream, mimetype } = await file
- stream.pipe(
+ return new Promise((resolve, reject) =>
+ file
+ .then(({ filename, stream, mimetype }) => {
+ stream
+ .on('error', err => {
+ if (err.constructor.name === 'FileStreamDisconnectUploadError') {
+ // Catch client disconnects.
+ // eslint-disable-next-line no-console
+ console.warn(
+ `Client disconnected during upload for dataset "${datasetId}".`,
+ )
+ } else {
+ // Unknown error, log it at least.
+ // eslint-disable-next-line no-console
+ console.error(err)
+ }
+ })
+ .pipe(
requestNode(
{
url: fileUrl(datasetId, path, filename),
@@ -161,7 +176,16 @@ export const addFile = (datasetId, path, file) => {
err => (err ? reject(err) : resolve()),
),
)
- }).then(data => {
+ })
+ .catch(err => {
+ if (err.constructor.name === 'UploadPromiseDisconnectUploadError') {
+ // Catch client aborts silently
+ } else {
+ // Raise other errors
+ throw err
+ }
+ }),
+ ).then(data => {
return redis.del(draftPartialKey(datasetId)).then(() => data)
})
}
| 9 |
diff --git a/bl-plugins/tinymce/metadata.json b/bl-plugins/tinymce/metadata.json "author": "TinyMCE",
"email": "",
"website": "https://www.tinymce.com",
- "version": "5.0.16",
- "releaseDate": "2019-06-10",
+ "version": "5.1.3",
+ "releaseDate": "2019-12-01",
"license": "LGPL 2.1",
"compatible": "3.10.0",
"notes": ""
| 3 |
diff --git a/app/templates/webpack.config.prod_vue2.js b/app/templates/webpack.config.prod_vue2.js @@ -6,8 +6,6 @@ const CopyWebpackPlugin = require('copy-webpack-plugin')
const CleanWebpackPlugin = require('clean-webpack-plugin')
const HtmlWebpackPlugin = require('html-webpack-plugin')
-const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
-
module.exports = webpackMerge(devConfig, {
mode: 'production',
devtool: 'source-map',
| 2 |
diff --git a/test/unit/service-broker.spec.js b/test/unit/service-broker.spec.js @@ -373,31 +373,39 @@ describe("Test broker.registerAction", () => {
let broker = new ServiceBroker();
broker.wrapAction = jest.fn();
broker.emitLocal = jest.fn();
+ broker.serviceRegistry.register = jest.fn(() => true);
- it("should push to the actions & emit an event", () => {
+ it("should push to the actions & emit an event without nodeID", () => {
let action = {
- name: "list"
+ name: "user.list"
};
broker.registerAction(null, action);
expect(broker.wrapAction).toHaveBeenCalledTimes(1);
- expect(broker.hasAction("list")).toBe(true);
+
+ expect(broker.serviceRegistry.register).toHaveBeenCalledTimes(1);
+ expect(broker.serviceRegistry.register).toHaveBeenCalledWith(null, action);
+
expect(broker.emitLocal).toHaveBeenCalledTimes(1);
- expect(broker.emitLocal).toHaveBeenCalledWith("register.action.list", { action, nodeID: null });
+ expect(broker.emitLocal).toHaveBeenCalledWith("register.action.user.list", { action, nodeID: null });
});
it("should push to the actions & emit an event with nodeID", () => {
+ broker.serviceRegistry.register.mockClear();
broker.wrapAction.mockClear();
broker.emitLocal.mockClear();
let action = {
- name: "update"
+ name: "user.update"
};
broker.registerAction("server-2", action);
expect(broker.wrapAction).toHaveBeenCalledTimes(0);
- expect(broker.hasAction("update")).toBe(true);
+
+ expect(broker.serviceRegistry.register).toHaveBeenCalledTimes(1);
+ expect(broker.serviceRegistry.register).toHaveBeenCalledWith("server-2", action);
+
expect(broker.emitLocal).toHaveBeenCalledTimes(1);
- expect(broker.emitLocal).toHaveBeenCalledWith("register.action.update", { action, nodeID: "server-2" });
+ expect(broker.emitLocal).toHaveBeenCalledWith("register.action.user.update", { action, nodeID: "server-2" });
});
});
| 3 |
diff --git a/entry_types/scrolled/package/src/collections.js b/entry_types/scrolled/package/src/collections.js @@ -111,7 +111,7 @@ export function watchCollection(collection,
payload: {
collectionName: name,
keyAttribute: keyAttribute,
- order: collection.pluck(keyAttribute),
+ order: collection.pluck(keyAttribute).filter(Boolean),
attributes: getAttributes(model, options)
}
});
@@ -119,7 +119,7 @@ export function watchCollection(collection,
}, handle);
collection.on('change', model => {
- if (hasChangedAttributes(model, watchedAttributeNames)) {
+ if (hasChangedAttributes(model, watchedAttributeNames) && !model.isNew()) {
dispatch({
type: CHANGE,
payload: {
@@ -132,23 +132,27 @@ export function watchCollection(collection,
}, handle);
if (includeConfiguration) {
- collection.on('change:configuration', model => dispatch({
+ collection.on('change:configuration', model => {
+ if (!model.isNew()) {
+ dispatch({
type: CHANGE,
payload: {
collectionName: name,
keyAttribute: keyAttribute,
attributes: getAttributes(model, options)
}
- }), handle);
+ })
+ }
+ }, handle);
}
collection.on('remove', model => {
- if (!tearingDown) {
+ if (!tearingDown && !model.isNew()) {
dispatch({
type: REMOVE,
payload: {
collectionName: name,
- order: collection.pluck(keyAttribute),
+ order: collection.pluck(keyAttribute).filter(Boolean),
key: model.attributes[keyAttribute]
}
})
| 8 |
diff --git a/src/core/lib/FileSignatures.mjs b/src/core/lib/FileSignatures.mjs @@ -280,7 +280,7 @@ export const FILE_SIGNATURES = {
9: 0x0,
10: [0x0, 0x1]
},
- extractor: null
+ extractor: extractICO
},
{
name: "Radiance High Dynamic Range image",
@@ -2772,6 +2772,32 @@ export function extractBMP(bytes, offset) {
}
+/**
+ * ICO extractor.
+ *
+ * @param {Uint8Array} bytes
+ * @param {number} offset
+ */
+export function extractICO(bytes, offset) {
+ const stream = new Stream(bytes.slice(offset));
+
+ // Move to number of file there are.
+ stream.moveTo(4);
+
+ // Read the number of files stored in the ICO
+ const numberFiles = stream.readInt(2, "le");
+
+ // Move forward to the last file header.
+ stream.moveForwardsBy(8 + ((numberFiles-1) * 16));
+ const fileSize = stream.readInt(4, "le");
+ const fileOffset = stream.readInt(4, "le");
+
+ // Move to the end of the last file.
+ stream.moveTo(fileOffset + fileSize);
+ return stream.carve();
+}
+
+
/**
* WAV extractor.
*
| 0 |
diff --git a/templates/indicators/form-sections/targets.html b/templates/indicators/form-sections/targets.html $("#clearTargets").hide();
});
+ function updateSum(e) {
+ let sum = 0;
+ for (i = 1; i <= $("#numberOfTargetPeriods").val(); i++) {
+ sum += +$(`#id_target_${i}`).val();
+ }
+
+ $("#sumOfTargets").text(sum);
+ }
+
// add target fields when the #addTargetsBtn is clicked
$("#addTargetsBtn").click(() => {
// hide the #frequencyMetadata
let input = $("<input>")
.addClass("form-control")
- .attr("type", "number");
+ .attr({ type: "number", id: `id_target_${i}` }).keyup(updateSum)
let value = $("<td>").append(input);
let removeTarget = $("<td>").addClass("text-danger");
tbody.append(
$("<tr>").append(
$("<th>").text("Sum of Targets"),
- $("<th>").text(0),
+ $("<th>").attr("id", "sumOfTargets").text(0),
$("<td>")
),
| 3 |
diff --git a/contracts/DelegateApprovals.sol b/contracts/DelegateApprovals.sol @@ -22,8 +22,7 @@ The concept is similar to the ERC20 interface where a wallet can
approve an authorised party to spend on the authorising party's
behalf in the allowance interface.
-Withdrawing approval sets the delegate as false instead of
-removing from the approvals list for auditability.
+Withdrawing approval deletes the approval for the given delegate.
This contract inherits state for upgradeability / associated
contract.
| 3 |
diff --git a/src/components/crown/utils.js b/src/components/crown/utils.js @@ -16,7 +16,7 @@ export function removeBoundaryEvents(graph, node, removeNode) {
return cell.component && cell.component.node.isBpmnType('bpmn:BoundaryEvent');
})
.forEach(boundaryEventShape => {
- graph.getConnectedLinks(boundaryEventShape).forEach(shape => this.$emit('remove-node', shape.component.node));
+ graph.getConnectedLinks(boundaryEventShape).forEach(shape => removeNode(shape.component.node));
removeNode(boundaryEventShape.component.node);
});
}
| 2 |
diff --git a/lib/transports/elasticsearch.js b/lib/transports/elasticsearch.js @@ -240,11 +240,11 @@ elasticsearch.prototype.setMapping = function (data, limit, offset, callback) {
if (mappings[key]._parent) {
var parentIndex = sortedMappings.findIndex(set => set.key === mappings[key]._parent.type) // find parent
if (parentIndex > -1) {
- sortedMappings.splice(parentIndex,0,{key: key, data: mappings[key]});
+ sortedMappings.splice(parentIndex, 0, {key: key, data: mappings[key]})
} else {
var childIndex = sortedMappings.findIndex(set => (set.data._parent) && (set.data._parent.type === key)) // find child
if (childIndex > -1) {
- sortedMappings.splice(childIndex+1,0,{key: key, data: mappings[key]});
+ sortedMappings.splice(childIndex + 1, 0, {key: key, data: mappings[key]})
} else {
sortedMappings = [{key: key, data: mappings[key]}].concat(sortedMappings)
}
| 4 |
diff --git a/src/block-manager.js b/src/block-manager.js @@ -306,19 +306,19 @@ Object.assign(BlockManager.prototype, require('./function-bind'), require('./med
var nextBlock = this.getNextBlock(currentBlock);
if (currentBlock.isEmpty()) {
- this.mediator.trigger("block:remove", currentBlock.blockID);
+ this.removeBlock(currentBlock.blockID);
}
if (nextBlock) {
blocks.forEach((block) => {
- this.mediator.trigger("block:createBefore", block.type, block.data, nextBlock, { focusAtEnd: true });
+ this.createBlockBefore(block.type, block.data, nextBlock, { focusAtEnd: true });
});
return;
}
}
blocks.forEach((block) => {
- this.mediator.trigger("block:create", block.type, block.data, undefined, { focusAtEnd: true });
+ this.createBlock(block.type, block.data, undefined, { focusAtEnd: true });
});
},
| 2 |
diff --git a/app/controllers/observations_controller.rb b/app/controllers/observations_controller.rb @@ -59,7 +59,7 @@ class ObservationsController < ApplicationController
:fields, :viewed_updates, :community_taxon_summary, :update_fields,
:review, :taxon_summary, :observation_links ]
before_action :load_observation, :only => load_only
- blocks_spam :only => load_only - [ :taxon_summary, :observation_links ],
+ blocks_spam :only => load_only - [ :taxon_summary, :observation_links, :review ],
:instance => :observation
check_spam only: [:create, :update], instance: :observation
before_action :require_owner, :only => [:edit, :edit_photos,
| 11 |
diff --git a/gulpfile.mjs b/gulpfile.mjs @@ -25,8 +25,8 @@ gulp.task('scripts', gulp.series(
*/
gulp.task('styles', gulp.series(
npmScriptTask('lint:scss'),
- npmScriptTask('build:sassdoc'),
- compileStylesheets
+ compileStylesheets,
+ npmScriptTask('build:sassdoc')
))
/**
| 11 |
diff --git a/lib/node_modules/@stdlib/_tools/scripts/publish_packages.js b/lib/node_modules/@stdlib/_tools/scripts/publish_packages.js @@ -766,7 +766,10 @@ function publish( pkg, clbk ) {
shell( command );
}
pkgJSON.homepage = 'https://stdlib.io';
- pkgJSON.repository.url = 'git://github.com/stdlib-js/'+distPkg+'.git';
+ pkgJSON.repository = {
+ 'type': 'git',
+ 'url': 'git://github.com/stdlib-js/'+distPkg+'.git'
+ };
// Ensure `npm install` does not automatically build a native add-on...
if ( pkgJSON.gypfile ) {
| 9 |
diff --git a/token-metadata/0xCc394f10545AeEf24483d2347B32A34a44F20E6F/metadata.json b/token-metadata/0xCc394f10545AeEf24483d2347B32A34a44F20E6F/metadata.json "symbol": "VGT",
"address": "0xCc394f10545AeEf24483d2347B32A34a44F20E6F",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/public/app/js/cbus-ui.js b/public/app/js/cbus-ui.js @@ -567,6 +567,7 @@ cbus.ui.setFullscreen = function(fullscreenOn) {
};
cbus.ui.updateThumbarButtons = function() {
+ if (cbus.audio.element) {
cbus.ui.browserWindow.setThumbarButtons([{
tooltip: cbus.audio.element.paused ? i18n.__("button_playback-play") : i18n.__("button_playback-pause"),
icon: path.join(__dirname, "img", `ic_${cbus.audio.element.paused ? "play_arrow" : "pause"}_white_24dp_1x.png`),
@@ -577,6 +578,7 @@ cbus.ui.updateThumbarButtons = function() {
flags: [ cbus.audio.queue.length ? "enabled" : "disabled" ],
click: function() { cbus.audio.playQueueItem(0) }
}]);
+ }
};
(function() {
| 1 |
diff --git a/core/worker/lib/algorithm-communication/socket-io.js b/core/worker/lib/algorithm-communication/socket-io.js @@ -31,7 +31,7 @@ class SocketWorkerCommunication extends EventEmitter {
return reject(new Error(validatedOptions.errors[0]));
}
const server = this._options.httpServer || http.createServer();
- this._socketServer = socketio.listen(server, { pingTimeout: this._options.pingTimeout, maxHttpBufferSize: 1e9 });
+ this._socketServer = socketio.listen(server, { pingTimeout: this._options.pingTimeout, maxHttpBufferSize: this._options.maxPayload });
this._socketServer.on('connection', (socket) => {
log.info('Connected!!!', { component });
this._registerSocketMessages(socket);
| 0 |
diff --git a/bin/moleculer-runner.js b/bin/moleculer-runner.js @@ -190,7 +190,7 @@ function mergeOptions() {
}
if (_.isPlainObject(obj[key]))
- obj[key] = overwriteFromEnv(obj[key], key);
+ obj[key] = overwriteFromEnv(obj[key], (prefix ? prefix + "_" : "") + key);
});
return obj;
| 1 |
diff --git a/packages/vue/src/components/organisms/SfHero/SfHero.spec.js b/packages/vue/src/components/organisms/SfHero/SfHero.spec.js @@ -2,6 +2,7 @@ import { shallowMount } from "@vue/test-utils";
import SfHero from "./SfHero.vue";
import SfHeroItem from "./_internal/SfHeroItem.vue";
import SfArrow from "../../atoms/SfArrow/SfArrow.vue";
+import SfButton from "../../atoms/SfButton/SfButton.vue";
import SfBullets from "../../atoms/SfBullets/SfBullets.vue";
const items = [
{
@@ -68,18 +69,6 @@ describe("SfHero.vue", () => {
it("renders SfBullets component", () => {
expect(component.findAllComponents(SfBullets)).toHaveLength(1);
});
- it("calls #go with 'prev' when clicked on left arrow", () => {
- jest.spyOn(component.vm, "go");
- expect(component.vm.go).not.toHaveBeenCalled();
- component.findAllComponents(SfArrow).at(0).trigger("click");
- expect(component.vm.go).toHaveBeenCalledWith("prev");
- });
- it("calls #go with 'next' when clicked on right arrow", () => {
- jest.spyOn(component.vm, "go");
- expect(component.vm.go).not.toHaveBeenCalled();
- component.findAllComponents(SfArrow).at(1).trigger("click");
- expect(component.vm.go).toHaveBeenCalledWith("next");
- });
});
describe("with 'prev' and 'next' slots populated", () => {
let component;
| 1 |
diff --git a/src/protocol/encoder.js b/src/protocol/encoder.js @@ -124,7 +124,7 @@ module.exports = class Encoder {
// Based on:
// https://github.com/addthis/stream-lib/blob/master/src/main/java/com/clearspring/analytics/util/Varint.java#L106
- writeSignedVarInt32(value) {
+ writeVarInt(value) {
const byteArray = []
let encodedValue = Encoder.encodeZigZag(value)
@@ -138,8 +138,7 @@ module.exports = class Encoder {
return this
}
-
- writeSignedVarInt64(value) {
+ writeVarLong(value) {
const byteArray = []
let longValue = Encoder.encodeZigZag64(value)
| 10 |
diff --git a/protocols/indexer/README.md b/protocols/indexer/README.md @@ -70,24 +70,6 @@ function createMarket(
| `_makerToken` | `address` | Address of the token that the Maker sends. |
| `_takerToken` | `address` | Address of the token that the Taker sends. |
-## Create a Two-Sided Market
-
-Call `createMarket` twice to for both sides of a market. For example, an intent to trade both WETH/DAI and DAI/WETH.
-
-```Solidity
-function createTwoSidedMarket(
- address _tokenOne,
- address _tokenTwo
-) public returns (address, address)
-```
-
-### Params
-
-| Name | Type | Description |
-| :---------- | :-------- | :----------------------------------------------------- |
-| `_tokenOne` | `address` | Address of the token of the first side of the market. |
-| `_tokenTwo` | `address` | Address of the token of the second side of the market. |
-
## Add a Token to Blacklist
Add a token to the blacklist. Markets that include the blacklisted token will be ignored. Emits an `AddToBlacklist` event.
@@ -153,30 +135,6 @@ function setIntent(
| `MINIMUM_NOT_MET` | The staking amount is insufficient. |
| `UNABLE_TO_STAKE` | The staking amount was not transferred. |
-## Set a Two-Sided Intent to Trade
-
-Call `setIntent` for both sides of a market.
-
-```Solidity
-function setTwoSidedIntent(
- address _tokenOne,
- address _tokenTwo,
- uint256 _amount,
- uint256 _expiry,
- address _locator
-) public
-```
-
-### Params
-
-| Name | Type | Description |
-| :---------- | :-------- | :----------------------------------------------------- |
-| `_tokenOne` | `address` | Address of the token of the first side of the market. |
-| `_tokenTwo` | `address` | Address of the token of the second side of the market. |
-| `_amount` | `uint256` | Amount of token to stake for EACH market. |
-| `_expiry` | `uint256` | Timestamp after which the intent is invalid. |
-| `_locator` | `address` | Locator for the peer. |
-
## Unset an Intent to Trade
Unset an intent to trade and return staked tokens to the sender.
@@ -202,27 +160,6 @@ function unsetIntent(
| `MARKET_IS_BLACKLISTED` | One or both of the tokens are blacklisted. |
| `MARKET_DOES_NOT_EXIST` | There is no market for the token pair. |
-## Unset a Two-Sided Intent to Trade
-
-Call `unsetIntent` for both sides of a market.
-
-```Solidity
-function setTwoSidedIntent(
- address _tokenOne,
- address _tokenTwo
-) public
-```
-
-### Params
-
-| Name | Type | Description |
-| :---------- | :-------- | :----------------------------------------------------- |
-| `_tokenOne` | `address` | Address of the token of the first side of the market. |
-| `_tokenTwo` | `address` | Address of the token of the second side of the market. |
-| `_amount` | `uint256` | Amount of token to stake for each side. |
-| `_expiry` | `uint256` | Timestamp after which the intent is invalid. |
-| `_locator` | `address` | Locator for the peer. |
-
## Get Intents
Get a list of addresses that have an intent to trade a token pair.
@@ -249,27 +186,3 @@ function getIntents(
| :---------------------- | :----------------------------------------- |
| `MARKET_IS_BLACKLISTED` | One or both of the tokens are blacklisted. |
| `MARKET_DOES_NOT_EXIST` | There is no market for the token pair. |
-
-## Get Length
-
-Get the length of the list of intents for a token pair.
-
-```Solidity
-function lengthOf(
- address _makerToken,
- address _takerToken
-) external view returns (uint256)
-```
-
-### Params
-
-| Name | Type | Description |
-| :------------ | :-------- | :----------------------------------------- |
-| `_makerToken` | `address` | Address of the token that the Maker sends. |
-| `_takerToken` | `address` | Address of the token that the Taker sends. |
-
-### Reverts
-
-| Reason | Scenario |
-| :---------------------- | :------------------------------------- |
-| `MARKET_DOES_NOT_EXIST` | There is no market for the token pair. |
| 2 |
diff --git a/hardening.py b/hardening.py @@ -5,6 +5,7 @@ import base64
import sys
+
parser = argparse.ArgumentParser(description='Uses a specified CMK to encrypt QnABot Lambdas and Parameter Store settings')
parser.add_argument("stack_arn", help="the arn of the QnABot CloudFormation Stack")
parser.add_argument("cmk_arn", help="the ARN of the Customer Master Key to use for encryption")
@@ -15,14 +16,16 @@ kms_client = boto3.client("kms")
cloudformation_client = boto3.client('cloudformation')
ssm_client = boto3.client('ssm')
s3_client = boto3.client('s3')
+ddb_client = boto3.client('dynamodb')
+
args = type('', (), {})()
-if len(sys.argv) != 0:
+if len(sys.argv) != 1:
args = parser.parse_args()
else:
- args.stack_arn = 'QnaBot-JohnDoe'
- args.cmk_arn = "arn:aws:kms:us-east-1:12345677:key/aaaaa-bbbb-ccccc-ddddd"
+ args.stack_arn = "QnaBotVPC4"
+ args.cmk_arn = "arn:aws:kms:us-east-1:123456778:key/aaaaa-bbbb-cccc-dddd-eeeee"
policy_document = {
"Version":"2012-10-17",
@@ -87,7 +90,7 @@ def process_stacks(stackname):
parameter_value = parameter_response['Parameter']['Value']
description = parameter_response['Parameter']["Description"] if "Decription" in parameter_response['Parameter'] else ""
- ssm_response = ssm_client.put_parameter(
+ ssm_client.put_parameter(
Name=parameter_name,
Description=description,
Value=parameter_value,
@@ -99,7 +102,7 @@ def process_stacks(stackname):
s3_buckets = filter(lambda x: x["ResourceType"] == "AWS::S3::Bucket",response["StackResourceSummaries"])
for bucket in s3_buckets:
- response = s3_client.put_bucket_encryption(
+ s3_client.put_bucket_encryption(
Bucket=bucket["PhysicalResourceId"],
ServerSideEncryptionConfiguration={
'Rules': [
@@ -114,6 +117,18 @@ def process_stacks(stackname):
)
print(f"Encryption set for {bucket['PhysicalResourceId']}")
+ ddb_tables = filter(lambda x: x["ResourceType"] == "AWS::DynamoDB::Table",response["StackResourceSummaries"])
+ for table in ddb_tables:
+ ddb_client.update_table(
+ TableName = table["PhysicalResourceId"],
+ SSESpecification ={
+ 'Enabled': True,
+ 'SSEType': 'KMS',
+ 'KMSMasterKeyId': args.cmk_arn
+ }
+ )
+
+
process_stacks(args.stack_arn)
paginator = cloudformation_client.get_paginator('list_stack_resources')
| 3 |
diff --git a/assets/js/components/data-block.js b/assets/js/components/data-block.js @@ -129,11 +129,9 @@ class DataBlock extends Component {
">
{ title }
</h3>
- { datapointFormatted && (
<div className="googlesitekit-data-block__datapoint">
{ datapointFormatted }
</div>
- ) }
</div>
{ sparklineComponent && (
<div className="googlesitekit-data-block__sparkline">
| 2 |
diff --git a/templates/components/objectives-tree.html b/templates/components/objectives-tree.html <script src="{% static 'hierachy_chart/jquery.orgchart.js' %}"></script>
<div class="container">
+ {% block breadcrumbs %}
+ <ul class="breadcrumb">
+ <li><a href="{% url 'index' %}">Home Dashboard</a></li>
+ <li class="active">Objectives</li>
+ </ul>
+ {% endblock %}
+
<!-- Sub navigation -->
<div class="sub-navigation">
<div class="sub-navigation-header">
| 0 |
diff --git a/specs/botframework-activity/botframework-cards.md b/specs/botframework-activity/botframework-cards.md @@ -128,7 +128,7 @@ Channels are recommended to make these rules simple.
All cards include content (in the form of one or more fields) and an array of buttons, each of which is represented by an action. Some cards include an additional card action, the "tap action," describing the behavior when the user taps the card but not any of the buttons.
-All Bot Framework card types except Adaptive Cards include a `buttons` field, which contains zero or more buttons to be presented to a user. The type of the `buttons` field is an array of type [`cardAction`](BotFramework-Activity.md#Card-action), defined in the [Bot Framework Activity](BotFramework-Activity.md) schema [[1](#References)].
+All Bot Framework card types except Adaptive Cards include a `buttons` field, which contains zero or more buttons to be presented to a user. The type of the `buttons` field is an array of type [`cardAction`](botframework-activity.md#card-action), defined in the [Bot Framework Activity](botframework-activity.md) schema [[1](#References)].
`C4000`: Channels MAY define a minimum and maximum number of buttons to allow on each card type.
| 3 |
diff --git a/articles/quickstart/webapp/symfony/01-login.md b/articles/quickstart/webapp/symfony/01-login.md @@ -142,7 +142,7 @@ hwi_oauth:
class: 'AppBundle\Auth0ResourceOwner'
base_url: https://${account.namespace}
client_id: ${account.clientId}
- client_secret: ${account.clientSecret}
+ client_secret: YOUR_CLIENT_SECRET
redirect_uri: http://yourUrl/auth0/callback
scope: "openid profile"
```
| 14 |
diff --git a/ReviewQueueHelper.user.js b/ReviewQueueHelper.user.js @@ -602,16 +602,20 @@ async function waitForSOMU() {
return;
}
- // Get current popup
- const currPopup = $('#delete-question-popup, #rejection-popup, #popup-flag-post, #popup-close-question').filter(':visible').last();
- console.log('active popup', currPopup.attr('id'));
-
// #69 - Do nothing else if a textbox or textarea is focused, e.g.: comment box
// Do nothing else also if post is being edited
- if($('input:text:focus, textarea:focus, .editing-review-content').length > 0) return;
+ if(document.activeElement.tagName == 'TEXTAREA' ||
+ (document.activeElement.tagName == 'INPUT' && document.activeElement.type == 'text') ||
+ document.getElementsByClassName('editing-review-content').length > 0 ) {
+ return;
+ }
+ if(goback || index != null) {
+ // Get current popup
+ const currPopup = $('#delete-question-popup, #rejection-popup, #popup-flag-post, #popup-close-question').filter(':visible').last();
+
// If there's an active popup
if(currPopup.length) {
@@ -662,6 +666,7 @@ async function waitForSOMU() {
}
} // end popup is active
+ }
// Review action buttons
| 14 |
diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.jsx @@ -245,7 +245,7 @@ const Header = ({
<ListItemText primary={strings.app_my_profile} />
</ListItem>
</DrawerLink>
- <DrawerLink to={`${process.env.REACT_APP_API_HOST}/logout`}>
+ <DrawerLink as="a" href={`${process.env.REACT_APP_API_HOST}/logout`}>
<ListItem button onClick={() => setMenuState(false)}>
<ListItemText primary={strings.app_logout} />
</ListItem>
| 1 |
diff --git a/test/deployments/index.js b/test/deployments/index.js @@ -111,7 +111,7 @@ describe('deployments', () => {
);
const tokenName = await tokenContract.methods.name().call();
- if (token === 'Synthetix') {
+ if (token === 'Synthetix' || token === 'ProxyERC20') {
assert.strictEqual(tokenName, 'Synthetix Network Token');
} else if (token.includes('Proxy')) {
const synthType = token.slice(5);
| 1 |
diff --git a/desktop/core/io/midi.js b/desktop/core/io/midi.js @@ -66,7 +66,7 @@ function Midi (terminal) {
if (!this.outputDevice()) { console.warn('Midi', 'No midi output!'); return }
const channel = down === true ? 0x90 + item[0] : 0x80 + item[0]
- const note = 24 + (item[1] * 12) + item[2]
+ const note = clamp(24 + (item[1] * 12) + item[2], 0, 127)
const velocity = item[3]
this.outputDevice().send([channel, note, velocity])
| 1 |
diff --git a/packages/moon/src/compiler/parser/parser.js b/packages/moon/src/compiler/parser/parser.js -/*
+/**
* Parse elements
*
* Given a start index, end index, and a list of tokens, return a tree after
@@ -39,7 +39,7 @@ function parseElements(start, end, tokens) {
}
}
-/*
+/**
* Parser
*
* The parser is responsible for taking a start index, end index, and a list of
| 4 |
diff --git a/shared/js/ui/views/whitelist.es6.js b/shared/js/ui/views/whitelist.es6.js const Parent = window.DDG.base.View
+const isHiddenClass = 'is-hidden'
+const isDisabledClass = 'is-disabled'
+const isInvalidInputClass = 'is-invalid-input'
function Whitelist (ops) {
this.model = ops.model
@@ -15,9 +18,6 @@ function Whitelist (ops) {
Whitelist.prototype = window.$.extend({},
Parent.prototype,
{
- _isHiddenClass: 'is-hidden',
- _isDisabledClass: 'is-disabled',
- _isInvalidInputClass: 'is-invalid-input',
_removeItem: function (e) {
const itemIndex = window.$(e.target).data('item')
@@ -43,26 +43,26 @@ Whitelist.prototype = window.$.extend({},
},
_showErrorMessage: function () {
- this.$add.addClass(this._isHiddenClass)
- this.$error.removeClass(this._isHiddenClass)
- this.$url.addClass(this._isInvalidInputClass)
+ this.$add.addClass(isHiddenClass)
+ this.$error.removeClass(isHiddenClass)
+ this.$url.addClass(isInvalidInputClass)
},
_hideErrorMessage: function () {
- this.$add.removeClass(this._isHiddenClass)
- this.$error.addClass(this._isHiddenClass)
- this.$url.removeClass(this._isInvalidInputClass)
+ this.$add.removeClass(isHiddenClass)
+ this.$error.addClass(isHiddenClass)
+ this.$url.removeClass(isInvalidInputClass)
},
_manageInputChange: function (e) {
- const isButtonDisabled = this.$add.hasClass(this._isDisabledClass)
+ const isButtonDisabled = this.$add.hasClass(isDisabledClass)
this._hideErrorMessage()
if (this.$url.val() && isButtonDisabled) {
- this.$add.removeClass(this._isDisabledClass)
+ this.$add.removeClass(isDisabledClass)
} else if (!this.$url.val()) {
- this.$add.addClass(this._isDisabledClass)
+ this.$add.addClass(isDisabledClass)
}
if (!isButtonDisabled && e.key === 'Enter') {
@@ -72,10 +72,10 @@ Whitelist.prototype = window.$.extend({},
},
_showAddToWhitelistInput: function (e) {
- this.$url.removeClass(this._isHiddenClass)
+ this.$url.removeClass(isHiddenClass)
this.$url.focus()
- this.$add.removeClass(this._isHiddenClass)
- this.$showadd.addClass(this._isHiddenClass)
+ this.$add.removeClass(isHiddenClass)
+ this.$showadd.addClass(isHiddenClass)
e.preventDefault()
},
| 5 |
diff --git a/package.json b/package.json "description": "Zigbee devices",
"devDependencies": {
"@alcalzone/release-script": "^2.2.0",
- "@iobroker/testing": "^2.4.2",
+ "@iobroker/testing": "^2.5.1",
"axios": "^0.21.1",
"mixin-deep": "^1.3.2",
"chai": "^4.2.0",
| 3 |
diff --git a/src/encoded/tests/test_file.py b/src/encoded/tests/test_file.py @@ -20,6 +20,7 @@ def fastq_no_replicate(award, experiment, lab):
'file_format': 'fastq',
'file_size': 23242,
'run_type': 'paired-ended',
+ 'paired_end': '1',
'md5sum': '0123456789abcdef0123456789abcdef',
'output_type': 'raw data',
'status': 'in progress',
| 1 |
diff --git a/package.json b/package.json "build": "node tasks/build.js && npm run test",
"changelog": "node tasks/changelog.js",
"git-stage": "node tasks/git-stage.js",
+ "major": "node tasks/version.js --type=\"major\"",
+ "minor": "node tasks/version.js --type=\"minor\"",
+ "patch": "node tasks/version.js --type=\"patch\"",
"precommit": "lint-staged",
"start": "npm run build",
"test": "node tasks/mochaTest.js",
- "test-silent": "node tasks/mochaTest.js --silent",
- "version": "node tasks/version.js"
+ "test-silent": "node tasks/mochaTest.js --silent"
},
"lint-staged": {
"*.js": [
| 3 |
diff --git a/src/actions/account.js b/src/actions/account.js @@ -480,9 +480,9 @@ export const { signAndSendTransactions, setSignTransactionStatus, sendMoney, tra
]
})
-export const { switchAccount, refreshAccount, refreshAccountExternal, refreshUrl, updateStakingAccount, updateStakingLockup } = createActions({
+export const { switchAccount, refreshAccountOwner, refreshAccountExternal, refreshUrl, updateStakingAccount, updateStakingLockup, getBalance } = createActions({
SWITCH_ACCOUNT: wallet.selectAccount.bind(wallet),
- REFRESH_ACCOUNT: [
+ REFRESH_ACCOUNT_OWNER: [
wallet.refreshAccount.bind(wallet),
() => ({ accountId: wallet.accountId })
],
| 10 |
diff --git a/js/bam/bamTrack.js b/js/bam/bamTrack.js @@ -175,7 +175,7 @@ var igv = (function (igv) {
// sort by @ center line
//menuItems.push(sortMenuItem());
- colorByMenuItems.push({key: 'none', label: 'track color'});
+ //colorByMenuItems.push({key: 'none', label: 'track color'});
colorByMenuItems.push({key: 'strand', label: 'read strand'});
@@ -234,6 +234,11 @@ var igv = (function (igv) {
inputValue,
clickFunction;
+ if (menuItem.key === self.alignmentTrack.colorBy) {
+ self.alignmentTrack.colorBy = 'none';
+ self.trackView.repaint(true);
+ }
+ else {
if ('tag' === menuItem.key) {
labelHTMLFunction = function () {
@@ -264,6 +269,7 @@ var igv = (function (igv) {
self.alignmentTrack.colorBy = menuItem.key;
self.trackView.repaint(true);
}
+ }
};
return {name: undefined, object: $e, click: clickHandler, init: undefined}
| 11 |
diff --git a/src/public/disease/sections/Ontology/Section.js b/src/public/disease/sections/Ontology/Section.js @@ -79,7 +79,7 @@ const Section = ({ efoId, name }) => {
useEffect(() => {
let isCurrent = true;
fetch(
- 'https://00e9e64bac03d5aa7f8a51cb126776eb75a8fa7ca08cd8ee56-apidata.googleusercontent.com/download/storage/v1/b/open-targets-data-releases/o/20.04%2Foutput%2FtherapeuticAreas.json?qk=AD5uMEsJ1WZh1J8eg8c7UFzzM2I7JsdqMrdg4aH1tPL6OhuU8rcXlfhB76OoOU4G6cxvtUHHm521pUSaNxUEsST03LWdeYQQ8EaSDTT_dghlQcrUr2Kl_nEqQ4dKxL-YX2C9W2AIvM3MKDijvcVHVHlEk6wo-h58IwfgqOoDQA0U1YrBZkPoN87kd32CUgqlajkAYA9j-dx9ku-0eibqce6gVBnaYuy0xSb-DcHutrY4e0CGKW6GkK_N83ZPmc0Mr05RqEmQivR5yVdeqj6AqgNy4aiUfWMbwkA4KXGtGDhsWRzZKNwW1U1aiojIJUynPdSjqbz7NLmku6Mrmk8cqz5n0wzwebBTWGhVkQ65RULT2-m6x_1jOcXzaKzNS3oL0oYWR8pMFELy8enT5jqGtTKDetabSSmMrLfxE7sVW9njCU8DHcSuN9ebs9B5StuODDGbytt88KENkCWKAC6t2GyOEiSq5n5e--iP_qrgTKzqDHWvJfNQelmkEubRxUC8hhBZGIay6wY-ZkkZJohs3azPg4dZXs0_bdjGYuW90us2z7DGAkudcnmlvTQtmaSfi3jm3f3Ty735S9fQVrwSX-kxdf2sP1HmCQoEWfpHDKlTSyk9Snm3Z4cQHtK2noavnnFNxWKKxjTxTMvyCg4l5Q3lGBZtzuWKj56Zu1X5qQm12VZADyuJ_i0vob96ftf6LV6mPbjXvra3tKUdHJcXJNcYfBWj_8vqZOsHYX3WbzMPzzPKi_D1sA3to5VQLjNT2GuGFQxHBiFk2qSbDqQe1UaLnrETMo9n1bK3QgMw36pYqK4gTNGVHW-WFimxBlGpz69Fi-6dYBXnvc4fiLiNoVqreUeHgWw7zA&isca=1'
+ 'https://storage.googleapis.com/open-targets-data-releases/20.04/output/therapeuticAreas.json'
)
.then(res => res.json())
.then(data => {
@@ -96,7 +96,7 @@ const Section = ({ efoId, name }) => {
useEffect(() => {
let isCurrent = true;
fetch(
- 'https://00e9e64bacaf0939e0b75efff29e10eb1f27046c9465b402db-apidata.googleusercontent.com/download/storage/v1/b/open-targets-data-releases/o/20.04%2Foutput%2Fefos.json?qk=AD5uMEu1R-v6YXrX-0gGQCaiZ4yqocdyAxA_8NZBbF45TTWU8myb2cDg_hvbBeJZ1x0gmZjk0mZT9Mx7hSq2dpjZmlI0UoBRaA80mm_qk6AuXsGj8icHRI-x8HXZVBOM7DsSSPHD6OYebLdUjXP8Lcyb7IUs_Qin6JaYCM48OLNIEiHUBCbkX0az8u8Go2OtyUEVq8UezKaCo5ZdULHninj06O6XSdsmaq72rP6qxLdeejfFkIwnYQU35Wi79V--bJCu6zpm20AUg1BGwbbhW267asvVojm2OmdUc98x8VfB9KSsLezTX3lufttVEReGedT0WVosm4UdU5eCR-TegLgDwbYVcCsbzi-zfdtm1C6gu5t0MIiLXX79ogeUDB_NYGMws1GUmcWCa5XHJ7S3ALwjW0SPZFx7dzjV1e2Feueo9nwHUaMeDltpHX67PECJ81P2AhLM5N07pzkL88go6qUYx1RUEZClldylGdE35CZRRj0L_oV_ysu-oNjq-giZsa5sa1TOmNJweHIfh9rI1F0bmVd7yXfSO56I-xaWM3g0bYq9Rh3SXNZuICh8n9e-QkQQk7dfwyPGUPeOvJx6qly5GploFBzydOlzsDCNDTDA5GvfE2M7vKQ6N5URVE9hfnnsvJsL0pkTQZKdiZtIEMjnsR7h03Cr5Dxpb6W9ZXbGwp34J41W2v1cWlSVfryyipPogPEnwSJgyrE2-8SNJODQ8ihTYa8hqeBax_rNwEXhkwWEBmikVfeZhR3KWosc1KelXN2meMCXQ3J22CRk5CyiG3pKMb7SNEQFjHNPs2WzHj_4nRdqjT1nTnoukEoq4XdrDZvRE5X3UHeUsyok9oZA20uxXp8OMg&isca=1'
+ 'https://storage.googleapis.com/open-targets-data-releases/20.04/output/efos.json'
)
.then(res => res.json())
.then(nodes => {
| 4 |
diff --git a/webpack.config.js b/webpack.config.js @@ -46,6 +46,7 @@ module.exports = {
new webpack.DefinePlugin({
'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'development')
}),
+ new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
],
module: {
| 8 |
diff --git a/CHANGELOG.md b/CHANGELOG.md +# v4.0.0
+
+- This major version upgrades all dependencies to the most recent working major
+ version, including binary dependencies.
+ This is a measure of last resort since the last version of v3 attempted
+ to use a postinstall hook to install different versions of some binary
+ dependencies so that a single version train would work for both old
+ and new Node.js versions.
+ This plan failed because some build systems would prune the versions
+ installed by the postinstall hook.
+
# v3.10.1
- This is the first patch release after master diverged for release 4.0.0.
| 6 |
diff --git a/src/content/en/tools/chrome-devtools/storage/indexeddb.md b/src/content/en/tools/chrome-devtools/storage/indexeddb.md @@ -2,7 +2,7 @@ project_path: /web/tools/_project.yaml
book_path: /web/tools/_book.yaml
description: How to view and change IndexedDB data with the Application panel and Snippets.
-{# wf_updated_on: 2019-03-19 #}
+{# wf_updated_on: 2020-06-19 #}
{# wf_published_on: 2019-03-18 #}
{# wf_blink_components: Platform>DevTools #}
@@ -72,7 +72,7 @@ IndexedDB. If not, see [Using IndexedDB][IDB]{: .external }.
1. Click an object store to see its key-value pairs.
<aside class="caution">
- IndexedDB data does not update in real-time. See <a href="refresh">Refresh
+ IndexedDB data does not update in real-time. See <a href="#refresh">Refresh
IndexedDB data</a>.
</aside>
| 1 |
diff --git a/src/admin/components/Motd/index.js b/src/admin/components/Motd/index.js @@ -23,7 +23,8 @@ const enhance = compose(
onChange: props => (event) => {
props.setMotd(event.target.value);
},
- onSubmit: props => () => {
+ onSubmit: props => (event) => {
+ event.preventDefault();
props.onSetMotd(props.newMotd);
props.setExpanded(false);
},
@@ -54,6 +55,7 @@ const Motd = ({
/>
<CardContent>{parsedMotd}</CardContent>
<Collapse in={expanded} unmountOnExit>
+ <form onSubmit={onSubmit}>
<CardContent style={{ paddingTop: 0 }}>
<textarea
className="AdminMotd-field"
@@ -65,13 +67,14 @@ const Motd = ({
</CardContent>
<CardActions>
<Button
+ type="submit"
variant="raised"
color="primary"
- onClick={onSubmit}
>
Save
</Button>
</CardActions>
+ </form>
</Collapse>
</Card>
);
| 4 |
diff --git a/packages/openneuro-app/src/scripts/front-page/front-page-top-datasets.jsx b/packages/openneuro-app/src/scripts/front-page/front-page-top-datasets.jsx @@ -160,7 +160,9 @@ const FrontPageTopResult = query => ({ loading, error, data }) => {
}
const FrontPageTopQuery = ({ query }) => (
- <Query query={query}>{FrontPageTopResult(query)}</Query>
+ <Query query={query} errorPolicy="ignore">
+ {FrontPageTopResult(query)}
+ </Query>
)
FrontPageTopQuery.propTypes = {
| 11 |
diff --git a/README.md b/README.md <a href="https://spectrum.chat/hikaya" rel="nofollow"><img src="https://withspectrum.github.io/badge/badge.svg" alt="Join the community on Spectrum"/></a>
</p>
-This is the source code that runs [**Activity**](https://hikaya.io). If you want to use Activity then you don't need to run this code, we offer a hosted version of the app at [activity.hikaya.app](https://activity.hikaya.app).
+This is the source code that runs the [**Activity**](https://hikaya.io/index#content4-8) application. If you want to use Activity then you don't need to run this code, we offer a hosted version of the app at [activity.hikaya.app](https://activity.hikaya.app).
-If you'd like to run your own copy of Activity or contribute to development then this is the place for you.
+If you'd like to run your own copy of Activity or contribute to its development then this is the place for you.
<!-- ## Configuration
## To deploy changes in activity servers
@@ -25,11 +25,11 @@ Once all your changes have been committed to the repo, and before pushing them,
# Local Setup
-Note: you should use `Python 3.7.5` for this project, meaning you may need to use `python3` or `pip3` in the following instructions (you can use the package manager on your OS, brew for mac, to install python 3).
+**Note**: You should use `Python 3.7.5` for this project, meaning you may need to use `python3` or `pip3` in the following instructions (you can use the package manager on your OS, brew for mac, to install python 3).
Open up your terminal and follow the instructions listed below.
-See [these instructions for installing known dependencies](#install-non-python-dependencies).
+See [these instructions for addtional information](#extra-information).
## Clone the github repository
@@ -38,7 +38,7 @@ Navigate to the folder you want the repository to be stored in.
Run the following command:
```bash
-$ git clone --branch dev https://github.com/hikaya-io/Activity.git
+$ git clone --branch dev https://github.com/hikaya-io/activity.git
```
Once cloned, navigate to the cloned repository with:
@@ -47,7 +47,7 @@ Once cloned, navigate to the cloned repository with:
$ cd activity
```
-or similar.
+or similar for your OS.
## Setting up on Virtual Environment
### Install virtualenv
@@ -71,12 +71,45 @@ $ virtualenv --no-site-packages <myvirtualenvironmentname>
$ source <myvirtualenvironmentname>/bin/activate
```
+for Windows users:
+
+```bash
+$ source <myvirtualenvironmentname>/script/activate
+```
+
### Install requirements
```bash
$ pip install -r requirements.txt
```
+### Install non-python dependencies
+
+1. **GDAL**
+
+On MacOs:
+
+```bash
+$ brew install gdal
+```
+
+On Windows:
+- You will need to donwload gdal core and gdal installer for your version of python.
+- Please read the following [instructions](https://pypi.org/project/GDAL/#windows) on how to properly install and test gdal.
+
+2. **Pango**
+
+On MacOs:
+
+```bash
+$ brew install pango
+```
+
+On Windows:
+- You will need Pango and Cairo for the application to run.
+- The runtime installer can be found [here](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases)
+- Download and install GTK+-3.
+
### Create local copy of config file
Copy the example config:
@@ -185,29 +218,11 @@ The `operation` in this case can be: `makemigrations`, `migrate`, `collectstatic
# Extra information
-## Install non-python dependencies
-
-1. **GDAL**
-
-On mac:
-
-```bash
-$ brew install gdal
-```
-
-2. **pango**
-
-On mac:
-
-```bash
-$ brew install pango
-```
-
## Postgresql help
### Install
-On mac:
+On MacOS:
```bash
$ brew update
@@ -216,6 +231,13 @@ $ initdb /usr/local/var/postgres
$ pg_ctl -D /usr/local/var/postgres start
$ createdb <mydatabasename>
```
+On Windows:
+- Download and install the latest stable installer for PostgreSQL
+- You can use the SQL Shell that comes along with the application to run the following commands
+- To create a database run the command
+```bash
+$ create database <mydatabasename>;
+```
### Manage
@@ -255,3 +277,7 @@ GRANT ALL ON activity.* TO 'root'@'localhost' IDENTIFIED BY 'root';
```
_NB:_ When you use these SQL queries, beware of not writing the quotes.
+
+
+# Contributing
+Activity is built and maintain by the team at Hikaya. We are always looking for a fresh set of :eyes: who want to contribute to **Activity**. Feel free to checkout our contributing page or reach out by creating an issue and we'll help you get started!
| 0 |
diff --git a/source/light-validator/contracts/LightValidator.sol b/source/light-validator/contracts/LightValidator.sol @@ -64,7 +64,8 @@ contract LightValidator {
uint256 senderAmount,
uint8 v,
bytes32 r,
- bytes32 s
+ bytes32 s,
+ address senderWallet
) public returns (uint256, bytes32[] memory) {
bytes32[] memory errors = new bytes32[](MAX_ERROR_COUNT);
uint256 errCount;
@@ -75,7 +76,7 @@ contract LightValidator {
signerWallet,
signerToken,
signerAmount,
- msg.sender,
+ senderWallet,
senderToken,
senderAmount
);
@@ -158,7 +159,7 @@ contract LightValidator {
signerWallet,
signerToken,
signerAmount,
- signerFee,
+ Light(light).signerFee(),
senderWallet,
senderToken,
senderAmount
| 3 |
diff --git a/src/display/font_loader.js b/src/display/font_loader.js @@ -315,8 +315,8 @@ if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("MOZCENTRAL")) {
this.insertRule(rule);
const names = [];
- for (i = 0, ii = fonts.length; i < ii; i++) {
- names.push(fonts[i].loadedName);
+ for (const font of fonts) {
+ names.push(font.loadedName);
}
names.push(loadTestFontId);
@@ -326,10 +326,10 @@ if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("MOZCENTRAL")) {
div.style.position = "absolute";
div.style.top = div.style.left = "0px";
- for (i = 0, ii = names.length; i < ii; ++i) {
+ for (const name of names) {
const span = this._document.createElement("span");
span.textContent = "Hi";
- span.style.fontFamily = names[i];
+ span.style.fontFamily = name;
div.appendChild(span);
}
this._document.body.appendChild(div);
| 14 |
diff --git a/src/js/components/Box/doc.js b/src/js/components/Box/doc.js import { schema, PropTypes } from 'react-desc';
+const PAD_SIZES = ['xsmall', 'small', 'medium', 'large'];
+
export default Box => schema(Box, {
description: `A flexible box that lays out its contents along a single
direction.`,
@@ -80,14 +82,14 @@ export default Box => schema(Box, {
],
margin: [
PropTypes.oneOfType([
- PropTypes.oneOf(['none', 'small', 'medium', 'large']),
+ PropTypes.oneOf(['none', ...PAD_SIZES]),
PropTypes.shape({
- bottom: PropTypes.oneOf(['small', 'medium', 'large']),
- horizontal: PropTypes.oneOf(['small', 'medium', 'large']),
- left: PropTypes.oneOf(['small', 'medium', 'large']),
- right: PropTypes.oneOf(['small', 'medium', 'large']),
- top: PropTypes.oneOf(['small', 'medium', 'large']),
- vertical: PropTypes.oneOf(['small', 'medium', 'large']),
+ bottom: PropTypes.oneOf(PAD_SIZES),
+ horizontal: PropTypes.oneOf(PAD_SIZES),
+ left: PropTypes.oneOf(PAD_SIZES),
+ right: PropTypes.oneOf(PAD_SIZES),
+ top: PropTypes.oneOf(PAD_SIZES),
+ vertical: PropTypes.oneOf(PAD_SIZES),
}),
]),
`The amount of margin around the box. An object can be specified to
@@ -96,14 +98,14 @@ export default Box => schema(Box, {
],
pad: [
PropTypes.oneOfType([
- PropTypes.oneOf(['none', 'small', 'medium', 'large']),
+ PropTypes.oneOf(['none', ...PAD_SIZES]),
PropTypes.shape({
- bottom: PropTypes.oneOf(['small', 'medium', 'large']),
- horizontal: PropTypes.oneOf(['small', 'medium', 'large']),
- left: PropTypes.oneOf(['small', 'medium', 'large']),
- right: PropTypes.oneOf(['small', 'medium', 'large']),
- top: PropTypes.oneOf(['small', 'medium', 'large']),
- vertical: PropTypes.oneOf(['small', 'medium', 'large']),
+ bottom: PropTypes.oneOf(PAD_SIZES),
+ horizontal: PropTypes.oneOf(PAD_SIZES),
+ left: PropTypes.oneOf(PAD_SIZES),
+ right: PropTypes.oneOf(PAD_SIZES),
+ top: PropTypes.oneOf(PAD_SIZES),
+ vertical: PropTypes.oneOf(PAD_SIZES),
}),
]),
`The amount of padding around the box contents. An object can be specified to
| 11 |
diff --git a/src/styles/StyleUtils.js b/src/styles/StyleUtils.js @@ -398,6 +398,9 @@ function getReportActionItemStyle(isHovered = false, isPending = false) {
// Warning: Setting this to a non-transparent color will cause unread indicator to break on Android
: colors.transparent,
+ opacity: isPending
+ ? 0.5
+ : 1,
cursor: 'default',
};
}
| 12 |
diff --git a/includes/Core/Util/Tracking.php b/includes/Core/Util/Tracking.php @@ -111,8 +111,6 @@ final class Tracking {
/**
* Is tracking active for this plugin install?
*
- * During the beta, this defaults to true.
- *
* @since 1.0.0
*
* @return bool True if tracking enabled, and False if not.
| 2 |
diff --git a/components/Frame/Toggle.js b/components/Frame/Toggle.js @@ -78,6 +78,7 @@ export default ({ expanded, onClick, id, title }) => {
{...buttonStyle}
onClick={onClick}
title={title}
+ aria-expanded={expanded}
aria-live='assertive'
>
<div {...toggleStyle}>
| 13 |
diff --git a/src/components/App.js b/src/components/App.js @@ -429,10 +429,11 @@ class App extends Component {
this.setState({
openDrawer: showInfo ? 'info' : null,
gameTrees: [emptyTree],
- treePosition: [emptyTree, 0],
representedFilename: null
})
+ this.setCurrentTreePosition(emptyTree, 0)
+
this.treeHash = this.generateTreeHash()
this.fileHash = this.generateFileHash()
@@ -503,10 +504,11 @@ class App extends Component {
this.detachEngines()
this.setState({
representedFilename: null,
- gameTrees,
- treePosition: [gameTrees[0], 0]
+ gameTrees
})
+ this.setCurrentTreePosition(gameTrees[0], 0)
+
this.treeHash = this.generateTreeHash()
this.fileHash = this.generateFileHash()
}
| 2 |
diff --git a/bids-validator/validators/tsv/tsv.js b/bids-validator/validators/tsv/tsv.js @@ -262,7 +262,7 @@ const TSV = (file, contents, fileList, callback) => {
.slice(1)
// extract unit values
.map((row, i) => ({
- unit: row.split('\t')[unitIndex],
+ unit: row[unitIndex],
line: i + 2,
}))
.forEach(({ unit, line }) => {
| 9 |
diff --git a/README.md b/README.md @@ -73,8 +73,8 @@ and use the plotly.js `dist` file(s). More info [here](https://github.com/plotly
## Partial bundles
There are two kinds of plotly.js partial bundles:
-1. The official partial bundles that are distributed to `npm` and `CDN` covered by [the dist README](https://github.com/plotly/plotly.js/blob/master/dist/README.md).
-2. The custom ones that could be created by the user, if none of the distributed packages meet your needs.
+1. The official partial bundles that are distributed to `npm` and the CDN, described in [the dist README](https://github.com/plotly/plotly.js/blob/master/dist/README.md).
+2. Custom bundles you can create yourself, if none of the distributed packages meet your needs.
Use the `traces` option to include just the trace types you need.
```
| 7 |
diff --git a/lib/misc/blocks.js b/lib/misc/blocks.js import { forLines } from './scopes'
function getLine (ed, l) {
- return ed.getTextInBufferRange([[l, 0], [l, Infinity]])
+ return {
+ scope: ed.scopeDescriptorForBufferPosition([l, 0]).scopes,
+ line: ed.getTextInBufferRange([[l, 0], [l, Infinity]])
+ }
}
-function isBlank (l) {
- return l.match(/^\s*(#.*)?$/)
+function isBlank ({line, scope}) {
+ for (let s of scope) {
+ if (/\bcomment\b/.test(s) || /\bstring\b/.test(s)) {
+ return true
+ }
+ }
+ return line.match(/^\s*(#.*)?$/)
}
-function isEnd (l) {
- return l.match(/^(end\b|\)|\]|\})/)
+function isEnd ({line, scope}) {
+ return line.match(/^(end\b|\)|\]|\})/)
}
-function isCont (l) {
- return l.match(/^(else|elseif|catch|finally)\b/)
+function isCont ({line, scope}) {
+ return line.match(/^(else|elseif|catch|finally)\b/)
}
-function isStart (l) {
- return !(l.match(/^\s/) || isBlank(l) || isEnd(l) || isCont(l))
+function isStart (lineInfo) {
+ return !(lineInfo.line.match(/^\s/) || isBlank(lineInfo) || isEnd(lineInfo) || isCont(lineInfo))
}
function walkBack(ed, row) {
@@ -30,28 +38,19 @@ function walkBack(ed, row) {
function walkForward (ed, start) {
let end
let mark = (end = start)
- let multiline = false
while (mark < ed.getLastBufferRow()) {
mark++
- const l = getLine(ed, mark)
- if (multiline) {
- if (l.match(/=#/)) {
- multiline = false
- } else {
- continue
- }
- }
- if (isStart(l)) {
+ const lineInfo = getLine(ed, mark)
+
+ if (isStart(lineInfo)) {
break
}
- if (isEnd(l)) {
+ if (isEnd(lineInfo)) {
if (!(forLines(ed, start, mark-1).length === 0)) {
end = mark
}
- } else if (!(isBlank(l) || isStart(l))) {
+ } else if (!(isBlank(lineInfo) || isStart(lineInfo))) {
end = mark
- } else if (l.match(/#=/) && !l.match(/=#/)) {
- multiline = true
}
}
return end
| 8 |
diff --git a/test/jasmine/tests/hover_label_test.js b/test/jasmine/tests/hover_label_test.js @@ -2641,7 +2641,7 @@ describe('Hover on multicategory axes', function() {
.then(done, done.fail);
});
- fit('should work with series', function(done) {
+ it('should work with series', function(done) {
var fig = Lib.extendDeep({}, require('@mocks/zz-multicategory_series.json'));
fig.data = [fig.data[0]];
fig.layout.width = 500;
| 2 |
diff --git a/src/components/topic/controlbar/TopicControlBar.js b/src/components/topic/controlbar/TopicControlBar.js @@ -89,9 +89,11 @@ const TopicControlBar = ({ filters, sideBarContent, topic, setupJumpToExplorer,
{mostRecentSnapshotIs(snapshots, topic, [TOPIC_SNAPSHOT_STATE_QUEUED, TOPIC_SNAPSHOT_STATE_RUNNING]) && (
<TabbedChip message={localMessages.latestRunning} />
)}
- {(selectedSnapshot.snapshots_id !== snapshots[snapshots.length - 1].snapshots_id) && mostRecentSnapshotIs(snapshots, topic, [TOPIC_SNAPSHOT_STATE_COMPLETED]) && (
- <TabbedChip warning message={localMessages.newerData} />
- )}
+ {(selectedSnapshot)
+ && (selectedSnapshot.snapshots_id !== snapshots[snapshots.length - 1].snapshots_id)
+ && mostRecentSnapshotIs(snapshots, topic, [TOPIC_SNAPSHOT_STATE_COMPLETED])
+ && (<TabbedChip warning message={localMessages.newerData} />)
+ }
</LinkWithFilters>
</div>
</Permissioned>
| 9 |
diff --git a/lib/unfurl/profile.js b/lib/unfurl/profile.js -module.exports = function unfurlProfile(profile) {
+module.exports = async function unfurlAccount(account) {
// TODO: handle organizations differently than users
+ if (account.type === 'User') {
return {
- fallback: `${profile.login} (${profile.name})`,
- title: `${profile.login} (${profile.name})`,
- text: profile.bio,
+ fallback: `${account.login} (${account.name})`,
+ title: `${account.login} (${account.name})`,
+ text: account.bio,
fields: [
{
title: 'Company',
- value: profile.company,
+ value: account.company,
short: true,
},
{
title: 'Location',
- value: profile.location,
+ value: account.location,
short: true,
},
{
title: 'URL',
- value: profile.blog,
+ value: account.blog,
short: true,
},
{
title: 'Repositories',
- value: profile.public_repos,
+ value: account.public_repos,
short: true,
},
{
title: 'Followers',
- value: profile.followers,
+ value: account.followers,
short: true,
},
],
- thumb_url: profile.avatar_url,
+ thumb_url: account.avatar_url,
mrkdwn_in: ['pretext', 'text', 'fields'],
};
+ } else if (account.type === 'Organization') {
+ return {
+ fallback: `$${account.name}`,
+ title: `${account.name}`,
+ text: account.bio,
+ fields: [
+ {
+ title: 'Location',
+ value: account.location,
+ short: true,
+ },
+ {
+ title: 'URL',
+ value: account.blog,
+ short: true,
+ },
+ {
+ title: 'Repositories',
+ value: account.public_repos,
+ short: true,
+ },
+ ],
+ thumb_url: account.avatar_url,
+ mrkdwn_in: ['pretext', 'text', 'fields'],
+ };
+ }
};
| 9 |
diff --git a/packages/cx/index.js b/packages/cx/index.js @@ -4,6 +4,7 @@ import * as ui from './ui';
import * as widgets from './widgets';
import * as svg from './svg';
import * as charts from './charts';
+import * as hooks from './hooks';
export {
util,
@@ -11,5 +12,6 @@ export {
ui,
widgets,
svg,
- charts
+ charts,
+ hooks
};
| 0 |
diff --git a/src/runner/development-server.js b/src/runner/development-server.js @@ -42,7 +42,7 @@ function setupHMR (saguiOptions) {
function concatHMRBundle (saguiOptions, entry) {
const devClient = [
- require.resolve('webpack-dev-server/client/') + '?http://0.0.0.0:' + saguiOptions.port,
+ require.resolve('webpack-dev-server/client/') + '?/',
'webpack/hot/dev-server'
]
| 1 |
diff --git a/src/utils/utils.less b/src/utils/utils.less word-break: break-all;
white-space: nowrap;
}
-
+.nameID {
+ .textOverflow();
+ width: 120px;
+}
.textOverflowMulti(@line: 3, @bg: #fff) {
overflow: hidden;
position: relative;
&:before,
&:after {
- content: " ";
+ content: ' ';
display: table;
}
| 1 |
diff --git a/util.js b/util.js @@ -607,3 +607,12 @@ export function makeId(length) {
return result;
}
+export function mod(a, n) {
+ return (a % n + n) % n;
+}
+
+export function angleDifference(angle1, angle2) {
+ let a = angle2 - angle1;
+ a = mod(a + Math.PI, Math.PI*2) - Math.PI;
+ return a;
+}
\ No newline at end of file
| 0 |
diff --git a/package.json b/package.json },
"dependencies": {
"base64-js": "^1.2.0",
- "brace": "0.10.0",
+ "brace": "0.7.0",
"deep-extend": "0.4.1",
"expect": "1.20.2",
- "getbase": "^3.4.2",
+ "getbase": "^2.8.2",
"ieee754": "^1.1.8",
"immutable": "^3.x.x",
"js-yaml": "^3.5.5",
"less": "2.7.1",
- "lodash": "4.17.4",
- "matcher": "^1.0.0",
- "memoizee": "0.4.5",
+ "lodash": "4.17.2",
+ "matcher": "^0.1.2",
+ "memoizee": "0.4.1",
"promise-worker": "^1.1.1",
"react": "^15.4.0",
- "react-addons-perf": "15.4.2",
- "react-addons-shallow-compare": "15.6.0",
+ "react-addons-perf": "0.14.8",
+ "react-addons-shallow-compare": "0.14.8",
"react-addons-test-utils": "^15.4.0",
- "react-collapse": "4.0.2",
+ "react-collapse": "2.3.1",
"react-dom": "^15.4.0",
- "react-height": "^3.0.0",
+ "react-height": "^2.0.0",
"react-hot-loader": "1.3.1",
"react-immutable-proptypes": "2.1.0",
- "react-motion": "0.5.0",
+ "react-motion": "0.4.4",
"react-object-inspector": "0.2.1",
- "react-redux": "^5.x.x",
+ "react-redux": "^4.x.x",
"react-remarkable": "1.1.1",
- "react-split-pane": "0.1.63",
+ "react-split-pane": "0.1.57",
"redux": "^3.x.x",
- "redux-immutable": "4.0.0",
+ "redux-immutable": "3.0.8",
"redux-logger": "*",
- "reselect": "3.0.1",
+ "reselect": "2.5.3",
"sanitize-html": "^1.14.1",
- "serialize-error": "2.1.0",
- "shallowequal": "1.0.1",
- "swagger-client": "3.0.16",
+ "serialize-error": "2.0.0",
+ "shallowequal": "0.2.2",
+ "swagger-client": "~3.0.15",
"url-parse": "^1.1.8",
- "whatwg-fetch": "2.0.3",
- "worker-loader": "^0.8.0",
+ "whatwg-fetch": "0.11.1",
+ "worker-loader": "^0.7.1",
"xml": "1.0.1",
"yaml-js": "^0.2.0"
},
| 13 |
diff --git a/articles/quickstart/native/wpf-winforms/01-login.md b/articles/quickstart/native/wpf-winforms/01-login.md @@ -15,6 +15,8 @@ contentType: tutorial
useCase: quickstart
---
+<!-- markdownlint-disable MD002 MD034 MD041 -->
+
<%= include('../_includes/_getting_started', { library: 'Windows Forms or WPF' }) %>
<%= include('../../../_includes/_callback_url') %>
@@ -23,7 +25,7 @@ useCase: quickstart
If you are following along with the sample project you downloaded from the top of this page, you should set the **Allowed Callback URLs** to `https://${account.namespace}/mobile`.
:::
-<%= include('../../../_includes/_logout_url', { returnTo: `https://${account.namespace}/mobile` }) %>
+<%= include('../../../_includes/_logout_url', { returnTo: 'https://' + account.namespace + '/mobile' }) %>
## Integrate Auth0 in your Application
| 1 |
diff --git a/assets/js/modules/analytics/common/tracking-exclusion-switches.js b/assets/js/modules/analytics/common/tracking-exclusion-switches.js @@ -56,7 +56,7 @@ export default function TrackingExclusionSwitches() {
{ __( 'Exclude from Analytics', 'google-site-kit' ) }
</legend>
- <div className="mdc-form-field">
+ <div>
<Switch
label={ trackingExclusionLabels[ TRACKING_LOGGED_IN_USERS ] }
checked={ trackingDisabled.includes( TRACKING_LOGGED_IN_USERS ) }
| 2 |
diff --git a/apps/dg/components/graph/graph_model.js b/apps/dg/components/graph/graph_model.js @@ -1570,6 +1570,7 @@ DG.GraphModel = DG.DataLayerModel.extend(
iCollectionClient = this.get('dataContext').getCollectionByID(iCollectionClient.get('id'));
return iCaseIDs.some(function (iCaseID) {
var tCase = iCollectionClient.getCaseByID( iCaseID);
+ if (!tCase) { return false; }
return ['x', 'y', 'y2'].some(function (iDim) {
var tFound = false,
tAxis = this.get(iDim + 'Axis');
| 9 |
diff --git a/magda-storage-api/package.json b/magda-storage-api/package.json {
- "name": "@magda/datastore-api",
- "version": "0.0.57",
+ "name": "@magda/storage-api",
+ "version": "0.0.57-0",
"scripts": {
"build": "yarn run compile",
"compile": "tsc -p tsconfig.json",
},
"dependencies": {
"@google-cloud/storage": "^4.1.0",
- "@magda/typescript-common": "0.0.56-terria-0",
+ "@magda/typescript-common": "0.0.57-0",
"@types/superagent": "^4.1.4",
"@types/xmldom": "^0.1.29",
"express": "^4.13.1",
},
"config": {
"docker": {
- "name": "data61/magda-datastore-api",
+ "name": "data61/magda-storage-api",
"include": "node_modules dist Dockerfile"
}
},
"magda": {
"language": "typescript",
"categories": {
- "api": true
+ "api": true,
+ "testStandAlone": true
}
}
}
| 12 |
diff --git a/source/types/package.json b/source/types/package.json "hint": "yarn solhint \"./contracts/**/*.sol\"",
"lint": "yarn eslint \"./test/**/*.js\"",
"ganache": "ganache-cli -p 8545 --gasLimit 0xfffffffffff --time '2017-05-10T00:00:00+00:00'",
- "clean": "rm -f ./build/*; rm -v ./flatten/*",
+ "clean": "rm -f ./build/*",
"compile": "truffle compile",
"coverage": "node_modules/.bin/solidity-coverage",
"cp_migration_flat": "mkdir flatten/; cp contracts/Migrations.sol flatten/",
| 2 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.