code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/core/algorithm-builder/dockerfile/get-deps-java.sh b/core/algorithm-builder/dockerfile/get-deps-java.sh #!/bin/bash
set -eo pipefail
SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
-mkdir -p $SCRIPTPATH/../environments/java/m2
export javaWrapperVersion='2.0-SNAPSHOT'
mkdir -p $SCRIPTPATH/../environments/java/debs
cd $SCRIPTPATH/../environments/java/debs
| 2 |
diff --git a/README.md b/README.md @@ -127,7 +127,7 @@ The tool will prompt you for your deploy settings, then provide you with two ite
It's also possible to deploy a site manually, without continuous deployment. This method uploads files directly from your local project directory to your site on Netlify, without running a build step. It also works with directories that are not Git repositories.
-A common use case for this command is when you're using a separate Contiuous Integration (CI) tool, deploying prebuilt files to Netlify at the end of the CI tool tasks.
+A common use case for this command is when you're using a separate Continuous Integration (CI) tool, deploying prebuilt files to Netlify at the end of the CI tool tasks.
### Create a new site
@@ -168,18 +168,26 @@ This command needs to know which folder to publish, and if your project includes
Here is an example using command flags to set the publish folder and functions folder:
```bash
-netlify deploy --publish-folder=_site --functions=functions
+netlify deploy --dir=build-folder --functions=functions
```
-### Draft Deploys
+By default, `deploy` will publish to draft previews. The draft site URL will display in the command line when the deploy is done.
-To preview a manual deploy without changing it in production, use the `--draft` flag:
+### Production Deploys
+
+By default, all `deploys` are set to a draft preview URL.
+
+To do a manual deploy to production, use the `--prod` flag:
```bash
-netlify deploy --draft
+# Deploy build folder to production
+netlify deploy --prod
+
+# Shorthand -p
+netlify deploy -p
```
-This will run a deploy just like your production deploy, but at a unique address. The draft site URL will display in the command line when the deploy is done.
+Deploying to production will publish the build directory at the live URL of your Netlify site.
## Inline Help
@@ -192,13 +200,13 @@ netlify help
For more information about a specific command, run `help` with the name of the command.
```bash
-netlify help deploy
+netlify deploy help
```
This also works for sub-commands.
```bash
-netlify help sites:create
+netlify sites:create help
```
## Full Command Reference
| 3 |
diff --git a/src/components/Timestamp/Timestamp.js b/src/components/Timestamp/Timestamp.js @@ -10,9 +10,9 @@ import type { TimestampProps } from "./Timestamp.types";
const Timestamp: ComponentType<TimestampProps> = ({ timestamp, format="D MMMM YYYY", ...props }) => {
- return <time dateTime={ timestamp } { ...props }>
- { moment(timestamp).format(format) }
- </time>;
+ return <time dateTime={ timestamp }
+ dangerouslySetInnerHTML={{ __html: moment(timestamp).format(format).replace(/\s/g, " ") }}
+ { ...props }/>
}; // Timestamp
| 14 |
diff --git a/src/payment-flows/native/eligibility.js b/src/payment-flows/native/eligibility.js @@ -129,32 +129,32 @@ export function isNativeEligible({ props, config, serviceData } : IsEligibleOpti
const { firebase: firebaseConfig } = config;
const { merchantID } = serviceData;
- if (!canUsePopupAppSwitch({ fundingSource }) && !canUseNativeQRCode({ fundingSource })) {
+ if (!firebaseConfig) {
return false;
}
- if (onShippingChange && !isNativeOptedIn({ props })) {
+ if (!canUsePopupAppSwitch({ fundingSource }) && !canUseNativeQRCode({ fundingSource })) {
return false;
}
- if (createBillingAgreement || createSubscription) {
- return false;
+ if (isNativeOptedIn({ props })) {
+ return true;
}
- if (!supportsPopups()) {
+ if (isNativeOptOut()) {
return false;
}
- if (!firebaseConfig) {
+ if (!supportsPopups()) {
return false;
}
- if (isNativeOptOut()) {
+ if (onShippingChange) {
return false;
}
- if (isNativeOptedIn({ props })) {
- return true;
+ if (createBillingAgreement || createSubscription) {
+ return false;
}
if (env === ENV.LOCAL || env === ENV.STAGE) {
| 11 |
diff --git a/package.json b/package.json {
"name": "prettier-atom",
"main": "./dist/main.js",
- "version": "0.39.0",
+ "version": "0.40.0",
"description": "Atom plugin for formatting JavaScript using prettier with (optional) prettier-eslint integration",
"keywords": [
"atom",
| 6 |
diff --git a/data.js b/data.js @@ -599,6 +599,14 @@ module.exports = [{
url: "https://github.com/evandrolg/Feed",
source: "https://raw.githubusercontent.com/EvandroLG/Feed/master/src/feed.js"
},
+ {
+ name: "Holen",
+ github: "RickStanley/Holen",
+ tags: ["xhr", "ajax", "nojquery", "xmlhttprequest", "x-requested-with", "http", "simple", "minimal", "german", "deutsch", "angular"],
+ description: "Simple and standalone AJAX library for modern browsers. Inspired by Angular's $http method.",
+ url: "https://github.com/RickStanley/Holen",
+ source: "https://raw.githubusercontent.com/RickStanley/Holen/master/index.js"
+ },
{
name: "Stoor",
github: "tiaanduplessis/stoor",
| 0 |
diff --git a/src/css/core.variables.styl b/src/css/core.variables.styl $space-base ?= 16px
$space-x-base ?= $space-base
$space-y-base ?= $space-base
-$spaces = {
+$spaces ?= {
none: {
x: 0,
y: 0
@@ -45,7 +45,7 @@ $flex-gutter-xl ?= 64px
$body-background ?= white
$body-color ?= #0c0c0c
-$flex-gutter = {
+$flex-gutter ?= {
none: 0,
xs: $flex-gutter-xs,
sm: $flex-gutter-sm,
@@ -61,20 +61,20 @@ $sizes ?= {
xl: $breakpoint-lg + 1 // Large screen / desktop
}
-$breakpoint-xs-min = 0
-$breakpoint-xs-max = $breakpoint-xs
+$breakpoint-xs-min ?= 0
+$breakpoint-xs-max ?= $breakpoint-xs
-$breakpoint-sm-min = $sizes[sm]
-$breakpoint-sm-max = $breakpoint-sm
+$breakpoint-sm-min ?= $sizes[sm]
+$breakpoint-sm-max ?= $breakpoint-sm
-$breakpoint-md-min = $sizes[md]
-$breakpoint-md-max = $breakpoint-md
+$breakpoint-md-min ?= $sizes[md]
+$breakpoint-md-max ?= $breakpoint-md
-$breakpoint-lg-min = $sizes[lg]
-$breakpoint-lg-max = $breakpoint-lg
+$breakpoint-lg-min ?= $sizes[lg]
+$breakpoint-lg-max ?= $breakpoint-lg
-$breakpoint-xl-min = $sizes[xl]
-$breakpoint-xl-max = 9999px
+$breakpoint-xl-min ?= $sizes[xl]
+$breakpoint-xl-max ?= 9999px
$backdrop-opacity ?= .3
$backdrop-background ?= rgba(0, 0, 0, $backdrop-opacity)
@@ -82,7 +82,7 @@ $backdrop-background ?= rgba(0, 0, 0, $backdrop-opacity)
$router-link-active ?= router-link-active
$router-link-exact-active ?= router-link-exact-active
-$headings = {
+$headings ?= {
display-4: {
size: 112px,
weight: 300,
@@ -147,7 +147,7 @@ $headings = {
}
}
-$h-tags = {
+$h-tags ?= {
h1: $headings.display-4,
h2: $headings.display-3,
h3: $headings.display-2,
@@ -156,7 +156,7 @@ $h-tags = {
h6: $headings.title
}
-$text-weights = {
+$text-weights ?= {
thin: 100,
light: 300,
regular: 400,
@@ -440,21 +440,21 @@ $brown-11 = #d7ccc8
$brown-12 = #bcaaa4
$brown-13 = #8d6e63
$brown-14 = #5d4037
-$grey = #9e9e9e
-$grey-1 = #fafafa
-$grey-2 = #f5f5f5
-$grey-3 = #eeeeee
-$grey-4 = #e0e0e0
-$grey-5 = #bdbdbd
-$grey-6 = #9e9e9e
-$grey-7 = #757575
-$grey-8 = #616161
-$grey-9 = #424242
-$grey-10 = #212121
-$grey-11 = #f5f5f5
-$grey-12 = #eeeeee
-$grey-13 = #bdbdbd
-$grey-14 = #616161
+$grey ?= #9e9e9e
+$grey-1 ?= #fafafa
+$grey-2 ?= #f5f5f5
+$grey-3 ?= #eeeeee
+$grey-4 ?= #e0e0e0
+$grey-5 ?= #bdbdbd
+$grey-6 ?= #9e9e9e
+$grey-7 ?= #757575
+$grey-8 ?= #616161
+$grey-9 ?= #424242
+$grey-10 ?= #212121
+$grey-11 ?= #f5f5f5
+$grey-12 ?= #eeeeee
+$grey-13 ?= #bdbdbd
+$grey-14 ?= #616161
$blue-grey = #607d8b
$blue-grey-1 = #eceff1
$blue-grey-2 = #cfd8dc
| 3 |
diff --git a/package.json b/package.json {
"name": "prettier-atom",
"main": "./dist/main.js",
- "version": "0.51.0",
+ "version": "0.52.0",
"description": "Atom plugin for formatting JavaScript using prettier with (optional) prettier-eslint integration",
"keywords": [
"atom",
| 6 |
diff --git a/server/typeDefs/flight.ts b/server/typeDefs/flight.ts @@ -35,6 +35,7 @@ export const aspectList = [
export function addAspects(template, sim: Classes.Simulator, data = App) {
// Duplicate all of the other stuff attached to the simulator too.
+
aspectList.forEach(aspect => {
if (
aspect === "softwarePanels" ||
@@ -461,11 +462,25 @@ const resolver = {
newSim.template = false;
newSim.templateId = tempId;
newSim.mission = sim.mission;
- newSim.stations = sim.stations;
+ newSim.stations = sim.stations.map(
+ s =>
+ new Classes.Station({
+ ...s,
+ cards: s.cards.map(c => {
+ const panelIndex = sim.panels.indexOf(c.component);
+ if (panelIndex > -1) {
+ return new Classes.Card({
+ ...c,
+ component: newSim.panels[panelIndex],
+ });
+ }
+ return new Classes.Card({...c});
+ }),
+ }),
+ );
newSim.executedTimelineSteps = [];
newSim.clientCards = {};
newSim.stationAssignedCards = {};
-
newSim.stationSet = sim.stationSet;
const stationSet = App.stationSets.find(
s => s.id === newSim.stationSet,
@@ -489,7 +504,7 @@ const resolver = {
),
);
App.simulators.push(newSim);
- addAspects({simulatorId: tempId}, newSim);
+ addAspects({simulatorId: tempId}, newSim, App);
// Create exocomps for the simulator
App.handleEvent(
{simulatorId: newSim.id, count: newSim.exocomps},
| 1 |
diff --git a/activities/Measure.activity/css/activity.css b/activities/Measure.activity/css/activity.css @@ -472,37 +472,44 @@ p {
background-image: url("../icons/help.svg");
}
-@media only screen and (max-width: 967px) {
- #logging-interval-button {
+@media only screen and (max-width: 1019px) {
+ #capture-image-button {
display: none;
}
- #record-off-button {
- display: none;
}
+
+@media only screen and (max-width: 960px) {
#export-button {
display: none;
}
- #afterLoggingSplitbar {
- display: none !important;
- }
}
-@media only screen and (max-width: 780px) {
- #capture-image-button {
+@media only screen and (max-width: 903px) {
+ #logging-interval-button {
display: none;
}
}
-@media only screen and (max-width: 721px) {
- #tuning-palette-button {
+@media only screen and (max-width: 845px) {
+ #record-off-button {
display: none;
}
+ #afterLoggingSplitbar {
+ display: none !important;
}
+}
+
+@media only screen and (max-width: 774px) {
-@media only screen and (max-width: 663px) {
#afterTuningSplitbar {
visibility: hidden;
}
+ #tuning-palette-button {
+ display: none;
+ }
+}
+
+@media only screen and (max-width: 718px) {
#instrument-select-button {
display: none;
}
| 7 |
diff --git a/src/page/HomePage/Report/ReportHistoryView.js b/src/page/HomePage/Report/ReportHistoryView.js @@ -18,18 +18,11 @@ class ReportHistoryView extends React.Component {
constructor(props) {
super(props);
+ // Keeps track of the history length so that when length changes, the list is scrolled to the bottom
this.previousReportHistoryLength = 0;
this.recordlastReadActionID = _.debounce(this.recordlastReadActionID.bind(this), 1000, true);
- }
-
- componentDidUpdate(prevProps) {
- if (prevProps.reportID !== this.props.reportID) {
- this.previousReportHistoryLength = 0;
- if (this.historyItemList) {
- this.historyItemList.scrollToEnd({animated: false});
- }
- }
+ this.scrollToBottomWhenListSizeChanges = this.scrollToBottomWhenListSizeChanges.bind(this);
}
/**
@@ -107,25 +100,29 @@ class ReportHistoryView extends React.Component {
});
}
- render() {
+ scrollToBottomWhenListSizeChanges(el) {
+ if (el) {
const filteredHistory = this.getFilteredReportHistory();
-
- if (filteredHistory.length === 0) {
- return <Text>Be the first person to comment!</Text>;
- }
-
console.log(this.previousReportHistoryLength, filteredHistory.length);
if (this.previousReportHistoryLength < filteredHistory.length) {
- if (this.historyItemList) {
console.log('scroll')
- this.historyItemList.scrollToEnd({animated: false});
- }
+ el.scrollToEnd({animated: false});
}
this.previousReportHistoryLength = filteredHistory.length;
+ }
+ }
+
+ render() {
+ const filteredHistory = this.getFilteredReportHistory();
+
+ if (filteredHistory.length === 0) {
+ return <Text>Be the first person to comment!</Text>;
+ }
+
return (
- <ScrollView ref={el => this.historyItemList = el}>
+ <ScrollView ref={this.scrollToBottomWhenListSizeChanges}>
{_.map(filteredHistory, (item, index) => (
<ReportHistoryItem
key={item.sequenceNumber}
| 7 |
diff --git a/src/js/common_shim.js b/src/js/common_shim.js @@ -259,7 +259,9 @@ module.exports = {
// Determine final maximum message size
var maxMessageSize;
- if (canSendMMS === 0 || remoteMMS === 0) {
+ if (canSendMMS === 0 && remoteMMS === 0) {
+ maxMessageSize = Number.POSITIVE_INFINITY;
+ } else if (canSendMMS === 0 || remoteMMS === 0) {
maxMessageSize = Math.max(canSendMMS, remoteMMS);
} else {
maxMessageSize = Math.min(canSendMMS, remoteMMS);
| 12 |
diff --git a/fxmanifest.lua b/fxmanifest.lua @@ -7,8 +7,9 @@ description 'Remotely Manage & Monitor your GTA5 FiveM Server'
repository 'https://github.com/tabarra/txAdmin'
version '3.2.0-dev'
+rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'
fx_version 'bodacious'
-games { 'gta5' }
+games { 'gta5', 'rdr3' }
-- NOTE: Due to global package constraints, js scripts will be loaded from main.js
server_scripts {
| 0 |
diff --git a/source/timezones/TimeZone.js b/source/timezones/TimeZone.js @@ -232,21 +232,11 @@ class TimeZone {
}
const addTimeZone = function (timeZone) {
- let area = TimeZone.areas;
- const parts = timeZone.name.split('/');
- const l = parts.length - 1;
- let i;
- for (i = 0; i < l; i += 1) {
- area = area[parts[i]] || (area[parts[i]] = {});
- }
- area[parts[l]] = timeZone;
-
TimeZone[timeZone.id] = timeZone;
};
TimeZone.rules = {
'-': [],
};
-TimeZone.areas = {};
export { TimeZone };
| 2 |
diff --git a/src/traces/pie/attributes.js b/src/traces/pie/attributes.js @@ -187,7 +187,6 @@ module.exports = {
values: ['horizontal', 'radial', 'tangential', 'auto'],
dflt: 'auto',
editType: 'plot',
-
description: [
'The `insidetextorientation` attribute controls the',
'orientation of the text inside chart sectors.',
| 2 |
diff --git a/content/questions/confusing-date/index.md b/content/questions/confusing-date/index.md @@ -10,7 +10,7 @@ answers:
- '1/1/2019 1/1/2019'
---
-Consider the following code block which calls the Date constructor with 2 type of values. What will be the output of `console.log`?
+Consider the following code block which calls the Date constructor with 2 type of values. In a US environment, what will be the output of `console.log`?
```javascript
let a = new Date("2019,1,1").toLocaleDateString();
| 0 |
diff --git a/samples/javascript_nodejs/09.message-routing/bot.js b/samples/javascript_nodejs/09.message-routing/bot.js @@ -115,7 +115,7 @@ class MessageRoutingBot {
* Determine whether a turn is interrupted and handle interruption based off user's utterance.
*
* @param {DialogContext} dc - dialog context
- * @param {string} utterance - user's utterance
+ * @param {string} utterance - user's utterance is normalized via the .trim().toLowerCase() calls
*/
async isTurnInterrupted(dc, utterance) {
| 0 |
diff --git a/js/dataobjects/bisweb_taskutils.js b/js/dataobjects/bisweb_taskutils.js @@ -54,11 +54,11 @@ let parseFile = (filename) => {
}
//return results with relevant metadata
- let tr = parseInt(obj.data.tr), units = parseInt(obj.data.units), offset = parseInt(obj.data.offset), frames = parseInt(obj.data.frames);
+ let tr = parseInt(obj.data.tr), offset = parseInt(obj.data.offset), frames = parseInt(obj.data.frames);
if (frames && frames < chartRanges.highRange) { chartRanges.highRange = frames; }
let tasks = parseRegionsFromRuns(parsedRuns, chartRanges, parsedData, offset);
- let resObj = Object.assign(tasks, { 'runs' : parsedRuns, 'range' : chartRanges, 'tr' : tr, 'units' : units, 'offset' : offset });
+ let resObj = Object.assign(tasks, { 'runs' : parsedRuns, 'range' : chartRanges, 'tr' : tr, 'offset' : offset });
resolve(resObj);
}).catch( (e) => { reject(e); });
});
| 2 |
diff --git a/src/traces/mesh3d/attributes.js b/src/traces/mesh3d/attributes.js @@ -163,7 +163,10 @@ module.exports = extendFlat({
editType: 'calc',
description: [
'Sets the color of each vertex',
- 'Overrides *color*.'
+ 'Overrides *color*. While Red, green and blue colors',
+ 'are in the range of 0 and 255; in the case of having',
+ 'vertex color data in RGBA format, the alpha color',
+ 'should be normalized to be between 0 and 1.'
].join(' ')
},
facecolor: {
| 3 |
diff --git a/lib/ui/components/new/QuickEdit.js b/lib/ui/components/new/QuickEdit.js @@ -37,7 +37,7 @@ const arrowSectionStyle = Object.assign({}, sectionStyle, {
});
const disabledArrowSectionStyle = Object.assign({}, sectionStyle, {
- opacity: '0.3'
+ cursor: 'default'
});
const responseBodyInputStyle = {
@@ -62,6 +62,10 @@ const iconStyle = {
height: '16px'
};
+const disabledIconStyle = Object.assign({}, iconStyle, {
+ opacity: '0.3'
+});
+
const delayOptions = [
{ value: 500, label: '0.5s' },
{ value: 1000, label: '1s' },
@@ -127,12 +131,16 @@ class QuickEdit extends React.Component {
<div style={ containerStyle }>
<div style={ this.isFirstCapturedRequest ? disabledArrowSectionStyle : arrowSectionStyle }
onClick={ this.selectPreviousRequest }>
- <img src={ leftIcon } style={ iconStyle } alt="Previous Request"/>
+ <img src={ leftIcon }
+ style={ this.isFirstCapturedRequest ? disabledIconStyle : iconStyle }
+ alt="Previous Request"/>
</div>
<div style={ this.isLastCapturedRequest ? disabledArrowSectionStyle : arrowSectionStyle }
onClick={ this.selectNextRequest }>
- <img src={ rightIcon } style={ iconStyle } alt="Next Request"/>
+ <img src={ rightIcon }
+ style={ this.isLastCapturedRequest ? disabledIconStyle : iconStyle }
+ alt="Next Request"/>
</div>
<div style={ sectionStyle }>
| 7 |
diff --git a/pages/docs/manual/latest/variant.mdx b/pages/docs/manual/latest/variant.mdx @@ -310,7 +310,7 @@ ReScript also provides [a few other ways](bind-to-js-function.md#modeling-polymo
### Variant Types Are Found By Field Name
-Please refer to this [record section](record#record-types-are-found-by-field-name). Variants are the same: a function can't accept an arbitrary constructor shared by two different variants. Again, such feature exists; it's called a polymorphic variant. We'll talk about this in the future =).
+Please refer to this [record section](record#tips--tricks). Variants are the same: a function can't accept an arbitrary constructor shared by two different variants. Again, such feature exists; it's called a polymorphic variant. We'll talk about this in the future =).
## Design Decisions
| 1 |
diff --git a/html/base/inputs/_checkbox.scss b/html/base/inputs/_checkbox.scss border-color: $sprk-checkbox-huge-container-hover-border-color;
box-shadow: $sprk-checkbox-huge-container-hover-box-shadow;
+ /* stylelint-disable max-nesting-depth */
&::before {
- /* stylelint-disable-line max-nesting-depth */
border-color: $sprk-checkbox-huge-custom-input-hover-border-color;
}
+
+ /* stylelint-enable max-nesting-depth */
}
}
| 3 |
diff --git a/core/server/web/shared/middlewares/api/spam-prevention.js b/core/server/web/shared/middlewares/api/spam-prevention.js @@ -3,10 +3,26 @@ const extend = require('lodash/extend');
const pick = require('lodash/pick');
const errors = require('@tryghost/errors');
const config = require('../../../../../shared/config');
-const i18n = require('../../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
const logging = require('@tryghost/logging');
const spam = config.get('spam') || {};
+const messages = {
+ forgottenPasswordEmail: {
+ error: 'Only {rfa} forgotten password attempts per email every {rfp} seconds.',
+ context: 'Forgotten password reset attempt failed'
+ },
+ forgottenPasswordIp: {
+ error: 'Only {rfa} tries per IP address every {rfp} seconds.',
+ context: 'Forgotten password reset attempt failed'
+ },
+ tooManySigninAttempts: {
+ error: 'Only {rateSigninAttempts} tries per IP address every {rateSigninPeriod} seconds.',
+ context: 'Too many login attempts.'
+ },
+ tooManyAttempts: 'Too many attempts.'
+};
+
const spamPrivateBlock = spam.private_block || {};
const spamGlobalBlock = spam.global_block || {};
const spamGlobalReset = spam.global_reset || {};
@@ -64,9 +80,9 @@ const globalBlock = () => {
failCallback(req, res, next, nextValidRequestDate) {
return next(new errors.TooManyRequestsError({
message: `Too many attempts try again in ${moment(nextValidRequestDate).fromNow(true)}`,
- context: i18n.t('errors.middleware.spamprevention.forgottenPasswordIp.error',
+ context: tpl(messages.forgottenPasswordIp.error,
{rfa: spamGlobalBlock.freeRetries + 1 || 5, rfp: spamGlobalBlock.lifetime || 60 * 60}),
- help: i18n.t('errors.middleware.spamprevention.tooManyAttempts')
+ help: tpl(messages.tooManyAttempts)
}));
},
handleStoreError: handleStoreError
@@ -94,9 +110,9 @@ const globalReset = () => {
// TODO use i18n again
return next(new errors.TooManyRequestsError({
message: `Too many attempts try again in ${moment(nextValidRequestDate).fromNow(true)}`,
- context: i18n.t('errors.middleware.spamprevention.forgottenPasswordIp.error',
+ context: tpl(messages.forgottenPasswordIp.error,
{rfa: spamGlobalReset.freeRetries + 1 || 5, rfp: spamGlobalReset.lifetime || 60 * 60}),
- help: i18n.t('errors.middleware.spamprevention.forgottenPasswordIp.context')
+ help: tpl(messages.forgottenPasswordIp.context)
}));
},
handleStoreError: handleStoreError
@@ -128,8 +144,8 @@ const userLogin = () => {
return next(new errors.TooManyRequestsError({
message: `Too many sign-in attempts try again in ${moment(nextValidRequestDate).fromNow(true)}`,
// TODO add more options to i18n
- context: i18n.t('errors.middleware.spamprevention.tooManySigninAttempts.context'),
- help: i18n.t('errors.middleware.spamprevention.tooManySigninAttempts.context')
+ context: tpl(messages.tooManySigninAttempts.context),
+ help: tpl(messages.tooManySigninAttempts.context)
}));
},
handleStoreError: handleStoreError
@@ -159,9 +175,9 @@ const userReset = function userReset() {
failCallback(req, res, next, nextValidRequestDate) {
return next(new errors.TooManyRequestsError({
message: `Too many password reset attempts try again in ${moment(nextValidRequestDate).fromNow(true)}`,
- context: i18n.t('errors.middleware.spamprevention.forgottenPasswordEmail.error',
+ context: tpl(messages.forgottenPasswordEmail.error,
{rfa: spamUserReset.freeRetries + 1 || 5, rfp: spamUserReset.lifetime || 60 * 60}),
- help: i18n.t('errors.middleware.spamprevention.forgottenPasswordEmail.context')
+ help: tpl(messages.forgottenPasswordEmail.context)
}));
},
handleStoreError: handleStoreError
@@ -189,12 +205,12 @@ const privateBlog = () => {
attachResetToRequest: false,
failCallback(req, res, next, nextValidRequestDate) {
logging.error(new errors.TooManyRequestsError({
- message: i18n.t('errors.middleware.spamprevention.tooManySigninAttempts.error',
+ message: tpl(messages.tooManySigninAttempts.error,
{
rateSigninAttempts: spamPrivateBlock.freeRetries + 1 || 5,
rateSigninPeriod: spamPrivateBlock.lifetime || 60 * 60
}),
- context: i18n.t('errors.middleware.spamprevention.tooManySigninAttempts.context')
+ context: tpl(messages.tooManySigninAttempts.context)
}));
return next(new errors.TooManyRequestsError({
@@ -218,7 +234,7 @@ const contentApiKey = () => {
attachResetToRequest: true,
failCallback(req, res, next) {
const err = new errors.TooManyRequestsError({
- message: i18n.t('errors.middleware.spamprevention.tooManyAttempts')
+ message: tpl(messages.tooManyAttempts)
});
logging.error(err);
| 14 |
diff --git a/src/core/viewport.js b/src/core/viewport.js @@ -306,7 +306,7 @@ let corefn = ({
_p.maxZoom = max;
} else if( is.number( min ) && max === undefined && min <= _p.maxZoom ){
_p.minZoom = min;
- } else if( is.number( max ) && min === undefined && max <= _p.minZoom ){
+ } else if( is.number( max ) && min === undefined && max >= _p.minZoom ){
_p.maxZoom = max;
}
| 1 |
diff --git a/lib/rules/index.js b/lib/rules/index.js @@ -156,9 +156,9 @@ function tpl(str, data){
.split('%>').join('p.push(\'')
.split('\r').join('\\\'');
try {
- fn = new Function('it',
+ fn = new Function('obj',
'var p=[],print=function(){p.push.apply(p,arguments);};' +
- 'p.push(\'' + str + '\');return p.join(\'\');');
+ 'with(obj){p.push(\'' + str + '\');}return p.join(\'\');');
} catch (e) {
fn = e;
throw e;
| 1 |
diff --git a/src/geo/polygon.js b/src/geo/polygon.js const PRO = Polygon.prototype;
- /** ******************************************************************
- * Polygon Filter/Chain Functions
- ******************************************************************* */
-
- Polygon.filterTooSmall = function(p) {
- return p.length < 3 ? null : p;
- };
-
- Polygon.filterTooSkinny = function(p) {
- return (p.circularityDeep() * p.areaDeep()) < 0.25 ? null : p;
- };
-
- Polygon.filterArea = function(area) {
- return function(p) {
- return p.area() >= area ? p : null;
- };
- };
-
- Polygon.filterDeleted = function(p) {
- return p.delete ? null : p;
- };
-
- Polygon.filterInside = function(pin) {
- return function(p) {
- return pin.contains(p);
- }
- };
-
- Polygon.filterCollect = function(out) {
- return function(p) {
- out.push(p);
- return p;
- }
- };
-
- Polygon.filterEvolve = function(p) {
- return p.evolve();
- };
-
- Polygon.filterChain = function(filters) {
- return function() {
- let f = filters;
- return function(p) {
- let len = f.length,
- idx = 0;
- while (idx < len && (p = f[idx++](p)))
- ;
- return p;
- }
- }();
- };
-
Polygon.fromArray = function(array) {
return newPolygon().fromArray(array);
};
| 2 |
diff --git a/Source/Scene/Camera.js b/Source/Scene/Camera.js @@ -366,6 +366,8 @@ Camera.prototype._updateCameraChanged = function () {
camera._changedHeading = camera.heading;
}
+ var headingChanged = camera._changedHeading === camera.heading ? false : true;
+
if (camera._mode === SceneMode.SCENE2D) {
if (!defined(camera._changedFrustum)) {
camera._changedPosition = Cartesian3.clone(
| 3 |
diff --git a/test/image/mocks/z-new_tickmode_sync.json b/test/image/mocks/z-new_tickmode_sync.json "name": "Oranges",
"type": "scatter",
"x": [
- "Jan",
- "Feb",
- "Mar",
- "Apr",
- "May"
+ "A",
+ "B",
+ "C"
],
"y": [
- -0.8,
- 0.09,
- 0.01,
- 0.13,
- 0.42
+ 0,
+ 0.5,
+ 1
],
- "yaxis": "y2"
+ "yaxis": "y2",
+ "xaxis": "x2"
}
],
"layout": {
"l": 70
},
"width": 700,
- "legend": {
- "orientation": "h",
- "x": 0.6,
- "y": 1.1
+ "showlegend": false,
+ "xaxis": {
+ "autorange": "true"
+ },
+ "xaxis2": {
+ "anchor": "y2",
+ "side": "top",
+ "overlaying": "x",
+ "tickmode": "sync",
+ "domain": [
+ 0.52,
+ 1
+ ]
},
"yaxis": {
"title": {
0,
2506
],
- "minor": { "showgrid": true }
+ "minor": {
+ "showgrid": true
+ }
},
"yaxis2": {
"title": {
],
"overlaying": "y",
"tickmode": "sync",
- "minor": { "showgrid": true },
+ "minor": {
+ "showgrid": true
+ },
"zeroline": false
}
}
| 0 |
diff --git a/articles/protocols/saml/saml-idp-generic.md b/articles/protocols/saml/saml-idp-generic.md @@ -28,7 +28,7 @@ In this section you will configure Auth0 to serve as an Identity Provider. You
2. Click on the red **"+ CREATE CLIENT"** button on the right.
-3. In the **Name** field, enter a name like "MySAMLApp".
+3. In the **Name** field, enter a name like "MySAMLApp", and select the [client type](/clients/client-types-and-settings).
4. Press the blue **"SAVE"** button.
| 0 |
diff --git a/config/engine_config.js b/config/engine_config.js @@ -28,21 +28,15 @@ EngineConfig.prototype.update = function(data, callback) {
var profileDir = __dirname + '/../profiles/' + newProfile;
var stat = fs.statSync(profileDir);
if(!stat.isDirectory()) {
- console.log("not a directory")
throw new Error('Not a directory: ' + profileDir)
- } else {
- console.log("New profile directory exists")
}
- console.log("fuckin made it")
} catch(e) {
- console.log("meeeeyyyyyyah")
logger.warn(e);
data[key] = 'default';
}
}
if((key in this._cache) && (data[key] != this._cache[key]) && (this.userConfigLoaded)) {
- console.log("profile changed")
profile_changed = true;
}
}
| 1 |
diff --git a/src/User.jsx b/src/User.jsx @@ -67,6 +67,7 @@ const User = ({address, setAddress, open, setOpen, toggleOpen, setLoginFrom}) =>
} else if (error) {
setLoginError(String(error).toLocaleUpperCase());
}
+ window.history.pushState({}, '', window.location.origin);
setLoggingIn(false);
} else {
await WebaWallet.waitForLoad(); // it may occur that wallet loading is in progress already
| 2 |
diff --git a/src/components/ActionCard.js b/src/components/ActionCard.js import React from "react"
import styled from "styled-components"
import Img from "gatsby-image"
+import Translation from "../components/Translation"
import Link from "./Link"
@@ -70,8 +71,12 @@ const ActionCard = ({
)}
</ImageWrapper>
<Content className="action-card-content">
- <h3>{title}</h3>
- <Description>{description}</Description>
+ <h3>
+ <Translation id={title} />
+ </h3>
+ <Description>
+ <Translation id={description} />
+ </Description>
{children}
</Content>
</Card>
| 12 |
diff --git a/lib/waterline/utils/query/process-all-records.js b/lib/waterline/utils/query/process-all-records.js @@ -387,6 +387,10 @@ module.exports = function processAllRecords(records, meta, modelIdentity, orm) {
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
}
+ // If the value is NULL and the attribute has allowNull set to true it's ok
+ else if (_.isNull(record[attrName]) && _.has(attrDef, 'allowNull') && attrDef.allowNull === true) {
+ // Nothing to validate here
+ }
// Otherwise, we know there's SOMETHING there at least.
else {
| 11 |
diff --git a/src/lib/utils/hotReloadComponent.js b/src/lib/utils/hotReloadComponent.js +import Config from '../../config/config'
import { isWeb } from './platform'
+const runningTests = Config.env === 'test'
+
/*
Hot reloads components for web-ONLY as react-native already has built-in hot refresher
*/
const hotReloadComponent = Component => {
- if (isWeb) {
+ if (isWeb && !runningTests) {
const { hot } = require('react-hot-loader/root')
return hot(Component)
}
| 0 |
diff --git a/OurUmbraco.Site/config/Dashboard.config b/OurUmbraco.Site/config/Dashboard.config </tab>
</section>
- <section alias="ReleasesDashboard">
- <areas>
- <area>developer</area>
- </areas>
- <tab caption="YouTrack Releases">
- <control showOnce="false" addPanel="true" panelCaption="">
- ~/usercontrols/dashboard/ForceYouTrackDownload.ascx
- </control>
- </tab>
- </section>
<section alias="UmbracoHealthCheck">
<areas>
<area>developer</area>
| 2 |
diff --git a/articles/rules/current/management-api.md b/articles/rules/current/management-api.md @@ -14,9 +14,15 @@ useCase:
---
# Use the Management API in Rules
-You have limited access to the [Management API](/api/management/v2) inside Rules. In particular, the version of the Node.js client library available from rules only allow you to update the user's `app_metadata` and `user_metadata` as descibed in [User Metadata in Rules](/rules/current/metadata-in-rules).
+When you write [Rules](/rules), you can use the `auth0` object to update a user's `app_metadata` or `user_metadata` (for details on how to do that, see [User Metadata in Rules](/rules/current/metadata-in-rules)).
-## Accessing a Newer Version of the Node.js Client Library
+If you wish to access more [Management API](/api/management/v2) endpoints inside Rules, you have to use another version of the library.
+
+:::warning
+[Searching for users](/users/search/best-practices) inside Rules may affect the performance of your logins and we advise against it.
+:::
+
+## How to access a newer version of the library
You can load a newer version of the Auth0 Node.js client library by requiring the specific version on the library. The sample code below loads version `2.6.0` of the library, then query the list of users and log the users to the console (to be inspected with the [Real-time Webtask Logs Extension](/extensions/realtime-webtask-logs)):
| 3 |
diff --git a/app/containers/App.js b/app/containers/App.js @@ -60,6 +60,8 @@ import {
VIEW,
SHEET_TYPE,
SHEET_FIT,
+ DEFAULT_THUMB_COUNT,
+ DEFAULT_COLUMN_COUNT,
DEFAULT_SHEET_SCENES,
DEFAULT_SHEET_INTERVAL,
} from '../utils/constants';
@@ -1126,14 +1128,14 @@ class App extends Component {
store.dispatch(addDefaultThumbs(
file,
sheetName,
- this.props.settings.defaultThumbCount,
+ DEFAULT_THUMB_COUNT, // use constant value instead of defaultThumbCount
sceneArray[sceneIndex].start,
sceneArray[sceneIndex].start + sceneArray[sceneIndex].length
));
}
store.dispatch(setSheet(sheetName));
store.dispatch(setView(VIEW.GRIDVIEW));
-
+ // store.dispatch(updateFileColumnCount(DEFAULT_COLUMN_COUNT));
}
onAddThumbClick(file, existingThumb, insertWhere) {
@@ -1558,8 +1560,9 @@ class App extends Component {
onSetSheetClick = (value) => {
const { store } = this.context;
store.dispatch(setSheet(value));
- if (value.indexOf(SHEET_TYPE.SCENE) > -1) {
+ if (value.indexOf(SHEET_TYPE.SCENES) > -1) {
store.dispatch(setView(VIEW.TIMELINEVIEW));
+ this.onReCaptureClick(false);
} else {
store.dispatch(setView(VIEW.GRIDVIEW));
}
| 12 |
diff --git a/src/apps.json b/src/apps.json ],
"html": "<link[^>]* href=\"[^\"]*material(?:\\.[\\w]+-[\\w]+)?(?:\\.min)?\\.css",
"icon": "Material Design Lite.png",
- "script": "material(?:\\.min)?\\.js",
+ "script": "(?:/([\\d.]+))?/material(?:\\.min)?\\.js\\;version:\\1",
+ "js": {
+ "MaterialIconToggle": ""
+ },
"website": "https://getmdl.io"
},
"Materialize CSS": {
| 7 |
diff --git a/index.ts b/index.ts @@ -8,12 +8,12 @@ import {ComponentDidAppearEvent, ComponentDidDisappearEvent, Navigation} from 'r
import {Events, Screens} from './app/constants';
import DatabaseManager from './app/database/manager';
import {getAllServerCredentials} from './app/init/credentials';
-import GlobalEventHandler from './app/init/global_event_handler';
import {initialLaunch} from './app/init/launch';
import ManagedApp from './app/init/managed_app';
-import NetworkManager from './app/init/network_manager';
import PushNotifications from './app/init/push_notifications';
-import WebsocketManager from './app/init/websocket_manager';
+import GlobalEventHandler from './app/managers/global_event_handler';
+import NetworkManager from './app/managers/network_manager';
+import WebsocketManager from './app/managers/websocket_manager';
import {registerScreens} from './app/screens';
import EphemeralStore from './app/store/ephemeral_store';
import setFontFamily from './app/utils/font_family';
| 14 |
diff --git a/lib/node_modules/@stdlib/_tools/scripts/publish_packages.js b/lib/node_modules/@stdlib/_tools/scripts/publish_packages.js @@ -50,7 +50,7 @@ var ENV = require( '@stdlib/process/env' );
var debug = logger( 'scripts:publish-packages' );
var START_PKG_INDEX = 0;
-var END_PKG_INDEX = 30;
+var END_PKG_INDEX = 50;
var INSTALLATION_SECTION = [
'<section class="installation">',
@@ -374,7 +374,7 @@ function publish( pkg, clbk ) {
command = [
'find '+dist+' -type f -name \'manifest.json\' -print0 ', // Find all `manifest.json` files in the destination directory and print their full names to standard output...
- '| xargs -0 ', // Convert standard input to the arguments for following `sed` command...
+ '| xargs -r -0 ', // Convert standard input to the arguments for following `sed` command if `find` returns output...
'sed -Ei ', // Edit files in-place without creating a backup...
'"/',
'@stdlib\\/[^ ]+', // Match @stdlib package names in dependencies
| 9 |
diff --git a/src/tags/control/TextArea/TextArea.js b/src/tags/control/TextArea/TextArea.js @@ -392,7 +392,7 @@ const HtxTextAreaRegionView = observer(({ item, area, collapsed, setCollapsed })
const lastFocusRequest = useRef(0);
useEffect(() => {
if (isActive && shouldFocus && lastFocusRequest.current < area.perRegionFocusRequest) {
- (mainInputRef.current || firstResultInputRef.current)?.focus?.();
+ (mainInputRef.current || firstResultInputRef.current)?.focus({ cursor: 'end' });
lastFocusRequest.current = area.perRegionFocusRequest;
}
}, [isActive, shouldFocus]);
| 12 |
diff --git a/token-metadata/0x249f71F8D9dA86c60f485E021b509A206667A079/metadata.json b/token-metadata/0x249f71F8D9dA86c60f485E021b509A206667A079/metadata.json "symbol": "SNGJ",
"address": "0x249f71F8D9dA86c60f485E021b509A206667A079",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/main-blockchain/Blockchain.js b/src/main-blockchain/Blockchain.js @@ -151,7 +151,7 @@ class Blockchain{
console.warn("################### RESYNCHRONIZATION STARTED ##########");
let suspendMining = false;
- if (this.blockchain.agent.light && NodesList.nodes.length <= 0)
+ if (!this.blockchain.light || (this.blockchain.light && NodesList.nodes.length <= 0))
suspendMining = true;
if (suspendMining) {
| 13 |
diff --git a/tools/make/lib/node/addons.mk b/tools/make/lib/node/addons.mk @@ -46,6 +46,7 @@ install-node-addons: $(NODE_MODULES) clean-node-addons
echo ''; \
echo "Building add-on: $$pkg"; \
cd $$pkg && \
+ NODE_PATH="$(NODE_PATH)" \
GYP_DEFINES="$(NODE_GYP_DEFINES)" \
$(NODE_GYP) $(NODE_GYP_FLAGS) rebuild \
|| { echo "Error: failed to build add-on: $$pkg"; exit 0; } \
| 12 |
diff --git a/js/readerview.js b/js/readerview.js @@ -89,7 +89,7 @@ var readerView = {
cb(results)
})
},
- showReadingList: function (container, filterText) {
+ showReadingList: function (filterText) {
readerView.searchForArticles(filterText, function (articles) {
searchbarPlugins.reset('bangs')
@@ -130,8 +130,8 @@ registerCustomBang({
phrase: '!readinglist',
snippet: l('viewReadingList'),
isAction: false,
- showSuggestions: function (text, input, event, container) {
- readerView.showReadingList(container, text)
+ showSuggestions: function (text, input, event) {
+ readerView.showReadingList(text)
},
fn: function (text) {
readerView.searchForArticles(text, function (articles) {
| 2 |
diff --git a/lib/cartodb/models/dataview/aggregation.js b/lib/cartodb/models/dataview/aggregation.js @@ -130,6 +130,41 @@ const aggregationQueryTpl = ctx => `
ORDER BY value DESC
`;
+const categoriesCTESqlTpl = ctx => `
+ WITH
+ ${filteredQueryTpl({
+ _isFloatColumn: ctx.isFloatColumn,
+ _query: ctx.query,
+ _column: ctx.column,
+ _aggregationColumn: ctx.aggregation !== 'count' ? ctx.aggregationColumn : null
+ })},
+ ${summaryQueryTpl({
+ _isFloatColumn: ctx.isFloatColumn,
+ _query: ctx.query,
+ _column: ctx.column,
+ _aggregationColumn: ctx.aggregation !== 'count' ? ctx.aggregationColumn : null
+ })},
+ ${rankedCategoriesQueryTpl({
+ _query: ctx.query,
+ _column: ctx.column,
+ _aggregation: aggregationFnQueryTpl({
+ aggregation: ctx.aggregation,
+ aggregationColumn: ctx.aggregationColumn || 1
+ }),
+ _aggregationColumn: ctx.aggregation !== 'count' ? ctx.aggregationColumn : null
+ })},
+ ${categoriesSummaryMinMaxQueryTpl({
+ _query: ctx.query,
+ _column: ctx.column
+ })},
+ ${categoriesSummaryCountQueryTpl({
+ _query: ctx.query,
+ _column: ctx.column
+ })}
+`;
+
+const aggregationFnQueryTpl = ctx => `${ctx.aggregation}(${ctx.aggregationColumn})`;
+
const CATEGORIES_LIMIT = 6;
const VALID_OPERATIONS = {
@@ -209,32 +244,37 @@ Aggregation.prototype.sql = function(psql, override, callback) {
var aggregationSql;
+
+
if (!!override.ownFilter) {
aggregationSql = [
- this.getCategoriesCTESql(
- _query,
- this.column,
- this.aggregation,
- this.aggregationColumn,
- this._isFloatColumn
- ),
+ categoriesCTESqlTpl({
+ query: _query,
+ column: this.column,
+ aggregation: this.aggregation,
+ aggregationColumn: this.aggregationColumn,
+ isFloatColumn: this._isFloatColumn
+ }),
aggregationQueryTpl({
_isFloatColumn: this._isFloatColumn,
_query: _query,
_column: this.column,
- _aggregation: this.getAggregationSql(),
+ _aggregation: aggregationFnQueryTpl({
+ aggregation: this.aggregation,
+ aggregationColumn: this.aggregationColumn || 1
+ }),
_limit: CATEGORIES_LIMIT
})
].join('\n');
} else {
aggregationSql = [
- this.getCategoriesCTESql(
- _query,
- this.column,
- this.aggregation,
- this.aggregationColumn,
- this._isFloatColumn
- ),
+ categoriesCTESqlTpl({
+ query: _query,
+ column: this.column,
+ aggregation: this.aggregation,
+ aggregationColumn: this.aggregationColumn,
+ isFloatColumn: this._isFloatColumn
+ }),
rankedAggregationQueryTpl({
_isFloatColumn: this._isFloatColumn,
_query: _query,
@@ -250,47 +290,6 @@ Aggregation.prototype.sql = function(psql, override, callback) {
return callback(null, aggregationSql);
};
-Aggregation.prototype.getCategoriesCTESql = function() {
- return `
- WITH
- ${filteredQueryTpl({
- _isFloatColumn: this._isFloatColumn,
- _query: this.query,
- _column: this.column,
- _aggregationColumn: this.aggregation !== 'count' ? this.aggregationColumn : null
- })},
- ${summaryQueryTpl({
- _isFloatColumn: this._isFloatColumn,
- _query: this.query,
- _column: this.column,
- _aggregationColumn: this.aggregation !== 'count' ? this.aggregationColumn : null
- })},
- ${rankedCategoriesQueryTpl({
- _query: this.query,
- _column: this.column,
- _aggregation: this.getAggregationSql(),
- _aggregationColumn: this.aggregation !== 'count' ? this.aggregationColumn : null
- })},
- ${categoriesSummaryMinMaxQueryTpl({
- _query: this.query,
- _column: this.column
- })},
- ${categoriesSummaryCountQueryTpl({
- _query: this.query,
- _column: this.column
- })}
- `;
-};
-
-const aggregationFnQueryTpl = ctx => `${ctx._aggregationFn}(${ctx._aggregationColumn})`;
-
-Aggregation.prototype.getAggregationSql = function() {
- return aggregationFnQueryTpl({
- _aggregationFn: this.aggregation,
- _aggregationColumn: this.aggregationColumn || 1
- });
-};
-
Aggregation.prototype.format = function(result) {
var categories = [];
var count = 0;
| 5 |
diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js @@ -215,7 +215,6 @@ class ReportActionCompose extends React.Component {
addAction(this.props.reportID, '', file);
this.setTextInputShouldClear(false);
}}
- onModalHide={this.focus}
>
{({displayFileInModal}) => (
<>
@@ -226,9 +225,6 @@ class ReportActionCompose extends React.Component {
onPress={(e) => {
e.preventDefault();
this.setMenuVisibility(true);
-
- // Hide the keyboard during a modal to modal transition
- this.blur();
}}
style={styles.chatItemAttachButton}
underlayColor={themeColors.componentBG}
| 13 |
diff --git a/packages/web/demos/airbeds/src/components/Filters.js b/packages/web/demos/airbeds/src/components/Filters.js @@ -5,6 +5,15 @@ import { leftCol } from '../styles';
export default () => (
<div className={leftCol}>
+ <DateRange
+ dataField="date_from"
+ componentId="DateRangeSensor"
+ title="When"
+ numberOfMonths={2}
+ queryFormat="basic_date"
+ initialMonth={new Date('04-01-2017')}
+ />
+
<NumberBox
componentId="GuestSensor"
dataField="accommodates"
@@ -16,15 +25,6 @@ export default () => (
}}
/>
- <DateRange
- dataField="date_from"
- componentId="DateRangeSensor"
- title="When"
- numberOfMonths={2}
- queryFormat="basic_date"
- initialMonth={new Date('04-01-2017')}
- />
-
<RangeSlider
componentId="PriceSensor"
dataField="price"
| 3 |
diff --git a/token-metadata/0x638155F4BD8F85d401Da32498D8866eE39A150B8/metadata.json b/token-metadata/0x638155F4BD8F85d401Da32498D8866eE39A150B8/metadata.json "symbol": "JREX",
"address": "0x638155F4BD8F85d401Da32498D8866eE39A150B8",
"decimals": 8,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/cpu-usage.js b/src/cpu-usage.js */
const os = require("os");
+/* istanbul ignore next */
module.exports = function getCpuUsage(sampleTime = 100) {
return new Promise(resolve => {
const first = os.cpus().map(cpu => cpu.times);
| 8 |
diff --git a/outbound/hmail.js b/outbound/hmail.js @@ -745,6 +745,10 @@ class HMailItem extends events.EventEmitter {
// EHLO command was rejected; fall-back to HELO
return send_command('HELO', mx.bind_helo);
}
+ if (command === 'rset') {
+ // Broken server doesn't accept RSET, terminate the connection
+ return client_pool.release_client(socket, port, host, mx.bind, true);
+ }
reason = `${code} ${(extc) ? `${extc} ` : ''}${response.join(' ')}`;
if (/^rcpt/.test(command) || command === 'dot_lmtp') {
if (command === 'dot_lmtp') last_recip = ok_recips.shift();
| 9 |
diff --git a/lib/assets/javascripts/locale/en.json b/lib/assets/javascripts/locale/en.json "deprecated-connector": "Deprecated connector.",
"twitter-contact-support": "Please <a href='mailto:[email protected]'>contact support</a> should you need Twitter data.",
"twitter-how-to-historical": "To get access to historical data (older than 30 days) you need to",
- "contact-team": "<a href='mailto:[email protected]'>contact our team</a>",
+ "contact-team": "contact our team",
"privacy-upgrade": "You cannot change the privacy of your new datasets. Click here to upgrade your account.",
"privacy-change": "Your new dataset will be %{privacy}",
"privacy-click": "Click to change it to %{nextPrivacy}",
| 2 |
diff --git a/build/karma.cover.config.js b/build/karma.cover.config.js @@ -24,7 +24,7 @@ module.exports = function (config) {
plugins.splice(idx, 1, babel({
plugins: [['istanbul', {
// TileLayerGLRenderer is not testable on CI
- exclude: ['test/**/*.js', 'src/core/mapbox/*.js', 'src/util/dom.js', 'src/renderer/layer/tilelayer/TileLayerGLRenderer.js', 'node_modules/**/*']
+ exclude: ['test/**/*.js', 'src/core/mapbox/*.js', 'src/util/dom.js', 'src/renderer/layer/tilelayer/TileLayerGLRenderer.js', 'src/renderer/layer/ImageGLRenderable.js', 'node_modules/**/*']
}]]
}));
}
| 3 |
diff --git a/src/scripts/autocomplete.js b/src/scripts/autocomplete.js /*jslint indent: 2, unparam: true, plusplus: true */
-/*global document: false */
+/*global document: false, window: false */
"use strict";
var noop = function () { return undefined; };
@@ -34,11 +34,11 @@ AutoComplete.prototype.addEvents = function () {
setTimeout(function () {that.filter.focus(); }, 50);
});
- that.filter.addEventListener('focus', function (e) {
- that.filter.parentNode.classList.add("open");
- that.listItems = that.el.querySelectorAll(that.item);
- that.updateHeight();
- });
+ window.addEventListener('focus', function (e) {
+ if (e.target === that.filter) {
+ that.openDropdown();
+ }
+ }, true);
that.filter.addEventListener('keydown', function (e) {
if (e.code === "Tab" || e.code === "Enter") {
@@ -76,6 +76,12 @@ AutoComplete.prototype.clearFilters = function () {
}
};
+AutoComplete.prototype.openDropdown = function () {
+ this.filter.parentNode.classList.add("open");
+ this.listItems = this.el.querySelectorAll(this.item);
+ this.updateHeight();
+};
+
AutoComplete.prototype.closeDropdown = function (t) {
var that = t || this;
that.filter.value = "";
| 1 |
diff --git a/tools/metadata/lib/index.ts b/tools/metadata/lib/index.ts @@ -124,9 +124,9 @@ class TokenMetadata {
tokens.forEach(token => {
if (
- !Object.prototype.hasOwnProperty.call(tokensByAddress, token.symbol)
+ !Object.prototype.hasOwnProperty.call(tokensByAddress, token.address)
) {
- tokensByAddress[token.symbol] = token
+ tokensByAddress[token.address] = token
}
})
}
| 1 |
diff --git a/redux/articleList.js b/redux/articleList.js @@ -164,15 +164,21 @@ export default createReducer(
.set('edges', payload.get('edges'))
.set(
'firstCursor',
- payload.getIn(['pageInfo', 'firstCursor']) || state.get('firstCursor')
+ payload.getIn(['pageInfo', 'firstCursor']) === undefined
+ ? state.get('firstCursor')
+ : payload.getIn(['pageInfo', 'firstCursor'])
)
.set(
'lastCursor',
- payload.getIn(['pageInfo', 'lastCursor']) || state.get('lastCursor')
+ payload.getIn(['pageInfo', 'lastCursor']) === undefined
+ ? state.get('lastCursor')
+ : payload.getIn(['pageInfo', 'lastCursor'])
)
.set(
'totalCount',
- payload.get('totalCount') || state.get('totalCount')
+ payload.get('totalCount') === undefined
+ ? state.get('totalCount')
+ : payload.get('totalCount')
),
[LOAD_AUTH_FIELDS]: (state, { payload }) =>
state.set(
| 1 |
diff --git a/src/blockchain/cappedMilestones.js b/src/blockchain/cappedMilestones.js @@ -21,6 +21,33 @@ const cappedMilestones = app => {
const m = data[0];
const { from } = await app.getWeb3().eth.getTransaction(txHash);
+ const {
+ PAID,
+ PAYING,
+ CANCELED,
+ NEEDS_REVIEW,
+ REJECTED,
+ IN_PROGRESS,
+ COMPLETED,
+ } = MilestoneStatus;
+
+ // bug in contract will allow state to be "reverted"
+ // we want to ignore that
+ if (
+ [PAYING, PAID, CANCELED, COMPLETED].includes(data.status) &&
+ [NEEDS_REVIEW, REJECTED, IN_PROGRESS, CANCELED, COMPLETED].includes(status)
+ ) {
+ logger.info(
+ 'Ignoring milestone state reversion -> projectId:',
+ projectId,
+ '-> currentStatus:',
+ data.status,
+ '-> status:',
+ status,
+ );
+ return;
+ }
+
await milestones.patch(
m._id,
{
| 8 |
diff --git a/diorama.js b/diorama.js @@ -718,7 +718,7 @@ const _makeOutlineRenderTarget = (w, h) => new THREE.WebGLRenderTarget(w, h, {
const createPlayerDiorama = ({
canvas = null,
objects = [],
- target = null,
+ target = new THREE.Object3D(),
cameraOffset = new THREE.Vector3(0.3, 0, -0.5),
clearColor = null,
clearAlpha = 1,
| 0 |
diff --git a/packages/node_modules/node-red/settings.js b/packages/node_modules/node-red/settings.js @@ -138,7 +138,6 @@ module.exports = {
* - httpNodeMiddleware
* - httpStatic
* - httpStaticRoot
- * - httpStaticCors
******************************************************************************/
/** the tcp port that the Node-RED web server is listening on */
| 2 |
diff --git a/src/components/fields/pretty-select.js b/src/components/fields/pretty-select.js @@ -62,6 +62,7 @@ export default createReactClass({
isAccordion: field.isAccordion,
isAccordionAlwaysCollapsable: field.isAccordionAlwaysCollapsable,
field,
+ id: this.props.id,
onChange: this.onChange,
onAction: this.onBubbleAction,
})
| 11 |
diff --git a/tools/utils/src/hashes.ts b/tools/utils/src/hashes.ts */
import * as ethUtil from 'ethereumjs-util'
+import { ethers } from 'ethers'
import { DOMAIN_NAME, DOMAIN_VERSION } from '@airswap/constants'
import { OrderParty, UnsignedOrder, EIP712 } from '@airswap/types'
-const ethers = require('ethers')
-const abiCoder = ethers.utils.defaultAbiCoder
-
-const Web3 = require('web3')
-const web3 = new Web3()
function stringify(type: string): string {
let str = `${type}(`
@@ -47,7 +43,7 @@ export const PARTY_TYPEHASH = ethUtil.keccak256(stringify('Party'))
export function hashParty(party: OrderParty): Buffer {
return ethUtil.keccak256(
- abiCoder.encode(
+ ethers.utils.defaultAbiCoder.encode(
['bytes32', 'bytes4', 'address', 'address', 'bytes'],
[PARTY_TYPEHASH, party.kind, party.wallet, party.token, party.data]
)
@@ -56,7 +52,7 @@ export function hashParty(party: OrderParty): Buffer {
export function hashOrder(order: UnsignedOrder): Buffer {
return ethUtil.keccak256(
- abiCoder.encode(
+ ethers.utils.defaultAbiCoder.encode(
['bytes32', 'uint256', 'uint256', 'bytes32', 'bytes32', 'bytes32'],
[
ORDER_TYPEHASH,
@@ -72,7 +68,7 @@ export function hashOrder(order: UnsignedOrder): Buffer {
export function hashDomain(swapContract: string): Buffer {
return ethUtil.keccak256(
- web3.eth.abi.encodeParameters(
+ ethers.utils.defaultAbiCoder.encode(
['bytes32', 'bytes32', 'bytes32', 'address'],
[
EIP712_DOMAIN_TYPEHASH,
| 2 |
diff --git a/site/rabbit.ent b/site/rabbit.ent @@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!ENTITY version-java-client "4.0.0">
+<!ENTITY version-java-client "4.0.1">
<!ENTITY version-dotnet-client "3.6.6">
<!ENTITY version-server "3.6.6">
<!ENTITY version-erlang-client "3.6.6">
| 12 |
diff --git a/QuestionListsHelper.user.js b/QuestionListsHelper.user.js // @description Adds more information about questions to question lists
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 3.1
+// @version 3.2
//
// @include https://stackoverflow.com/*
// @include https://serverfault.com/*
@@ -653,11 +653,12 @@ const initEventListeners = async function () {
return; // Use normal form submit action
}
+ // Remove dialog wrapper
+ closeWrapper.remove();
+
// We do our own AJAX submission to avoid page reload
evt.preventDefault();
closeQuestionAsOfftopic(qid, closeReasonId, siteSpecificCloseReasonId, siteSpecificOtherText, duplicateOfQuestionId).then(() => {
- // Remove dialog wrapper
- closeWrapper.remove();
// Rename close button and disable it
closeBtn.innerText = 'Closed';
closeBtn.disabled = true;
| 2 |
diff --git a/graveyard.json b/graveyard.json "dateClose": "2013-12-31",
"dateOpen": "2007-11-04",
"description": "Windows Home Server was intended to be a solution for homes with multiple connected PCs to offer file sharing, automated backups, print server, and remote access.",
- "link": "https://it.wikipedia.org/wiki/Windows_Home_Server",
+ "link": "https://en.wikipedia.org/wiki/Windows_Home_Server",
"name": "Windows Home Server",
"type": "service"
},
"dateClose": "2021-10-12",
"dateOpen": "2005-09-05",
"description": "Microsoft Silverlight (or simply Silverlight) was an application framework for writing and running rich Internet applications, similar to Adobe Flash.",
- "link": "https://it.wikipedia.org/wiki/Silverlight",
+ "link": "https://en.wikipedia.org/wiki/Silverlight",
"name": "Silverlight",
"type": "service"
},
| 14 |
diff --git a/lib/utils/screen-manager.js b/lib/utils/screen-manager.js @@ -102,7 +102,6 @@ ScreenManager.prototype.releaseCursor = function () {
if (this.extraLinesUnderPrompt > 0) {
util.down(this.rl, this.extraLinesUnderPrompt);
}
- this.done();
};
ScreenManager.prototype.normalizedCliWidth = function () {
| 2 |
diff --git a/lib/assets/javascripts/dashboard/views/dashboard/content-controller/content-controller-view.js b/lib/assets/javascripts/dashboard/views/dashboard/content-controller/content-controller-view.js @@ -164,7 +164,6 @@ module.exports = CoreView.extend({
const contentFooter = new ContentFooterView({
el: this.$('#content-footer'),
configModel: this._configModel,
- model: this.user,
router: this._routerModel,
collection: this.collection
});
| 2 |
diff --git a/packages/app/src/components/Sidebar/PageTree/Item.tsx b/packages/app/src/components/Sidebar/PageTree/Item.tsx @@ -112,7 +112,7 @@ const Item: FC<ItemProps> = (props: ItemProps) => {
const [{ isDragging }, drag] = useDrag(() => ({
- type: 'DND_GROUP',
+ type: 'PAGE_TREE',
item: { page },
collect: monitor => ({
isDragging: !!monitor.isDragging(),
@@ -218,7 +218,6 @@ const Item: FC<ItemProps> = (props: ItemProps) => {
</div>
</div>
-
{isEnableActions && (
<ClosableTextInput
isShown={isNewPageInputShown}
| 10 |
diff --git a/README.md b/README.md @@ -51,8 +51,8 @@ User documentation is <a href="https://webaverse.notion.site/User-Docs-3a36b223e
## Installation
-**Important note:** This repo uses Git submodules.
-You need to install with the **--recurse-submodules** flag or installation will not work. Copy the code below to clone the repository if you aren't sure.
+**Important note before you clone this repo:** This repo uses Git submodules.
+You need to install with the `--recurse-submodules` flag or installation will not work. Copy the code below to clone the repository if you aren't sure.
```sh
git clone --recurse-submodules https://github.com/webaverse/app.git
@@ -61,19 +61,18 @@ git pull --recurse-submodules # Pull recursively
npm install # Install dependencies
```
+##### Note for Windows Users
+We recommend that you use Windows Subsystem for Linux to run Webaverse. This [video](https://www.youtube.com/watch?v=5RTSlby-l9w) shows you how you can set up WSL. Once you've installed it, run `wsl` in your terminal to enter Ubuntu, and then run Webaverse from there.
+
## Quickstart
-Provided you followed the instructions above, starting the application is as easy as:
+Starting the application is as easy as:
```sh
-# Run in development
-npm run dev
-
-# OR deploy to production
npm run prod
```
-Once the server has started up, you can visit `https://local.webaverse.com:3000` in development or `https://local.webaverse.com` in production.
+Once the server has started up, you can visit `https://local.webaverse.com`
## Let's build it together!
| 2 |
diff --git a/source/core/woogeen_base/AVStreamOut.cpp b/source/core/woogeen_base/AVStreamOut.cpp @@ -440,6 +440,10 @@ bool AVStreamOut::addVideoStream(FrameFormat format, uint32_t width, uint32_t he
av_parser_close(parser);
}
+ if (codec_id == AV_CODEC_ID_H265) {
+ par->codec_tag = 0x31637668; //hvc1
+ }
+
return true;
}
| 12 |
diff --git a/test/server/cards/12-SoW/AsahinaMaeko.spec.js b/test/server/cards/12-SoW/AsahinaMaeko.spec.js @@ -152,7 +152,7 @@ describe('Asahina Maeko', function() {
this.player1.clickCard(this.whisperer);
this.player1.clickPrompt('0');
this.player1.clickPrompt('Conflict');
- expect(this.player1.fate).toBe(p1fate - 1);
+ expect(this.player1.fate).toBe(p1fate - 2);
});
});
});
| 3 |
diff --git a/nin/backend/compile.js b/nin/backend/compile.js @@ -13,8 +13,6 @@ const stream = require('stream');
const utils = require('./utils');
const walk = require('walk');
-const pngOptimizer = new OptiPng(['-o7']);
-
function moveCursorToColumn(col) {
return '\x1B[' + col + 'G';
@@ -60,6 +58,8 @@ function res(projectPath, callback) {
const s = new stream.Readable();
s.push(file);
s.push(null);
+
+ const pngOptimizer = new OptiPng(['-o7']);
s.pipe(pngOptimizer).on('data', data => {
chunks.push(data);
}).on('end', () => {
| 4 |
diff --git a/src/main/keyboard/shortcutHandler.js b/src/main/keyboard/shortcutHandler.js @@ -38,6 +38,9 @@ class Keybindings {
registerKeyHandlers (win, acceleratorMap) {
for (const item of acceleratorMap) {
let { accelerator } = item
+ if (accelerator == null || accelerator === '') {
+ continue
+ }
// Regisiter shortcuts on the BrowserWindow instead of using Chromium's native menu.
// This makes it possible to receive key down events before Chromium/Electron and we
| 8 |
diff --git a/src/public/disease/Associations.js b/src/public/disease/Associations.js @@ -64,7 +64,7 @@ const DiseaseAssociationsPage = ({ efoId, name }) => {
const [evidence, setEvidence] = useState(null);
const handleIndirectsChange = indirects => {
- setIndirects({ indirects });
+ setIndirects(indirects);
};
const handleDataSourcesChange = ({ dataSources, options }) => {
setDataSourcesState({ dataSources, options });
| 12 |
diff --git a/src/js/controller/settings/SaveController.js b/src/js/controller/settings/SaveController.js };
ns.SaveController.prototype.updateSaveToGalleryMessage_ = function (spritesheetSize) {
- if (pskl.app.performanceReportService.hasProblem()) {
+ var saveToGalleryStatus = document.querySelector('.save-online-status');
+ if (saveToGalleryStatus && pskl.app.performanceReportService.hasProblem()) {
var warningPartial = pskl.utils.Template.get('save-gallery-warning-partial');
- document.querySelector('.save-online-status').innerHTML = warningPartial;
+ saveToGalleryStatus.innerHTML = warningPartial;
}
};
| 1 |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml @@ -15,14 +15,14 @@ jobs:
registry-url: https://registry.npmjs.org/
- name: Install dependencies
run: npm ci
- - name: Prepare changes
- run: npm run release
- env:
- GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
- name: Set up git credentials
run: |
git config --global user.name 'ci'
git config --global user.email '[email protected]'
+ - name: Prepare changes
+ run: npm run release
+ env:
+ GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
- name: Commit and push changes
run: |
git add .
| 12 |
diff --git a/package.json b/package.json "dev:reset": "cross-env node .ki-scripts/reset.js",
"postinstall": "npx lerna exec npm install",
"heroku-postbuild": "npx lerna exec npm run build",
- "start": "node api/dist/index.js"
+ "start": "node api/dist/index.js",
+ "start:worker": "node api/dist/index.js --worker"
},
"repository": {
"type": "git",
| 0 |
diff --git a/appjs/logicjavascript.js b/appjs/logicjavascript.js @@ -6339,7 +6339,7 @@ function seveneightCalc(){
seven += '7' - input[i];
}
result.innerHTML = "Seven's complement of " + input + " is " + seven + "<br>";
- eight = parseInt(seven) + 1;
+ eight = (parseInt(seven,8) + 1).toString(8);
result.innerHTML = "Seven's complement of "+ input + " is " + parseInt(seven) + "<br>";
result.innerHTML += "Eight's complement of "+ input + " is " + eight + "<br>";
| 1 |
diff --git a/assets/js/googlesitekit-idea-hub-notice.js b/assets/js/googlesitekit-idea-hub-notice.js @@ -65,11 +65,8 @@ const loadIdeaHubNotices = async ( _global = global ) => {
// We've already shown this notice, so when it's hidden, mark it as shown
// so it doesn't appear again.
if ( shownNotices.includes( noticeKey ) ) {
- setItem(
- noticeKey,
- postMeta.googlesitekitpersistent_idea_text,
- { ttl: 108000 } // Don't show this notice for another 90 days.
- );
+ // Don't show this notice for another 90 days.
+ setItem( noticeKey, true, { ttl: 108000 } );
unsubscribeFromListener();
return;
}
| 4 |
diff --git a/docs/api/README.md b/docs/api/README.md @@ -271,7 +271,7 @@ In the following example, we create a simple task `fetchAutocomplete`. We use `t
start a new `fetchAutocomplete` task on dispatched `FETCH_AUTOCOMPLETE` action. However since `throttle` ignores consecutive `FETCH_AUTOCOMPLETE` for some time, we ensure that user won't flood our server with requests.
```javascript
-import { throttle } from `redux-saga/effects`
+import { call, put, throttle } from `redux-saga/effects`
function* fetchAutocomplete(action) {
const autocompleteProposals = yield call(Api.fetchAutocomplete, action.text)
| 3 |
diff --git a/src/plots/polar/set_convert.js b/src/plots/polar/set_convert.js @@ -34,7 +34,7 @@ var rad2deg = Lib.rad2deg;
*
* Radial axis coordinate systems:
* - d, c and l: same as for cartesian axes
- * - g: like calcdata but translated about `radialaxis.range[0]`
+ * - g: like calcdata but translated about `radialaxis.range[0]` & `polar.hole`
*
* Angular axis coordinate systems:
* - d: data, in whatever form it's provided
| 0 |
diff --git a/configs/circonus.json b/configs/circonus.json "conversation_id": [
"1139468845"
],
+ "sitemap_urls": [
+ "https://docs.circonus.com/sitemap.xml"
+ ],
+ "js_render": true,
+ "use_anchors": true,
+ "only_content_level": true,
"nb_hits": 11177
}
| 7 |
diff --git a/src/config/streaming.json b/src/config/streaming.json "providers": {
"streamlink": {
"version": "0.2.0",
- "regexp": "^streamlink(?:\\.exe|-script\\.pyw?)? (\\d+\\.\\d+\\.\\d+)(?:$|\\s.*)"
+ "regexp": "^(?:python\\d*-)?streamlink(?:\\.exe|-script\\.pyw?)? (\\d+\\.\\d+\\.\\d+)(?:$|\\s.*)"
},
"livestreamer": {
"version": "1.11.1",
- "regexp": "^livestreamer(?:\\.exe|-script\\.pyw?)? (\\d+\\.\\d+\\.\\d+)(?:$|\\s.*)"
+ "regexp": "^(?:python\\d*-)?livestreamer(?:\\.exe|-script\\.pyw?)? (\\d+\\.\\d+\\.\\d+)(?:$|\\s.*)"
}
}
},
| 7 |
diff --git a/.github/workflows/ci-app-prod.yml b/.github/workflows/ci-app-prod.yml @@ -61,7 +61,7 @@ jobs:
node-version: 16.x
skip-cypress: ${{ contains( github.event.pull_request.labels.*.name, 'dependencies' ) && contains( github.event.pull_request.labels.*.name, 'github_actions' ) }}
cypress-report-artifact-name: Cypress report
- cypress-config-video: ${{ inputs.cypress-config-video }}
+ cypress-config-video: ${{ inputs.cypress-config-video || false }}
secrets:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
| 12 |
diff --git a/src/node.js b/src/node.js @@ -504,11 +504,14 @@ var _ = Mavo.Node = $.Class({
for (var i = 0; i<collection.length; i++) {
var ind = index + i * direction;
- ind = o.wrap? Mavo.wrap(ind, collection.length) : ind;
+
+ if (o.wrap) {
+ ind = Mavo.wrap(ind, collection.length);
+ }
var item = collection.children[ind];
- if (!item) {
+ if (item) {
break;
}
}
| 1 |
diff --git a/assets/js/modules/idea-hub/components/dashboard/DashboardIdeasWidget/Idea.js b/assets/js/modules/idea-hub/components/dashboard/DashboardIdeasWidget/Idea.js @@ -70,8 +70,6 @@ const Idea = ( { postEditURL, name, text, topics, buttons } ) => {
const handleCreate = useCallback( () => {
setIsProcessing( true );
createIdeaDraftPost( { name, text, topics } );
- // @TODO: Implement callback.
- global.console.log( `Created: ${ name }` );
setIsProcessing( false );
}, [ name, text, topics, createIdeaDraftPost ] );
| 2 |
diff --git a/src/tools/auth0/handlers/branding.ts b/src/tools/auth0/handlers/branding.ts @@ -2,6 +2,7 @@ import DefaultHandler from './default';
import constants from '../../constants';
import log from '../../../logger';
import { Asset, Assets } from '../../../types';
+import { detectInsufficientScopeError } from '../../utils';
export const schema = {
type: 'object',
| 13 |
diff --git a/webpack.config.js b/webpack.config.js @@ -30,7 +30,7 @@ const ESLintPlugin = require( 'eslint-webpack-plugin' );
const MiniCssExtractPlugin = require( 'mini-css-extract-plugin' );
const TerserPlugin = require( 'terser-webpack-plugin' );
const WebpackBar = require( 'webpackbar' );
-const { DefinePlugin, ProvidePlugin } = require( 'webpack' );
+const { DefinePlugin } = require( 'webpack' );
const { BundleAnalyzerPlugin } = require( 'webpack-bundle-analyzer' );
const CreateFileWebpack = require( 'create-file-webpack' );
const ManifestPlugin = require( 'webpack-manifest-plugin' );
@@ -271,9 +271,6 @@ function* webpackConfig( env, argv ) {
rules: [ ...rules ],
},
plugins: [
- new ProvidePlugin( {
- React: 'react',
- } ),
new WebpackBar( {
name: 'Module Entry Points',
color: '#fbbc05',
| 2 |
diff --git a/src/webview/lib/RecipeWebview.js b/src/webview/lib/RecipeWebview.js @@ -19,6 +19,12 @@ class RecipeWebview {
window.FranzAPI = {
clearCache: RecipeWebview.clearCache,
};
+
+ // fix BrowserView Background issue
+ const styles = document.createElement('style');
+ styles.innerHTML = 'html { background: white; }';
+
+ document.querySelector('head').appendChild(styles);
}
loopFunc = () => null;
| 12 |
diff --git a/components/Search/index.js b/components/Search/index.js @@ -185,14 +185,16 @@ class Search extends Component {
let filters = [...this.state.filters].filter(
filter => !(filter.key === 'template' && filter.value === 'front')
)
+ console.log(filterBucketKey, filterBucketValue, selected)
if (selected) {
- filters = filters.filter(filter => filter.key !== filterBucketKey && filter.value !== filterBucketValue)
+ filters = filters.filter(filter => filter.key !== filterBucketKey)
} else {
if (!filters.find(filter => filter.key === filterBucketKey && filter.value === filterBucketValue)) {
filters.push(filter)
}
}
+ console.log(filters)
const serializedFilters = serializeFilters(filters)
this.setState({
| 1 |
diff --git a/dist/ccxt.browser.js b/dist/ccxt.browser.js @@ -32266,6 +32266,7 @@ module.exports = class bitget extends Exchange {
const timestamp = this.safeInteger (item, 'cTime');
const bizType = this.safeString (item, 'bizType');
let direction = undefined;
+ if (bizType !== undefined) {
const parts = bizType.split ('-');
direction = parts[1];
}
@@ -37861,6 +37862,10 @@ module.exports = class bitmex extends Exchange {
}
const response = await this.privateGetUserWalletHistory (this.extend (request, params));
const transactions = this.filterByArray (response, 'transactType', [ 'Withdrawal', 'Deposit' ], false);
+ let currency = undefined;
+ if (code !== undefined) {
+ currency = this.currency (code);
+ }
return this.parseTransactions (transactions, currency, since, limit);
}
@@ -38413,7 +38418,7 @@ module.exports = class bitmex extends Exchange {
const side = this.safeStringLower (trade, 'side');
// price * amount doesn't work for all symbols (e.g. XBT, ETH)
let fee = undefined;
- const feeCostString = Precise.stringDiv (this.safeString (trade, 'execComm'), '1e6');
+ const feeCostString = Precise.stringDiv (this.safeString (trade, 'execComm'), '1e8');
if (feeCostString !== undefined) {
const currencyId = this.safeString (trade, 'settlCurrency');
const feeCurrencyCode = this.safeCurrencyCode (currencyId);
| 13 |
diff --git a/bake.html b/bake.html (async () => {
const q = parseQuery(location.search);
if (q.u) {
+ const w = 30;
+ const extents = parseExtents(q.e) || new THREE.Box3(
+ new THREE.Vector3(-w/2, 0, -w/2),
+ new THREE.Vector3(w/2, w, w/2)
+ );
+
const app = new App();
await app.waitForLoad();
// window.object = object;
object.updateMatrixWorld();
// const replacementMeshes = [];
- const w = 30;
- const box = new THREE.Box3(
- new THREE.Vector3(-w/2, 0, -w/2),
- new THREE.Vector3(w/2, w, w/2)
- );
const planes = [
- new THREE.Plane().setFromNormalAndCoplanarPoint(new THREE.Vector3(0, 1, 0), box.min),
- new THREE.Plane().setFromNormalAndCoplanarPoint(new THREE.Vector3(0, -1, 0), box.max),
- new THREE.Plane().setFromNormalAndCoplanarPoint(new THREE.Vector3(1, 0, 0), box.min),
- new THREE.Plane().setFromNormalAndCoplanarPoint(new THREE.Vector3(-1, 0, 0), box.max),
- new THREE.Plane().setFromNormalAndCoplanarPoint(new THREE.Vector3(0, 0, 1), box.min),
- new THREE.Plane().setFromNormalAndCoplanarPoint(new THREE.Vector3(0, 0, -1), box.max),
+ new THREE.Plane().setFromNormalAndCoplanarPoint(new THREE.Vector3(0, 1, 0), extents.min),
+ new THREE.Plane().setFromNormalAndCoplanarPoint(new THREE.Vector3(0, -1, 0), extents.max),
+ new THREE.Plane().setFromNormalAndCoplanarPoint(new THREE.Vector3(1, 0, 0), extents.min),
+ new THREE.Plane().setFromNormalAndCoplanarPoint(new THREE.Vector3(-1, 0, 0), extents.max),
+ new THREE.Plane().setFromNormalAndCoplanarPoint(new THREE.Vector3(0, 0, 1), extents.min),
+ new THREE.Plane().setFromNormalAndCoplanarPoint(new THREE.Vector3(0, 0, -1), extents.max),
];
const oldGeometryMap = {};
const oldMaterialMap = {};
| 0 |
diff --git a/scenes/gunroom.scn b/scenes/gunroom.scn 4
]
},
- {
- "start_url": "https://webaverse.github.io/eyeblaster/",
- "position": [
- 0,
- 0,
- 0
- ]
- },
{
"position": [
1,
| 2 |
diff --git a/README.md b/README.md @@ -115,7 +115,7 @@ too big. If you don't see the language you need in the ["Common" section][5],
it can be added manually:
```html
-<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.4.0/languages/go.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/go.min.js"></script>
```
**On Almond.** You need to use the optimizer to give the module a name. For
| 1 |
diff --git a/src/navigation/restaurant/components/DatePickerHeader.js b/src/navigation/restaurant/components/DatePickerHeader.js import React, { Component } from 'react'
import { StyleSheet, View, TouchableOpacity } from 'react-native'
import { Col, Row, Grid } from 'react-native-easy-grid'
-import { Icon, Text } from 'native-base'
+import { Icon, Text, H3 } from 'native-base'
import { translate } from 'react-i18next'
class DatePickerHeader extends Component {
@@ -10,20 +10,21 @@ class DatePickerHeader extends Component {
const { date } = this.props
return (
- <Grid style={{ borderBottomWidth: 1, borderBottomColor: '#000' }}>
+ <Grid style={ styles.container }>
<Row>
<Col size={ 8 }>
<TouchableOpacity onPress={ () => this.props.onCalendarClick() }>
<View style={ [ styles.wrapper, styles.buttonLeft ] }>
- <Icon name="calendar" />
- <Text>{ date.format('dddd LL') }</Text>
+ <Icon type="FontAwesome" name="calendar" />
+ <H3>{ date.format('dddd LL') }</H3>
+ <Icon type="FontAwesome" name="chevron-right" style={{ color: '#ddd' }} />
</View>
</TouchableOpacity>
</Col>
<Col size={ 4 }>
<TouchableOpacity onPress={ () => this.props.onTodayClick() }>
<View style={ [ styles.wrapper, styles.buttonRight ] }>
- <Icon name="refresh" />
+ <Icon type="FontAwesome" name="refresh" />
<Text>{ this.props.t('TODAY') }</Text>
</View>
</TouchableOpacity>
@@ -35,6 +36,10 @@ class DatePickerHeader extends Component {
}
const styles = StyleSheet.create({
+ container: {
+ borderBottomWidth: StyleSheet.hairlineWidth,
+ borderBottomColor: '#ddd'
+ },
wrapper: {
flex: 1,
flexDirection: 'row',
| 7 |
diff --git a/src/node.js b/src/node.js @@ -85,6 +85,13 @@ var _ = Mavo.Node = class Node {
}
}
+ // Handle dynamic mv-storage on Mavo nodes (Fix for #576)
+ if (this.element.hasAttribute("mv-storage")) {
+ this.storageObserver = new Mavo.Observer(this.element, "mv-storage", record => {
+ this.storage = this.element.getAttribute("mv-storage");
+ });
+ }
+
Mavo.hooks.run("node-init-end", env);
}
| 9 |
diff --git a/app/components/Exchange/OrderBook.jsx b/app/components/Exchange/OrderBook.jsx @@ -403,6 +403,12 @@ class OrderBook extends React.Component {
});
}
+ componentWillReceiveProps(nextProps) {
+ this.setState({
+ autoScroll: nextProps.autoScroll
+ });
+ }
+
shouldComponentUpdate(nextProps, nextState) {
if (
this.props.horizontal &&
@@ -939,7 +945,8 @@ class OrderBook extends React.Component {
</span>
</div>
) : null}
- {flipOrderBook ? (
+ {flipOrderBook &&
+ !this.props.hideFunctionButtons ? (
<div className="float-right header-sub-title grouped_order">
{trackedGroupsConfig ? (
<GroupOrderLimitSelector
@@ -1085,7 +1092,8 @@ class OrderBook extends React.Component {
</span>
</div>
) : null}
- {!flipOrderBook ? (
+ {!flipOrderBook &&
+ !this.props.hideFunctionButtons ? (
<div className="float-right header-sub-title grouped_order">
{trackedGroupsConfig ? (
<GroupOrderLimitSelector
@@ -1102,6 +1110,19 @@ class OrderBook extends React.Component {
) : null}
</div>
) : null}
+ {currentGroupOrderLimit !== 0 &&
+ this.props.hideFunctionButtons && (
+ <Icon
+ name="grouping"
+ className="float-right icon-14px"
+ title={translator.translate(
+ "icons.order_grouping"
+ )}
+ style={{
+ marginLeft: "0.5rem"
+ }}
+ />
+ )}
{this.props.onTogglePosition &&
!this.props.hideFunctionButtons ? (
<span
| 13 |
diff --git a/common/lib/transport/connectionmanager.js b/common/lib/transport/connectionmanager.js @@ -1507,6 +1507,7 @@ var ConnectionManager = (function() {
var onHeartbeat = function (responseId) {
if(responseId === id) {
+ transport.off('heartbeat', onHeartbeat);
clearTimeout(timer);
var responseTime = Utils.now() - pingStart;
callback(null, responseTime);
@@ -1515,7 +1516,7 @@ var ConnectionManager = (function() {
var timer = setTimeout(onTimeout, this.options.timeouts.realtimeRequestTimeout);
- transport.once('heartbeat', onHeartbeat);
+ transport.on('heartbeat', onHeartbeat);
transport.ping(id);
return;
}
| 1 |
diff --git a/avatars/avatars.js b/avatars/avatars.js @@ -67,6 +67,7 @@ const animationsSelectMap = {
'magic standing idle.fbx': new THREE.Vector3(0, Infinity, 0),
'Skateboarding.fbx': new THREE.Vector3(0, Infinity, 0),
'Throw.fbx': new THREE.Vector3(0, Infinity, 0),
+ 'Hip Hop Dancing.fbx': new THREE.Vector3(0, Infinity, 0),
};
const animationsDistanceMap = {
'idle.fbx': new THREE.Vector3(0, 0, 0),
@@ -108,6 +109,7 @@ const animationsDistanceMap = {
'magic standing idle.fbx': new THREE.Vector3(0, Infinity, 0),
'Skateboarding.fbx': new THREE.Vector3(0, Infinity, 0),
'Throw.fbx': new THREE.Vector3(0, Infinity, 0),
+ 'Hip Hop Dancing.fbx': new THREE.Vector3(0, Infinity, 0),
};
let animations;
@@ -211,6 +213,7 @@ const loadPromise = (async () => {
// animation.isHit = /sword and shield idle/i.test(animation.name);
animation.isMagic = /magic/i.test(animation.name);
animation.isSkateboarding = /skateboarding/i.test(animation.name);
+ animation.isDancing = /dancing/i.test(animation.name);
animation.isForward = /forward/i.test(animation.name);
animation.isBackward = /backward/i.test(animation.name);
animation.isLeft = /left/i.test(animation.name);
| 0 |
diff --git a/test/map/MapCameraSpec.js b/test/map/MapCameraSpec.js @@ -545,7 +545,7 @@ describe('Map.Camera', function () {
it('should generate dom css matrix', function () {
map.setPitch(75);
map.setBearing(45);
- expect(maptalks.Util.join(map.domCssMatrix)).to.be.eql('31.819805153394643,-8.235571585149868,0.6830127076821895,0.6830127018922193,31.819805153394636,8.23557158514987,-0.6830127076821896,-0.6830127018922194,0,-43.466662183008076,-0.2588190472965569,-0.25881904510252074,0,0,44.80000038062201,45');
+ expect(maptalks.Util.join(map.domCssMatrix)).to.be.eql('31.819805153394643,-8.235571585149868,0.6830127060279125,0.6830127018922193,31.819805153394636,8.23557158514987,-0.6830127060279126,-0.6830127018922194,0,-43.466662183008076,-0.2588190466696895,-0.25881904510252074,0,0,44.800000271872875,45');
});
});
| 1 |
diff --git a/react/features/invite/components/dial-in-summary/web/DialInSummary.js b/react/features/invite/components/dial-in-summary/web/DialInSummary.js import React, { Component } from 'react';
import { translate } from '../../../../base/i18n';
+import { doGetJSON } from '../../../../base/util';
import ConferenceID from './ConferenceID';
import NumbersList from './NumbersList';
@@ -176,11 +177,7 @@ class DialInSummary extends Component<Props, State> {
return Promise.resolve();
}
- const conferenceIDURL
- = `${dialInConfCodeUrl}?conference=${room}@${mucURL}`;
-
- return fetch(conferenceIDURL)
- .then(response => response.json())
+ return doGetJSON(`${dialInConfCodeUrl}?conference=${room}@${mucURL}`)
.catch(() => Promise.reject(this.props.t('info.genericError')));
}
@@ -206,11 +203,8 @@ class DialInSummary extends Component<Props, State> {
if (room && mucURL) {
URLSuffix = `?conference=${room}@${mucURL}`;
}
- const conferenceIDURL
- = `${dialInNumbersUrl}${URLSuffix}`;
- return fetch(conferenceIDURL)
- .then(response => response.json())
+ return doGetJSON(`${dialInNumbersUrl}${URLSuffix}`)
.catch(() => Promise.reject(this.props.t('info.genericError')));
}
| 4 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.