code
stringlengths
122
4.99k
label
int64
0
14
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md <!--- Provide a general summary of your changes in the Title above --> -## Description +### Description <!--- Describe your changes in detail --> -## Motivation and Context + + +### Motivation and Context <!--- Why is this change required?...
7
diff --git a/assets/js/app/core/layout/01_layout-controllers.js b/assets/js/app/core/layout/01_layout-controllers.js } + + $scope.$on('kong.node.deleted',function(ev,node){ + if(node.id == $rootScope.$node.id) setNode(null) + + }) + $scope.$on('kong.node.updated',function(ev,node){ if(node.active) { setNode(node)
9
diff --git a/src/main/webapp/org/cboard/view/config/chart/template/schema.html b/src/main/webapp/org/cboard/view/config/chart/template/schema.html -<div class="tree tree-bg-dragout " style="min-height: 600px; max-height: 820px;overflow:auto; overflow-x: auto; border:none;"> +<div class="tree tree-bg-dragout " style="ov...
12
diff --git a/includes/Modules/Analytics/Advanced_Tracking.php b/includes/Modules/Analytics/Advanced_Tracking.php @@ -63,13 +63,6 @@ final class Advanced_Tracking { */ private $plugin_detector; - /** - * Main class code injector instance. - * - * @var Measurement_Code_Injector - */ - private $measurement_code_injector; ...
2
diff --git a/content/hacktoberfest-2021-announcement-and-contribution-guidelines/Hacktoberfest-2021.png b/content/hacktoberfest-2021-announcement-and-contribution-guidelines/Hacktoberfest-2021.png Binary files a/content/hacktoberfest-2021-announcement-and-contribution-guidelines/Hacktoberfest-2021.png and b/content/hac...
7
diff --git a/ChatImprovements.user.js b/ChatImprovements.user.js // @description New responsive userlist with usernames and total count, more timestamps, use small signatures only, mods with diamonds, message parser (smart links), timestamps on every message, collapse room description and room tags, mobile improvements...
2
diff --git a/src/components/Widgets/PreviewHOC.js b/src/components/Widgets/PreviewHOC.js @@ -2,7 +2,11 @@ import React from 'react'; class PreviewHOC extends React.Component { shouldComponentUpdate(nextProps) { - return nextProps.value !== this.props.value; + // Only re-render on value change, but always re-render obje...
11
diff --git a/packages/app/test/cypress/support/index.ts b/packages/app/test/cypress/support/index.ts @@ -20,6 +20,16 @@ import './screenshot' // Alternatively you can use CommonJS syntax: // require('./commands') +// Ignore 'ResizeObserver loop limit exceeded' exception +// https://github.com/cypress-io/cypress/issues/...
8
diff --git a/src/components/staking/PageValidator.vue b/src/components/staking/PageValidator.vue @@ -378,6 +378,7 @@ export default { apollo: { validator: { query() { + /* istanbul ignore next */ return ValidatorProfile(this.network) }, variables() { @@ -387,6 +388,7 @@ export default { } }, update(data) { + /* istanbu...
8
diff --git a/templates/customdashboard/program_list.html b/templates/customdashboard/program_list.html {% block breadcrumbs %} <ul class="breadcrumb"> <li><a href="{% url 'index' %}">Home Dashboard</a></li> - <li class="active">{{ user.activity_user.organization.level_1_label }} Dashboards</li> + <li class="active"> + ...
0
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml @@ -34,6 +34,9 @@ steps: artifact_paths: "bundle-analysis/*" plugins: docker-compose#v1.3.1: + config: + - docker-compose.yml + - .buildkite/docker-compose.ci.yml run: frontend - name: ":webpack:"
4
diff --git a/src/main/java/org/cboard/services/MenuService.java b/src/main/java/org/cboard/services/MenuService.java @@ -23,7 +23,7 @@ public class MenuService { static { menuList.add(new DashboardMenu(1, -1, "SIDEBAR.CONFIG", "config")); menuList.add(new DashboardMenu(2, 1, "SIDEBAR.DATA_SOURCE", "config.datasource"))...
3
diff --git a/assets/js/components/surveys/SurveyQuestionMultiSelect.js b/assets/js/components/surveys/SurveyQuestionMultiSelect.js @@ -165,8 +165,6 @@ const SurveyQuestionMultiSelect = ( { disabled={ hasMaximumNumberOfChoices && ! answer.selected - ? true - : undefined } onChange={ () => handleCheck( answer_ordinal )
4
diff --git a/ios/Gemfile.lock b/ios/Gemfile.lock @@ -64,7 +64,7 @@ GEM xcodeproj (>= 1.6.0, < 2.0.0) xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) - fastlane-plugin-bugsnag (1.4.1) + fastlane-plugin-bugsnag (1.3.2) git xml-simple fastlane-plugin-get_unprovisioned_devices_from_hockey (0.1.1)
13
diff --git a/docs/KeyBase.md b/docs/KeyBase.md @@ -6,12 +6,12 @@ they contain. ## Key Terms: -- UserProfile: A collection of User materials. Includes multiple `keyringEntries` associated with a UserProfile. -- Keyring: An object containing `keyringEntry`'s. -- KeyringEntry: An object which houses ONE `SecretIdentity` a...
10
diff --git a/src/css/docs/components/docs-footer.css b/src/css/docs/components/docs-footer.css .DocsFooter--content { display: flex; } + +@media (max-width: 414px) { + .DocsFooter--edit-on-gh-link-wrapper { + display: block; + margin-bottom: .5em; + } + + .DocsFooter--content-dot-spacer { + display: none; + } +}
7
diff --git a/versioned_docs/version-6.x/native-stack-navigator.md b/versioned_docs/version-6.x/native-stack-navigator.md @@ -181,7 +181,7 @@ Supported values: - `systemThinMaterialDark` - `systemMaterialDark` - `systemThickMaterialDark` -- `systemChromeMaterialDark'` +- `systemChromeMaterialDark` Only supported on iOS....
1
diff --git a/lib/assets/javascripts/dashboard/data/api-key-model.js b/lib/assets/javascripts/dashboard/data/api-key-model.js @@ -85,14 +85,14 @@ module.exports = Backbone.Model.extend({ }, _parseApiGrants: function (grants) { - const apis = grants.find(grant => grant.type === GRANT_TYPES.APIS).apis; + const apis = _.fi...
2
diff --git a/server/game/cards/02.5-FHNS/CrisisBreaker.js b/server/game/cards/02.5-FHNS/CrisisBreaker.js const DrawCard = require('../../drawcard.js'); class CrisisBreaker extends DrawCard { - setupCardAbilities(ability) { // eslint-disable-line no-unused-vars + setupCardAbilities() { + this.action({ + title: 'Ready an...
5
diff --git a/bower.json b/bower.json "assets", "config", "test", + "testem.json", + "tslint.json", ".babelrc", - ".editorcofig", + ".editorconfig", ".gitignore", ".sass-lint.yml", ".travis.yml", - "contributing.md", + ".github", "gulpfile.js", - "package.json" + "package.json", + "yarn.lock", + "DONATIONS.md" ], "descr...
8
diff --git a/articles/api/authentication/_login.md b/articles/api/authentication/_login.md @@ -404,10 +404,10 @@ Use this endpoint for API-based (active) authentication. Given the user credenti | `username` <br/><span class="label label-danger">Required</span> | Username/email of the user to login | | `password` <br/><...
0
diff --git a/src/pages/Armor.jsx b/src/pages/Armor.jsx @@ -81,11 +81,11 @@ function Armor() { accessor: 'armorClass', Cell: centerCell, }, - { - Header: 'Material', - accessor: 'material', - Cell: centerCell, - }, + // { + // Header: 'Material', + // accessor: 'material', + // Cell: centerCell, + // }, { Header: 'Max D...
7
diff --git a/CHANGELOG.md b/CHANGELOG.md All notable changes to this project are documented in this file. -## Head +## 14.2.0 -- Added: `cwd` option ([#5721](https://github.com/stylelint/stylelint/pull/5721)). -- Added: `resolveConfig` to Node.js API ([#5734](https://github.com/stylelint/stylelint/pull/5734)). +- Added...
6
diff --git a/src/test/service/page.test.js b/src/test/service/page.test.js +/* eslint-disable no-unused-vars */ const mongoose = require('mongoose'); const { getInstance } = require('../setup-crowi'); @@ -20,7 +21,7 @@ let childForDeleteCompletely; let childForRevert; describe('PageService', () => { - // eslint-disable...
6
diff --git a/src/tokens/eth/0xba3a79d758f19efe588247388754b8e4d6edda81.json b/src/tokens/eth/0xba3a79d758f19efe588247388754b8e4d6edda81.json "decimals": 18, "website": "https://verisafe.io/", "logo": { - "src": "https://uploads-ssl.webflow.com/5bb626a3d5b0897767e1fdca/5c82bee056338f42f21c3785_VeriSafe-128.png", + "src"...
4
diff --git a/articles/libraries/auth0js/v9/index.md b/articles/libraries/auth0js/v9/index.md @@ -84,7 +84,7 @@ The `authorize()` method can be used for logging in users via the [Hosted Login | `responseType` | optional | (String) It can be any space separated list of the values `code`, `token`, `id_token`. It defaults ...
0
diff --git a/src/components/dashboard/Claim.js b/src/components/dashboard/Claim.js @@ -58,7 +58,7 @@ class Claim extends Component<ClaimProps, {}> { const { entitlement } = store.get('account') const ClaimButton = ( <CustomButton - disabled={entitlement <= 0 && this.state.isCitizen} + // disabled={entitlement <= 0 && t...
2
diff --git a/packages/mobile-bridge/src/index.js b/packages/mobile-bridge/src/index.js @@ -80,7 +80,8 @@ class MobileBridge { rpcUrl, getAccounts: this.getAccounts.bind(this), processTransaction: this.processTransaction.bind(this), - signMessage: this.signMessage.bind(this) + signMessage: this.signMessage.bind(this), +...
9
diff --git a/src/ObjectPreview.jsx b/src/ObjectPreview.jsx @@ -3,6 +3,8 @@ import React, {useEffect, useRef} from 'react'; import classnames from 'classnames'; import style from './ObjectPreview.module.css'; import dioramaManager from '../diorama.js'; +import {OrbitControls} from 'three/examples/jsm/controls/OrbitContr...
0
diff --git a/src/gml/GmlImports.hx b/src/gml/GmlImports.hx @@ -164,7 +164,7 @@ class GmlImports { if (ns != null) cache.enumNsComps = nsComps; } for (comp in comps) this.comp.push(comp); - for (comp in nsComps) ns.comp.push(comp); + if (ns != null) for (comp in nsComps) ns.comp.push(comp); } else for (comp in en.compLi...
1
diff --git a/docusaurus/docs/making-a-progressive-web-app.md b/docusaurus/docs/making-a-progressive-web-app.md @@ -4,7 +4,7 @@ title: Making a Progressive Web App --- The production build has all the tools necessary to generate a first-class -[Progressive Web App](https://developers.google.com/web/progressive-web-apps/...
1
diff --git a/index.js b/index.js @@ -72,8 +72,8 @@ function createWindow () { }) // create system tray icon - if(process.platform == 'win32') trayIcon = new Tray('./assets/icon.ico') - else trayIcon = new Tray('./assets/icon.png') + if(process.platform == 'win32') trayIcon = new Tray(path.join(__dirname, './assets/icon...
1
diff --git a/src/structures/MiniGames/SkyWars.js b/src/structures/MiniGames/SkyWars.js @@ -367,7 +367,7 @@ function getSkyWarsPrestige (level) { */ function getSkyWarsLevel (xp) { const totalXp = [0, 2, 7, 15, 25, 50, 100, 200, 350, 600, 1000, 1500]; - if (xp >= 15000) return (xp - 15000) / 10000 + 12; + if (xp >= 1500...
1
diff --git a/lib/worker/line-numbers.js b/lib/worker/line-numbers.js @@ -61,7 +61,7 @@ function findTest(locations, declaration) { const range = (start, end) => Array.from({length: end - start + 1}).fill(start).map((element, index) => element + index); const translate = (sourceMap, pos) => { - if (sourceMap === undefin...
9
diff --git a/test/utils/expected-files.js b/test/utils/expected-files.js @@ -818,7 +818,7 @@ const expectedFiles = { `${CLIENT_TEST_SRC_DIR}cypress/integration/account/reset-password-page.spec.ts`, ], - cypressWithOauth2: [`${CLIENT_TEST_SRC_DIR}cypress/support/keycloak-oauth2.ts`, `${CLIENT_TEST_SRC_DIR}cypress/suppor...
2
diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js @@ -747,16 +747,16 @@ function generateDefaultWorkspaceName(email = '') { } // Check if this name already exists in the policies - let suffix = 0; + let count = 0; _.forEach(allPolicies, (policy) => { const name = lodashGet(policy, 'name', ''); if (na...
4
diff --git a/articles/compliance/gdpr/features-aiding-compliance/data-portability.md b/articles/compliance/gdpr/features-aiding-compliance/data-portability.md @@ -21,9 +21,4 @@ To export a user's data manually from the Dashboard: ## Export data using the API -You can export a user's full profile using our Management AP...
2
diff --git a/common/actions.js b/common/actions.js @@ -12,18 +12,6 @@ const REQUEST_HEADERS = { "Content-Type": "application/json", }; -const API_HEADERS = { - Accept: "application/json", - "Content-Type": "application/json", - Authorization: "Basic SLA42887290-7073-4f7c-961d-db84aea29b41TE", -}; - -const API_OPTIONS =...
2
diff --git a/token-metadata/0x2C537E5624e4af88A7ae4060C022609376C8D0EB/metadata.json b/token-metadata/0x2C537E5624e4af88A7ae4060C022609376C8D0EB/metadata.json "symbol": "TRYB", "address": "0x2C537E5624e4af88A7ae4060C022609376C8D0EB", "decimals": 6, - "dharmaVerificationStatus": { "dharmaVerificationStatus": "VERIFIED" ...
3
diff --git a/articles/quickstart/webapp/python/01-login.md b/articles/quickstart/webapp/python/01-login.md @@ -7,6 +7,12 @@ budicon: 448 You can get started by either downloading the complete sample or following the tutorial steps to integrate Auth0 with an existing application. +<%= include('../../../_includes/_packag...
0
diff --git a/js/main.js b/js/main.js @@ -3863,6 +3863,7 @@ class V2C_PluginCard extends BDV2.reactComponent { constructor(props) { super(props); let self = this; + self.settingsPanel = self.props.plugin.getSettingsPanel(); self.onChange = self.onChange.bind(self); self.showSettings = self.showSettings.bind(self); self....
11
diff --git a/admin-base/ui.apps/src/main/content/jcr_root/apps/admin/components/contentview/template.vue b/admin-base/ui.apps/src/main/content/jcr_root/apps/admin/components/contentview/template.vue <div id = "editviewoverlay" v-on:click = "click" + v-on:mousewheel = "scrollEditView" v-on:mousemove= "mouseMove" v-on:mo...
11
diff --git a/test/db/header.js b/test/db/header.js @@ -25,13 +25,11 @@ function main(options, dc) { if (options && typeof options === 'object') { if (!('pgNative' in options)) { options.pgNative = true; - options.noWarnings = true; } } else { if (!options) { options = { - pgNative: true, - noWarnings: true + pgNative: ...
1
diff --git a/app/controllers/ApplicationController.scala b/app/controllers/ApplicationController.scala @@ -88,7 +88,7 @@ class ApplicationController @Inject() (implicit val env: Environment[User, Sessi } case None => // When there are no referrers, just load the landing page but store the query parameters that were pas...
1
diff --git a/assets/scripts/lobby.js b/assets/scripts/lobby.js @@ -204,9 +204,15 @@ function addToAllChat(data){ if(data.date < 10){data.date = "0" + data.date;} var date = "[" + hour + ":" + data.date + "]"; + //prevent XSS injection var filteredMessage = data.message.replace(/</g, "&lt;").replace(/>/g, "&gt;"); - var...
1
diff --git a/protocols/indexer/contracts/Indexer.sol b/protocols/indexer/contracts/Indexer.sol @@ -41,25 +41,25 @@ contract Indexer is IIndexer, Ownable { mapping (address => uint256) public blacklist; // The whitelist contract for checking whether a peer is whitelisted - address public whitelist; + address public loca...
10
diff --git a/test/jasmine/tests/hover_label_test.js b/test/jasmine/tests/hover_label_test.js @@ -5377,29 +5377,29 @@ describe('hovermode: (x|y)unified', function() { .then(function(gd) { _hover(gd, { xpx: 40, ypx: 200 }); assertLabel({title: 'Jan', items: [ - 'bar : (Jan 1, 2000, 1)', - 'start : 1', - 'end : 1' + 'star...
7
diff --git a/storybook-utilities/storybook-theming/storybook-spark-theme.js b/storybook-utilities/storybook-theming/storybook-spark-theme.js @@ -6,16 +6,16 @@ let sparkLogo; switch (storybookInstance) { case 'react': - sparkLogo = 'https://spark-assets.netlify.com/spark-logo-black-text.svg'; + sparkLogo = 'https://spar...
3
diff --git a/src/diagrams/flowchart/graphDb.js b/src/diagrams/flowchart/graphDb.js @@ -248,7 +248,7 @@ export const getClasses = function () { const setupToolTips = function (element) { let tooltipElem = d3.select('.mermaidTooltip') - if (tooltipElem[0][0] === null) { + if ((tooltipElem._groups || tooltipElem)[0][0] ==...
1
diff --git a/src/components/postElements/body/view/postBodyView.js b/src/components/postElements/body/view/postBodyView.js @@ -22,6 +22,7 @@ import { toastNotification } from '../../../../redux/actions/uiAction'; import { default as ROUTES } from '../../../../constants/routeNames'; import getYoutubeId from '../../../.....
14
diff --git a/token-metadata/0x10Bae51262490B4f4AF41e12eD52A0E744c1137A/metadata.json b/token-metadata/0x10Bae51262490B4f4AF41e12eD52A0E744c1137A/metadata.json "symbol": "SLINK", "address": "0x10Bae51262490B4f4AF41e12eD52A0E744c1137A", "decimals": 9, - "dharmaVerificationStatus": { "dharmaVerificationStatus": "VERIFIED"...
3
diff --git a/src/js/common_shim.js b/src/js/common_shim.js @@ -266,9 +266,10 @@ module.exports = { dc.send = function() { var data = arguments[0]; var length = data.length || data.size || data.byteLength; - if (length > pc.sctp.maxMessageSize) { - throw new DOMException('Message too large (can send a maximum of ' + - p...
7
diff --git a/packages/bitcore-lib-doge/test/transaction/transaction.js b/packages/bitcore-lib-doge/test/transaction/transaction.js @@ -1788,7 +1788,7 @@ describe('Transaction', function() { txId: '1d732950d99f821b8a8d11972ea56000b0666e4d31fa71861ffd80a83797dc61', outputIndex: 1, script: Script.buildScriptHashOut(nested...
3
diff --git a/packages/idyll-document/test/vars.js b/packages/idyll-document/test/vars.js @@ -58,63 +58,71 @@ describe('Component state initialization', () => { const checks = [ { id: 'varDisplay', - html: '<span>2.00</span>' + html: '<span class="idyll-display">2.00</span>' }, { id: 'derivedVarDisplay', - html: '<span>...
1
diff --git a/factory-ai-vision/EdgeSolution/modules/WebModule/ui/src/store/project/projectActions.ts b/factory-ai-vision/EdgeSolution/modules/WebModule/ui/src/store/project/projectActions.ts @@ -373,13 +373,7 @@ export const thunkGetInferenceMetrics = (projectId: number, isDemo: boolean) => data.unidentified_num, data....
9
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md @@ -28,7 +28,7 @@ For example: - [ ] Android ### Screenshots -<Add any necessary screenshots for all platforms if your change added or updated UI> +<Add screenshots for all platforms tested. Pull requests won't be merged unless the screens...
7
diff --git a/token-metadata/0x4889F721f80C5E9fadE6Ea9B85835D405D79a4f4/metadata.json b/token-metadata/0x4889F721f80C5E9fadE6Ea9B85835D405D79a4f4/metadata.json "symbol": "MAFI", "address": "0x4889F721f80C5E9fadE6Ea9B85835D405D79a4f4", "decimals": 18, - "dharmaVerificationStatus": { "dharmaVerificationStatus": "VERIFIED"...
3
diff --git a/reputation/plugin_bot.go b/reputation/plugin_bot.go @@ -34,9 +34,16 @@ func (p *Plugin) BotInit() { var thanksRegex = regexp.MustCompile(`(?i)( |\n|^)(thanks?\pP*|danks|ty|thx|\+rep|\+ ?\<\@[0-9]*\>)( |\n|$)`) +var repDisabledError = "**Rep command is disabled on this server. Enable it from the control pan...
11
diff --git a/src/navigationStore.js b/src/navigationStore.js @@ -335,7 +335,7 @@ class NavigationStore { props.init = true; if (!this[key]) { this[key] = new Function('actions', 'props', 'type', // eslint-disable-line no-new-func - `return function ${key}(params){ actions.execute(type, '${key}', props, params)}`)(this,...
11
diff --git a/articles/protocols/saml/samlsso-auth0-to-auth0.md b/articles/protocols/saml/samlsso-auth0-to-auth0.md @@ -145,7 +145,7 @@ Copy and save this URL. This is the URL on tenant 1 that will receive the SAML a In this section you will go back and add some information about the Service Provider (tenant 1) to the I...
0
diff --git a/token-metadata/0x74faaB6986560fD1140508e4266D8a7b87274Ffd/metadata.json b/token-metadata/0x74faaB6986560fD1140508e4266D8a7b87274Ffd/metadata.json "symbol": "HDAO", "address": "0x74faaB6986560fD1140508e4266D8a7b87274Ffd", "decimals": 18, - "dharmaVerificationStatus": { "dharmaVerificationStatus": "VERIFIED"...
3
diff --git a/js/findIntrons.js b/js/findIntrons.js @@ -37,6 +37,9 @@ function mergeTop(groups, exon) { // // exons in the returned groups are sorted by start position. function exonGroups(exons) { + if (exons.length < 1) { + return []; + } var sorted = _.sortBy(exons, 'start'), [first, ...rest] = sorted; return rest.re...
9
diff --git a/magda-web-server/src/buildSitemapRouter.ts b/magda-web-server/src/buildSitemapRouter.ts @@ -130,7 +130,9 @@ export default function buildSitemapRouter({ function catchError<T>(res: express.Response, promise: Promise<T>) { return promise.catch(e => { console.error(e); - res.status(500).send("Internal Server...
12
diff --git a/js/xss.js b/js/xss.js @@ -39,6 +39,7 @@ var whiteList = { header: ['style'], hr: ['style'], i: ['style'], + iframe: ['src', 'width', 'height', 'frameborder', 'allowfullscreen'], img: ['src', 'alt', 'title', 'width', 'height', 'style'], ins: ['datetime', 'style'], li: ['style'],
11
diff --git a/src/containers/NavBar/ExportFileModal/ExportFileModal.jsx b/src/containers/NavBar/ExportFileModal/ExportFileModal.jsx @@ -9,6 +9,7 @@ const remote = window.require('electron').remote; const fs = remote.require('fs'); const path = remote.require('path'); const beautify = remote.require('js-beautify'); +cons...
1
diff --git a/docs/introduction/vr-headsets-and-webxr-browsers.md b/docs/introduction/vr-headsets-and-webxr-browsers.md @@ -145,10 +145,10 @@ front-facing changes to A-Frame developers, involving mostly renaming of APIs. - Chrome (WebXR under origin trials) - Exokit (experimental early support) -[webxrpolyfill]: https:/...
14
diff --git a/src/client/components/containers/SingleReqResContainer.jsx b/src/client/components/containers/SingleReqResContainer.jsx @@ -39,6 +39,7 @@ const SingleReqResContainer = (props) => { }, reqResUpdate, reqResDelete, + index, } = props; const network = content.request.network; const method = content.request.met...
1
diff --git a/public/locales/nl/common.json b/public/locales/nl/common.json "cracks": "scheuren", "grass": "gras", "narrow sidewalk": "smal trottoir", - "brick": "steen", + "brick/cobblestone": "steen", "very broken": "erg beschadigd", "rail/tram track": "spoor/trambaan", "sand/gravel": "zand/grind",
1
diff --git a/src/navigationStore.js b/src/navigationStore.js @@ -673,7 +673,7 @@ class NavigationStore { } // add all clones for (const child of children) { - if (child.props.clone) { + if (child && child.props.clone) { if (clones.indexOf(child) === -1) { clones.push(child); } @@ -682,6 +682,10 @@ class NavigationStore...
11
diff --git a/test/unit/components/join-flow-step.test.jsx b/test/unit/components/join-flow-step.test.jsx @@ -4,7 +4,7 @@ import JoinFlowStep from '../../../src/components/join-flow/join-flow-step'; describe('JoinFlowStep', () => { - test('test components exist when props present', () => { + test('components exist when ...
10
diff --git a/packages/rollup/package-lock.json b/packages/rollup/package-lock.json "slash": "^3.0.0" } }, + "@rollup/plugin-commonjs": { + "version": "11.0.2", + "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-11.0.2.tgz", + "integrity": "sha512-MPYGZr0qdbV5zZj8/2AuomVpnRVXRU5XKXb3HVni...
11
diff --git a/src/components/ProjectPreview/ImageCollage.js b/src/components/ProjectPreview/ImageCollage.js @@ -26,42 +26,45 @@ const ImageCollage = ({ images }) => { // slideNumber % 3 === 0 ? 3 : slideNumber % 2 === 0 ? 2 : 1; const selectedClass = () => 1; - // Prepare fixed images data for art-directed images using ...
12
diff --git a/tools/make/lib/benchmark/cpp.mk b/tools/make/lib/benchmark/cpp.mk @@ -11,7 +11,7 @@ benchmark-cpp: echo "Running benchmark: $$file"; \ cd `dirname $$file` && \ $(MAKE) clean && \ - $(MAKE) && \ + BOOST=$(DEPS_BOOST_BUILD_OUT) $(MAKE) && \ $(MAKE) run || exit 1; \ done
12
diff --git a/src/client/components/composer/ComposerContainer.jsx b/src/client/components/composer/ComposerContainer.jsx @@ -124,8 +124,8 @@ const ComposerContainer = (props) => { ...props.newRequestFields, protocol: '', url: props.newRequestFields.webRTCInitiator, - method: 'openapi', + openapi: true, graphQL: false, ...
12
diff --git a/package.json b/package.json "carbon-factory": "git+ssh://git@github.com/Sage/carbon-factory.git#build-npm-6-audit", "enzyme": "^3.3.0", "enzyme-adapter-react-16": "^1.1.1", - "express": "^4.16.3", + "express": "~4.16.3", "flux": "^3.1.1", "gulp": "~3.9.0", "highlight.js": "~9.6.0",
14
diff --git a/app/components/wallet/WalletAdd.js b/app/components/wallet/WalletAdd.js @@ -26,6 +26,10 @@ const messages = defineMessages({ id: 'wallet.add.dialog.hardware.description', defaultMessage: '!!!Connect to hardware wallet', }, + useTrezorDescription: { + id: 'wallet.add.dialog.trezor.description', + defaultMes...
13
diff --git a/articles/sso/current/single-page-apps.md b/articles/sso/current/single-page-apps.md @@ -172,7 +172,7 @@ setInterval(function() { // if the token is not in local storage, there is nothing to check (i.e. the user is already logged out) if (!localStorage.getItem('userToken')) return; - auth0.getSSOData(functi...
14
diff --git a/app/views/console/users/oauth/gitlab.phtml b/app/views/console/users/oauth/gitlab.phtml @@ -6,7 +6,7 @@ $provider = $this->getParam('provider', ''); <input name="appId" id="oauth2<?php echo $this->escape(ucfirst($provider)); ?>Appid" type="text" autocomplete="off" data-ls-bind="{{console-project.provider<?...
7
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-4 + image: sitespeedio/grafana-bootstrap:sitespeed.io-4.6 links: - grafana environment:
4
diff --git a/stories/notifications.stories.js b/stories/notifications.stories.js @@ -43,7 +43,7 @@ import ThumbsUpSVG from '../assets/svg/thumbs-up.svg'; storiesOf( 'Global/Notifications', module ) .add( 'Module Setup Complete', () => { const setupRegistry = ( registry ) => { - registry.dispatch( CORE_MODULES ).receive...
1
diff --git a/.github/workflows/crawler.yml b/.github/workflows/crawler.yml @@ -20,11 +20,12 @@ jobs: run: | python "data/crawlWorldData.py" python "data/crawlKoreaRegionalData.py" + python "data/crawlKoreaRegionalCumulativeData.py" - name: Commit files run: | git config --local user.email "commit-bot@taeuk.me" git conf...
0
diff --git a/test/unit/renderers/mapnik-factory.test.js b/test/unit/renderers/mapnik-factory.test.js @@ -35,27 +35,27 @@ describe('renderer-mapnik-factory', function() { var factory = new MapnikRendererFactory({ mapnik: { bufferSize: 128 }}); - assert.equal(factory.getMetatile('png'), 128); + assert.equal(factory.getBu...
4
diff --git a/generators/server/templates/gradle/_liquibase.gradle b/generators/server/templates/gradle/_liquibase.gradle @@ -73,13 +73,17 @@ def liquibaseCommand(command) { } } -task liquibaseDiffChangeLog(dependsOn: initPaths) << { +task liquibaseDiffChangeLog(dependsOn: initPaths) { + doLast { liquibaseCommand("diffC...
2
diff --git a/AttackMaster/script.json b/AttackMaster/script.json { "$schema": "", "name": "AttackMaster", -<<<<<<< HEAD "script": "attackMaster.js", -<<<<<<< HEAD -======= - "script": "AttackMaster.js", ->>>>>>> parent of d534e416 (Attempt to resolve pull request conflict) "version": "1.038", "previousversions": ["1.03...
3
diff --git a/html/settings/_settings.scss b/html/settings/_settings.scss @@ -1065,7 +1065,7 @@ $sprk-checkbox-custom-input-background-color-disabled: transparent !default; $sprk-checkbox-huge-container-transition: $sprk-checkbox-transition !default; $sprk-checkbox-huge-container-border: 2px $sprk-black-tint-50 solid !d...
3
diff --git a/packages/cx/src/ui/Restate.js b/packages/cx/src/ui/Restate.js @@ -78,13 +78,20 @@ Restate.prototype.detached = false; class RestateStore extends Store { + constructor(config) { + super(config); + this.parentData = {}; + } + setParentData(data) { let changed = this.silently(() => { for (let key in data) { -...
1
diff --git a/packages/app/package.json b/packages/app/package.json "build:server": "yarn cross-env NODE_ENV=production tsc -p tsconfig.build.server.json && tsc-alias -p tsconfig.build.server.json", "clean": "npx -y shx rm -rf dist transpiled", "prebuild": "yarn cross-env NODE_ENV=production run-p clean resources:*", - ...
7
diff --git a/src/ace.jsx b/src/ace.jsx @@ -104,7 +104,7 @@ export default class ReactAce extends Component { } if (className) { - this.refs.editor.className += ' ' + className; + this.refEditor.className += ' ' + className; } if (focus) { @@ -127,14 +127,14 @@ export default class ReactAce extends Component { } if (nex...
14
diff --git a/userscript.user.js b/userscript.user.js @@ -10283,8 +10283,8 @@ var $$IMU_EXPORT$$; }, mouseover_allow_partial: { name: "Allow showing partially loaded", - description: "This will allow the popup to open for partially loaded media", - description_userscript: "This will allow the popup to open for partially...
7
diff --git a/js/cloud/bisweb_awsmodule.js b/js/cloud/bisweb_awsmodule.js @@ -80,8 +80,6 @@ class AWSModule extends BaseServerClient { createLoadImageModal(filters, modalTitle, suffixes) { this.s3.listObjectsV2( { 'Delimiter' : '/' }, (err, data) => { if (err) { console.log('an error occured', err); return; } - - consol...
1
diff --git a/test/test-generator-base.js b/test/test-generator-base.js @@ -63,7 +63,8 @@ describe('Generator Base', () => { }); it('returns an up-to-date state', () => { assert.deepEqual( - BaseGenerator.prototype.getExistingEntities()[0] + BaseGenerator.prototype.getExistingEntities() + .find(it => it.name === 'Region...
1
diff --git a/src/service_status_keeper.erl b/src/service_status_keeper.erl @@ -103,7 +103,7 @@ handle_cast({update, Status}, #state{source = local} = State) -> handle_cast({update, _}, State) -> ?log_warning("Got unexpected status update when source is not local. Ignoring."), {noreply, State}; -handle_cast({refresh_don...
11
diff --git a/runtime.js b/runtime.js @@ -337,6 +337,7 @@ const _loadImg = async file => { side: THREE.DoubleSide, vertexColors: true, transparent: true, + alphaTest: 0.5, }); /* const material = meshComposer.material.clone(); material.uniforms.map.value = texture;
0
diff --git a/src/utils/wallet.ts b/src/utils/wallet.ts @@ -369,6 +369,7 @@ export const fetchCoinsData = async ({ coins, currentAccount, vsCurrency, + currencyRate, globalProps, refresh, quotes, @@ -376,6 +377,7 @@ export const fetchCoinsData = async ({ coins: CoinBase[], currentAccount: any, vsCurrency: string, + curr...
4
diff --git a/src/adapters/autocomplete.js b/src/adapters/autocomplete.js @@ -40,7 +40,7 @@ function SearchInput(tagSelector) { const suggestPromise = ajax.query(geocoderConfig.url, {q: term, center : center, bbox : bbox}) const suggestHistoryPromise = store.getPrefixes(term) Promise.all([suggestPromise, suggestHistoryP...
10
diff --git a/content/getting-started/hosting-providers.md b/content/getting-started/hosting-providers.md @@ -7,7 +7,7 @@ tag = "hostprov" ## Tlon -[Tlon](https://tlon.io) is the company responsible for creating Urbit, Landscape, Groups and Talk. They also offer hosting services that seamlessly integrate with the rest o...
4
diff --git a/src/physics/collision.js b/src/physics/collision.js @@ -117,7 +117,7 @@ var collision = { * // ... * } */ - rayCast(line, result) { return game.world.rayCast(line, result); } + rayCast(line, result) { return game.world.detector.rayCast(line, result); } }; export default collision;
1
diff --git a/src/apps.json b/src/apps.json "cats": [ 20 ], - "html": "(?:<!--[^>]*(?:InstanceBeginEditable|Dreamweaver([^>]+)target|DWLayoutDefaultTable)|function MM_preloadImages\\(\\) \\{)\\;version:\\1", + "html": "<!--[^>]*(?:InstanceBeginEditable|Dreamweaver([^>]+)target|DWLayoutDefaultTable)\\;version:\\1", + "js...
7
diff --git a/test/Persistence.test.js b/test/Persistence.test.js @@ -37,6 +37,7 @@ function InvariantLoadSaveTest (archiveId, memory) { let testVfs = setupTestVfs(vfs, archiveId) let { app, archive, manuscriptSession } = setupTestApp(t, { vfs: testVfs, + writable: true, archiveId }) @@ -110,6 +111,7 @@ function LoadSav...
11
diff --git a/src/DateComboBox.js b/src/DateComboBox.js @@ -171,14 +171,15 @@ class DateComboBox extends Base { refineState(state) { let result = super.refineState ? super.refineState(state) : true; state[previousStateKey] = state[previousStateKey] || { + date: null, opened: false, value: null }; const changed = stateCh...
11