code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/token-metadata/0x0501E7a02C285B9B520FdBF1BADC74Ae931aD75d/metadata.json b/token-metadata/0x0501E7a02C285B9B520FdBF1BADC74Ae931aD75d/metadata.json "symbol": "WTF",
"address": "0x0501E7a02C285B9B520FdBF1BADC74Ae931aD75d",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/public/locales/nl/audit.json b/public/locales/nl/audit.json "label-shortcuts-obstacle": "Je kunt ook de <kbd>{{key}}</kbd> toets gebruiken voor het selecteren van het Obstakel label.",
"label-shortcuts-surface-problem": "Je kunt ook de <kbd>{{key}}</kbd> toets gebruiken voor het selecteren van het Grond Oppervlakte Probleem label.",
"label-shortcuts-no-sidewalk": "Je kunt ook de <kbd>{{key}}</kbd> toets gebruiken voor het selecteren van het Geen Trottoir label.",
- "label-shortcuts-crosswalk": "Je kunt ook de <kbd>{{key}}</kbd> toets gebruiken voor het selecteren van Crosswalk label.",
- "label-shortcuts-signal": "Je kunt ook de <kbd>{{key}}</kbd> toets gebruiken voor het selecteren van Pedestrian Signal label.",
+ "label-shortcuts-crosswalk": "Je kunt ook de <kbd>{{key}}</kbd> toets gebruiken voor het selecteren van Oversteekplaats label.",
+ "label-shortcuts-signal": "Je kunt ook de <kbd>{{key}}</kbd> toets gebruiken voor het selecteren van Verkeerslicht label.",
"label-shortcuts-occlusion": "Je kunt ook de <kbd>{{key}}</kbd> toets gebruiken voor het selecteren van 'Het trottoir is niet zichtbaar' label.",
"still-stuck": "Als je nog steeds vastzit, klik opnieuw op de Vastgelopen knop.",
"stuck-skipped-street": "We konden geen geschikte plek vinden in deze straat, dus we hebben je naar een nieuwe straat verplaatst."
| 1 |
diff --git a/assets/js/hooks/useChecks.test.js b/assets/js/hooks/useChecks.test.js @@ -25,7 +25,6 @@ import { useChecks } from './useChecks';
describe( 'useChecks', () => {
it( 'should return { complete:true, error: undefined } successful check runs.', async () => {
- muteFetch( /^\/google-site-kit\/v1\/core\/site\/data\/connection/ );
const checks = [ async () => Promise.resolve() ];
let result;
await act( async () => {
| 2 |
diff --git a/packages/frontend/src/components/wallet-migration/modals/MigrateAccountsModal/SelectDestinationWallet.jsx b/packages/frontend/src/components/wallet-migration/modals/MigrateAccountsModal/SelectDestinationWallet.jsx @@ -75,7 +75,7 @@ export const WALLET_OPTIONS = [
id: 'finer-wallet',
name: 'FiNER Wallet',
icon: <img src={ImgFinerWallet} alt="Finer Wallet Logo" />,
- getUrl: ({ hash }) => `finer://wallet.near.org/batch-import#${hash}`,
+ getUrl: ({ hash, networkId }) => `https://finerwallet.io/near-wallet-${networkId}/batch-import#${hash}`,
checkAvailability: () => isMobile('iOS'),
},
];
| 3 |
diff --git a/core/pipeline-driver/package.json b/core/pipeline-driver/package.json {
"name": "pipeline-driver",
"version": "1.1.77",
- "description": "pipeline execution based on producer-consumer",
+ "description": "pipeline execution based on DAG",
"main": "app.js",
"directories": {
"lib": "lib",
| 3 |
diff --git a/src/pages/HomePage/HomeBox.js b/src/pages/HomePage/HomeBox.js @@ -7,6 +7,8 @@ const useStyles = makeStyles(theme => ({
homeboxContainer: {
overflow: 'visible',
padding: '30px 60px',
+ maxWidth: '800px',
+ margin: 'auto',
},
homeboxHeader: {
textAlign: 'center',
| 12 |
diff --git a/src/main/resources/public/js/src/projectSettings/tabViews/bts/btsTabView.js b/src/main/resources/public/js/src/projectSettings/tabViews/bts/btsTabView.js @@ -240,9 +240,9 @@ define(function (require) {
this.stopListening(this.selectIssueType);
this.selectIssueType.destroy();
}
- /*$('[data-js-issue-type-loader]', self.$el).show();*/
+ $('[data-js-issue-type-loader]', self.$el).show();
this.fieldsView && this.fieldsView.destroy();
- /*Service.getBtsTypes(this.model.get('id')).done(function (types) {
+ Service.getBtsTypes(this.model.get('id')).done(function (types) {
var defaultValue = types[0];
var selectItem = _.find(self.model.get('fields'), {
id: 'issuetype'
@@ -262,18 +262,8 @@ define(function (require) {
self.loadDefaultBtsFields();
}).always(function () {
$('[data-js-issue-type-loader]', self.$el).hide();
- });*/
- this.selectIssueType = new DropDownComponent({
- data: [{
- name: 'BUG', value: 'BUG'
- }],
- defaultValue: 'BUG'
});
- $('[data-js-issue-type-select]', self.$el).html(self.selectIssueType.$el);
- self.loadDefaultBtsFields();
-
-
- /*$('[data-js-bts-fields-wrapper]', this.$el).addClass('edit-mode');*/
+ $('[data-js-bts-fields-wrapper]', this.$el).addClass('edit-mode');
},
setupAnchors: function () {
@@ -375,8 +365,7 @@ define(function (require) {
loadDefaultBtsFields: function () {
var self = this;
config.trackingDispatcher.trackEventNumber(409);
- // this.$fieldsLoader.show();
- $('[data-js-issue-type-loader]', self.$el).show();
+ this.$fieldsLoader.show();
this.fieldsView && this.fieldsView.destroy();
this.fieldsView = new BtsFieldsView({
holder: this.$dynamicFieldsWrapper,
@@ -404,7 +393,6 @@ define(function (require) {
self.fieldsView.update(data);
self.$updateFieldsBtn.hide();
- $('[data-js-issue-type-loader]', self.$el).hide();
self.model.fieldsWereSelected() && self.$cancelFieldsBtn.show();
self.$fieldsWrapper.show();
| 13 |
diff --git a/_includes/service-mesh-non-functional.html b/_includes/service-mesh-non-functional.html <th>Open Source</th>
<th>Governance</th>
<th>Primary Language</th>
- <th>Project Announce Date</th>
- <th>GA / 1.0 Date</th>
+ <th>Project Announce</th>
+ <th>GA / 1.0</th>
<th>Commercial Offerings</th>
</tr>
</thead>
| 3 |
diff --git a/tests/unit/specs/store/session.spec.js b/tests/unit/specs/store/session.spec.js @@ -78,6 +78,15 @@ describe(`Module: Session`, () => {
)
})
+ it(`should add user address to previously used addresses array`, () => {
+ let address = {
+ address: `cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9`,
+ sessionType: `explore`
+ }
+ mutations.setUserAddresses(state, address)
+ expect(state.addresses).toEqual(address)
+ })
+
it(`should activate experimental mode`, () => {
mutations.setExperimentalMode(state)
expect(state.experimentalMode).toBe(true)
| 7 |
diff --git a/.travis.yml b/.travis.yml -sudo: false
+sudo: true
+dist: trusty
language: node_js
node_js:
- "6.0.0"
before_script:
- - export CHROME_BIN=chromium-browser
+ - export CHROME_BIN=/usr/bin/google-chrome
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
+ - sudo apt-get install -y libappindicator1 fonts-liberation
+ - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+ - sudo dpkg -i google-chrome*.deb
addons:
firefox: latest
notifications:
| 4 |
diff --git a/packages/feed-fetcher/src/errors/FeedParserError.ts b/packages/feed-fetcher/src/errors/FeedParserError.ts @@ -10,8 +10,8 @@ class FeedParserError extends Error {
* @param message User-friendly error message
* @returns An instance of FeedParserError
*/
- static InvalidFeed(message: string = `That is a not a valid feed. Note that you cannot add just
- any link. You may check if it is a valid feed by using online RSS feed validators`,
+ static InvalidFeed(message: string = 'That is a not a valid feed. Note that you cannot add just' +
+ ' any link. You may check if it is a valid feed by using online RSS feed validators',
) {
return new FeedParserError(message);
}
| 1 |
diff --git a/src/autoComplete.js b/src/autoComplete.js @@ -178,7 +178,7 @@ export default class autoComplete {
// Initialization stage
init() {
// Assign the input field selector
- this.inputField = document.querySelector(this.selector);
+ this.inputField = typeof this.selector === 'string' ? document.querySelector(this.selector) : this.selector();
// Set input field attributes
inputComponent(this);
// Set placeholder attribute value
| 11 |
diff --git a/token-metadata/0x8BA6DcC667d3FF64C1A2123cE72FF5F0199E5315/metadata.json b/token-metadata/0x8BA6DcC667d3FF64C1A2123cE72FF5F0199E5315/metadata.json "symbol": "ALEX",
"address": "0x8BA6DcC667d3FF64C1A2123cE72FF5F0199E5315",
"decimals": 4,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/ReviewQueueHelper.user.js b/ReviewQueueHelper.user.js // @description Keyboard shortcuts, skips accepted questions and audits (to save review quota)
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 1.9.3
+// @version 1.9.4
//
// @include https://*stackoverflow.com/review*
// @include https://*serverfault.com/review*
@@ -237,7 +237,8 @@ async function waitForSOMU() {
}
// Do nothing if a textbox or textarea is focused, unless it's a tilde key - so close dupe dialog has the shortcut
- if($('input:text:focus, textarea:focus').length > 0 && evt.keyCode !== 192) return;
+ // Also ignore single quote key, which triggers dialog close for some reason
+ if(($('input:text:focus, textarea:focus').length > 0 && evt.keyCode !== 192) || (evt.which == "'" || evt.keyCode == 222)) return;
// Is close menu open?
const closeMenu = $('#popup-close-question:visible');
| 8 |
diff --git a/src/article/ArticleLoader.js b/src/article/ArticleLoader.js -import { forEach, platform, getQueryStringParam } from 'substance'
+import { forEach } from 'substance'
import JATSImporter from './converter/JATSImporter'
import ArticleConfigurator from './ArticleConfigurator'
import ArticleModelPackage from './ArticleModelPackage'
@@ -9,15 +9,8 @@ export default {
let configurator = new ArticleConfigurator()
configurator.import(ArticleModelPackage)
let jatsImporter = new JATSImporter()
- // ATTENTION: the defailt policy is now to not support elements that
- // have not been implemented (UnsupportedNode)
- // For evaluation it is possible to provide a query parameter like so:
- // localhost:4000/?allowNotImplemented=true
let importOptions = {
- allowNotImplemented: false
- }
- if (platform.inBrowser) {
- importOptions.allowNotImplemented = getQueryStringParam('allowNotImplemented') === 'true'
+ allowNotImplemented: true
}
let result = jatsImporter.import(xml, importOptions)
if (result.hasErrored) {
| 11 |
diff --git a/app/shared/reducers/blockchains.js b/app/shared/reducers/blockchains.js @@ -273,8 +273,8 @@ const initialState = [...knownChains];
export default function blockchains(state = initialState, action) {
switch (action.type) {
case types.APP_INIT: {
- // When the app initializes, merge any unknown _ids (new chains) into state
- const amendChains = unionBy(state, initialState, '_id');
+ // When the app initializes, merge any unknown chains into state
+ const amendChains = unionBy(state, initialState, 'chainId');
const mergeContracts = _(amendChains).keyBy('chainId')
.merge(_.keyBy(supportedContracts, 'chainId'))
.values().value();
| 4 |
diff --git a/packages/imba/bin/imba-create.imba b/packages/imba/bin/imba-create.imba @@ -27,7 +27,7 @@ const templates = [
['Full Stack', 'Full stack app with backend in Express (Imba bundler)', "base-template"]
['Jamstack', 'Client only application (Vite bundler)', "vite-template"],
# ['Electron', 'Desktop application using Electron (Node)', "electron-template"],
- ['Desktop', 'Desktop application using Tauri (Imba bundler)', "tauri-template"]
+ ['Desktop', 'Desktop application using Tauri (Vite bundler)', "tauri-template"]
].map do([name,hint, urlPart]) {name: name, hint: hint, urlPart: urlPart}
const cli = new class
| 3 |
diff --git a/addon/components/paper-menu/template.hbs b/addon/components/paper-menu/template.hbs <BasicDropdown
+ @disabled={{@disabled}}
@triggerComponent="paper-menu/trigger"
@contentComponent="paper-menu/content"
@calculatePosition={{this.calculatePosition}}
@onClose={{this.close}}
@onOpen={{this.open}}
+ ...attributes
as |dd|>
{{yield (hash
trigger=dd.Trigger
| 11 |
diff --git a/src/server/views/widget/page_tabs.html b/src/server/views/widget/page_tabs.html Right Tabs
#}
+ {# to place right side #}
+ <div class="mr-auto"></div>
+
<!-- presentation -->
{% if not page.isPortal() %}
- <li class="nav-item ml-md-auto">
+ <li class="nav-item">
<a href="?presentation=1" class="nav-link toggle-presentation">
- <i class="icon-film"></i><span class="hidden-xs"> {{ t('Presentation Mode') }}</span>
+ <i class="icon-film"></i><span class="d-none d-md-inline"> {{ t('Presentation Mode') }}</span>
</a>
</li>
{% endif %}
<!-- revision-history -->
- {% if page.isPortal() %}
- <li class="nav-item ml-md-auto">
- {% else %}
<li class="nav-item">
- {% endif %}
<a class="nav-link" href="#revision-history" role="tab" data-toggle="tab">
- <i class="icon-layers"></i><span class="hidden-xs"> {{ t('History') }}</span>
+ <i class="icon-layers"></i><span class="d-none d-md-inline"> {{ t('History') }}</span>
</a>
</li>
| 14 |
diff --git a/test/image/mocks/gl2d_scatter-marker-line-colorscales.json b/test/image/mocks/gl2d_scatter-marker-line-colorscales.json },
{
"type": "scattergl"
+ },
+ {
+ "type": "scattergl",
+ "x": [1,2,3],
+ "y": [2,1,2],
+ "visible": false
+ },
+ {
+ "type": "scattergl",
+ "x": [1,2,3],
+ "y": [2,1,2],
+ "visible": "legendonly"
}
],
"layout": {
| 0 |
diff --git a/src/inner-slider.js b/src/inner-slider.js @@ -172,7 +172,7 @@ export var InnerSlider = createReactClass({
onLazyLoad && slidesToLoad.length > 0 && onLazyLoad(slidesToLoad)
this.setState(state, () => {
asNavFor && asNavFor.innerSlider.state.currentSlide !== currentSlide
- && asnavFor.innerSlider.slideHandler(index)
+ && asNavFor.innerSlider.slideHandler(index)
this.animationEndCallback = setTimeout(() => {
this.setState(nextState, () => {
afterChange && afterChange(state.currentSlide)
| 1 |
diff --git a/conf/messages.en b/conf/messages.en @@ -243,4 +243,4 @@ labeling.guide.occlusion.summary = Occlusion is when you can't see something at
admin.overview.distance = km
-admin.clear.internal.cache = Clear Internal Cache
+admin.clear.internal.cache = Clear Internal Caches
| 3 |
diff --git a/src/events.js b/src/events.js @@ -104,7 +104,7 @@ module.exports = class EditorEvents {
action: 'skip',
text: '',
filename: normalizeDriveLetter(document.fileName),
- selections: [{start: 0, end: 0}],
+ selections: [{start: 0, end: 0, encoding: 'utf-16'}],
editor_version,
plugin_version
}
@@ -125,6 +125,7 @@ module.exports = class EditorEvents {
event.selections = [{
start: document.offsetAt(selection.start),
end: document.offsetAt(selection.end),
+ encoding: 'utf-16',
}];
}
| 12 |
diff --git a/src/index.scss b/src/index.scss $govuk-assets-path: "~govuk-frontend/govuk/assets/";
$govuk-page-width: 1045px;
+$govuk-font-family: "GDS Transport", Arial, sans-serif;
@import "node_modules/govuk-frontend/govuk/all";
body {
margin: 0;
- font-family: "GDS Transport", Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-ononesx-font-smoothing: grayscale;
background-color: #fff;
| 5 |
diff --git a/userscript.user.js b/userscript.user.js @@ -44413,8 +44413,11 @@ var $$IMU_EXPORT$$;
}
function find_source(els) {
+ //console_log(els);
var result = _find_source(els);
+ //console_log(result);
+
if (!result)
return result;
@@ -44427,7 +44430,8 @@ var $$IMU_EXPORT$$;
if (isNaN(thresh))
thresh = 0;
- if (result.width < thresh || result.height < thresh)
+ if ((!isNaN(result.width) && result.width > 0 && result.width < thresh) ||
+ (!isNaN(result.height) && result.height > 0 && result.height < thresh))
return null;
return result;
@@ -44462,11 +44466,10 @@ var $$IMU_EXPORT$$;
if (!style)
break;
- if (style.opacity.toString().match(/^0(?:\.0*)?$/)) {
+ if (style.opacity.toString().match(/^0(?:\.0*)?$/))
return false;
if (style.visibility === "hidden")
return false;
- }
} while (el = el.parentElement);
return true;
@@ -44503,6 +44506,7 @@ var $$IMU_EXPORT$$;
}
function addImage(src, el, options) {
+ //console_log("addImage", el, check_visible(el));
if (settings.mouseover_apply_blacklist && !bigimage_filter(src))
return false;
@@ -44834,6 +44838,8 @@ var $$IMU_EXPORT$$;
layers = newlayers;
}
+ //console_log(deepcopy(layers));
+
rebuildlayers();
// If there are background images ahead of an image, it's likely to be masks
@@ -44887,7 +44893,8 @@ var $$IMU_EXPORT$$;
if (current_el.tagName === stack[0]) {
if (stack.length === 1) {
- if (valid_source(current_el))
+ //if (valid_source(current_el))
+ if (is_valid_el(current_el))
return current_el;
continue;
}
@@ -45076,7 +45083,8 @@ var $$IMU_EXPORT$$;
prev.push(el);
var rect = el.getBoundingClientRect();
- if (rect.left <= xy[0] && rect.right >= xy[0] &&
+ if (rect && rect.width > 0 && rect.height > 0 &&
+ rect.left <= xy[0] && rect.right >= xy[0] &&
rect.top <= xy[1] && rect.bottom >= xy[1] &&
ret.indexOf(el) < 0) {
ret.push(el);
@@ -45098,6 +45106,39 @@ var $$IMU_EXPORT$$;
return ret;
}
+ function find_els_at_el(el) {
+ return [el];
+
+ var rect = el.getBoundingClientRect();
+ //console.log("find_els_at_el", el, rect);
+ if (rect && rect.width > 0 && rect.height > 0) {
+ var point = [rect.left + rect.width / 2, rect.top + rect.height / 2];
+ var pointels = find_els_at_point(point);
+
+ // ensure el is the first element
+ var index = pointels.indexOf(el);
+ if (index > 0) {
+ pointels.splice(index, 1);
+ }
+
+ if (pointels.indexOf(el) < 0)
+ pointels.unshift(el);
+
+ var newels = [];
+
+ for (var i = 0; i < pointels.length; i++) {
+ if (!is_popup_el(pointels[i]))
+ newels.push(pointels[i]);
+ }
+
+ //console.log("find_els_at_el", newels);
+
+ return newels;
+ }
+
+ return [el];
+ }
+
function trigger_popup(is_contextmenu) {
controlPressed = true;
delay_handle_triggering = true;
| 1 |
diff --git a/animal.js b/animal.js @@ -18,6 +18,7 @@ const animalShader = {
uniform vec4 headRotation;
uniform float walkFactor;
uniform float walkCycle;
+ uniform float hitFactor;
varying vec3 vColor;
vec4 quat_from_axis_angle(vec3 axis, float angle)
@@ -42,6 +43,7 @@ const animalShader = {
void main() {
vec3 p = position;
+ p.y += sin(hitFactor*PI);
if (head.y != 0.) {
// p = vec3(0.);
p -= head.xyz;
@@ -59,12 +61,12 @@ const animalShader = {
precision highp float;
precision highp int;
- uniform float isHit;
+ uniform float hitFactor;
varying vec3 vColor;
void main() {
gl_FragColor = vec4(vColor, 1.0);
- if (isHit > 0.) {
+ if (hitFactor > 0.) {
gl_FragColor.rgb += vec3(${new THREE.Color(0xef5350).toArray().map(n => n.toFixed(8)).join(', ')});
}
}
@@ -89,7 +91,7 @@ export const makeAnimalFactory = (geometryWorker, physxWorker) => (position, has
value: 0,
needsUpdate: true,
},
- isHit: {
+ hitFactor: {
type: 'f',
value: 0,
needsUpdate: true,
@@ -163,14 +165,11 @@ export const makeAnimalFactory = (geometryWorker, physxWorker) => (position, has
hitAnimation = {
update() {
const now = Date.now();
- const factor = (now - startTime) / (endTime - startTime);
- if (factor < 1) {
- material.uniforms.isHit.value = 1;
- } else {
- material.uniforms.isHit.value = 0;
+ material.uniforms.hitFactor.value = (now - startTime) / (endTime - startTime);
+ if (material.uniforms.hitFactor.value >= 1) {
hitAnimation = null;
}
- material.uniforms.isHit.needsUpdate = true;
+ material.uniforms.hitFactor.needsUpdate = true;
},
};
} else {
| 0 |
diff --git a/src/Data.js b/src/Data.js @@ -196,7 +196,7 @@ CM.ConfigData.DragonAuraInfo = {type: 'bool', group: 'Tooltip', label: ['Extra D
// Statistics
CM.ConfigData.Stats = {type: 'bool', group: 'Statistics', label: ['Statistics OFF', 'Statistics ON'], desc: 'Extra Cookie Monster statistics!', toggle: true};
CM.ConfigData.MissingUpgrades = {type: 'bool', group: 'Statistics', label: ['Missing Upgrades OFF', 'Missing Upgrades ON'], desc: 'Shows Missing upgrades in Stats Menu. This feature can be laggy for users with a low amount of unlocked achievements.', toggle: true};
-CM.ConfigData.MissingAchievements = {type: 'bool', group: 'Statistics', label: ['Show Normal Missing Achievements', 'Show Shadow Missing Achievements', 'Show All Missing Achievements', 'Hide Missing Achievements'], desc: 'Shows Missing normal or shadow achievements in Stats Menu.', toggle: false};
+CM.ConfigData.MissingAchievements = {type: 'bool', group: 'Statistics', label: ['Missing Normal Achievements ON', 'Missing Shadow Achievements ON', 'All Missing Achievements ON', 'Missing Achievements OFF'], desc: 'Shows Missing normal or shadow achievements in Stats Menu.', toggle: false};
CM.ConfigData.UpStats = {type: 'bool', group: 'Statistics', label: ['Statistics Update Rate (Default)', 'Statistics Update Rate (1s)'], desc: 'Default Game rate is once every 5 seconds', toggle: false};
CM.ConfigData.TimeFormat = {type: 'bool', group: 'Statistics', label: ['Time XXd, XXh, XXm, XXs', 'Time XX:XX:XX:XX:XX'], desc: 'Change the time format', toggle: false};
CM.ConfigData.DetailedTime = {type: 'bool', group: 'Statistics', label: ['Detailed Time OFF', 'Detailed Time ON'], desc: 'Change how time is displayed in certain statistics and tooltips', toggle: true, func: function() {CM.Disp.ToggleDetailedTime();}};
| 10 |
diff --git a/source/drag/Drag.js b/source/drag/Drag.js @@ -225,7 +225,7 @@ const Drag = Class({
}
} else {
dragCursor = this._dragCursor = el('div', {
- style: 'position: fixed; z-index: 9999;',
+ style: 'position: fixed; z-index: 9999; pointer-events: none',
});
this._updateDragImagePosition();
document.body.appendChild(dragCursor);
| 0 |
diff --git a/layouts/partials/fragments/pricing.html b/layouts/partials/fragments/pricing.html </div>
{{- end }}
<div class="row">
+ {{- if eq (len $items) 0 -}}
+ {{- partial "helpers/empty-subpath.html" (dict "context" "pricing" "root" $) -}}
+ {{- end -}}
{{- range (sort $items ".Params.weight") }}
<div class="col-lg-4 col-md-6 col-12 py-2 pricing-plan {{- if .Params.highlight }} pricing-plan-highlight {{- end -}}">
<div class="card">
| 0 |
diff --git a/package.json b/package.json "build": "npm run clean && npm run build-server",
"test": "npm run eslint && npm run mocha",
"eslint": "eslint src/. test/. --config .eslintrc.json",
- "testrpc": "mkdirp data/testrpc && node node_modules/ganache-cli/build/cli.node.js -d --gasLimit 6700000 --db data/testrpc --port 8546",
+ "testrpc": "mkdirp data/testrpc && node node_modules/ganache-cli/build/cli.node.js -d --gasLimit 6700000 --db data/testrpc --port 8546 -b 5",
"start": "babel-watch src",
"serve": "npm run build && pm2 startOrRestart ecosystem.config.js --env production",
"serve-restart": "npm run build && pm2 startOrRestart ecosystem.config.js --env production",
| 12 |
diff --git a/src/index.html b/src/index.html <script crossorigin src="https://unpkg.com/react-dom@16/umd/react-dom.production.min.js"></script>
<script src="https://unpkg.com/prop-types/prop-types.min.js"></script>
<!-- include libphonenumber.js just for example page -->
- <script src="https://raw.githack.com/patw0929/libphonenumber-js-utils/master/dist/libphonenumber.js"></script>
+ <script src="https://unpkg.com/[email protected]/dist/libphonenumber.js"></script>
<!--[if gte IE 9]><!-->
<script>hljs.initHighlightingOnLoad();</script>
<!--<![endif]-->
| 1 |
diff --git a/addon/helpers/t.js b/addon/helpers/t.js @@ -7,9 +7,9 @@ import { assert } from '@ember/debug';
import BaseHelper from './-format-base';
export default BaseHelper.extend({
- format(value, options) {
- assert('[ember-intl] translation lookup attempted but no translation key was provided.', value);
+ format(key, options) {
+ assert('[ember-intl] translation lookup attempted but no translation key was provided.', key);
- return this.intl.t(value, options);
+ return this.intl.t(key, options);
}
});
| 10 |
diff --git a/test/FeePool.js b/test/FeePool.js @@ -1346,46 +1346,4 @@ contract('FeePool', async accounts => {
assert.bnEqual(vestingScheduleEntry[1], escrowAmount);
});
});
-
- describe('Recover sUSD at 0xFEE address', async () => {
- beforeEach(async () => {
- // Issue 10,000 sUSD.
- await synthetix.issueSynths(sUSD, toUnit('10000'), { from: owner });
- });
- it('should revert if non owner calls', async () => {
- await assert.revert(feePool.recoverTransferFees({ from: account3 }));
- });
-
- it('should revert if no tokens', async () => {
- await assert.revert(feePool.recoverTransferFees({ from: owner }));
- });
-
- it('should recover sUSD at 0xFEEFEE address when called by owner', async () => {
- const sUSDAmount = toUnit('2900');
-
- // send FEE_ADDRESS some sUSD
- await sUSDContract.methods['transfer(address,uint256)'](FEE_ADDRESS, sUSDAmount, {
- from: owner,
- });
-
- const feesUSDBalanceBefore = await sUSDContract.balanceOf(FEE_ADDRESS);
- // console.log('feesUSDBalanceBefore', feesUSDBalanceBefore.toString());
- assert.bnEqual(feesUSDBalanceBefore, sUSDAmount);
-
- await feePool.recoverTransferFees({ from: owner });
-
- // Assert FEE_ADDRESS balance is 0
- const feesUSDBalance = await sUSDContract.balanceOf(FEE_ADDRESS);
- assert.bnEqual(feesUSDBalance, 0);
-
- // Assert Fees recorded
- const xdrAmount = await synthetix.effectiveValue(sUSD, sUSDAmount, XDR);
- assert.deepEqual(await feePool.recentFeePeriods(0), {
- feePeriodId: 1,
- startingDebtIndex: 0,
- feesToDistribute: xdrAmount,
- feesClaimed: 0,
- });
- });
- });
});
| 2 |
diff --git a/ducks/articleDetail.js b/ducks/articleDetail.js @@ -450,7 +450,9 @@ export default createReducer(
article: edge
.get('node')
.remove('replyConnections'),
- reply: conn.get('reply'),
+ reply: conn
+ .get('reply')
+ .set('createdAt', conn.get('createdAt')),
})
)
.filter(articleAndReply => {
| 1 |
diff --git a/html/base/inputs/Text.stories.js b/html/base/inputs/Text.stories.js @@ -27,14 +27,7 @@ export const textInput = () => `
id="text-input"
data-id="text-input"
type="text"
- value=""
- aria-describedby="text-input--error-container"
>
-
- <div
- class="sprk-b-ErrorContainer"
- id="text-input--error-container"
- ></div>
</div>
`;
@@ -56,7 +49,6 @@ export const invalidTextInput = () => `
id="text-input"
data-id="text-input"
type="text"
- value=""
aria-invalid="true"
aria-describedby="text-input--error-container"
>
@@ -68,6 +60,7 @@ export const invalidTextInput = () => `
<svg
class="sprk-c-Icon sprk-b-ErrorIcon"
viewBox="0 0 64 64"
+ aria-hidden="true"
>
<use xlink:href="#exclamation-filled" />
</svg>
@@ -96,15 +89,8 @@ export const disabledTextInput = () => `
id="text-input"
data-id="text-input"
type="text"
- value=""
- aria-describedby="text-input--error-container"
disabled
>
-
- <div
- class="sprk-b-ErrorContainer"
- id="text-input--error-container"
- ></div>
</div>
`;
@@ -125,7 +111,6 @@ export const hugeTextInput = () => {
id="text-input-huge"
data-id="text-input-huge"
type="text"
- aria-describedby="text-input-huge--error-container"
placeholder="Placeholder"
>
@@ -135,11 +120,6 @@ export const hugeTextInput = () => {
>
Text Input Label
</label>
-
- <div
- class="sprk-b-ErrorContainer"
- id="text-input-huge--error-container"
- ></div>
</div>
`;
};
@@ -186,6 +166,7 @@ export const invalidHugeTextInput = () => {
<svg
class="sprk-c-Icon sprk-b-ErrorIcon"
viewBox="0 0 64 64"
+ aria-hidden="true"
>
<use xlink:href="#exclamation-filled" />
</svg>
@@ -217,7 +198,6 @@ export const disabledHugeTextInput = () => {
id="text-input-huge"
data-id="text-input-huge"
type="text"
- aria-describedby="text-input-huge--error-container"
placeholder="Placeholder"
disabled
>
@@ -228,11 +208,6 @@ export const disabledHugeTextInput = () => {
>
Text Input Label
</label>
-
- <div
- class="sprk-b-ErrorContainer"
- id="text-input-huge--error-container"
- ></div>
</div>
`;
};
| 3 |
diff --git a/tools/subgraph/AirSwap.postman.json b/tools/subgraph/AirSwap.postman.json "body": {
"mode": "graphql",
"graphql": {
- "query": "{\n users {\n id\n authorizedSigners {\n id\n }\n authorizedSenders {\n id\n }\n executedOrders\n cancelledNonces\n }\n executedOrders {\n id\n signer {\n id\n }\n sender {\n id\n }\n swap {\n id\n }\n }\n}",
+ "query": "{\n users {\n id\n authorizedSigners {\n id\n }\n authorizedSenders {\n id\n }\n cancelledNonces\n }\n swaps {\n id\n signer {\n id\n }\n sender {\n id\n }\n swap {\n id\n }\n }\n}",
"variables": ""
}
},
"body": {
"mode": "graphql",
"graphql": {
- "query": "{\n users {\n id\n authorizedSigners {\n id\n }\n authorizedSenders {\n id\n }\n executedOrders\n cancelledNonces\n }\n executedOrders {\n id\n signer {\n id\n }\n sender {\n id\n }\n swap {\n id\n }\n }\n}",
+ "query": "{\n users {\n id\n authorizedSigners {\n id\n }\n authorizedSenders {\n id\n }\n cancelledNonces\n }\n swaps {\n id\n signer {\n id\n }\n sender {\n id\n }\n swap {\n id\n }\n }\n}",
"variables": ""
}
},
"body": {
"mode": "graphql",
"graphql": {
- "query": "{\n tokens {\n id\n isBlacklisted\n }\n indexers {\n id\n }\n indexContracts {\n id\n indexer {\n id\n }\n signerToken {\n id\n }\n senderToken {\n id\n }\n protocol\n }\n stakedAmounts {\n id\n indexer {\n id\n }\n signerToken {\n id\n }\n senderToken {\n id\n }\n staker {\n id\n }\n protocol\n stakeAmount\n }\n locators {\n id\n owner {\n id\n }\n index {\n id\n }\n score\n locator\n }\n}",
+ "query": "{\n tokens {\n id\n isBlacklisted\n }\n indexers {\n id\n }\n indexes {\n id\n indexer {\n id\n }\n signerToken {\n id\n }\n senderToken {\n id\n }\n protocol\n }\n stakes {\n id\n indexer {\n id\n }\n signerToken {\n id\n }\n senderToken {\n id\n }\n staker {\n id\n }\n protocol\n stakeAmount\n }\n locators {\n id\n owner {\n id\n }\n index {\n id\n }\n score\n locator\n }\n}",
"variables": ""
}
},
"body": {
"mode": "graphql",
"graphql": {
- "query": "{\n tokens {\n id\n isBlacklisted\n }\n indexers {\n id\n }\n indexContracts {\n id\n indexer {\n id\n }\n signerToken {\n id\n }\n senderToken {\n id\n }\n protocol\n }\n stakedAmounts {\n id\n indexer {\n id\n }\n signerToken {\n id\n }\n senderToken {\n id\n }\n staker {\n id\n }\n protocol\n stakeAmount\n }\n locators {\n id\n owner {\n id\n }\n index {\n id\n }\n score\n locator\n }\n}",
+ "query": "{\n tokens {\n id\n isBlacklisted\n }\n indexers {\n id\n }\n indexes {\n id\n indexer {\n id\n }\n signerToken {\n id\n }\n senderToken {\n id\n }\n protocol\n }\n stakes {\n id\n indexer {\n id\n }\n signerToken {\n id\n }\n senderToken {\n id\n }\n staker {\n id\n }\n protocol\n stakeAmount\n }\n locators {\n id\n owner {\n id\n }\n index {\n id\n }\n score\n locator\n }\n}",
"variables": ""
}
},
"body": {
"mode": "graphql",
"graphql": {
- "query": "{\n delegateFactories {\n id\n }\n delegateContracts {\n id\n factory {\n id\n }\n swap {\n id\n }\n indexer {\n id\n }\n owner {\n id\n }\n tradeWallet\n }\n rules {\n id\n delegate {\n id\n }\n owner {\n id\n }\n signerToken {\n id\n }\n senderToken {\n id\n }\n maxSenderAmount\n priceCoef\n priceExp\n }\n}",
+ "query": "{\n delegateFactories {\n id\n }\n delegates {\n id\n factory {\n id\n }\n swap {\n id\n }\n indexer {\n id\n }\n owner {\n id\n }\n tradeWallet\n }\n rules {\n id\n delegate {\n id\n }\n owner {\n id\n }\n signerToken {\n id\n }\n senderToken {\n id\n }\n maxSenderAmount\n priceCoef\n priceExp\n }\n}",
"variables": ""
},
"options": {
"body": {
"mode": "graphql",
"graphql": {
- "query": "{\n delegateFactories {\n id\n }\n delegateContracts {\n id\n factory {\n id\n }\n swap {\n id\n }\n indexer {\n id\n }\n owner {\n id\n }\n tradeWallet\n }\n rules {\n id\n delegate {\n id\n }\n owner {\n id\n }\n signerToken {\n id\n }\n senderToken {\n id\n }\n maxSenderAmount\n priceCoef\n priceExp\n }\n}",
+ "query": "{\n delegateFactories {\n id\n }\n delegates {\n id\n factory {\n id\n }\n swap {\n id\n }\n indexer {\n id\n }\n owner {\n id\n }\n tradeWallet\n }\n rules {\n id\n delegate {\n id\n }\n owner {\n id\n }\n signerToken {\n id\n }\n senderToken {\n id\n }\n maxSenderAmount\n priceCoef\n priceExp\n }\n}",
"variables": ""
},
"options": {
| 3 |
diff --git a/packages/bitcore-node/src/modules/ethereum/api/csp.ts b/packages/bitcore-node/src/modules/ethereum/api/csp.ts @@ -16,6 +16,7 @@ import { ERC20Abi } from '../abi/erc20';
import { Transaction } from 'web3/eth/types';
import { EventLog } from 'web3/types';
import { EthP2pWorker } from '../p2p';
+import { partition } from '../../../utils/partition';
interface ERC20Transfer extends EventLog {
returnValues: {
@@ -349,6 +350,26 @@ export class ETHStateProvider extends InternalStateProvider implements CSP.IChai
return txs.sort((tx1, tx2) => tx1.blockNumber! - tx2.blockNumber!);
}
+ async updateCoins(params: CSP.UpdateWalletParams) {
+ const { addresses, wallet, chain, network } = params;
+ for (const addressBatch of partition(addresses, 1000)) {
+ await Promise.all([
+ EthTransactionStorage.collection.updateMany(
+ { chain, network, to: { $in: addressBatch } },
+ { $addToSet: { wallets: wallet._id } }
+ ),
+ EthTransactionStorage.collection.updateMany(
+ { chain, network, from: { $in: addressBatch } },
+ { $addToSet: { wallets: wallet._id } }
+ )
+ ]);
+ await WalletAddressStorage.collection.updateMany(
+ { chain, network, wallet: wallet._id, address: { $in: addressBatch } },
+ { $set: { processed: true } }
+ );
+ }
+ }
+
async estimateGas(params): Promise<Number> {
const { network, from, to, value, data, gasPrice } = params;
const gasLimit = await this.getWeb3(network).eth.estimateGas({ from, to, value, data, gasPrice });
| 3 |
diff --git a/blocks/init/src/Blocks/components/accordion/accordion.php b/blocks/init/src/Blocks/components/accordion/accordion.php @@ -49,6 +49,7 @@ $accordionPanelClass = Components::classnames([
$accordionContentClass = Components::selector($componentClass, $componentClass, 'content');
$uniqueAccordionId = Components::getUnique();
+$uniqueAccordionTriggerId = Components::getUnique();
?>
<div
@@ -61,6 +62,7 @@ $uniqueAccordionId = Components::getUnique();
aria-label="<?php echo esc_html($accordionTitle); ?>"
aria-controls="<?php echo \esc_attr($uniqueAccordionId); ?>"
aria-expanded="<?php echo \esc_attr($accordionIsOpen ? 'true' : 'false'); ?>"
+ id="<?php echo \esc_attr($uniqueAccordionTriggerId); ?>"
>
<?php echo \esc_html($accordionTitle); ?>
<div class="<?php echo \esc_attr($accordionIconClass); ?>" aria-hidden="true" >
@@ -72,6 +74,7 @@ $uniqueAccordionId = Components::getUnique();
role="region"
class="<?php echo \esc_attr($accordionPanelClass); ?>"
aria-hidden="<?php echo \esc_attr($accordionIsOpen ? 'false' : 'true'); ?>"
+ aria-labelledby="<?php echo \esc_attr($uniqueAccordionTriggerId); ?>"
id="<?php echo esc_attr($uniqueAccordionId); ?>"
>
<div class="<?php echo \esc_attr($accordionContentClass); ?>">
| 7 |
diff --git a/src/stories/2-components/15-Charts.stories.js b/src/stories/2-components/15-Charts.stories.js @@ -3,7 +3,7 @@ import React from 'react'
import AreaChart from '../../components/charts/area-chart'
import BarChart from '../../components/charts/bar-chart'
-import { parseDate } from '../../pages/dashboard/_utils'
+import { parseDate } from '../../utilities/visualization'
import usDaily from '../../../_data/v1/us/daily.json'
| 1 |
diff --git a/detox/src/devices/AndroidDriver.js b/detox/src/devices/AndroidDriver.js const {spawn} = require('child_process');
-const path = require('path');
const fs = require('fs');
const _ = require('lodash');
const log = require('npmlog');
@@ -15,16 +14,19 @@ const EspressoDetox = 'com.wix.detox.espresso.EspressoDetox';
class AndroidDriver extends DeviceDriverBase {
constructor(client) {
super(client);
- const expect = require('../android/expect');
- expect.exportGlobals();
+ this.expect = require('../android/expect');
this.invocationManager = new InvocationManager(client);
- expect.setInvocationManager(this.invocationManager);
+ this.expect.setInvocationManager(this.invocationManager);
this.adb = new ADB();
this.aapt = new AAPT();
this.apkPath = new APKPath();
}
+ exportGlobals() {
+ this.expect.exportGlobals();
+ }
+
async getBundleIdFromBinary(apkPath) {
return await this.aapt.getPackageName(apkPath);
}
| 1 |
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js @@ -619,7 +619,7 @@ function buildOptimisticChatReport(
lastMessageTimestamp: 0,
lastVisitedTimestamp: 0,
maxSequenceNumber: 0,
- notificationPreference: '',
+ notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.DAILY,
oldPolicyName,
ownerEmail,
participants: participantList,
| 12 |
diff --git a/apps/planetarium/planetarium.app.js b/apps/planetarium/planetarium.app.js @@ -83,7 +83,6 @@ function drawStars(lat,lon,date){
for (i=0;i<f.length;i++)
{
if (f[i]=='\n'){
- var start = new Date().getTime();
starNumber++;
//console.log("Line from "+linestart.toString()+"to "+(i-1).toString());
line = f.substr(linestart,i-linestart);
@@ -99,8 +98,6 @@ function drawStars(lat,lon,date){
var dec = Math.asin(Math.sin(theta) * Math.cos(starDE) * Math.cos(starRA + zeta) + Math.cos(theta) * Math.sin(starDE));
var ascen = Math.atan2(Math.cos(starDE) * Math.sin(starRA + zeta), Math.cos(theta) * Math.cos(starDE) * Math.cos(starRA + zeta) - Math.sin(theta) * Math.sin(starDE)) + z;
var H = siderealTime(julianDay) - longitude - ascen;
- //var end = new Date().getTime();
- //console.log("Call to doSomething took " + (end - start) + " milliseconds.");
//Compute altitude
var alt = Math.asin(Math.sin(latitude) * Math.sin(dec) + Math.cos(latitude) * Math.cos(dec) * Math.cos(H));
if(alt >= 0)
@@ -136,7 +133,6 @@ function drawStars(lat,lon,date){
Bangle.setGPSPower(1);
var gps = { fix : 0};
-var gpsCount = 0;
var prevSats = 0;
g.clear();
@@ -147,7 +143,6 @@ g.setFontAlign(0,0);
Bangle.on('GPS',function(gp) {
date = new Date();
gps = gp;
- gpsCount++;
if (gp.fix) {
lat = gp.lat;
lon = gp.lon;
| 1 |
diff --git a/.storybook/addons.js b/.storybook/addons.js import '@storybook/addon-actions/register';
import '@storybook/addon-knobs/register';
import '@storybook/addon-notes/register';
+import '@storybook/addon-viewport/manager';
import '@storybook/addon-a11y/register';
\ No newline at end of file
-import '@storybook/addon-viewport/register';
\ No newline at end of file
| 13 |
diff --git a/src/modules/ui/directives/anyTransactionForm/any-tx-form.html b/src/modules/ui/directives/anyTransactionForm/any-tx-form.html required
class="large"></w-input>
- <w-input-error name="required">
+ <w-input-error message="required">
<span w-i18n="directives.anyTransaction.errors.invalidScript"></span>
</w-input-error>
- <w-input-error name="custom">
+ <w-input-error message="custom">
<span w-i18n="directives.anyTransaction.errors.invalidScript"></span>
</w-input-error>
</w-input-container>
| 1 |
diff --git a/en/option/component/grid.md b/en/option/component/grid.md @@ -31,10 +31,10 @@ Whether the grid region contains [axis tick label](~yAxis.axisLabel) of axis.
+ When containLabel is `false`:
+ `grid.left` `grid.right` `grid.top` `grid.bottom` `grid.width` `grid.height` decide the location and size of the rectangle that is made of by xAxis and yAxis.
- + Setting to `false` will helps when multiple gris need to be align at their axes.
+ + Setting to `false` will help when multiple grids need to be aligned at their axes.
+ When containLabel is `true`:
- + `grid.left` `grid.right` `grid.top` `grid.bottom` `grid.width` `grid.height` decide the location and size of the rectangle that is not only contains axes but also contains labels of those axes.
- + Setting to `true` will helps when the length of axis labels is dynamic and is hard to approximate to avoid them overflowing the container or overlapping other components.
+ + `grid.left` `grid.right` `grid.top` `grid.bottom` `grid.width` `grid.height` decide the location and size of the rectangle that contains the axes and the labels of the axes.
+ + Setting to `true` will help when the length of axis labels is dynamic and is hard to approximate. This will avoid labels from overflowing the container or overlapping other components.
{{ use:partial-component-common-style(componentName="grid", prefix='#', needShow=true) }}
| 7 |
diff --git a/token-metadata/0xE477292f1B3268687A29376116B0ED27A9c76170/metadata.json b/token-metadata/0xE477292f1B3268687A29376116B0ED27A9c76170/metadata.json "symbol": "PLAY",
"address": "0xE477292f1B3268687A29376116B0ED27A9c76170",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml @@ -115,6 +115,7 @@ jobs:
echo ::set-env name=CXX::g++
echo ::set-env name=CXX_COMPILER::g++
echo ::set-env name=LINKER::g++
+ echo ::set-env name=GITHUB::true
timeout-minutes: 1
# Configure the virtual display server (needed for electron):
| 12 |
diff --git a/README.md b/README.md @@ -54,13 +54,14 @@ $ cd Activity
or similar.
-## Install virtualenv
+## Setting up on Virtual Environment
+### Install virtualenv
```bash
$ pip install virtualenv
```
-## Create virtualenv
+### Create virtualenv
```bash
$ virtualenv --no-site-packages <myvirtualenvironmentname>
@@ -69,19 +70,19 @@ $ virtualenv --no-site-packages <myvirtualenvironmentname>
- use no site packages to prevent virtualenv from seeing your global packages
- . <myvirtualenvironmentname>/bin/activate allows us to just use pip from the command-line by adding to the path rather then full path.
-## Activate virtualenv
+### Activate virtualenv
```bash
$ source <myvirtualenvironmentname>/bin/activate
```
-## Install requirements
+### Install requirements
```bash
$ pip install -r requirements.txt
```
-## Create local copy of config file
+### Create local copy of config file
Copy the example config:
@@ -89,7 +90,7 @@ Copy the example config:
$ cp activity/settings/local-sample.py activity/settings/local.py
```
-## Modify the config file
+### Modify the config file
Edit database settings activity/settings/local.py as shown below.
@@ -110,19 +111,19 @@ Since postgres is the preferred database for this project, we have provided extr
56 'PORT': os.environ.get('ACTIVITY_CE_DB_PORT', ''),
```
-## Set up DB
+### Set up DB
```bash
$ python manage.py migrate
```
-## Create super user (first time only)
+### Create super user (first time only)
```bash
$ python manage.py createsuperuser
```
-# Run the app locally
+### Run the app locally
If you're using more then one settings file change manage.py to point to local or dev file first.
@@ -132,12 +133,43 @@ $ python manage.py runserver
This will run the server on http://127.0.0.1:8000. You can configure the host and port as needed.
-# Create an activity user
+### Create an activity user
Once you have created your user account, you need to create an `activity user` that is linked to this user account.
Go to http://127.0.0.1:8000/admin and sign in using your superuser account. Under the `workflow` model, you'll find `activity user`. Create a new activity user making sure you associate your user under the `user` attribute.
+## Set up locally using Docker
+Ensure docker is installed on your local computer!
+
+### Build the docker image
+```bash
+$ docker-compose build
+```
+
+### Run the container
+```bash
+$ docker-compose up
+```
+you can add the `-d` flag to run the container in detached mode
+
+### Run and Build at the same time
+```bash
+$ docker-compose up -d --build
+
+```
+
+### Create Superuser
+```bash
+$ docker-compose exec web python manage.py createsuperuser
+```
+
+### To run any other django commands
+```bash
+$ docker-compose exec web python manage.py [operation]
+```
+The `operation` in this case can be: `makemigrations`, `migrate`, `collectstatic` etc
+
# Extra information
## Install non-python dependencies
| 3 |
diff --git a/articles/quickstart/spa/_includes/_authz_preamble.md b/articles/quickstart/spa/_includes/_authz_preamble.md @@ -12,5 +12,5 @@ To set up access control in your application, define the following restrictions:
The previous step used the `read:messages` scope for accessing API resources. This scope indicates that the user can only view the data. You can consider users with this scope regular users. If you want to give some users permission to edit the data, you can add the `write:messages` scope.
::: note
-You can give your scopes any names and map them to any access levels you want.
+Read about naming scopes and mapping them to access levels in the [Scopes documentation](/scopes). To learn more about custom scope claims, follow the [User profile claims and scope tutorial](/api-auth/tutorials/adoption/scope-custom-claims).
:::
| 3 |
diff --git a/RUNBOOK.md b/RUNBOOK.md @@ -123,7 +123,6 @@ This system is a Node.js [application](https://github.com/Financial-Times/polyfi
<td><a href='https://docs.google.com/a/ft.com/drawings/d/1eA_sYaSRkvOqIxdkN6LRpyHeOzv8Mxr51WMfXM1sS3Q/edit?usp=sharing'>On Google Drive</a></td>
</tr>
-
<tr>
<td><b>Link to Business Continuity Plan</b></td>
<td>None</td>
@@ -136,8 +135,9 @@ This system is a Node.js [application](https://github.com/Financial-Times/polyfi
<tr>
<td><b>Useful Sites/Other Information</b></td>
- <td>Full information on setting up and deploying the service is in the <a rel='nofollow' href='https://github.com/Financial-Times/polyfill-service'>README in the git repo</a>, which is publicly accessible on GitHub.<br/>
- Control of the service is via the <a rel='nofollow' href='https://app.fastly.com/#analytics/4E1GeTez3EFH3cnwfyMAog'>Fastly dashboard</a> and <a rel='nofollow' href='https://dashboard-next.heroku.com/orgs/financial-times/apps/ft-polyfill-service/activity'>Heroku dashboard</a>, so check that you can access both of these.</td>
+ <td>
+ Full information on setting up and deploying the service is in the <a rel='nofollow' href='https://github.com/Financial-Times/polyfill-service'>README in the git repo</a>, which is publicly accessible on GitHub.<br/> Control of the service is via the <a rel='nofollow' href='https://app.fastly.com/#analytics/4E1GeTez3EFH3cnwfyMAog'>Fastly dashboard</a> and <a rel='nofollow' href='https://dashboard-next.heroku.com/orgs/financial-times/apps/ft-polyfill-service/activity'>Heroku dashboard</a>, so check that you can access both of these.
+ </td>
</tr>
</table>
@@ -176,4 +176,3 @@ The application is deployed to QA whenever a new commit is pushed to the `master
## Key Management Details
Not Applicable
-
| 2 |
diff --git a/client/src/luigi-element.js b/client/src/luigi-element.js * Base class for Luigi web component micro frontends.
*/
export class LuigiElement extends HTMLElement {
- constructor() {
+ constructor(options) {
super();
+ const openShadow = options ? options.openShadow : false;
this._shadowRoot = this.attachShadow({
- mode: 'closed',
+ mode: openShadow ? 'open' : 'closed',
delegatesFocus: false
});
this.__initialized = false;
| 11 |
diff --git a/src/handler-runner/ServerlessInvokeLocalRunner.js b/src/handler-runner/ServerlessInvokeLocalRunner.js @@ -39,37 +39,39 @@ module.exports = class ServerlessInvokeLocalRunner {
subprocess.stdin.write(`${stringify(event)}\n`)
subprocess.stdin.end()
+ const newlineRegex = /\r?\n|\r/g
+ const proxyResponseRegex = /{[\r\n]?\s*('|")isBase64Encoded('|")|{[\r\n]?\s*('|")statusCode('|")|{[\r\n]?\s*('|")headers('|")|{[\r\n]?\s*('|")body('|")|{[\r\n]?\s*('|")principalId('|")/
+
let results = ''
let hasDetectedJson = false
subprocess.stdout.on('data', (data) => {
- let str = data.toString('utf8')
-
- if (hasDetectedJson) {
- // Assumes that all data after matching the start of the
- // JSON result is the rest of the context result.
- results += trimNewlines(str)
- } else {
+ let str = data.toString('utf-8')
// Search for the start of the JSON result
// https://docs.aws.amazon.com/apigateway/latest/developerguide/set-up-lambda-proxy-integrations.html#api-gateway-simple-proxy-for-lambda-output-format
- const match = /{[\r\n]?\s*"isBase64Encoded"|{[\r\n]?\s*"statusCode"|{[\r\n]?\s*"headers"|{[\r\n]?\s*"body"|{[\r\n]?\s*"principalId"/.exec(
- str,
- )
-
+ const match = proxyResponseRegex.exec(str)
if (match && match.index > -1) {
- // The JSON result was in this chunk so slice it out
+ // If we see a JSON result that looks like it could be a Lambda Proxy response,
+ // we want to start treating the console output like it is the actual response.
hasDetectedJson = true
- results += trimNewlines(str.slice(match.index))
+ // Here we overwrite the existing reults. The last JSON match is the only one we want
+ // to ensure that we don't accidentally start writing the results just because the
+ // lambda program itself printed something that matched the regex string. The last match is
+ // the correct one because it comes from sls invoke local after the lambda code fully executes.
+ results = trimNewlines(str.slice(match.index))
str = str.slice(0, match.index)
}
-
+ if (hasDetectedJson) {
+ // Assumes that all data after matching the start of the
+ // JSON result is the rest of the context result.
+ results += trimNewlines(str)
+ }
if (str.length > 0) {
// The data does not look like JSON and we have not
// detected the start of JSON, so write the
// output to the console instead.
console.log('Proxy Handler could not detect JSON:', str)
}
- }
})
subprocess.stderr.on('data', (data) => {
@@ -79,7 +81,21 @@ module.exports = class ServerlessInvokeLocalRunner {
subprocess.on('close', (code) => {
if (code.toString() === '0') {
try {
- context.succeed(parse(results))
+ // This is a bit of an odd one. It looks like _process.stdout is chunking
+ // data to the max buffer size (in my case, 65536) and adding newlines
+ // between chunks.
+ //
+ // In my specific case, I was returning images encoded in the JSON response,
+ // and these newlines were occuring at regular intervals (every 65536 chars)
+ // and corrupting the response JSON. Not sure if this is the best way for
+ // a general solution, but it fixed it in my case.
+ //
+ // Upside is that it will handle large JSON payloads correctly,
+ // downside is that it will strip out any newlines that were supposed
+ // to be in the response data.
+ //
+ // Open to comments about better ways of doing this!
+ context.succeed(parse(results.replace(newlineRegex, '')))
} catch (ex) {
context.fail(results)
}
| 3 |
diff --git a/core/server/web/api/v2/admin/middleware.js b/core/server/web/api/v2/admin/middleware.js const errors = require('@tryghost/errors');
-const i18n = require('../../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
const auth = require('../../../../services/auth');
const shared = require('../../../shared');
const apiMw = require('../../middleware');
+const messages = {
+ notImplemented: 'The server does not support the functionality required to fulfill the request.'
+};
+
const notImplemented = function (req, res, next) {
// CASE: user is logged in, allow
if (!req.api_key) {
@@ -38,7 +42,7 @@ const notImplemented = function (req, res, next) {
next(new errors.GhostError({
errorType: 'NotImplementedError',
- message: i18n.t('errors.api.common.notImplemented'),
+ message: tpl(messages.notImplemented),
statusCode: '501'
}));
};
| 14 |
diff --git a/lib/shared/addon/components/cluster-driver/driver-rke/component.js b/lib/shared/addon/components/cluster-driver/driver-rke/component.js @@ -25,7 +25,7 @@ import deepSet from 'ember-deep-set';
import { coerceVersion } from 'shared/utils/parse-version';
const EXCLUDED_KEYS = ['name'];
-const EXCLUDED_CHILDREN_KEYS = ['extra_args', 'nodelocal', 'dns'];
+const EXCLUDED_CHILDREN_KEYS = ['extra_args', 'nodelocal', 'dns', 'extraArgs'];
function camelToUnderline(str, split = true) {
str = (str || '');
@@ -848,7 +848,6 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, {
let config = this.isEdit ? this.getSupportedFields(get(this, 'primaryResource'), 'cluster', EXCLUED_CLUSTER_OPTIONS) : this.getClusterFields(this.primaryResource);
let cpConfig = get(config, 'rancher_kubernetes_engine_config.cloud_provider');
- // some kind of recursion bug
config = removeEmpty(config, EXCLUDED_KEYS, EXCLUDED_CHILDREN_KEYS);
// get rid of undefined
config = JSON.parse(JSON.stringify(config));
@@ -1412,9 +1411,9 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, {
}
},
- getSupportedFields(source, tragetField, excludeFields = []) {
+ getSupportedFields(source, targetField, excludeFields = []) {
const out = {};
- const resourceFields = this.getResourceFields(tragetField);
+ const resourceFields = this.getResourceFields(targetField);
Object.keys(resourceFields).filter((key) => resourceFields[key].update && excludeFields.indexOf(key) === -1).forEach((key) => {
const field = get(source, key);
| 3 |
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js @@ -2882,7 +2882,7 @@ axes.drawLabels = function(gd, ax, opts) {
} else {
var mjWidth = Drawing.bBox(mathjaxGroup.node()).width;
var mjShift = mjWidth * {end: -0.5, start: 0.5}[anchor];
- mathjaxGroup.attr('transform', transform + (mjShift ? strTranslate(mjShift, 0) : ''));
+ mathjaxGroup.attr('transform', transform + strTranslate(mjShift, 0));
}
});
}
| 2 |
diff --git a/src/events/message.js b/src/events/message.js @@ -23,12 +23,6 @@ async function handler (message) {
return log.trace('No valid command found')
}
try {
- if (await Command.blockIfNotSupporter(message)) {
- const visitUrl = config.get().apis.pledge.url.replace('/api', '')
- return await message.channel.send(
- `Sorry, only supporters have access to this bot. To become a supporter, visit ${visitUrl}`
- )
- }
// Check member
const memberPerms = command.getMemberPermission()
log.debug({
@@ -44,6 +38,14 @@ async function handler (message) {
if (!Command.enabled && !Command.isOwnerID(author.id)) {
return log.info(`Command ${command.name} disabled, only owners allowed`)
}
+
+ if (await Command.blockIfNotSupporter(message)) {
+ const visitUrl = config.get().apis.pledge.url.replace('/api', '')
+ return await message.channel.send(
+ `Sorry, only supporters have access to this bot. To become a supporter, visit ${visitUrl}`
+ )
+ }
+
// Check bot
const botPerms = command.getBotPermissions()
log.debug({
| 11 |
diff --git a/packages/insomnia/src/ui/css/components/markdown-preview.less b/packages/insomnia/src/ui/css/components/markdown-preview.less padding-left: var(--padding-xs);
}
- & > ul {
+ ul {
list-style: disc;
ul {
}
}
- & > ol {
+ ol {
list-style: decimal;
ol {
| 2 |
diff --git a/edit.js b/edit.js @@ -1452,17 +1452,29 @@ window.addEventListener('avatarchange', e => {
const p = e.data;
avatarSubpageContent.innerHTML = `\
- <div class=avatar>
+ <div class=avatar draggable=true>
<img class=screenshot style="display: none;">
<div class=wrap>
- <div class=hash>${p ? p.hash : 'No avatar'}</div>
- ${p ? `<nav class="button unwear-button">Unwear</nab>` : ''}
+ ${p ? `\
+ <div class=name>${p.name}</div>
+ <div class=hash>${p.hash}</div>
+ <nav class="button unwear-button">Unwear</nab>
+ ` : `\
+ <div class=name>No avatar</div>
+ `}
</div>
</div>
`;
+ if (p) {
+ avatarSubpageContent.addEventListener('dragstart', e => {
+ _startPackageDrag(e, {
+ name: p.name,
+ dataHash: p.hash,
+ iconHash: null,
+ });
+ });
(async () => {
const img = avatarSubpageContent.querySelector('.screenshot');
- if (p) {
const u = await p.getScreenshotImageUrl();
if (u) {
img.src = u;
@@ -1474,15 +1486,15 @@ window.addEventListener('avatarchange', e => {
console.warn(err);
URL.revokeObjectURL(u);
};
- }
- } else {
+ } /* else {
img.src = 'assets/question.png';
- }
+ } */
})();
const unwearButton = avatarSubpageContent.querySelector('.unwear-button');
unwearButton && unwearButton.addEventListener('click', e => {
loginManager.setAvatar(null);
});
+ }
});
const _changeInventory = inventory => {
| 0 |
diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml @@ -34,7 +34,7 @@ jobs:
- name: Generate version
id: generate-new-version
- uses: ${{ github.repository }}/.github/actions/bumpVersion
+ uses: Expensify/Expensify.cash/.github/actions/bumpVersion
with:
GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
SEMVER_LEVEL: PATCH
| 13 |
diff --git a/client/index.html b/client/index.html <ons-list-title style="margin-top:5px;">Persistent Data Configuration</ons-list-title>
<ons-row>
<ons-col></ons-col>
- <ons-col width="300px" vertical-align='center' style='text-align:center; max-width: 400px;'>Persistent data or "lab mode" is a feature of the Roborock S50 which allows to save no-go areas and virtual walls. It also allows the robot to drive back to the dock wherever it is and keeps the map from being rotated.</ons-col>
+ <ons-col width="300px" vertical-align='center' style='text-align:center; max-width: 400px;'>Persistent data or "lab mode" is a feature of the Roborock S5x which allows to save no-go areas and virtual walls. It also allows the robot to drive back to the dock wherever it is and keeps the map from being rotated.</ons-col>
<ons-col></ons-col>
</ons-row>
| 7 |
diff --git a/map.html b/map.html <script type=module>
import * as THREE from './three.module.js';
import App from './app.js';
- import {camera, orthographicCamera, renderer} from './app-object.js';
+ import {renderer, scene, camera, orthographicCamera} from './app-object.js';
import {world} from './world.js';
- import {parseQuery} from './util.js';
+ import {parseQuery, parseExtents} from './util.js';
import {homeScnUrl, rarityColors} from './constants.js';
const cameraPosition = new THREE.Vector3(0, 100, 0);
})(),
]);
+ const q = parseQuery(location.search);
+ const extents = parseExtents(q.e);
+ if (extents) {
+ const center = extents.getCenter(new THREE.Vector3());
+ const size = extents.getSize(new THREE.Vector3());
+ const geometry = new THREE.PlaneBufferGeometry(size.x, size.z)
+ // .applyMatrix4(new THREE.Matrix4().makeTranslation(size.x/2, -size.y/2, 0));
+ .applyMatrix4(new THREE.Matrix4().makeRotationFromQuaternion(new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(1, 0, 0), -Math.PI/2)));
+ const material = new THREE.MeshBasicMaterial({
+ color: rarityColors.legendary[0],
+ depthTest: false,
+ });
+ const extentMesh = new THREE.Mesh(geometry, material);
+ extentMesh.position.set(center.x, 0, center.z)
+ // .sub(perspectiveOffset); // offset by half of the offset since we are halfway to the camera
+ scene.add(extentMesh);
+ }
+
// fixes a glitch where the first render has black opaque
app.render();
const container = document.getElementById('container');
- const {dst} = parseQuery(location.search);
+ const {dst} = q;
setTimeout(async () => { // wait for load; should really be a lock
// console.time('render');
if (!dst) {
orthographicCamera.updateProjectionMatrix();
camera.projectionMatrix.copy(orthographicCamera.projectionMatrix);
- cameraPosition.set(x + sw/2, 100, y + sh/2);
+ cameraPosition.set(x, 100, y);
cameraTarget.set(cameraPosition.x, 0, cameraPosition.z)
camera.position.copy(cameraPosition);
| 0 |
diff --git a/test/jasmine/tests/localize_test.js b/test/jasmine/tests/localize_test.js @@ -233,4 +233,54 @@ describe('localization', function() {
.catch(failTest)
.then(done);
});
+
+ it('uses extraFormat to localize the autoFormatted x-axis date tick', function(done) {
+ plot('test')
+ .then(function() {
+ // test format.month
+ expect(firstXLabel()).toBe('Jan 2001');
+ return Plotly.update(gd, {x: [['2001-01-01', '2001-02-01']]});
+ })
+ .then(function() {
+ // test format.dayMonth & format.year
+ expect(firstXLabel()).toBe('Dec 312000');
+
+ return Plotly.update(gd, {x: [['2001-01-01', '2001-01-02']]});
+ })
+ .then(function() {
+ // test format.dayMonthYear
+ expect(firstXLabel()).toBe('00:00Jan 1, 2001');
+
+ Plotly.register({
+ moduleType: 'locale',
+ name: 'test',
+ format: {
+ year: 'Y%Y',
+ month: '%Y %b',
+ dayMonth: '%-d %b',
+ dayMonthYear: '%-d %b %Y'
+ }
+ });
+
+ return Plotly.update(gd, {x: [['2001-01-01', '2002-01-01']]});
+ })
+ .then(function() {
+ // test format.month
+ expect(firstXLabel()).toBe('2001 Jan');
+
+ return Plotly.update(gd, {x: [['2001-01-01', '2001-02-01']]});
+ })
+ .then(function() {
+ // test format.dayMonth & format.year
+ expect(firstXLabel()).toBe('31 DecY2000');
+
+ return Plotly.update(gd, {x: [['2001-01-01', '2001-01-02']]});
+ })
+ .then(function() {
+ // test format.dayMonthYear
+ expect(firstXLabel()).toBe('00:001 Jan 2001');
+ })
+ .catch(failTest)
+ .then(done);
+ });
});
| 0 |
diff --git a/packages/openneuro-server/graphql/schema.js b/packages/openneuro-server/graphql/schema.js @@ -11,8 +11,17 @@ const typeDefs = `
type Query {
# One dataset
dataset(id: ID!): Dataset
- # All datasets
- datasets(first: Int = 25, after: String, public: Boolean = false, sort: DatasetSort): [Dataset]
+ # Get all datasets
+ datasets(
+ "Limit results, default 25, max 100"
+ first: Int = 25
+ "Cursor key used to fetch remaining results"
+ after: String
+ "Limit to datasets available publicly"
+ public: Boolean = false
+ "Sorting fields"
+ orderBy: DatasetSort
+ ): [Dataset]
# Get one user
user(id: ID!): User
# Get a list of users
@@ -130,20 +139,25 @@ const typeDefs = `
followers: [Follower]
}
- # Sorting order for datasets, all fields are -1 for descending and 1 for ascending
+ enum SortOrdering {
+ ascending
+ descending
+ }
+
+ # Sorting order for datasets
input DatasetSort {
# Dataset created time
- created: Int
+ created: SortOrdering
# Alphanumeric sort of dataset name
- name: Int
+ name: SortOrdering
# Alphanumeric sort of user names
- user: Int
+ user: SortOrdering
# Order by star count
- stars: Int
+ stars: SortOrdering
# Order by download count
- downloads: Int
+ downloads: SortOrdering
# Order by count of dataset followers
- followers: Int
+ followers: SortOrdering
}
# Ephemeral draft or working tree for a dataset
| 7 |
diff --git a/packages/bitcore-lib-doge/test/hdpublickey.js b/packages/bitcore-lib-doge/test/hdpublickey.js @@ -15,11 +15,11 @@ var HDPublicKey = bitcore.HDPublicKey;
var Base58Check = bitcore.encoding.Base58Check;
var Networks = bitcore.Networks;
-var xprivkey = 'Ltpv71G8qDifUiNetP6nmxPA5STrUVmv2J9YSmXajv8VsYBUyuPhvN9xCaQrfX2wo5xxJNtEazYCFRUu5FmokYMM79pcqz8pcdo4rNXAFPgyB4k';
-var xpubkey = 'Ltub2SSUS19CirucWFod2ZsYA2J4v4U76YiCXHdcQttnoiy5aGanFHCPDBX7utfG6f95u1cUbZJNafmvzNCzZZJTw1EmyFoL8u1gJbGM8ipu491';
-var xpubkeyTestnet = 'ttub4XNESS7BCg9c1drFYS3NSKAodkDNmUuTDq5cii78UkFjiaeCxVsQhQrkvrV76JEUsz61E3HtQf1w8oo81QQiUbPwcEeyqiToE4Q8GFnKgPE';
-var json = '{"network":"livenet","depth":0,"fingerPrint":876747070,"parentFingerPrint":0,"childIndex":0,"chainCode":"873dff81c02f525623fd1fe5167eac3a55a049de3d314bb42ee227ffed37d508","publicKey":"0339a36013301597daef41fbe593a02cc513d0b55527ec2df1050e2e8ff49c85c2","checksum":435229356,"xpubkey":"Ltub2SSUS19CirucWFod2ZsYA2J4v4U76YiCXHdcQttnoiy5aGanFHCPDBX7utfG6f95u1cUbZJNafmvzNCzZZJTw1EmyFoL8u1gJbGM8ipu491"}';
-var derived_0_1_200000 = 'Ltub2YH6FGT8kBVNhrNH8RiXzFj2DPABedMG1YSTTEsn8m4AWawdMnXQbcLV1DeNRTAP44n4TTynaKaCg8wk6N6aPk2NN2hVEVrqL5iPfyn8WrT';
+var xprivkey = 'dgpv51eADS3spNJh9Gjth94XcPwAczvQaDJs9rqx11kvxKs6r3Ek8AgERHhjLs6mzXQFHRzQqGwqdeoDkZmr8jQMBfi43b7sT3sx3cCSk5fGeUR';
+var xpubkey = 'dgub8kXBZ7ymNWy2S8Q3jNgVjFUm5ZJ3QLLaSTdAA89ukSv7Q6MSXwE14b7Nv6eDpE9JJXinTKc8LeLVu19uDPrm5uJuhpKNzV2kAgncwo6bNpP';
+var xpubkeyTestnet = 'tpubDFJ62oZ3oPvH1rEFrnGt1osMBcihEkce85JaCoEj81ibMFnnqgRucHkfTFpHQPMLsHM2VNKbbR5ebZZLDWWdoD75QKeBs5BhVgcjbhEbTsH';
+var json = '{"network":"livenet","depth":0,"fingerPrint":876747070,"parentFingerPrint":0,"childIndex":0,"chainCode":"873dff81c02f525623fd1fe5167eac3a55a049de3d314bb42ee227ffed37d508","publicKey":"0339a36013301597daef41fbe593a02cc513d0b55527ec2df1050e2e8ff49c85c2","checksum":-1473549296,"xpubkey":"dgub8kXBZ7ymNWy2S8Q3jNgVjFUm5ZJ3QLLaSTdAA89ukSv7Q6MSXwE14b7Nv6eDpE9JJXinTKc8LeLVu19uDPrm5uJuhpKNzV2kAgncwo6bNpP"}';
+var derived_0_1_200000 = 'dgub8rMoNPHhPqYndixhqEXVZUuiNsz7xQydviS1CU8u5V1CLQiHeSZ2T1vk1RdL92AbTatNKEHYLJ8mamtekCesYe6W6bDY65suCBEfUyBY9DU';
describe('HDPublicKey interface', function() {
@@ -94,6 +94,7 @@ describe('HDPublicKey interface', function() {
});
it('can be generated from a json', function() {
+ console.log(new HDPublicKey(xpubkey).toJSON());
expect(new HDPublicKey(JSON.parse(json)).xpubkey).to.equal(xpubkey);
});
@@ -173,7 +174,7 @@ describe('HDPublicKey interface', function() {
'childIndex':0,
'chainCode':'873dff81c02f525623fd1fe5167eac3a55a049de3d314bb42ee227ffed37d508',
'publicKey':'0339a36013301597daef41fbe593a02cc513d0b55527ec2df1050e2e8ff49c85c2',
- 'checksum':435229356,
+ 'checksum':-1473549296,
'xpubkey':'Ltub2SSUS19CirucWFod2ZsYA2J4v4U76YiCXHdcQttnoiy5aGanFHCPDBX7utfG6f95u1cUbZJNafmvzNCzZZJTw1EmyFoL8u1gJbGM8ipu491'
};
it('roundtrips to JSON and to Object', function() {
| 3 |
diff --git a/data.js b/data.js @@ -5692,6 +5692,14 @@ module.exports = [{
url: "https://github.com/vitaly-t/excellent",
source: "https://raw.githubusercontent.com/vitaly-t/excellent/master/src/excellent.js"
},
+ {
+ name: "easyrouter",
+ github: "aMarCruz/easyrouter",
+ tags: ["html5", "router", "routes", "browser", "location", "history", "hash"],
+ description: "Tiny, fast, easy, yet powerful hash router in JavaScript",
+ url: "https://github.com/aMarCruz/easyrouter",
+ source: "https://raw.githubusercontent.com/aMarCruz/easyrouter/master/dist/easyrouter.js"
+ },
{
name: "Beedle",
github: "hankchizljaw/beedle",
| 0 |
diff --git a/source/dom/Element.js b/source/dom/Element.js /*global window, document, Element, SVGAnimatedString */
-import '../core/String.js'; // For String#camelCase, #hyphenate
-import { browser } from '../ua/UA.js';
import { Binding } from '../_codependent/_Binding.js';
-import { didError } from '../foundation/RunLoop.js';
import { View } from '../_codependent/_View.js';
+import { didError } from '../foundation/RunLoop.js';
+import { browser } from '../ua/UA.js';
+
+import '../core/String.js'; // For String#camelCase, #hyphenate
/**
Module: DOM
@@ -154,6 +155,7 @@ const booleanProperties = {
defaultChecked: 1,
disabled: 1,
hidden: 1,
+ indeterminate: 1,
multiple: 1,
readOnly: 1,
required: 1,
| 12 |
diff --git a/server/game/cards/13.2-CoS/ACityBesieged.js b/server/game/cards/13.2-CoS/ACityBesieged.js @@ -4,7 +4,7 @@ class ACityBesieged extends PlotCard {
setupCardAbilities() {
this.whenRevealed({
handler: context => {
- let numTargets = this.hasUsedCityPlot() ? 2 : 1;
+ let numTargets = this.hasUsedCityPlot(context.player) ? 2 : 1;
this.game.promptForSelect(context.player, {
mode: 'upTo',
| 1 |
diff --git a/token-metadata/0x95bA34760ac3D7fBE98ee8b2AB33b4F1a6D18878/metadata.json b/token-metadata/0x95bA34760ac3D7fBE98ee8b2AB33b4F1a6D18878/metadata.json "symbol": "DESH",
"address": "0x95bA34760ac3D7fBE98ee8b2AB33b4F1a6D18878",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/lib/bundle/add_process_shim.js b/lib/bundle/add_process_shim.js @@ -6,7 +6,9 @@ module.exports = function(bundle, options){
var source = prettier.format(
`
if(typeof process === "undefined") {
- process = { env: { NODE_ENV: "development" } };
+ (function(global){
+ global.process = { env: { NODE_ENV: "development" } };
+ })(typeof self !== "undefined" : self : global);
}
`,
{ useTabs: true }
| 12 |
diff --git a/rcloud.support/R/setup.R b/rcloud.support/R/setup.R @@ -184,7 +184,7 @@ configure.rcloud <- function (mode=c("startup", "script")) {
}
if (!nzConf("cookie.domain")) setConf("cookie.domain", getConf("host"))
- if (!isTRUE(grepl("[.:]", getConf("cookie.domain"))))
+ if (!isTRUE(grepl("[.:]", getConf("cookie.domain"))) && !isTRUE(getConf("cookie.domain") == "*"))
stop("*** ERROR: cookie.domain must be a FQDN! Please set your hostname correctly or add cookie.domain directive to rcloud.conf")
rcloud.setup.dirs()
| 11 |
diff --git a/test/MUIDataTable.test.js b/test/MUIDataTable.test.js @@ -173,6 +173,32 @@ describe('<MUIDataTable />', function() {
assert.deepEqual(JSON.stringify(state.displayData), displayData);
});
+ it('should correctly build internal table data and displayData structure when using nested data', () => {
+ const columns = [
+ { name: 'Name', options: { customBodyRender: renderName, customFilterListRender: renderCustomFilterList } },
+ 'Company',
+ { name: 'Location.City', label: 'City Label' },
+ { name: 'Location.State' },
+ { name: 'Empty', options: { empty: true, filterType: 'checkbox' } },
+ ];
+ const data = [
+ { Name: 'Joe James', Company: 'Test Corp', Location: { City: 'Yonkers', State: 'NY' } },
+ { Name: 'John Walsh', Company: 'Test Corp', Location: { City: 'Hartford', State: null } },
+ { Name: 'Bob Herm', Company: 'Test Corp', Location: { Town: 'Tampa', State: 'FL' } },
+ { Name: 'James Houston', Company: 'Test Corp', Location: { City: 'Dallas', State: 'TX' } },
+ ];
+ const displayData = JSON.stringify([
+ { data: ['James, Joe', 'Test Corp', 'Yonkers', 'NY', undefined], dataIndex: 0, },
+ { data: ['Walsh, John', 'Test Corp', 'Hartford', null, undefined], dataIndex: 1, },
+ { data: ['Herm, Bob', 'Test Corp', undefined, 'FL', undefined], dataIndex: 2, },
+ { data: ['Houston, James', 'Test Corp', 'Dallas', 'TX', undefined], dataIndex: 3, },
+ ]);
+ const shallowWrapper = shallow(<MUIDataTable columns={columns} data={data} />);
+ const state = shallowWrapper.dive().state();
+
+ assert.deepEqual(JSON.stringify(state.displayData), displayData);
+ });
+
it('should correctly re-build display after xhr with serverSide=true', done => {
const fullWrapper = mount(<MUIDataTable columns={columns} data={[]} options={{ serverSide: true }} />);
assert.strictEqual(fullWrapper.find('tbody tr').length, 1);
| 0 |
diff --git a/src/extensions/layout/cose.js b/src/extensions/layout/cose.js @@ -54,34 +54,34 @@ var defaults = {
randomize: false,
// Extra spacing between components in non-compound graphs
- componentSpacing: 100,
+ componentSpacing: 40,
// Node repulsion (non overlapping) multiplier
- nodeRepulsion: function( node ){ return 400000; },
+ nodeRepulsion: function( node ){ return 2048; },
// Node repulsion (overlapping) multiplier
- nodeOverlap: 10,
+ nodeOverlap: 4,
// Ideal edge (non nested) length
- idealEdgeLength: function( edge ){ return 10; },
+ idealEdgeLength: function( edge ){ return 32; },
// Divisor to compute edge forces
- edgeElasticity: function( edge ){ return 100; },
+ edgeElasticity: function( edge ){ return 32; },
// Nesting factor (multiplier) to compute ideal edge length for nested edges
- nestingFactor: 5,
+ nestingFactor: 1.2,
// Gravity force (constant)
- gravity: 80,
+ gravity: 1,
// Maximum number of iterations to perform
numIter: 1000,
// Initial temperature (maximum node displacement)
- initialTemp: 200,
+ initialTemp: 1000,
// Cooling factor (how the temperature is reduced between consecutive iterations
- coolingFactor: 0.95,
+ coolingFactor: 0.99,
// Lower temperature threshold (below this point the layout will end)
minTemp: 1.0,
| 7 |
diff --git a/src/base/utils.js b/src/base/utils.js @@ -540,16 +540,16 @@ export const without = function(arr, el) {
* http://stackoverflow.com/questions/1960473/unique-values-in-an-array
*/
export const unique = (array, map = data => data) => {
- const uniqueValues = [];
+ const uniqueValues = {};
return array.filter(item => {
const value = map(item);
- if (uniqueValues.includes(value)) {
+ if (uniqueValues.hasOwnProperty(value)) {
return false;
}
- uniqueValues.push(value);
+ uniqueValues[value] = 1;
return true;
});
| 13 |
diff --git a/src/actions/account.js b/src/actions/account.js @@ -331,9 +331,9 @@ export const { addAccessKey, createAccountWithSeedPhrase, addAccessKeySeedPhrase
const fullAccess = true;
const newKeyPair = KeyPair.fromRandom('ed25519')
const newPublicKey = newKeyPair.publicKey
- await wallet.postSignedJson('/account/seedPhraseAdded', { accountId, publicKey })
await wallet.addAccessKey(accountId, contractName, newPublicKey, fullAccess)
await wallet.saveAccount(accountId, newKeyPair)
+ await wallet.postSignedJson('/account/seedPhraseAdded', { accountId, publicKey })
},
() => defaultCodesFor('account.createAccountSeedPhrase')
],
| 13 |
diff --git a/semantics.json b/semantics.json "H5P.DragText 1.5",
"H5P.GoToQuestion 1.2",
"H5P.IVHotspot 1.2",
- "H5P.Questionnaire 1.1"
+ "H5P.Questionnaire 1.2"
]
},
{
| 3 |
diff --git a/src/lib/vm-listener-hoc.jsx b/src/lib/vm-listener-hoc.jsx @@ -49,8 +49,6 @@ const vmListenerHOC = function (WrappedComponent) {
}
this.props.vm.postIOData('userData', {username: this.props.username});
}
- // NOTE: should consider changing this to another lifecycle method, e.g. componentDidUpdate,
- // because componentWillReceiveProps is deprecated
componentWillReceiveProps (newProps) {
if (newProps.username !== this.props.username) {
this.props.vm.postIOData('userData', {username: newProps.username});
@@ -103,15 +101,9 @@ const vmListenerHOC = function (WrappedComponent) {
onTurboModeOn,
onShowAlert,
/* eslint-enable no-unused-vars */
- vm,
- ...componentProps
+ ...props
} = this.props;
- return (
- <WrappedComponent
- vm={vm}
- {...componentProps}
- />
- );
+ return <WrappedComponent {...props} />;
}
}
VMListener.propTypes = {
| 13 |
diff --git a/src/ovirtapi/transform.js b/src/ovirtapi/transform.js @@ -975,8 +975,11 @@ const RemoteUserOptions = {
// filter them out
.filter(Boolean)
+ const fromEntries = {}
+ vmPortalOptions.forEach(([name, option]) => { fromEntries[name] = option })
+
// pick only options supported by this version of the UI
- const { locale } = Object.fromEntries(vmPortalOptions)
+ const { locale } = fromEntries
return {
locale,
| 14 |
diff --git a/assets/js/modules/idea-hub/datastore/idea-state.js b/assets/js/modules/idea-hub/datastore/idea-state.js * External dependencies
*/
import invariant from 'invariant';
-import isPlainObject from 'lodash/isPlainObject';
/**
* Internal dependencies
@@ -34,15 +33,23 @@ const { receiveError, clearError } = errorStoreActions;
const fetchPostUpdateIdeaStateStore = createFetchStore( {
baseName: 'updateIdeaState',
- controlCallback: ( { ideaState } ) => {
- return API.set( 'modules', 'idea-hub', 'update-idea-state', { ideaState } );
+ controlCallback: ( { name, saved, dismissed } ) => {
+ const params = { name };
+
+ if ( saved !== undefined ) {
+ params.saved = saved;
+ } else {
+ params.dismissed = dismissed;
+ }
+
+ return API.set( 'modules', 'idea-hub', 'update-idea-state', params );
},
- argsToParams( ideaState ) {
- return { ideaState };
+ argsToParams( { name, saved, dismissed } ) {
+ return { name, saved, dismissed };
},
- validateParams( { ideaState } = {} ) {
- invariant( isPlainObject( ideaState ), 'ideaState must be an object.' );
- invariant( typeof ideaState.name === 'string', 'ideaState.name must be a string.' );
+ validateParams( { name, saved, dismissed } = {} ) {
+ invariant( typeof name === 'string' && name.length > 0, 'name must be a non empty string' );
+ invariant( saved !== undefined || dismissed !== undefined, 'either saved or dimissed property must be set' );
},
} );
| 7 |
diff --git a/modules/test-utils/src/render-test.js b/modules/test-utils/src/render-test.js @@ -127,7 +127,6 @@ export default class RenderTest {
const resultString = JSON.stringify(result);
window.testDone(resultString);
} else {
- console.warn('testDone not exposed, waiting 1 second'); // eslint-disable-line
window.setTimeout(this._reportToTestDriver.bind(this), 1000);
}
}
| 2 |
diff --git a/source/Renderer/rendering_parameters.js b/source/Renderer/rendering_parameters.js import { ImageMimeType } from "../gltf/image";
-import { AnimationTimer } from "../gltf/utils";
const UserCameraIndex = "orbit camera";
-class gltfRenderingParameters
-{
- constructor(
- environmentName = Object.keys(Environments)[0],
- useIBL = true,
- usePunctual = false,
- exposure = 1.0,
- clearColor = [50, 50, 50],
- toneMap = ToneMaps.NONE,
- debugOutput = DebugOutput.NONE)
- {
- this.environmentName = environmentName;
- this.useIBL = useIBL;
- this.usePunctual = usePunctual;
- this.exposure = exposure;
- this.clearColor = clearColor;
- this.toneMap = toneMap;
- this.debugOutput = debugOutput;
- this.sceneIndex = 0;
- this.cameraIndex = UserCameraIndex;
- this.animationTimer = new AnimationTimer();
- this.animationIndex = "all";
- this.skinning = true;
- this.morphing = true;
- }
-
- userCameraActive()
- {
- return this.cameraIndex === UserCameraIndex;
- }
-}
-
const ToneMaps =
{
NONE: "None",
@@ -78,4 +45,4 @@ const Environments =
"Chromatic": { folder: "chromatic", mipLevel: 11, type: ImageMimeType.KTX2 }
};
-export { UserCameraIndex, gltfRenderingParameters, Environments, ToneMaps, DebugOutput };
+export { UserCameraIndex, Environments, ToneMaps, DebugOutput };
| 2 |
diff --git a/packages/three-instanced-uniforms-mesh/src/InstancedUniformsMesh.js b/packages/three-instanced-uniforms-mesh/src/InstancedUniformsMesh.js @@ -5,6 +5,7 @@ import { createInstancedUniformsDerivedMaterial } from './InstancedUniformsDeriv
export class InstancedUniformsMesh extends InstancedMesh {
constructor (geometry, material, count) {
super(geometry, material, count)
+ this._maxCount = count;
this._instancedUniformNames = [] //treated as immutable
}
@@ -84,10 +85,10 @@ export class InstancedUniformsMesh extends InstancedMesh {
if (!attr) {
const defaultValue = getDefaultUniformValue(this._baseMaterial, name)
const itemSize = getItemSizeForValue(defaultValue)
- attr = attrs[attrName] = new InstancedBufferAttribute(new Float32Array(itemSize * this.count), itemSize)
+ attr = attrs[attrName] = new InstancedBufferAttribute(new Float32Array(itemSize * this._maxCount), itemSize)
// Fill with default value:
if (defaultValue !== null) {
- for (let i = 0; i < this.count; i++) {
+ for (let i = 0; i < this._maxCount; i++) {
setAttributeValue(attr, i, defaultValue)
}
}
| 11 |
diff --git a/server/src/events/flight.js b/server/src/events/flight.js @@ -27,6 +27,7 @@ export const aspectList = [
function addAspects(template, sim) {
// Duplicate all of the other stuff attached to the simulator too.
aspectList.forEach(aspect => {
+ if (aspect === "softwarePanels") return;
const filterAspect = App[aspect].filter(
a => a.simulatorId === template.simulatorId
);
@@ -109,14 +110,17 @@ function addAspects(template, sim) {
const panels =
App.simulators.find(s => s.id === template.simulatorId).panels || [];
panels.forEach(p => {
- const panel = App.softwarePanels.find(s => s.id === p);
- if (!panel) return;
+ const panelData = App.softwarePanels.find(s => s.id === p);
+ if (!panelData) return;
+ const panel = { ...panelData };
const id = uuid.v4();
- sim.stations.forEach(s => {
- s.cards.forEach(c => {
- if (c.component === p) c.component = id;
- });
- });
+ sim.stations = sim.stations.map(s => ({
+ ...s,
+ cards: s.cards.map(c => ({
+ ...c,
+ component: c.component === p ? id : c.component
+ }))
+ }));
App.softwarePanels.push(
new Classes.SoftwarePanel({
id,
@@ -143,7 +147,7 @@ App.on("startFlight", ({ id, name, simulators }) => {
sim.templateId = s.simulatorId;
sim.mission = s.missionId;
const stationSet = App.stationSets.find(ss => ss.id === s.stationSet);
- sim.stations = stationSet.stations;
+ sim.stations = [...stationSet.stations];
sim.stationSet = stationSet.id;
App.simulators.push(sim);
addAspects(s, sim);
| 1 |
diff --git a/app/classifier/classifier.jsx b/app/classifier/classifier.jsx @@ -296,7 +296,7 @@ class Classifier extends React.Component {
}
render() {
- const { interventions, user } = this.props;
+ const { actions, interventions, user } = this.props;
const { showIntervention, showSummary, workflowHistory } = this.state;
const currentTaskKey = workflowHistory.length > 0 ? workflowHistory[workflowHistory.length - 1] : null;
const largeFormatImage = this.props.workflow.configuration.image_layout && this.props.workflow.configuration.image_layout.includes('no-max-height');
@@ -436,7 +436,7 @@ class Classifier extends React.Component {
<strong>Gold standard mode:</strong>
<br />
Please ensure this classification is completely accurate.{' '}
- <button type="button" className="secret-button" onClick={currentClassification.update.bind(currentClassification, { gold_standard: undefined })}>
+ <button type="button" className="secret-button" onClick={() => actions.classify.toggleGoldStandard(undefined)}>
<u>Disable</u>
</button>
</small>
| 1 |
diff --git a/src/stories/SubscriptAvatar.stories.js b/src/stories/SubscriptAvatar.stories.js @@ -32,8 +32,8 @@ const Default = Template.bind({});
const AvatarURLStory = Template.bind({});
AvatarURLStory.args = {
- mainAvatar: 'https://d2k5nsl2zxldvw.cloudfront.net/images/avatars/avatar_1.png',
- secondaryAvatar: 'https://d2k5nsl2zxldvw.cloudfront.net/images/avatars/avatar_3.png',
+ mainAvatar: `${CONST.CLOUDFRONT_URL}/images/avatars/avatar_1.png`,
+ secondaryAvatar: `${CONST.CLOUDFRONT_URL}/images/avatars/avatar_3.png`,
};
export {
| 4 |
diff --git a/layouts/partials/helpers/fragments.html b/layouts/partials/helpers/fragments.html {{- $directory_same_name := in ($page_scratch.Get "fragments_directory_name") (printf "%s%s/" $root.File.Dir (replace $name ".md" "")) -}}
{{- if and (not .Params.disabled) (isset .Params "fragment") (not $directory_same_name) -}}
{{- if or $is_404 (ne .Params.fragment "404") -}}
- {{- if and (eq .Params.fragment "config") (not (where ($page_scratch.Get "page_config") ".Name" $name)) (ne .Params.hide) -}}
+ {{- if and (eq .Params.fragment "config") (not (where ($page_scratch.Get "page_config") ".Name" $name)) (not .Params.hide) -}}
{{- $page_scratch.Add "page_config" . -}}
{{- else if not (where ($page_scratch.Get "page_fragments") ".Name" $name) -}}
{{- $page_scratch.Add "page_fragments" . -}}
| 14 |
diff --git a/plugins/dns_service/app/views/dns_service/zones/recordsets/_recordset_item.html.haml b/plugins/dns_service/app/views/dns_service/zones/recordsets/_recordset_item.html.haml %br
%span.info-text= recordset.id
%td= recordset.type
- %td
+ %td.big-data-cell
- if recordset.records.is_a?(Array)
= raw recordset.records.join('<br/>')
- else
| 9 |
diff --git a/html/components/dropdown.stories.js b/html/components/dropdown.stories.js @@ -13,7 +13,7 @@ export default {
},
};
-export const defaultDropdown = () => {
+export const defaultStory = () => {
useEffect(() => {
dropdowns();
}, []);
@@ -67,11 +67,11 @@ export const defaultDropdown = () => {
`;
};
-defaultDropdown.story = {
+defaultStory.story = {
name: 'Default',
};
-export const informationalDropdown = () => {
+export const informational = () => {
useEffect(() => {
dropdowns();
}, []);
@@ -159,6 +159,6 @@ export const informationalDropdown = () => {
`;
};
-informationalDropdown.story = {
+informational.story = {
name: 'Informational',
};
| 3 |
diff --git a/articles/appliance/custom-domains/index.md b/articles/appliance/custom-domains/index.md @@ -48,20 +48,19 @@ You may do so by utilizing the PSaaS Appliance's custom domains feature, which s
## Certificates Required for Custom Domains
-Custom domains map one or more external DNS to a tenant that follows the standard naming convention.
+Custom domains map one external DNS to a tenant that follows the standard naming convention.
Suppose that we have a tenant with the following domain:
`auth.example.com`
-Suppose that we want the following domains to map to `auth.example.com`:
+Suppose that we want the following domain to map to `auth.example.com`:
```text
-auth.site1.example.com
auth.site2.com
```
-Each of the custom domains (in this example, there are two) has its own certificate, which is stored separately.
+The custom domains has its own certificate, which is stored separately.
## Configuring Custom Domains
| 2 |
diff --git a/src/lexer.js b/src/lexer.js @@ -27,7 +27,7 @@ module.exports = function() {
});
lexer.addRule(/(\n?[^`\[\n\]])+/, function(lexeme) {
- this.reject = inComponent;
+ this.reject = inComponent || lexeme.trim() === '';
if (!this.reject) {
text = lexeme;
}
| 7 |
diff --git a/package.json b/package.json "scripts": {
"prepublish": "node make publish",
"build": "node make",
- "watch": "node make -w",
- "start": "node make -s -w -d data",
+ "watch": "node make dev -w",
+ "start": "node make dev -s -w -d data",
"release": "node make && build",
"electron": "electron ./dist",
- "app": "node make && electron ./dist",
+ "app": "node make browser && electron ./dist",
"test": "npm run lint && node make test",
"lint": "eslint -c .eslintrc.js src index.es.js"
},
| 4 |
diff --git a/src/backends/test-repo/implementation.js b/src/backends/test-repo/implementation.js @@ -34,7 +34,7 @@ const getCursor = (collection, extension, entries, index) => {
};
const getFolderEntries = (folder, extension) => {
- return Object.keys(window.repoFiles[folder])
+ return Object.keys(window.repoFiles[folder] || {})
.filter(path => path.endsWith(`.${ extension }`))
.map(path => ({
file: { path: `${ folder }/${ path }` },
| 1 |
diff --git a/scripts/contractInteraction/staking_vesting.py b/scripts/contractInteraction/staking_vesting.py @@ -14,13 +14,27 @@ def sendSOVFromVestingRegistry():
sendWithMultisig(conf.contracts['multisig'], vestingRegistry.address, data, conf.acct)
-def addAdmin(admin, vestingRegistryAddress):
+def vestingRegistryAddAdmin(admin, vestingRegistryAddress):
multisig = Contract.from_abi("MultiSig", address=conf.contracts['multisig'], abi=MultiSigWallet.abi, owner=conf.acct)
vestingRegistry = Contract.from_abi("VestingRegistry", address=vestingRegistryAddress, abi=VestingRegistry.abi, owner=conf.acct)
data = vestingRegistry.addAdmin.encode_input(admin)
sendWithMultisig(conf.contracts['multisig'], vestingRegistry.address, data, conf.acct)
-def isVestingAdmin(admin, vestingRegistryAddress):
+def vestingRegistryProxyAddAdmin(admin):
+ vestingRegistry = Contract.from_abi("VestingRegistryLogic", address=contracts['VestingRegistryProxy'], abi=abi, owner=acct)
+ vestingRegistryAddAdmin(admin, vestingRegistry.address)
+
+def vestingRegistryRemoveAdmin(admin, vestingRegistryAddress):
+ multisig = Contract.from_abi("MultiSig", address=conf.contracts['multisig'], abi=MultiSigWallet.abi, owner=conf.acct)
+ vestingRegistry = Contract.from_abi("VestingRegistry", address=vestingRegistryAddress, abi=VestingRegistry.abi, owner=conf.acct)
+ data = vestingRegistry.removeAdmin.encode_input(admin)
+ sendWithMultisig(conf.contracts['multisig'], vestingRegistry.address, data, conf.acct)
+
+def vestingRegistryProxyRemoveAdmin(admin):
+ vestingRegistry = Contract.from_abi("VestingRegistryLogic", address=contracts['VestingRegistryProxy'], abi=abi, owner=acct)
+ vestingRegistryRemoveAdmin(admin, vestingRegistry.address)
+
+def isVestingRegistryAdmin(admin, vestingRegistryAddress):
vestingRegistry = Contract.from_abi("VestingRegistry", address=vestingRegistryAddress, abi=VestingRegistry.abi, owner=conf.acct)
print(vestingRegistry.admins(admin))
| 10 |
diff --git a/guide/popular-topics/reactions.md b/guide/popular-topics/reactions.md @@ -131,7 +131,7 @@ If you try again with either of the codeblocks above, you'll get the result you
-<p class="tip">If you aren't familiar with Promises or `async`/`await`, you can read more about them on [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise) or [our guide page on async/await]((/additional-info/async-await)!</p>
+<p class="tip">If you aren't familiar with Promises or `async`/`await`, you can read more about them on [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise) or [our guide page on async/await](additional-info/async-await)!</p>
However, if you don't mind the order the emojis react in, you can take advantage of `Promise.all()`, like so:
| 1 |
diff --git a/src/hooks/sanitizeHtml.js b/src/hooks/sanitizeHtml.js @@ -31,7 +31,7 @@ module.exports = (...fieldNames) => context => {
allowedAttributes: {
iframe: ['src', 'allowfullscreen', 'frameborder'],
a: ['target', 'href'],
- img: ['src'],
+ img: ['src', 'width'],
},
allowedClasses: {
'*': ['ql-indent-*'],
| 11 |
diff --git a/packages/uikit-default/package.json b/packages/uikit-default/package.json },
"homepage": "https://github.com/pattern-lab/styleguidekit-assets-default",
"devDependencies": {
- "gulp": "^3.8.6"
+ "gulp": "^3.8.6",
+ "gulp-autoprefixer": "0.0.8",
+ "gulp-concat": "^2.3.4",
+ "gulp-imagemin": "^0.6.1",
+ "gulp-jshint": "^1.8.0",
+ "gulp-load-plugins": "^0.5.3",
+ "gulp-minify-css": "^0.3.7",
+ "gulp-notify": "^1.4.0",
+ "gulp-rename": "^1.2.0",
+ "gulp-ruby-sass": "^0.6.0",
+ "gulp-uglify": "^0.3.1"
}
}
| 9 |
diff --git a/src/components/CartPopover/CartPopover.js b/src/components/CartPopover/CartPopover.js @@ -3,24 +3,13 @@ import PropTypes from "prop-types";
import Grid from "@material-ui/core/Grid";
import { withStyles } from "@material-ui/core/styles";
import Typography from "@material-ui/core/Typography";
-import CartCheckoutButton from "@reactioncommerce/components/CartCheckoutButton/v1";
-import Button from "@reactioncommerce/components/Button/v1";
-import Link from "components/Link";
-
-// import ButtonBase from "@material-ui/core/ButtonBase";
-// import InputAdornment from "@material-ui/core/InputAdornment";
-// import TextField from "@material-ui/core/TextField";
-// import Typography from "@material-ui/core/Typography";
-// import Minus from "mdi-material-ui/Minus";
-// import Plus from "mdi-material-ui/Plus";
-// import { inject, observer } from "mobx-react";
-// import Divider from "components/Divider";
+import CheckoutButtons from "components/CheckoutButtons";
const styles = (theme) => ({
container: {
alignItems: "center",
- boxShadow: `0 0 1em ${theme.palette.reaction.black30}`,
+ boxShadow: theme.boxShadow.depth2,
display: "flex",
marginLeft: "auto",
marginRight: "auto",
@@ -170,9 +159,7 @@ class CartPopover extends Component {
</Typography>
</Grid>
<Grid item xs={12}>
- <CartCheckoutButton
- components={{ Button }}
- isDisabled={false}
+ <CheckoutButtons
onClick={this.handleOnClick}
/>
</Grid>
| 14 |
diff --git a/modules/xerte/parent_templates/Nottingham/models_html5/topXQ.html b/modules/xerte/parent_templates/Nottingham/models_html5/topXQ.html AllAnswersCheckt = function(){
- var wrongs = 0;
+ var amountOfGood = 0;
if (x_currentPageXML.getAttribute("caseSensitivity") == "true" || x_currentPageXML.getAttribute("caseSensitivity") == undefined) {
if (givenAnswer === correctAnswer) {
answers[j].counter2++;
-
+ amountOfGood++;
if (answers[j].counter2 > 1) {
- wrongs++;
+ amountOfGood--;
}
break;
}
}
}
- if (givenAnswer !== correctAnswer) {
- wrongs++;
- }
}
} else {
for (i = 0; i < inputs.length; i++) {
if (givenAnswer === correctAnswer) {
answers[j].counter2++;
-
+ amountOfGood++;
if (answers[j].counter2 > 1) {
- wrongs++;
+ amountOfGood--;
}
break;
}
}
}
- if (givenAnswer !== correctAnswer) {
- wrongs++;
- }
}
}
- if(wrongs > 0){
- return false;
+ if(amountOfGood === answers.length){
+ return true;
}
};
label: checkBtnTxt
})
.click(function () {
+ debugger;
var tries = parseInt(x_currentPageXML.getAttribute("amountOfTries"));
amountofTries -= 1;
average *= 100;
+ debugger;
+
var passedOrFailed = "";
- if(AllAnswersCheckt() === false){
- passedOrFailed = failedTxt
- }else{
+ if(AllAnswersCheckt() === true){
passedOrFailed = passedTxt
+ }else{
+ passedOrFailed = failedTxt
}
$("#mainFeedback").append("<div>" + passedOrFailed + "</div>");
| 1 |
diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade @@ -7,8 +7,8 @@ template(name="board")
+boardBody
else
//-- XXX We need a better error message in case the board has been archived
- //-- +message(label="board-not-found")
- | {{goHome}}
+ +message(label="board-not-found")
+ //-- | {{goHome}}
else
+spinner
| 1 |
diff --git a/articles/libraries/auth0js/v8/index.md b/articles/libraries/auth0js/v8/index.md @@ -437,6 +437,10 @@ This callback page should only parse the URL hash and post it to the parent docu
Remember to add the URL of the silent authentication callback page that you create to the **Allowed Callback URLs** list of your Auth0 client in the [Auth0 Dashboard](${manage_url}) under your client's *Settings*.
+::: warning
+If the connection is a social connection and you are using Auth0 dev keys, the `renewAuth` call will always return `login_required`.
+:::
+
## Password reset requests
If attempting to set up a password reset functionality, you'll use the `changePassword` method and pass in an "options" object, with a "connection" parameter and an "email" parameter.
| 0 |
diff --git a/docs/content/examples/grid/RowEditing.js b/docs/content/examples/grid/RowEditing.js @@ -67,8 +67,11 @@ export const RowEditing = <cx>
records:bind="$page.records"
lockColumnWidths
cached
- rowStyle={{
+ row={{
+ style: {
background: {expr: "!!{$record.$editing} ? 'lightsteelblue' : null"}
+ },
+ valid: { bind: '$record.valid' }
}}
columns={[
{
@@ -81,6 +84,7 @@ export const RowEditing = <cx>
viewMode:expr="!{$record.$editing}"
style="width: 100%"
autoFocus
+ required
/>
</cx>
},
@@ -93,6 +97,7 @@ export const RowEditing = <cx>
value:bind="$record.continent"
viewMode:expr="!{$record.$editing}"
style="width: 100%"
+ required
/>
</cx>
},
@@ -105,6 +110,7 @@ export const RowEditing = <cx>
value:bind="$record.browser"
viewMode:expr="!{$record.$editing}"
style="width: 100%"
+ required
/>
</cx>
},
@@ -117,6 +123,7 @@ export const RowEditing = <cx>
value:bind="$record.os"
viewMode:expr="!{$record.$editing}"
style="width: 100%"
+ required
/>
</cx>
},
@@ -131,6 +138,7 @@ export const RowEditing = <cx>
viewMode:expr="!{$record.$editing}"
style="width: 100%"
inputStyle="text-align: right"
+ required
/>
</cx>
}, {
@@ -140,7 +148,7 @@ export const RowEditing = <cx>
items: <cx>
<Button mod="hollow" onClick="editRow" visible:expr="!{$record.$editing}">Edit</Button>
<Button mod="hollow" onClick="deleteRow" visible:expr="!{$record.$editing}" confirm="Are you sure?">Delete</Button>
- <Button mod="primary" onClick="saveRow" visible:expr="!!{$record.$editing}">Save</Button>
+ <Button mod="primary" onClick="saveRow" disabled:expr="!{$record.valid}" visible:expr="!!{$record.$editing}">Save</Button>
<Button mod="hollow" onClick="cancelRowEditing" visible:expr="!!{$record.$editing}">Cancel</Button>
</cx>
}
@@ -217,10 +225,14 @@ export const RowEditing = <cx>
records:bind="$page.records"
lockColumnWidths
cached
- rowStyle={{
+ row={{
+ style: {
background: {expr: "!!{$record.$editing} ? 'lightsteelblue' : null"}
+ },
+ valid: { bind: '$record.valid' }
}}
- columns={[{
+ columns={[
+ {
header: "Name",
field: "fullName",
sortable: true,
@@ -230,9 +242,11 @@ export const RowEditing = <cx>
viewMode:expr="!{$record.$editing}"
style="width: 100%"
autoFocus
+ required
/>
</cx>
- }, {
+ },
+ {
header: "Continent",
field: "continent",
sortable: true,
@@ -241,9 +255,11 @@ export const RowEditing = <cx>
value:bind="$record.continent"
viewMode:expr="!{$record.$editing}"
style="width: 100%"
+ required
/>
</cx>
- }, {
+ },
+ {
header: "Browser",
field: "browser",
sortable: true,
@@ -252,9 +268,11 @@ export const RowEditing = <cx>
value:bind="$record.browser"
viewMode:expr="!{$record.$editing}"
style="width: 100%"
+ required
/>
</cx>
- }, {
+ },
+ {
header: "OS",
field: "os",
sortable: true,
@@ -263,9 +281,11 @@ export const RowEditing = <cx>
value:bind="$record.os"
viewMode:expr="!{$record.$editing}"
style="width: 100%"
+ required
/>
</cx>
- }, {
+ },
+ {
header: "Visits",
field: "visits",
sortable: true,
@@ -276,6 +296,7 @@ export const RowEditing = <cx>
viewMode:expr="!{$record.$editing}"
style="width: 100%"
inputStyle="text-align: right"
+ required
/>
</cx>
}, {
@@ -285,7 +306,7 @@ export const RowEditing = <cx>
items: <cx>
<Button mod="hollow" onClick="editRow" visible:expr="!{$record.$editing}">Edit</Button>
<Button mod="hollow" onClick="deleteRow" visible:expr="!{$record.$editing}" confirm="Are you sure?">Delete</Button>
- <Button mod="primary" onClick="saveRow" visible:expr="!!{$record.$editing}">Save</Button>
+ <Button mod="primary" onClick="saveRow" disabled:expr="!{$record.valid}" visible:expr="!!{$record.$editing}">Save</Button>
<Button mod="hollow" onClick="cancelRowEditing" visible:expr="!!{$record.$editing}">Cancel</Button>
</cx>
}
| 0 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.