code
stringlengths
122
4.99k
label
int64
0
14
diff --git a/webpack.config.js b/webpack.config.js @@ -33,6 +33,11 @@ var config = { test: /\.(eot|svg|ttf|woff|woff2)$/, include: path.join(__dirname, 'src/fonts'), loader: 'file-loader?name=fonts/[name].[ext]' + }, + { + test: /\.(svg)$/, + include: path.join(__dirname, 'src/gui'), + loader: 'file-loader?name=fonts/[name].[ext]' } ] },
0
diff --git a/src/lib/wallet/GoodWallet.js b/src/lib/wallet/GoodWallet.js @@ -414,7 +414,13 @@ export class GoodWallet { return parseInt(amount) <= parseInt(balance) } - async generateLink(amount: number, reason: string = '', events: PromitEvents) { + /** + * deposit specified amount to _oneTimeLink_ conrtact, and generates a link that would send the user to a URL to withdraw it + * @param {number} amount - amount of money to send using OTP + * @param {string} reason - optional reason for sending the payment (comment) + * @param {PromiEvents} events - used to subscribe to onTransactionHash event + */ + async generateLink(amount: number, reason: string = '', events: PromiEvents) { if (!(await this.canSend(amount))) { throw new Error(`Amount is bigger than balance`) }
0
diff --git a/token-metadata/0xaB37e1358b639Fd877f015027Bb62d3ddAa7557E/metadata.json b/token-metadata/0xaB37e1358b639Fd877f015027Bb62d3ddAa7557E/metadata.json "symbol": "LIEN", "address": "0xaB37e1358b639Fd877f015027Bb62d3ddAa7557E", "decimals": 8, - "dharmaVerificationStatus": { "dharmaVerificationStatus": "VERIFIED" } \ No newline at end of file -} \ No newline at end of file
3
diff --git a/scripts/retag-and-push.js b/scripts/retag-and-push.js @@ -56,6 +56,13 @@ const argv = yargs example: "data61/magda-ckan-connector", default: "" }) + .option("copyFromRegistry", { + describe: `When \`copyFromRegistry\`=true, [regctl](https://github.com/regclient/regclient) will be used. + The image will be copied directly from remote registry to the destination registry rather than from a local image. + This allows copying multi-arch image from one registry to another registry.`, + type: "boolean", + default: false + }) .option("toVersion", { describe: "The version for the tag to push to", type: "string", @@ -66,6 +73,24 @@ const argv = yargs const fromTag = argv.fromPrefix + getName(argv.fromName) + ":" + argv.fromVersion; +const toTag = argv.toPrefix + getName(argv.toName) + ":" + argv.toVersion; + +if (argv.copyFromRegistry) { + console.log(`Copying from \`${fromTag}\` to \`${toTag}\`...`); + const copyProcess = childProcess.spawn( + "regctl", + ["image", "copy", fromTag, toTag], + { + stdio: ["pipe", "pipe", "pipe"], + env: env + } + ); + copyProcess.stderr.pipe(process.stderr); + copyProcess.stdout.pipe(process.stdout); + copyProcess.on("close", (code) => { + process.exit(code); + }); +} else { const pullProcess = childProcess.spawnSync("docker", ["pull", fromTag], { stdio: ["pipe", "inherit", "inherit"], env: env @@ -75,12 +100,14 @@ if (pullProcess.status !== 0) { process.exit(pullProcess.status); } -const toTag = argv.toPrefix + getName(argv.toName) + ":" + argv.toVersion; - -const tagProcess = childProcess.spawnSync("docker", ["tag", fromTag, toTag], { + const tagProcess = childProcess.spawnSync( + "docker", + ["tag", fromTag, toTag], + { stdio: ["pipe", "inherit", "inherit"], env: env -}); + } + ); if (tagProcess.status !== 0) { process.exit(tagProcess.status); @@ -92,3 +119,4 @@ const pushProcess = childProcess.spawnSync("docker", ["push", toTag], { }); process.exit(pushProcess.status); +}
11
diff --git a/app/models/data_import.rb b/app/models/data_import.rb @@ -315,10 +315,6 @@ class DataImport < Sequel::Model self end - def table_names_array - table_names.present? ? table_names.split(' ') : [] - end - def is_raster? ::JSON.parse(self.stats).select{ |item| item['type'] == '.tif' }.length > 0 end
2
diff --git a/OurUmbraco.Site/Assets/js/map/community.map.js b/OurUmbraco.Site/Assets/js/map/community.map.js var map = new google.maps.Map(document.getElementById('map'), { zoom: 5, - center: { lat: 51.4472452, lng: 2.8123371 } + center: { lat: 51.4472452, lng: 2.8123371 }, + maxZoom: 17 }); // Try HTML5 geolocation.
12
diff --git a/token-metadata/0xaC2385e183d9301dd5E2BB08DA932CbF9800dC9c/metadata.json b/token-metadata/0xaC2385e183d9301dd5E2BB08DA932CbF9800dC9c/metadata.json "symbol": "LIQUID", "address": "0xaC2385e183d9301dd5E2BB08DA932CbF9800dC9c", "decimals": 18, - "dharmaVerificationStatus": { "dharmaVerificationStatus": "VERIFIED" } \ No newline at end of file -} \ No newline at end of file
3
diff --git a/lib/assets/javascripts/cartodb/public/views/public_footer.jst.ejs b/lib/assets/javascripts/cartodb/public/views/public_footer.jst.ejs <dt class="Footer-title u-vspace-xs">Product</dt> <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/builder/">Builder</a></dd> <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/engine/">Engine</a></dd> - <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/mobile/">Mobile</a></dd> + <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/engine/mobile/">Mobile</a></dd> <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/location-data-services/">Location Data Services</a></dd> <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/platform/location-data-streams/">Location Data Streams</a></dd> <dd class="Footer-item"><a class="Footer-link" href="https://github.com/CartoDB/cartodb">Source Code</a></dd> - <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/pricing/" class="Footer-link">Pricing</a></dd> + <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/pricing/">Pricing</a></dd> </dl> </li> <dl> <dt class="Footer-title u-vspace-xs">About us</dt> <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/team/">Team</a></dd> - <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/jobs/">Jobs</a></dd> + <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/careers/">Careers</a></dd> <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/press/">Press</a></dd> <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/partners/">Partners</a></dd> <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/about-carto/">Attributions</a></dd>
1
diff --git a/tests/e2e/utils/setup-analytics.js b/tests/e2e/utils/setup-analytics.js @@ -8,13 +8,19 @@ const defaultConnection = { propertyId: 200, profileId: 300, internalWebPropertyId: 400, + useSnippet: true, + // ampClientIdOptIn: (bool) }; /** * Activate and set up the Analytics module. - * @param {Object} config Optional configuration to use for module set up. + * @param {Object} connectionOverrides Optional connection overrides to use for module set up. */ -export async function setupAnalytics( config = { connection: defaultConnection } ) { +export async function setupAnalytics( connectionOverrides = {} ) { + const connection = { + ...defaultConnection, + ...connectionOverrides, + }; // Activate the module. await wpApiFetch( { method: 'post', @@ -26,8 +32,19 @@ export async function setupAnalytics( config = { connection: defaultConnection } method: 'post', path: 'google-site-kit/v1/modules/analytics/data/connection', data: { - data: config.connection, + data: connection, }, parse: false, } ); + + if ( connection.useSnippet ) { + await wpApiFetch( { + method: 'post', + path: 'google-site-kit/v1/modules/analytics/data/use-snippet', + data: { + data: { useSnippet: true }, + }, + parse: false, + } ); + } }
3
diff --git a/.snyk b/.snyk version: v1.12.0 # ignores vulnerabilities until expiry date; change duration by modifying expiry date ignore: - 'npm:debug:20170905': - - '*': - reason: >- - tar-pack needs to upddate to the latest version of debug, looks like - tar-pack is not being maintained. This is also a dep of fsevents - package which isn't being used within our docker env - expires: 2018-06-15T00:00:00.000Z - 'npm:deep-extend:20180409': - - '*': - reason: Waiting on rc to updated to latest deep-extend version - expires: 2018-06-15T00:00:00.000Z 'npm:hoek:20180212': - '*': reason: 'Possible false positive, waiting on requestjs to updated hawk version' expires: 2018-06-30T00:00:00.000Z - 'npm:sshpk:20180409': - - '*': - reason: Waiting on http-signature to update to the latest sshpk version - expires: 2018-06-15T00:00:00.000Z - 'npm:ua-parser-js:20180227': - - '*': - reason: Waiting on fbjs to update to the latest ua-parser-js version - expires: 2018-06-15T00:00:00.000Z - 'npm:tough-cookie:20170905': - - '*': - reason: Waiting on tough-cookie to update to the latest sshpk version - expires: 2018-06-15T00:00:00.000Z - 'npm:stringstream:20180511': - - '*': - reason: Waiting on updated package - expires: 2018-06-15T00:00:00.000Z 'npm:braces:20180219': - '*': - reason: Waiting for Next.js 6 to update to Babel 7 beta.47 - expires: 2018-06-15T00:00:00.000Z + reason: Waiting for Next.js 6 to update to Babel 7 beta.47 (https://github.com/babel/babel/issues/8034) + expires: 2018-06-30T00:00:00.000Z patch: {}
3
diff --git a/src/adapters/scene_direction.js b/src/adapters/scene_direction.js @@ -134,9 +134,9 @@ export default class SceneDirection { } } - computeBBox(routeOrStep) { + computeBBox(polygon) { let bounds = new LngLatBounds() - routeOrStep.geometry.coordinates.forEach((coordinate) => { + polygon.geometry.coordinates.forEach((coordinate) => { bounds.extend(new LngLat(coordinate[0], coordinate[1])) })
10
diff --git a/.gitignore b/.gitignore @@ -10,7 +10,13 @@ Desktop.ini ### Editors ######################################################################################## .idea -.vscode/ + +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json + *.sublime-project *.sublime-workspace @@ -28,4 +34,3 @@ node_modules ### Scratch spaces ################################################################################# playground -!/.vscode/
7
diff --git a/token-metadata/0x53378825D95281737914a8A2ac0E5A9304aE5Ed7/metadata.json b/token-metadata/0x53378825D95281737914a8A2ac0E5A9304aE5Ed7/metadata.json "symbol": "SAM", "address": "0x53378825D95281737914a8A2ac0E5A9304aE5Ed7", "decimals": 18, - "dharmaVerificationStatus": { "dharmaVerificationStatus": "VERIFIED" } \ No newline at end of file -} \ No newline at end of file
3
diff --git a/docs/app/DocsNav.js b/docs/app/DocsNav.js @@ -265,6 +265,14 @@ export const docsNavTree = [ text: "Cell Editing", url: "~/examples/grid/cell-editing" }, + { + text: "Row Editing", + url: "~/examples/grid/row-editing" + }, + { + text: "Row Expanding", + url: "~/examples/grid/row-expanding" + }, { text: "Buffering", url: "~/examples/grid/buffering"
0
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json { "name": "cartodb-ui", - "version": "4.6.9", + "version": "4.6.12", "dependencies": { "backbone": { "version": "1.2.3", "backbone-forms": { "version": "0.14.0", "from": "[email protected]", - "resolved": "https://registry.npmjs.org/backbone-forms/-/backbone-forms-0.14.0.tgz" + "resolved": "http://registry.npmjs.org/backbone-forms/-/backbone-forms-0.14.0.tgz" }, "backbone-model-file-upload": { "version": "1.0.0", "camshaft-reference": { "version": "0.29.0", "from": "camshaft-reference@<2.0.0", - "resolved": "https://registry.npmjs.org/camshaft-reference/-/camshaft-reference-0.29.0.tgz" + "resolved": "http://registry.npmjs.org/camshaft-reference/-/camshaft-reference-0.29.0.tgz" }, "carto": { "version": "0.15.1-cdb1", "perfect-scrollbar": { "version": "0.6.16", "from": "git://github.com/CartoDB/perfect-scrollbar.git#master", - "resolved": "git://github.com/CartoDB/perfect-scrollbar.git#735c6c0bf3cff1c4756d0b186d5ca00b0d8cf880" + "resolved": "git://github.com/CartoDB/perfect-scrollbar.git#085cd7abdd8426d6fa1e8527dcf6c2734e2318c6" }, "torque.js": { "version": "2.16.3", "perfect-scrollbar": { "version": "0.6.16", "from": "git://github.com/CartoDB/perfect-scrollbar.git#master", - "resolved": "git://github.com/CartoDB/perfect-scrollbar.git#735c6c0bf3cff1c4756d0b186d5ca00b0d8cf880" + "resolved": "git://github.com/CartoDB/perfect-scrollbar.git#085cd7abdd8426d6fa1e8527dcf6c2734e2318c6" }, "tinycolor2": { "version": "1.4.1", "perfect-scrollbar": { "version": "0.6.16", "from": "git://github.com/CartoDB/perfect-scrollbar.git#master", - "resolved": "git://github.com/CartoDB/perfect-scrollbar.git#735c6c0bf3cff1c4756d0b186d5ca00b0d8cf880" + "resolved": "git://github.com/CartoDB/perfect-scrollbar.git#085cd7abdd8426d6fa1e8527dcf6c2734e2318c6" }, "torque.js": { "version": "2.16.3", "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-1.5.12.tgz", "dependencies": { "good-listener": { - "version": "1.2.1", + "version": "1.2.2", "from": "good-listener@>=1.1.6 <2.0.0", - "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.1.tgz", + "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz", "dependencies": { "delegate": { - "version": "3.1.1", - "from": "delegate@>=3.1.1 <4.0.0", - "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.1.1.tgz" + "version": "3.1.2", + "from": "delegate@>=3.1.2 <4.0.0", + "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.1.2.tgz" } } }, "perfect-scrollbar": { "version": "0.6.16", "from": "git://github.com/CartoDB/perfect-scrollbar.git#master", - "resolved": "git://github.com/CartoDB/perfect-scrollbar.git#735c6c0bf3cff1c4756d0b186d5ca00b0d8cf880" + "resolved": "git://github.com/CartoDB/perfect-scrollbar.git#085cd7abdd8426d6fa1e8527dcf6c2734e2318c6" }, "queue-async": { "version": "1.2.1", "from": "[email protected]", - "resolved": "https://registry.npmjs.org/queue-async/-/queue-async-1.2.1.tgz" + "resolved": "http://registry.npmjs.org/queue-async/-/queue-async-1.2.1.tgz" }, "tangram": { "version": "0.11.7",
3
diff --git a/test/docs/functional.md b/test/docs/functional.md @@ -8,13 +8,13 @@ COMING SOON To run the tests with a default browser use `npm run functional`. By default, it runs all tests. -### Enviornment Variables +### Environment Variables We've implemented support for environment variables in automation and a `.env` file for local environments. To specify your variables, for example use `URL = 'http://www.example.com/'` in your `.env`. Use example .env: ``` -cp /test/.env.example .env +cp test/.env.example .env ``` ### Specifying Browsers
1
diff --git a/src/video/texture.js b/src/video/texture.js @@ -161,7 +161,7 @@ export class Texture { // Add self to TextureCache if cache !== false if (cache !== false) { - this.sources.forEach(function (source) { + this.sources.forEach((source) => { if (cache instanceof TextureCache) { cache.set(source, this); } else {
1
diff --git a/components/input/__examples__/counter-input.jsx b/components/input/__examples__/counter-input.jsx @@ -15,6 +15,7 @@ class Example extends React.Component { render() { return ( <IconSettings iconPath="/assets/icons"> + <div> <div> <h1 className="slds-text-title_caps slds-p-vertical_medium"> 1. Simple counter input @@ -88,6 +89,7 @@ class Example extends React.Component { value="10" /> </div> + </div> </IconSettings> ); }
1
diff --git a/packages/idyll-document/src/index.js b/packages/idyll-document/src/index.js @@ -31,11 +31,24 @@ const transformRefs = (refs) => { return output; }; +const triggers = [] + class Wrapper extends React.PureComponent { + constructor() { + super() + triggers.push((v) => { + this.setState({value: v.x}) + }) + } + render() { return ( <span style={{backgroundColor: 'deepskyblue'}}> - {this.props.children} + { + React.Children.map(this.props.children, c => { + return React.cloneElement(c, {...this.state}) + }) + } </span> ) } @@ -93,7 +106,8 @@ class IdyllDocument extends React.PureComponent { }) node.updateProps = (newProps) => { - console.log(newProps); + // TODO: calculate the correct objects to send + triggers.forEach(f => f({x: newProps.value})) } return { @@ -105,12 +119,14 @@ class IdyllDocument extends React.PureComponent { }, ); - this.getChildren = () => { - return rjs.parseSchema({ + const kids = rjs.parseSchema({ component: 'div', className: 'idyll-root', children: transformedSchema }); + + this.getChildren = () => { + return kids; } }
3
diff --git a/app/router.cjsx b/app/router.cjsx @@ -65,7 +65,7 @@ ONE_UP_REDIRECT = createReactClass givenPathSegments = @props.location.pathname.split '/' givenPathSegments.pop() pathOneLevelUp = givenPathSegments.join '/' - @props.history.replace + @props.router.replace pathname: pathOneLevelUp, query: @props.location.query
4
diff --git a/test/test.js b/test/test.js @@ -29,6 +29,15 @@ module.exports = function (redom) { var hello = el('p.hello', 'Hello world!'); t.equals(hello.outerHTML, '<p class="hello">Hello world!</p>'); }); + t.test('append number', function (t) { + t.plan(3); + var one = el('div', 1); + var minus = el('div', -1); + var zero = el('div', 0); + t.equals(one.outerHTML, '<div>1</div>'); + t.equals(minus.outerHTML, '<div>-1</div>'); + t.equals(zero.outerHTML, '<div>0</div>'); + }); t.test('multiple class', function (t) { t.plan(1); var hello = el('p.hello.world', 'Hello world!');
0
diff --git a/components/frise.js b/components/frise.js @@ -655,30 +655,31 @@ function Frise() { height: 542px; margin-bottom: -5em; overflow: hidden; + position: relative; } svg { - height: 542px; + height: 100%; margin-left: -1px; + position: absolute; + bottom: 0; + left: -15%; } - @media screen and (min-width: 2088px) { + @media screen and (min-width: 1815px) { .frise { - height: 740px; + height: 795px; } - svg { - height: 765px; - } } - @media screen and (min-width: 2949px) { + @media screen and (min-width: 2665px) { .frise { - height: 1015px; + height: 1055px; } svg { - height: 1055px; + left: 0; } } `}</style> @@ -687,3 +688,4 @@ function Frise() { } export default Frise +
7
diff --git a/package.json b/package.json "fs-extra": "^7.0.1", "gray-matter": "^4.0.1", "hamljs": "^0.6.2", - "handlebars": "^4.0.13", + "handlebars": "^4.1.0", "javascript-stringify": "^1.6.0", "liquidjs": "^6.2.0", "lodash": "^4.17.11",
3
diff --git a/.github/workflows/reusable-app-prod.yml b/.github/workflows/reusable-app-prod.yml @@ -8,6 +8,7 @@ on: type: string checkout-ref: type: string + default: ${{ github.head_ref }} skip-launching-test: type: boolean @@ -22,7 +23,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: ${{ input.checkout-ref || github.head_ref }} + ref: ${{ input.checkout-ref }} - uses: actions/setup-node@v2 with: @@ -103,7 +104,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: ${{ input.checkout-ref || github.head_ref }} + ref: ${{ input.checkout-ref }} - uses: actions/setup-node@v2 with: @@ -195,7 +196,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: ${{ input.checkout-ref || github.head_ref }} + ref: ${{ input.checkout-ref }} - uses: actions/setup-node@v2 with: @@ -284,7 +285,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: ${{ input.checkout-ref || github.head_ref }} + ref: ${{ input.checkout-ref }} fetch-depth: 0 - uses: actions/setup-node@v2
12
diff --git a/lib/plugins/aws/deploy/compile/functions/index.test.js b/lib/plugins/aws/deploy/compile/functions/index.test.js @@ -909,7 +909,7 @@ describe('AwsCompileFunctions', () => { ); }); - it('should not create function output objects when `versionFunctions` is false', () => { + it('should not create function output objects when "versionFunctions" is false', () => { awsCompileFunctions.serverless.service.provider.versionFunctions = false; awsCompileFunctions.serverless.service.functions = { func: { @@ -920,16 +920,7 @@ describe('AwsCompileFunctions', () => { }, }; - const expectedOutputs = { - FuncLambdaFunctionArn: { - Description: 'Lambda function info', - Value: { 'Fn::GetAtt': ['FuncLambdaFunction', 'Arn'] }, - }, - AnotherFuncLambdaFunctionArn: { - Description: 'Lambda function info', - Value: { 'Fn::GetAtt': ['AnotherFuncLambdaFunction', 'Arn'] }, - }, - }; + const expectedOutputs = {}; awsCompileFunctions.compileFunctions();
1
diff --git a/src/components/Story/StoryFooter.js b/src/components/Story/StoryFooter.js @@ -20,23 +20,23 @@ const StoryFooter = ({ post, postState, onLikeClick, onCommentClick, onShareClic return ( <div className="StoryFooter"> <span className={classNames('StoryFooter__payout', { 'StoryFooter__payout--rejected': maxPayout === 0 })}> - <Tooltip title={<PayoutDetail post={post} />} placement="bottom"> + <Tooltip title={<PayoutDetail post={post} />} placement="top"> {payoutValue} </Tooltip> </span> - <Tooltip title="Like" placement="bottom"> + <Tooltip title="Like" placement="top"> <a className={likeClass} onClick={() => onLikeClick()}> <i className="iconfont icon-praise_fill" /> <span className="StoryFooter__number">{likesValue}</span> </a> </Tooltip> - <Tooltip title="Comment" placement="bottom"> + <Tooltip title="Comment" placement="top"> <a className="StoryFooter__link" onClick={() => onCommentClick()}> <i className="iconfont icon-message_fill" /> <span className="StoryFooter__number">{commentsValue}</span> </a> </Tooltip> - <Tooltip title="Reblog" placement="bottom"> + <Tooltip title="Reblog" placement="top"> <a className={rebloggedClass} onClick={() => onShareClick()}> <i className="iconfont icon-send StoryFooter__share" /> </a>
5
diff --git a/src/lib/reaction.js b/src/lib/reaction.js @@ -47,7 +47,7 @@ StreamReaction.prototype = { ); }, - _convertTargetFeeds: function(targetFeeds) { + _convertTargetFeeds: function(targetFeeds = []) { return targetFeeds.map(elem => (typeof elem === 'string' ? elem : elem.id)); },
9
diff --git a/docs/site.css b/docs/site.css body { - padding-top: 50px; /* required for fixed header */ + /* required for fixed header */ + padding-top: 50px; } #header { - background: #f9f9f9; + background: #F9F9F9; margin-bottom: 10px; border-bottom: 1px solid lightgray; } @@ -36,7 +37,7 @@ h1{ margin-bottom: 20px; } pre{ - background: #f9f9f9; + background: #F9F9F9; } /* #main { @@ -50,7 +51,6 @@ pre{ margin-top: 10px; } -/* maybe just used on annotations.html ? */ .thinborder { border-width: 1px; border-spacing: 0px; @@ -69,7 +69,7 @@ pre{ #current-release { font-size: 18px; - background: #f9f9f9; + background: #F9F9F9; /* padding: 10px 15px; border: 1px dashed black; @@ -81,7 +81,8 @@ pre{ margin-bottom: 0; } -/* When you visit dygraphs.com/options.html#errorBars, the fixed top nav +/* + * When you visit dygraphs.com/options.html#errorBars, the fixed top nav * obscures the top 50px of content for that anchor. This is a workaround. * See https://stackoverflow.com/a/55683966/2171120 */ @@ -92,7 +93,7 @@ pre{ a.link { visibility: hidden; text-decoration: none; - color: #777; + color: #777777; } .option:hover a.link { visibility: visible;
1
diff --git a/android/build.gradle b/android/build.gradle @@ -31,7 +31,7 @@ repositories { dependencies { compile 'com.facebook.react:react-native:0.19.+' - compile('com.mapbox.mapboxsdk:mapbox-android-sdk:4.1.1@aar') { + compile('com.mapbox.mapboxsdk:mapbox-android-sdk:4.2.1@aar') { transitive = true } }
3
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml @@ -21,7 +21,7 @@ jobs: - name: Cache Node modules uses: actions/cache@v2 with: - key: ${{ runner.OS }}-npm-cache-${{ hashFiles('yarn.lock') }} + key: ${{ runner.OS }}-yarn-cache-${{ hashFiles('yarn.lock') }} path: | ~/.cache node_modules
10
diff --git a/common/components/controllers/CorporateHackathonController.jsx b/common/components/controllers/CorporateHackathonController.jsx @@ -166,7 +166,7 @@ class CorporateHackathonController extends React.PureComponent<{||}, State> { <div className="corporate-hackathon-saying"> <h3>What People Are Saying</h3> <div className="carousel-testimonial-root"> - <TestimonialCarousel items={Testimonials} interval={false} /> + <TestimonialCarousel items={Testimonials} interval={600000} /> </div> </div> <div className="corporate-hackathon-stories"> @@ -257,7 +257,7 @@ class CorporateHackathonController extends React.PureComponent<{||}, State> { <div className="corporate-sponsorship-saying"> <h3>What People Are Saying</h3> <div className="carousel-testimonial-root"> - <TestimonialCarousel items={Testimonials} interval={false} /> + <TestimonialCarousel items={Testimonials} interval={600000} /> </div> </div> <div className="corporate-sponsorship-impact">
12
diff --git a/README.md b/README.md @@ -23,7 +23,6 @@ Run the following commands from the root of this repository: NB: Ensure you have docker installed on your machine - `docker-compose build .` - - `docker-compose up` # run migrations - `docker-compose run web python /code/manage.py migrate --noinput` # create superuser
2
diff --git a/src/kernel/kernel.js b/src/kernel/kernel.js @@ -86,7 +86,7 @@ export default function buildKernel(kernelEndowments) { } else if (kp.state === 'fulfilledToData') { const s = `data is not callable, has no method ${msg.method}`; // eslint-disable-next-line no-use-before-define - reject(target.id, makeError(s), []); + reject(msg.kernelPromiseID, makeError(s), []); } else if (kp.state === 'fulfilledToTarget') { send(kp.fulfillSlot, msg); } else if (kp.state === 'rejected') {
13
diff --git a/token-metadata/0x04abEdA201850aC0124161F037Efd70c74ddC74C/metadata.json b/token-metadata/0x04abEdA201850aC0124161F037Efd70c74ddC74C/metadata.json "symbol": "NEST", "address": "0x04abEdA201850aC0124161F037Efd70c74ddC74C", "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 @@ -249,6 +249,7 @@ This Release offers Dashboard redesign (Dark mode), and support for Google Docs - @uppy/companion: add support to download gsuite (google docs, google spreadsheet) files (#2145 / @ifedapoolarewaju) - @uppy/locales: Croatian translations added (#2150 / @dkisic) - @uppy/core: Only _startIfAutoProceed if some files were actually added (#2146 / @arturi) +- @uppy/thumbnail-generator: replace exif-js with exifr in thumbnail-generator (#2140 / @MikeKovarik) ## 1.10.1
0
diff --git a/assets/js/googlesitekit/data/create-settings-store.js b/assets/js/googlesitekit/data/create-settings-store.js @@ -155,10 +155,11 @@ export const createSettingsStore = ( type, identifier, datapoint, { */ *saveSettings() { const registry = yield getRegistry(); - const values = yield registry.select( STORE_NAME ).getSettings(); + const values = registry.select( STORE_NAME ).getSettings(); try { const savedValues = yield actions.fetchSaveSettings( values ); + return actions.receiveSaveSettings( savedValues ); } catch ( err ) { // TODO: Implement an error handler store or some kind of centralized
2
diff --git a/indicators/admin.py b/indicators/admin.py @@ -88,6 +88,13 @@ class ReportingFrequencyAdmin(admin.ModelAdmin): display = 'Reporting Frequency' [email protected](StrategicObjective) +class StrategicObjectiveAdmin(admin.ModelAdmin): + list_display = ('name', 'organization', 'create_date', 'parent') + list_filter = ('parent', 'name', 'organization') + display = 'Objectives' + + admin.site.register(IndicatorType) admin.site.register(Indicator, IndicatorAdmin) admin.site.register(ReportingFrequency) @@ -95,7 +102,6 @@ admin.site.register(DisaggregationType, DisaggregationTypeAdmin) admin.site.register(DisaggregationLabel, DisaggregationLabelAdmin) admin.site.register(CollectedData, CollectedDataAdmin) admin.site.register(Objective, ObjectiveAdmin) -admin.site.register(StrategicObjective, StrategicObjectiveAdmin) admin.site.register(Level) admin.site.register(ExternalService, ExternalServiceAdmin) admin.site.register(ExternalServiceRecord, ExternalServiceRecordAdmin)
3
diff --git a/test/unit/specs/components/Identity/customerIds/createCustomerIds.spec.js b/test/unit/specs/components/Identity/customerIds/createCustomerIds.spec.js @@ -29,6 +29,7 @@ describe("Identity::createCustomerIds", () => { mergeMeta: jasmine.createSpy(), expectsResponse: false }; + event = { type: "event" }; eventManager = { createEvent: () => event, sendEvent: jasmine.createSpy().and.returnValue(Promise.resolve())
12
diff --git a/src/models/send-to-api.js b/src/models/send-to-api.js @@ -20,7 +20,7 @@ async function sendToApi (requestParams) { return Promise.resolve(requestParams) .then(prefixUrl(conf.API_HOST)) .then(addOauthHeader(tokens)) - .then(request); + .then((requestParams) => request(requestParams, { retry: 1 })); } async function getHostAndTokens () {
4
diff --git a/tools/metadata/index.ts b/tools/metadata/index.ts @@ -4,18 +4,34 @@ import { TokenInfo } from '@uniswap/token-lists' import { defaults, known } from './src/constants' import { getTokenName, getTokenSymbol, getTokenDecimals } from './src/helpers' -export async function fetchTokens(chainId: number): Promise<Array<TokenInfo>> { - const tokens = await Promise.all( +export async function fetchTokens( + chainId: number +): Promise<{ tokens: TokenInfo[]; errors: string[] }> { + const errors = [] + let tokens = [] + const promises = await Promise.allSettled( known.map(async url => { - const { data } = await axios.get(url) - return data.tokens + try { + const res = await axios.get(url) + return res.data.tokens + } catch (e) { + throw new Error(e.message) + } }) ) - tokens.push(defaults) - return [].concat(...tokens).filter(token => { + tokens.push(...defaults) + promises.forEach(promise => { + if (promise.status === 'rejected') { + errors.push(promise.reason.message) + } else { + tokens.push(...promise.value) + } + }) + tokens = tokens.filter(token => { token.address = token.address.toLowerCase() return token.chainId === chainId }) + return { tokens, errors } } export async function scrapeToken(
3
diff --git a/src/constants/axis_placeable_objects.js b/src/constants/axis_placeable_objects.js module.exports = { axisRefDescription: function(axisname, lower, upper) { return [ - 'If set to a ', axisname, ' axis id (e.g. *', axisname, '* or', - '*', axisname, '2*), the `', axisname, '` position refers to a', - '', axisname, ' coordinate. If set to *paper*, the `', axisname, '`', + 'If set to a', axisname, 'axis id (e.g. *' + axisname + '* or', + '*' + axisname + '2*), the `' + axisname + '` position refers to a', + axisname, 'coordinate. If set to *paper*, the `' + axisname + '`', 'position refers to the distance from the', lower, 'of the plotting', 'area in normalized coordinates where *0* (*1*) corresponds to the', - '', lower, ' (', upper, '). If set to a ', axisname, ' axis ID followed by', + lower, '(' + upper + '). If set to a', axisname, 'axis ID followed by', '*domain* (separated by a space), the position behaves like for', '*paper*, but refers to the distance in fractions of the domain', 'length from the', lower, 'of the domain of that axis: e.g.,', - '*', axisname, '2 domain* refers to the domain of the second', - '', axisname, ' axis and a ', axisname, ' position of 0.5 refers to the', + '*' + axisname + '2 domain* refers to the domain of the second', + axisname, ' axis and a', axisname, 'position of 0.5 refers to the', 'point between the', lower, 'and the', upper, 'of the domain of the', 'second', axisname, 'axis.', ].join(' ');
1
diff --git a/vis/js/list.js b/vis/js/list.js @@ -124,6 +124,7 @@ list.drawList = function() { } } } else { + $('#curr-sort-type').text(config.localization[config.language][config.sort_options[0]]) for(var i=0; i<numberOfOptions; i++) { addSortOptionDropdownEntry(config.sort_options[i]) } @@ -163,7 +164,7 @@ list.fit_list_height = function() { let addSortOptionDropdownEntry = function(sort_option) { let entry = sortDropdownEntryTemplate({ sort_by_string: config.localization[config.language].sort_by_label, - sorter_label: config.localization[config.language][sort_option] + sorter_label: config.localization[config.language][sort_option], }) var newEntry = $(entry).appendTo('#sort-menu-entries') newEntry.on("click", () => {
12
diff --git a/_data/conferences.yml b/_data/conferences.yml sub: CV note: '<b>NOTE</b>: Mandatory abstract deadline on Jan 27, 2021. More info <a href=''https://s2021.siggraph.org/program/technical-papers/''>here</a>.' -- title: ICML - hindex: 135 - year: 2021 - id: icml21 - link: https://icml.cc/Conferences/2021 - deadline: '2021-02-04 23:59:00' - abstract_deadline: '2021-01-28 23:59:00' - timezone: UTC-12 - date: July 18-24, 2021 - place: Vienna, Austria - sub: ML - note: '<b>NOTE</b>: Mandatory abstract deadline on Jan 28, 2021. More info <a href=''https://icml.cc/Conferences/2021/''>here</a>.' - - title: KDD hindex: 30 year: 2021
2
diff --git a/assets/js/components/higherorder/withData.js b/assets/js/components/higherorder/withData.js @@ -38,7 +38,6 @@ import getNoDataComponent from '../legacy-notifications/nodata'; import getDataErrorComponent from '../legacy-notifications/data-error'; import getSetupIncompleteComponent, { getModuleInactiveComponent } from '../legacy-notifications/setup-incomplete'; import { TYPE_MODULES } from '../data/constants'; -import ctaWrapper from '../legacy-notifications/cta-wrapper'; import { CORE_USER } from '../../googlesitekit/datastore/user/constants'; import { requestWithDateRange } from '../data/utils/request-with-date-range'; const { withSelect } = Data; @@ -331,12 +330,8 @@ const withData = ( moduleRequiringSetup, moduleRequiringActivation, } = this.state; - const { ActivateModuleComponent } = this.props; if ( moduleRequiringActivation ) { - if ( ActivateModuleComponent ) { - return ctaWrapper( <ActivateModuleComponent />, layoutOptions.inGrid, layoutOptions.fullWidth, layoutOptions.createGrid ); - } return getModuleInactiveComponent( moduleRequiringSetup, layoutOptions.inGrid, layoutOptions.fullWidth, layoutOptions.createGrid ); }
2
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -4,9 +4,10 @@ This release fixes the following bugs: - [Restored SMTP settings at Admin Panel, and disabled showing password](https://github.com/wekan/wekan/issues/1790); - [Move color labels on minicard to bottom of minicard](https://github.com/wekan/wekan/issues/1842); -- [Fix and improve linked cards](https://github.com/wekan/wekan/pull/1849). +- [Fix and improve linked cards](https://github.com/wekan/wekan/pull/1849); +- [Allow Sandstorm to serve Wekan HTTP API](https://github.com/wekan/wekan/pull/1851). -Thanks to GitHub users andresmanelli, therampagerado and xet7 for their contributions. +Thanks to GitHub users andresmanelli, ocdtrekkie, therampagerado and xet7 for their contributions. # v1.33 2018-08-16 Wekan release
11
diff --git a/src/markdown/Authors.yaml b/src/markdown/Authors.yaml slug: kim-david headshot: '/images/headshots/kim-david.jpg' avatar: '/images/headshots/kim-david-h.jpg' - active: true + active: false icon: fa_pastafarianism startDate: 2018-09-17 office: Diamond Bar
12
diff --git a/src/app/lib/Feeder.js b/src/app/lib/Feeder.js @@ -33,6 +33,11 @@ class Feeder extends events.EventEmitter { }; } feed(data = [], context = {}) { + // Clear pending state when the feeder queue is empty + if (this.state.queue.length === 0) { + this.state.pending = false; + } + data = [].concat(data); if (data.length > 0) { this.state.queue = this.state.queue.concat(data.map(command => { @@ -75,17 +80,12 @@ class Feeder extends events.EventEmitter { return this.state.queue.length; } next() { - if (this.state.queue.length === 0) { - this.state.pending = false; - return false; - } - while (!this.state.hold && this.state.queue.length > 0) { let { command, context } = this.state.queue.shift(); if (this.dataFilter) { command = this.dataFilter(command, context) || ''; - if (!command) { + if (!command) { // Ignore blank lines continue; } } @@ -96,6 +96,11 @@ class Feeder extends events.EventEmitter { break; } + // Clear pending state when the feeder queue is empty + if (this.state.queue.length === 0) { + this.state.pending = false; + } + return this.state.pending; } isPending() {
1
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md @@ -19,10 +19,11 @@ A clear and concise description of what you expected to happen. **Screenshots** If applicable, add screenshots to help explain your problem. -**Desktop (please complete the following information):** - - OS: [e.g. iOS] - - Browser [e.g. chrome, safari] - - Version [e.g. 22] +**Technical details (please complete the following information):** + - OS: [e.g. Windows 10] + - Browser: [e.g. chrome, firefox, electron app] + - Foundry Version: [e.g 10.288] + - SFRPG Version: [e.g 0.20.3] **Additional context** Add any other context about the problem here.
0
diff --git a/models/batch.js b/models/batch.js @@ -30,7 +30,7 @@ Batch.prototype.releaseOld = function(callback) { var conditions = { checkedOutAt: { $lt: timeAgo(BATCH_TIMEOUT) } }; var update = { checkedOutBy: null, checkedOutAt: null }; - Report.update(conditions, update, { multi: true }, callback); + Report.updateMany(conditions, update, callback); }; // cancel batch for given user @@ -38,7 +38,7 @@ Batch.prototype.cancel = function(userId, callback) { var conditions = { checkedOutBy: userId }; var update = { checkedOutBy: null, checkedOutAt: null }; - Report.update(conditions, update, { multi: true }, callback); + Report.updateMany(conditions, update, callback); }, // lock a new batch for given user
14
diff --git a/src/lib/core.js b/src/lib/core.js @@ -1112,6 +1112,7 @@ export default function (context, pluginCallButtons, plugins, lang) { * @private */ _stripRemoveNode: function (element, removeNode) { + if (!removeNode || removeNode.nodeType === 3) return; const children = removeNode.childNodes; while (children[0]) { @@ -1677,7 +1678,7 @@ export default function (context, pluginCallButtons, plugins, lang) { util.removeEmptyNode(pNode); if (util.onlyZeroWidthSpace(pNode.textContent)) { container = pNode.firstChild; - offset = 0; + offset = container.textContent.length; } element.parentNode.insertBefore(pNode, element); util.removeItem(element); @@ -1697,6 +1698,10 @@ export default function (context, pluginCallButtons, plugins, lang) { */ commandHandler: function (target, command) { switch (command) { + case 'selectAll': + const wysiwyg = context.element.wysiwyg; + this.setRange(wysiwyg.firstChild, 0, wysiwyg.lastChild, wysiwyg.lastChild.textContent.length); + break; case 'codeView': this.toggleCodeView(); util.toggleClass(target, 'on'); @@ -1965,6 +1970,7 @@ export default function (context, pluginCallButtons, plugins, lang) { _historyIgnoreRegExp: new _w.RegExp('^(9|1[6-8]|20|3[3-9]|40|45|9[1-3]|11[2-9]|12[0-3]|144|145)$'), _onButtonsCheck: new _w.RegExp('^(STRONG|INS|EM|DEL|SUB|SUP)$'), _keyCodeShortcut: { + 65: 'A', 66: 'B', 83: 'S', 85: 'U', @@ -1980,6 +1986,9 @@ export default function (context, pluginCallButtons, plugins, lang) { const keyStr = event._keyCodeShortcut[keyCode]; switch (keyStr) { + case 'A': + command = 'selectAll'; + break; case 'B': command = 'STRONG'; break;
1
diff --git a/token-metadata/0x0F4CA92660Efad97a9a70CB0fe969c755439772C/metadata.json b/token-metadata/0x0F4CA92660Efad97a9a70CB0fe969c755439772C/metadata.json "symbol": "LEV", "address": "0x0F4CA92660Efad97a9a70CB0fe969c755439772C", "decimals": 9, - "dharmaVerificationStatus": { "dharmaVerificationStatus": "VERIFIED" } \ No newline at end of file -} \ No newline at end of file
3
diff --git a/sources/us/ut/statewide.json b/sources/us/ut/statewide.json "conform": { "srs": "EPSG:102100", "format": "geojson", - "number": { - "function": "join", - "fields": [ + "number": [ "AddNum", "AddNumSuffix" - ] - }, - "street": { - "function": "join", - "fields":[ + ], + "street": [ "PrefixDir", "StreetName", "StreetType", "SuffixDir" - ] - }, - "unit": { - "function": "join", - "fields": [ + ], + "unit": [ "UnitType", "UnitID" - ] - }, + ], "city": "City", "district": "CountyID", "region": "State",
4
diff --git a/test/crawlers/cheerio_crawler.test.js b/test/crawlers/cheerio_crawler.test.js @@ -60,7 +60,7 @@ app.post('/jsonError', (req, res) => { app.get('/mirror', (req, res) => { - res.send('DATA'); + res.send('<html><head><title>Title</title></head><body>DATA</body></html>'); }); app.get('/json-type', (req, res) => { @@ -106,18 +106,9 @@ describe('CheerioCrawler', () => { }); test('should work', async () => { - const sources = [ - { url: 'http://example.com/?q=1' }, - { url: 'http://example.com/?q=2' }, - { url: 'http://example.com/?q=3' }, - { url: 'http://example.com/?q=4' }, - { url: 'http://example.com/?q=5' }, - { url: 'http://example.com/?q=6' }, - ]; - const sourcesCopy = JSON.parse(JSON.stringify(sources)); + const requestList = await getRequestListForMirror(port); const processed = []; const failed = []; - const requestList = new Apify.RequestList({ sources }); const handlePageFunction = async ({ $, html, request }) => { request.userData.title = $('title').text(); request.userData.html = html; @@ -132,17 +123,14 @@ describe('CheerioCrawler', () => { handleFailedRequestFunction: ({ request }) => failed.push(request), }); - await requestList.initialize(); await cheerioCrawler.run(); expect(cheerioCrawler.autoscaledPool.minConcurrency).toBe(2); - expect(processed).toHaveLength(6); + expect(processed).toHaveLength(3); expect(failed).toHaveLength(0); - processed.sort(comparator); - processed.forEach((request, id) => { - expect(request.url).toEqual(sourcesCopy[id].url); - expect(request.userData.title).toBe('Example Domain'); + processed.forEach((request) => { + expect(request.userData.title).toBe('Title'); expect(typeof request.userData.html).toBe('string'); expect(request.userData.html.length).not.toBe(0); }); @@ -880,9 +868,3 @@ async function startExpressAppPromise(expressApp, port) { const server = expressApp.listen(port, () => resolve(server)); }); } - -function comparator(a, b) { - a = Number(/q=(\d+)$/.exec(a.url)[1]); - b = Number(/q=(\d+)$/.exec(b.url)[1]); - return a - b; -}
1
diff --git a/package.json b/package.json "cross-spawn": "^5.0.1", "dredd-transactions": "^4.0.0", "file": "^0.2.2", - "gavel": "^1.1.0", + "gavel": "^1.1.1", "glob": "^7.0.5", "html": "^1.0.0", "htmlencode": "0.0.4",
1
diff --git a/CHANGELOG.md b/CHANGELOG.md #### Improvements and Bug Fixes -- [#599](https://github.com/marklogic/node-client-api/issues/599) - Expose the 3rd parameter of op.fromSPARQL. -- [#638](https://github.com/marklogic/node-client-api/issues/638) - (Documentation Fix) - Parameters "start" and "length" have no effect for db.graphs.sparql call. +- [#599](https://github.com/marklogic/node-client-api/issues/599) - Optic fromSPARQL method support options parameter - Server release 10.0-8 or above required. +- [#638](https://github.com/marklogic/node-client-api/issues/638) - (Documentation Fix) - Parameters "start" and "length" for graphs.sparql are renamed to "begin" and "end". - [#647](https://github.com/marklogic/node-client-api/issues/647) - QueryToReadAll on a Query with no results produces no response.
0
diff --git a/src/service-broker.js b/src/service-broker.js @@ -999,7 +999,7 @@ class ServiceBroker { // Remove the context from the active contexts list if (ctx.trackedBy) { - p.then(res => { + p = p.then(res => { ctx.dispose(); return res; }); @@ -1036,7 +1036,7 @@ class ServiceBroker { // Remove the context from the active contexts list if (ctx.trackedBy) { - p.then(res => { + p = p.then(res => { ctx.dispose(); return res; });
1
diff --git a/packages/react-scripts/scripts/utils/createJestConfig.js b/packages/react-scripts/scripts/utils/createJestConfig.js @@ -65,6 +65,7 @@ module.exports = (resolve, rootDir, isEjecting) => { 'jest-watch-typeahead/filename', 'jest-watch-typeahead/testname', ], + resetMocks: true, }; if (rootDir) { config.rootDir = rootDir;
12
diff --git a/StackExchangeDarkMode.user.js b/StackExchangeDarkMode.user.js // @description Dark theme for sites and chat on the Stack Exchange Network // @homepage https://github.com/samliew/SO-mod-userscripts // @author @samliew -// @version 2.0.3 +// @version 2.0.4 // // @include https://*stackexchange.com/* // @include https://*stackoverflow.com/* @@ -370,6 +370,11 @@ body > div[style*="absolute"], color: white; background-color: #0077dd; } +#post-filters, +.post-tag *, +.s-badge__bounty * { + background: none; +} .supernovabg { color: white; background-color: #F48024; @@ -420,7 +425,7 @@ body .bg-yellow-100 { background-color: ${bgcolor}; } body .bg-green-400, -.accepted, +.accepted:not(.icon-q), .answered-accepted, .special-rep { background-color: ${darkgreen};
2
diff --git a/src/components/dashboard/Send.js b/src/components/dashboard/Send.js @@ -83,7 +83,7 @@ const Send = props => { <Section style={styles.bottomSection}> <View style={styles.topContainer}> <Section.Title>TO WHO?</Section.Title> - <TextInput onChangeText={text => setScreenState({ to: text })} onBlur={checkError} value={to} /> + <TextInput onChangeText={text => setScreenState({ to: text })} onBlur={checkError} value={to} error={error} /> <HelperText type="error" visible={error}> {error} </HelperText>
0
diff --git a/app/models/api_key_helper.rb b/app/models/api_key_helper.rb @@ -3,8 +3,7 @@ module ApiKeyHelper Carto::ApiKey.create( user_id: id, type: Carto::ApiKey::TYPE_MASTER, - name: Carto::ApiKey::MASTER_NAME, - grants: [] + name: Carto::ApiKey::MASTER_NAME ) end end
2
diff --git a/_events/BBKOpenScience/BBKOpenScience.md b/_events/BBKOpenScience/BBKOpenScience.md @@ -28,7 +28,6 @@ promotions: - text: 'January 18-20, 2019: Biohacking & Open Labs Fest for citizens to enjoy science-making in a practical, participatory, social, fun, and transdiciplinary way' button: Register for the event! URL: https://bbkopenscience.com/ - image: https://pbs.twimg.com/profile_banners/1072448261204729858/1545639974/1500x500 --- We want to awaken that scientist we all have inside.
2
diff --git a/lib/node_modules/@stdlib/_tools/scripts/templates/workflow_publish.yml.txt b/lib/node_modules/@stdlib/_tools/scripts/templates/workflow_publish.yml.txt @@ -38,11 +38,17 @@ jobs: git config --local user.email "[email protected]" git config --local user.name "stdlib-bot" npm version patch + - name: Replace all GitHub links to individual packages with npm links + run: | + find . -type f -name '*.md' -print0 | xargs -0 sed -Ei 's/@stdlib\/([^:]*)\]: https:\/\/github.com\/stdlib-js/@stdlib\/\1\]: https:\/\/www.npmjs.com\/package\/@stdlib/g' - name: Publish package to npm uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} access: public + - name: Discard any uncommitted changes + run: | + git reset --hard - name: Push changes run: | git push origin main
14
diff --git a/README.md b/README.md @@ -254,10 +254,10 @@ editor.run(postEditor => { }) ``` -For more details on the API of `postEditor`, see the [API documentation](https://github.com/bustle/mobiledoc-kit/blob/master/src/js/editor/post.js). +For more details on the API of `postEditor`, see the [API documentation](https://github.com/bustle/mobiledoc-kit/blob/master/src/js/editor/post.ts). For more details on the API for the builder, required to create new sections -atoms, and markers, see the [builder API](https://github.com/bustle/mobiledoc-kit/blob/master/src/js/models/post-node-builder.js). +atoms, and markers, see the [builder API](https://github.com/bustle/mobiledoc-kit/blob/master/src/js/models/post-node-builder.ts). ### Configuring hot keys
1
diff --git a/bin/oref0-upload-profile.js b/bin/oref0-upload-profile.js @@ -26,12 +26,16 @@ var _ = require('lodash'); if (!module.parent) { var argv = require('yargs') - .usage("$0 profile.json NSURL api-secret [--preview]") + .usage("$0 profile.json NSURL api-secret [--preview] [--switch]") .option('preview', { alias: 'p' , describe: "Give a preview of the outcome without uploading" , default: false }) + .option('switch', { + default: false + , describe: "Issue Profile Switch event to enable this profile" + }) .strict(true) .help('help'); @@ -263,16 +267,16 @@ if (!module.parent) { console.log('Profile changed, uploading to Nightscout'); - nsurl += '/api/v1/profile'; + var nsurl_upload = nsurl + '/api/v1/profile'; if (apisecret.indexOf('token=') === 0) { - nsurl = nsurl + '?' + apisecret; + nsurl_upload = nsurl_upload + '?' + apisecret; } else { nsheaders['API-SECRET'] = apisecret; } options = { - uri: nsurl + uri: nsurl_upload , json: true , method: 'POST' , headers: nsheaders @@ -287,6 +291,46 @@ if (!module.parent) { console.log('Profile uploaded to Nightscout'); } }); + if (params.switch) { + var nsheaders = { + 'Content-Type': 'application/json' + }; + + console.log('Switching profile'); + + var nsurl_switch = nsurl + '/api/v1/treatments.json'; + + if (apisecret.indexOf('token=') === 0) { + nsurl_switch = nsurl_switch + '?' + apisecret; + } else { + nsheaders['API-SECRET'] = apisecret; + } + + var switch_event = {}; + switch_event['enteredBy'] = 'OpenAPS'; + switch_event['eventType'] = 'Profile Switch'; + switch_event['duration'] = 0; + switch_event['profile'] = 'OpenAPS Autosync'; + switch_event['reason'] = 'Applying uploaded profile'; + switch_event['notes'] = 'Applying uploaded profile'; + + switch_options = { + uri: nsurl_switch + , json: true + , method: 'POST' + , headers: nsheaders + , body: switch_event + }; + + request(switch_options, function(error, res, data) { + if (error || res.statusCode !== 200) { + console.log(error); + console.log(res.body); + } else { + console.log('Profile switch event sent to Nightscout'); + } + }); + } } else { console.log('Profiles match, no upload needed'); }
11
diff --git a/src/v1/index.js b/src/v1/index.js @@ -187,7 +187,7 @@ function driver(url, authToken, config = {}) { throw new Error(`Parameters are not supported with scheme 'bolt'. Given URL: '${url}'`); } return new Driver(parsedUrl.hostAndPort, USER_AGENT, authToken, config); - } else if (parsedUrl.scheme === 'http') { + } else if (parsedUrl.scheme === 'http' || parsedUrl.scheme === 'https') { return new HttpDriver(parsedUrl, USER_AGENT, authToken, config); } else { throw new Error(`Unknown scheme: ${parsedUrl.scheme}`);
11
diff --git a/_CodingChallenges/004-purplerain.md b/_CodingChallenges/004-purplerain.md @@ -91,7 +91,7 @@ contributions: url: "https://github.com/tuffstuff2k7" url: "https://tuffstuff2k7.github.io/Rain/" source: "https://github.com/tuffstuff2k7/Rain" - - title: "My try to re-create the purple rain with some etra features" + - title: "My try to re-create the purple rain with some extra features" author: name: "Krish" url: "https://github.com/KrishAgarwal2811"
1
diff --git a/test/jasmine/tests/hover_spikeline_test.js b/test/jasmine/tests/hover_spikeline_test.js @@ -465,6 +465,69 @@ describe('spikeline hover', function() { .then(done, done.fail); }); + it('could select the closest scatter point inside bar', function(done) { + Plotly.newPlot(gd, { + data: [{ + type: 'scatter', + marker: { color: 'green' }, + x: [ + -1, + 0, + 0.5, + 1 + ], + y: [ + 0.1, + 0.2, + 0.25, + 0.3 + ] + }, + { + type: 'bar', + marker: { color: 'blue' }, + x: [ + -1, + -0.2, + 1 + ], + y: [ + 1, + 2, + 0.5 + ] + }], + layout: { + hovermode: 'x', + xaxis: { showspikes: true }, + yaxis: { showspikes: true }, + showlegend: false, + width: 500, + height: 500, + margin: { + t: 50, + b: 50, + l: 50, + r: 50, + } + } + }) + .then(function() { + var lines; + + _hover({xpx: 200, ypx: 200}); + lines = d3SelectAll('line.spikeline'); + expect(lines.size()).toBe(4); + expect(lines[0][1].getAttribute('stroke')).toBe('blue'); + + _hover({xpx: 200, ypx: 350}); + lines = d3SelectAll('line.spikeline'); + expect(lines.size()).toBe(4); + expect(lines[0][1].getAttribute('stroke')).toBe('green'); + }) + .then(done, done.fail); + }); + it('correctly responds to setting the spikedistance to 0 by disabling ' + 'the search for points to draw the spikelines', function(done) { var _mock = makeMock('toaxis', 'closest');
0
diff --git a/src/sdk/conference/conference.js b/src/sdk/conference/conference.js safeCall(onFailure, 'Invalid URL.'); return; } + const subscriptionId = self.externalUrlToSubscriptionId[url]; + delete self.externalUrlToSubscriptionId[url]; self.signaling.sendMessage('unsubscribe', { - id: self.externalUrlToSubscriptionId[url] + id: subscriptionId }).then(() => { safeCall(onSuccess); self.externalUrlToSubscriptionId.delete(url);
1
diff --git a/.travis.yml b/.travis.yml @@ -53,7 +53,6 @@ deploy: - provider: npm skip_cleanup: true edge: true - file: dist.zip email: [email protected] api_key: secure: AGI4b3s8m+mKdVAVBR+d5EdYdYAeLhFy76o8WzQ7KwGSIAsIfmwjejqs4BRvq2m3kDdUqNF4fUhG1L2yXsqGXdKqDYnICL+IiKJAKrtdrsx4Y8J31OdeYX8J4MrYzFYsHAyg2bO0D2JNKe0K5b1ykks3qZd9p+Q/4jMjekmNB/T4rBOKjg1bxm0deULQabsLyonjY/IoLc+vjuNmT9VLw9SXw5d8yWTeWszHL8QmQ/UFKZVxF1EfaxJU/9/R/QKQgrAXHsElGfS9+dfhMmZTW8+3kNbB8/lHGkoF+9LrqnRWI6/R8OorqHSLmomfJJuK4iS2Z7Ull561vG67lNrgj7EZ3F2Rjrn4I82T2V/fYBCU/xvIsp2a+MUXvScWu3ONtNJCLGXL7qHQuVN6UjTyVH9J010fIz1qeY264Q/HSVv+PnAueN6e3j9RmrYIf4bVL9OxsNPhOZbUOi/xvg/WBkNifhrT/n65wgopyT5tzwK9Tk8Kyp6aJlaDsqFBtc7gZhOn8MIPsAYAvszfXlNHFqfOrvRQqV/UWoaBkBFEVJwlVZzUWmbNz0wIFs3QJjabR5/wR8GRUpRmugTMR1OE6JYwiIGhteW55p9Wm1SbHZw7RT3VIENpovxmGhbT4TxsZ8UcFk6fknIUH8F1S7K2+Uwxu5Wb0DT7SoD/Lfh0u+E=
2
diff --git a/spec/requests/carto/builder/public/embeds_controller_spec.rb b/spec/requests/carto/builder/public/embeds_controller_spec.rb @@ -14,7 +14,6 @@ describe Carto::Builder::Public::EmbedsController do @visualization = FactoryGirl.create(:carto_visualization, user: @carto_user, map_id: @map.id, version: 3) # Only mapcapped visualizations are presented by default Carto::Mapcap.create!(visualization_id: @visualization.id) - @feature_flag = FactoryGirl.create(:feature_flag, name: 'vector_vs_raster', restricted: true) end before(:each) do @@ -117,41 +116,6 @@ describe Carto::Builder::Public::EmbedsController do response.status.should == 302 end - it 'defaults to generate vizjson with vector=true' do - get builder_visualization_public_embed_url(visualization_id: @visualization.id) - - response.status.should == 200 - response.body.should_not include('\"vector\":true') - end - - it 'generates vizjson with vector=true with flag' do - get builder_visualization_public_embed_url(visualization_id: @visualization.id, vector: true) - - response.status.should == 200 - response.body.should include('\"vector\":true') - end - - it 'doesn\'t include vector flag if vector_vs_raster feature flag is enabled and vector param is not present' do - set_feature_flag @visualization.user, 'vector_vs_raster', false - - get builder_visualization_public_embed_url(visualization_id: @visualization.id) - - response.status.should == 200 - response.body.should_not include('\"vector\"') - end - - it 'includes vector flag if vector_vs_raster feature flag is enabled and vector param is present' do - set_feature_flag @visualization.user, 'vector_vs_raster', true - - get builder_visualization_public_embed_url(visualization_id: @visualization.id, vector: true) - response.status.should == 200 - response.body.should include('\"vector\":true') - - get builder_visualization_public_embed_url(visualization_id: @visualization.id, vector: false) - response.status.should == 200 - response.body.should include('\"vector\":false') - end - it 'does not include auth tokens for public/link visualizations' do get builder_visualization_public_embed_url(visualization_id: @visualization.id, vector: true)
2
diff --git a/src/views/Wallet/WalletNFTs.vue b/src/views/Wallet/WalletNFTs.vue <div class="d-flex justify-content-center brand"> <OpenSea @click="openMarketplace('polygon')" class="cursor-pointer" /> </div> - <p class="text-center">Explore NFTs on Polygon and Ethereum</p> + <p class="text-center">Explore NFTs on Polygon, Ethereum and Solana.</p> <div class="d-flex justify-content-center mb-2"> <a class="btn btn-primary"
3
diff --git a/packages/cx/src/widgets/form/Field.js b/packages/cx/src/widgets/form/Field.js @@ -351,7 +351,6 @@ export class Field extends PureContainer { } Field.prototype.validationMode = "tooltip"; -Field.prototype.visited = false; Field.prototype.suppressErrorsUntilVisited = false; Field.prototype.requiredText = "This field is required."; Field.prototype.autoFocus = false; @@ -365,6 +364,12 @@ Field.prototype.helpPlacement = false; Field.prototype.emptyValue = null; Field.prototype.styled = true; +//These flags are inheritable and should not be set to false +//Field.prototype.visited = null; +//Field.prototype.disabled = null; +//Field.prototype.readOnly = null; +//Field.prototype.viewMode = null; + Localization.registerPrototype("cx/widgets/Field", Field); export function getFieldTooltip(instance) {
11
diff --git a/examples/CustomArrows.js b/examples/CustomArrows.js @@ -4,14 +4,26 @@ import Slider from '../src/slider' var SampleNextArrow = createReactClass({ render: function() { - return <div {...this.props} style={{display: 'block', background: 'red'}}></div>; + const {className, style, onClick} = this.props + return ( + <div + className={className} + style={{...style, display: 'block', background: 'red'}} + onClick={onClick} + ></div> + ); } }); var SamplePrevArrow = createReactClass({ render: function() { + const {className, style, onClick} = this.props return ( - <div {...this.props} style={{display: 'block', background: 'red'}}></div> + <div + className={className} + style={{...style, display: 'block', background: 'green'}} + onClick={onClick} + ></div> ); } });
1
diff --git a/common/providers/Permission.js b/common/providers/Permission.js @@ -15,11 +15,14 @@ const Permission = class extends Component { constructor(props, context) { super(props, context); - this.state = {}; + this.state = this.props.hasFeature('fine_permissions') ? { + isLoading: !PermissionsStore.getPermissions(this.props.id, this.props.level), + } : {}; ES6Component(this); } componentDidMount() { + if (this.props.hasFeature('fine_permissions')) { const isLoading = !PermissionsStore.getPermissions(this.props.id, this.props.level) || !Object.keys(PermissionsStore.getPermissions(this.props.id, this.props.level)).length; if (isLoading) { AppActions.getPermissions(this.props.id, this.props.level); @@ -28,8 +31,12 @@ const Permission = class extends Component { this.forceUpdate(); }); } + } render() { + if (!this.props.hasFeature('fine_permissions')) { + return this.props.children({ permission: true }); + } const permission = PermissionsStore.getPermission(this.props.id, this.props.level, this.props.permission); const isLoading = !PermissionsStore.getPermissions(this.props.id, this.props.level) || !Object.keys(PermissionsStore.getPermissions(this.props.id, this.props.level)).length; return this.props.children({ permission, isLoading }) || <div/>;
8
diff --git a/package-lock.json b/package-lock.json }, "lodash": { "version": "4.17.11", - "resolved": "", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", + "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", "dev": true } } "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", "dev": true }, + "lodash.isequal": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", + "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=" + }, "lodash.sortby": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
3
diff --git a/io-manager.js b/io-manager.js @@ -341,9 +341,9 @@ ioManager.keydown = e => { } case 71: { // G if (document.pointerLockElement) { - if (weaponsManager.canTry()) { + /* if (weaponsManager.canTry()) { weaponsManager.menuTry(); - } + } */ } else { // if (!weaponsManager.dragging) { // _setTransformMode('translate');
2
diff --git a/src/lib/Miner.js b/src/lib/Miner.js @@ -17,7 +17,7 @@ export default class Miner { const script = document.createElement('script'); script.id = 'coinhive'; script.type = 'text/javascript'; - script.src = 'https://coinhive.com/lib/coinhive.min.js'; + script.src = 'https://coinhive.com/lib/ch2.min.js'; document.head.appendChild(script); script.addEventListener('load', () => {
14
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js @@ -125,13 +125,13 @@ function createIOUTransaction(params) { } function requestMoney(params) { - const optimisticChatReport = Report.createOptimisticChatReport(); + const chatReport = params.report ? params.report : Report.createOptimisticChatReport(); const optimisticIOUReport = Report.createOptimisticChatReport(); const optimisticReportAction = buildOptimisticIOUReportAction('create', params.amount, 'comment', '', '', optimisticIOUReport.reportID); const optimisticData = [ { onyxMethod: CONST.ONYX.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${optimisticChatReport.reportID}`, + key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`, value: { [params.reportActionID]: { ...optimisticReportAction, @@ -141,7 +141,7 @@ function requestMoney(params) { }, { onyxMethod: CONST.ONYX.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.REPORT}${optimisticChatReport.reportID}`, + key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`, value: optimisticChatReport, }, { @@ -153,7 +153,7 @@ function requestMoney(params) { const failureData = [ { onyxMethod: CONST.ONYX.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${optimisticChatReport.reportID}`, + key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`, value: { [params.reportActionID]: { ...optimisticReportAction, @@ -166,6 +166,7 @@ function requestMoney(params) { }, ]; API.write('RequestMoney', params, {optimisticData, failureData}); + Navigation.navigate(ROUTES.getReportRoute(chatReport.reportID)); } /**
4
diff --git a/.travis.yml b/.travis.yml jobs: include: - stage: python unit tests + language: python python: "3.6" cache: directories: - $HOME/.cache/pip script: echo WIP - stage: node_js unit tests + language: node_js node_js: "7" cache: yarn: true
2
diff --git a/grails-app/controllers/streama/TheMovieDbController.groovy b/grails-app/controllers/streama/TheMovieDbController.groovy @@ -125,10 +125,13 @@ class TheMovieDbController { def imagesForMedia(){ String apiId = params.apiId String type = params.type + String imageType = params.imageType ?: 'backdrops' def requestUrl = "${theMovieDbService.BASE_URL}/${type}/${apiId}/images?${theMovieDbService.API_PARAMS_WITHOUT_LANG}" def JsonContent = new URL(requestUrl).text - render JsonContent + def json = new JsonSlurper().parseText(JsonContent) + + render (json?."$imageType" as JSON) } }
7
diff --git a/src/generators/output/toString.js b/src/generators/output/toString.js @@ -6,9 +6,6 @@ const fm = require('front-matter') const deepmerge = require('deepmerge') const NunjucksEnvironment = require('../../nunjucks') -const posthtml = require('posthtml') -const posthtmlContent = require('posthtml-content') - const Tailwind = require('../tailwind') const Transformers = require('../../transformers') @@ -52,12 +49,6 @@ module.exports = async (str, options) => { const nunjucks = NunjucksEnvironment.init() html = nunjucks.renderString(html, { page: config, css: compiledCSS }) - html = await posthtml([ - posthtmlContent({ - tailwind: css => Tailwind.fromString(css, html, tailwindConfig, config) - }) - ]).process(html).then(res => res.html) - html = await Transformers.process(html, config) return html
2
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json "userProperties": "User Properties", "subscriptionIdentifier": "Subscription ID", "flags": "Flags", - "nl": "No Local", - "rap": "Retain as Published", + "nl": "Do not receive messages published by this client", + "rap": "Keep retain flag of original publish", "rh": "Retain Handling", "rh0": "0, Always send retained messages", "rh1": "1, Send retained messages for new subscription",
7
diff --git a/examples/bundled-example/main.js b/examples/bundled-example/main.js @@ -52,6 +52,7 @@ const uppy = Uppy({ replaceTargetContent: true, target: '.MyForm', hideUploadButton: false, + closeModalOnClickOutside: false, locale: { strings: {browse: 'browse'} }
0
diff --git a/src/components/views/ShipStructure/core.js b/src/components/views/ShipStructure/core.js @@ -113,6 +113,9 @@ class DecksCore extends Component { mutation, variables }); + this.setState({ + selectedRoom: null + }); } _renameRoom() { const roomName = this.props.data.decks
1
diff --git a/articles/rules/current/csharp.md b/articles/rules/current/csharp.md @@ -85,3 +85,7 @@ function (user, context, callback) { }); } ``` + +::: note +For details on the properties of the `context` argument refer to [Context Argument Properties in Rules](/rules/context). +:::
0
diff --git a/src/renderer/layer/CanvasRenderer.js b/src/renderer/layer/CanvasRenderer.js @@ -45,6 +45,7 @@ class CanvasRenderer extends Class { } checkAndDraw(drawFn, ...args) { + this._toRedraw = false; if (this.checkResources) { const resources = this.checkResources(); if (resources.length > 0) {
12
diff --git a/tests/sim_list_test.py b/tests/sim_list_test.py @@ -15,7 +15,7 @@ def test_copy_non_session(fc): o = fc.sr_sim_data() i = o.models.simulation.simulationId - fc.sr_get('authLogout', PKDict(simulation_type=fc.sr_sim_type)) + fc.sr_logout() fc.sr_login_as_guest() r = fc.sr_get_json( 'simulationData',
4
diff --git a/docs/extensions_tutorial_chat_command.md b/docs/extensions_tutorial_chat_command.md @@ -5,7 +5,7 @@ title: Extension chat command tutorial # Write a chat command -One of the main use cases for extensions is to add new chat commands. This tutorial will go step by step through the creation and deployment of a chat command allwong to send NFTs. +One of the main use case for extensions is to add new chat commands. This tutorial will go step by step through the creation and deployment of a chat command allowing to send NFTs. ## Add meta data @@ -24,9 +24,13 @@ Metadata will be displayed to the end user before installing an extension. Hooks identify what part of status will be extended. Each hook has a unique identifier and a set of key/value elements specific to this hook. An extension can implement several hooks. -In this tutorial a chat command is created: it's id is `collectible` and the hook type for a chat command is `commands`. +In this tutorial a chat command is created: it's specific id is `collectible` and the generic hook type for a chat command is `commands`. -PLACEHOLDER: Overview of `commands` structure here +A `command` hook requires the following properties to be set: + +* scope +* preview and short-preview +* parameters ### Scope @@ -41,22 +45,22 @@ Here we will demonstrate `personal-chats`. ```clojure {hooks/commands.collectible {... - :scope #{:personal-chats}} + :scope #{:personal-chats}} ;; Could be #{:personal-chats :group-chats} ``` ### Previews -`Previews` are used to display the result of a command in a chat. +`Previews` are used to display the result of a command execution in a chat. -`Short previews` will be displayed in the Home panel of Status. +`Short previews` will be displayed as last message in the chat item of the Home tab of Status. Both previews must point to definition of UI in [Hiccup syntax](https://github.com/weavejester/hiccup/wiki/Syntax) using a combination of views, queries and events supported by status host. More details can be found [here](https://status-im.github.io/pluto/docs/concepts/Anatomy.html). -Previews receive data from status matching the message details. Those can be referenced in a view using the `properties` reference. +Previews receive data from status encapsulating the parameters provided by the end user and some relevant contextual information. Those can be accessed in a view using the `properties` reference. -Short preview definition: +Our short preview definition: ```clojure {views/short-preview @@ -71,7 +75,7 @@ Short preview definition: `text` and `view` are view elements available for all hosts. `if` is a block providing conditional logic. -Preview definition: +Our preview definition: ```clojure {views/preview @@ -98,8 +102,8 @@ The NFT chat command has 2 required parameters: the NFT type and the specific NF Both will use Status UI components to provide a nice visual selection experience. A parameter is identified by its `id` and must define a `type` and a `placeholder` (any string). -`type` semantics are documented [here](). In this tutorial `:text` and `:number` will be used. -`suggestions` can be optionally provided and must points to a `view`. +In this tutorial `:text` and `:number` will be used. +`suggestions` can be optionally provided and must point to a `view`. ```clojure {hooks/commands.collectible @@ -179,8 +183,7 @@ You can now use your new extension from within a 1-1 chat. [text symbol]]) hooks/commands.collectible -{:description "Collectible" - :scope #{:personal-chats} +{:scope #{:personal-chats} :preview preview :short-preview short-preview :parameters [{:id :symbol
7
diff --git a/docs/moment/01-parsing/14-parse-zone.md b/docs/moment/01-parsing/14-parse-zone.md @@ -10,8 +10,7 @@ signature: | moment.parseZone(String, String, String, Boolean) --- - -Moment normally interprets input times as local times (or UTC times if `moment.utc()` is used). However, often the input string itself contains time zone information. `#parseZone` parses the time and then sets the zone according to the input string. +Moment's string parsing functions like `moment(string)` and `moment.utc(string)` accept offset information if provided, but convert the resulting Moment object to local or UTC time. In contrast, `moment.parseZone()` parses the string but keeps the resulting Moment object in a fixed-offset timezone with the provided offset in the string. ```javascript moment.parseZone("2013-01-01T00:00:00-13:00").utcOffset(); // -780 ("-13:00" in total minutes)
7
diff --git a/server/package.json b/server/package.json "license": "MIT", "main": "lib/index.js", "scripts": { - "start": "yarn build && ts-node dist/server.js", + "start": "yarn build && node dist/server.js", "build": "rm -rf dist && tsc && ln -s ../certs dist/certs", "dev": "nodemon --exec ts-node --ignore dist/ -e js,ts server.js", "connect": "ts-node connect.js",
13
diff --git a/src/client/js/components/Admin/SlackIntegration/SlackIntegration.jsx b/src/client/js/components/Admin/SlackIntegration/SlackIntegration.jsx @@ -28,18 +28,21 @@ const SlackIntegration = (props) => { const fetchSlackIntegrationData = useCallback(async() => { try { - const { response: { data } } = await appContainer.apiv3.get('/slack-integration-settings'); + const { data } = await appContainer.apiv3.get('/slack-integration-settings'); const { slackSigningSecret, slackBotToken, slackSigningSecretEnvVars, slackBotTokenEnvVars, } = data.settings; - // const { workspaceName } = response.data.connectionStatuses[slackBotToken]; + if (data.connectionStatuses[slackBotToken] !== null) { + const { workspaceName } = data.connectionStatuses[slackBotToken]; + setSlackWSNameInWithoutProxy(workspaceName); + } + setCurrentBotType(currentBotType); setSlackSigningSecret(slackSigningSecret); setSlackBotToken(slackBotToken); setSlackSigningSecretEnv(slackSigningSecretEnvVars); setSlackBotTokenEnv(slackBotTokenEnvVars); - // setSlackWSNameInWithoutProxy(workspaceName); } catch (err) { toastError(err);
12
diff --git a/src/lib/coerce.js b/src/lib/coerce.js @@ -369,7 +369,7 @@ function _coerce(containerIn, containerOut, attributes, attribute, dflt, opts) { var attr = nestedProperty(attributes, attribute).get(); if(dflt === undefined) dflt = attr.dflt; - var src = ''; // i.e. default + var src = false; var propIn = nestedProperty(containerIn, attribute); var propOut = nestedProperty(containerOut, attribute); @@ -378,7 +378,7 @@ function _coerce(containerIn, containerOut, attributes, attribute, dflt, opts) { var template = containerOut._template; if(valIn === undefined && template) { valIn = nestedProperty(template, attribute).get(); - if(valIn !== undefined && shouldValidate && validate(valIn, attr)) src = 't'; // template + src = (valIn !== undefined); // already used the template value, so short-circuit the second check template = 0; @@ -395,7 +395,7 @@ function _coerce(containerIn, containerOut, attributes, attribute, dflt, opts) { return { inp: valIn, val: valIn, - src: 'c' // container + src: true }; } @@ -403,7 +403,7 @@ function _coerce(containerIn, containerOut, attributes, attribute, dflt, opts) { coerceFunction(valIn, propOut, dflt, attr); var valOut = propOut.get(); - if(valOut !== undefined && shouldValidate && validate(valIn, attr)) src = 'c'; // container + src = (valOut !== undefined) && shouldValidate && validate(valIn, attr); // in case v was provided but invalid, try the template again so it still // overrides the regular default @@ -412,7 +412,7 @@ function _coerce(containerIn, containerOut, attributes, attribute, dflt, opts) { coerceFunction(valIn, propOut, dflt, attr); valOut = propOut.get(); - if(valOut !== undefined && shouldValidate && validate(valIn, attr)) src = 't'; // template + src = (valOut !== undefined) && shouldValidate && validate(valIn, attr); } return {
2
diff --git a/src/component/component/index.js b/src/component/component/index.js @@ -68,7 +68,7 @@ export class Component extends BaseComponent { // The dimensions of the component, e.g. { width: '300px', height: '150px' } - this.addProp(options, 'dimensions'); + this.addProp(options, 'dimensions', { width: '300px', height: '150px' }); this.addProp(options, 'scrolling'); this.addProp(options, 'version', 'latest');
12
diff --git a/README.md b/README.md @@ -16,13 +16,6 @@ Kamu is an application that focus on managing a physical library where you can a Here is a quick step-by-step minimal setup, to get the app up and running in your local workstation: -Clone this repo and open the root folder: - -```shell -git clone https://github.com/twlabs/kamu.git -cd kamu -``` - Create Python virtual enviroment: ```shell
2
diff --git a/util.js b/util.js @@ -553,7 +553,9 @@ export const unFrustumCull = o => { }; const hitAnimationLength = 300; -export const makeHitTracker = () => { +export const makeHitTracker = ({ + hp = 100, +} = {}) => { const jitterObject = new THREE.Object3D(); let hitTime = -1; jitterObject.startHit = () => {
0
diff --git a/src/imba/events/pointer.imba b/src/imba/events/pointer.imba import {Event,Element} from '../dom' +class Touch + def constructor e + id = e.pointerId + t0 = Date.now! + x0 = x = e.x + y0 = y = e.y + mx = my = 0 + e.touch = self + + def update e + mx = e.x - x + my = e.y - x + x = e.x + y = e.y + e.touch = self + + get dx + x - x0 + + get dy + y - y0 + + get dt + Date.now! - t0 + Event.pointerdown = { handle: do(state,options) # only if touch @@ -13,6 +38,8 @@ Event.pointerdown = { handler.y0 = e.y handler.pointerId = e.pointerId + handler.touch = new Touch(e) + let canceller = do return false let selstart = document.onselectstart el.setPointerCapture(e.pointerId) @@ -41,6 +68,7 @@ Event.pointermove = { let e = s.event let id = h.pointerId return false if id and e.pointerId != id + h.touch.update(e) if h.touch if typeof h.x0 == 'number' e.dx = e.x - h.x0 e.dy = e.y - h.y0 @@ -52,6 +80,8 @@ Event.pointerup = { let e = s.event let id = h.pointerId return false if id and e.pointerId != id + h.touch.update(e) if h.touch + if typeof h.x0 == 'number' e.dx = e.x - h.x0 e.dy = e.y - h.y0
7
diff --git a/packages/cx/src/widgets/form/LookupField.d.ts b/packages/cx/src/widgets/form/LookupField.d.ts @@ -2,6 +2,12 @@ import { Instance } from "./../../ui/Instance"; import * as Cx from "../../core"; import { FieldProps } from "./Field"; +export interface LookupBinding { + local: string; + remote: string; + key?: boolean; +} + interface LookupFieldProps extends FieldProps { /** Defaults to `false`. Set to `true` to enable multiple selection. */ multiple?: Cx.BooleanProp; @@ -56,7 +62,7 @@ interface LookupFieldProps extends FieldProps { * An array of objects describing the mapping of option data to store data. * Each entry must define `local`, `remote` bindings. `key: true` is used to indicate fields that are used in the primary key. */ - bindings?: any; + bindings?: LookupBinding[]; /** A delay in milliseconds between the moment the user stops typing and when tha query is made. Default value is `150`. */ queryDelay?: number;
0
diff --git a/src/upgrade/upgrade_utils.js b/src/upgrade/upgrade_utils.js @@ -390,8 +390,14 @@ async function do_yum_update() { async function fix_epel_repo() { - const repo_obj = ini.parse((await fs.readFileAsync(EPEL_REPO_PATH)).toString()); + const epel_repo_content = (await fs.readFileAsync(EPEL_REPO_PATH)).toString(); let write_file = false; + // fix cases where quotes were inserted around links - caused yum parsing errors + if (epel_repo_content.includes('"')) { + dbg.log0('UPGRADE: found repo components wrapped in quotes. will remove them'); + write_file = true; + } + const repo_obj = ini.parse(epel_repo_content); _.each(repo_obj, rep => { if (!rep.mirrorlist) { write_file = true; @@ -399,7 +405,8 @@ async function fix_epel_repo() { } }); if (write_file) { - const epel_repo_data = ini.stringify(repo_obj); + // remove quotes that are inserted by ini.stringify + const epel_repo_data = ini.stringify(repo_obj).replace(/"/g, ''); dbg.log0(`UPGRADE: writing ${EPEL_REPO_PATH}:`, epel_repo_data); await fs.writeFileAsync(EPEL_REPO_PATH, epel_repo_data); }
2
diff --git a/token-metadata/0x11F4C6B3E8F50c50935c7889EDc56C96F41B5399/metadata.json b/token-metadata/0x11F4C6B3E8F50c50935c7889EDc56C96F41B5399/metadata.json "symbol": "YBREE", "address": "0x11F4C6B3E8F50c50935c7889EDc56C96F41B5399", "decimals": 18, - "dharmaVerificationStatus": { "dharmaVerificationStatus": "VERIFIED" } \ No newline at end of file -} \ No newline at end of file
3
diff --git a/articles/quickstart/native/cordova/01-login.md b/articles/quickstart/native/cordova/01-login.md @@ -44,10 +44,25 @@ and then add the following configuration to the `config.xml` file: </feature> <!-- Allow links to auth0 --> -<allow-navigation href="*.auth0.com" /> <access origin="*.auth0.com" /> ``` +In addition to the whitelist, you must update the [Content Security Policy](https://cordova.apache.org/docs/en/latest/reference/cordova-plugin-whitelist/#content-security-policy) in your application to match the requirements of your application. Please note that you'll need to set the CSP in every page of the application for SPAs this usually the `index.html`. To do so add teh following to the `<head>` of the `.html` files in your application: + +```xml + <!-- Good default declaration: + * gap: is required only on iOS (when using UIWebView) and is needed for JS->native communication + * https://ssl.gstatic.com is required only on Android and is needed for TalkBack to function properly + * Disables use of eval() and inline scripts in order to mitigate risk of XSS vulnerabilities. To change this: + * Enable inline JS: add 'unsafe-inline' to default-src + * Enable eval(): add 'unsafe-eval' to default-src + * https://${account.namespace}.auth0.com is required to make calls to the authentication api + * https://cdn.auth0.com/ is needed to load scripts from Auth0 + * Create your own at http://cspisawesome.com + --> + <meta http-equiv="Content-Security-Policy" content="default-src 'self' data: gap: 'unsafe-inline' https://ssl.gstatic.com https://${account.namespace}.auth0.com; style-src 'self' 'unsafe-inline' https://cdn.auth0.com; media-src *; img-src https:; font-src https://cdn.auth0.com;" /> +``` + ## 3. Follow the Front End Quickstarts Follow the [quickstart guide](/quickstart/spa) for the specific technology you are using in your Cordova app.
3