code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/src/lime/tools/ProjectXMLParser.hx b/src/lime/tools/ProjectXMLParser.hx @@ -2184,13 +2184,15 @@ class ProjectXMLParser extends HXProject {
value = StringTools.replace (value, "#", "");
- if (value.indexOf ("0x") == -1) {
+ if (value == "null" || value == "transparent" || value == "") {
- value = "0x" + value;
+ windows[id].background = null;
- }
+ } else {
- if (value == "0x" || (value.length == 10 && StringTools.startsWith (value, "0x00"))) {
+ if (value.indexOf ("0x") == -1) value = "0x" + value;
+
+ if (value.length == 10 && StringTools.startsWith (value, "0x00")) {
windows[id].background = null;
@@ -2200,6 +2202,8 @@ class ProjectXMLParser extends HXProject {
}
+ }
+
case "orientation":
var orientation = Reflect.field (Orientation, Std.string (value).toUpperCase ());
| 11 |
diff --git a/articles/integrations/aws-api-gateway/part-2.md b/articles/integrations/aws-api-gateway/part-2.md @@ -175,8 +175,6 @@ Click the edit icon beside the **Authorization Type**, and select *AWS_IAM*. Now
Our Single Page Application (SPA) will access web API methods from a domain different from that of the page. The *Cross-Origin Resource Sharing* setting needs to explicitly permit this action for the browser to allow access to the AWS API Gateway. Typically, the browser will first issue an `OPTIONS` request to see what actions the site will permit.
-> See [Enable CORS for a Method in API Gateway](http://docs.aws.amazon.com/apigateway/latest/developerguide/how-to-cors.html) for details.
-
Select `/pets` under Resources, and click **Create Method**. In the drop-down, select **OPTIONS**, and click the **checkmark** to save the setting.
| 2 |
diff --git a/src/utils/tribes.ts b/src/utils/tribes.ts @@ -500,7 +500,6 @@ export async function createChannel({ tribe_uuid, host, name, owner_pubkey }) {
body: JSON.stringify({
tribe_uuid,
name,
- owner_pubkey,
}),
headers: { 'Content-Type': 'application/json' },
})
| 2 |
diff --git a/src/victory-legend/victory-legend.js b/src/victory-legend/victory-legend.js @@ -95,6 +95,7 @@ export default class VictoryLegend extends React.Component {
return padding.top + contentHeight + padding.bottom;
}
+ // eslint-disable-next-line max-params
calculateLegendWidth(itemCount, padding, isHorizontal, maxTextWidth) {
const { gutter, itemsPerRow, symbolSpacer } = this.props;
const rowCount = itemsPerRow ? Math.ceil(itemCount / itemsPerRow) : 1;
@@ -123,7 +124,7 @@ export default class VictoryLegend extends React.Component {
getCalculatedProps() { // eslint-disable-line max-statements
const { role } = this.constructor;
- const { data, orientation, theme, itemsPerRow } = this.props;
+ const { data, orientation, theme } = this.props;
const legendTheme = theme && theme[role] ? theme[role] : {};
const parentStyles = this.getStyles({}, legendTheme, "parent");
const colorScale = this.getColorScale(legendTheme);
@@ -150,7 +151,7 @@ export default class VictoryLegend extends React.Component {
height = this.calculateLegendHeight(textSizes, padding, isHorizontal);
}
if (!width) {
- width = this.calculateLegendWidth(textSizes.length, padding, isHorizontal, maxTextWidth); // eslint-disable-line max-params
+ width = this.calculateLegendWidth(textSizes.length, padding, isHorizontal, maxTextWidth);
}
return Object.assign({}, this.props, {
@@ -161,7 +162,6 @@ export default class VictoryLegend extends React.Component {
padding,
parentStyles,
symbolStyles,
- textSizes,
width
});
}
@@ -188,30 +188,29 @@ export default class VictoryLegend extends React.Component {
maxTextWidth,
padding,
symbolSpacer,
- symbolStyles,
- textSizes
+ symbolStyles
} = props;
const { fontSize } = labelStyles[i];
const symbolShift = fontSize / 2;
const style = symbolStyles[i];
const rowHeight = fontSize + gutter;
- let itemRowIndex = i;
+ let itemIndex = i;
let rowSpacer = 0;
let rowIndex = 0;
if (itemsPerRow) {
rowIndex = Math.floor(i / itemsPerRow);
rowSpacer = rowHeight * rowIndex;
- itemRowIndex = i % itemsPerRow;
+ itemIndex = i % itemsPerRow;
}
const symbolCoords = isHorizontal ? {
- x: padding.left + symbolShift + (fontSize + symbolSpacer + maxTextWidth + gutter) * itemRowIndex,
+ x: padding.left + symbolShift + (fontSize + symbolSpacer + maxTextWidth + gutter) * itemIndex,
y: padding.top + symbolShift + rowSpacer
} : {
x: padding.left + symbolShift + (rowHeight + maxTextWidth) * rowIndex,
- y: padding.top + symbolShift + rowHeight * itemRowIndex
+ y: padding.top + symbolShift + rowHeight * itemIndex
};
return defaults({}, dataComponent.props, {
@@ -232,30 +231,30 @@ export default class VictoryLegend extends React.Component {
labelStyles,
maxTextWidth,
padding,
- symbolSpacer,
- textSizes
+ symbolSpacer
} = props;
const style = labelStyles[i];
const { fontSize } = style;
const symbolShift = fontSize / 2;
const rowHeight = fontSize + gutter;
- let itemRowIndex = i;
+ const symbolWidth = fontSize + symbolSpacer;
+ let itemIndex = i;
let rowSpacer = 0;
let rowIndex = 0;
if (itemsPerRow) {
rowIndex = Math.floor(i / itemsPerRow);
rowSpacer = rowHeight * rowIndex;
- itemRowIndex = i % itemsPerRow;
+ itemIndex = i % itemsPerRow;
}
const labelCoords = isHorizontal ? {
- x: padding.left + (fontSize + symbolSpacer) * (itemRowIndex + 1) + (maxTextWidth + gutter) * itemRowIndex,
+ x: padding.left + symbolWidth * (itemIndex + 1) + (maxTextWidth + gutter) * itemIndex,
y: padding.top + symbolShift + rowSpacer
} : {
- x: padding.left + fontSize + symbolSpacer + (rowHeight + maxTextWidth) * rowIndex,
- y: padding.top + symbolShift + rowHeight * itemRowIndex
+ x: padding.left + symbolWidth + (rowHeight + maxTextWidth) * rowIndex,
+ y: padding.top + symbolShift + rowHeight * itemIndex
};
return defaults({}, labelComponent.props, {
| 10 |
diff --git a/src/pages/home/report/ReportActionItemMessageEdit.js b/src/pages/home/report/ReportActionItemMessageEdit.js @@ -99,7 +99,7 @@ class ReportActionItemMessageEdit extends React.Component {
* @param {String} draft
*/
updateDraft(draft) {
- const newDraft = EmojiUtils.replaceEmojis(draft);
+ const newDraft = EmojiUtils.replaceEmojis(draft, this.props.isKeyboardShown);
this.setState((prevState) => {
const newState = {draft: newDraft};
if (draft !== newDraft) {
@@ -183,13 +183,12 @@ class ReportActionItemMessageEdit extends React.Component {
* @param {String} emoji
*/
addEmojiToTextBox(emoji) {
- const emojiWithSpace = `${emoji} `;
const newComment = this.state.draft.slice(0, this.state.selection.start)
- + emojiWithSpace + this.state.draft.slice(this.state.selection.end, this.state.draft.length);
+ + emoji + this.state.draft.slice(this.state.selection.end, this.state.draft.length);
this.setState(prevState => ({
selection: {
- start: prevState.selection.start + emojiWithSpace.length,
- end: prevState.selection.start + emojiWithSpace.length,
+ start: prevState.selection.start + emoji.length,
+ end: prevState.selection.start + emoji.length,
},
}));
this.updateDraft(newComment);
| 4 |
diff --git a/edit.js b/edit.js @@ -417,14 +417,12 @@ let rayMesh = null;
}
{
- const u = 'assets/hookshot.glb';
- const res = await fetch('./' + u);
- const file = await res.blob();
- file.name = u;
- let mesh = await runtime.loadFile(file, {
- optimize: false,
+ const mesh = await runtime.loadFile({
+ name: 'index.js',
+ url: './hookshot/index.js',
});
mesh.position.y = 1;
+ mesh.run();
scene.add(mesh);
}
| 0 |
diff --git a/lib/block-listeners/cosmos-node-subscription.js b/lib/block-listeners/cosmos-node-subscription.js @@ -19,7 +19,7 @@ const COSMOS_DB_DELAY = 2000
class CosmosNodeSubscription {
constructor(network, CosmosApiClass, store) {
this.network = network
- this.cosmosAPI = new CosmosApiClass(network)
+ this.CosmosApiClass = CosmosApiClass
this.store = store
this.validators = []
const networkSchemaName = this.network.id.replace(/-/g, '_')
@@ -31,23 +31,11 @@ class CosmosNodeSubscription {
}
async pollForNewBlock() {
- this.pollingTimeout = setTimeout(async () => {
- let block
- try {
- block = await this.cosmosAPI.getBlockByHeightV2()
- } catch (error) {
- console.error('Failed to fetch block', error)
- Sentry.captureException(error)
- }
- if (block && this.height !== block.height) {
- // apparently the cosmos db takes a while to serve the content after a block has been updated
- // if we don't do this, we run into errors as the data is not yet available
- setTimeout(() => this.newBlockHandler(block), COSMOS_DB_DELAY)
- this.height = block.height // this needs to be set somewhere
+ const cosmosAPI = new this.CosmosApiClass(this.network, this.store)
+ await this.checkForNewBlock(cosmosAPI)
- // we are safe, that the chain produced a block so it didn't hang up
- if (this.chainHangup) clearTimeout(this.chainHangup)
- }
+ this.pollingTimeout = setTimeout(async () => {
+ await this.checkForNewBlock(cosmosAPI)
this.pollForNewBlock()
}, POLLING_INTERVAL)
@@ -64,16 +52,40 @@ class CosmosNodeSubscription {
}, EXPECTED_MAX_BLOCK_WINDOW)
}
+ async checkForNewBlock(cosmosAPI) {
+ let block
+ try {
+ block = await cosmosAPI.getBlockByHeightV2()
+ } catch (error) {
+ console.error('Failed to fetch block', error)
+ Sentry.captureException(error)
+ }
+ if (block && this.height !== block.height) {
+ // apparently the cosmos db takes a while to serve the content after a block has been updated
+ // if we don't do this, we run into errors as the data is not yet available
+ setTimeout(() => this.newBlockHandler(block, cosmosAPI), COSMOS_DB_DELAY)
+ this.height = block.height // this needs to be set somewhere
+
+ // we are safe, that the chain produced a block so it didn't hang up
+ if (this.chainHangup) clearTimeout(this.chainHangup)
+ }
+ }
+
// For each block event, we fetch the block information and publish a message.
// A GraphQL resolver is listening for these messages and sends the block to
// each subscribed user.
- async newBlockHandler(block) {
+ async newBlockHandler(block, cosmosAPI) {
try {
Sentry.configureScope(function(scope) {
scope.setExtra('height', block.height)
})
- const validators = await this.cosmosAPI.getAllValidators(block.height)
+ // allow for network specific block handlers
+ if (cosmosAPI.newBlockHandler) {
+ await cosmosAPI.newBlockHandler(block, this.store)
+ }
+
+ const validators = await cosmosAPI.getAllValidators(block.height)
const validatorMap = await this.getValidatorMap(validators)
this.updateDBValidatorProfiles(validators)
this.store.update({
@@ -99,7 +111,6 @@ class CosmosNodeSubscription {
console.error('newBlockHandler failed', error)
Sentry.captureException(error)
}
- this.cosmosAPI.memoizedResults.clear()
}
async getValidatorMap(validators) {
| 7 |
diff --git a/packages/insomnia/src/sync/vcs/vcs.ts b/packages/insomnia/src/sync/vcs/vcs.ts @@ -490,31 +490,6 @@ export class VCS {
return delta;
}
- async shareWithTeam(teamId: string) {
- const { memberKeys, projectKey: backendProjectKey } = await this._queryProjectShareInstructions(teamId);
-
- const { privateKey } = this._assertSession();
-
- const symmetricKey = crypt.decryptRSAWithJWK(privateKey, backendProjectKey.encSymmetricKey);
- const keys: any[] = [];
-
- for (const { accountId, publicKey } of memberKeys) {
- const encSymmetricKey = crypt.encryptRSAWithJWK(JSON.parse(publicKey), symmetricKey);
- keys.push({
- accountId,
- encSymmetricKey,
- });
- }
-
- await this._queryProjectShare(teamId, keys);
- console.log(`[sync] Shared project ${this._backendProjectId()} with ${teamId}`);
- }
-
- async unShareWithTeam() {
- await this._queryProjectUnShare();
- console.log(`[sync] Unshared project ${this._backendProjectId()}`);
- }
-
async _getOrCreateRemoteBackendProject(teamId: string) {
const localProject = await this._assertBackendProject();
let remoteProject = await this._queryProject();
@@ -1046,82 +1021,6 @@ export class VCS {
return teams as Team[];
}
- async _queryProjectUnShare() {
- await this._runGraphQL(
- `
- mutation ($id: ID!) {
- projectUnShare(id: $id) {
- id
- }
- }
- `,
- {
- id: this._backendProjectId(),
- },
- 'projectUnShare',
- );
- }
-
- async _queryProjectShare(
- teamId: string,
- keys: {
- accountId: string;
- encSymmetricKey: string;
- }[],
- ) {
- await this._runGraphQL(
- `
- mutation ($id: ID!, $teamId: ID!, $keys: [ProjectShareKeyInput!]!) {
- projectShare(teamId: $teamId, id: $id, keys: $keys) {
- id
- }
- }
- `,
- {
- keys,
- teamId,
- id: this._backendProjectId(),
- },
- 'projectShare',
- );
- }
-
- async _queryProjectShareInstructions(
- teamId: string,
- ): Promise<{
- teamId: string;
- projectKey: {
- encSymmetricKey: string;
- };
- memberKeys: {
- accountId: string;
- publicKey: string;
- }[];
- }> {
- const { projectShareInstructions } = await this._runGraphQL(
- `
- query ($id: ID!, $teamId: ID!) {
- projectShareInstructions(teamId: $teamId, id: $id) {
- teamId
- projectKey {
- encSymmetricKey
- }
- memberKeys {
- accountId
- publicKey
- }
- }
- }
- `,
- {
- id: this._backendProjectId(),
- teamId: teamId,
- },
- 'projectShareInstructions',
- );
- return projectShareInstructions;
- }
-
async _queryBackendProjects(teamId?: string) {
const { projects } = await this._runGraphQL(
`
@@ -1231,11 +1130,9 @@ export class VCS {
const symmetricKeyStr = JSON.stringify(symmetricKey);
const teamKeys: {accountId: string; encSymmetricKey: string}[] = [];
- let encSymmetricKey: string | undefined;
- if (teamId) {
- if (!teamPublicKeys?.length) {
- throw new Error('teamPublicKeys must not be null or empty!');
+ if (!teamId || !teamPublicKeys?.length) {
+ throw new Error('teamId and teamPublicKeys must not be null or empty!');
}
// Encrypt the symmetric key with the public keys of all the team members, ourselves included
@@ -1245,16 +1142,6 @@ export class VCS {
encSymmetricKey: crypt.encryptRSAWithJWK(JSON.parse(publicKey), symmetricKeyStr),
});
}
- } else {
- const { publicKey } = this._assertSession();
-
- if (!publicKey) {
- throw new Error('Session does not have publicKey');
- }
-
- // Encrypt the symmetric key with the account public key
- encSymmetricKey = crypt.encryptRSAWithJWK(publicKey, symmetricKeyStr);
- }
const { projectCreate } = await this._runGraphQL(
`
@@ -1262,7 +1149,6 @@ export class VCS {
$name: String!,
$id: ID!,
$rootDocumentId: ID!,
- $encSymmetricKey: String,
$teamId: ID,
$teamKeys: [ProjectCreateKeyInput!],
) {
@@ -1270,7 +1156,6 @@ export class VCS {
name: $name,
id: $id,
rootDocumentId: $rootDocumentId,
- encSymmetricKey: $encSymmetricKey,
teamId: $teamId,
teamKeys: $teamKeys,
) {
@@ -1284,7 +1169,6 @@ export class VCS {
name: workspaceName,
id: this._backendProjectId(),
rootDocumentId: workspaceId,
- encSymmetricKey: encSymmetricKey,
teamId: teamId,
teamKeys: teamKeys,
},
| 2 |
diff --git a/generators/client/templates/react/src/main/webapp/app/reducers/index.ts b/generators/client/templates/react/src/main/webapp/app/reducers/index.ts @@ -9,7 +9,7 @@ import authentication from './authentication';
import administration from './administration';
import userManagement from './user-management';
import register from './register';
-import activate from '../modules/account/activate/activate';
+import activate from './activate';
/* jhipster-needle-add-reducer-import - JHipster will add reducer here */
@@ -21,8 +21,8 @@ export default combineReducers({
layout,
administration,
userManagement,
- register,
activate,
+ register,
/* jhipster-needle-add-reducer-combine - JHipster will add reducer here */
loadingBar
});
| 1 |
diff --git a/lib/models/revision.js b/lib/models/revision.js @@ -10,7 +10,11 @@ module.exports = function(crowi) {
revisionSchema = new mongoose.Schema({
path: { type: String, required: true },
- body: { type: String, required: true },
+ body: { type: String, required: true, get: (data) => {
+ // replace CR/CRLF to LF above v3.1.5
+ // see https://github.com/weseek/growi/issues/463
+ return data.replace(/\r\n?/g, '\n');
+ }},
format: { type: String, default: 'markdown' },
author: { type: ObjectId, ref: 'User' },
createdAt: { type: Date, default: Date.now }
| 14 |
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml @@ -33,7 +33,7 @@ services:
volumes:
- graphite:/opt/graphite/storage/whisper
grafana-setup:
- image: sitespeedio/grafana-bootstrap:grafana-4.1.1
+ image: sitespeedio/grafana-bootstrap:grafana-4.1.1-2
links:
- grafana
environment:
| 4 |
diff --git a/site/_data/contributors.js b/site/_data/contributors.js const got = require('got');
+const IGNORED_CONTRIBUTORS = ['stefanjudis', 'github-actions[bot]'];
+
async function fetchContributors({ page = 1, options }) {
const response = await got({
url: `https://api.github.com/repos/stefanjudis/tiny-helpers/contributors?per_page=100&page=${page}`,
@@ -8,7 +10,7 @@ async function fetchContributors({ page = 1, options }) {
const contributors = JSON.parse(response.body)
.map((contributor) => contributor.login)
- .filter((contributor) => contributor !== 'stefanjudis');
+ .filter((contributor) => !IGNORED_CONTRIBUTORS.includes(contributor));
const match = response.headers.link.match(
/^<.*?&page=(?<nextPage>.*?)>; rel="next".*$/
| 2 |
diff --git a/articles/extensions/authorization-extension/v2/index.md b/articles/extensions/authorization-extension/v2/index.md @@ -56,6 +56,10 @@ Once your extension is up and running, you can add additional functionality to i
<i class="icon icon-budicon-715"></i><a href="/extensions/authorization-extension/v2/api-access">Enable API Access to the Extension</a>
<p>Learn how you can automate provisioning and query the authorization context of your users in real-time, using the extension's API.</p>
</li>
+ <li>
+ <i class="icon icon-budicon-715"></i><a href="/api/authorization-extension">Authorization Extension API Explorer</a>
+ <p>Learn about the Authorization Extension's API endpoints and how you can use them.</p>
+ </li>
<li>
<i class="icon icon-budicon-715"></i><a href="/extensions/authorization-extension/v2/rules">Use the Authorization Extension's Data in Rules</a>
<p>Learn how you can use rules to configure extra logic to your logins.</p>
| 0 |
diff --git a/js/searchbar/instantAnswerPlugin.js b/js/searchbar/instantAnswerPlugin.js @@ -89,6 +89,10 @@ function showSearchbarInstantAnswers (text, input, event) {
if (res.Image && !res.ImageIsLogo) {
data.image = res.Image
+ if (data.image.startsWith('/')) {
+ // starting 11/2020, the DDG API returns relative URLs rather than absolute ones
+ data.image = 'https://duckduckgo.com' + data.image
+ }
}
// show a disambiguation
| 1 |
diff --git a/test/e2e/wallet.js b/test/e2e/wallet.js @@ -134,6 +134,10 @@ test('wallet', async function (t) {
t.test('own balance updated', async function (t) {
await navigate(t, client, 'Balances')
+ // TODO should not be necessary
+ await sleep(1000)
+ await client.$('.material-icons=refresh').click()
+
let mycoinEl = () => balanceEl('fermion')
await waitForText(mycoinEl, '9007199254740892')
t.pass('balance is reduced by 100')
| 1 |
diff --git a/src/domain/session/room/timeline/tiles/GapTile.js b/src/domain/session/room/timeline/tiles/GapTile.js @@ -76,6 +76,7 @@ export class GapTile extends SimpleTile {
}
catch (e) {
if (e instanceof ConnectionError) {
+ canFillMore = true;
// Don't increase depth because this gap fill was a noop
continue;
}
| 12 |
diff --git a/react/src/components/card/SprkCard.stories.js b/react/src/components/card/SprkCard.stories.js @@ -127,6 +127,12 @@ export const teaser = () => (
</SprkText>
</SprkStackItem>
+ <SprkStack
+ additionalClasses="
+ sprk-o-Stack__item
+ sprk-o-Stack--split@xxs
+ sprk-o-Stack--end-row"
+ >
<SprkStackItem>
<SprkLink
variant="unstyled"
@@ -138,6 +144,7 @@ export const teaser = () => (
</SprkLink>
</SprkStackItem>
</SprkStack>
+ </SprkStack>
</SprkCard>
);
@@ -225,6 +232,12 @@ export const teaserWithDifferentElementOrder = () => (
</SprkText>
</SprkStackItem>
+ <SprkStack
+ additionalClasses="
+ sprk-o-Stack__item
+ sprk-o-Stack--split@xxs
+ sprk-o-Stack--end-row"
+ >
<SprkStackItem>
<SprkLink
variant="unstyled"
@@ -236,6 +249,7 @@ export const teaserWithDifferentElementOrder = () => (
</SprkLink>
</SprkStackItem>
</SprkStack>
+ </SprkStack>
</SprkCard>
);
@@ -278,6 +292,12 @@ export const twoUpCards = () => (
</SprkText>
</SprkStackItem>
+ <SprkStack
+ additionalClasses="
+ sprk-o-Stack__item
+ sprk-o-Stack--split@xxs
+ sprk-o-Stack--end-row"
+ >
<SprkStackItem>
<SprkLink
variant="unstyled"
@@ -289,6 +309,7 @@ export const twoUpCards = () => (
</SprkLink>
</SprkStackItem>
</SprkStack>
+ </SprkStack>
</SprkCard>
<SprkCard additionalClasses="sprk-o-Stack__item sprk-o-Stack__item--flex@l">
@@ -324,6 +345,12 @@ export const twoUpCards = () => (
</SprkText>
</SprkStackItem>
+ <SprkStack
+ additionalClasses="
+ sprk-o-Stack__item
+ sprk-o-Stack--split@xxs
+ sprk-o-Stack--end-row"
+ >
<SprkStackItem>
<SprkLink
variant="unstyled"
@@ -335,6 +362,7 @@ export const twoUpCards = () => (
</SprkLink>
</SprkStackItem>
</SprkStack>
+ </SprkStack>
</SprkCard>
</SprkStack>
);
@@ -382,6 +410,12 @@ export const threeUpCards = () => (
</SprkText>
</SprkStackItem>
+ <SprkStack
+ additionalClasses="
+ sprk-o-Stack__item
+ sprk-o-Stack--split@xxs
+ sprk-o-Stack--end-row"
+ >
<SprkStackItem>
<SprkLink
variant="unstyled"
@@ -393,6 +427,7 @@ export const threeUpCards = () => (
</SprkLink>
</SprkStackItem>
</SprkStack>
+ </SprkStack>
</SprkCard>
<SprkCard additionalClasses="sprk-o-Stack__item sprk-o-Stack__item--flex@l">
<SprkStackItem>
@@ -427,6 +462,12 @@ export const threeUpCards = () => (
</SprkText>
</SprkStackItem>
+ <SprkStack
+ additionalClasses="
+ sprk-o-Stack__item
+ sprk-o-Stack--split@xxs
+ sprk-o-Stack--end-row"
+ >
<SprkStackItem>
<SprkLink
variant="unstyled"
@@ -438,6 +479,7 @@ export const threeUpCards = () => (
</SprkLink>
</SprkStackItem>
</SprkStack>
+ </SprkStack>
</SprkCard>
<SprkCard additionalClasses="sprk-o-Stack__item sprk-o-Stack__item--flex@l">
<SprkStackItem>
@@ -472,6 +514,12 @@ export const threeUpCards = () => (
</SprkText>
</SprkStackItem>
+ <SprkStack
+ additionalClasses="
+ sprk-o-Stack__item
+ sprk-o-Stack--split@xxs
+ sprk-o-Stack--end-row"
+ >
<SprkStackItem>
<SprkLink
variant="unstyled"
@@ -483,6 +531,7 @@ export const threeUpCards = () => (
</SprkLink>
</SprkStackItem>
</SprkStack>
+ </SprkStack>
</SprkCard>
</SprkStack>
);
@@ -530,6 +579,12 @@ export const fourUpCards = () => (
</SprkText>
</SprkStackItem>
+ <SprkStack
+ additionalClasses="
+ sprk-o-Stack__item
+ sprk-o-Stack--split@xxs
+ sprk-o-Stack--end-row"
+ >
<SprkStackItem>
<SprkLink
variant="unstyled"
@@ -541,6 +596,7 @@ export const fourUpCards = () => (
</SprkLink>
</SprkStackItem>
</SprkStack>
+ </SprkStack>
</SprkCard>
<SprkCard additionalClasses="sprk-o-Stack__item sprk-o-Stack__item--flex@l">
<SprkStackItem>
@@ -575,6 +631,12 @@ export const fourUpCards = () => (
</SprkText>
</SprkStackItem>
+ <SprkStack
+ additionalClasses="
+ sprk-o-Stack__item
+ sprk-o-Stack--split@xxs
+ sprk-o-Stack--end-row"
+ >
<SprkStackItem>
<SprkLink
variant="unstyled"
@@ -586,6 +648,7 @@ export const fourUpCards = () => (
</SprkLink>
</SprkStackItem>
</SprkStack>
+ </SprkStack>
</SprkCard>
<SprkCard additionalClasses="sprk-o-Stack__item sprk-o-Stack__item--flex@l">
<SprkStackItem>
@@ -620,6 +683,12 @@ export const fourUpCards = () => (
</SprkText>
</SprkStackItem>
+ <SprkStack
+ additionalClasses="
+ sprk-o-Stack__item
+ sprk-o-Stack--split@xxs
+ sprk-o-Stack--end-row"
+ >
<SprkStackItem>
<SprkLink
variant="unstyled"
@@ -631,6 +700,7 @@ export const fourUpCards = () => (
</SprkLink>
</SprkStackItem>
</SprkStack>
+ </SprkStack>
</SprkCard>
<SprkCard additionalClasses="sprk-o-Stack__item sprk-o-Stack__item--flex@l">
<SprkStackItem>
@@ -665,6 +735,12 @@ export const fourUpCards = () => (
</SprkText>
</SprkStackItem>
+ <SprkStack
+ additionalClasses="
+ sprk-o-Stack__item
+ sprk-o-Stack--split@xxs
+ sprk-o-Stack--end-row"
+ >
<SprkStackItem>
<SprkLink
variant="unstyled"
@@ -676,6 +752,7 @@ export const fourUpCards = () => (
</SprkLink>
</SprkStackItem>
</SprkStack>
+ </SprkStack>
</SprkCard>
</SprkStack>
);
| 3 |
diff --git a/metaverse-modules.js b/metaverse-modules.js @@ -15,6 +15,7 @@ const moduleUrls = {
spawner: './metaverse_modules/spawner/',
defaultScene: './metaverse_modules/default-scene/',
path: './metaverse_modules/path/',
+ area: './metaverse_modules/area/',
};
const modules = {};
const loadPromise = (async () => {
| 0 |
diff --git a/js/feature/segTrack.js b/js/feature/segTrack.js @@ -156,7 +156,7 @@ class SegTrack extends TrackBase {
const pixelWidth = options.pixelWidth;
const pixelHeight = options.pixelHeight;
const pixelBottom = pixelTop + pixelHeight;
- IGVGraphics.fillRect(ctx, 0, options.pixelTop, pixelWidth, pixelHeight, {'fillStyle': "rgb(255, 255, 255)"});
+ IGVGraphics.fillRect(ctx, 0, 0, pixelWidth, pixelHeight, {'fillStyle': "rgb(255, 255, 255)"});
const featureList = options.features;
@@ -207,7 +207,7 @@ class SegTrack extends TrackBase {
const sampleKey = segment.sampleKey || segment.sample
segment.row = samples[sampleKey];
- const y = pixelTop + segment.row * sampleHeight + border;
+ const y = segment.row * sampleHeight + border;
const bottom = y + sampleHeight;
if (bottom < pixelTop || y > pixelBottom) {
| 1 |
diff --git a/src/commands/sites/create.js b/src/commands/sites/create.js @@ -14,6 +14,7 @@ class SitesCreateCommand extends Command {
if (isEmpty(flags)) {
const accounts = await this.netlify.listAccountsForUser()
const personal = accounts.find(account => account.type === 'PERSONAL')
+ console.log('Choose a site name. One will be automatically generated if left blank. You will be able to update this at a later time.')
const results = await inquirer.prompt([
{
type: 'input',
@@ -36,7 +37,15 @@ class SitesCreateCommand extends Command {
const { accountSlug } = results
delete results.accountSlug
- const site = await this.netlify.createSiteInTeam({ accountSlug, body: results })
+ let site
+ try {
+ site = await this.netlify.createSiteInTeam({ accountSlug, body: results })
+ } catch (error) {
+ console.log(`Error ${error.status}: ${error.message} from createSiteInTeam call`)
+ if (error.status === 422) {
+ this.error(`A site with name ${results.name} already exists. Please try a different slug`)
+ }
+ }
this.log()
this.log(chalk.greenBright.bold.underline(`Site Created`))
this.log()
@@ -47,6 +56,7 @@ class SitesCreateCommand extends Command {
'Site ID': site.id
})
)
+ this.log()
return site
}
}
| 9 |
diff --git a/src/TemplatePassthroughManager.js b/src/TemplatePassthroughManager.js +const multimatch = require("multimatch");
+const isGlob = require("is-glob");
const { TemplatePath } = require("@11ty/eleventy-utils");
const EleventyExtensionMap = require("./EleventyExtensionMap");
@@ -177,6 +179,13 @@ class TemplatePassthroughManager {
if (TemplatePath.startsWithSubPath(changedFile, path.inputPath)) {
return path;
}
+ if (
+ changedFile &&
+ isGlob(path.inputPath) &&
+ multimatch([changedFile], [path.inputPath]).length
+ ) {
+ return path;
+ }
}
return false;
| 1 |
diff --git a/app.js b/app.js @@ -73,6 +73,23 @@ export default class App {
world.getWorldJson(q.u),
]);
+ const coord = (() => {
+ if (q.c) {
+ const split = q.c.match(/^\[(-?[0-9]+),(-?[0-9]+),(-?[0-9]+)\]$/);
+ let x, y, z;
+ if (split && !isNaN(x = parseInt(split[1])) && !isNaN(y = parseInt(split[2])) && !isNaN(z = parseInt(split[3]))) {
+ return new THREE.Vector3(x, y, z);
+ } else {
+ return null;
+ }
+ } else {
+ return null;
+ }
+ })();
+ if (coord) {
+ camera.position.copy(coord);
+ }
+
try {
await Promise.all([
universe.enterWorld(worldJson),
| 0 |
diff --git a/lib/user.js b/lib/user.js @@ -5,7 +5,7 @@ var auth = require('./auth');
var console = require('./log');
const API_BASE = 'account.demandware.com/dw/rest/v1';
-const USER_LIST_PAGE_SIZE = 10;
+const USER_LIST_PAGE_SIZE = 25;
const USER_ALLOWED_READ_PROPERTIES = [ 'id', 'userState', 'roles', 'roleTenantFilter', 'primaryOrganization', 'mail',
'firstName', 'lastName', 'displayName' ];
const ORG_ALLOWED_READ_PROPERTIES = [ 'id', 'name', 'realms', 'twoFARoles' ];
| 12 |
diff --git a/spec/requests/carto/builder/visualizations_controller_spec.rb b/spec/requests/carto/builder/visualizations_controller_spec.rb @@ -13,8 +13,8 @@ describe Carto::Builder::VisualizationsController do
describe '#show' do
before(:each) do
- map = FactoryGirl.create(:map, user_id: @user1.id)
- @visualization = FactoryGirl.create(:carto_visualization, user_id: @user1.id, map_id: map.id)
+ @map = FactoryGirl.create(:map, user_id: @user1.id)
+ @visualization = FactoryGirl.create(:carto_visualization, user_id: @user1.id, map_id: @map.id)
login(@user1)
end
@@ -207,8 +207,10 @@ describe Carto::Builder::VisualizationsController do
end
it 'includes the google maps client id if configured' do
+ @map.provider = 'googlemaps'
@user1.google_maps_key = 'client=wadus_cid'
@user1.save
+ @visualization
get builder_visualization_url(id: @visualization.id)
response.status.should == 200
| 12 |
diff --git a/app/models/street/StreetEdgeTable.scala b/app/models/street/StreetEdgeTable.scala @@ -184,12 +184,16 @@ object StreetEdgeTable {
}
val edges = for {
- (_streetEdges, _auditTasks) <- streetEdgesWithoutDeleted.innerJoin(auditTaskQuery).on(_.streetEdgeId === _.streetEdgeId)
- } yield _streetEdges
+ _edges <- streetEdgesWithoutDeleted
+ _tasks <- auditTaskQuery if _tasks.streetEdgeId === _edges.streetEdgeId
+ } yield _edges
- val edgesWithAuditCounts = edges.groupBy(x => x).map{ case (edge, group) => (edge.geom.transform(26918).length, group.length)}
+ // Gets tuple of (street_edge_id, num_completed_audits)
+ val edgesWithAuditCounts = edges.groupBy(x => x).map{
+ case (edge, group) => (edge.geom.transform(26918).length, group.length)
+ }
- // get length of each street segment, sum the lengths, and convert from meters to miles
+ // Get length of each street segment, sum the lengths, and convert from meters to miles
val distances: List[Float] = edgesWithAuditCounts.filter(_._2 >= auditCount).map(_._1).list
(distances.sum * 0.000621371).toFloat
}
| 3 |
diff --git a/assets/js/modules/tagmanager/setup.js b/assets/js/modules/tagmanager/setup.js @@ -39,10 +39,9 @@ class TagmanagerSetup extends Component {
constructor( props ) {
super( props );
- const {
- accountID,
- containerID,
- } = googlesitekit.modules.tagmanager.settings;
+ const { settings } = googlesitekit.modules.tagmanager;
+ const usageContext = googlesitekit.admin.ampMode === 'primary' ? 'amp' : 'web';
+ const containerKey = usageContext === 'amp' ? 'ampContainerID' : 'containerID';
this.state = {
isLoading: true,
@@ -51,10 +50,11 @@ class TagmanagerSetup extends Component {
errorCode: false,
errorMsg: '',
refetch: false,
- selectedAccount: accountID ? accountID : 0,
- selectedContainer: containerID ? containerID : 0,
+ selectedAccount: settings.accountID || 0,
+ selectedContainer: settings[ containerKey ] || 0,
containersLoading: false,
- usageContext: googlesitekit.admin.ampMode === 'primary' ? 'amp' : 'web',
+ usageContext,
+ containerKey,
};
this.handleSubmit = this.handleSubmit.bind( this );
@@ -236,10 +236,10 @@ class TagmanagerSetup extends Component {
selectedAccount,
selectedContainer,
usageContext,
+ containerKey,
} = this.state;
const { finishSetup } = this.props;
- const containerKey = usageContext === 'amp' ? 'ampContainerID' : 'containerID';
try {
const dataParams = {
| 3 |
diff --git a/v2-routes/v2-rockets.js b/v2-routes/v2-rockets.js @@ -5,7 +5,7 @@ const v2 = express.Router()
// Returns all vehicle info
v2.get("/", (req, res, next) => {
- global.db.collection("vehicle").find({},{"_id": 0 }).toArray((err, doc) => {
+ global.db.collection("rocket").find({},{"_id": 0 }).toArray((err, doc) => {
if (err) {
return next(err)
}
@@ -15,7 +15,7 @@ v2.get("/", (req, res, next) => {
// Returns Falcon 1 info
v2.get("/falcon1", (req, res, next) => {
- global.db.collection("vehicle").find({"id": "falcon1"},{"_id": 0 }).toArray((err, doc) => {
+ global.db.collection("rocket").find({"id": "falcon1"},{"_id": 0 }).toArray((err, doc) => {
if (err) {
return next(err)
}
@@ -25,7 +25,7 @@ v2.get("/falcon1", (req, res, next) => {
// Returns Falcon 9 info
v2.get("/falcon9", (req, res, next) => {
- global.db.collection("vehicle").find({"id": "falcon9"},{"_id": 0 }).toArray((err, doc) => {
+ global.db.collection("rocket").find({"id": "falcon9"},{"_id": 0 }).toArray((err, doc) => {
if (err) {
return next(err)
}
@@ -35,7 +35,7 @@ v2.get("/falcon9", (req, res, next) => {
// Returns Falcon Heavy info
v2.get("/falconheavy", (req, res, next) => {
- global.db.collection("vehicle").find({"id": "falconheavy"},{"_id": 0 }).toArray((err, doc) => {
+ global.db.collection("rocket").find({"id": "falconheavy"},{"_id": 0 }).toArray((err, doc) => {
if (err) {
return next(err)
}
| 3 |
diff --git a/js/views/modals/purchase/Shipping.js b/js/views/modals/purchase/Shipping.js @@ -23,6 +23,11 @@ export default class extends baseView {
if (!col.models.length) {
this.selectedAddress = '';
this.trigger('shippingOptionSelected', { name: '', service: '' });
+ } else {
+ // If the old selected address doesn't exist any more, select the first address.
+ const userAddresses = app.settings.get('shippingAddresses');
+ this.selectedAddress = userAddresses.get(this.selectedAddress) ?
+ this.selectedAddress : userAddresses.at(0);
}
this.render();
});
| 9 |
diff --git a/package.json b/package.json "socket.io": "^1.4.5",
"socket.io-client": "^1.4.8",
"speakingurl": "^11.0.0",
- "steem": "steemit/steem-js#dev",
+ "steem": "^0.4.6",
"steemconnect": "adcpm/steemconnect#dev",
"store": "^1.3.20",
"striptags": "^2.1.1",
| 4 |
diff --git a/describe.go b/describe.go @@ -12,6 +12,7 @@ import (
"strings"
"text/template"
+ spartaCF "github.com/mweagle/Sparta/aws/cloudformation"
"github.com/sirupsen/logrus"
)
@@ -199,10 +200,11 @@ func Describe(serviceName string,
writeLink(&b, name, eachLambda.lambdaFunctionName(), strings.Replace(link, "\n", "<br><br>", -1))
}
}
-
for _, eachEventSourceMapping := range eachLambda.EventSourceMappings {
- writeNode(&b, eachEventSourceMapping.EventSourceArn, nodeColorEventSource, "border-style:dotted")
- writeLink(&b, eachEventSourceMapping.EventSourceArn, eachLambda.lambdaFunctionName(), "")
+ dynamicArn := spartaCF.DynamicValueToStringExpr(eachEventSourceMapping.EventSourceArn)
+ literalArn := dynamicArn.String().Literal
+ writeNode(&b, literalArn, nodeColorEventSource, "border-style:dotted")
+ writeLink(&b, literalArn, eachLambda.lambdaFunctionName(), "")
}
}
| 4 |
diff --git a/src/branch_view.js b/src/branch_view.js @@ -24,7 +24,6 @@ function checkPreviousBanner() {
*/
function renderHtmlBlob(parent, html, hasApp) {
journeys_utils.setJourneyLinkData(html);
- journeys_utils.branch._publishEvent('willShowJourney', journeys_utils.journeyLinkData);
var ctaText = hasApp ? 'OPEN' : 'GET';
@@ -47,6 +46,8 @@ function renderHtmlBlob(parent, html, hasApp) {
journeys_utils.addIframeInnerCSS(iframe, cssInsideIframe);
journeys_utils.addDynamicCtaText(iframe, ctaText);
+ journeys_utils.branch._publishEvent('willShowJourney', journeys_utils.journeyLinkData);
+
journeys_utils.animateBannerEntrance(iframe);
return iframe;
| 3 |
diff --git a/config/config.json b/config/config.json "commandExecutorVerboseLoggingEnabled": false,
"minimumReplicationFactor": 5,
"publishFindNodesCount": 20,
- "signalingServerUrl": "not_defined",
+ "signalingServerUrl": null,
"appDataPath": "data",
"graphDatabase": {
"implementation": "GraphDB",
"minimumReplicationFactor": 5,
"publishFindNodesCount": 20,
"appDataPath": "data",
- "signalingServerUrl": "not_defined",
+ "signalingServerUrl": null,
"graphDatabase": {
"implementation": "GraphDB",
"url": "http://localhost:7200",
| 3 |
diff --git a/bin/config-yargs.js b/bin/config-yargs.js @@ -200,7 +200,7 @@ module.exports = function(yargs) {
},
"resolve-extensions": {
"type": "array",
- describe: "Setup extensions that should be used to resolve modules (Example: --resolve-extensions .es6 .js)",
+ describe: "Setup extensions that should be used to resolve modules (Example: --resolve-extensions .es6,.js)",
group: RESOLVE_GROUP,
requiresArg: true
},
| 1 |
diff --git a/package.json b/package.json "fast-isnumeric": "^1.1.2",
"immutability-helper": "^3.0.0",
"plotly-icons": "1.3.11",
- "plotly.js": "1.46.1",
+ "plotly.js": "1.47.0",
"prop-types": "^15.7.2",
"raf": "^3.4.1",
"react-color": "^2.17.0",
"react-colorscales": "0.7.3",
"react-day-picker": "^7.3.0",
- "react-dropzone": "^10.1.0",
+ "react-dropzone": "^10.1.3",
"react-plotly.js": "^2.3.0",
"react-rangeslider": "^2.2.0",
"react-resizable-rotatable-draggable": "^0.2.0",
"style-loader": "0.23.1",
"webpack": "4.29.6",
"webpack-cli": "3.3.0",
- "webpack-dev-server": "3.2.1"
+ "webpack-dev-server": "3.3.0"
},
"peerDependencies": {
"react": ">15",
| 3 |
diff --git a/readme.md b/readme.md @@ -319,7 +319,7 @@ You can also pass `render` or `children` as a function to act differently based
```jsx
<ConfigureFlopFlip adapter={adapter} adapterArgs={{ clientSideId, user }}>
- {{isAdapterConfigured} => isAdapterConfigured ? <App /> : <LoadingSpinner />}
+ {(isAdapterConfigured) => isAdapterConfigured ? <App /> : <LoadingSpinner />}
</ConfigureFlopFlip>;
```
| 1 |
diff --git a/index.html b/index.html </div>
</div>
</div>
-<div class="collapse" id="wags">
- <h1 style="color: white;font-family:mathfont">Wagstaff Number</h2><p> </p>
- <input style="color: white; font-family:mathfont" type="text"id="wag1" placeholder="Enter the input number" class="form__field"><p> </p>
- <button class="btn btn-dark" onclick="wagcal()">FInd</button><p> </p>
- <p style="font-family:mathfont" id="wagans"></p><br>
+<div class="collapse" id="wags" style="text-align: center;">
+ <div class="container">
+ <h1 style="color: white;font-family:mathfont;text-align: center;">Wagstaff Number</h2>
+ <br>
+ <p>A Wagstaff prime is a prime number of the form \[{{2^p+1}\over 3}\] , where p is an odd prime.</p>
+ <br>
+ <form action="">
+ <div class="form-group">
+ <input style="color: white; font-family:mathfont" type="number" id="wag1" placeholder="Enter the input number" class="form__field">
+ </div>
+ <div class="form-group">
+ <button type="button" class="btn btn-light" onclick="wagcal()">FInd</button>
+ <button type="button" class="btn btn-light" onclick="this.form.reset();">
+ Reset
+ </button>
+ </div>
+ </form>
+ <br>
+ <div class="form-group text-center">
+ <p class="stopwrap" style="color:white;" id="wagans"></p><br>
+ </div>
+ </div>
</div>
<div class="collapse" id="woods">
| 7 |
diff --git a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js @@ -152,6 +152,8 @@ in your Node-RED user directory (${RED.settings.userDir}).
// opts.defaultPort = isHttps?443:80;
opts.timeout = node.reqTimeout;
opts.throwHttpErrors = false;
+ // TODO: add UI option to auto decompress. Setting to false for 1.x compatibility
+ opts.decompress = false;
opts.method = method;
opts.headers = {};
opts.retry = 0;
| 12 |
diff --git a/src/helpers/file_helper.js b/src/helpers/file_helper.js @@ -137,7 +137,7 @@ export function getBlobFromBase64(b64Data, contentType, sliceSize) {
return new Blob(byteArrays, { type })
}
-export function processImage({ exifData, file, fileType, maxWidth = 2560, maxHeight = 5000 }) {
+export function processImage({ exifData, file, fileType, maxWidth = 2560, maxHeight = 7680 }) {
return new Promise((resolve, reject) => {
const img = new Image()
img.onload = () => {
| 11 |
diff --git a/app/queries/carto/visualization_query_searcher.rb b/app/queries/carto/visualization_query_searcher.rb @@ -25,7 +25,7 @@ class Carto::VisualizationQuerySearcher
def tsvector
%{
setweight(to_tsvector('english', coalesce("visualizations"."name",'')), 'A') ||
- setweight(to_tsvector('english', coalesce(array_to_string(visualizations.tags, ', '),'')), 'B') ||
+ setweight(to_tsvector('english', coalesce(array_to_string(visualizations.tags, ''),'')), 'B') ||
setweight(to_tsvector('english', coalesce("visualizations"."description",'')), 'C')
}
end
| 2 |
diff --git a/spec/services/carto/user_metadata_export_service_spec.rb b/spec/services/carto/user_metadata_export_service_spec.rb @@ -520,11 +520,6 @@ describe Carto::UserMetadataExportService do
def expect_export_matches_oauth_apps(exported_oauth_app, oauth_app)
expect(exported_oauth_app).to be_nil && return unless oauth_app
- expect_export_matches_oauth_apps_no_dates(exported_oauth_app, oauth_app)
- expect_export_matches_oauth_apps_dates(exported_oauth_app, oauth_app)
- end
-
- def expect_export_matches_oauth_apps_no_dates(exported_oauth_app, oauth_app)
expect(exported_oauth_app[:id]).to eq oauth_app.id
expect(exported_oauth_app[:user_id]).to eq oauth_app.user_id
expect(exported_oauth_app[:name]).to eq oauth_app.name
@@ -533,6 +528,8 @@ describe Carto::UserMetadataExportService do
expect(exported_oauth_app[:redirect_uris]).to eq oauth_app.redirect_uris
expect(exported_oauth_app[:icon_url]).to eq oauth_app.icon_url
expect(exported_oauth_app[:restricted]).to eq oauth_app.restricted
+
+ expect_export_matches_oauth_apps_dates(exported_oauth_app, oauth_app)
end
def expect_export_matches_oauth_apps_dates(exported_oauth_app, oauth_app)
| 2 |
diff --git a/scripts/hardhat-tasks-functions.js b/scripts/hardhat-tasks-functions.js @@ -142,7 +142,10 @@ async function verifyContract(contractAddress, contractName) {
},
};
const params = new URLSearchParams();
- params.append('apikey', process.env.ETHERSCAN_API_KEY);
+
+ const apiKey = process.env.ETHERSCAN_API_KEY;
+
+ params.append('apikey', apiKey);
params.append('module', 'contract');
params.append('action', 'verifysourcecode');
params.append('contractaddress', contractAddress);
@@ -166,15 +169,14 @@ async function verifyContract(contractAddress, contractName) {
params.append('licenseType', 3);
const blockExplorer = hre.network.config.blockExplorer;
- // TODO: different API keys needed, different urls for arbi / L1
let url = `https://api.${blockExplorer}.io/api`;
let demo = `https://${blockExplorer}.io/sourcecode-demo.html`;
- if (!(network !== 'mainnet' || network !== 'arbitrum')) {
+ if (!(network === 'mainnet' || network === 'arbitrum')) {
url = `https://api-${network}.${blockExplorer}.io/api`;
demo = `https://${network}.${blockExplorer}.io/sourcecode-demo.html`;
}
const tx = await axios.post(url, params, config);
- console.log(`Check how verification is going at ${demo} with API key ${process.env.ETHERSCAN_API_KEY} and receipt GUID ${tx.data.result}`);
+ console.log(`Check how verification is going at ${demo} with API key ${apiKey} and receipt GUID ${tx.data.result}`);
}
async function flatten(filePath) {
| 1 |
diff --git a/src/kite.js b/src/kite.js @@ -428,6 +428,11 @@ const Kite = {
this.getSupportedLanguages().catch(() => []),
]).then(([state, languages]) => {
this.supportedLanguages = languages;
+
+ if (state > StateController.STATES.INSTALLED) {
+ localconfig.set('wasInstalled', true);
+ }
+
switch (state) {
case StateController.STATES.UNSUPPORTED:
if (this.shown[state] || !this.isGrammarSupported(vscode.window.activeTextEditor)) { return state; }
@@ -442,55 +447,14 @@ const Kite = {
case StateController.STATES.UNINSTALLED:
if (this.shown[state] || !this.isGrammarSupported(vscode.window.activeTextEditor)) { return state; }
this.shown[state] = true;
- // this.showErrorMessage('Kite is not installed: Grab the installer from our website', 'Get Kite').then(item => {
- // if (item) { opn('https://kite.com/'); }
- // });
+ if (!localconfig.get('wasInstalled', false)) {
this.install.reset();
AccountManager.initClient('alpha.kite.com', -1, true);
vscode.commands.executeCommand('vscode.previewHtml', 'kite-vscode-install://install', vscode.ViewColumn.One, 'Kite Install');
+ }
break;
case StateController.STATES.INSTALLED:
break;
- // if (this.shown[state] || !this.isGrammarSupported(vscode.window.activeTextEditor)) { return state; }
- // this.shown[state] = true;
- // Promise.all([
- // StateController.isKiteInstalled().then(() => true).catch(() => false),
- // StateController.isKiteEnterpriseInstalled().then(() => true).catch(() => false),
- // ]).then(([kiteInstalled, kiteEnterpriseInstalled]) => {
- // if (StateController.hasManyKiteInstallation() ||
- // StateController.hasManyKiteEnterpriseInstallation()) {
- // this.showErrorMessage('You have multiple versions of Kite installed. Please launch your desired one.');
- // } else if (kiteInstalled && kiteEnterpriseInstalled) {
- // this.showErrorMessage('Kite is not running: Start the Kite background service to get Python completions, documentation, and examples.', 'Launch Kite Enterprise', 'Launch Kite Cloud').then(item => {
- // if (item === 'Launch Kite Cloud') {
- // return StateController.runKiteAndWait(ATTEMPTS, INTERVAL)
- // .then(() => this.checkState())
- // .catch(err => console.error(err));
- // } else if (item === 'Launch Kite Enterprise') {
- // return StateController.runKiteEnterpriseAndWait(ATTEMPTS, INTERVAL)
- // .then(() => this.checkState())
- // .catch(err => console.error(err));
- // }
- // });
- // } else if (kiteInstalled) {
- // this.showErrorMessage('Kite is not running: Start the Kite background service to get Python completions, documentation, and examples.', 'Launch Kite').then(item => {
- // if (item) {
- // return StateController.runKiteAndWait(ATTEMPTS, INTERVAL)
- // .then(() => this.checkState())
- // .catch(err => console.error(err));
- // }
- // });
- // } else if (kiteEnterpriseInstalled) {
- // this.showErrorMessage('Kite Enterprise is not running: Start the Kite background service to get Python completions, documentation, and examples.', 'Launch Kite Enterprise').then(item => {
- // if (item) {
- // return StateController.runKiteEnterpriseAndWait(ATTEMPTS, INTERVAL)
- // .then(() => this.checkState())
- // .catch(err => console.error(err));
- // }
- // });
- // }
- // });
- // break;
case StateController.STATES.RUNNING:
if (this.shown[state] || !this.isGrammarSupported(vscode.window.activeTextEditor)) { return state; }
this.shown[state] = true;
| 4 |
diff --git a/frameworks/keyed/fntags/src/Main.js b/frameworks/keyed/fntags/src/Main.js @@ -57,14 +57,15 @@ const row = ( item ) => {
} )
tr.addEventListener( 'click', () => {
- if( selected ) selected.className = ''
- tr.className = 'danger'
- selected = tr
+ if( selected ) selected.patch( { selected: false } )
+ item.patch( { selected: true } )
+ selected = item
} )
tr.setAttribute( 'id', item().id.toString() )
const update = () => {
+ tr.className = item().selected ? 'danger' : ''
label.innerText = item().label
id.innerText = item().id
}
| 13 |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md @@ -15,8 +15,8 @@ You will need the following things properly installed on your computer.
* [Ember CLI](http://www.ember-cli.com/)
* [PhantomJS 2](http://phantomjs.org/)
* [Gatekeeper](https://github.com/prose/gatekeeper)
-* [Docker](https://docs.docker.com/install/)
-* [Docker Compose](https://docs.docker.com/compose/install/)
+* [Docker](https://docs.docker.com/install/) (Optional)
+* [Docker Compose](https://docs.docker.com/compose/install/) (Optional)
### Installation
| 0 |
diff --git a/avatars/microphone-worklet.js b/avatars/microphone-worklet.js @@ -9,6 +9,9 @@ let emitBuffer = false;
// console.log('load worklet');
+const queue = [];
+let queueLength = 0;
+const maxQueueLength = 4000;
class VolumeProcessor extends AudioWorkletProcessor {
constructor() {
super();
@@ -64,6 +67,15 @@ class VolumeProcessor extends AudioWorkletProcessor {
}
if (!muted) {
+ queue.push(inputs.map(channels => channels.map(samples => Float32Array.from(samples))));
+ queueLength += (inputs && inputs[0] && inputs[0][0] && inputs[0][0].length) ?? 0;
+ // console.log('got queue length', inputs[0]);
+
+ // console.log('push', inputs, inputs.map(input => Float32Array.from(input)));
+ // debugger;
+ while (queueLength > maxQueueLength) {
+ const inputs = queue.shift();
+ queueLength -= (inputs && inputs[0] && inputs[0][0] && inputs[0][0].length) ?? 0;
for (let i = 0; i < outputs.length; i++) {
const input = inputs[i];
const output = outputs[i];
@@ -76,6 +88,7 @@ class VolumeProcessor extends AudioWorkletProcessor {
}
}
}
+ }
if (emitBuffer) {
const i = 0;
| 0 |
diff --git a/src/core/operations/SeqUtils.js b/src/core/operations/SeqUtils.js @@ -26,7 +26,7 @@ const SeqUtils = {
* @constant
* @default
*/
- SORT_ORDER: ["Alphabetical (case sensitive)", "Alphabetical (case insensitive)", "IP address"],
+ SORT_ORDER: ["Alphabetical (case sensitive)", "Alphabetical (case insensitive)", "IP address", "Numeric"],
/**
* Sort operation.
@@ -47,6 +47,8 @@ const SeqUtils = {
sorted = sorted.sort(SeqUtils._caseInsensitiveSort);
} else if (order === "IP address") {
sorted = sorted.sort(SeqUtils._ipSort);
+ } else if (order === "Numeric") {
+ sorted = sorted.sort(SeqUtils._numericSort);
}
if (sortReverse) sorted.reverse();
@@ -221,6 +223,33 @@ const SeqUtils = {
return a_ - b_;
},
+ /**
+ * Comparison operation for sorting of numeric values.
+ *
+ * @private
+ * @param {string} a
+ * @param {string} b
+ * @returns {number}
+ */
+ _numericSort: function _numericSort(a, b) {
+ let a_ = a.split(/([^\d]+)/),
+ b_ = b.split(/([^\d]+)/);
+
+ for (let i=0; i<a_.length && i<b.length; ++i) {
+ if (isNaN(a_[i]) && !isNaN(b_[i])) return 1; // Numbers after non-numbers
+ if (!isNaN(a_[i]) && isNaN(b_[i])) return -1;
+ if (isNaN(a_[i]) && isNaN(b_[i])) {
+ let ret = a_[i].localeCompare(b_[i]); // Compare strings
+ if (ret !== 0) return ret;
+ }
+ if (!isNaN(a_[i]) && !isNaN(a_[i])) { // Compare numbers
+ if (a_[i] - b_[i] !== 0) return a_[i] - b_[i];
+ }
+ }
+
+ return 0;
+ },
+
};
export default SeqUtils;
| 0 |
diff --git a/src/server/system_services/cluster_server.js b/src/server/system_services/cluster_server.js @@ -780,6 +780,19 @@ function update_dns_servers(req) {
})) {
throw new RpcError('OFFLINE_SERVER', 'Server is disconnected');
}
+ const config_to_compare = [
+ dns_servers_config.dns_servers ? dns_servers_config.dns_servers.sort() : undefined,
+ dns_servers_config.search_domains ? dns_servers_config.search_domains.sort() : undefined
+ ];
+ // don't update servers that already have the dame configuration
+ target_servers = target_servers.filter(srv => {
+ const { dns_servers, search_domains } = srv;
+ return !_.isEqual(config_to_compare, [dns_servers.sort(), search_domains.sort()]);
+ });
+ if (!target_servers.length) {
+ dbg.log0(`DNS changes are the same as current configuration. skipping`);
+ throw new Error('NO_CHANGE');
+ }
let updates = _.map(target_servers, server => _.omitBy({
_id: server._id,
dns_servers: dns_servers_config.dns_servers,
@@ -806,6 +819,9 @@ function update_dns_servers(req) {
`DNS servers cleared` : `DNS servers set to: ${dns_servers_config.dns_servers.join(', ')}`
});
})
+ .catch(err => {
+ if (err.message !== 'NO_CHANGE') throw err;
+ })
.return();
}
| 8 |
diff --git a/html/settings/_settings.scss b/html/settings/_settings.scss @@ -2080,7 +2080,7 @@ $sprk-stepper-icon-border-width: 2px !default;
/// The color of the border around the Stepper icon.
$sprk-stepper-icon-border-color: $sprk-black-tint-50 !default;
/// The color of the step icon when the step is selected in the Stepper.
-$sprk-stepper-icon-border-color-selected: $sprk-purple !default;
+$sprk-stepper-icon-border-color-selected: $sprk-dark-purple !default;
/// The color of the step icon in front of a dark background
/// when the step is selected in the Stepper.
$sprk-stepper-icon-border-color-selected-dark-bg: $sprk-lightest-purple !default;
| 3 |
diff --git a/closure/goog/functions/functions.js b/closure/goog/functions/functions.js // limitations under the License.
/**
- * @fileoverview Utilities for creating functions. Loosely inspired by the
- * java classes: http://goo.gl/GM0Hmu and http://goo.gl/6k7nI8.
+ * @fileoverview Utilities for creating functions. Loosely inspired by these
+ * java classes from the Guava library:
+ * com.google.common.base.Functions
+ * https://google.github.io/guava/releases/snapshot-jre/api/docs/index.html?com/google/common/base/Functions.html
+ *
+ * com.google.common.base.Predicates
+ * https://google.github.io/guava/releases/snapshot-jre/api/docs/index.html?com/google/common/base/Predicates.html
+ *
+ * More about these can be found at
+ * https://github.com/google/guava/wiki/FunctionalExplained
*
* @author [email protected] (Nick Santos)
*/
| 14 |
diff --git a/styles/tokens/settings.json b/styles/tokens/settings.json "themable": true
},
"pre-overflow": {
- "comment": "Text color of any text when selected.",
- "value": "auto",
- "type": "settings",
- "themable": true
- },
- "pre-overflow": {
- "comment": "Text color of any text when selected.",
+ "comment": "Reset for the overflow property on pre elements.",
"value": "auto",
"type": "settings",
"themable": true
| 3 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,40 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master
where X.Y.Z is the semver of most recent plotly.js release.
+## [1.24.0] -- 2017-02-27
+
+### Added
+- Add `parcoords` trace type (parallel coordinate plots) [#1256]
+- Add support for multiple range sliders [#1355]
+- Add `'aitoff'` and `'sinusoidal'` geo projection types [#1422]
+- Implement `scene.dragmode: false` to disable drag interaction on 3D subplots
+ [#1377]
+- Add `showAxisDragHandles` and `showAxisRangeEntryBoxes` configuration options
+ [#1389]
+- Add `customdata` attribute to scatter traces to add custom data to scatter SVG
+ nodes [#1379]
+
+### Changed
+- Consistent handling of array containers during `relayout` [#1403]
+- Improve hover for `choropleth` traces [#1401]
+- Make range slider handles and mask crispier [#1409]
+- Bump `country-regex` dependency to `1.1.0` [#1392]
+
+### Fixed
+- Fix 3D on iOS devices [#1411]
+- Fix `surface` trace opacity scaling [#1415]
+- Fix hover data in animations [#1274]
+- Fix annotations edit when dragging from one axis to another [#1403]
+- Fix 3D hover labels for date axes [#1414]
+- Deleting cartesian subplots now clear their corresponding axis titles [#1393]
+- Fix hover for xyz column `heatmap` trace `'text'` [#1417]
+- Fix `scattermapbox` lines with trailing gaps [#1421]
+- Make `restyle`, `relayout` and `update` not mutate input update objects [#1376]
+- Fix race condition in gl2d `toImage` [#1388]
+- Fix handling of `Virgin Islands` country name [#1392]
+- Fix `Plotly.validate` for `colorscale` attributes [#1420]
+
+
## [1.23.2] -- 2017-02-15
### Changed
| 3 |
diff --git a/test/version.js b/test/version.js @@ -3,7 +3,7 @@ const proxyquire = require('proxyquire');
const shell = require('shelljs');
const mockStdIo = require('mock-stdio');
const { run } = require('../lib/shell');
-const { isValid, isPreRelease } = require('../lib/version');
+const { parse, isValid, isPreRelease } = require('../lib/version');
const getLatestTag = version => ({ getLatestTag: () => version });
const getRecommendedType = (type = null) => ({ getRecommendedType: () => type });
@@ -151,8 +151,6 @@ test('parse (patch release after pre-release)', async t => {
});
test('parse (recommended conventional bump)', async t => {
- const { parse } = getMock(getLatestTag('1.0.0'));
-
const tmp = 'test/resources/tmp';
shell.mkdir(tmp);
shell.pushd('-q', tmp);
| 4 |
diff --git a/src/components/fx/hover.js b/src/components/fx/hover.js @@ -925,15 +925,10 @@ function createHoverText(hoverData, opts, gd) {
if(d.nameOverride !== undefined) d.name = d.nameOverride;
if(d.name) {
- // strip out our pseudo-html elements from d.name (if it exists at all)
- name = svgTextUtils.plainText(d.name || '');
-
- var nameLength = Math.round(d.nameLength);
-
- if(nameLength > -1 && name.length > nameLength) {
- if(nameLength > 3) name = name.substr(0, nameLength - 3) + '...';
- else name = name.substr(0, nameLength);
- }
+ name = svgTextUtils.plainText(d.name || '', {
+ len: d.nameLength,
+ allowedTags: ['br', 'sub', 'sup']
+ });
}
if(d.zLabel !== undefined) {
| 4 |
diff --git a/lib/queryBuilder/operations/InsertOperation.js b/lib/queryBuilder/operations/InsertOperation.js @@ -27,8 +27,8 @@ class InsertOperation extends QueryBuilderOperation {
}
async onBefore2(builder, result) {
- if (this.models.length > 1 && !isPostgres(builder.knex())) {
- throw new Error('batch insert only works with Postgresql');
+ if (this.models.length > 1 && (!isPostgres(builder.knex() || !isSqlServer(builder.knex())))) {
+ throw new Error('batch insert only works with Postgresql and SQL Server');
} else {
await callBeforeInsert(builder, this.models);
return result;
| 11 |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md @@ -16,6 +16,7 @@ The following is a set of guidelines for contributing to the Auth0 documentation
* [Screenshots](#screenshots)
* [Front Matter](#front-matter)
* [Linting](#linting)
+* [Sidebar](#sidebar)
* [Versioning](#versioning)
* [Finishing](#finishing)
* [Editing Text](#editing-with-wordy)
@@ -265,6 +266,18 @@ You won't be able to commit if your edited file don't follow these guidelines.
If you are using VS Code as your code editor, it's highly recommended to install the [MarkdownLint VS Code Extension](https://marketplace.visualstudio.com/items?itemName=DavidAnson.vscode-markdownlint).
+## Sidebar
+
+When you are adding a new article you should always add a link to it in the `config/sidebar.yml` file.
+It's really important to represent all our articles in the sidebar because this will help the user identify where he is inside the documentation.
+
+You can add titles to the sidebar using the attribute `category`:
+
+```
+- title: "Title text"
+- category: true
+```
+
## Beta Content
To mark a doc as Beta set this metadata:
| 0 |
diff --git a/test/jasmine/tests/streamtube_test.js b/test/jasmine/tests/streamtube_test.js @@ -147,6 +147,24 @@ describe('Test streamtube starting positions defaults:', function() {
expect(exp.cellsLength).toBe(obj.cells.length, 'cells length');
}
+ it('@gl should ignore starts if one (x | y | z) dimension missing', function(done) {
+ var mock = makeFigure(4, 4, 4);
+ mock.data[0].starts = {
+ x: [0, 1, 2, 3],
+ // missing y
+ z: [0, 1, 2, 3]
+ };
+
+ Plotly.plot(gd, mock).then(function() {
+ _assert({
+ positionsLength: 6144,
+ cellsLength: 2048
+ });
+ })
+ .catch(failTest)
+ .then(done);
+ });
+
it('@gl should cut xz at min-y and take all x/y/z pts on that plane except those on the edges', function(done) {
Plotly.plot(gd, makeFigure(3, 3, 3)).then(function() {
_assert({
| 0 |
diff --git a/test/contracts/TradingRewards.js b/test/contracts/TradingRewards.js @@ -56,19 +56,19 @@ contract('TradingRewards', accounts => {
stashedData: null,
snapshotId: null,
- takeSnapshot: async function() {
+ async takeSnapshot() {
this.stashedData = cloneDeep(this.data);
this.snapshotId = await takeSnapshot();
},
- restoreSnapshot: async function() {
+ async restoreSnapshot() {
this.data = this.stashedData;
await restoreSnapshot(this.snapshotId);
},
- depositRewards: async function({ amount }) {
+ async depositRewards({ amount }) {
const amountBN = toUnit(amount);
this.data.rewardsBalance = this.data.rewardsBalance.add(amountBN);
@@ -76,7 +76,7 @@ contract('TradingRewards', accounts => {
token.transfer(rewards.address, amountBN, { from: owner });
},
- createPeriod: async function({ amount }) {
+ async createPeriod({ amount }) {
const amountBN = toUnit(amount);
this.data.availableRewards = this.data.availableRewards.add(amountBN);
@@ -102,7 +102,7 @@ contract('TradingRewards', accounts => {
});
},
- recordFee: async function({ account, fee, periodID }) {
+ async recordFee({ account, fee, periodID }) {
const feeBN = toUnit(fee);
const period = this.data.periods[periodID];
@@ -122,7 +122,7 @@ contract('TradingRewards', accounts => {
});
},
- calculateRewards: function({ account, periodID }) {
+ calculateRewards({ account, periodID }) {
if (periodID === 0 || periodID === this.data.periods.length - 1) {
return 0;
}
@@ -137,14 +137,14 @@ contract('TradingRewards', accounts => {
return multiplyDecimal(period.totalRewards, divideDecimal(accountFees, period.recordedFees));
},
- calculateMultipleRewards: function({ account, periodIDs }) {
+ calculateMultipleRewards({ account, periodIDs }) {
return periodIDs.reduce(
(totalRewards, periodID) => totalRewards.add(this.calculateRewards({ account, periodID })),
toBN(0)
);
},
- claimRewards: async function({ account, periodID }) {
+ async claimRewards({ account, periodID }) {
const period = this.data.periods[periodID];
const reward = this.calculateRewards({ account, periodID });
@@ -163,7 +163,7 @@ contract('TradingRewards', accounts => {
return rewards.claimRewardsForPeriod(periodID, { from: account });
},
- claimMultipleRewards: async function({ account, periodIDs }) {
+ async claimMultipleRewards({ account, periodIDs }) {
let reward = toBN(0);
periodIDs.map(periodID => {
@@ -191,7 +191,7 @@ contract('TradingRewards', accounts => {
return rewards.claimRewardsForPeriods(periodIDs, { from: account });
},
- describe: function() {
+ describe() {
// Converts BNs to decimals for readability
const replacer = (key, val) => {
if (isHex(val)) {
| 7 |
diff --git a/config/sidebar.yml b/config/sidebar.yml @@ -744,7 +744,7 @@ articles:
url: /dashboard-access/add-change-remove-mfa
- title: Update Dashboard User Email
url: /dashboard-access/update-dashboard-user-email
- - title: Brand & Customize
+ - title: Brand and Customize
url: /brand-and-customize
children:
- title: Universal Login Pages
| 2 |
diff --git a/packages/node_modules/@node-red/nodes/core/function/10-function.js b/packages/node_modules/@node-red/nodes/core/function/10-function.js @@ -87,17 +87,6 @@ module.exports = function(RED) {
}
}
- function processAsyncResult(result, callbacks) {
- var promises = callbacks;
- if (Array.isArray(result)) {
- promises = promises.concat(result);
- }
- else if(result) {
- promises = promises.concat([result]);
- }
- return Promise.all(promises);
- }
-
function FunctionNode(n) {
RED.nodes.createNode(this,n);
var node = this;
@@ -108,44 +97,6 @@ module.exports = function(RED) {
var handleNodeDoneCall = true;
- var callbackPromises = [];
- function createAsyncCallback() {
- var result = undefined;
- var callbacks = undefined;
-
- var promise = new Promise((resolve, reject) => {
- if (result) {
- if (result.error) {
- reject(result.error);
- }
- else {
- resolve(result.value);
- }
- }
- else {
- callbacks = {
- resolve: resolve,
- reject: reject
- };
- }
- });
- var cb = function(err, val) {
- if (callbacks) {
- if (err) {
- callbacks.reject(err);
- }
- else {
- callbacks.resolve(val);
- }
- }
- else {
- result = { error: err, value: val };
- }
- };
- callbackPromises.push(promise);
- return cb;
- }
-
// Check to see if the Function appears to call `node.done()`. If so,
// we will assume it is well written and does actually call node.done().
// Otherwise, we will call node.done() after the function returns regardless.
@@ -171,13 +122,14 @@ module.exports = function(RED) {
"};\n"+
node.func+"\n"+
"})(msg,send,done);";
- var iniText = "(function () {\n"+node.ini +"\n})();";
+ var iniText = "(async function () {\n"+node.ini +"\n})();";
var finText = "(function () {\n"+node.fin +"\n})();";
var finScript = null;
var finOpt = null;
node.topic = n.topic;
node.outstandingTimers = [];
node.outstandingIntervals = [];
+ var initValue = undefined;
var sandbox = {
console:console,
util:util,
@@ -305,8 +257,9 @@ module.exports = function(RED) {
node.outstandingIntervals.splice(index,1);
}
},
- promisify: (util.hasOwnProperty("promisify") ? util.promisify : undefined),
- asyncCallback: createAsyncCallback
+ getInitValue: function() {
+ return initValue;
+ }
};
if (util.hasOwnProperty('promisify')) {
sandbox.setTimeout[util.promisify.custom] = function(after, value) {
@@ -314,6 +267,7 @@ module.exports = function(RED) {
sandbox.setTimeout(function(){ resolve(value); }, after);
});
};
+ sandbox.promisify = util.promisify;
}
var context = vm.createContext(sandbox);
try {
@@ -330,13 +284,10 @@ module.exports = function(RED) {
}
var promise = Promise.resolve();
if (iniScript) {
- var result = vm.runInContext(iniText, context, iniOpt);
- if (result || callbackPromises) {
- promise = processAsyncResult(result, callbackPromises);
+ promise = iniScript.runInContext(context, iniOpt);
}
- }
- promise.then(function (v) {
- node.on("input", function(msg,send,done) {
+
+ function processMessage(msg, send, done) {
try {
var start = process.hrtime();
context.msg = msg;
@@ -394,6 +345,21 @@ module.exports = function(RED) {
done(JSON.stringify(err));
}
}
+ }
+
+ const RESOLVING = 0;
+ const RESOLVED = 1;
+ const ERROR = 2;
+ var state = RESOLVING;
+ var messages = [];
+
+ node.on("input", function(msg,send,done) {
+ if(state === RESOLVING) {
+ messages.push({msg:msg, send:send, done:done});
+ }
+ else if(state === RESOLVED) {
+ processMessage(msg, send, done);
+ }
});
node.on("close", function() {
if (finScript) {
@@ -412,9 +378,25 @@ module.exports = function(RED) {
}
node.status({});
});
+
+ promise.then(function (v) {
+ initValue = v;
+ var msgs = messages;
+ messages = [];
+ while (msgs.length > 0) {
+ msgs.forEach(function (s) {
+ processMessage(s.msg, s.send, s.done);
+ });
+ msgs = messages;
+ messages = [];
+ }
+ state = RESOLVED;
}).catch((error) => {
+ messages = [];
+ state = ERROR;
node.error(error);
});
+
}
catch(err) {
// eg SyntaxError - which v8 doesn't include line number information
@@ -426,3 +408,4 @@ module.exports = function(RED) {
RED.nodes.registerType("function",FunctionNode);
RED.library.register("functions");
};
+
| 3 |
diff --git a/generators/kubernetes/templates/README-KUBERNETES.md.ejs b/generators/kubernetes/templates/README-KUBERNETES.md.ejs @@ -90,7 +90,7 @@ $ kubectl get svc jhipster-grafana<%= kubernetesNamespace === 'default' ? '' : `
* If you have chosen *Ingress*, then you should be able to access Grafana using the given ingress domain.
* If you have chosen *NodePort*, then point your browser to an IP of any of your nodes and use the node port described in the output.
-* If you have chosen *LoadBalancer*, then use the IaaS provided LB IP
+* If you have chosen *LoadBalancer*, then use the IaaS provided load balancer IP
<%_ } _%>
<%_ } _%>
@@ -122,7 +122,7 @@ $ kubectl scale statefulset jhipster-registry --replicas 3<%= kubernetesNamespac
> my apps doesn't get pulled, because of 'imagePullBackof'
-Check the registry your Kubernetes cluster is accessing. If you are using a private registry, you should add it to your namespace by `kubectl create secret docker-registry` (check the [docs](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/) for more info)
+Check the docker registry your Kubernetes cluster is accessing. If you are using a private registry, you should add it to your namespace by `kubectl create secret docker-registry` (check the [docs](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/) for more info)
> my applications get killed, before they can boot up
@@ -132,16 +132,3 @@ This can occur if your cluster has low resource (e.g. Minikube). Increase the `i
The default setting are optimized for middle-scale clusters. You are free to increase the JAVA_OPTS environment variable, and resource requests and limits to improve the performance. Be careful!
-<%_ if (monitoring === 'prometheus') { _%>
-> I have selected Prometheus but no targets are visible
-
-This depends on the setup of the Prometheus operator and the access control policies in your cluster. Version 1.6.0+ is needed for the RBAC setup to work.
-
-> I have selected Prometheus, but my targets never get scraped
-
-This means your applications are probably not built using the `prometheus` profile in Maven/Gradle
-<%_ } _%>
-
-> my SQL-based microservice is stuck during Liquibase initialization when running multiple replicas
-
-Sometimes the database changelog lock gets corrupted. You will need to connect to the database using `kubectl exec -it` and remove all lines of liquibases `databasechangeloglock` table.
| 2 |
diff --git a/aleph/index/util.py b/aleph/index/util.py @@ -130,7 +130,7 @@ def query_delete(index, query, sync=False, **kwargs):
wait_for_completion=sync,
refresh=refresh_sync(sync),
request_timeout=84600,
- timeout='3500m',
+ timeout='700m',
**kwargs)
return
except TransportError as exc:
@@ -147,7 +147,9 @@ def bulk_actions(actions, chunk_size=BULK_PAGE, sync=False):
initial_backoff=2,
yield_ok=False,
raise_on_error=False,
- refresh=refresh_sync(sync))
+ refresh=refresh_sync(sync),
+ request_timeout=84600,
+ timeout='700m')
for _, details in stream:
if details.get('delete', {}).get('status') == 404:
continue
| 12 |
diff --git a/src/util/config/schema.js b/src/util/config/schema.js @@ -28,7 +28,7 @@ const botSchema = Joi.object({
exitOnSocketIssues: Joi.bool().strict().default(true),
exitOnDatabaseDisconnect: Joi.bool().strict().default(false),
exitOnExcessRateLimits: Joi.bool().strict().default(true),
- userAgent: Joi.string().strict().default('Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Firefox/78.0'),
+ userAgent: Joi.string().strict().default('MonitoRSS (+https://github.com/synzen/MonitoRSS)'),
feedRequestTimeoutMs: Joi.number().strict().default(15000)
})
| 7 |
diff --git a/.github/workflows/test_docker_all.yml b/.github/workflows/test_docker_all.yml @@ -9,9 +9,12 @@ jobs:
id: run
uses: bioimagesuiteweb/bisweb/actions/docker@devel
env:
- BIS_FIRST_TEST: 2
+ BIS_FIRST_TEST: 12
BIS_LAST_TEST: 20
- name: Results
run: echo "${{ steps.run.outputs.result}}"
-
-
\ No newline at end of file
+ - name: Upload results
+ uses: actions/upload-artifact@v1
+ with:
+ name: results
+ path: /basedir/bisweb/src/build/result.txt
| 3 |
diff --git a/pages/api/v1/get.js b/pages/api/v1/get.js @@ -48,10 +48,7 @@ export default async (req, res) => {
publicOnly: req.body.data && req.body.data.private ? false : true,
});
- console.log(slates);
-
slates = slates.map((each) => {
- console.log(each);
each.data.url = `https://slate.host/${user.username}/${each.slatename}`;
return each;
});
| 2 |
diff --git a/jobs/upcoming.js b/jobs/upcoming.js @@ -56,6 +56,7 @@ module.exports = async () => {
const wikiDates = allWikiDates.slice(0, 30).map((date) => date.replace(/~|\[[0-9]{1,3}\]/gi, '')
.replace(/(~|early|mid|late|end|tbd|tba)/gi, ' ')
.split('/')[0].trim());
+ const rawWikiDates = allWikiDates.slice(0, 30);
const allWikiPayloads = wikiRow.filter((_, index) => (index + 2) % 7 === 0);
const wikiPayloads = allWikiPayloads.slice(0, 30).map((payload) => payload.replace(/\[[0-9]{1,3}\]/gi, ''));
@@ -114,9 +115,10 @@ module.exports = async () => {
let precision;
let wikiDate = wikiDates[parseInt(wikiIndex, 10)];
+ const rawWikiDate = rawWikiDates[parseInt(wikiIndex, 10)];
// Check if date contains TBD
- const tbd = tbdPattern.test(wikiDate);
+ const tbd = tbdPattern.test(rawWikiDate);
// Remove extra stuff humans might add
// NOTE: Add to this when people add unexpected things to dates in the wiki
| 1 |
diff --git a/src/components/TextLink.js b/src/components/TextLink.js @@ -29,72 +29,29 @@ const defaultProps = {
onPress: undefined,
};
-class TextLink extends React.Component {
- constructor(props) {
- super(props);
-
- this.state = {
- linkHovered: false,
- };
-
- this.additionalStyles = _.isArray(this.props.style) ? this.props.style : [this.props.style];
- }
-
- render() {
+const TextLink = (props) => {
+ const additionalStyles = _.isArray(props.style) ? props.style : [props.style];
return (
- typeof this.props.children === 'string' ?
- <>
- {this.props.children.split(' ').map((word, i) => (
<Pressable
- key={word}
- onHoverIn={() => this.setState({linkHovered: true})}
- onHoverOut={() => this.setState({linkHovered: false})}
- onPressIn={() => this.setState({linkHovered: true})}
- onPressOut={() => this.setState({linkHovered: false})}
onPress={(e) => {
e.preventDefault();
- if (this.props.onPress) {
- this.props.onPress();
+ if (props.onPress) {
+ props.onPress();
return;
}
- Linking.openURL(this.props.href);
+ Linking.openURL(props.href);
}}
accessibilityRole="link"
- href={this.props.href}
- >
- {({hovered, pressed}) => {
- return (
- <Text style={[styles.link, this.state.linkHovered ? styles.linkHovered : undefined, ...this.additionalStyles]}>
- {`${word}${i === this.props.children.split(' ').length - 1 ? '' : ' '}`}
- </Text>
- )
- }}
- </Pressable>
- ))}
- </>
- :
- <Pressable
- onPress={(e) => {
- e.preventDefault();
- if (this.props.onPress) {
- this.props.onPress();
- return;
- }
-
- Linking.openURL(this.props.href);
- }}
- accessibilityRole="link"
- href={this.props.href}
+ href={props.href}
>
{({hovered, pressed}) => (
- <Text style={[styles.link, (hovered || pressed) ? styles.linkHovered : undefined, ...this.additionalStyles]}>
- {this.props.children}
+ <Text style={[styles.link, (hovered || pressed) ? styles.linkHovered : undefined, ...additionalStyles]}>
+ {props.children}
</Text>
)}
</Pressable>
);
- }
};
TextLink.defaultProps = defaultProps;
| 13 |
diff --git a/util.js b/util.js @@ -4,6 +4,13 @@ import atlaspack from './atlaspack.js';
const localVector = new THREE.Vector3();
+export function jsonParse(s, d = null) {
+ try {
+ return JSON.parse(s);
+ } catch (err) {
+ return d;
+ }
+}
export function parseQuery(queryString) {
var query = {};
var pairs = (queryString[0] === '?' ? queryString.substr(1) : queryString).split('&');
| 0 |
diff --git a/src/matrix/room/Room.js b/src/matrix/room/Room.js @@ -23,6 +23,7 @@ import {WrappedError} from "../error.js"
import {Heroes} from "./members/Heroes.js";
import {AttachmentUpload} from "./AttachmentUpload.js";
import {DecryptionSource} from "../e2ee/common.js";
+import {PowerLevels, EVENT_TYPE as POWERLEVELS_EVENT_TYPE } from "./timeline/PowerLevels.js";
const EVENT_ENCRYPTED_TYPE = "m.room.encrypted";
@@ -173,6 +174,7 @@ export class Room extends BaseRoom {
if (Array.isArray(roomResponse.timeline?.events)) {
removedPendingEvents = await this._sendQueue.removeRemoteEchos(roomResponse.timeline.events, txn, log);
}
+ this._updatePowerLevels(roomResponse);
return {
summaryChanges,
roomEncryption,
@@ -262,6 +264,18 @@ export class Room extends BaseRoom {
}
}
+ _updatePowerLevels(roomResponse) {
+ const powerLevelEvent = roomResponse.timeline.events.find(event => event.type === POWERLEVELS_EVENT_TYPE);
+ if (powerLevelEvent && this._powerLevels) {
+ const newPowerLevels = new PowerLevels({
+ powerLevelEvent,
+ ownUserId: this._user.id,
+ membership: this.membership,
+ });
+ this._powerLevels.set(newPowerLevels);
+ }
+ }
+
needsAfterSyncCompleted({shouldFlushKeyShares}) {
return shouldFlushKeyShares;
}
| 12 |
diff --git a/src/components/nodes/sequenceFlow/index.js b/src/components/nodes/sequenceFlow/index.js @@ -34,6 +34,11 @@ export default {
// Exclusive and inclusive gateways could have conditioned flows
const hasCondition = ['bpmn:ExclusiveGateway', 'bpmn:InclusiveGateway'].includes(definition.sourceRef.$type);
+ // If the flow's source is doesn't have condition remove it:
+ if (!hasCondition) {
+ delete value.conditionExpression;
+ }
+
// Go through each property and rebind it to our data
for (const key in value) {
if (definition[key] === value[key]) {
| 2 |
diff --git a/components/nav-item-dropdown.vue b/components/nav-item-dropdown.vue href="" aria-haspopup="true"
:aria-expanded="show"
:disabled="disabled">
- <slot>{{ text }}</slot>
+ <slot name="text">{{ text }}</slot>
</a>
<div :class="{'dropdown-menu': true, 'dropdown-menu-right': rightAlignment}">
- <slot name="dropdown-menu">Slot "items"</slot>
+ <slot></slot>
</div>
</li>
</template>
| 7 |
diff --git a/src/pages/users.js b/src/pages/users.js @@ -15,7 +15,7 @@ export default function Users(props) {
if ((siteConfig.customFields.users || []).length === 0) {
return null
}
- const editUrl = `${siteConfig.customFields.docsRepoUrl}/edit/master/website/docusaurus.config.js`
+ const editUrl = `${siteConfig.customFields.docsRepoUrl}/edit/master/docusaurus.config.js`
return (
<Layout
permalink="/users"
| 1 |
diff --git a/assets/src/libraries/BookDetail.js b/assets/src/libraries/BookDetail.js @@ -95,15 +95,6 @@ export default class BookDetail extends Component {
<div className="modal-book__borrowed-informations">
{borrowers}
</div>
-
- <div className="modal-book__waitlist">
- <div className="modal-book__waitlist-label">
- <FontIcon className="material-icons">people</FontIcon>
- <span className="modal-book__waitlist-amount">4</span>
- </div>
- <div className="modal-book__waitlist-value"></div>
- <button className="modal-book__waitlist-button"><span>Join in the queue</span></button>
- </div>
</div>
</div>
</div>
| 2 |
diff --git a/test-integration/scripts/24-tests-e2e.sh b/test-integration/scripts/24-tests-e2e.sh source $(dirname $0)/00-init-env.sh
-#-------------------------------------------------------------------------------
-# Specific for couchbase
-#-------------------------------------------------------------------------------
-cd "$JHI_FOLDER_APP"
-if [ -a src/main/docker/couchbase.yml ]; then
- docker-compose -f src/main/docker/couchbase.yml up -d
- sleep 20
- docker ps -a
-fi
-
#-------------------------------------------------------------------------------
# Functions
#-------------------------------------------------------------------------------
| 2 |
diff --git a/lib/modules/deployment/index.js b/lib/modules/deployment/index.js let async = require('async');
const ContractDeployer = require('./contract_deployer.js');
-const utils = require('../../utils/utils.js');
-//require("../utils/debug_util.js")(__filename, async);
+const cloneDeep = require('clone-deep');
class DeployManager {
constructor(embark, options) {
@@ -43,6 +42,7 @@ class DeployManager {
deployAll(done) {
let self = this;
+ self.events.request('contracts:dependencies', (err, contractDependencies) => {
self.events.request('contracts:list', (err, contracts) => {
if (err) {
return done(err);
@@ -51,17 +51,28 @@ class DeployManager {
self.logger.info(__("deploying contracts"));
self.events.emit("deploy:beforeAll");
- const contractsPerDependencyCount = utils.groupBy(contracts, 'dependencyCount');
- async.eachSeries(contractsPerDependencyCount,
- function (parallelGroups, callback) {
- async.each(parallelGroups, (contract, eachCb) => {
+ const contractDeploys = {};
+ contracts.forEach(contract => {
+ function deploy(result, callback) {
+ if (typeof result === 'function') {
+ callback = result;
+ }
contract._gasLimit = self.gasLimit;
self.events.request('deploy:contract', contract, (err) => {
- eachCb(err);
+ callback(err);
});
- }, callback);
- },
- function (err, _results) {
+ }
+
+ const className = contract.className;
+ if (!contractDependencies[className] || contractDependencies[className].length === 0) {
+ contractDeploys[className] = deploy;
+ return;
+ }
+ contractDeploys[className] = cloneDeep(contractDependencies[className]);
+ contractDeploys[className].push(deploy);
+ });
+
+ async.auto(contractDeploys, function(err, _results) {
if (err) {
self.logger.error(__("error deploying contracts"));
self.logger.error(err.message);
@@ -73,8 +84,8 @@ class DeployManager {
}
self.logger.info(__("finished deploying contracts"));
done(err);
- }
- );
+ });
+ });
});
}
| 4 |
diff --git a/app/sanitizeOpts.js b/app/sanitizeOpts.js @@ -7,6 +7,6 @@ module.exports = {
allowedAttributes: {
img: ['src', 'alt']
},
- allowedSchemes: ['data'],
+ allowedSchemes: ['data', 'http', 'https'],
exclusiveFilter: function(frame) { return frame.attribs['data-js'] === 'mathEditor' }
}
| 11 |
diff --git a/lib/console_web/controllers/router/device_controller.ex b/lib/console_web/controllers/router/device_controller.ex @@ -566,6 +566,20 @@ defmodule ConsoleWeb.Router.DeviceController do
case updated_org_pending_result do
nil -> nil
organization ->
+ last_dc_purchase = DcPurchases.get_last_nonrecurring_dc_purchase(organization)
+ last_dc_purchaser = if not is_nil(last_dc_purchase) do Organizations.get_membership(last_dc_purchase.user_id, organization) else nil end
+
+ receipt_email = case last_dc_purchaser do
+ nil ->
+ admin = List.first(Organizations.get_administrators(organization))
+ case admin do
+ nil -> ""
+ _ -> admin.email
+ end
+ _ ->
+ last_dc_purchaser.email
+ end
+
request_body = URI.encode_query(%{
"customer" => organization.stripe_customer_id,
"amount" => organization.automatic_charge_amount,
@@ -573,6 +587,7 @@ defmodule ConsoleWeb.Router.DeviceController do
"payment_method" => organization.automatic_payment_method,
"off_session" => "true",
"confirm" => "true",
+ "receipt_email" => receipt_email,
})
with {:ok, stripe_response} <- HTTPoison.post("#{@stripe_api_url}/v1/payment_intents", request_body, @headers) do
@@ -584,20 +599,6 @@ defmodule ConsoleWeb.Router.DeviceController do
200 <- stripe_response.status_code do
card = Poison.decode!(stripe_response.body)
- last_dc_purchase = DcPurchases.get_last_nonrecurring_dc_purchase(organization)
- last_dc_purchaser = if not is_nil(last_dc_purchase) do Organizations.get_membership(last_dc_purchase.user_id, organization) else nil end
-
- receipt_email = case last_dc_purchaser do
- nil ->
- admin = List.first(Organizations.get_administrators(organization))
- case admin do
- nil -> ""
- _ -> admin.email
- end
- _ ->
- last_dc_purchaser.email
- end
-
attrs = %{
"dc_purchased" => payment_intent["amount"] * 1000,
"cost" => payment_intent["amount"],
@@ -606,7 +607,6 @@ defmodule ConsoleWeb.Router.DeviceController do
"user_id" => "Recurring Charge",
"organization_id" => organization.id,
"payment_id" => payment_intent["id"],
- "receipt_email" => receipt_email,
"description" => "Data Credits"
}
| 5 |
diff --git a/story.js b/story.js @@ -444,7 +444,14 @@ export const listenHack = () => {
}
} else {
const comment = await aiScene.generateSelectTargetComment(name, description);
- _startConversation(comment, null, true);
+ const fakePlayer = {
+ avatar: {
+ modelBones: {
+ Head: app,
+ },
+ },
+ };
+ _startConversation(comment, fakePlayer, true);
}
})();
} else if (e.button === 0 && currentConversation) {
| 0 |
diff --git a/src/broker/saslAuthenticator/scram.js b/src/broker/saslAuthenticator/scram.js const crypto = require('crypto')
const scram = require('../../protocol/sasl/scram')
-const { KafkaJSSASLAuthenticationError } = require('../../errors')
+const { KafkaJSSASLAuthenticationError, KafkaJSNonRetriableError } = require('../../errors')
const GS2_HEADER = 'n,,'
@@ -96,7 +96,7 @@ class SCRAM {
const length = Buffer.byteLength(bufferA)
if (length !== Buffer.byteLength(bufferB)) {
- throw new Error('Buffers must be of the same length')
+ throw new KafkaJSNonRetriableError('Buffers must be of the same length')
}
const result = []
@@ -118,7 +118,7 @@ class SCRAM {
}
digestDefinition() {
- throw new Error('Not implemented')
+ throw new KafkaJSNonRetriableError('Not implemented')
}
async authenticate() {
| 14 |
diff --git a/src/domain/session/room/RoomBeingCreatedViewModel.js b/src/domain/session/room/RoomBeingCreatedViewModel.js @@ -34,7 +34,16 @@ export class RoomBeingCreatedViewModel extends ViewModel {
get name() { return this._roomBeingCreated.name; }
get id() { return this._roomBeingCreated.id; }
get isEncrypted() { return this._roomBeingCreated.isEncrypted; }
- get error() { return this._roomBeingCreated.error?.message; }
+ get error() {
+ const {error} = this._roomBeingCreated;
+ if (error) {
+ if (error.name === "ConnectionError") {
+ return this.i18n`You seem to be offline`;
+ } else {
+ return error.message;
+ }
+ }
+ }
get avatarLetter() { return avatarInitials(this.name); }
get avatarColorNumber() { return getIdentifierColorNumber(this._roomBeingCreated.avatarColorId); }
get avatarTitle() { return this.name; }
| 9 |
diff --git a/templates/modifier-bucket.html b/templates/modifier-bucket.html <div style="background-color:gold; align-content: end;display:{{#if cansend}}block{{else}}none{{/if}}">
<div class="modttlabel">Send your Modifier Bucket to:</div>
- <div style="position: relative;text-align: center;display: inline-flex;justify-content: center; ">
+ <div style="position: relative;text-align: center;display: flex;justify-content: center; flex-wrap: wrap; ">
{{#each users}}
<button class="gmbutton" data-id="{{this.id}}" type="button">{{this.name}}</button>
{{/each}}
| 11 |
diff --git a/src/map/tool/DrawTool.js b/src/map/tool/DrawTool.js -import Browser from 'core/Browser';
import { INTERNAL_LAYER_PREFIX } from 'core/Constants';
import { isNil } from 'core/util';
import { extendSymbol } from 'core/util/style';
@@ -406,9 +405,6 @@ class DrawTool extends MapTool {
}
const registerMode = this._getRegisterMode();
const path = this._clickCoords;
- if (!Browser.mobile) {
- path.push(param['coordinate']);
- }
if (path.length < 2) {
return;
}
| 8 |
diff --git a/services/importer/lib/importer/downloader.rb b/services/importer/lib/importer/downloader.rb @@ -71,7 +71,7 @@ module CartoDB
false
end
- attr_reader :source_file, :etag, :last_modified, :http_response_code, :datasource
+ attr_reader :source_file, :http_response_code, :datasource
def initialize(user_id, url, http_options = {}, options = {})
raise UploadError unless user_id && url
| 2 |
diff --git a/src/io_frida.c b/src/io_frida.c @@ -513,13 +513,11 @@ static char *__system(RIO *io, RIODesc *fd, const char *command) {
io->cb_printf (" stalker.event = compile\n");
io->cb_printf (" stalker.timeout = 300\n");
io->cb_printf (" stalker.in = raw\n");
- } else if (!strncmp (command, "s", 1)) {
- if (command[1] == ' ') {
- // do nothing
- } else {
- ut64 entry = 0;
+ } else if (!strcmp (command, "s")) {
io->cb_printf ("0x%08"PFMT64x, rf->r2core->offset);
- }
+ return NULL;
+ } else if (!strncmp (command, "s ", 2)) {
+ r_core_cmd0 (rf->r2core, command);
return NULL;
} else if (!strncmp (command, "dkr", 3)) {
if (rf->crash_report) {
| 1 |
diff --git a/JSONSchema/schema.json b/JSONSchema/schema.json "Homestead": {
"$ref": "#/definitions/TransactionResults"
},
- "Metropolis": {
+ "Byzantium": {
+ "$ref": "#/definitions/TransactionResults"
+ },
+ "Constantinople": {
"$ref": "#/definitions/TransactionResults"
}
},
| 14 |
diff --git a/token-metadata/0xaA19673aA1b483a5c4f73B446B4f851629a7e7D6/metadata.json b/token-metadata/0xaA19673aA1b483a5c4f73B446B4f851629a7e7D6/metadata.json "symbol": "XETH",
"address": "0xaA19673aA1b483a5c4f73B446B4f851629a7e7D6",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/test/commands/test/generate/uitest-test.ts b/test/commands/test/generate/uitest-test.ts @@ -102,20 +102,20 @@ describe("Validating UITest template generation", () => {
// Assert
let packageFileContent = await pfs.readFile(packageFilePath, "utf8");
- expect(packageFileContent).contain("2.2.5");
+ expect(packageFileContent).contain("3.0.0");
let projectFileContent = await pfs.readFile(projectFilePath, "utf8");
- expect(projectFileContent).contain("2.2.5");
+ expect(projectFileContent).contain("3.0.0");
// Act
await (command as any).processTemplate();
// Assert
packageFileContent = await pfs.readFile(packageFilePath, "utf8");
- expect(packageFileContent).contain("2.2.5");
+ expect(packageFileContent).contain("3.0.0");
projectFileContent = await pfs.readFile(projectFilePath, "utf8");
- expect(projectFileContent).contain("2.2.5");
+ expect(projectFileContent).contain("3.0.0");
});
it("should recover original template files on failure", async () => {
| 1 |
diff --git a/docs/src/pages/demos/menus/SimpleListMenu.js b/docs/src/pages/demos/menus/SimpleListMenu.js @@ -15,6 +15,7 @@ const styles = theme => ({
});
const options = [
+ 'Show some love to Material-UI',
'Show all notification content',
'Hide sensitive notification content',
'Hide all notification content',
@@ -68,6 +69,7 @@ class SimpleListMenu extends React.Component {
{options.map((option, index) => (
<MenuItem
key={option}
+ disabled={index === 0}
selected={index === this.state.selectedIndex}
onClick={event => this.handleMenuItemClick(event, index)}
>
| 3 |
diff --git a/views/_partials/nav.pug b/views/_partials/nav.pug @@ -37,6 +37,13 @@ nav.navbar.navbar-expand-xl.navbar-dark.bg-dark
data-ga-label='GitHub project',
rel='noopener nofollow',
target='_blank') GitHub project
+ li.dropdown-item.bg-dark
+ a.nav-link(href='https://opencollective.com/getbootstrapcdn',
+ data-ga-category='Navigation',
+ data-ga-action='Resources',
+ data-ga-label='OpenCollective',
+ rel='noopener',
+ target='_blank') OpenCollective
li.dropdown-item.bg-dark
a.nav-link(href='https://getbootstrap.com/',
data-ga-category='Navigation',
| 0 |
diff --git a/src/deploy/mongo_upgrade/mongo_upgrade_2_8_0.js b/src/deploy/mongo_upgrade/mongo_upgrade_2_8_0.js @@ -36,7 +36,16 @@ function add_create_time_to_multiparts() {
}
}
+function fix_upgrade_stage_changed_date() {
+ db.clusters.updateMany({}, {
+ $unset: {
+ "stage_changed_date": 1
+ }
+ });
+}
+
update_buckets_set_versioning();
update_buckets_unset_cloud_sync();
drop_old_md_indexes();
add_create_time_to_multiparts();
+fix_upgrade_stage_changed_date();
| 2 |
diff --git a/src/core/lib/FileSignatures.mjs b/src/core/lib/FileSignatures.mjs @@ -2451,7 +2451,7 @@ export function extractJPEG(bytes, offset) {
export function extractMZPE(bytes, offset) {
const stream = new Stream(bytes.slice(offset));
- // Move to PE header pointer
+ // Read pointer to PE header
stream.moveTo(0x3c);
const peAddress = stream.readInt(4, "le");
@@ -2462,12 +2462,36 @@ export function extractMZPE(bytes, offset) {
stream.moveForwardsBy(6);
const numSections = stream.readInt(2, "le");
- // Get optional header size
- stream.moveForwardsBy(12);
- const optionalHeaderSize = stream.readInt(2, "le");
+ // Read Optional Header Magic to determine the state of the image file
+ // 0x10b = normal exeuctable, 0x107 = ROM image, 0x20b = PE32+ executable
+ stream.moveForwardsBy(16);
+ const optionalMagic = stream.readInt(2, "le");
+ const pe32Plus = optionalMagic === 0x20b;
+
+ // Move to Data Directory
+ const dataDirectoryOffset = pe32Plus ? 112 : 96;
+ stream.moveForwardsBy(dataDirectoryOffset - 2);
+
+ // Read Certificate Table address and size (IMAGE_DIRECTORY_ENTRY_SECURITY)
+ stream.moveForwardsBy(32);
+ const certTableAddress = stream.readInt(4, "le");
+ const certTableSize = stream.readInt(4, "le");
+
+ // PE files can contain extra data appended to the end of the file called an "overlay".
+ // This data is not covered by the PE header and could be any arbitrary format, so its
+ // length cannot be determined without contextual information.
+ // However, the Attribute Certificate Table is stored in the overlay - usually right at
+ // the end. Therefore, if this table is defined, we can use its offset and size to carve
+ // out the entire PE file, including the overlay.
+ // If the Certificate Table is not defined, we continue to parse the PE file as best we
+ // can up to the end of the final section, not including any appended data in the overlay.
+ if (certTableAddress > 0) {
+ stream.moveTo(certTableAddress + certTableSize);
+ return stream.carve();
+ }
- // Move past optional header to section header
- stream.moveForwardsBy(2 + optionalHeaderSize);
+ // Move past Optional Header to Section Header
+ stream.moveForwardsBy(88);
// Move to final section header
stream.moveForwardsBy((numSections - 1) * 0x28);
| 7 |
diff --git a/package.json b/package.json "asar": true,
"forceCodeSigning": false,
"files": [
- "**/*",
+ "local_modules/**/*.{js,json,wasm}",
+ "local_modules/**/*.{png,icns,ico,otf,ttf}",
+ "local_modules/**/*.css",
+ "local_modules/**/*.html",
+ "node_modules/**",
"!**/node_modules/*/{CHANGELOG.md,README.md,README,readme.md,readme,test,__tests__,tests,powered-test,example,examples,*.d.ts}",
"!**/node_modules/.bin",
"!**/*.{o,hprof,orig,pyc,pyo,rbc}",
"!**/._*",
"!**/{.DS_Store,.eslintrc.json,.eslintignore,.git,.hg,.svn,CVS,RCS,SCCS,__pycache__,thumbs.db,.gitignore,.gitattributes,.editorconfig,.flowconfig,.yarn-metadata.json,.idea,appveyor.yml,.travis.yml,circle.yml,npm-debug.log,.nyc_output,yarn.lock,.yarn-integrity}",
- "!dist",
- "!docs",
- "!plugins",
- "!platforms",
- "!docs",
- "!www",
- "!cordova_res",
- "!bin",
"!**/*.cordova.*",
"!**/*.Lite.*",
+ "!**/local_modules/**/package.json",
+ "!**/tests/*",
+ "!**/*.spec.js",
+ "!local_modules/mymonero_core_js/tests/**",
+ "!local_modules/mymonero_core_js/wallaby*",
+ "!local_modules/mymonero_core_js/src/**",
+ "!**/*.browser.*",
"!**/favicon*.png",
"!**/favicon*.ico"
],
| 1 |
diff --git a/lib/script/interpreter.js b/lib/script/interpreter.js @@ -219,6 +219,7 @@ Interpreter.true = Buffer.from([1]);
Interpreter.false = Buffer.from([]);
Interpreter.MAX_SCRIPT_ELEMENT_SIZE = 520;
+Interpreter.MAXIMUM_ELEMENT_SIZE = 4;
Interpreter.LOCKTIME_THRESHOLD = 500000000;
Interpreter.LOCKTIME_THRESHOLD_BN = new BN(Interpreter.LOCKTIME_THRESHOLD);
@@ -408,8 +409,9 @@ Interpreter.prototype.checkPubkeyEncoding = function(buf) {
*
*/
-Interpreter._isMinimallyEncoded = function(buf) {
- if (buf.length > Interpreter.MAX_SCRIPT_ELEMENT_SIZE ) {
+Interpreter._isMinimallyEncoded = function(buf, nMaxNumSize) {
+ nMaxNumSize = nMaxNumSize || Interpreter.MAXIMUM_ELEMENT_SIZE;
+ if (buf.length > nMaxNumSize ) {
return false;
}
| 1 |
diff --git a/src/traces/box/cross_trace_calc.js b/src/traces/box/cross_trace_calc.js @@ -97,7 +97,6 @@ function setPositionOffset(traceType, gd, boxList, posAxis, pad) {
// Find maximum trace width
// we baseline this at dPos
- var maxHalfWidth = dPos;
for(i = 0; i < boxList.length; i++) {
calcTrace = calcdata[boxList[i]];
// set the width of this box
| 2 |
diff --git a/404.js b/404.js @@ -115,7 +115,7 @@ const _setIframe = u => {
if (u) {
const iframe = document.createElement('iframe');
iframe.classList.add('preview');
- iframe.src = '/edit.html?o=' + u;
+ iframe.src = '/edit.html?ftu=0&o=' + u;
iframe.setAttribute('frameBorder', 0);
iframeContainer.appendChild(iframe);
}
| 0 |
diff --git a/src/docs/languages/webc.md b/src/docs/languages/webc.md @@ -28,7 +28,7 @@ relatedLinks:
* All configuration extensions/hooks into WebC are async-friendly out of the box.
* Bundler mode: Easily roll up the CSS and JS in-use by WebC components on a page for page-specific bundles. Dirt-simple critical CSS/JS to only load the code you need.
* For more complex templating needs, render any existing Eleventy template syntax (Liquid, markdown, Nunjucks, etc.) inside of WebC.
-* Works great with [is-land](https://www.11ty.dev/docs/plugins/partial-hydration/) for web component hydration.
+* Works great with [is-land](/docs/plugins/partial-hydration/) for web component hydration.
## Resources
| 4 |
diff --git a/packages/maps/README.md b/packages/maps/README.md @@ -71,4 +71,4 @@ The official docs for the library are at [https://opensource.appbase.io/reactive
- [**mirage**](https://github.com/appbaseio/mirage) ReactiveSearch components can be extended using custom Elasticsearch queries. For those new to Elasticsearch, Mirage provides an intuitive GUI for composing queries.
-<a href="https://new.appbase.io/support/"><img src="https://i.imgur.com/UL6B0uE.png" width="100%" /></a>
+<a href="https://appbase.io/support/"><img src="https://i.imgur.com/UL6B0uE.png" width="100%" /></a>
| 3 |
diff --git a/token-metadata/0x6B9f031D718dDed0d681c20cB754F97b3BB81b78/metadata.json b/token-metadata/0x6B9f031D718dDed0d681c20cB754F97b3BB81b78/metadata.json "symbol": "GEEQ",
"address": "0x6B9f031D718dDed0d681c20cB754F97b3BB81b78",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Recommendation to enable CORS
- A 'visual' option as an asset role.
- Added a best practice recommendation to keep collections at consistent levels.
+- Catalog and Collection now require a `type` parameter, to be set to `Catalog` or `Collection` for clients to more easily distinguish them easily.
### Changed
| 0 |
diff --git a/Source/Shaders/ModelExperimental/ModelExperimentalVS.glsl b/Source/Shaders/ModelExperimental/ModelExperimentalVS.glsl @@ -28,11 +28,6 @@ void main()
updateFeatureStruct(feature);
#endif
- #ifdef HAS_CUSTOM_VERTEX_SHADER
- czm_modelVertexOutput vsOutput = defaultVertexOutput(attributes.positionMC);
- customShaderStage(vsOutput, attributes);
- #endif
-
// Update the position for this instance in place
#ifdef HAS_INSTANCING
@@ -48,6 +43,11 @@ void main()
#endif
+ #ifdef HAS_CUSTOM_VERTEX_SHADER
+ czm_modelVertexOutput vsOutput = defaultVertexOutput(attributes.positionMC);
+ customShaderStage(vsOutput, attributes);
+ #endif
+
// Compute the final position in each coordinate system needed.
// This also sets gl_Position.
geometryStage(attributes);
| 5 |
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md # Eleventy Community Code of Conduct
+View the [Code of Conduct](https://www.11ty.dev/docs/code-of-conduct/) on 11ty.dev
+
## Our Pledge
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
| 0 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.