code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/token-metadata/0xbCdfE338D55c061C084D81fD793Ded00A27F226D/metadata.json b/token-metadata/0xbCdfE338D55c061C084D81fD793Ded00A27F226D/metadata.json "symbol": "DML",
"address": "0xbCdfE338D55c061C084D81fD793Ded00A27F226D",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/angular/projects/spark-core-angular/src/lib/components/sprk-footer/sprk-footer.component.ts b/src/angular/projects/spark-core-angular/src/lib/components/sprk-footer/sprk-footer.component.ts @@ -23,9 +23,9 @@ import { Component, Input, OnInit } from '@angular/core';
</div>
</div>
- <div *ngIf="localLinks" class="sprk-o-Stack__item sprk-o-Stack__item--three-fourths@m sprk-o-Stack sprk-o-Stack--medium">
- <div *ngFor="let item of localLinks" class="sprk-o-Stack__item sprk-o-Stack sprk-o-Stack--split@m">
- <div class="sprk-o-Stack__item sprk-o-Stack__item--third@m sprk-o-Box sprk-o-Stack sprk-o-Stack--large">
+ <div class="sprk-o-Stack__item sprk-o-Stack__item--three-fourths@m sprk-o-Stack sprk-o-Stack--medium">
+ <div *ngIf="localLinks" class="sprk-o-Stack__item sprk-o-Stack sprk-o-Stack--split@m">
+ <div *ngFor="let item of localLinks" class="sprk-o-Stack__item sprk-o-Stack__item--third@m sprk-o-Box sprk-o-Stack sprk-o-Stack--large">
<h3 class="sprk-o-Stack__item sprk-b-TypeBodyOne sprk-u-TextTransform--uppercase">
{{ item.heading }}
</h3>
| 3 |
diff --git a/src/embeds/EarthCycleEmbed.js b/src/embeds/EarthCycleEmbed.js @@ -9,9 +9,8 @@ class EarthCycleEmbed extends BaseEmbed {
/**
* @param {Genesis} bot - An instance of Genesis
* @param {Object} state - The current state of the cycle
- * @param {string} platform - platform
*/
- constructor(bot, state, platform) {
+ constructor(bot, state) {
super();
this.color = state.isDay ? 0x00ff00 : 0x000066;
| 2 |
diff --git a/templates/examples/extensions/js_lambda_hooks/CreateRecentTopicsResponse/CreateRecentTopicsResponse.js b/templates/examples/extensions/js_lambda_hooks/CreateRecentTopicsResponse/CreateRecentTopicsResponse.js @@ -4,23 +4,23 @@ const hook = require("lambda_hook_sdk/hooks")
function create_buttons(event,start=0,stop=10) {
let buttons = []
- var settings = hook.list_settings(event);
- var topicMap = {},
+ let settings = hook.list_settings(event);
+ let topicMap = {},
topicKey;
- for (var key of Object.keys(settings)) {
+ for (let key of Object.keys(settings)) {
if (key.startsWith("topic::")) {
[, topicKey] = key.split("::");
console.log(topicKey);
topicMap[topicKey] = settings[key];
}
}
- var userTopics = hook.get_user_attribute(event, "recentTopics", []).sort((t1, t2) => {
+ let userTopics = hook.get_user_attribute(event, "recentTopics", []).sort((t1, t2) => {
if (t1.dateTime == t2.dateTime) {
return 0;
}
return t2.dateTime < t1.dateTime ? -1 : 1;
});
- for (var userTopic of userTopics.slice(start, stop)) {
+ for (let userTopic of userTopics.slice(start, stop)) {
if (!(userTopic.topic in topicMap)) {
continue;
}
| 14 |
diff --git a/app/views/layouts/public_dashboard.html.erb b/app/views/layouts/public_dashboard.html.erb <meta name="twitter:url" content="<%= request.original_url %>" />
<% if @has_new_dashboard %>
- <%= stylesheet_link_tag 'deep_insights_new', 'deep_insights_new_vendor', 'common_new', 'common_new_vendor', 'public_dashboard_new' %>
+ <%= stylesheet_link_tag 'deep_insights_new', 'common_new', 'public_dashboard_new' %>
<% else %>
<%= stylesheet_link_tag 'cartodb', 'deep_insights', 'common', 'public_dashboard' %>
<% end %>
<% end %>
<% if @has_new_dashboard %>
- <%= javascript_include_tag 'common_dashboard.js', 'public_dashboard_new_vendor', 'public_dashboard_new' %>
+ <%= javascript_include_tag 'common', 'common_vendor', 'public_dashboard_new' %>
<% else %>
<%= javascript_include_tag 'cdb.js', 'templates', 'public_dashboard_deps', 'public_dashboard' %>
<% end %>
| 1 |
diff --git a/assets/js/components/data-table.js b/assets/js/components/data-table.js @@ -34,18 +34,18 @@ import Link from './Link';
import { getFullURL } from '../util';
const { useSelect } = Data;
-const PrimaryAdminLink = ( { children, permaLink, useAdminURLs, PrimaryLink, link } ) => {
+const PrimaryAdminLink = ( { children, permaLink, useAdminURLs, link } ) => {
const adminURL = useSelect( ( select ) => select( CORE_SITE ).getAdminURL( 'googlesitekit-dashboard', { permaLink } ) );
return (
- <PrimaryLink
+ <Link
className="googlesitekit-table__body-item-link"
href={ useAdminURLs ? adminURL : link }
external={ ! useAdminURLs }
inherit
>
{ children }
- </PrimaryLink>
+ </Link>
);
};
@@ -58,7 +58,6 @@ export const getDataTableFromData = ( data, headers, options ) => {
source,
showURLs,
useAdminURLs = false,
- PrimaryLink = Link,
} = options;
if ( options.cap ) {
@@ -87,11 +86,11 @@ export const getDataTableFromData = ( data, headers, options ) => {
) }
>
{ row[ 0 ] === cell && link
- ? <div className="googlesitekit-table__body-item-content">
+ ? (
+ <div className="googlesitekit-table__body-item-content">
<PrimaryAdminLink
permaLink={ permaLink }
useAdminURLs={ useAdminURLs }
- PrimaryLink={ PrimaryLink }
link={ link }
>
{ cell }
@@ -108,6 +107,7 @@ export const getDataTableFromData = ( data, headers, options ) => {
</Link>
}
</div>
+ )
: <div className="googlesitekit-table__body-item-content">{ cell }</div>
}
</td>
| 2 |
diff --git a/app/models/observations_place.rb b/app/models/observations_place.rb @@ -3,4 +3,12 @@ class ObservationsPlace < ActiveRecord::Base
belongs_to :observation
belongs_to :place
+ def self.merge_future_duplicates( reject, keeper )
+ if reject.is_a?( Place )
+ ObservationsPlace.where( place_id: reject.id ).delete_all
+ elsif reject.is_a?( Observation )
+ ObservationsPlace.where( observation_id: reject.id ).delete_all
+ end
+ end
+
end
| 1 |
diff --git a/stories/module-analytics.stories.js b/stories/module-analytics.stories.js @@ -42,7 +42,7 @@ import {
PropertySelectIncludingGA4,
ProfileSelect,
AnonymizeIPSwitch,
- UseSnippetSwitch,
+ UseUASnippetSwitch as UseSnippetSwitch,
TrackingExclusionSwitches,
GA4Notice,
} from '../assets/js/modules/analytics/components/common';
| 1 |
diff --git a/src/sunstone/public/app/utils/vcenter/templates/row.hbs b/src/sunstone/public/app/utils/vcenter/templates/row.hbs <div id="{{data.vcenter_ref}}Advanced" class="content" hidden>
{{#if resourcePool}}
<div class="vcenter_rp_input row" style="margin-left: 11px">
- <div class="medium-3 columns">
+ <div class="medium-4 columns">
<label>
{{tr "Type"}}
<select class="modify_rp" id="modify_rp_{{id}}">
</select>
</label>
</div>
- <div class="medium-4 columns end" id="div_rp_{{id}}" hidden>
+ <div class="medium-5 columns end" id="div_rp_{{id}}" hidden>
<label>
{{tr "Available Resource Pools"}}
<span class="tip">
<input type="checkbox" class="create_copy" id="create_copy_{{id}}"/>
</label>
</div>
- <div class="medium-6 columns" id="name_{{id}}" hidden>
+ <div class="medium-5 columns left" id="name_{{id}}" hidden>
<label>
{{tr "Template name"}}
<input class="template_name" id="template_name_{{id}}"/>
| 7 |
diff --git a/src/stores/RegionStore.js b/src/stores/RegionStore.js @@ -22,12 +22,12 @@ export default types
get sortedRegions() {
const sorts = {
- date: () => self.regions,
- score: () => self.regions.sort((a, b) => b.score - a.score),
+ date: isDesc => (isDesc ? self.regions : [...self.regions].reverse()),
+ score: isDesc => [...self.regions].sort(isDesc ? (a, b) => b.score - a.score : (a, b) => a.score - b.score),
};
- const r = sorts[self.sort]();
- return self.sortOrder === "asc" ? r.slice().reverse() : r;
+ const sorted = sorts[self.sort](self.sortOrder === "desc");
+ return sorted;
},
asTree(enrich) {
| 7 |
diff --git a/src/plugins/XHRUpload.js b/src/plugins/XHRUpload.js @@ -281,8 +281,7 @@ module.exports = class XHRUpload extends Plugin {
})
this.uppy.on('cancel-all', () => {
- // const files = this.uppy.getState().files
- // if (!files[file.id]) return
+ timer.done()
xhr.abort()
})
})
@@ -419,6 +418,7 @@ module.exports = class XHRUpload extends Plugin {
})
this.uppy.on('cancel-all', () => {
+ timer.done()
xhr.abort()
})
| 0 |
diff --git a/src/controllers/contacts.ts b/src/controllers/contacts.ts @@ -314,7 +314,7 @@ export const createContact = async (req, res) => {
(await models.Contact.findOne({
where: { publicKey: attrs['public_key'], tenant },
}))
- if (existing && jsonUtils.contactToJson(existing).contact_key != null) {
+ if (existing) {
const updateObj: { [k: string]: any } = { fromGroup: false }
if (attrs['alias']) updateObj.alias = attrs['alias']
await existing.update(updateObj)
| 2 |
diff --git a/src/sdk/conference/conference.js b/src/sdk/conference/conference.js });
delete self.recorderCallbacks[arg.id];
} else if (self.publicationCallbacks[arg.id]) {
- if (stream instanceof Woogeen.ExternalStream || (self.commonMixedStream &&
- !stream.isScreen() && !self.unmixStreams.has(arg.id))) {
+ if ((stream instanceof Woogeen.ExternalStream || !stream.isScreen()) &&
+ self.commonMixedStream && !self.unmixStreams.has(arg.id)) {
self.mix(stream, [self.commonMixedStream]);
}
self.unmixStreams.delete(arg.id);
| 1 |
diff --git a/bin/is.js b/bin/is.js @@ -50,7 +50,11 @@ exports.boolean = (value, strict) => {
*/
exports.date = (value, strict) => {
if (!strict && typeof value === 'string') {
- return rx.date.test(value);
+ const match = rx.date.exec(value);
+ if (!match) return false;
+ const d = new Date(value);
+ return d.getUTCFullYear() === +match[1] && d.getUTCMonth() + 1 === +match[2] && d.getUTCDate() === +match[3];
+
} else if (value instanceof Date) {
return !(isNaN(value) || value.getUTCHours() || value.getUTCMinutes() ||
value.getUTCSeconds() || value.getUTCMilliseconds());
@@ -67,7 +71,13 @@ exports.date = (value, strict) => {
*/
exports.dateTime = (value, strict) => {
if (!strict && typeof value === 'string') {
- return rx.dateTime.test(value);
+ const match = rx.dateTime.exec(value);
+ if (!match) return false;
+ const d = new Date(value);
+ return d.getUTCFullYear() === +match[1] && d.getUTCMonth() + 1 === +match[2] && d.getUTCDate() === +match[3] &&
+ d.getUTCHours() === +match[4] && d.getUTCMinutes() === +match[5] && d.getUTCSeconds() === match[6] &&
+ d.getUTCMilliseconds() === +match[7];
+
} else {
return value instanceof Date && !isNaN(value);
}
| 7 |
diff --git a/src/components/Divider/Divider.js b/src/components/Divider/Divider.js @@ -41,12 +41,12 @@ export default class Divider extends Component {
}
render() {
- const { classes: { container, item, label }, label: textLabel } = this.props;
+ const { classes: { container, item, label: labelClass }, label } = this.props;
return (
<div className={container}>
<hr className={item} />
- {!!textLabel && <Typography component="span" className={label}>{textLabel}</Typography>}
+ {!!label && <Typography component="span" className={labelClass}>{label}</Typography>}
<hr className={item} />
</div>
);
| 10 |
diff --git a/src/os/ui/filter/ruleexpression.js b/src/os/ui/filter/ruleexpression.js @@ -46,8 +46,8 @@ goog.inherits(os.ui.filter.RuleExpression, os.ui.filter.Expression);
* @type {Array.<os.ui.filter.op.Rule>}
*/
os.ui.filter.RuleExpression.OPS = [
- new os.ui.filter.op.Rule('GreaterThanOrEqualTo', 'at least', '>='),
- new os.ui.filter.op.Rule('LessThanOrEqualTo', 'at most', '<=')
+ new os.ui.filter.op.Rule('GreaterThan', 'more than', '>='),
+ new os.ui.filter.op.Rule('LessThan', 'less than', '<=')
];
| 1 |
diff --git a/.eslintrc b/.eslintrc "rules": {
"semi": ["warn", "never"],
"indent": ["error", 2],
- "spaced-comment": ["error", "never"],
+ "spaced-comment": [0, "never"],
"no-cond-assign": 2,
"no-var": 1,
"prefer-const": 0,
| 11 |
diff --git a/app/src/renderer/components/common/ToolBar.vue b/app/src/renderer/components/common/ToolBar.vue @@ -46,18 +46,15 @@ export default {
name: `tool-bar`,
components: { TmBtn },
props: {
- refresh: {
connected: {
type: Boolean,
- required: true
+ required: false
},
refresh: {
type: Function,
- required: true
+ required: false
}
},
- default: undefined
- },
computed: {
...mapGetters([`session`])
},
| 1 |
diff --git a/src/stylesheets/main.scss b/src/stylesheets/main.scss @@ -85,17 +85,16 @@ button.pm-button {
position: relative;
top: -45px;
left: 30px;
- border: 0;
+ height: 20px;
+ width: 20px;
+ text-align: center;
+ vertical-align: middle;
+ display: table-cell;
background: red;
- border-radius: 100px;
- padding: 1px 6px 2px;
+ border-radius: 50%;
color: white;
- cursor: pointer;
- visibility: visible;
- opacity: 1;
- font-size: 16px;
+ font: normal 12px Arial;
line-height: 1em;
- font-weight: normal;
&.hidden {
display: none;
| 7 |
diff --git a/src/views/studio/modals/user-projects-tile.jsx b/src/views/studio/modals/user-projects-tile.jsx @@ -29,7 +29,12 @@ const UserProjectsTile = ({id, title, image, inStudio, onAdd, onRemove}) => {
'mod-mutating': submitting
})}
onClick={toggle}
- onKeyDown={e => e.key === 'Enter' && toggle()}
+ onKeyDown={e => {
+ if (e.key === 'Enter' || e.key === ' ') {
+ toggle();
+ e.preventDefault();
+ }
+ }}
>
<img
className="studio-project-image"
| 11 |
diff --git a/.travis.yml b/.travis.yml @@ -38,7 +38,9 @@ deploy:
api_key: $NPM_TOKEN
- provider: s3
on:
- branch: master
+ branch:
+ - master
+ - $PREVIEW_BRANCH
access_key_id: $AWS_ACCESS_KEY_ID
secret_access_key: $AWS_SECRET_ACCESS_KEY
bucket: $AWS_BUCKET_NAME
| 11 |
diff --git a/.github/workflows/browserslist-db-update.yml b/.github/workflows/browserslist-db-update.yml @@ -7,10 +7,6 @@ on:
workflow_dispatch:
-permissions:
- contents: write
- pull-requests: write
-
jobs:
update-browserslist-database:
name: Create PR containing Browserslist updates
| 2 |
diff --git a/lib/test.js b/lib/test.js @@ -39,8 +39,7 @@ Test.prototype.deployAll = function(contractsConfig, cb) {
contractsConfig: config.contractsConfig,
logger: logger
});
- contractsManager.build();
- callback(null, contractsManager);
+ contractsManager.build(callback);
},
function deployContracts(contractsManager, callback) {
var deploy = new Deploy({
| 1 |
diff --git a/src/js/common_shim.js b/src/js/common_shim.js @@ -187,17 +187,16 @@ module.exports = {
// Note: 65535 bytes is the default value from the SDP spec. Also,
// every implementation we know supports receiving 65535 bytes.
var maxMessageSize = 65535;
- var match = description.sdp.match(/a=max-message-size:\s*(\d+)/);
- if (match !== null && match.length >= 2) {
- maxMessageSize = parseInt(match[1]);
+ var match = SDPUtils.matchPrefix(description.sdp, 'a=max-message-size:');
+ if (match.length > 0) {
+ maxMessageSize = parseInt(match[0]);
}
return maxMessageSize;
};
var isFirefox = function(description) {
// TODO: Is there a better solution for detecting Firefox?
- var match = description.sdp.match(/mozilla...THIS_IS_SDPARTA/);
- return (match !== null && match.length >= 1);
+ return description.sdp.indexOf('mozilla...THIS_IS_SDPARTA') !== -1;
};
var maybeApplyMaxMessageSize = function(pc) {
| 14 |
diff --git a/.github/linters/.htmlhintrc_morechecks b/.github/linters/.htmlhintrc_morechecks "head-script-disabled": false,
"href-abs-or-rel": false,
"id-class-ad-disabled": true,
- "inline-style-disabled": true,
+ "inline-style-disabled": false,
"inline-script-disabled": true,
"space-tab-mixed-disabled": "space",
"spec-char-escape": false,
| 11 |
diff --git a/userscript.user.js b/userscript.user.js @@ -10005,19 +10005,7 @@ var $$IMU_EXPORT$$;
// https://public.flashingjungle.com/exhibitionism/2020/01/tumblr_l7d540zpVM1qd5asfo1_1280-681x1024.jpg
domain === "public.flashingjungle.com" ||
// https://static.acgsoso.com/uploads/2020/02/19bd4f091f03c191195d5e626c3190f9-200x300.jpg
- (domain === "static.acgsoso.com" && src.indexOf("/uploads/") >= 0) ||
- // https://1.soompi.io/wp-content/blogs.dir/8/files/2015/09/HA-TFELT-Wonder-Girls-590x730.jpg -- doesn't work
- // https://cdn0.tnwcdn.com/wp-content/blogs.dir/1/files/2018/01/GTA-6-Female-Protag-796x417.jpg -- does work
- /^[a-z]+:\/\/[^?]*\/wp(?:-content\/+(?:uploads|images|photos|blogs.dir)|\/+uploads)\//.test(src)
- //src.indexOf("/wp-content/blogs.dir/") >= 0 ||
- // https://d13ezvd6yrslxm.cloudfront.net/wp/wp-content/images/x-men-apocalypse-700x300.jpg
- //src.indexOf("/wp/wp-content/images/") >= 0 ||
- // http://ljshopch.com/wp-content/photos/2017/12/e6c61489857f770f1738b9a5b8702671-250x150.jpg
- //src.indexOf("/wp-content/photos/") >= 0 ||
- // https://cdn.gamerant.com/wp-content/uploads/resident-evil-2-director-remake-faith-738x410.jpg.webp
- // https://cdn.gamerant.com/wp-content/uploads/resident-evil-2-director-remake-faith.jpg.webp
- //src.indexOf("/wp-content/uploads/") >= 0 ||
- /*src.indexOf("/wp/uploads/") >= 0*/
+ (domain === "static.acgsoso.com" && src.indexOf("/uploads/") >= 0)
) {
// http://arissa-x.com/miss-x-channel/wp-content/uploads/2017/06/IMG_0005.jpg
src = src.replace(/-[0-9]+x[0-9]+\.([^/]*(?:[?#].*)?)$/, ".$1");
@@ -10170,8 +10158,23 @@ var $$IMU_EXPORT$$;
(domain_nowww === "xda-developers.com" && src.indexOf("/files/") >= 0) ||
// http://www.onthemoveworld.com/otm-fr/wp-content/uploads/2019/03/Carly-rae-jepsen-2018-cr-Natalie-OMoore-billboard-1548-347x246_c.jpg
// http://www.onthemoveworld.com/otm-fr/wp-content/uploads/2019/03/Carly-rae-jepsen-2018-cr-Natalie-OMoore-billboard-1548.jpg
- domain_nowww === "onthemoveworld.com") {
- src = src.replace(/-[0-9]*x[0-9]*(?:_[a-z])?(\.[^/.]*)(?:[?#].*)?$/, "$1");
+ domain_nowww === "onthemoveworld.com" ||
+ // https://1.soompi.io/wp-content/blogs.dir/8/files/2015/09/HA-TFELT-Wonder-Girls-590x730.jpg -- doesn't work
+ // https://cdn0.tnwcdn.com/wp-content/blogs.dir/1/files/2018/01/GTA-6-Female-Protag-796x417.jpg -- does work
+ // https://dreamix.eu/blog/wp-content/uploads/2017/05/20150224test644-1508x706_c.jpg
+ // https://dreamix.eu/blog/wp-content/uploads/2017/05/20150224test644.jpg
+ /^[a-z]+:\/\/[^?]*\/wp(?:-content\/+(?:uploads|images|photos|blogs.dir)|\/+uploads)\//.test(src)
+ //src.indexOf("/wp-content/blogs.dir/") >= 0 ||
+ // https://d13ezvd6yrslxm.cloudfront.net/wp/wp-content/images/x-men-apocalypse-700x300.jpg
+ //src.indexOf("/wp/wp-content/images/") >= 0 ||
+ // http://ljshopch.com/wp-content/photos/2017/12/e6c61489857f770f1738b9a5b8702671-250x150.jpg
+ //src.indexOf("/wp-content/photos/") >= 0 ||
+ // https://cdn.gamerant.com/wp-content/uploads/resident-evil-2-director-remake-faith-738x410.jpg.webp
+ // https://cdn.gamerant.com/wp-content/uploads/resident-evil-2-director-remake-faith.jpg.webp
+ //src.indexOf("/wp-content/uploads/") >= 0 ||
+ //src.indexOf("/wp/uploads/") >= 0
+ ) {
+ src = src.replace(/-[0-9]*x[0-9]*(?:_c)?(\.[^/.]*)(?:[?#].*)?$/, "$1");
}
// http://felipepitta.com/blog/wp-content/uploads/2014/08/Harry-Potter-Hogwarts-Express-Jacobite-Fort-William-Scotland-Train(pp_w970_h646).jpg
| 7 |
diff --git a/js/monogatari.js b/js/monogatari.js @@ -690,10 +690,10 @@ $_ready(function() {
shutUp();
if (engine["Step"] >= 2) {
engine["Step"] -= 2;
- var back = ["show", "play", "display", "hide", "stop"];
+ var back = ["show", "play", "display", "hide", "stop", "scene"];
try {
if (typeof label[engine["Step"]] == "string") {
- while (back.indexOf(label[engine["Step"]].split(" ")[0]) > -1) {
+ while (back.indexOf(label[engine["Step"]].split(" ")[0]) > -1 && engine["Step"] > 0) {
var parts = replaceVariables(label[engine["Step"]]).split(" ");
switch (parts[0]) {
case "show":
@@ -784,22 +784,19 @@ $_ready(function() {
break;
case "scene":
+ engine["SceneHistory"].pop()
+ engine["Scene"] = engine["SceneHistory"].slice(-1)[0];
+ if (typeof engine["Scene"] != 'undefined') {
$_("[data-character]").remove();
$_("[data-image]").remove();
- engine["SceneHistory"].pop()
- engine["Scene"] = engine["SceneHistory"].slice(-1)[0];
- $_('#game').fadeOut(200, function() {
-
if (scenes[parts[1]] != null) {
$_('#game').style("background", "url(img/scenes/" + scenes[engine["Scene"]] + ") center / cover no-repeat");
} else {
$_('#game').style("background", engine["Scene"]);
}
-
- $_('#game').fadeIn(200);
- });
+ }
whipeText();
break;
| 7 |
diff --git a/packages/cloud-cognitive/src/components/_Canary/Canary.js b/packages/cloud-cognitive/src/components/_Canary/Canary.js @@ -28,7 +28,7 @@ export const Canary = (
{ className, componentName, ...rest } /*, originalArgs*/
) => {
const instructions = `
-import { pkg } from '@carbon/ibm-cloud-cognitive';
+import { pkg } from '@carbon/ibm-cloud-cognitive/es/settings';
// NOTE: must happen before component import
pkg.component.${componentName} = true;
`;
| 1 |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml @@ -3,7 +3,7 @@ on: ["pull_request"]
jobs:
iscodeclean:
if: "!contains(github.event.head_commit.message, 'skip ci')"
- name: Test
+ name: Code Cleanliness
runs-on: ubuntu-18.04
steps:
- name: Checkout
@@ -21,6 +21,7 @@ jobs:
npm install
npm run test:lint
cypress-run:
+ name: Cypress Integration Tests (Browser Tests)
needs: iscodeclean
runs-on: ubuntu-16.04
steps:
@@ -33,7 +34,7 @@ jobs:
with:
start: npm run start
wait-on: http://localhost:6001
+ wait-on-timeout: 120
record: true
- config: pageLoadTimeout=120000
env:
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
| 10 |
diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js @@ -112,6 +112,8 @@ class ReportActionItem extends Component {
if (this.props.draftMessage) {
return;
}
+
+ this.setState({isContextMenuActive: true});
const selection = SelectionScraper.getCurrentSelection();
ReportActionContextMenu.showContextMenu(
ContextMenuActions.CONTEXT_MENU_TYPES.REPORT_ACTION,
@@ -121,7 +123,7 @@ class ReportActionItem extends Component {
this.props.report.reportID,
this.props.action,
this.props.draftMessage,
- this.checkIfContextMenuActive,
+ undefined,
this.checkIfContextMenuActive,
);
}
| 12 |
diff --git a/server/game/cards/15-DotE/ThePrinceWhoCameTooLate.js b/server/game/cards/15-DotE/ThePrinceWhoCameTooLate.js const PlotCard = require('../../plotcard');
const GameActions = require('../../GameActions');
-class TheLostMessage extends PlotCard {
+class ThePrinceWhoCameTooLate extends PlotCard {
setupCardAbilities(ability) {
this.action({
title: 'Search your deck',
@@ -26,6 +26,6 @@ class TheLostMessage extends PlotCard {
}
}
-TheLostMessage.code = '15052';
+ThePrinceWhoCameTooLate.code = '15052';
-module.exports = TheLostMessage;
+module.exports = ThePrinceWhoCameTooLate;
| 1 |
diff --git a/vis/js/list.js b/vis/js/list.js @@ -496,7 +496,7 @@ list.populateMetaData = function(nodes) {
return d.outlink;
})
.attr("class", function(d){
- if(d.oa){
+ if(d.oa && d.link !== ""){
return "oa-link oa-link-hidden"
}
return "outlink"
@@ -508,7 +508,7 @@ list.populateMetaData = function(nodes) {
var paper_link = list_metadata.select(".link2");
paper_link.style("display", function(d) {
- if (d.oa === false || d.resulttype == "dataset") {
+ if (d.oa === false || d.resulttype == "dataset" || d.link === "") {
return "none";
}
});
@@ -1528,15 +1528,22 @@ list.populateOverlay = function(d) {
keyboard: true
});
- let article_url = d.oa_link;
+ let article_url = encodeURIComponent(d.oa_link);
let possible_pdfs = "";
if (config.service === "base") {
- possible_pdfs = d.link + ";" + d.identifier + ";" + d.relation;
- } else if (config.service === "openaire") {
- possible_pdfs = d.link + ";" + d.fulltext;
+ let encodeRelation = function (relation) {
+ let relation_array = relation.split("; ");
+ let encoded_array = relation_array.map(function (x) { return encodeURIComponent(x) });
+ return encoded_array.join("; ")
}
- $.getJSON(config.server_url + "services/getPDF.php?url=" + article_url + "&filename=" + pdf_url + "&service=" + config.service + "&pdf_urls=" + possible_pdfs, (data) => {
+ possible_pdfs = encodeURIComponent(d.link) + ";"
+ + encodeURIComponent(d.identifier) + ";"
+ + encodeRelation(d.relation);
+ } else if (config.service === "openaire") {
+ possible_pdfs = encodeURIComponent(d.link) + ";"
+ + d.fulltext;
+ }
var showError = function() {
var pdf_location_link = (config.service === "openaire") ? (this_d.link) : (this_d.outlink);
@@ -1546,6 +1553,8 @@ list.populateOverlay = function(d) {
$("#status").show();
}
+ $.getJSON(config.server_url + "services/getPDF.php?url=" + article_url + "&filename=" + pdf_url + "&service=" + config.service + "&pdf_urls=" + possible_pdfs, (data) => {
+
if (data.status === "success") {
this.writePopup(config.server_url + "paper_preview/" + pdf_url);
} else if (data.status === "error") {
| 7 |
diff --git a/js/lbry.js b/js/lbry.js @@ -190,7 +190,7 @@ lbry.getTotalCost = function(name, size, callback) {
}
lbry.getPeersForBlobHash = function(blobHash, callback) {
- lbry.call('get_peers_for_hash', { blob_hash: blobHash }, callback)
+ lbry.call('peer_list', { blob_hash: blobHash }, callback);
}
lbry.getCostInfoForName = function(name, callback) {
| 4 |
diff --git a/Gruntfile.js b/Gruntfile.js @@ -3,7 +3,7 @@ module.exports = function (grunt) {
const version = packageFile.version
const electronVersion = packageFile.electronVersion
- const ignoredDirs = ['dist/app', 'ext/readability-master/test', /\.map$/g] // directories that will be ignored when building binaries
+ const ignoredDirs = ['.DS_Store', 'dist/app', 'ext/readability-master/test', /\.map$/g] // directories that will be ignored when building binaries
// Project configuration.
grunt.initConfig({
| 2 |
diff --git a/devices.js b/devices.js @@ -185,7 +185,7 @@ const devices = [
supports: 'shake, wakeup, fall, tap, slide, flip180, flip90, rotate_left and rotate_right',
fromZigbee: [
fz.xiaomi_battery_3v, fz.MFKZQ01LM_action_multistate, fz.MFKZQ01LM_action_analog,
- fz.ignore_analog_change, fz.ignore_multistate_change,
+ fz.ignore_analog_change, fz.ignore_multistate_change, fz.ignore_basic_change,
],
toZigbee: [],
},
| 8 |
diff --git a/packages/@uppy/dashboard/src/style.scss b/packages/@uppy/dashboard/src/style.scss transition: transform ease-in-out .15s;
}
- .uppy-DashboardTab-btn:hover svg {
- transform: translateZ(0) scale(1.1, 1.1);
- }
-
.uppy-DashboardTab-name {
font-size: 14px;
font-weight: 500;
| 2 |
diff --git a/src/resources/weapons.json b/src/resources/weapons.json "mr": 6,
"type": "Primary",
"subtype": "Rifle",
- "trigger": "Charge (2.5s)",
+ "trigger": "Charge (2.0s)",
"projectile": "Hitscan",
"rate": 1,
"flight": "-",
"noise": "Alarming",
"accuracy": 100,
"magazine": 5,
- "ammo": "540",
+ "ammo": "200",
"reload": "2.0s",
"riven_disposition": "4",
"damage": "1000",
- "impact": "100.0",
- "puncture": "850.0",
- "slash": "50.0",
- "crit_chance": "15%",
- "crit_mult": "2.0x",
- "status_chance": "15%",
+ "impact": "100",
+ "puncture": "850",
+ "slash": "50",
+ "crit_chance": "20%",
+ "crit_mult": "2.5x",
+ "status_chance": "20%",
"polarities": "<:vazarin:319586146269003778>",
"thumbnail": "https://vignette2.wikia.nocookie.net/warframe/images/a/a7/CrpBFG.png/revision/latest/scale-to-width-down/220?cb=20141024143412",
"location": "Dojo"
| 3 |
diff --git a/packages/vue/config/storybook/addons.js b/packages/vue/config/storybook/addons.js import "@storybook/addon-knobs/register";
import "@storybook/addon-a11y/register";
import "@storybook/addon-links/register";
-import "@storybook/addon-viewport/register";
+// import "@storybook/addon-viewport/register";
// import "@storybook/addon-backgrounds/register";
import "@storybook/addon-storysource/register";
| 1 |
diff --git a/src/ui/sass/trumbowyg.scss b/src/ui/sass/trumbowyg.scss @@ -163,7 +163,7 @@ $slow-transition-duration: 300ms !default;
color: transparent;
}
- & + .trumbowyg-button-group::before {
+ &::after {
content: " ";
display: inline-block;
width: 1px;
@@ -172,6 +172,10 @@ $slow-transition-duration: 300ms !default;
height: 35px;
vertical-align: top;
}
+
+ &:last-child::after {
+ content: none;
+ }
}
button {
@@ -241,10 +245,6 @@ $slow-transition-duration: 300ms !default;
.trumbowyg-right {
float: right;
-
- &::before {
- display: none !important;
- }
}
}
@@ -668,7 +668,7 @@ body.trumbowyg-body-fullscreen {
}
.trumbowyg-button-group:not(:empty) {
- &::before {
+ &::after {
background-color: lighten($dark-color, 7%);
}
.trumbowyg-fullscreen-button svg {
@@ -677,7 +677,7 @@ body.trumbowyg-body-fullscreen {
}
&.trumbowyg-disable {
- .trumbowyg-button-group::before {
+ .trumbowyg-button-group::after {
background-color: lighten($dark-color, 3%);
}
}
| 7 |
diff --git a/js/node/bis_basefileserver.js b/js/node/bis_basefileserver.js @@ -69,8 +69,6 @@ class BaseFileServer {
this.opts = {};
- this.opts.dcm2nii = '/usr/bin/dcm2niix';
-
for (let i = 0; i < server_fields.length; i++) {
let name = server_fields[i].name;
this.opts[name] = server_fields[i].value;
| 2 |
diff --git a/html/objects/flag.stories.js b/html/objects/flag.stories.js @@ -17,7 +17,7 @@ export const defaultStory = () => (
<div class="sprk-o-Flag__figure">
<img
alt="Provide useful alternative text"
- src="https://spark-assets.netlify.com/spark-logo-updated.svg"
+ src="https://spark-assets.netlify.com/spark-logo-mark.svg"
/>
</div>
<div class="sprk-o-Flag__body">
| 3 |
diff --git a/src/web/OutputWaiter.mjs b/src/web/OutputWaiter.mjs import Utils from "../core/Utils";
import FileSaver from "file-saver";
-import zip from "zlibjs/bin/zip.min";
import ZipWorker from "worker-loader?inline&fallback=false!./ZipWorker";
-const Zlib = zip.Zlib;
-
/**
* Waiter to handle events related to the output
*/
| 2 |
diff --git a/src/viewer.js b/src/viewer.js @@ -60,12 +60,13 @@ class gltfViewer
load(gltfFile, basePath = "")
{
+ gltfFile = basePath + gltfFile;
+ console.log("Loading gltf file " + gltfFile);
+
// Started loading the glTF 2.0 models.
if (!this.headless) this.showSpinner();
let self = this;
-
- gltfFile = basePath + gltfFile;
axios.get(gltfFile).then(function(response) {
let incompleteGltf = new glTF(gltfFile);
incompleteGltf.fromJson(response.data);
@@ -385,7 +386,7 @@ class gltfViewer
{
let models = [];
- let ignoreVariants = ["glTF-Binary", "glTF-Draco", "glTF-Embedded"];
+ let ignoreVariants = ["glTF-Draco", "glTF-Embedded"];
for(let entry of jsonIndex)
{
| 11 |
diff --git a/packages/bitcore-node/src/modules/ethereum/api/csp.ts b/packages/bitcore-node/src/modules/ethereum/api/csp.ts @@ -434,7 +434,13 @@ export class ETHStateProvider extends InternalStateProvider implements CSP.IChai
};
});
+ try {
await WalletAddressStorage.collection.bulkWrite(walletAddressInserts);
+ } catch (err) {
+ if (err.code !== 11000) {
+ throw err;
+ }
+ }
await EthTransactionStorage.collection.updateMany(
{ chain, network, $or: [{ from: { $in: addressBatch } }, { to: { $in: addressBatch } }] },
| 9 |
diff --git a/scripts/generate-typings.js b/scripts/generate-typings.js @@ -44,6 +44,7 @@ async function generateIndexTypes(from, to) {
exportName = kebabToCamel(file.split('/').shift());
}
+ if (fileSource) {
let name = fileSource.match(/export default *[a-zA-Z\d;]+\n/gm);
if (name !== null) {
name = name.pop().replace('export default', '').replace(/\n/, '').replace(';', '').trim();
@@ -56,6 +57,7 @@ async function generateIndexTypes(from, to) {
throw new Error(`module name missing!: ${file}\n`);
}
}
+ }
if (!exportName) {
exportName = kebabToCamel(file.split('/').shift());
| 9 |
diff --git a/ui/app/global-styles.js b/ui/app/global-styles.js @@ -262,8 +262,8 @@ injectGlobal`
-webkit-box-shadow: none;
box-shadow: none; }
- .conversationInput {
- width: 250px !important;
+ .conversation-input {
+ width: 180px !important;
margin-bottom: 10px !important;
margin-left: 15px !important;
}
| 10 |
diff --git a/src/components/ButtonDropdown.js b/src/components/ButtonDropdown.js @@ -131,15 +131,13 @@ const ButtonDropdown = ({ list, className }) => {
variants={listVariants}
initial="closed"
>
- {list.items.map((item, idx) => {
- return (
+ {list.items.map((item, idx) => (
<DropdownItem key={idx} onClick={() => setIsOpen(false)}>
<NavLink to={item.to} tabIndex="-1">
<Translation id={item.text} />
</NavLink>
</DropdownItem>
- )
- })}
+ ))}
</DropdownList>
</Container>
)
| 7 |
diff --git a/token-metadata/0x426CA1eA2406c07d75Db9585F22781c096e3d0E0/metadata.json b/token-metadata/0x426CA1eA2406c07d75Db9585F22781c096e3d0E0/metadata.json "symbol": "MNE",
"address": "0x426CA1eA2406c07d75Db9585F22781c096e3d0E0",
"decimals": 8,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/README.md b/README.md @@ -89,6 +89,9 @@ var Plotly = require('plotly.js-dist-dist');
To learn more about native imports please visit [here](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Modules). Also please note that ES6 import is not supported by IE-11.
+### Content Delivery Network (CDN)
+Fastly supports Plotly.js with free CDN service. Read more at <https://www.fastly.com/open-source>.
+
### Un-minified versions are also available on CDN
While non-minified source files may contain characters outside UTF-8, it is recommended that you specify the `charset` when loading those bundles.
```html
| 0 |
diff --git a/server/Opendatacam.js b/server/Opendatacam.js @@ -376,15 +376,15 @@ module.exports = {
Opendatacam.countedItemsHistory.forEach((countedItem) => {
if(!counterSummary[countedItem.area]) {
counterSummary[countedItem.area] = {}
+ counterSummary[countedItem.area]['_total'] = 0;
}
if(!counterSummary[countedItem.area][countedItem.name]) {
counterSummary[countedItem.area][countedItem.name] = 1;
- counterSummary[countedItem.area]['_total'] = 1;
} else {
counterSummary[countedItem.area][countedItem.name]++;
- counterSummary[countedItem.area]['_total']++;
}
+ counterSummary[countedItem.area]['_total']++;
})
return counterSummary;
| 1 |
diff --git a/src/Services/Air/templates/AirCancel.handlebars.js b/src/Services/Air/templates/AirCancel.handlebars.js @@ -16,9 +16,9 @@ module.exports = `
<com:OverridePCC ProviderCode="1G" PseudoCityCode="{{emulatePcc}}"/>
{{/if}}
<air:AirReservationLocatorCode>{{uapi_reservation_locator}}</air:AirReservationLocatorCode>
- {{#trips}}
+ {{#segments}}
<air:AirSegmentRef Key="{{{uapi_segment_ref}}}"/>
- {{/trips}}
+ {{/segments}}
</univ:AirCancelReq>
</soapenv:Body>
</soapenv:Envelope>
| 10 |
diff --git a/Specs/Widgets/Viewer/ViewerSpec.js b/Specs/Widgets/Viewer/ViewerSpec.js @@ -1045,7 +1045,7 @@ defineSuite([
it('zoomTo when target is Cesium3DTileset and uses default offset when offset not defined', function() {
viewer = createViewer(container);
var path = './Data/Cesium3DTiles/Tilesets/TilesetOfTilesets';
- var tileset = new Cesium3DTileSet({
+ var tileset = new Cesium3DTileset({
url : path
});
@@ -1073,7 +1073,7 @@ defineSuite([
viewer = createViewer(container);
var path = './Data/Cesium3DTiles/Tilesets/TilesetOfTilesets';
- var tileset = new Cesium3DTileSet({
+ var tileset = new Cesium3DTileset({
url : path
});
@@ -1100,7 +1100,7 @@ defineSuite([
viewer = createViewer(container);
var path = './Data/Cesium3DTiles/Tilesets/TilesetOfTilesets';
- var tileset = new Cesium3DTileSet({
+ var tileset = new Cesium3DTileset({
url : path
});
@@ -1133,7 +1133,7 @@ defineSuite([
var camDir = Cartesian3.clone(viewer.camera.direction);
var path = './Data/Cesium3DTiles/Tilesets/TilesetOfTilesets';
- var tileset = new Cesium3DTileSet({
+ var tileset = new Cesium3DTileset({
url : path
});
@@ -1158,7 +1158,7 @@ defineSuite([
viewer = createViewer(container);
var path = './Data/Cesium3DTiles/Tilesets/TilesetOfTilesets';
- var tileset = new Cesium3DTileSet({
+ var tileset = new Cesium3DTileset({
url : path
});
| 3 |
diff --git a/generators/client/templates/angular/package.json.ejs b/generators/client/templates/angular/package.json.ejs "bootstrap": "4.2.1",
"core-js": "2.6.4",
"moment": "2.24.0",
- "ng-jhipster": "0.9.1",
+ "ng-jhipster": "0.9.3",
"ngx-cookie": "2.0.1",
"ngx-infinite-scroll": "7.0.1",
"ngx-webstorage": "2.0.1",
| 3 |
diff --git a/lib/utility.js b/lib/utility.js @@ -871,7 +871,7 @@ function stopMicrophone() {
return value;
}
function noise(x) {
- if (isArray(x)) {
+ if (Array.isArray(x)) {
let _x = x.length >= 3 ? x : [x[0],def(x[1]),def(x[2])];
return noise3dObject.noise(_x);
}
| 1 |
diff --git a/lib/node_modules/@stdlib/math/base/special/expm1/lib/expm1.js b/lib/node_modules/@stdlib/math/base/special/expm1/lib/expm1.js @@ -290,7 +290,7 @@ function expm1( x ) {
} else {
k = (LN2_INV*x) + 0.5;
}
- k = k|0; // use a bitwise OR to cast `k` to an integer (see also asm.js type annotations: http://asmjs.org/spec/latest/#annotations)
+ k |= 0; // use a bitwise OR to cast `k` to an integer (see also asm.js type annotations: http://asmjs.org/spec/latest/#annotations)
t = k;
hi = x - (t*LN2_HI); // t*ln2_hi is exact here
lo = t * LN2_LO;
| 14 |
diff --git a/core/bound_variable_value.js b/core/bound_variable_value.js @@ -131,7 +131,7 @@ Blockly.BoundVariableValue.prototype.getAllBoundVariables = function() {
* @override
*/
Blockly.BoundVariableValue.prototype.dispose = function(opt_removeReference) {
- var forceToRemove = this.isConstructor() ?
+ var forceToRemove = this.isConstructor() || this.isRecord() ?
opt_removeReference !== false : opt_removeReference === true;
if (forceToRemove) {
| 2 |
diff --git a/src/styles/_layer.scss b/src/styles/_layer.scss // PROPERTY
.maputnik-default-property {
+ .maputnik-input-block-label {
+ color: darken($color-lowgray, 25%);
+ }
+ .maputnik-string,
+ .maputnik-number,
+ .maputnik-color,
+ .maputnik-select,
+ .maputnik-checkbox-wrapper {
+ background-color: darken($color-gray, 2%);
+ color: darken($color-lowgray, 25%);
+ }
+ .maputnik-make-zoom-function svg {
opacity: 0.4;
}
+ .maputnik-multibutton .maputnik-button {
+ background-color: darken($color-midgray, 10%);
+ color: darken($color-lowgray, 25%);
+
+ &:hover {
+ background-color: lighten($color-midgray, 12);
+ color: $color-white;
+ }
+ }
+ .maputnik-multibutton .maputnik-button-selected {
+ background-color: darken($color-midgray, 2%);
+ color: $color-lowgray;
+ }
+}
| 7 |
diff --git a/kitty-items-js/src/workers/base-event-handler.ts b/kitty-items-js/src/workers/base-event-handler.ts @@ -9,6 +9,8 @@ interface EventDetails {
blockHeight: number;
}
+// BaseEventHandler will iterate through a range of block_heights and then run a callback to process any events we
+// are interested in. It also keeps a cursor in the database so we can resume from where we left off at any time.
abstract class BaseEventHandler {
private stepSize: number = 1000;
private stepTimeMs: number = 500;
@@ -55,6 +57,8 @@ abstract class BaseEventHandler {
let getEventsResult, eventList;
try {
+ // `getEvents` will retrieve all events of the given type within the block height range supplied.
+ // See https://docs.onflow.org/core-contracts/access-api/#geteventsforheightrange
getEventsResult = await send([
getEvents(this.eventName, fromBlock, toBlock),
]);
@@ -69,7 +73,7 @@ abstract class BaseEventHandler {
for (let i = 0; i < eventList.length; i++) {
console.log(
- "event height=",
+ "block_height =",
getEventsResult.events[i].blockHeight,
" payload =",
eventList[i].data
| 0 |
diff --git a/README.md b/README.md ### An open source storage system for your data that makes it easy to collect, organize, and share them anywhere on the web.
- [Create an account and try it out!](https://slate.host)
-- [Use our components](https://slate.host/_/system)
-- [Design System Release Repository](https://github.com/filecoin-project/slate-react-system)
- [Filecoin](https://filecoin.io)
- [Textile](https://textile.io)
- [Twitter](https://twitter.com/_slate)
@@ -61,6 +59,7 @@ How?
- You must create a `.env` file if you want to work on the service.
- You don't need one if you work on the system.
+- Resource URIs are optional if you want to use another server for uploads.
```
POSTGRES_ADMIN_PASSWORD=XXX
@@ -73,6 +72,9 @@ LOCAL_PASSWORD_ROUNDS_MANUAL=5
LOCAL_PASSWORD_ROUNDS=14
TEXTILE_HUB_KEY=XXX
TEXTILE_HUB_SECRET=XXX
+RESOURCE_URI_UPLOAD=http://localhost:8888
+RESOURCE_URI_STORAGE_UPLOAD=http://localhost:8888
+RESOURCE_URI_REALTIME=http://localhost:8888
```
### Install and run
@@ -89,3 +91,10 @@ npm run dev
- Visit `localhost:1337` in a browser.
+
+### Design System
+
+Our design system is outdated but we will be updating it again soon.
+
+- [Use our components](https://slate.host/_/system)
+- [Design System Release Repository](https://github.com/filecoin-project/slate-react-system)
\ No newline at end of file
| 3 |
diff --git a/tests/generators/colour.xml b/tests/generators/colour.xml <xml xmlns="http://www.w3.org/1999/xhtml">
- <variables>
- <variable type="" id=".BC!Zr?d!(!/,oU[FR=N">item</variable>
- <variable type="" id="Y^.=S=NGMAu`73E}(x;A">i</variable>
- </variables>
<block type="procedures_defnoreturn" x="260" y="14">
<field name="NAME">test colour picker</field>
<comment pinned="false" h="80" w="160">Describe this function...</comment>
</value>
<statement name="DO">
<block type="variables_set" inline="false">
- <field name="VAR" id=".BC!Zr?d!(!/,oU[FR=N" variabletype="">item</field>
+ <field name="VAR">item</field>
<value name="VALUE">
<block type="colour_random"></block>
</value>
</value>
<value name="ADD1">
<block type="variables_get">
- <field name="VAR" id=".BC!Zr?d!(!/,oU[FR=N" variabletype="">item</field>
+ <field name="VAR">item</field>
</block>
</value>
</block>
<block type="text_length" inline="false">
<value name="VALUE">
<block type="variables_get">
- <field name="VAR" id=".BC!Zr?d!(!/,oU[FR=N" variabletype="">item</field>
+ <field name="VAR">item</field>
</block>
</value>
</block>
</value>
<value name="ADD1">
<block type="variables_get">
- <field name="VAR" id=".BC!Zr?d!(!/,oU[FR=N" variabletype="">item</field>
+ <field name="VAR">item</field>
</block>
</value>
</block>
<field name="WHERE">FIRST</field>
<value name="VALUE">
<block type="variables_get">
- <field name="VAR" id=".BC!Zr?d!(!/,oU[FR=N" variabletype="">item</field>
+ <field name="VAR">item</field>
</block>
</value>
</block>
</value>
<next>
<block type="controls_for">
- <field name="VAR" id="Y^.=S=NGMAu`73E}(x;A" variabletype="">i</field>
+ <field name="VAR">i</field>
<value name="FROM">
<block type="math_number">
<field name="NUM">1</field>
</value>
<value name="ADD1">
<block type="variables_get">
- <field name="VAR" id=".BC!Zr?d!(!/,oU[FR=N" variabletype="">item</field>
+ <field name="VAR">item</field>
</block>
</value>
<value name="ADD2">
<block type="unittest_adjustindex">
<value name="INDEX">
<block type="variables_get">
- <field name="VAR" id="Y^.=S=NGMAu`73E}(x;A" variabletype="">i</field>
+ <field name="VAR">i</field>
</block>
</value>
</block>
<field name="WHERE">FROM_START</field>
<value name="VALUE">
<block type="variables_get">
- <field name="VAR" id=".BC!Zr?d!(!/,oU[FR=N" variabletype="">item</field>
+ <field name="VAR">item</field>
</block>
</value>
<value name="AT">
<block type="unittest_adjustindex">
<value name="INDEX">
<block type="variables_get">
- <field name="VAR" id="Y^.=S=NGMAu`73E}(x;A" variabletype="">i</field>
+ <field name="VAR">i</field>
</block>
</value>
</block>
| 2 |
diff --git a/src/utils/chart.js b/src/utils/chart.js @@ -8,7 +8,6 @@ const bar = (value, maxValue) => {
const barLength = value * chartWidth / maxValue
const wholeNumberPart = Math.floor(barLength)
const emptyPart = chartWidth - wholeNumberPart
-
let bar = chalk.blue(barSection).repeat(wholeNumberPart)
let empty = chalk.grey(barSection).repeat(emptyPart)
@@ -21,10 +20,10 @@ const formatValue = (value, formatter) => {
}
const chart = (data, formatter) => {
- const maxValue = Math.max(...data.map(item => parseInt(item.value)))
+ const maxValue = Math.max(...data.map(item => parseInt(item.value || 0)))
return data
.map(item => {
- const barText = bar(item.value, maxValue)
+ const barText = bar(item.value || 0, maxValue)
return `${item.key}\n${barText} ${formatValue(item.value, formatter)}`
})
.join('\n\n')
| 9 |
diff --git a/README.md b/README.md @@ -73,6 +73,9 @@ There is no plugin included for any service, see the reference implementation in
### Database migrations
Database schema migration is automatically done when visiting the root (`/`) route (click on the logo in the left upper edge).
+### Disable certain features
+If you don't use certain feature sets of grocy (for example if you don't need "Chores"), there are feature flags per major feature set to hide/disable the related UI elements (see `config-dist.php`)
+
### Adding your own CSS or JS without to have to modify the application itself
- When the file `data/custom_js.html` exists, the contents of the file will be added just before `</body>` (end of body) on every page
- When the file `data/custom_css.html` exists, the contents of the file will be added just before `</head>` (end of head) on every page
| 0 |
diff --git a/articles/architecture-scenarios/checklists.md b/articles/architecture-scenarios/checklists.md @@ -23,45 +23,49 @@ Auth0 recommends that you break your implementation into 6 phases to plan and co
Auth0 provides a checklist (Google Sheets format) for each phase with links to pertinent Auth0 feature documentation. Not all parts of each phase may apply to you.
-Click the links below to open each checklist, make a copy, and customize the checklists to suit your needs.
+## How to use the checklists
+
+1. Right-click the links below to open each checklists in a new tab.
+2. Save a copy or export them to another spreadsheet application.
+3. Customize the checklists to suit your needs.
## Analyze
-In the Analyze phase, you analyze end-user business requirements and determine project goals as part of the high-level plan for the project. Convert the requirements and goals into system functions that the organization intends to develop. Activities include:
+In the Analyze phase, analyze end-user business requirements and determine project goals as part of the high-level plan for the project. Convert the requirements and goals into system functions that the organization intends to develop. Activities include:
* Gathering business requirements
* Creating process diagrams
* Performing detailed analysis
* Alignment to project plan
-<a href="https://docs.google.com/spreadsheets/d/1hTtRvvO6Szlvcr4XnsgzzmJj7FmmucAZAmFF275hB20/edit?usp=sharing" download>Download the Analyze Checklist</a>
+[Analyze Checklist](https://docs.google.com/spreadsheets/d/1hTtRvvO6Szlvcr4XnsgzzmJj7FmmucAZAmFF275hB20/edit?usp=sharing)
## Design
-In the Design phase, you describe the desired features and operations of the system, including business rules, pseudo-code, screen layouts, and other necessary documentation. Activities include:
+In the Design phase, describe the desired features and operations of the system, including business rules, pseudo-code, screen layouts, and other necessary documentation. Activities include:
* Infrastructure design
* System model design
-<a href="https://docs.google.com/spreadsheets/d/1L0PLqcghVvCSdW_OmLoKlU0uDJtb5mw6uIufMrKW7ro/edit?usp=sharing" download>Download the Design Checklist</a>
+[Design Checklist](https://docs.google.com/spreadsheets/d/1L0PLqcghVvCSdW_OmLoKlU0uDJtb5mw6uIufMrKW7ro/edit?usp=sharing)
## Build
-In the Build phase, you develop the actual system through implementation of infrastructure and code. Activities include:
+In the Build phase, develop the actual system through implementation of infrastructure and code. Activities include:
* Infrastructure implementation
* Code implementation
-<a href="https://docs.google.com/spreadsheets/d/1Wd5HwONEi2Max7zcORJpwn8yQO_mbu62FDc-Sk8oWS8/edit?usp=sharing" download>Download the Design Checklist</a>
+[Build Checklist](https://docs.google.com/spreadsheets/d/1Wd5HwONEi2Max7zcORJpwn8yQO_mbu62FDc-Sk8oWS8/edit?usp=sharing)
## Test
-In the Test phase, you integrate and deploy all implemented code in the testing environment infrastructure. Testing then follows Software Testing Life Cycle activities to check the system for errors, bugs, and defects to verify that system functionalities work as expected (or not). Activities include:
+In the Test phase, integrate and deploy all implemented code in the testing environment infrastructure. Testing then follows Software Testing Life Cycle activities to check the system for errors, bugs, and defects to verify that system functionalities work as expected (or not). Activities include:
* Write test cases
* Execute test cases
-<a href="https://docs.google.com/spreadsheets/d/19tQOQ_heBVpHXx-YKZZY20u6y8mU8IwRHEF32znZ_-w/edit?usp=sharing" download>Download the Test Checklist</a>
+[Test Checklist](https://docs.google.com/spreadsheets/d/19tQOQ_heBVpHXx-YKZZY20u6y8mU8IwRHEF32znZ_-w/edit?usp=sharing)
## Deploy
@@ -69,7 +73,7 @@ In the Deploy phase, you deploy the system to either a staging or production env
Eventually, you deploy all components of the system to the production environment as a live release is made.
-<a href="https://docs.google.com/spreadsheets/d/1MRBz4CiT6RTL7Mf7eWmpjSZEQS3rwjNryyPGmvjn-fc/edit?usp=sharing" download>Download the Deploy Checklist</a>
+[Deploy Checklist](https://docs.google.com/spreadsheets/d/1MRBz4CiT6RTL7Mf7eWmpjSZEQS3rwjNryyPGmvjn-fc/edit?usp=sharing)
## Monitor
@@ -80,4 +84,4 @@ In the Monitor phase, you make enhancements, corrections, and changes to ensure
* Changes and adjustments
* Upgrade and adapt to future needs
-<a href="https://docs.google.com/spreadsheets/d/1zHs29OoeiludHxY5cV06oGVAIW91jMjUflJgzJVaRKo/edit?usp=sharing" download>Download the Monitor Checklist</a>
\ No newline at end of file
+[Monitor Checklist](https://docs.google.com/spreadsheets/d/1zHs29OoeiludHxY5cV06oGVAIW91jMjUflJgzJVaRKo/edit?usp=sharing)
\ No newline at end of file
| 2 |
diff --git a/src/lib/IP.coffee b/src/lib/IP.coffee # It is also possible to carry metadata with an IP object.
# For example, the `datatype` and `schema` of the sending
# port is transmitted with the IP object.
-module.exports = class IP
+
# Valid IP types
- @types: [
+validTypes = [
'data'
'openBracket'
'closeBracket'
]
+module.exports = class IP
# Detects if an arbitrary value is an IP
@isIP: (obj) ->
- obj and typeof obj is 'object' and obj._isIP is true
+ return obj and typeof obj is 'object' and obj._isIP is true
# Creates as new IP object
# Valid types: 'data', 'openBracket', 'closeBracket'
@@ -45,6 +46,7 @@ module.exports = class IP
@datatype = 'all'
for key, val of options
this[key] = val
+ return @
# Creates a new IP copying its contents by value not reference
clone: ->
@@ -56,12 +58,14 @@ module.exports = class IP
ip[key] = JSON.parse JSON.stringify val
else
ip[key] = val
- ip
+ return ip
# Moves an IP to a different owner
move: (@owner) ->
# no-op
+ return @
# Frees IP contents
drop: ->
delete this[key] for key, val of @
+ return
\ No newline at end of file
| 6 |
diff --git a/tests/e2e/specs/auth-flow.test.js b/tests/e2e/specs/auth-flow.test.js @@ -9,9 +9,7 @@ import { activatePlugin, createURL, visitAdminPage } from '@wordpress/e2e-test-u
import {
deactivateUtilityPlugins,
resetSiteKit,
- pasteText,
setSearchConsoleProperty,
- testClientConfig,
useRequestInterception,
setClientConfig,
setAuthToken,
@@ -65,12 +63,8 @@ describe( 'Site Kit set up flow for the first time', () => {
} );
it( 'authenticates from splash page', async () => {
+ await setClientConfig();
await visitAdminPage( 'admin.php', 'page=googlesitekit-splash' );
- await page.waitForSelector( '#client-configuration' );
-
- await pasteText( '#client-configuration', JSON.stringify( testClientConfig ) );
- await page.click( '#wizard-step-one-proceed' );
- await page.waitForSelector( '.googlesitekit-wizard-step--two .mdc-button' );
// Sign in with Google
await page.setRequestInterception( true );
| 2 |
diff --git a/components/bindings.js b/components/bindings.js @@ -3,12 +3,9 @@ import { App, updateProps } from './App.js';
export const setBindings = (appState, appProps, appHelpers) => {
window.addEventListener('load', () => {
- // APP
- const appContainer = document.getElementById('appContainer');
- appContainer.innerHTML = App(appProps);
- console.log(appProps);
-
// INVENTORY
+ console.log('lolrofl', appHelpers.inventory.getItems());
+
appContainer.querySelector('#twoD-inventoryUploadBtn').addEventListener('change', (e) => {
const file = e.target.files[0];
appHelpers.inventory.uploadFile(file);
| 2 |
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js @@ -3703,15 +3703,14 @@ RED.view = (function() {
var label = RED.utils.getNodeLabel(d, d.type);
var labelParts;
- if (this.__hideLabel__ !== hideLabel || d.resize || this.__label__ !== label) {
+ if (d.resize || this.__hideLabel__ !== hideLabel || this.__label__ !== label || this.__outputs__.length !== d.outputs) {
labelParts = getLabelParts(label, "red-ui-flow-node-label");
this.__label__ = label;
if (labelParts.lines.length !== this.__labelLineCount__) {
d.resize = true;
}
this.__labelLineCount__ = labelParts.lines.length;
- }
- if (d.resize || this.__hideLabel__ !== hideLabel || this.__outputs__.length !== d.outputs) {
+
if (hideLabel) {
d.h = Math.max(node_height,(d.outputs || 0) * 15);
} else {
| 9 |
diff --git a/runtime/opensbp/commands/zero.js b/runtime/opensbp/commands/zero.js @@ -234,17 +234,24 @@ exports.Z6 = function(args,callback) {
}.bind(this));
};
+////## update ZT to cover all axes 2/4/22, will still need to attend to U,V,W
exports.ZT = function(args, callback) {
ztObj = {};
ztObj.g55x = 0.0;
ztObj.g55y = 0.0;
ztObj.g55z = 0.0;
- this.emit_gcode("G28.3 X0 Y0 Z0");
+ ztObj.g55a = 0.0;
+ ztObj.g55b = 0.0;
+ ztObj.g55c = 0.0;
+ this.emit_gcode("G28.3 X0 Y0 Z0 A0 B0 C0");
config.driver.setMany(ztObj, function(err, value) {
if(err) { return callback(err); }
this.cmd_posx = this.posx = 0.0;
this.cmd_posy = this.posy = 0.0;
this.cmd_posz = this.posz = 0.0;
+ this.cmd_posa = this.posa = 0.0;
+ this.cmd_posb = this.posb = 0.0;
+ this.cmd_posc = this.posc = 0.0;
this.driver.requestStatusReport(function(report) {
log.debug("report = " + JSON.stringify(report));
callback();
| 3 |
diff --git a/token-metadata/0x3C45B24359fB0E107a4eAA56Bd0F2cE66C99A0E5/metadata.json b/token-metadata/0x3C45B24359fB0E107a4eAA56Bd0F2cE66C99A0E5/metadata.json "symbol": "ANK",
"address": "0x3C45B24359fB0E107a4eAA56Bd0F2cE66C99A0E5",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/components/file.js b/src/components/file.js @@ -162,9 +162,11 @@ module.exports = function(app) {
app.controller('formioFileUpload', [
'$scope',
+ '$interpolate',
'FormioUtils',
function(
$scope,
+ $interpolate,
FormioUtils
) {
if ($scope.builder) return;
@@ -196,6 +198,7 @@ module.exports = function(app) {
message: 'Starting upload'
};
var dir = $scope.component.dir || '';
+ dir = $interpolate(dir)({ data: $scope.data, row: $scope.row });
var formio = null;
if ($scope.formio) {
formio = $scope.formio;
| 11 |
diff --git a/core/util/runChromy.js b/core/util/runChromy.js @@ -155,7 +155,7 @@ function processScenarioView (scenario, variantOrScenarioLabelSafe, scenarioLabe
*/
const w = viewport.width || viewport.viewport.width;
const h = viewport.height || viewport.viewport.height;
- const flags = ['--disable-gpu', '--force-device-scale-factor=1', '--window-size={w},{h}'.replace(/{w}/, w).replace(/{h}/, h)].concat(hostFlags);
+ const flags = ['--disable-gpu', '--force-device-scale-factor=1', '--disable-infobars=true', '--window-size={w},{h}'.replace(/{w}/, w).replace(/{h}/, h)].concat(hostFlags);
const port = CHROMY_STARTING_PORT_NUMBER + runId;
console.log('Starting Chromy:', `port:${port}`, flags.toString());
| 3 |
diff --git a/docker/lost/entrypoint.sh b/docker/lost/entrypoint.sh @@ -53,7 +53,9 @@ worker="celery -A flaskapp.celery worker -Q celery,worker_status,$ENV_NAME -n $W
eval $worker &
if [ ${DEBUG} = "True" ]; then
+ if [ "$CUSTOM_NGINX_CONF" != "True" ]; then
cp /code/docker/lost/nginx/dev.conf /etc/nginx/conf.d/default.conf
+ fi
# start nginx web server
nginx="service nginx start"
eval $nginx &
@@ -61,7 +63,9 @@ if [ ${DEBUG} = "True" ]; then
endpoint="python3 /code/backend/lost/app.py"
eval $endpoint
else
+ if [ "$CUSTOM_NGINX_CONF" != "True" ]; then
cp /code/docker/lost/nginx/prod.conf /etc/nginx/conf.d/default.conf
+ fi
# start nginx web server
nginx="service nginx start"
eval $nginx &
| 11 |
diff --git a/app/service/controller.js b/app/service/controller.js @@ -2,6 +2,7 @@ import Ember from 'ember';
export default Ember.Controller.extend({
application: Ember.inject.controller(),
+ projects: Ember.inject.service(),
service: Ember.computed.alias('model.service'),
rules: Ember.computed.alias('service.lbConfig.portRules'),
| 1 |
diff --git a/test/builders/core-query.test.js b/test/builders/core-query.test.js @@ -12,101 +12,90 @@ beforeAll((done) => {
// Core Query Test
//------------------------------------------------------------
-test('It should return core serial B1041', () => {
- return request(app).get('/v2/parts/cores?core_serial=B1041').then((response) => {
+test('It should return core serial B1041', async () => {
+ const response = await request(app).get('/v2/parts/cores?core_serial=B1041');
expect(response.statusCode).toBe(200);
response.body.forEach((item) => {
expect(item).toHaveProperty('core_serial', 'B1041');
});
});
-});
-test('It should return all block 4 cores', () => {
- return request(app).get('/v2/parts/cores?block=4').then((response) => {
+test('It should return all block 4 cores', async () => {
+ const response = await request(app).get('/v2/parts/cores?block=4');
expect(response.statusCode).toBe(200);
response.body.forEach((item) => {
expect(item).toHaveProperty('block');
});
});
-});
-test('It should return all cores with active status', () => {
- return request(app).get('/v2/parts/cores?status=active').then((response) => {
+test('It should return all cores with active status', async () => {
+ const response = await request(app).get('/v2/parts/cores?status=active');
expect(response.statusCode).toBe(200);
response.body.forEach((item) => {
expect(item).toHaveProperty('status', 'active');
});
});
-});
-test('It should return core B1041 with the correct launch date', () => {
- return request(app).get('/v2/parts/cores?original_launch=2017-10-09T12:37:00Z').then((response) => {
+test('It should return core B1041 with the correct launch date', async () => {
+ const response = await request(app).get('/v2/parts/cores?original_launch=2017-10-09T12:37:00Z');
expect(response.statusCode).toBe(200);
response.body.forEach((item) => {
expect(item).toHaveProperty('original_launch', '2017-10-09T12:37:00Z');
});
});
-});
-test('It should return core for Iridium NEXT 21-30', () => {
- return request(app).get('/v2/parts/cores?missions=Iridium+NEXT+21-30').then((response) => {
+test('It should return core for Iridium NEXT 21-30', async () => {
+ const response = await request(app).get('/v2/parts/cores?missions=Iridium+NEXT+21-30');
expect(response.statusCode).toBe(200);
response.body.forEach((item) => {
expect(item).toHaveProperty('missions');
});
});
-});
-test('It should return core with an active status', () => {
- return request(app).get('/v2/parts/cores?status=active').then((response) => {
+test('It should return core with an active status', async () => {
+ const response = await request(app).get('/v2/parts/cores?status=active');
expect(response.statusCode).toBe(200);
response.body.forEach((item) => {
expect(item).toHaveProperty('status', 'active');
});
});
-});
-test('It should return cores with rtls attempts', () => {
- return request(app).get('/v2/parts/cores?rtls_attempt=true').then((response) => {
+test('It should return cores with rtls attempts', async () => {
+ const response = await request(app).get('/v2/parts/cores?rtls_attempt=true');
expect(response.statusCode).toBe(200);
response.body.forEach((item) => {
expect(item).toHaveProperty('rtls_attempt', true);
});
});
-});
-test('It should return cores with 1 rtls landings', () => {
- return request(app).get('/v2/parts/cores?rtls_landings=1').then((response) => {
+test('It should return cores with 1 rtls landings', async () => {
+ const response = await request(app).get('/v2/parts/cores?rtls_landings=1');
expect(response.statusCode).toBe(200);
response.body.forEach((item) => {
expect(item).toHaveProperty('rtls_landings', 1);
});
});
-});
-test('It should return cores with asds attempts', () => {
- return request(app).get('/v2/parts/cores?asds_attempt=true').then((response) => {
+test('It should return cores with asds attempts', async () => {
+ const response = await request(app).get('/v2/parts/cores?asds_attempt=true');
expect(response.statusCode).toBe(200);
response.body.forEach((item) => {
expect(item).toHaveProperty('asds_attempt', true);
});
});
-});
-test('It should return cores with 1 asds landing', () => {
- return request(app).get('/v2/parts/cores?asds_landings=1').then((response) => {
+test('It should return cores with 1 asds landing', async () => {
+ const response = await request(app).get('/v2/parts/cores?asds_landings=1');
expect(response.statusCode).toBe(200);
response.body.forEach((item) => {
expect(item).toHaveProperty('asds_landings', 1);
});
});
-});
-test('It should return cores with water landings', () => {
- return request(app).get('/v2/parts/cores?water_landing=true').then((response) => {
+test('It should return cores with water landings', async () => {
+ const response = await request(app).get('/v2/parts/cores?water_landing=true');
expect(response.statusCode).toBe(200);
response.body.forEach((item) => {
expect(item).toHaveProperty('water_landing', true);
});
});
-});
| 3 |
diff --git a/src/client/js/components/Admin/SlackIntegration/SlackIntegration.jsx b/src/client/js/components/Admin/SlackIntegration/SlackIntegration.jsx @@ -143,8 +143,8 @@ const SlackIntegration = (props) => {
{t('admin:slack_integration.selecting_bot_types.selecting_bot_type')}
- <div className="my-4">
- <div className="row flex-wrap-reverse justify-content-center">
+ <div className="row my-4">
+ <div className="flex-wrap-reverse justify-content-center">
{botTypes.map((botType) => {
return (
<BotTypeCard
| 5 |
diff --git a/app/views/navbar.scala.html b/app/views/navbar.scala.html </a>
<ul id="nav-data-menu" class="dropdown-menu" role="menu" aria-label="Data Options">
<li>
- <a id="navbar-results-btn" href="@routes.ApplicationController.results">@Messages("navbar.results")</a>
+ <a id="navbar-results-btn" role="menuitem" href="@routes.ApplicationController.results">@Messages("navbar.results")</a>
</li>
<!-- Only show Label Map link if the city does not have too much data to load that page quickly. -->
@if(!List("seattle-wa").contains(Play.configuration.getString("city-id").get)) {
<li>
- <a id="navbar-labelmap-btn"href="@routes.ApplicationController.labelMap">@Messages("navbar.labelmap")</a>
+ <a id="navbar-labelmap-btn" role="menuitem" href="@routes.ApplicationController.labelMap">@Messages("navbar.labelmap")</a>
</li>
}
<li>
- <a id="navbar-leaderboard-btn" href='@routes.ApplicationController.leaderboard'>
+ <a id="navbar-leaderboard-btn" role="menuitem" href='@routes.ApplicationController.leaderboard'>
@Messages("navbar.leaderboard")
</a>
</li>
<li>
- <a id="navbar-api-btn" href='@routes.ApplicationController.developer'>@Messages("footer.api")</a>
+ <a id="navbar-api-btn" role="menuitem" href='@routes.ApplicationController.developer' aria-label="Developer A.P.I.">@Messages("footer.api")</a>
</li>
</ul>
</li>
</a>
<ul id="nav-user-menu" class="dropdown-menu" role="menu" aria-label="User options for @user.get.username">
<li role="presentation">
- <a id="navbar-dashboard-btn" href='@routes.UserProfileController.userProfile(user.get.username)' role="menuitem">
+ <a id="navbar-dashboard-btn" role="menuitem" href='@routes.UserProfileController.userProfile(user.get.username)'>
@Messages("navbar.dashboard")
</a>
</li>
@if(user.get.role.getOrElse("") == "Administrator" || user.get.role.getOrElse("") == "Owner") {
<li role="presentation">
- <a id="navbar-admin-btn" href='@routes.AdminController.index' role="menuitem">
+ <a id="navbar-admin-btn" role="menuitem" href='@routes.AdminController.index'>
@Messages("navbar.admin")
</a>
</li>
}
<li role="presentation">
- <a id="navbar-sign-out-btn" href='@routes.UserController.signOut(url.getOrElse("/"))' role="menuitem">@Messages("navbar.signout")</a>
+ <a id="navbar-sign-out-btn" role="button" href='@routes.UserController.signOut(url.getOrElse("/"))'>@Messages("navbar.signout")</a>
</li>
</ul>
} else {
| 3 |
diff --git a/deployment/deploy.sh b/deployment/deploy.sh @@ -32,12 +32,12 @@ fi
echo -en "Extracted Changelog:\n$INSERT\n$CHANGELOG\n"
-cat <<EOF >add.txt
+cat <<EOF >~/add.txt
$CHANGELOG
EOF
# Update CHANGELOG.md
-sed -i '/\#\# \[VERSION\] - unreleased/r add.txt' CHANGELOG.md
+sed -i '/\#\# \[VERSION\] - unreleased/r ~/add.txt' CHANGELOG.md
sed -i -e "s/## \[VERSION\] - unreleased/## [$VERSION] - $DATE/" CHANGELOG.md
perl -i -pe '$_ = "\n## [VERSION] - unreleased\n\n" if $. ==4' CHANGELOG.md
| 2 |
diff --git a/src/js/easymde.js b/src/js/easymde.js @@ -1540,10 +1540,10 @@ function EasyMDE(options) {
// Handle status bar
if (!Object.prototype.hasOwnProperty.call(options, 'status')) {
- if (options.uploadImage) {
- options.status = ['upload-image', 'autosave', 'lines', 'words', 'cursor'];
- } else {
options.status = ['autosave', 'lines', 'words', 'cursor'];
+
+ if (options.uploadImage) {
+ options.status.unshift('upload-image');
}
}
| 7 |
diff --git a/config/logger.js b/config/logger.js @@ -9,7 +9,7 @@ const envVarsSchema = joi.object({
.truthy("true")
.falsy("FALSE")
.falsy("false")
- .default(false),
+ .default(true),
LOGGER_FILE_PATH: joi.string()
.default("./data/app.log"),
LOGGER_FILE_MAX_SIZE: joi.number()
| 12 |
diff --git a/templates/formlibrary/modals/add_training_modal.html b/templates/formlibrary/modals/add_training_modal.html .addClass('has-error');
}
});
+
+ // show quick add modal if quick-modal to true
+ const url = new URL(window.location.href);
+ if (url.searchParams.get('quick-modal')) {
+ $('#addTrainingModal').modal('show');
+ }
});
- $(function() {
- $('#saveTrainingBtn').click(function(e) {
+ var saveTraining = (buttonId) => {
+ $(`#${buttonId}`).click(function (e) {
const formValue = $('#addTrainingForm').serializeArray();
const obj = {};
// reset form
$('#addTrainingForm').trigger('reset');
+ const urlWithoutQueryString = window.location.href.split('?')[0];
+ if (buttonId === 'saveTrainingAndNewBtn') {
+ window.location.replace(`${urlWithoutQueryString}?quick-modal=true`);
+ } else {
setTimeout(() => {
- window.location.reload();
+ window.location.replace(urlWithoutQueryString);
}, 2000);
+ }
},
error: function (xhr, status, error) {
toastr.error(error, 'Failed');
});
}
});
+ }
+
+ $(function () {
+ saveTraining('saveTrainingAndNewBtn');
+ saveTraining('saveTrainingBtn');
});
</script>
<!-- Modal -->
-<div
- class="modal fade"
- id="addTrainingModal"
- tabindex="-1"
- role="dialog"
- aria-labelledby="addTrainingModalLabel"
->
+<div class="modal fade" id="addTrainingModal" tabindex="-1" role="dialog" aria-labelledby="addTrainingModalLabel">
<div class="modal-dialog" role="form">
<div class="modal-content">
<form id="addTrainingForm">
{% csrf_token %}
<div class="modal-header">
- <button
- type="button"
- class="close"
- data-dismiss="modal"
- aria-label="Close"
- >
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
<h4 class="modal-title" id="addTrainingModalLabel">
<option value="{{ item.id }}">{{ item.name }}</option>
{% endif %} {% endfor %}
</select>
- <span id="programHelpBlock" class="help-block hikaya-hide"
- >{{ user.activity_user.level_1_label }} is required</span
- >
+ <span id="programHelpBlock" class="help-block hikaya-hide">{{ user.activity_user.level_1_label }} is
+ required</span>
</div>
<div class="form-group" id="div_training_name">
<label class="control-label" for="trainingName">Name*</label>
- <input
- type="text"
- id="trainingName"
- name="training_name"
- class="form-control"
- placeholder="Name of the training"
- autocomplete="off"
- />
- <span id="nameHelpBlock" class="help-block hikaya-hide"
- >Name is required</span
- >
+ <input type="text" id="trainingName" name="training_name" class="form-control"
+ placeholder="Name of the training" autocomplete="off" />
+ <span id="nameHelpBlock" class="help-block hikaya-hide">Name is required</span>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label for="trainingStart">Start Date</label>
- <input
- type="text"
- name="start_date"
- id="trainingStart"
- class="form-control"
- placeholder="Start Date"
- autocomplete="off"
- />
+ <input type="text" name="start_date" id="trainingStart" class="form-control" placeholder="Start Date"
+ autocomplete="off" />
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label for="trainingEnd">End Date</label>
- <input
- type="text"
- name="end_date"
- id="trainingEnd"
- class="form-control"
- placeholder="End Date"
- autocomplete="off"
- />
+ <input type="text" name="end_date" id="trainingEnd" class="form-control" placeholder="End Date"
+ autocomplete="off" />
</div>
</div>
</div>
<button type="button" class="btn btn-close" data-dismiss="modal">
Close
</button>
+ <button type="button" class="btn btn-outline-success" id="saveTrainingAndNewBtn">
+ Save & New
+ </button>
+
<button type="button" class="btn btn-success" id="saveTrainingBtn">
Save
</button>
| 0 |
diff --git a/test/jasmine/tests/gl2d_plot_interact_test.js b/test/jasmine/tests/gl2d_plot_interact_test.js @@ -833,3 +833,103 @@ describe('@gl Test gl2d plots', function() {
.then(done);
});
});
+
+describe('Test scattergl autorange:', function() {
+ afterEach(destroyGraphDiv);
+
+ describe('should return the same value as SVG scatter for ~small~ data', function() {
+ var specs = [
+ {name: 'lines+markers', fig: require('@mocks/gl2d_10.json')},
+ {name: 'bubbles', fig: require('@mocks/gl2d_12.json')},
+ {name: 'line on log axes', fig: require('@mocks/gl2d_14.json')},
+ {name: 'fill to zero', fig: require('@mocks/gl2d_axes_labels2.json')},
+ {name: 'annotations', fig: require('@mocks/gl2d_annotations.json')}
+ ];
+
+ specs.forEach(function(s) {
+ it('- case ' + s.name, function(done) {
+ var gd = createGraphDiv();
+ var glRangeX;
+ var glRangeY;
+
+ // ensure the mocks have auto-range turned on
+ var glFig = Lib.extendDeep({}, s.fig);
+ Lib.extendDeep(glFig.layout, {xaxis: {autorange: true}});
+ Lib.extendDeep(glFig.layout, {yaxis: {autorange: true}});
+
+ var svgFig = Lib.extendDeep({}, glFig);
+ svgFig.data.forEach(function(t) { t.type = 'scatter'; });
+
+ Plotly.newPlot(gd, glFig).then(function() {
+ glRangeX = gd._fullLayout.xaxis.range;
+ glRangeY = gd._fullLayout.yaxis.range;
+ })
+ .then(function() {
+ return Plotly.newPlot(gd, svgFig);
+ })
+ .then(function() {
+ expect(gd._fullLayout.xaxis.range).toBeCloseToArray(glRangeX, 'x range');
+ expect(gd._fullLayout.yaxis.range).toBeCloseToArray(glRangeY, 'y range');
+ })
+ .catch(fail)
+ .then(done);
+ });
+ });
+ });
+
+ describe('should return the approximative values for ~big~ data', function() {
+ beforeEach(function() {
+ spyOn(ScatterGl, 'plot');
+ });
+
+ // threshold for 'fast' axis expansion routine
+ var N = 1e5;
+ var x = new Array(N);
+ var y = new Array(N);
+ var ms = new Array(N);
+
+ Lib.seedPseudoRandom();
+
+ for(var i = 0; i < N; i++) {
+ x[i] = Lib.pseudoRandom();
+ y[i] = Lib.pseudoRandom();
+ ms[i] = 10 * Lib.pseudoRandom() + 20;
+ }
+
+ it('- case scalar marker.size', function(done) {
+ var gd = createGraphDiv();
+
+ Plotly.newPlot(gd, [{
+ type: 'scattergl',
+ mode: 'markers',
+ x: x,
+ y: y,
+ marker: {size: 10}
+ }])
+ .then(function() {
+ expect(gd._fullLayout.xaxis.range).toBeCloseToArray([-0.02, 1.02], 'x range');
+ expect(gd._fullLayout.yaxis.range).toBeCloseToArray([-0.04, 1.04], 'y range');
+ })
+ .catch(fail)
+ .then(done);
+ });
+
+ it('- case array marker.size', function(done) {
+ var gd = createGraphDiv();
+
+ Plotly.newPlot(gd, [{
+ type: 'scattergl',
+ mode: 'markers',
+ x: x,
+ y: y,
+ marker: {size: ms}
+ }])
+ .then(function() {
+ expect(gd._fullLayout.xaxis.range).toBeCloseToArray([-0.05, 1.05], 'x range');
+ expect(gd._fullLayout.yaxis.range).toBeCloseToArray([-0.11, 1.11], 'y range');
+ })
+ .catch(fail)
+ .then(done);
+ });
+ });
+});
| 0 |
diff --git a/js/plugins/keyShortcuts.js b/js/plugins/keyShortcuts.js (function(){
var SHORTCUTS = {
+ // Map key combination to an ACTION (below)
"Ctrl + `" : "TOGGLE_TERMINAL_EDITOR",
+ "Ctrl + U" : "ICON_DEPLOY"
};
+/* ACTIONS:
+ Are either implemented in `action` function.
+ or `ICON_` prefixed actions, eg `ICON-DEPLOY` will 'click' the relevant icon
+*/
+
var BUILTIN_SHORTCUTS = {
"Ctrl + C / Cmd-C" : "Copy (simple drag and release copies from the Terminal Window)",
"Ctrl + V / Cmd-V" : "Paste",
function init() {
window.addEventListener("keydown",function(e) {
- var key = e.key;
+ var key = (""+e.key).toUpperCase();
if (e.shiftKey) key = "Shift + "+key;
if (e.altKey) key = "Alt + "+key;
if (e.ctrlKey) key = "Ctrl + "+key;
if (e.metaKey) key = "Cmd + "+key;
- //console.log(str);
+ //console.log(key);
var actionName = SHORTCUTS[key];
if (actionName!==undefined) {
console.log("Key Shortcut "+key+" => "+actionName);
}
function action(name, getDescription) {
+ if (name.startsWith("ICON_")) {
+ var iconid = "icon-" + name.substr(5).toLowerCase();
+ var icon = document.getElementById(iconid);
+ if (icon!==null) {
+ if (getDescription) return icon.getAttribute("title");
+ else icon.click();
+ return;
+ }
+ }
switch (name) {
case "TOGGLE_TERMINAL_EDITOR":
if(getDescription) return "Toggle between typing in the Terminal or Code Editor";
| 11 |
diff --git a/packages/idyll-components/src/header.js b/packages/idyll-components/src/header.js @@ -21,6 +21,35 @@ class Header extends React.PureComponent {
</div>
)
}
+ {
+ this.props.authors ? (
+ <div className={'byline'}>
+ By: {
+ this.props.authors.map((author, i) => {
+ if (typeof author === 'string') {
+ return author;
+ }
+ return author.link ? (
+ <span key={author.name}>
+ <a href={author.link} >{author.name}</a>{
+ i < this.props.authors.length -1 ? (
+ i === this.props.authors.length - 2 ? ' and ' : ', ' )
+ : ''}
+ </span>
+ ) : author.name;
+ })
+ }
+ {}
+ </div>
+ ) : null
+ }
+ {
+ this.props.date && (
+ <div className={'idyll-pub-date'}>
+ {this.props.date}
+ </div>
+ )
+ }
</div>
);
| 7 |
diff --git a/packages/openneuro-app/src/scripts/front-page/front-page.jsx b/packages/openneuro-app/src/scripts/front-page/front-page.jsx @@ -22,6 +22,7 @@ import nih from './assets/nih.png'
import nsf from './assets/nsf.png'
import squishymedia from './assets/squishymedia.png'
import stanford from './assets/stanford.png'
+import AuthenticationButtons from '../authentication/buttons.jsx'
// component setup ----------------------------------------------------
@@ -103,25 +104,7 @@ class FrontPage extends Reflux.Component {
_signinForm(loadingState) {
if (!loadingState) {
if (!this.state.users.token) {
- return (
- <span>
- <button className="btn-admin" onClick={userStore.googleSignIn}>
- <i className="icon fa fa-google" />
- Sign in with Google
- </button>
- <button className="btn-admin" onClick={userStore.orcidSignIn}>
- <span className="icon">
- <img
- alt="ORCID"
- width="20"
- height="20"
- src="https://orcid.org/sites/default/files/images/orcid_24x24.png"
- />
- </span>
- Sign in with ORCID
- </button>
- </span>
- )
+ return <AuthenticationButtons />
}
}
}
| 4 |
diff --git a/CHANGELOG.md b/CHANGELOG.md ## 7.9.3 (unreleased)
-### Breaking
-
### Feature
- Added toast notifications for form errors @nzambello @avoinea
- Added italian translations and translated array, token and select widget. @giuliaghisini
-### Bugfix
-
-### Internal
-
## 7.9.2 (2020-08-26)
### Bugfix
| 6 |
diff --git a/articles/dashboard/guides/connections/view-connections.md b/articles/dashboard/guides/connections/view-connections.md @@ -29,5 +29,5 @@ This guide will show you how to view all of the available and configured [connec
- [Set Up Social Connections](/dashboard/guides/connections/set-up-connections-social)
- [Identity Providers Supported by Auth0](/identityproviders)
-- [Create Multiple Tenants](/dashboard/guides/tenants/create-multiple-tenants.md)
+- [Create Multiple Tenants](/dashboard/guides/tenants/create-multiple-tenants)
- [Using Auth0 with Multi-Tenant Applications](/design/using-auth0-with-multi-tenant-apps)
| 1 |
diff --git a/app/controllers/observations_controller.rb b/app/controllers/observations_controller.rb @@ -781,7 +781,7 @@ class ObservationsController < ApplicationController
end
# Convert the params to a hash keyed by ID. Yes, it's weird
- hashed_params = Hash[params[:observations].map do |id, obs|
+ hashed_params = Hash[params[:observations].to_h.map do |id, obs|
instance = @observations.detect{ |o| o.uuid == id || o.id.to_s == id }
instance ? [instance.id.to_s, obs] : nil
end.compact]
| 1 |
diff --git a/lib/jiff-client.js b/lib/jiff-client.js @@ -196,7 +196,7 @@ function JIFFClient(hostname, computation_id, options) {
* @see {@link https://www.npmjs.com/package/libsodium-wrappers}
* @type {?sodium}
*/
- this.sodium_ = options.sodium !== false ? sodium : null;
+ this.sodium_ = options.sodium !== false ? sodium : false;
/**
* A map from party id to public key. Where key is the party id (number), and
| 12 |
diff --git a/app/models/label/LabelTable.scala b/app/models/label/LabelTable.scala @@ -152,7 +152,16 @@ object LabelTable {
case class MiniMapResumeMetadata(labelId: Int, labelType: String, lat: Option[Float], lng: Option[Float])
- implicit val labelMetadataWithValidationConverted = GetResult[LabelMetadataWithValidation](r =>
+ implicit val labelMetadataConverter = GetResult[LabelMetadata](r =>
+ LabelMetadata(
+ r.nextInt, r.nextString, r.nextBoolean, r.nextString, r.nextFloat, r.nextFloat, r.nextInt, r.nextInt, r.nextInt,
+ r.nextInt, r.nextInt, r.nextInt, r.nextString, r.nextString, r.nextTimestampOption, r.nextString, r.nextString,
+ r.nextIntOption, r.nextBoolean, r.nextStringOption,
+ r.nextStringOption.map(tags => tags.split(",").toList).getOrElse(List())
+ )
+ )
+
+ implicit val labelMetadataWithValidationConverter = GetResult[LabelMetadataWithValidation](r =>
LabelMetadataWithValidation(
r.nextInt, r.nextString, r.nextBoolean, r.nextString, r.nextFloat, r.nextFloat, r.nextInt, r.nextInt, r.nextInt,
r.nextInt, r.nextInt, r.nextInt, r.nextString, r.nextString, r.nextTimestampOption, r.nextString, r.nextString,
@@ -419,9 +428,7 @@ object LabelTable {
}
def retrieveLabelMetadata(takeN: Int, userId: String): List[LabelMetadata] = db.withSession { implicit session =>
- val selectQuery = Q.query[(String, Int),(Int, String, Boolean, String, Float, Float, Int, Int, Int, Int, Int,
- Int, String, String, Option[java.sql.Timestamp], String, String, Option[Int], Boolean,
- Option[String])](
+ val selectQuery = Q.query[(String, Int), LabelMetadata](
"""SELECT lb1.label_id,
| lb1.gsv_panorama_id,
| lb1.tutorial,
@@ -441,7 +448,8 @@ object LabelTable {
| lb_big.label_type_desc,
| lb_big.severity,
| lb_big.temp,
- | lb_big.description
+ | lb_big.description,
+ | lb_big.tag_list
|FROM sidewalk.label AS lb1,
| sidewalk.gsv_data,
| sidewalk.audit_task AS at,
@@ -454,12 +462,20 @@ object LabelTable {
| lbt.description AS label_type_desc,
| sev.severity,
| COALESCE(lab_temp.temporary, 'FALSE') AS temp,
- | lab_desc.description
+ | lab_desc.description,
+ | the_tags.tag_list
| FROM label AS lb
| LEFT JOIN sidewalk.label_type AS lbt ON lb.label_type_id = lbt.label_type_id
| LEFT JOIN sidewalk.label_severity AS sev ON lb.label_id = sev.label_id
| LEFT JOIN sidewalk.label_description AS lab_desc ON lb.label_id = lab_desc.label_id
| LEFT JOIN sidewalk.label_temporariness AS lab_temp ON lb.label_id = lab_temp.label_id
+ | LEFT JOIN (
+ | SELECT label_id, array_to_string(array_agg(tag.tag), ',') AS tag_list
+ | FROM sidewalk.label_tag
+ | INNER JOIN sidewalk.tag ON label_tag.tag_id = tag.tag_id
+ | GROUP BY label_id
+ | ) AS the_tags
+ | ON lb.label_id = the_tags.label_id
| ) AS lb_big
|WHERE u.user_id = ?
| AND lb1.deleted = FALSE
@@ -472,7 +488,7 @@ object LabelTable {
|ORDER BY lb1.label_id DESC
|LIMIT ?""".stripMargin
)
- selectQuery((userId, takeN)).list.map(label => labelAndTagsToLabelMetadata(label, getTagsFromLabelId(label._1)))
+ selectQuery((userId, takeN)).list
}
def retrieveSingleLabelMetadata(labelId: Int): LabelMetadataWithValidation = db.withSession { implicit session =>
| 7 |
diff --git a/src/commands/deploy.js b/src/commands/deploy.js @@ -100,7 +100,14 @@ var handleDeployment = function(api, s_appData, s_deploy, s_commitId, quiet) {
Logger.println("Deployment started".bold.blue);
});
- const s_deploymentEnd = s_deploymentEvents.filter(e => e.event === 'DEPLOYMENT_ACTION_END').first();
+ // We ignore cancellation events triggered by a git push, are they are always
+ // generated even though a deployment is not in progress. Since we match events
+ // with commit id in a case of a git push, it makes the program stop before the
+ // actual deployment.
+ const s_deploymentEnd = s_deploymentEvents
+ .filter(e => e.event === 'DEPLOYMENT_ACTION_END')
+ .filter(e => deploymentId || (e.data.state !== 'CANCELLED' || e.data.cause !== 'Git'))
+ .first();
s_deploymentEnd.onValue(function(e) {
if(e.data.state === 'OK') {
| 8 |
diff --git a/src/components/modals/styles.js b/src/components/modals/styles.js @@ -110,8 +110,9 @@ export const UpsellDescription = styled(Description)`
padding: 8px 16px;
margin: 8px 0;
border-radius: 8px;
- background: ${props => props.theme.space.dark};
- color: ${props => props.theme.text.reverse};
+ border: 2px solid ${props => props.theme.success.border};
+ background: ${props => props.theme.success.wash};
+ color: ${props => props.theme.success.default};
a {
color: ${props => props.theme.text.reverse};
| 14 |
diff --git a/src/encoded/schemas/donor.json b/src/encoded/schemas/donor.json "items": {
"type": "string",
"description": "External identifier that uniquely identify the donor of the sample, e.g. for strains it might be a strain identifier at a repository or a de-identified donor ID for a person.",
- "pattern": "^(BDSC:\\d+)$|^(NICHD:\\d+)$|^(CGC:[A-Z]{2,3}[0-9]+)$|^(PGP:hu[A-Z0-9]+)$|^(PromoCell:\\d+)$|^(BioChain:[A-Z0-9-]+)$|^(DSSC:[0-9.-]+)$|^(DGGR:\\d+)$|^(GEO:SAMN\\d+)$|^(MGI.D:[A-Za-z0-9]+)$|^(GTEx:[A-Z0-9-]+)$|^(FlyBase:FBst\\d+)$|^(encode:[a-zA-Z\\d_$.+!*,()'-]+(?:\\s[a-zA-Z\\d_$.+!*,()'-]+)*)$|^(roadmap-epigenomics:[a-zA-Z\\d_$.+!*,()'-]+(?:\\s[a-zA-Z\\d_$.+!*,()'-]+)*)$"
+ "pattern": "^(BDSC:\\d+)$|^(NICHD:\\d+)$|^(CGC:[A-Z]{2,3}[0-9]+)$|^(PGP:hu[A-Z0-9]+)$|^(PromoCell:\\d+)$|^(BioChain:[A-Z0-9-]+)$|^(DSSC:[0-9.-]+)$|^(DGGR:\\d+)$|^(GEO:SAMN\\d+)$|^(MGI.D:[A-Za-z0-9]+)$|^(GTEx:[A-Z0-9-]+)$|^(FlyBase:FBst\\d+)$"
}
},
"alternate_accessions": {
| 2 |
diff --git a/test/jasmine/tests/geo_test.js b/test/jasmine/tests/geo_test.js @@ -1459,11 +1459,13 @@ describe('Test event property of interactions on a geo plot:', function() {
});
describe('Test geo base layers', function() {
+ var gd;
+
+ beforeEach(function() { gd = createGraphDiv(); });
+
afterEach(destroyGraphDiv);
it('should clear obsolete features and layers on *geo.scope* relayout calls', function(done) {
- var gd = createGraphDiv();
-
function _assert(geojson, layers) {
var cd0 = gd.calcdata[0];
var subplot = gd._fullLayout.geo._subplot;
@@ -1518,6 +1520,63 @@ describe('Test geo base layers', function() {
.catch(failTest)
.then(done);
});
+
+ it('should be able to relayout axis grid *tick0* / *dtick*', function(done) {
+ function findGridPath(axisName) {
+ return d3.select(gd).select(axisName + ' > path').attr('d');
+ }
+
+ function first(parts) {
+ return parts[1].split('L')[0].split(',').map(Number);
+ }
+
+ function _assert(msg, exp) {
+ var lonParts = findGridPath('.lonaxis').split('M');
+ var latParts = findGridPath('.lataxis').split('M');
+
+ expect(lonParts.length).toBe(exp.lonCnt, msg + ' - lonaxis grid segments');
+ expect(latParts.length).toBe(exp.latCnt, msg + ' - lataxis grid segments');
+
+ expect(first(lonParts)).toBeCloseToArray(exp.lon0, 1, msg + ' - first lonaxis grid pt');
+ expect(first(latParts)).toBeCloseToArray(exp.lat0, 1, msg + ' - first lataxis grid pt');
+ }
+
+ Plotly.plot(gd, [{type: 'scattergeo'}], {
+ geo: {
+ lonaxis: {showgrid: true},
+ lataxis: {showgrid: true}
+ }
+ })
+ .then(function() {
+ _assert('base', {
+ lonCnt: 12, lon0: [124.99, 369.99],
+ latCnt: 18, lat0: [80, 355]
+ });
+ })
+ .then(function() { return Plotly.relayout(gd, 'geo.lonaxis.tick0', 25); })
+ .then(function() {
+ _assert('w/ lonaxis.tick0:25', {
+ lonCnt: 12, lon0: [117.49, 369.99],
+ latCnt: 18, lat0: [80, 355]
+ });
+ })
+ .then(function() { return Plotly.relayout(gd, 'geo.lataxis.tick0', 41); })
+ .then(function() {
+ _assert('w/ lataxis.tick0:41', {
+ lonCnt: 12, lon0: [117.49, 369.99],
+ latCnt: 19, lat0: [80, 368.5]
+ });
+ })
+ .then(function() { return Plotly.relayout(gd, 'geo.lataxis.dtick', 45); })
+ .then(function() {
+ _assert('w/ lataxis.dtick0:45', {
+ lonCnt: 12, lon0: [117.49, 369.99],
+ latCnt: 5, lat0: [80, 308.5]
+ });
+ })
+ .catch(failTest)
+ .then(done);
+ });
});
describe('Test geo zoom/pan/drag interactions:', function() {
| 0 |
diff --git a/scripts/contractInteraction/mainnet_contracts.json b/scripts/contractInteraction/mainnet_contracts.json "USDT": "0xEf213441a85DF4d7acBdAe0Cf78004E1e486BB96",
"BPro": "0x440cd83c160de5c96ddb20246815ea44c7abbca8",
"RIF": "0x2acc95758f8b5f583470ba265eb685a8f45fc9d5",
+ "MYNT": "0x2e6B1d146064613E8f521Eb3c6e65070af964EbB",
+
"swapNetwork": "0x98aCE08D2b759a265ae326F010496bcD63C15afc",
"ConverterDOC": "0xd715192612F03D20BaE53a5054aF530C9Bb0fA3f",
"ConverterBPRO": "0x26463990196B74aD5644865E4d4567E4A411e065",
"ConverterBNBs": "0x3a36919f1d6729ea8bd2a04f72bd9d5396f7e549",
"ConverterFISH": "0xe731DA93034D769c2045B1ee137D42E1Aa23C18e",
"ConverterRIF": "0x1769044CBa7aD37719badE16Cc71EC3f027b943D",
+ "ConverterMYNT": "0x25B8D024B39174824424f032423E03dd7dcCF044",
+
"(WR)BTC/USDT1": "0x9c4017D1C04cFa0F97FDc9505e33a0D8ac84817F",
"(WR)BTC/USDT2": "0x40580E31cc14DbF7a0859f38Ab36A84262df821D",
"(WR)BTC/DOC1": "0x840437BdE7346EC13B5451417Df50586F4dAF836",
"(WR)BTC/FISH": "0x35A74a38Fd7728F1c6BC39aE3b18C974b7979ddD",
"(WR)BTC/RIF": "0xAE66117C8105a65D914fB47d37a127E879244319",
"(WR)BTC/MYNT": "0x36263Ac99ecdCf1aB20513d580b7d8D32d3c439D",
+
"LiquidityMiningConfigToken": "0x513B0f20027BDc6bc2fE9e28A9d4B40d20730Dca",
"FishPoolOracle": "0x6C58148993bB918347D6d4e0E67EE47903776ab7",
"XUSDPoolOracle": "0x374EE48C4A167E328084b14D0a4B21dB721A7366",
"BNBPoolOracle": "0x4283DE93D21a91D38A39E295E0991F23E0c62941",
"SOVPoolOracle": "0x756d751d09B67d8Fc98be892431926Ff3F70a991",
"RIFPoolOracle": "0xC89A53f2A29169422958AC1b6d9E70Ab422Ef12a",
+ "MYNTPoolOracle": "0x73A520A6a1f4d5696114A6ac32689C6BCFBe765D",
+
"og": "0x81d25201D044f178883599Be1934FF53FDA98acD",
"multisig": "0x924f5ad34698Fd20c90Fe5D5A8A0abd3b42dc711",
"PriceFeeds": "0x437AC62769f386b2d238409B7f0a7596d36506e4",
"StakingRewards": "0x3D6171d73F74e75FC94F93d294fa153128c6B825",
"Watcher": "0x051B89f575fCd540F0a6a5B49c75f9a83BB2Cf07",
- "FastBTC": "0xca1C5B1bc55755C5e3b6Ed1afE88ABD7B26F147f"
+ "FastBTC": "0xca1C5B1bc55755C5e3b6Ed1afE88ABD7B26F147f",
+
+ "MyntMarketMaker": "0x722935ff8a99d801d802bb3ee528408c11c18656",
+ "MyntController": "0xB576658700D32CCE28552349bCD52FaD8173ae32"
}
| 12 |
diff --git a/src/js/core/Tippy.js b/src/js/core/Tippy.js @@ -436,8 +436,12 @@ export function _getEventListeners() {
}
const onBlur = event => {
- if (event.target !== this.reference || !event.relatedTarget || browser.usingTouch) return
+ if (event.target !== this.reference || browser.usingTouch) return
+
+ if (this.options.interactive) {
+ if (!event.relatedTarget) return
if (closest(event.relatedTarget, selectors.POPPER)) return
+ }
_leave.call(this)
}
| 7 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,17 @@ 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.50.1] -- 2019-10-15
+
+### Fixed
+- Guard against mirrored + automargin `anchor:'free'` axes (bug introduced in 1.50.0) [#4273]
+- Fix `streamtube` trace `starts` case when missing a dimension [#4265]
+- Fix `scattergl` performance for drawing legend items of traces with typed arrays [#4268]
+- Fix legend item style for markers with typed array colors [#4268]
+- Do not attempt to re-hover on exiting subplots [#4269]
+- Fix "layout first" transition race condition [#4262]
+
+
## [1.50.0] -- 2019-10-07
### Added
| 3 |
diff --git a/package.json b/package.json "moleculer-repl": "^0.7.3",
"mqtt": "^4.3.7",
"msgpack5": "^6.0.2",
- "nats": "^2.10.2",
+ "nats": "2.7.1",
"node-nats-streaming": "^0.3.2",
"nodemon": "^2.0.20",
"notepack.io": "^3.0.1",
| 13 |
diff --git a/CHANGELOG.md b/CHANGELOG.md -## Next Version
+## v1.6.3
- Dynamically update dark theme when the options change
- Fix #722: added `labelShowResolution` as an option to allow hiding the `[Current data resolution...]` text
- Add support for missing values (`NaN`s) to the 1D heatmap track
- Use the new link format
-_[Detailed changes since v1.6.2](https://github.com/higlass/higlass/compare/v1.6.2...develop)_
+_[Detailed changes since v1.6.2](https://github.com/higlass/higlass/compare/v1.6.2...v1.6.3)_
## v1.6.2
| 3 |
diff --git a/src/stories/Picker.stories.js b/src/stories/Picker.stories.js @@ -21,7 +21,7 @@ const Default = Template.bind({});
Default.args = {
label: 'Default picker',
name: 'Default',
- onChange: () => {},
+ onInputChange: () => {},
items: [
{
label: 'Orange',
@@ -38,7 +38,7 @@ const PickerWithValue = Template.bind({});
PickerWithValue.args = {
label: 'Picker with defined value',
name: 'Picker with defined value',
- onChange: () => {},
+ onInputChange: () => {},
value: 'apple',
items: [
{
@@ -57,7 +57,7 @@ ErrorStory.args = {
label: 'Picker with error',
name: 'PickerWithError',
errorText: 'This field has an error.',
- onChange: () => {},
+ onInputChange: () => {},
items: [
{
label: 'Orange',
@@ -75,7 +75,7 @@ Disabled.args = {
label: 'Picker disabled',
name: 'Disabled',
isDisabled: true,
- onChange: () => {},
+ onInputChange: () => {},
items: [
{
label: 'Orange',
| 10 |
diff --git a/articles/security/bulletins/2020-03-31_wpauth0.md b/articles/security/bulletins/2020-03-31_wpauth0.md @@ -13,7 +13,7 @@ useCase:
- development
---
-# Security Update for WordPress Plugin for Auth0 [wp-auth0](https://github.com/auth0/wp-auth0)
+# Security Update for WordPress Plugin for Auth0
**Published**: March 31, 2020
@@ -23,7 +23,7 @@ useCase:
## Overview
-Auth0 has released a new major version of WordPress Plugin for Auth0 to address several vulnerabilities.
+Auth0 has released a new major version of the [WordPress Plugin for Auth0](https://github.com/auth0/wp-auth0) to address several vulnerabilities.
We recommend you review the following security advisories and upgrade to the new major version:
@@ -39,7 +39,7 @@ Customers using any version of the WordPress Plugin for Auth0 3.11.3 or earlier
## How to fix that?
-Customers using WordPress Plugin for Auth0 need to upgrade to version 4.0.0 or higher.
+Customers using [WordPress Plugin for Auth0](https://github.com/auth0/wp-auth0) need to upgrade to version 4.0.0 or higher.
## Will this update impact my users?
| 2 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.