code
stringlengths
122
4.99k
label
int64
0
14
diff --git a/README.md b/README.md @@ -46,10 +46,9 @@ _Follow steps as necessary. If you already have Reaction installed, you may be a - Open devtools and copy the Meteor.loginToken from `localStorage`. 6. Setup the Storefront environment - Navigate to the `reaction-next-starterkit` directory and create a `.env` file. Then add the EXTERNAL_ASSETS_URL if you wish to see images from your Reaction Meteor shop. + Navigate to the `reaction-next-starterkit` directory and create a `.env` file. ```sh cp .env.example .env - echo "EXTERNAL_ASSETS_URL=http://localhost:3000" >> .env ``` 7. Start the storefront application in development mode using Docker Compose ```
2
diff --git a/src/components/common/view/Icon/config.json b/src/components/common/view/Icon/config.json "icons-copy" ] }, - { - "uid": "e385a865f5bb6a66d270c47d51ed3cdd", - "css": "logout", - "code": 59461, - "src": "custom_icons", - "selected": true, - "svg": { - "path": "M497 293.8H593.2V46.3A47.2 47.2 0 0 0 545.2-0.1H353.8C264.6 1.1 307-0.1 194-0.1H48.3A47.3 47.3 0 0 0 0.1 46.1V953.5A47.3 47.3 0 0 0 48.1 999.9H544.7A47.3 47.3 0 0 0 592.8 953.5L593 953.7V706.2H496.7V907.4H96.1V92.5H497ZM684.2 663A52 52 0 0 0 757.6 663L883.9 536.7A51.6 51.6 0 0 0 898.9 501C898.9 500.4 898.9 499.7 898.9 499.1A51.1 51.1 0 0 0 898.1 491.4C898.1 490.7 898.1 490 898.1 489.3A51.4 51.4 0 0 0 896.1 482.4C895.8 481.4 895.6 480.4 895.2 479.4A52.9 52.9 0 0 0 892 473.2C891.4 472.3 891 471.3 890.4 470.3A52.6 52.6 0 0 0 883.8 462.3L757.8 336.3A52 52 0 0 0 684.5 336.3 51.8 51.8 0 0 0 669.2 372.9 51.8 51.8 0 0 0 684.5 409.6L722 447.1 373 447.1A52 52 0 0 0 320.9 499.1 52 52 0 0 0 373 551.1L722.6 551.1 684.2 589.5A51.8 51.8 0 0 0 669 626.2 51.8 51.8 0 0 0 684.2 662.8", - "width": 899 - }, - "search": [ - "icons-logout" - ] - }, { "uid": "418ed8ca62a3396e35c0005c39c3927b", "css": "export-wallet", "icons-export-wallet" ] }, - { - "uid": "5050d0f17e907e8248a22975e77e43d9", - "css": "profile", - "code": 59401, - "src": "custom_icons", - "selected": true, - "svg": { - "path": "M743.7 944.1A372.3 372.3 0 0 0 371.9 572.2 372.3 372.3 0 0 0 0 944.1 55.9 55.9 0 0 0 55.9 1000 56 56 0 0 0 111.8 944.1 260.4 260.4 0 0 1 371.9 684 260.4 260.4 0 0 1 631.9 944.1 55.9 55.9 0 0 0 687.8 1000 56 56 0 0 0 743.7 944.1M633.3 261.2A261.6 261.6 0 0 0 371.9 0 261.6 261.6 0 0 0 110.6 261.2 261.6 261.6 0 0 0 371.9 522.6 261.6 261.6 0 0 0 633.3 261.2M521.5 261.2A149.7 149.7 0 0 1 371.9 410.8 149.7 149.7 0 0 1 222.4 261.2 149.7 149.7 0 0 1 371.9 111.8 149.7 149.7 0 0 1 521.3 261.2", - "width": 744 - }, - "search": [ - "user-profile" - ] - }, - { - "uid": "de37deb73e3de135242e917773661f54", - "css": "link", - "code": 59463, - "src": "custom_icons", - "selected": true, - "svg": { - "path": "M936.5 273.4A343 343 0 0 0 781.6 55.7 365.4 365.4 0 0 0 512.7 7.7 355.6 355.6 0 0 0 287.3 157.3 333.3 333.3 0 0 0 237.3 417 342.9 342.9 0 0 0 392.2 634.7 56.4 56.4 0 0 0 422.2 643.3 55.6 55.6 0 0 0 468.4 619.1 52.2 52.2 0 0 0 452.3 545.4 237.1 237.1 0 0 1 345.3 394.6 230.4 230.4 0 0 1 379.8 215 245.6 245.6 0 0 1 535.6 111.8 252.4 252.4 0 0 1 721.6 145.1 237.3 237.3 0 0 1 828.7 295.6 230.6 230.6 0 0 1 794.2 475.2 52.1 52.1 0 0 0 810.4 548.8 56.3 56.3 0 0 0 886.6 533.2 333.3 333.3 0 0 0 936.6 273.4M222.7 855.2A237.1 237.1 0 0 1 115.7 704.6 230.3 230.3 0 0 1 150.4 525 52.1 52.1 0 0 0 133.8 451.4 56.2 56.2 0 0 0 57.6 467.1 333.3 333.3 0 0 0 7.6 726.8 343.1 343.1 0 0 0 162.8 944.6 364 364 0 0 0 356.8 1000.2 361.1 361.1 0 0 0 657.1 842.9 333.3 333.3 0 0 0 707.1 583.2 343.1 343.1 0 0 0 552 365.6 56.4 56.4 0 0 0 475.8 381.3 52.1 52.1 0 0 0 492.1 454.9 237.3 237.3 0 0 1 599.2 605.4 230.6 230.6 0 0 1 564.7 785.1 252.8 252.8 0 0 1 222.7 855.2", - "width": 944 - }, - "search": [ - "generate-link" - ] - }, - { - "uid": "94866000983bd8925c72c4013bbf5609", - "css": "faq", - "code": 59464, - "src": "custom_icons", - "selected": true, - "svg": { - "path": "M1000 500A500.8 500.8 0 0 0 500 0 500.8 500.8 0 0 0 0 500 500.8 500.8 0 0 0 500 1000 500.8 500.8 0 0 0 1000 500M887.3 500A387.8 387.8 0 0 1 500 887.3 387.8 387.8 0 0 1 112.7 500 387.8 387.8 0 0 1 500 112.7 387.8 387.8 0 0 1 887.3 500M671.7 433.2A190.7 190.7 0 0 0 685.1 359.2 174.3 174.3 0 0 0 662.1 270.2 161.4 161.4 0 0 0 597.8 209 190.1 190.1 0 0 0 507.4 187.3 209.3 209.3 0 0 0 407.2 210.7 168.2 168.2 0 0 0 338.8 277.4 192.9 192.9 0 0 0 314.8 373.6 54.1 54.1 0 0 0 330.5 412.6 57.5 57.5 0 0 0 409.3 412.6 54.8 54.8 0 0 0 424.4 373.6 84.6 84.6 0 0 1 445 312.4 81.8 81.8 0 0 1 507.5 291 65.6 65.6 0 0 1 558.1 310.7 67.6 67.6 0 0 1 577 359.3 104.6 104.6 0 0 1 569.1 402.4 113 113 0 0 1 549.2 433.2 448.1 448.1 0 0 1 510.3 469.1 182 182 0 0 0 462 532.3 169.5 169.5 0 0 0 445.4 602.3 54 54 0 0 0 461 641.3 53.9 53.9 0 0 0 500 657.1 53.6 53.6 0 0 0 539.7 641.1 54.7 54.7 0 0 0 554.8 602.2 108.8 108.8 0 0 1 561.6 567.3 57.6 57.6 0 0 1 580.7 540 504.1 504.1 0 0 0 635.7 489.6 193.5 193.5 0 0 0 671.7 433.2M432.4 745.4A67.4 67.4 0 0 0 500 812.9 67.4 67.4 0 0 0 567.4 745.5 67.4 67.4 0 0 0 500 678.1 67.4 67.4 0 0 0 432.4 745.5", - "width": 1000 - }, - "search": [ - "faq-questions" - ] - }, { "uid": "dc1d91222da5cb2b9c3988ba7bbbfcd6", "css": "add",
2
diff --git a/.travis.yml b/.travis.yml @@ -35,8 +35,10 @@ deploy: tag_name: "$TRAVIS_TAG" name: "$TRAVIS_TAG" body: - Automated release from Travis CI with added files from AppVeyor build - api_key: "$GITHUB_TOKEN" + "Automated release from Travis CI with added files from AppVeyor build" + api_key: + secure: + HV4BRj0Nn4+3AGC5U2LxFQ3qr6bbwcs2SR7BIEKXdHcIAshvL52Qn9R2pXFjeJhj/FqGMRc6o1E54q4+QpzzlnoZquZkJoSv4x4EW306KVXNxaBQmwjNLs6gO09/s8j3IlZ0pudANmH2WQvT264ldGCqq0mC1vCMpHfxetdGsskfqdboFgyaUSDtRBER9FH23cM22Ro3oPJmRxn/dzZSctiB05e1i8CD6VZm8HeGuWKXyKOuhzBFzEgaSkSQWa6u5YsvAKkQ4c6rAAxUWJOH9+8WoqUVN/Pem56mnA0HYtqAoX/cShLuZfsHRJUVdE5Wt9YfEOBRQy954QmZgPhQbp7OKcIBAQyAkMSR1AEKCYd2QjPBBM5ek44Pbz0AsDSd1qsSgKUJs4urpOTLbFi2KfDmaXiO+ciaIDvyh0QiUPykVdRtDKacdrHCWUUuJajc465KRE8LGheOGThj+s9vPmy9Eubn7Zzsdzy1q0Xjwjd57bz8G5aTbBWpJJ4sk096trJqGX1iQMKEpnEU/KwmRS9XX65s6gBjuO8/2ZhoE8HQCDBS0whiJi+eHggu6wch6SfTvATkQ9ivex6T/T/eYHGF+sbShkXrzmUs0sbsq1TrjgFyIA/x23y+0k59mZ8xfkRLHT3L1EjgW6MahwPCPESumomq3PDJrKPVpd7n/04= file_glob: true file: - build/binaries/BitShares*
14
diff --git a/docs-website/pages/plugins-releases-54.md b/docs-website/pages/plugins-releases-54.md --- -title: Sketch 54 +title: New in Sketch 54 summary: API to let plugins react to events in the app. section: plugins -chapter: JS API Releases -permalink: /plugins/release-54 +chapter: JavaScript API Updates +permalink: /plugins/updates/new-in-sketch-54 order: 400 ---
7
diff --git a/edit.js b/edit.js @@ -147,7 +147,7 @@ const highlightMesh = new THREE.Mesh( highlightMesh.visible = false; highlightScene.add(highlightMesh); -const _makeTextMesh = (text, fontSize) => { +const _makeTextMesh = (text, fontSize, clippingPlanes) => { const textMesh = new TextMesh(); textMesh.text = text; textMesh.font = './GeosansLight.ttf'; @@ -157,11 +157,19 @@ const _makeTextMesh = (text, fontSize) => { // textMesh.anchorY = 'left'; textMesh.frustumCulled = false; textMesh.sync(); + if (clippingPlanes) { + textMesh.material.clippingPlanes = clippingPlanes; + } return textMesh; }; const wristMenu = (() => { const object = new THREE.Object3D(); + const clippingPlanes = [ + new THREE.Plane(new THREE.Vector3(0, 1, 0), -0.5), + new THREE.Plane(new THREE.Vector3(0, -1, 0), 1), + ]; + const size = 1; const packageWidth = size*0.9; const packageHeight = size*0.1; @@ -180,6 +188,7 @@ const wristMenu = (() => { new THREE.MeshBasicMaterial({ color: 0xb0bec5, side: THREE.DoubleSide, + clippingPlanes, }) ); backgroundMesh.scale.set(packageWidth, packageHeight, 0.01); @@ -213,13 +222,14 @@ const wristMenu = (() => { new THREE.MeshBasicMaterial({ map: texture, side: THREE.DoubleSide, + clippingPlanes, }) ); imgMesh.position.x = -packageWidth/2 + packageHeight/2; imgMesh.position.z = 0.001; object.add(imgMesh); - const textMesh = _makeTextMesh(name, size*0.05); + const textMesh = _makeTextMesh(name, size*0.05, clippingPlanes); textMesh.position.x = -packageWidth/2 + packageHeight; textMesh.position.y = packageHeight/2; textMesh.position.z = 0.001; @@ -276,11 +286,11 @@ const wristMenu = (() => { const packagesScrollHeight = _getPackagesScrollHeight(); packages.position.y = y*packagesScrollHeight; - packages.children.forEach(p => { + /* packages.children.forEach(p => { let {offset} = p; // offset += packageHeight; p.visible = offset >= packages.position.y && offset <= packages.position.y + _getPackagesWindowHeight(); - }); + }); */ }; object.addPackage = p => { const packageMesh = _makePackageMesh(p);
0
diff --git a/app/components/member/New.js b/app/components/member/New.js @@ -146,9 +146,12 @@ class MemberNew extends React.PureComponent { const role = this.state.role; - const teams = this.state.teams.map((id) => { + let teams = []; + if(this.state.teams) { + teams = this.state.teams.map((id) => { return { id: id, role: TeamMemberRoleConstants.MEMBER }; }); + } const mutation = new OrganizationInvitationCreateMutation({ organization: this.props.organization,
9
diff --git a/components/Notifications/enhancers.js b/components/Notifications/enhancers.js @@ -217,7 +217,7 @@ const notificationCountQuery = gql` ${notificationInfo} ` -const markAsReadMutation = gql` +const MARK_NOTIFICATION_AS_READ_MUTATION = gql` mutation markNotificationAsRead($id: ID!) { markNotificationAsRead(id: $id) { ...notificationInfo @@ -283,7 +283,9 @@ export const withNotificationCount = graphql(notificationCountQuery, { }) const alreadyMarkedAsReadIds = [] -export const withMarkAsReadMutation = graphql(markAsReadMutation, { +export const withMarkAsReadMutation = graphql( + MARK_NOTIFICATION_AS_READ_MUTATION, + { props: ({ mutate }) => ({ markAsReadMutation: id => { if (alreadyMarkedAsReadIds.includes(id)) { @@ -297,7 +299,8 @@ export const withMarkAsReadMutation = graphql(markAsReadMutation, { }) } }) -}) + } +) export const withMarkAllAsReadMutation = graphql(markAllAsReadMutation, { props: ({ mutate }) => ({
10
diff --git a/app/shared/actions/validate.js b/app/shared/actions/validate.js @@ -126,7 +126,7 @@ export function validateKey(key) { // Establish EOS connection eos(connection).getAccount(settings.account).then((account) => { // Keys must resolve to one of these types of permissions - const permissions = ['active']; + const permissions = ['active', 'owner']; try { // Derive the public key from the private key provided const expect = ecc.privateToPublic(key);
11
diff --git a/.solcover.js b/.solcover.js @@ -4,5 +4,5 @@ module.exports = { copyPackages: ['openzeppelin-solidity'], testCommand: 'node ../node_modules/.bin/truffle test `find test/*.js ! -name a_poly_oracle.js -and ! -name s_v130_to_v140_upgrade.js` --network coverage', deepSkip: true, - skipFiles: ['external', 'flat', 'mocks'] + skipFiles: ['external', 'flat', 'mocks', 'helpers', 'oracles'] };
8
diff --git a/articles/pre-deployment/index.html b/articles/pre-deployment/index.html @@ -36,4 +36,10 @@ title: Pre-Deployment Tests </li> </ul> </li> + <li> + <i class="icon icon-budicon-715"></i><a href="/prelaunch-tips">Pre-Launch Tips</a> + <p> + A list of tips our customers have found most useful when first getting started with Auth0. + </p> + </li> </ul>
0
diff --git a/src/encoded/schemas/biosample.json b/src/encoded/schemas/biosample.json ] }, "model_organism_sex": { - "title": "Sex", + "title": "Model organism sex", "type": "string", - "description": "The sex of the organism the biosample comes from.", + "description": "The sex of the model organism the biosample comes from.", "comment": "model_organism_sex is not valid for a human biosample.", "enum": [ "female", ] }, "model_organism_health_status": { - "title": "Health status", + "title": "Model organism health status", "type": "string", "description": "Health status of the model organism.", "comment": "model_organism_health_status is not valid for a human biosample."
10
diff --git a/src/errors.js b/src/errors.js @@ -24,5 +24,6 @@ export class ApifyCallError extends Error { /** * TimeoutError class. * This error should be thrown after request timeout from `requestAsBrowser`. + * @ignore */ export class TimeoutError extends Error {}
8
diff --git a/lib/assets/javascripts/builder/components/input-color/input-qualitative-ramps/main-view.js b/lib/assets/javascripts/builder/components/input-color/input-qualitative-ramps/main-view.js @@ -47,7 +47,6 @@ module.exports = CoreView.extend({ this._imageEnabled = opts.imageEnabled; this._hideTabs = opts.hideTabs; this._query = opts.query; - this._requiredNumberOfColors = this._computeRequiredNumberOfColors(); this._viewModel = new Backbone.Model({ step: 0, status: 'idle' @@ -278,7 +277,7 @@ module.exports = CoreView.extend({ model: this.model, maxValues: MAX_VALUES, imageEnabled: this._iconStylingEnabled(), - requiredNumberOfColors: this._requiredNumberOfColors + requiredNumberOfColors: this._computeRequiredNumberOfColors() }); view.bind('back', function (value) { @@ -302,7 +301,7 @@ module.exports = CoreView.extend({ var view = new ColorRampsListView({ model: this.model, maxValues: MAX_VALUES, - requiredNumberOfColors: this._requiredNumberOfColors + requiredNumberOfColors: this._computeRequiredNumberOfColors() }); var eventsToListen = [
14
diff --git a/src/embeds/WeaponEmbed.js b/src/embeds/WeaponEmbed.js @@ -19,7 +19,6 @@ class WeaponEmbed extends BaseEmbed { this.url = weapon.url || ''; this.thumbnail = { url: weapon.thumbnail || '' }; this.description = `${weapon.type} ${weapon.subtype ? `| ${weapon.subtype}` : ''}`; - this.footer = { text: `Drops from: ${weapon.location}` }; this.color = weapon.color; this.fields = [];
2
diff --git a/src/regions/Result.js b/src/regions/Result.js @@ -72,7 +72,7 @@ const Result = types }, get mainValue() { - return self.value[self.type]; + return self.value[self.from_name._type]; }, get editable() { @@ -152,13 +152,14 @@ const Result = types serialize() { const { from_name, to_name, type, score, value } = getSnapshot(self); + const { _type } = self.from_name; const data = self.area ? self.area.serialize() : {}; // cut off completion id const id = self.area.id.replace(/#.*/, ""); if (!data.value) data.value = {}; Object.assign(data, { id, from_name, to_name, type }); - Object.assign(data.value, { [type]: value[type] }); + Object.assign(data.value, { [_type]: value[_type] }); if (typeof score === "number") data.score = score; return data;
7
diff --git a/contracts/HavvenEscrow.sol b/contracts/HavvenEscrow.sol @@ -195,7 +195,6 @@ contract HavvenEscrow is Owned, LimitedSetup(8 weeks), SafeDecimalMath { delete vestingSchedules[account]; totalVestedBalance = safeSub(totalVestedBalance, totalVestedAccountBalance[account]); delete totalVestedAccountBalance[account]; - SchedulePurged(account); } /* Add a new vesting entry at a given time and quantity to an account's schedule. @@ -290,11 +289,5 @@ contract HavvenEscrow is Owned, LimitedSetup(8 weeks), SafeDecimalMath { event NominUpdated(address newNomin); - event ContractFeesWithdrawn(uint time, uint value); - - event FeesWithdrawn(address recipient, address indexed recipientIndex, uint time, uint value); - event Vested(address beneficiary, address indexed beneficiaryIndex, uint time, uint value); - - event SchedulePurged(address account); }
2
diff --git a/src/comments/Comments.js b/src/comments/Comments.js @@ -95,7 +95,7 @@ export default class Comments extends Component { return (<Loading />); } - if (fetchedCommentsList && fetchedCommentsList.length) { + if (fetchedCommentsList) { return ( <CommentsList comments={fetchedCommentsList}
3
diff --git a/source/plugins/contributors/metadata.yml b/source/plugins/contributors/metadata.yml @@ -30,7 +30,7 @@ inputs: description: Contributors to ignore type: array format: comma-separated - default: github-actions[bot] + default: github-actions[bot], dependabot[bot] # Display total contributions for each contributor plugin_contributors_contributions:
8
diff --git a/.env.example b/.env.example SITE_URL="http://ghost.local:8000" -GHOST_API_URL="https://docs-test.ghost.io" -GHOST_API_KEY="87de3a12779c" -ALGOLIA_ADMIN_KEY="<replace with api key>" +# These are all public keys, deliberately committed +GHOST_API_URL="https://docs.ghost.io" +GHOST_API_KEY="af3707f559ae" +ALGOLIA_ADMIN_KEY="<key>"
4
diff --git a/includes/Core/Permissions/Permissions.php b/includes/Core/Permissions/Permissions.php @@ -448,7 +448,7 @@ final class Permissions { } /** - * Gets all the capabilities specifically added for dashboard sharing.__resizable_base__ + * Gets all the capabilities specifically added for dashboard sharing. * * @since n.e.x.t *
2
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,15 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master where X.Y.Z is the semver of most recent plotly.js release. +## [1.49.5] -- 2019-09-18 + +### Fixed +- Clear rejected promises from queue when calling `Plotly.react` [#4197] +- Do not attempt to remove non-existing mapbox layout source and layers [#4197] +- Invalid mapbox layout layers with blank-string tile entries [#4197] +- Fix hover labels for `choroplethmapbox` with number `locations` items [#4197] + + ## [1.49.4] -- 2019-08-22 ### Fixed
3
diff --git a/OpenRobertaServer/staticResources/js/app/simulation/robertaLogic/program.eval.js b/OpenRobertaServer/staticResources/js/app/simulation/robertaLogic/program.eval.js @@ -72,7 +72,7 @@ define(['robertaLogic.actors', 'robertaLogic.memory', 'robertaLogic.program', 'r case CONSTANTS.IF_STMT: evalIf(internal(this), stmt); - this.step(simulationData); + // this.step(simulationData); break; case CONSTANTS.REPEAT_STMT: @@ -650,7 +650,7 @@ define(['robertaLogic.actors', 'robertaLogic.memory', 'robertaLogic.program', 'r obj.currentStatement = stmt.exprList; for (var i = 0; i < stmt.exprList.length; i++) { value = evalExpr(obj, stmt.exprList[i], i); - if (!isObject(value) && value != undefined) { + if (!isObject(value) && value) { programPrefix = stmt.thenList[i]; if (obj.program.isWait()) { obj.program.getRemove(); @@ -660,7 +660,7 @@ define(['robertaLogic.actors', 'robertaLogic.memory', 'robertaLogic.program', 'r } } obj.currentStatement = stmt; - if ((programPrefix == undefined || programPrefix == []) && !obj.program.isWait()) { + if ((programPrefix == undefined || programPrefix == []) && !obj.program.isWait() && !obj.modifiedStmt) { programPrefix = stmt.elseStmts; } obj.program.prepend(programPrefix);
9
diff --git a/src/data/performance.test.js b/src/data/performance.test.js @@ -4,7 +4,7 @@ import decodePerformance from "./performance"; describe("Performance", () => { describe("decoder", () => { - it("correctly decodes valid CMS sponsor", () => { + it("correctly decodes valid CMS performance", () => { const data: mixed = sampleOne(generateCMSPerformance); const decoded = decodePerformance("en-GB")(data);
1
diff --git a/src/encoded/search.py b/src/encoded/search.py @@ -665,7 +665,7 @@ def iter_long_json(name, iterable, other): yield ']' + other_stuff + '}' @view_config(route_name='search', request_method='GET', permission='search') -def search(context, request, search_type=None, return_generator=False): +def search(context, request, return_generator=False): """ Search view connects to ElasticSearch and returns the results """ @@ -694,14 +694,15 @@ def search(context, request, search_type=None, return_generator=False): search_term = prepare_search_term(request) ## converts type= query parameters to list of doc_types to search, "*" becomes super class Item - if search_type is None: + if (hasattr(context, 'type_info') and + hasattr(context.type_info, 'name') + and context.type_info.name): + doc_types = [context.type_info.name] + else: doc_types = request.params.getall('type') if '*' in doc_types: doc_types = ['Item'] - else: - doc_types = [search_type] - # Normalize to item_type try: doc_types = sorted({types[name].name for name in doc_types}) @@ -908,7 +909,7 @@ def collection_view_listing_es(context, request): if request.datastore != 'elasticsearch': return collection_view_listing_db(context, request) - return search(context, request, context.type_info.name) + return search(context, request) @view_config(route_name='report', request_method='GET', permission='search')
2
diff --git a/models/users.js b/models/users.js @@ -108,6 +108,10 @@ Users.attachSchema(new SimpleSchema({ type: Boolean, optional: true, }, + fromAdmin: { + type: Boolean, + optional: false, + }, })); // Search a user in the complete server database by its name or username. This @@ -435,6 +439,12 @@ if (Meteor.isServer) { user.isAdmin = true; return user; } + + if (options.from == 'admin') { + user.fromAdmin = true; + return user; + } + const disableRegistration = Settings.findOne().disableRegistration; if (!disableRegistration) { return user; @@ -524,6 +534,9 @@ if (Meteor.isServer) { Users.after.insert((userId, doc) => { + if (doc.fromAdmin) + return; + //invite user to corresponding boards const disableRegistration = Settings.findOne().disableRegistration; if (disableRegistration) { @@ -582,6 +595,7 @@ if (Meteor.isServer) { username: req.body.username, email: req.body.email, password: 'default', + from: 'admin' }); JsonRoutes.sendResult(res, {
11
diff --git a/src/reducers/index.js b/src/reducers/index.js // @flow import { combineReducers } from "redux"; +import { DateTime } from "luxon"; import events from "./events"; import type { State as EventsState } from "./events"; import eventFilters from "./event-filters"; import type { State as EventFiltersState } from "../data/event-filters"; import savedEvents from "./saved-events"; import type { SavedEvents as SavedEventsState } from "../data/event"; +import globalFilters from "./global-filters"; +import type { State as GlobalFiltersState } from "./global-filters"; export type State = { events: EventsState, eventFilters: EventFiltersState, + globalFilters: GlobalFiltersState, savedEvents: SavedEventsState }; export default combineReducers({ events, eventFilters, + globalFilters: globalFilters(DateTime.local), savedEvents });
0
diff --git a/src/components/views/Sensors/SensorGrid.js b/src/components/views/Sensors/SensorGrid.js @@ -133,11 +133,14 @@ class SensorGrid extends Component{ if (intersection) { const obj = {}; - const contact = this.state.draggingContact; + + const contact = this.props.data.sensorContacts.find((contact) => contact.id === this.state.draggingContact.id); contact.destination = JSON.parse(JSON.stringify(intersection.sub(this._offset))); + obj[contact.id] = contact; this.setState({ - contacts: Object.assign(this.state.contacts, obj) + contacts: Object.assign(this.state.contacts, obj), + draggingContact: contact, }) } }; @@ -148,7 +151,7 @@ class SensorGrid extends Component{ document.removeEventListener('mouseup', this._onDocumentMouseUp); document.removeEventListener('mousemove', this._onDocumentMouseMove); const contact = this.state.draggingContact; - const speed = 1; //TODO: Replace with selected speed + const speed = 0.5; //TODO: Replace with selected speed this.props.client.mutate({ mutation: gql` mutation MoveSensorContact($id: ID!, $contact: SensorContactInput!){ @@ -205,7 +208,7 @@ class SensorGrid extends Component{ return true; } //Make sure the contact doesn't need to be updated - if (contact.icon !== this.state.contacts[contact.id].iconUrl){ + if (contact.iconUrl !== this.state.contacts[contact.id].iconUrl){ return true; } //It means the contact either has little or no changes @@ -237,15 +240,22 @@ class SensorGrid extends Component{ return prev; },{}) }).then((contacts) => { + if (Object.keys(contacts).length > 0){ + console.log('Updating State'); this.setState({ contacts: Object.assign(this.state.contacts, contacts) }) + } }); //Now handle the simple update contacts const newContacts = this.state.contacts; simpleUpdateContacts.forEach((contact) => { const geometry = newContacts[contact.id].geometry; + const destination = this.state.draggingContact.destination; newContacts[contact.id] = contact; + if (this.state.dragging) { + newContacts[contact.id].destination = destination; + } newContacts[contact.id].geometry = geometry; }) this.setState({ @@ -280,7 +290,10 @@ class SensorGrid extends Component{ _onDragStart(e, intersection) { const contactId = intersection.object.name; const contact = this.state.contacts[contactId]; - const position = new THREE.Vector3(contact.location.x, contact.location.y, contact.location.z); + // Use the materials transparency to decide wether to use location or destination as the origin + const position = intersection.object.material.transparent ? + new THREE.Vector3(contact.location.x, contact.location.y, contact.location.z) : + new THREE.Vector3(contact.destination.x, contact.destination.y, contact.destination.z); this.setState({ dragging: true, draggingContact: contact,
1
diff --git a/packages/app/src/pages/[[...path]].page.tsx b/packages/app/src/pages/[[...path]].page.tsx @@ -314,10 +314,11 @@ async function getPageData(context: GetServerSidePropsContext, props: Props): Pr const result: IPageWithMeta = await pageService.findPageAndMetaDataByViewer(pageId, currentPathname, user, true); // includeEmpty = true, isSharedPage = false const page = result?.data as unknown as PageDocument; - // populate + // populate & check if the revision is latest if (page != null) { page.initLatestRevisionField(revisionId); await page.populateDataToShowRevision(); + props.isLatestRevision = page.isLatestRevision(); } return result; @@ -442,16 +443,6 @@ export const getServerSideProps: GetServerSideProps = async(context: GetServerSi } } - // check revision - const isSpecifiedRevisionExist = await crowi.revisionService.isSpecifiedRevisionExist(revisionId); - const page = pageWithMeta?.data; - if (page == null || page.latestRevision == null || revisionId == null || !isSpecifiedRevisionExist) { - props.isLatestRevision = true; - } - else { - props.isLatestRevision = page.latestRevision.toString() === revisionId; - } - injectRoutingInformation(context, props, pageWithMeta); injectServerConfigurations(context, props);
4
diff --git a/token-metadata/0x8E870D67F660D95d5be530380D0eC0bd388289E1/metadata.json b/token-metadata/0x8E870D67F660D95d5be530380D0eC0bd388289E1/metadata.json "symbol": "PAX", "address": "0x8E870D67F660D95d5be530380D0eC0bd388289E1", "decimals": 18, - "dharmaVerificationStatus": { "dharmaVerificationStatus": "VERIFIED" } \ No newline at end of file -} \ No newline at end of file
3
diff --git a/src/js/base/module/Buttons.js b/src/js/base/module/Buttons.js @@ -655,8 +655,8 @@ export default class Buttons { build($container, groups) { for (let groupIdx = 0, groupLen = groups.length; groupIdx < groupLen; groupIdx++) { const group = groups[groupIdx]; - const groupName = group[0]; - const buttons = (group.length === 1) ? [group[0]] : group[1]; + const groupName = $.isArray(group) ? group[0] : group; + const buttons = $.isArray(group) ? ((group.length === 1) ? [group[0]] : group[1]) : [group]; const $group = this.ui.buttonGroup({ className: 'note-' + groupName
11
diff --git a/docs/docs/05-configuration.md b/docs/docs/05-configuration.md @@ -46,7 +46,6 @@ $ snowpack dev --no-bundle "unistore/full/preact.es.js", // An ESM file within a package (supports globs) "bulma/css/bulma.css" // A non-JS static asset (supports globs) ], - "homepage": "/your-project", "scripts": { /* ... */ }, "installOptions": { /* ... */ }, "devOptions": { /* ... */ }, @@ -64,10 +63,6 @@ $ snowpack dev --no-bundle - Useful for excluding tests and other unnecessary files from the final build. Supports glob pattern matching. - **`install`** | `string[]` - Known dependencies to install with Snowpack. Useful for installing packages manually and any dependencies that couldn't be detected by our automatic import scanner (ex: package CSS files). -- **`homepage`** | `string` - - By default, Snowpack's builds your app assuming it will be hosted at the server root. - - You can set the "homepage" whenever your project is deployed anywhere other than the domain's root URL. - - Note: Snowpack will also read this value from your `package.json` manifest. - **`scripts`** - Set build scripts to transform your source files. See the section below for more info. - **`installOptions.*`** @@ -126,7 +121,7 @@ $ snowpack dev --no-bundle #### Build Options - **`baseUrl`** | `string` | Default: `/` - - In your HTML, replace all instances of `%PUBLIC_URL%` with this (inspired by the same [Create React App](https://create-react-app.dev/docs/using-the-public-folder/) concept). This is useful if your app will be deployed to a subdirectory. + - In your HTML, replace all instances of `%PUBLIC_URL%` with this (inspired by the same [Create React App](https://create-react-app.dev/docs/using-the-public-folder/) concept). This is useful if your app will be deployed to a subdirectory. _Note: if you have `homepage` in your `package.json`, Snowpack will actually pick up on that, too._ - **`metaDir`** | `string` | Default: `__snowpack__` - By default, Snowpack outputs Snowpack-related metadata such as [HMR](#hot-module-replacement) and [ENV](#environment-variables) info to a folder called `__snowpack__`. You can rename that folder with this option (e.g.: `metaDir: 'static/snowpack'`).
2
diff --git a/package.json b/package.json "build-server": "npm run build && node ./scripts/build-electron-server.js", "lint": "eslint .", "cloc": "cloc . --exclude-dir=node_modules,config,scripts", - "test": "npm run lint && npm run flow && jest", + "test": "npm run lint && jest", "flow": "flow", "precommit": "lint-staged" },
2
diff --git a/lib/util.js b/lib/util.js @@ -113,7 +113,12 @@ util.log = async (message, logMessage, logEmbed) => { return; } try { + if (logMessage && logEmbed) await message.guild.channels.resolve(guilds.get(message.guild.id).logChannel).send(logMessage, new Discord.MessageEmbed(logEmbed)); + else if (logMessage) + await message.guild.channels.resolve(guilds.get(message.guild.id).logChannel).send(logMessage); + else if (logEmbed) + await message.guild.channels.resolve(guilds.get(message.guild.id).logChannel).send(new Discord.MessageEmbed(logEmbed)); } catch (e) { console.error("Failed to log", e) }
11
diff --git a/core/algorithm-builder/environments/java/dockerfile/DockerfileTemplate b/core/algorithm-builder/environments/java/dockerfile/DockerfileTemplate @@ -3,7 +3,6 @@ LABEL maintainer="[email protected]" ENV PACKAGES_REGISTRY_USER ${PACKAGES_REGISTRY_USER} ENV PACKAGES_TOKEN ${PACKAGES_TOKEN} COPY ./dockerfile/cpy-settings ./algorithm_unique_folder/src/main/resources/settings.xml* /root/.m2/ -RUN ls /root/.m2/ COPY ./jars/* /hkube/algorithm-runner/ COPY algorithm_unique_folder/ /hkube/algorithm-runner/algorithm_unique_folder/ COPY ./runJava.sh /hkube/algorithm-runner/
2
diff --git a/apigateway.go b/apigateway.go @@ -501,6 +501,17 @@ func (api *API) LogicalResourceName() string { return CloudFormationResourceName("APIGateway", api.name) } +// RestAPIURL returns the dynamically assigned +// Rest API URL including the scheme +func (api *API) RestAPIURL() *gocf.StringExpr { + return gocf.Join("", + gocf.String("https://"), + gocf.Ref(api.LogicalResourceName()), + gocf.String(".execute-api."), + gocf.Ref("AWS::Region"), + gocf.String(".amazonaws.com")) +} + func (api *API) corsEnabled() bool { return api.CORSEnabled || (api.CORSOptions != nil) }
0
diff --git a/app/models/table/user_table.rb b/app/models/table/user_table.rb @@ -87,24 +87,6 @@ class UserTable < Sequel::Model def_delegators :relator, :affected_visualizations - def_dataset_method(:search) do |query| - conditions = <<-EOS - to_tsvector('english', coalesce(name, '') || ' ' || coalesce(description, '')) @@ plainto_tsquery('english', ?) OR name ILIKE ? - EOS - where(conditions, query, "%#{query}%") - end - - def_dataset_method(:multiple_order) do |criteria| - if criteria.nil? || criteria.empty? - order(:id) - else - order_params = criteria.map do |key, order| - Sequel.send(order.to_sym, key.to_sym) - end - order(*order_params) - end - end - # Ignore mass-asigment on not allowed columns self.strict_param_setting = false
2
diff --git a/src/extensions/scratch3_microbit/index.js b/src/extensions/scratch3_microbit/index.js @@ -620,7 +620,7 @@ class Scratch3MicroBitBlocks { opcode: 'displayText', text: formatMessage({ id: 'microbit.displayText', - default: 'display [TEXT]', + default: 'display text [TEXT]', description: 'display text on the micro:bit display' }), blockType: BlockType.COMMAND,
10
diff --git a/server/game/triggeredability.js b/server/game/triggeredability.js @@ -26,8 +26,7 @@ class TriggeredAbility extends BaseAbility { const DefaultLocationForType = { event: 'hand', - agenda: 'agenda', - plot: 'active plot' + province: 'province' }; this.game = game;
3
diff --git a/tests/jsunit/block_test.js b/tests/jsunit/block_test.js @@ -264,9 +264,9 @@ function test_set_style() { var styleStub = { getBlockStyle: function() { return{ - "primaryColour": "colour1", - "secondaryColour":"colour2", - "tertiaryColour":"colour3" + "primaryColour": "#FFFFFF", + "secondaryColour":"#AABBCC", + "tertiaryColour":"#DDEEFF" } } }; @@ -274,9 +274,9 @@ function test_set_style() { var blockA = workspace.newBlock('row_block'); blockA.setStyle('styleOne'); - assertEquals(blockA.colour_, 'colour1'); - assertEquals(blockA.secondaryColour_, 'colour2'); - assertEquals(blockA.tertiaryColour_, 'colour3'); + assertEquals(blockA.colour_, '#FFFFFF'); + assertEquals(blockA.secondaryColour_, '#AABBCC'); + assertEquals(blockA.tertiaryColour_, '#DDEEFF'); blockTest_tearDown(); }
1
diff --git a/website_code/scripts/xapi_dashboard.js b/website_code/scripts/xapi_dashboard.js @@ -79,6 +79,22 @@ xAPIDashboard.prototype.displayFrequencyGraph = function(statements, element) { begin.setDate(begin.getDate() - 1); end = new Date(dashstatements[dashstatements.length - 1].timestamp); end.setDate(end.getDate() + 1); + + var vals = []; + var timeFrame = end.getTime() - begin.getTime(); + var tickmarkDuration = timeFrame / 8; + //round to nearset day + var tickMarkNrDays = Math.round(tickmarkDuration / (1000 * 3600 * 24)); + if (tickMarkNrDays < 1) + { + tickMarkNrDays = 1; + } + var tick = begin.getTime(); + while(tick < end.getTime()) { + vals.push(tick); + tick += (tickMarkNrDays * 1000 * 3600 * 24); + } + var dash = new ADL.XAPIDashboard(); dash.addStatements(dashstatements); var chart = dash.createLineChart({ @@ -98,6 +114,7 @@ xAPIDashboard.prototype.displayFrequencyGraph = function(statements, element) { chart.xAxis.tickFormat(function(label) { return d3.time.format('%b %d')(new Date(label)); }); + chart.xAxis.tickValues(vals); }, post: function(data) { data.contents.map(function(el) { @@ -952,6 +969,20 @@ xAPIDashboard.prototype.drawActivityChart = function(elmnt, begin, end, link = t var launchedStatements = this.data.getStatementsList(this.data.rawData, "http://adlnet.gov/expapi/verbs/launched"); dash.addStatements(launchedStatements); template_id = this.data.info.template_id; + var vals = []; + var timeFrame = end.getTime() - begin.getTime(); + var tickmarkDuration = timeFrame / 8; + //round to nearset day + var tickMarkNrDays = Math.round(tickmarkDuration / (1000 * 3600 * 24)); + if (tickMarkNrDays < 1) + { + tickMarkNrDays = 1; + } + var tick = begin.getTime(); + while(tick < end.getTime()) { + vals.push(tick); + tick += (tickMarkNrDays * 1000 * 3600 * 24); + } var chart = dash.createLineChart({ container: '#graph-svg-wrapper-' + this.data.info.template_id + ' svg', groupBy: 'timestamp', @@ -983,6 +1014,7 @@ xAPIDashboard.prototype.drawActivityChart = function(elmnt, begin, end, link = t } return intllabel; }); + chart.xAxis.tickValues(vals); }, post: function(data) { data.contents.map(function(el) {
7
diff --git a/src/selectors/dataSelectors.js b/src/selectors/dataSelectors.js @@ -254,13 +254,24 @@ export const visibleRowCountSelector = createSelector( ); // TODO: Needs tests and jsdoc -export const cellValueSelector = (state, { griddleKey, columnId }) => { +export const cellValueSelector = (state, props) => { + const { griddleKey, columnId } = props; + const cellProperties = cellPropertiesSelector(state, props); + //TODO: Make Griddle key a string in data utils const lookup = state.getIn(['lookup', griddleKey.toString()]); - return state + const value = state .get('data').get(lookup) .getIn(columnId.split('.')); + const type = !!cellProperties ? cellProperties.type : 'string'; + switch (type) { + case 'date': + return value.toString(); + case 'string': + default: + return value; + } }; // TODO: Needs tests and jsdoc
0
diff --git a/test/routes/v2-launches.test.js b/test/routes/v2-launches.test.js @@ -97,8 +97,8 @@ test('It should return a specific Launch info', async () => { expect(item).toHaveProperty('mission_name', expect.anything()); expect(item).toHaveProperty('launch_year', expect.stringMatching(/^[0-9]{4}$/)); expect(item).toHaveProperty('launch_date_unix'); - expect(item).toHaveProperty('launch_date_utc', expect.anything()); - expect(item).toHaveProperty('launch_date_local', expect.anything()); + expect(item).toHaveProperty('launch_date_utc'); + expect(item).toHaveProperty('launch_date_local'); expect(item).toHaveProperty('rocket.rocket_id'); expect(item).toHaveProperty('rocket.rocket_name'); expect(item).toHaveProperty('rocket.rocket_type');
11
diff --git a/src/components/Goban.js b/src/components/Goban.js @@ -85,8 +85,8 @@ class GobanVertex extends Component { h('span', {title: label}) ), - heat != null && h('div', {class: 'heat'}), - paint != null && h('div', {class: 'paint'}), + !!heat && h('div', {class: 'heat'}), + !!paint && h('div', {class: 'paint'}), highlight && h('div', {class: 'highlight'}) ) } @@ -110,8 +110,7 @@ class GobanLine extends Component { let angle = Math.atan2(dy, dx) * 180 / Math.PI let length = Math.sqrt(dx * dx + dy * dy) - return h('hr', - { + return h('hr', { class: classNames({[type]: true, temporary}), style: { width: length, @@ -120,8 +119,7 @@ class GobanLine extends Component { rotate(${angle}deg) ` } - } - ) + }) } } @@ -193,26 +191,6 @@ class Goban extends Component { this.resize() } - shouldComponentUpdate(nextProps, nextState) { - for (let key in nextProps) { - if (['board', 'highlightVertices', 'dimmedStones', 'paintMap'].includes(key)) continue - - if (nextProps[key] !== this.props[key]) - return true - } - - for (let key in nextState) { - if (nextState[key] !== this.state[key]) - return true - } - - return nextProps.board.getHash() !== this.props.board.getHash() - || !helper.equals(nextProps.highlightVertices, this.props.highlightVertices) - || !helper.equals(nextProps.dimmedStones, this.props.dimmedStones) - || !helper.equals(nextProps.paintMap, this.props.paintMap) - || !helper.equals(nextProps.heatMap, this.props.heatMap) - } - componentWillReceiveProps({board, animatedVertex}) { let dim = board => [board.width, board.height]
2
diff --git a/config/sidebar.yml b/config/sidebar.yml @@ -392,6 +392,9 @@ apis: - title: API Tokens url: "/api/management/v2/tokens" forceFullReload: true + children: + - title: Changes + url: "/api/management/v2/tokens-flows" - title: Query String Syntax url: "/api/management/v2/query-string-syntax" @@ -401,6 +404,10 @@ apis: url: "/api/management/v2/user-search" forceFullReload: true + - title: Changes in v2 + url: "/api/management/v2/changes" + forceFullReload: true + - title: API Explorer url: "/api/management/v2/" forceFullReload: true
0
diff --git a/lib/classes/Service.js b/lib/classes/Service.js @@ -92,7 +92,7 @@ class Service { }; } - const providers = ['aws', 'azure', 'google', 'openwhisk']; + const providers = ['aws', 'azure', 'google', 'openwhisk', 'webtasks']; if (providers.indexOf(serverlessFile.provider.name) === -1) { const errorMessage = [ `Provider "${serverlessFile.provider.name}" is not supported.`,
11
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md @@ -98,8 +98,9 @@ After that: Our tests use [shoulda.js](https://github.com/philc/shoulda.js) and [Puppeteer](https://github.com/puppeteer/puppeteer). To run the tests: - 1. Install [nodejs](https://nodejs.org/) if you don't have it already. - 1. `npm install puppeteer` to install [Puppeteer](https://github.com/puppeteer/puppeteer). + 1. Install [Deno](https://deno.land/) if you don't have it already. + 1. `PUPPETEER_PRODUCT=chrome deno run -A --unstable https://deno.land/x/[email protected]/install.ts` to + install [Puppeteer](https://github.com/lucacasonato/deno-puppeteer) 1. `./make.js test` to build the code and run the tests. ### Coding Style
14
diff --git a/tests/helpers/webdriver-wrapper.js b/tests/helpers/webdriver-wrapper.js @@ -150,9 +150,9 @@ exports.quit = () => driver.quit(); * @param {Number} timeout How long to wait until page is loaded * @return {Promise} Promise that will be resolved when the document has finished loading */ -function getUrl(url, timeout) { - let timeouts = driver.manage().timeouts(); - return timeouts.pageLoadTimeout(timeout || URL_LOAD_TIMEOUT).then(() => { +function getUrl(url, timeout = URL_LOAD_TIMEOUT) { + let timeouts = { pageLoad: timeout }; + return driver.manage().setTimeouts(timeouts).then(() => { return driver.get(url).catch(() => { throw new Error('Unable to load URL: timed out'); });
12
diff --git a/source/datastore/query/LocalQuery.js b/source/datastore/query/LocalQuery.js -import { Class, guid } from '../../core/Core'; +import { Class } from '../../core/Core'; import sortByProperties from '../../core/sortByProperties'; import Query from './Query'; import { EMPTY, READY, OBSOLETE } from '../record/Status'; @@ -45,27 +45,32 @@ const LocalQuery = Class({ mixin - {Object} The properties for the query. */ init ( mixin ) { + this.dependsOn = null; + this.where = null; + this.sort = null; + const sort = mixin.sort; if ( sort && !( sort instanceof Function ) ) { mixin.sort = sortByProperties( sort ); } + LocalQuery.parent.constructor.apply( this, arguments ); }, monitorForChanges () { - const typeId = guid( this.get( 'Type' ) ); - this.get( 'store' ).on( typeId, this, 'setObsolete' ); - }, - - typeStatusChanged ( _, __, oldStatus, newStatus ) { - if ( !( oldStatus & READY ) && ( newStatus & READY ) ) { - this.setObsolete(); - } + const store = this.get( 'store' ); + const types = this.get( 'dependsOn' ) || [ this.get( 'Type' ) ]; + types.forEach( function ( Type ) { + store.on( Type, this, 'setObsolete' ); + }, this ); }, unmonitorForChanges () { - const typeId = guid( this.get( 'Type' ) ); - this.get( 'store' ).off( typeId, this, 'setObsolete' ); + const store = this.get( 'store' ); + const types = this.get( 'dependsOn' ) || [ this.get( 'Type' ) ]; + types.forEach( function ( Type ) { + store.off( Type, this, 'setObsolete' ); + }, this ); }, fetch ( force, callback ) {
0
diff --git a/src/encoded/tests/test_types_antibody_lot.py b/src/encoded/tests/test_types_antibody_lot.py @@ -408,3 +408,72 @@ def test_multi_lane_primary(testapp, if review['biosample_term_name'] == 'HepG2': assert review['status'] == 'not characterized to standards' assert review['detail'] == 'Awaiting a compliant primary characterization and secondary characterization not reviewed.' + + +# A test status calculation when primaries have extraneous characterization_reviews +def test_bonus_char_reviews_in_primary(testapp, + immunoblot, + immunoprecipitation, + mass_spec, + antibody_lot, + human, + target, + wrangler, + document): + + # A not submitted for review primary with no secondary should give status of not pursued + prim_char1 = testapp.post_json('/antibody_characterization', immunoblot).json['@graph'][0] + characterization_review1 = { + 'biosample_term_name': 'K562', + 'biosample_term_id': 'EFO:0002067', + 'biosample_type': 'immortalized cell line', + 'organism': human['@id'], + 'lane': 1, + 'lane_status': 'pending dcc review' + } + testapp.patch_json(prim_char1['@id'], {'status': 'not submitted for review by lab', + 'target': target['@id'], + 'characterization_reviews': [characterization_review1]}) + res = testapp.get(antibody_lot['@id'] + '@@index-data') + ab = res.json['object'] + assert ab['lot_reviews'][0]['status'] == 'not pursued' + assert ab['lot_reviews'][0]['detail'] == 'Awaiting a compliant primary and submission of a secondary characterization.' + + # Adding an in progress primary in a different cell type should result in the ab awaiting characterization + prim_char2 = testapp.post_json('/antibody_characterization', immunoprecipitation).json['@graph'][0] + characterization_review2 = { + 'biosample_term_name': 'HepG2', + 'biosample_term_id': 'EFO:0001187', + 'biosample_type': 'immortalized cell line', + 'organism': human['@id'], + 'lane': 1, + 'lane_status': 'pending dcc review' + } + testapp.patch_json(prim_char2['@id'], {'status': 'in progress', + 'target': target['@id'], + 'characterization_reviews': [characterization_review2]}) + res = testapp.get(antibody_lot['@id'] + '@@index-data') + ab = res.json['object'] + assert len(ab['lot_reviews']) == 2 + for review in ab['lot_reviews']: + if review['biosample_term_name'] == 'K562': + assert review['status'] == 'not pursued' + if review['biosample_term_name'] == 'HepG2': + assert review['status'] == 'awaiting characterization' + assert review['detail'] == 'Awaiting a compliant primary and submission of a secondary characterization.' + + # Adding an exempted secondary should make the ab partially characterized + sec_char = testapp.post_json('/antibody_characterization', mass_spec).json['@graph'][0] + testapp.patch_json(sec_char['@id'], {'status': 'exempt from standards', + 'target': target['@id'], + 'reviewed_by': wrangler['@id'], + 'documents': [document['@id']], + 'comment': 'Please exempt this.', + 'notes': 'OK.'}) + res = testapp.get(antibody_lot['@id'] + '@@index-data') + ab = res.json['object'] + assert len(ab['lot_reviews']) == 2 + for review in ab['lot_reviews']: + if review['biosample_term_name'] in ['K562', 'HepG2']: + assert review['status'] == 'partially characterized' + assert review['detail'] == 'Awaiting a compliant primary characterization.'
0
diff --git a/snippets/server-platforms/rails/setup.md b/snippets/server-platforms/rails/setup.md @@ -7,8 +7,7 @@ Rails.application.config.middleware.use OmniAuth::Builder do '${account.namespace}', callback_path: '/auth/oauth2/callback', authorize_params: { - scope: 'openid profile', - audience: 'https://${account.namespace}/userinfo' + scope: 'openid profile' } ) end
2
diff --git a/app/es_indices/observation_index.rb b/app/es_indices/observation_index.rb @@ -263,14 +263,14 @@ class Observation < ActiveRecord::Base unless o.indexed_private_place_ids.blank? o.indexed_private_places = private_places_by_id.values_at(*o.indexed_private_place_ids).compact.select do |p| always_indexed_place_levels.include?( p.admin_level ) || - Observation::CNC_2018_PLACE_IDS.include?( p.id ) || + Observation.places_without_obscuration_protection.include?( p.id ) || p.bbox_privately_contains_observation?( o ) end o.indexed_private_place_ids = o.indexed_private_places.map(&:id) unless o.geoprivacy == Observation::PRIVATE o.indexed_place_ids = o.indexed_private_places.select {|p| always_indexed_place_levels.include?( p.admin_level ) || - Observation::CNC_2018_PLACE_IDS.include?( p.id ) || + Observation.places_without_obscuration_protection.include?( p.id ) || p.bbox_publicly_contains_observation?( o ) }.map(&:id) end
14
diff --git a/exampleSite/content/docs/fragments/content.md b/exampleSite/content/docs/fragments/content.md @@ -87,6 +87,22 @@ This would overwrite the global one. Aside from the `content/_global/` directory, you can create `_global/` directory in any section's directory (`content/[section]/_global/`). Each section can have global fragments and if there are multiple fragments with the same name, the fragment closest to the page would override the others. +##### Disabling a global fragment in specific pages/sections + +As global fragments are displayed in all children pages, you might want to +disable them in some of those pages or specific sections. You can do so by +duplicating that fragment in the page you want and disable it there. + +For example if you have `/content/_global/nav.md` and want to disable it in your +blog, create `/content/blog/_global/nav.md` with following configuration: + +``` ++++ +fragment = "nav" +disabled = true ++++ +``` + ### Built-in fragments There are several pre-bundled fragments already available in Syna. You can see the full list and their documentation in the [fragments]({{< ref "fragments" >}}) section.
0
diff --git a/html/components/stepper.stories.js b/html/components/stepper.stories.js @@ -464,7 +464,7 @@ export const withCarousel = () => { }, []); return ` - <div class="sprk-u-BackgroundColor--blue sprk-o-Box sprk-o-Box--large"> + <div class="sprk-u-BackgroundColor--dark-purple sprk-o-Box sprk-o-Box--large"> <div class="sprk-o-CenteredColumn sprk-o-Stack sprk-o-Stack--medium sprk-o-Stack--center-column sprk-o-Stack--split-reverse@xl"> <div class="sprk-o-Stack__item sprk-o-Stack__item--flex@xl"> <div
3
diff --git a/package.json b/package.json "underscore": "^1.8.3" }, "devDependencies": { - "@babel/core": "7.0.0", - "@babel/plugin-proposal-class-properties": "7.4.4", + "@babel/core": "7.5.0", + "@babel/plugin-proposal-class-properties": "7.5.0", "@babel/plugin-transform-exponentiation-operator": "7.2.0", - "@babel/plugin-transform-flow-strip-types": "7.0.0", - "@babel/plugin-transform-runtime": "7.0.0", - "@babel/runtime": "7.0.0", + "@babel/plugin-transform-flow-strip-types": "7.4.4", + "@babel/plugin-transform-runtime": "7.5.0", + "@babel/runtime": "7.5.0", "babel-core": "7.0.0-bridge.0", "babel-eslint": "^10.0.1", "babel-jest": "24.8.0",
3
diff --git a/articles/connections/passwordless/ios-magic-link.md b/articles/connections/passwordless/ios-magic-link.md -# Lock iOS: Passwordless with Magic Link +--- +title: Lock iOS v1 Passwordless Magic Links +description: Using Passwordless Magic Links with Lock for iOS v1 +--- -Using the Lock library, you can implement a Passwordless login flow using Magic Link authentication for your iOS applications. +# Lock iOS v1: Passwordless with Magic Link + +Using [Lock v1 for iOS](/libraries/lock-ios/v1), you can implement a Passwordless login flow using Magic Link authentication for your iOS applications. [Click here](https://github.com/auth0/Mobile-Samples.iOS) for iOS sample applications. -:::panel-info +::: panel-info Universal Links Before beginning this tutorial, [enable Universal Links](/clients/enable-universal-links/) between your iOS application and Auth0 Client. :::
1
diff --git a/token-metadata/0x954b890704693af242613edEf1B603825afcD708/metadata.json b/token-metadata/0x954b890704693af242613edEf1B603825afcD708/metadata.json "symbol": "CARD", "address": "0x954b890704693af242613edEf1B603825afcD708", "decimals": 18, - "dharmaVerificationStatus": { "dharmaVerificationStatus": "VERIFIED" } \ No newline at end of file -} \ No newline at end of file
3
diff --git a/token-metadata/0x5d48F293BaED247A2D0189058bA37aa238bD4725/metadata.json b/token-metadata/0x5d48F293BaED247A2D0189058bA37aa238bD4725/metadata.json "symbol": "NCC", "address": "0x5d48F293BaED247A2D0189058bA37aa238bD4725", "decimals": 18, - "dharmaVerificationStatus": { "dharmaVerificationStatus": "VERIFIED" } \ No newline at end of file -} \ No newline at end of file
3
diff --git a/spec/models/observation_spec.rb b/spec/models/observation_spec.rb @@ -1716,11 +1716,13 @@ describe Observation do it "should not make a guess for problematic names" do Taxon::PROBLEM_NAMES.each do |name| - t = Taxon.make!(:name => name.capitalize) + t = Taxon.make( name: name.capitalize ) + if t.save o = Observation.make!(:species_guess => name) expect(o.taxon_id).not_to eq t.id end end + end it "should choose a taxon from a parenthesized scientific name" do name = "Northern Pygmy Owl (Glaucidium gnoma)"
1
diff --git a/sample/html/examples.html b/sample/html/examples.html imageSize <span class="pl-k">:</span> <span class="pl-s">150</span>, buttonList <span class="pl-k">:</span> [ [<span class="pl-s"><span class="pl-pds">'</span>font<span class="pl-pds">'</span></span>, <span class="pl-s"><span class="pl-pds">'</span>fontSize<span class="pl-pds">'</span></span>], - [<span class="pl-s"><span class="pl-pds">'</span>image<span class="pl-pds">'</span></span>, <span class="pl-s"><span class="pl-pds">'</span>video<span class="pl-pds">'</span></span>] + [<span class="pl-s"><span class="pl-pds">'</span>image<span class="pl-pds">'</span></span>, + <span class="pl-c">// Set the display attribute of the "image" module to "full"</span> + { + buttonClass:<span class="pl-s"><span class="pl-pds">''</span></span>, + title:<span class="pl-s"><span class="pl-pds">'</span>image<span class="pl-pds">'</span></span>, + dataCommand:<span class="pl-s"><span class="pl-pds">'</span>image<span class="pl-pds">'</span></span>, + dataDisplay:<span class="pl-s"><span class="pl-pds">'</span>dialog<span class="pl-pds">'</span></span>, + displayOption:<span class="pl-s"><span class="pl-pds">'</span>full<span class="pl-pds">'</span></span>, + innerHTML:<span class="pl-s"><span class="pl-pds">'</span>&lt;div class="ico_picture"&gt;&lt;/div&gt;<span class="pl-pds">'</span></span> + }, + <span class="pl-s"><span class="pl-pds">'</span>video<span class="pl-pds">'</span></span> + ] ] });</pre> </div> imageSize : 150, buttonList : [ ['font', 'fontSize'], - ['image', 'video'] + [ + { + buttonClass:'', + title:'image', + dataCommand:'image', + dataDisplay:'dialog', + displayOption:'full', + innerHTML:'<div class="ico_picture"></div>' + }, + 'video' + ] ] });
3
diff --git a/lib/compressDracoMeshes.js b/lib/compressDracoMeshes.js 'use strict'; var Cesium = require('cesium'); +var draco3d = require('draco3d'); +var hashObject = require('object-hash'); var ForEach = require('./ForEach'); var addExtensionsRequired = require('./addExtensionsRequired'); var addToArray = require('./addToArray'); var byteLengthForComponentType = require('./byteLengthForComponentType'); -var draco3d = require('draco3d'); var getAccessorByteStride = require('./getAccessorByteStride'); var getComponentReader = require('./getComponentReader.js'); -var hashObject = require('object-hash'); +var hasExtension = require('./hasExtension.js'); var numberOfComponentsForType = require('./numberOfComponentsForType'); var defined = Cesium.defined; @@ -235,8 +236,7 @@ function removeBufferViews(gltf) { } }); - if (defined(gltf.extensionsUsed) && - gltf.extensionsUsed.indexOf('KHR_draco_mesh_compression') >= 0) { + if (hasExtension('KHR_draco_mesh_compression')) { ForEach.mesh(gltf, function(mesh) { ForEach.meshPrimitive(mesh, function(primitive) { if (defined(primitive.extensions) && @@ -291,8 +291,7 @@ function getNamedAttributeData(gltf, primitive, semantic) { }; } -function addCompressionExtensionToPrimitive(gltf, primitive, - attributeToId, encodedLen, encodedData) { +function addCompressionExtensionToPrimitive(gltf, primitive, attributeToId, encodedLength, encodedData) { // Remove properties from accessors. // Remove indices bufferView. @@ -324,7 +323,7 @@ function addCompressionExtensionToPrimitive(gltf, primitive, } var buffer = { - byteLength : encodedLen, + byteLength : encodedLength, extras : { _pipeline : { extension : '.bin', @@ -336,7 +335,7 @@ function addCompressionExtensionToPrimitive(gltf, primitive, var bufferView = { buffer : bufferId, byteOffset : 0, - byteLength : encodedLen + byteLength : encodedLength }; var bufferViewId = addToArray(gltf.bufferViews, bufferView); @@ -347,7 +346,7 @@ function addCompressionExtensionToPrimitive(gltf, primitive, } var draco_extension = { bufferView : bufferViewId, - attributes : attributeToId, + attributes : attributeToId }; extensions.KHR_draco_mesh_compression = draco_extension; } @@ -367,7 +366,7 @@ function copyCompressedExtensionToPrimitive(primitive, compressedPrimitive) { primitive.extensions = extensions; var copied_extension = { bufferView : draco_extension.bufferView, - attributes : draco_extension.attributes, + attributes : draco_extension.attributes }; extensions.KHR_draco_mesh_compression = copied_extension; } @@ -439,7 +438,7 @@ function compressDracoMeshes(gltf, options) { mode : primitive.mode }; var hashValue = hashObject(primitiveGeometry); - if (hashPrimitives[hashValue] !== undefined) { + if (defined(hashPrimitives[hashValue])) { // Copy compressed primitive. copyCompressedExtensionToPrimitive(primitive, hashPrimitives[hashValue]); return;
1
diff --git a/static/scss/partials/_wallets.scss b/static/scss/partials/_wallets.scss color: #797979; display: block; font-size: rem(13px); + margin-bottom: .5rem; transition: .2s all; + @media (min-width: $min-width-sm) { + margin-bottom: rem(5px); + } + + @media (min-width: $min-width-md) { + margin-bottom: 0; + } + &:hover { color: $picton-blue; } h4 { color: #000; line-height: rem(18px); - margin-bottom: 0; + + @media (min-width: $min-width-md) { + margin-bottom: rem(2px); + } a { color: #000;
7
diff --git a/index.d.ts b/index.d.ts @@ -23,10 +23,16 @@ export interface RedomComponent { onunmount?(): void; } -export interface RedomComponentConstructor { +export interface RedomComponentFunction { new (): RedomComponent; } +export class RedomComponentClass implements RedomComponent { + el: HTMLElement; +} + +export type RedomComponentConstructor = RedomComponentClass | RedomComponentFunction; + export class ListPool { constructor(View: RedomComponentConstructor, key?: string, initData?: any);
3
diff --git a/articles/connections/database/rate-limits.md b/articles/connections/database/rate-limits.md @@ -16,7 +16,7 @@ For database connections Auth0 limits certain types of repeat login attempts dep - If a user enters their password incorrectly more than 10 times from a single IP address, they will be blocked from logging into that account from that IP address. Auth0 will send an email containing a link to unblock the user to the owner of the database account. This the [Brute Force Protection](/anomaly-detection#brute-force-protection) shield as part of Auth0's Anomaly Detection. - - A user cannot login more than 5 times per minute as the same user from the same location, regardless of having the correct credentials. This limit does not apply if the frequent requests are from different users. +- If a user attempts to login 20 times per minute as the same user from the same location, regardless of having the correct credentials, the rate limit will come into effect. When this happens, the user can make 10 attempts per minute. Most endpoints at the moment support this rate limit, and soon all of them will. ## Unblocking a User
3
diff --git a/tools/utils/PlatformSetup.hx b/tools/utils/PlatformSetup.hx @@ -1654,8 +1654,12 @@ class PlatformSetup { public static function setupLime ():Void { + if (!targetFlags.exists ("cli")) { + setupHaxelib (new Haxelib ("lime")); + } + var haxePath = Sys.getEnv ("HAXEPATH"); if (PlatformHelper.hostPlatform == Platform.WINDOWS) { @@ -1848,9 +1852,20 @@ class PlatformSetup { public static function setupOpenFL ():Void { + if (!targetFlags.exists ("cli")) { + setupHaxelib (new Haxelib ("openfl")); + } + var haxePath = Sys.getEnv ("HAXEPATH"); + var project = null; + + try { + + project = HXProject.fromHaxelib (new Haxelib ("openfl")); + + } catch (e:Dynamic) {} if (PlatformHelper.hostPlatform == Platform.WINDOWS) { @@ -1862,8 +1877,13 @@ class PlatformSetup { try { File.copy (HaxelibHelper.getPath (new Haxelib ("lime")) + "\\templates\\\\bin\\lime.exe", haxePath + "\\lime.exe"); } catch (e:Dynamic) {} try { File.copy (HaxelibHelper.getPath (new Haxelib ("lime")) + "\\templates\\\\bin\\lime.sh", haxePath + "\\lime"); } catch (e:Dynamic) {} - try { File.copy (HaxelibHelper.getPath (new Haxelib ("openfl")) + "\\templates\\\\bin\\openfl.exe", haxePath + "\\openfl.exe"); } catch (e:Dynamic) {} - try { File.copy (HaxelibHelper.getPath (new Haxelib ("openfl")) + "\\templates\\\\bin\\openfl.sh", haxePath + "\\openfl"); } catch (e:Dynamic) {} + + try { + + FileHelper.copyFileTemplate (project.templatePaths, "bin/openfl.exe", haxePath + "\\openfl.exe"); + FileHelper.copyFileTemplate (project.templatePaths, "bin/openfl.sh", haxePath + "\\openfl"); + + } catch (e:Dynamic) {} } else { @@ -1892,7 +1912,7 @@ class PlatformSetup { ProcessHelper.runCommand ("", "sudo", [ "cp", "-f", HaxelibHelper.getPath (new Haxelib ("lime")) + "/templates/bin/lime.sh", "/usr/local/bin/lime" ], false); ProcessHelper.runCommand ("", "sudo", [ "chmod", "755", "/usr/local/bin/lime" ], false); - ProcessHelper.runCommand ("", "sudo", [ "cp", "-f", HaxelibHelper.getPath (new Haxelib ("openfl")) + "/templates/bin/openfl.sh", "/usr/local/bin/openfl" ], false); + ProcessHelper.runCommand ("", "sudo", [ "cp", "-f", PathHelper.findTemplate (project.templatePaths, "bin/openfl.sh"), "/usr/local/bin/openfl" ], false); ProcessHelper.runCommand ("", "sudo", [ "chmod", "755", "/usr/local/bin/openfl" ], false); installedCommand = true; @@ -1910,7 +1930,7 @@ class PlatformSetup { Sys.println (""); Sys.println ("sudo cp \"" + PathHelper.combine (HaxelibHelper.getPath (new Haxelib ("lime")), "templates/bin/lime.sh") + "\" /usr/local/bin/lime"); Sys.println ("sudo chmod 755 /usr/local/bin/lime"); - Sys.println ("sudo cp \"" + PathHelper.combine (HaxelibHelper.getPath (new Haxelib ("openfl")), "templates/bin/openfl.sh") + "\" /usr/local/bin/openfl"); + Sys.println ("sudo cp \"" + PathHelper.findTemplate (project.templatePaths, "bin/openfl.sh") + "\" /usr/local/bin/openfl"); Sys.println ("sudo chmod 755 /usr/local/bin/openfl"); Sys.println (""); @@ -2137,7 +2157,7 @@ class PlatformSetup { if (FileSystem.exists (git)) { - LogHelper.info ("\x1b[32;1mUpdating \"" + haxelib.name + "\"\x1b[0m"); + LogHelper.info (LogHelper.accentColor + "Updating \"" + haxelib.name + "\"" + LogHelper.resetColor); if (PlatformHelper.hostPlatform == Platform.WINDOWS) {
7
diff --git a/token-metadata/0x17540494Ad5E39AEFD49901774528e9ff17FE40B/metadata.json b/token-metadata/0x17540494Ad5E39AEFD49901774528e9ff17FE40B/metadata.json "symbol": "PRIVATE", "address": "0x17540494Ad5E39AEFD49901774528e9ff17FE40B", "decimals": 3, - "dharmaVerificationStatus": { "dharmaVerificationStatus": "VERIFIED" } \ No newline at end of file -} \ No newline at end of file
3
diff --git a/angular/projects/spark-angular/src/lib/components/sprk-masthead/sprk-masthead.stories.ts b/angular/projects/spark-angular/src/lib/components/sprk-masthead/sprk-masthead.stories.ts @@ -1099,7 +1099,7 @@ extended.story = { }, }; -export const withOutCollapsibleNav = () => ({ +export const withoutCollapsibleNav = () => ({ moduleMetadata: modules, template: ` <sprk-masthead> @@ -1217,7 +1217,7 @@ export const withOutCollapsibleNav = () => ({ }, }); -withOutCollapsibleNav.story = { +withoutCollapsibleNav.story = { parameters: { jest: ['sprk-masthead.component'], },
3
diff --git a/packages/sling-web-component-form/src/state/FormReducer.js b/packages/sling-web-component-form/src/state/FormReducer.js -import { setIn, isDeeplyEmpty, omit, isPromise } from 'sling-helpers/src'; +import { setIn, isDeeplyEmpty, omit, isPromise, toFlatEntries } from 'sling-helpers/src'; import { createStore, applyMiddleware } from 'redux'; import thunk from 'redux-thunk'; import CancelablePromise from 'cancelable-promise'; -export const FORM = Symbol('FORM'); +export const FORM = '__FORM__'; const INITIAL_FIELD_STATE = { error: null, @@ -138,8 +138,9 @@ const atFormLevel = (...args) => atLevel(errObj => errObj || {})(...args); const validate = (fieldId, validatorThunk) => (dispatch, getState) => { const field = getState()[fieldId]; + const fieldExists = field != null; - if (field != null) { + if (fieldExists) { const { validation: previousValidation } = field; if (previousValidation) { @@ -168,15 +169,22 @@ export const validateForm = (validatorFn, obj) => // SELECTORS -export const selectIsValid = state => isDeeplyEmpty(state[FORM].error) && - Object.values(state).every(({ error }) => error == null); +const getForm = state => state[FORM]; -export const selectIsValidating = state => state[FORM].isValidating === true || - Object.values(state).some(({ isValidating }) => isValidating === true); +const getFields = state => Object + .entries(state) + .filter(([key]) => key !== FORM) + .reduce(toFlatEntries, {}); -export const selectUserState = (state) => { - const form = state[FORM]; - const fieldEntries = Object.entries(state); +export const getIsValid = state => isDeeplyEmpty(getForm(state).error) && + Object.values(getFields(state)).every(value => value.error == null); + +export const getIsValidating = state => + Object.values(state).some(value => value.isValidating === true); + +export const getUserState = (state) => { + const form = getForm(state); + const fieldEntries = Object.entries(getFields(state)); const errors = { ...form.error, @@ -193,13 +201,14 @@ export const selectUserState = (state) => { const isValidatingField = fieldEntries.reduce((result, [fieldId, obj]) => setIn(result, fieldId, obj.isValidating), {}); - const isValid = selectIsValid(state); + const isValid = getIsValid(state); - const isValidating = selectIsValidating(state); + const isValidating = getIsValidating(state); return { errors, values, touched, isValid, isValidating, isValidatingField }; }; + // TESTS const requiredField = value => (!value @@ -215,7 +224,7 @@ store.subscribe(() => { if (previousState !== currentState) { console.log(currentState); - console.log(selectUserState(currentState)); + console.log(getUserState(currentState)); } previousState = currentState;
7
diff --git a/test/testingpage/index.html b/test/testingpage/index.html </div> </div> - <script type="text/javascript" src="./scripts/adapter.js"></script> - <script type="text/javascript" src="./scripts/socket.io.js"></script> - <script type="text/javascript" src="./scripts/jquery-3.2.1.min.js"></script> + <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script> + <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.2.0/socket.io.js" type="text/javascript"></script> + <script src="https://webrtchacks.github.io/adapter/adapter-7.0.0.js" type="text/javascript"></script> <script type="text/javascript" src="./scripts/owt.js"></script> <script type="text/javascript" src="script2.js"></script> <!--
14
diff --git a/src/encoded/upgrade/upgrade_data/analysis_step_5_to_6.py b/src/encoded/upgrade/upgrade_data/analysis_step_5_to_6.py @@ -205,7 +205,9 @@ label_mapping = { 'zhiping-weng:bed-2-bigbed': 'bed-2-bigbed-step', 'zhiping-weng:celltype-cre-id': 'celltype-cre-identification-step', 'zhiping-weng:cluster-filter': 'cluster-filter-step', - 'zhiping-weng:generalized-cre-id': 'generalized-cre-identification-step' + 'zhiping-weng:generalized-cre-id': 'generalized-cre-identification-step', + 'zhiping-weng:ChromHMM-bed-conversion-step': 'chromhmm-bedtobigbed-step', + 'zhiping-weng:ChromHMM-chromatin-state-calling-step': 'chromhmm-chromatin-state-calling-step' } major_version_mapping = { @@ -415,15 +417,17 @@ major_version_mapping = { 'zhiping-weng:bed-2-bigbed': 1, 'zhiping-weng:celltype-cre-id': 1, 'zhiping-weng:cluster-filter': 1, - 'zhiping-weng:generalized-cre-id': 1 + 'zhiping-weng:generalized-cre-id': 1, + 'zhiping-weng:ChromHMM-bed-conversion-step': 1, + 'zhiping-weng:ChromHMM-chromatin-state-calling-step': 1 } title_mapping = { - 'j-michael-cherry:fecdf1f3-6547-41f5-ae38-501437ef8357': 'WGBS Bismark-bowtie1 genome indexing step - Version 2', + 'j-michael-cherry:fecdf1f3-6547-41f5-ae38-501437ef8357': 'WGBS Bismark-bowtie1 genome indexing step', 'j-michael-cherry:ff1f5989-1866-417e-a4b7-04879283cb3e': 'DNase-seq mapping and peak calling step', - 'j-michael-cherry:3fa67405-fa88-4627-b3eb-04f789eb5d29': 'Long RNA-seq STAR paired-ended alignment step v2.0', - 'dnanexus:align-star-se-v-2': 'Long RNA-seq STAR single-ended alignment step v2.0', - 'dnanexus:dme-index-bismark-bowtie2-v-2': 'WGBS Bismark-bowtie2 genome indexing step - Version 1', + 'j-michael-cherry:3fa67405-fa88-4627-b3eb-04f789eb5d29': 'Long RNA-seq STAR paired-ended alignment step', + 'dnanexus:align-star-se-v-2': 'Long RNA-seq STAR single-ended alignment step', + 'dnanexus:dme-index-bismark-bowtie2-v-2': 'WGBS Bismark-bowtie2 genome indexing step', 'ross-hardison:atac-seq-alignment-step-v-1': 'ATAC-seq filtration and alignment step', 'ross-hardison:atac-seq-peak-calling-step-v-1': 'ATAC-seq peak calling step', 'ross-hardison:atac-seq-peak-filtering-step-v-1': 'ATAC-seq peak filtering step', @@ -563,7 +567,9 @@ title_mapping = { 'dnanexus:dme-extract-se-v-2': 'WGBS Bismark single-end methylation extraction step', 'j-michael-cherry:fecdf1f3-6547-41f5-ae38-501437ef8357': 'WGBS Bismark bowtie1 genome indexing step', 'dnanexus:dme-index-bismark-bowtie2-v-2': 'WGBS Bismark bowtie2 genome indexing step', - 'dnanexus:bigbed-conversion-v-2.6': 'WGBS methylation state to bigbed file conversion step' + 'dnanexus:bigbed-conversion-v-2.6': 'WGBS methylation state to bigbed file conversion step', + 'zhiping-weng:ChromHMM-bed-conversion-step': 'Chromatin state calling bed to bigBed conversion step', + 'zhiping-weng:ChromHMM-chromatin-state-calling-step': 'Chromatin state calling step by ChromHMM' } status_mapping = {
0
diff --git a/gulpfile.cjs b/gulpfile.cjs @@ -1007,9 +1007,7 @@ gulp.task("coverage", async function () { handleBuildWarnings(result); - return new Promise((resolve, reject) => { - const karma = new Karma.Server( - { + const karmaConfig = Karma.config.parseConfig(karmaConfigFile, { configFile: karmaConfigFile, browsers: browsers, specReporter: { @@ -1057,8 +1055,10 @@ gulp.task("coverage", async function () { undefined, ], }, - }, - function (e) { + }); + + return new Promise((resolve, reject) => { + const karma = new Karma.Server(karmaConfig, function doneCallback(e) { let html = "<!doctype html><html><body><ul>"; folders.forEach(function (folder) { html += `<li><a href="${encodeURIComponent( @@ -1080,8 +1080,7 @@ gulp.task("coverage", async function () { } resolve(); - } - ); + }); karma.start(); }); });
3
diff --git a/public/maps/tamil-nadu.json b/public/maps/tamil-nadu.json } }, { - "arcs": [[[69, -15, 70, -36, -47, 71, 72, 73]], [[74]]], - "type": "MultiPolygon", + "arcs": [[69, -15, 70, -36, -47, 71, 72, 73]], + "type": "Polygon", "properties": { "cartodb_id": 605, "censuscode": 625, } }, { - "arcs": [[-11, 95, -33, -71, -14]], - "type": "Polygon", + "arcs": [[[-11, 95, -33, -71, -14]], [[74]]], + "type": "MultiPolygon", "properties": { "cartodb_id": 471, "censuscode": 626,
1
diff --git a/lib/waterline/utils/query/forge-stage-two-query.js b/lib/waterline/utils/query/forge-stage-two-query.js @@ -708,8 +708,11 @@ module.exports = function forgeStageTwoQuery(query, orm) { 'This is a singular ("model") association, which means it never refers to '+ 'more than _one_ associated record. So passing in subcriteria (i.e. as '+ 'the second argument to `.populate()`) is not supported for this association, '+ - 'since it wouldn\'t make any sense. But that\'s the trouble-- it looks like '+ - 'some sort of a subcriteria (or something) _was_ provided!\n'+ + 'since it generally wouldn\'t make any sense. But that\'s the trouble-- it '+ + 'looks like some sort of a subcriteria (or something) _was_ provided!\n'+ + '(Note that subcriterias consisting ONLY of `omit` or `select` are a special '+ + 'case that _does_ make sense. This usage will be supported in a future version '+ + 'of Waterline.)\n'+ '\n'+ 'Here\'s what was passed in:\n'+ util.inspect(query.populates[populateAttrName], {depth: 5}),
7
diff --git a/package.json b/package.json "chokidar": "1.0.3", "clean-webpack-plugin": "^0.1.17", "grunt": "0.4.5", + "grunt-contrib-clean": "^2.0.0", "grunt-apidoc": "0.10.0", "grunt-available-tasks": "0.6.0", "grunt-gh-pages": "0.10.0",
0
diff --git a/src/components/editor-mode/scene-menu/SceneMenu.jsx b/src/components/editor-mode/scene-menu/SceneMenu.jsx @@ -17,6 +17,7 @@ export const SceneMenu = ({ multiplayerConnected, selectedScene, setSelectedScen const [ scenesMenuOpened, setScenesMenuOpened ] = useState( false ); const [ roomsMenuOpened, setRoomsMenuOpened ] = useState( false ); const [ micEnabled, setMicEnabled ] = useState( false ); + const [ speechEnabled, setSpeechEnabled ] = useState( false ); // @@ -204,6 +205,35 @@ export const SceneMenu = ({ multiplayerConnected, selectedScene, setSelectedScen }; + const _ensureMicEnabled = async () => { + + if ( ! world.micEnabled() ) { + + await world.enableMic(); + setMicEnabled( true ); + + } + + }; + + const handleSpeakBtnClick = async () => { + + await _ensureMicEnabled(); + + if ( ! world.speechEnabled() ) { + + world.enableSpeech(); + setSpeechEnabled( true ); + + } else { + + world.disableSpeech(); + setSpeechEnabled( false ); + + } + + }; + useEffect( () => { refreshRooms(); @@ -254,6 +284,11 @@ export const SceneMenu = ({ multiplayerConnected, selectedScene, setSelectedScen <img src="images/microphone-slash.svg" className={ classnames( micEnabled ? styles.hidden : null ) } /> </button> </div> + <div className={styles.buttonWrap } onClick={ handleSpeakBtnClick } > + <button className={ classnames( styles.button, speechEnabled ? null : styles.disabled ) } > + <img src="images/speak.svg" /> + </button> + </div> </div> {
0
diff --git a/src/view/component.js b/src/view/component.js @@ -45,7 +45,7 @@ var elementOwnAttach = require('./element-own-attach'); var elementOwnDetach = require('./element-own-detach'); var elementOwnAttachHTML = require('./element-own-attach-html'); var elementOwnPushChildANode = require('./element-own-push-child-anode'); -var warnEventBind = require('./warn-event-bind'); +var warnEventListenMethod = require('./warn-event-listen-method'); var createDataTypesChecker = require('../util/create-data-types-checker'); @@ -110,7 +110,7 @@ function Component(options) { }); each(givenANode.events, function (eventBind) { // #[begin] error - warnEventBind(eventBind.name, options.owner, eventBind.expr.name); + warnEventListenMethod(eventBind.name, options.owner, eventBind.expr.name); // #[end] me.on(
10
diff --git a/closure/goog/base.js b/closure/goog/base.js @@ -1060,6 +1060,14 @@ goog.TRANSPILE_TO_LANGUAGE = goog.define('goog.TRANSPILE_TO_LANGUAGE', ''); goog.TRANSPILER = goog.define('goog.TRANSPILER', 'transpile.js'); +/** + * @define {string} Trusted Types policy name. If non-empty then Closure will + * use Trusted Types. + */ +goog.TRUSTED_TYPES_POLICY_NAME = + goog.define('goog.TRUSTED_TYPES_POLICY_NAME', 'goog'); + + /** * @package {?boolean} * Visible for testing. @@ -2128,6 +2136,48 @@ goog.defineClass.applyProperties_ = function(target, source) { } }; +/** + * Returns the parameter. + * @param {string} s + * @return {string} + * @private + */ +goog.identity_ = function(s) { + return s; +}; + + +/** + * Creates Trusted Types policy if Trusted Types are supported by the browser. + * The policy just blesses any string as a Trusted Type. It is not visibility + * restricted because anyone can also call trustedTypes.createPolicy directly. + * However, the allowed names should be restricted by a HTTP header and the + * reference to the created policy should be visibility restricted. + * @param {string} name + * @return {?TrustedTypePolicy} + */ +goog.createTrustedTypesPolicy = function(name) { + var policy = null; + var policyFactory = goog.global.trustedTypes; + if (!policyFactory || !policyFactory.createPolicy) { + return policy; + } + // trustedTypes.createPolicy throws if called with a name that is already + // registered, even in report-only mode. Until the API changes, catch the + // error not to break the applications functionally. In such case, the code + // will fall back to using regular Safe Types. + // TODO(koto): Remove catching once createPolicy API stops throwing. + try { + policy = policyFactory.createPolicy(name, { + createHTML: goog.identity_, + createScript: goog.identity_, + createScriptURL: goog.identity_ + }); + } catch (e) { + goog.logToConsole_(e.message); + } + return policy; +}; // There's a bug in the compiler where without collapse properties the // Closure namespace defines do not guard code correctly. To help reduce code @@ -2276,7 +2326,7 @@ if (!COMPILED && goog.DEPENDENCIES_ENABLED) { */ function /** boolean */ evalCheck(/** string */ code) { try { - return !!eval(code); + return !!eval(goog.CLOSURE_EVAL_PREFILTER_.createScript(code)); } catch (ignored) { return false; } @@ -3399,7 +3449,7 @@ if (!COMPILED && goog.DEPENDENCIES_ENABLED) { try { var contents = dep.contents_; dep.contents_ = null; - goog.globalEval(contents); + goog.globalEval(goog.CLOSURE_EVAL_PREFILTER_.createScript(contents)); if (isEs6) { namespace = goog.moduleLoaderState_.moduleName; } @@ -3809,57 +3859,6 @@ if (!COMPILED && goog.DEPENDENCIES_ENABLED) { } -/** - * @define {string} Trusted Types policy name. If non-empty then Closure will - * use Trusted Types. - */ -goog.TRUSTED_TYPES_POLICY_NAME = - goog.define('goog.TRUSTED_TYPES_POLICY_NAME', 'goog'); - - -/** - * Returns the parameter. - * @param {string} s - * @return {string} - * @private - */ -goog.identity_ = function(s) { - return s; -}; - - -/** - * Creates Trusted Types policy if Trusted Types are supported by the browser. - * The policy just blesses any string as a Trusted Type. It is not visibility - * restricted because anyone can also call trustedTypes.createPolicy directly. - * However, the allowed names should be restricted by a HTTP header and the - * reference to the created policy should be visibility restricted. - * @param {string} name - * @return {?TrustedTypePolicy} - */ -goog.createTrustedTypesPolicy = function(name) { - var policy = null; - var policyFactory = goog.global.trustedTypes; - if (!policyFactory || !policyFactory.createPolicy) { - return policy; - } - // trustedTypes.createPolicy throws if called with a name that is already - // registered, even in report-only mode. Until the API changes, catch the - // error not to break the applications functionally. In such case, the code - // will fall back to using regular Safe Types. - // TODO(koto): Remove catching once createPolicy API stops throwing. - try { - policy = policyFactory.createPolicy(name, { - createHTML: goog.identity_, - createScript: goog.identity_, - createScriptURL: goog.identity_ - }); - } catch (e) { - goog.logToConsole_(e.message); - } - return policy; -}; - if (!COMPILED) { var isChrome87 = false; // Cannot run check for Chrome <87 bug in case of strict CSP environments.
7
diff --git a/bot/src/discord/create_kanji_search_page.js b/bot/src/discord/create_kanji_search_page.js @@ -148,7 +148,7 @@ function createPageForKanjiData(kanjiData, prefix) { embedFields.push({ name: 'Examples', inline: true, value: examplesStr }); } - const unicodeString = kanjiData.query.codePointAt(0).toString(10); + const unicodeString = kanjiData.query.codePointAt(0).toString(16); const fileName = `${unicodeString}.png`; const thumbnailInfo = { url: `https://raw.githubusercontent.com/mistval/kanji_images/master/pngs/${fileName}` };
4
diff --git a/js/tabManager.js b/js/tabManager.js @@ -57,6 +57,15 @@ class TabManager { settings.updateSetting(list, globalwhitelist) } + + incrementTotalPagesVisited () { + const count = settings.getSetting('total_pages') + 1 || 1 + settings.updateSetting('total_pages', count) + } + + resetTotalPagesVisited () { + settings.updateSetting('total_pages', 0) + } } var tabManager = new TabManager(); @@ -129,5 +138,7 @@ chrome.webRequest.onHeadersReceived.addListener( (request) => { tab.updateSite(); Companies.incrementPages(); } + // NOTE: this counts all pages, even request response codes in 300s, 400s: + tabManager.incrementTotalPagesVisited() }, {urls: ['<all_urls>'], types: ['main_frame']});
12
diff --git a/src/commands/Settings/Enable.js b/src/commands/Settings/Enable.js @@ -71,7 +71,10 @@ class Enable extends Command { getCommandsToEnable(commandIdParam) { const commandsToEnable = []; const commandRegex = new RegExp(commandIdParam.replace('.', '\\.').replace('*', '.*'), 'ig'); - this.bot.commandHandler.commands.forEach((command) => { + const commands = this.bot.commandHandler.commands + .concat(this.bot.commandHandler.inlineCommands || []) + .concat(this.bot.commandHandler.customCommands || []); + commands.forEach((command) => { if (commandRegex.test(command.id) && command.blacklistable) { commandsToEnable.push(command.id); }
3
diff --git a/assets/js/modules/analytics/index.js b/assets/js/modules/analytics/index.js @@ -23,7 +23,6 @@ import './datastore'; import { fillFilterWithComponent } from '../../util'; import { SetupMain as AnalyticsSetup } from './setup'; import { SettingsMain as AnalyticsSettings } from './settings'; -import withSnapshotRestoration from '../../components/restore-snapshots/with-snapshot-restoration'; /** * WordPress dependencies @@ -34,11 +33,11 @@ import { addFilter } from '@wordpress/hooks'; addFilter( 'googlesitekit.ModuleSetup-analytics', 'googlesitekit.AnalyticsModuleSetup', - compose( fillFilterWithComponent, withSnapshotRestoration )( AnalyticsSetup ) + compose( fillFilterWithComponent )( AnalyticsSetup ) ); addFilter( 'googlesitekit.ModuleSettingsDetails-analytics', 'googlesitekit.AnalyticsModuleSettings', - compose( fillFilterWithComponent, withSnapshotRestoration )( AnalyticsSettings ) + compose( fillFilterWithComponent )( AnalyticsSettings ) );
2
diff --git a/modules/keyboard.js b/modules/keyboard.js @@ -551,8 +551,17 @@ function makeCodeBlockHandler(indent) { key: 'Tab', shiftKey: !indent, format: { 'code-block': true }, - handler(range) { + handler(range, { event }) { const CodeBlock = this.quill.scroll.query('code-block'); + if (range.length === 0 && !event.shiftKey) { + this.quill.insertText(range.index, CodeBlock.TAB, Quill.sources.USER); + this.quill.setSelection( + range.index + CodeBlock.TAB.length, + Quill.sources.SILENT, + ); + return; + } + const lines = range.length === 0 ? this.quill.getLines(range.index, 1)
7
diff --git a/CHANGELOG.md b/CHANGELOG.md All notable changes to this project are documented in this file. -## Head +## 14.9.0 - Added: `import-notation` rule ([#6102](https://github.com/stylelint/stylelint/pull/6102)). - Fixed: `no-duplicate-selectors` false positives for SCSS/Less nested interpolations ([#6118](https://github.com/stylelint/stylelint/pull/6118)). @@ -18,25 +18,24 @@ All notable changes to this project are documented in this file. ## 14.8.3 -- Fixed: `no-invalid-*` end positions ([#6072](https://github.com/stylelint/stylelint/pull/6072)). -- Fixed: `no-duplicate-*` end positions ([#6047](https://github.com/stylelint/stylelint/pull/6047)). -- Fixed: `no-descending-specificity` end positions ([#6049](https://github.com/stylelint/stylelint/pull/6049)). -- Fixed: `media-feature-name-no-unknown` false positives for `display-mode` ([#6073](https://github.com/stylelint/stylelint/pull/6073)). -- Fixed: dependency on `normalize-selector` removed ([#6068](https://github.com/stylelint/stylelint/pull/6068)). - Fixed: `at-rule-no-unknown` false positives for `@layer` ([#6093](https://github.com/stylelint/stylelint/pull/6093)). -- Fixed: `no-invalid-position-at-import-rule` false positives for `@layer` ([#6094](https://github.com/stylelint/stylelint/pull/6094)). - Fixed: `length-zero-no-unit` autofix for `.0` values ([#6098](https://github.com/stylelint/stylelint/pull/6098)). +- Fixed: `media-feature-name-no-unknown` false positives for `display-mode` ([#6073](https://github.com/stylelint/stylelint/pull/6073)). +- Fixed: `no-descending-specificity` end positions ([#6049](https://github.com/stylelint/stylelint/pull/6049)). +- Fixed: `no-duplicate-*` end positions ([#6047](https://github.com/stylelint/stylelint/pull/6047)). +- Fixed: `no-invalid-*` end positions ([#6072](https://github.com/stylelint/stylelint/pull/6072)). +- Fixed: `no-invalid-position-at-import-rule` false positives for `@layer` ([#6094](https://github.com/stylelint/stylelint/pull/6094)). ## 14.8.2 -- Fixed: `selector-*-no-unknown` end positions ([#6046](https://github.com/stylelint/stylelint/pull/6046)). - Fixed: `function-calc-no-unspaced-operator` false positives for non-standard variables ([#6053](https://github.com/stylelint/stylelint/pull/6053)). +- Fixed: `selector-*-no-unknown` end positions ([#6046](https://github.com/stylelint/stylelint/pull/6046)). ## 14.8.1 - Fixed: `declaration-block-no-*` end positions that avoid errors ([#6040](https://github.com/stylelint/stylelint/pull/6040)). -- Fixed: `named-grid-areas-no-invalid` false positives for arealess templates ([#6042](https://github.com/stylelint/stylelint/pull/6042)). - Fixed: `function-calc-no-unspaced-operator` false positives and memory leak ([#6045](https://github.com/stylelint/stylelint/pull/6045)). +- Fixed: `named-grid-areas-no-invalid` false positives for arealess templates ([#6042](https://github.com/stylelint/stylelint/pull/6042)). ## 14.8.0 @@ -44,9 +43,9 @@ All notable changes to this project are documented in this file. - Added: `property-*-list` support for vendor prefixes ([#6025](https://github.com/stylelint/stylelint/pull/6025)). - Fixed: `at-rule-*-list` end positions ([#6032](https://github.com/stylelint/stylelint/pull/6032)). - Fixed: `at-rule-no-unknown` end positions ([#6026](https://github.com/stylelint/stylelint/pull/6026)). +- Fixed: `function-linear-gradient-no-nonstandard-direction` false negative about `-ms-linear-gradient` ([#6031](https://github.com/stylelint/stylelint/pull/6031)). - Fixed: `function-no-unknown` end positions ([#6038](https://github.com/stylelint/stylelint/pull/6038)). - Fixed: `property-no-unknown` end positions ([#6039](https://github.com/stylelint/stylelint/pull/6039)). -- Fixed: `function-linear-gradient-no-nonstandard-direction` false negative about `-ms-linear-gradient` ([#6031](https://github.com/stylelint/stylelint/pull/6031)). ## 14.7.1
6
diff --git a/localization/strings.pot b/localization/strings.pot @@ -2263,11 +2263,17 @@ msgstr "" msgid "Due today" msgstr "" -msgid "%s chore is due to be done today" -msgstr "" - msgid "%s task is due to be done today" -msgstr "" +msgid_plural "%s tasks are due to be done today" +msgstr[0] "" +msgstr[1] "" + +msgid "%s chore is due to be done today" +msgid_plural "%s chores are due to be done today" +msgstr[0] "" +msgstr[1] "" msgid "%s battery is due to be charged today" -msgstr "" +msgid_plural "%s batteries are due to be charged today" +msgstr[0] "" +msgstr[1] ""
0
diff --git a/articles/api/authentication/_sign-up.md b/articles/api/authentication/_sign-up.md @@ -21,21 +21,14 @@ curl --request POST \ ``` ```javascript +// Script uses auth0.js v8. See Remarks for details. <script src="${auth0js_urlv8}"></script> <script type="text/javascript"> var webAuth = new auth0.WebAuth({ domain: '${account.namespace}', clientID: '${account.clientId}' }); -</script> -<h2>Signup Database Connection</h2> -<input class="signup-username" /> -<input type="password" class="signup-password" /> -<input type="button" class="signup-db" value="Signup!" /> -<script type="text/javascript"> - $('.signup-db').click(function (e) { - e.preventDefault(); webAuth.signup({ connection: 'Username-Password-Authentication', email: $('.signup-email').val(), @@ -44,7 +37,6 @@ curl --request POST \ if (err) return alert('Something went wrong: ' + err.message); return alert('success signup without login!') }); - }); </script> ``` @@ -84,6 +76,10 @@ This endpoint only works for database connections. <%= include('../../_includes/_test-with-postman') %> +### Remarks +- The sample auth0.js script uses the library version 8. If you are using auth0.js version 7, please see this [reference guide](/libraries/auth0js/v7). + + ### More Information - [Password Strength in Auth0 Database Connections](/connections/database/password-strength)
0
diff --git a/src/Data.js b/src/Data.js @@ -211,6 +211,8 @@ CM.ConfigData.ScaleCutoff = {type: 'numscale', group: 'Notation', label: 'Notati CM.ConfigData.GCTimer = {type: 'bool', group: 'Miscellaneous', label: ['Golden Cookie Timer OFF', 'Golden Cookie Timer ON'], desc: 'A timer on the Golden Cookie when it has been spawned', toggle: true, func: function() {CM.Disp.ToggleGCTimer();}}; CM.ConfigData.Favicon = {type: 'bool', group: 'Miscellaneous', label: ['Favicon OFF', 'Favicon ON'], desc: 'Update favicon with Golden/Wrath Cookie', toggle: true, func: function() {CM.Disp.UpdateFavicon();}}; CM.ConfigData.WrinklerButtons = {type: 'bool', group: 'Miscellaneous', label: ['Extra Buttons OFF', 'Extra Buttons ON'], desc: 'Show buttons for popping wrinklers at bottom of cookie section', toggle: true, func: function() {CM.Disp.UpdateWrinklerButtons();}}; +CM.ConfigData.ShowMysteriousAchievements = {type: 'bool', group: 'Miscellaneous', label: ['Show Mysterious Achievements OFF', 'Show Mysterious Achievements ON'], desc: 'Show mysterious achievemennts in stats', toggle: true, func: function() {}}; +CM.ConfigData.ShowMysteriousShadowAchievements = {type: 'bool', group: 'Miscellaneous', label: ['Show Mysterious Shadow Achievements OFF', 'Show Mysterious Shadow Achievements ON'], desc: 'Show mysterious shadow achievemennts in stats', toggle: true, func: function() {}}; /**
0
diff --git a/app/models/carto/dbdirect_ip.rb b/app/models/carto/dbdirect_ip.rb @@ -4,7 +4,12 @@ module Carto class DbdirectIp < ActiveRecord::Base belongs_to :user, inverse_of: :dbdirect_ip, foreign_key: :user_id - serialize :ips, JSON + # Note about the `ips` attribute: + # The corresponding column is of type json, so there's no need for an explicit serializer + # But there's a subtle difference here from having a text field and defining `serialize :ips JSON` + # If a string is assigned to `ips` it is interpreted and parsed and JSON, and the result is nil + # if not valid JSON. With the serializer version, the string would be preserved as string. + validate :validate_ips private @@ -13,8 +18,8 @@ module Carto def validate_ips # Check type - unless ips.nil? || (ips.kind_of?(Array) && ips.all? { |ip| ip.kind_of?(String) }) - errors.add(:ips, "IPs must be either be nil or an array of strings ") + unless ips.kind_of?(Array) && ips.all? { |ip| ip.kind_of?(String) } + errors.add(:ips, "IPs must be an array of strings ") return false end ok = true
2
diff --git a/src/core/core.plugins.js b/src/core/core.plugins.js @@ -289,8 +289,8 @@ function createDescriptors(plugins, options) { * the event will be discarded. * @param {Chart} chart - The chart instance. * @param {IEvent} event - The event object. - * @param {object} options - The plugin options. * @param {boolean} replay - True if this event is replayed from `Chart.update` + * @param {object} options - The plugin options. */ /** * @method IPlugin#afterEvent @@ -298,8 +298,8 @@ function createDescriptors(plugins, options) { * will not be called if the `event` has been previously discarded. * @param {Chart} chart - The chart instance. * @param {IEvent} event - The event object. - * @param {object} options - The plugin options. * @param {boolean} replay - True if this event is replayed from `Chart.update` + * @param {object} options - The plugin options. */ /** * @method IPlugin#resize
1
diff --git a/lib/shimmer.js b/lib/shimmer.js @@ -340,14 +340,14 @@ var shimmer = module.exports = { patchModule: function patchModule(agent) { logger.trace("Wrapping module loader.") var Module = require('module') - var filepathStack = [] + var filepathMap = {} shimmer.wrapMethod(Module, 'Module', '_resolveFilename', function wrapRes(resolve) { - return function wrappedResolveFilename() { + return function wrappedResolveFilename(file) { // This is triggered by the load call, so record the path that has been seen so // we can examine it after the load call has returned. const resolvedFilepath = resolve.apply(this, arguments) - filepathStack.push(resolvedFilepath) + filepathMap[file] = resolvedFilepath return resolvedFilepath } }) @@ -358,7 +358,7 @@ var shimmer = module.exports = { // load function calls resolve, we must mirror the recursive load calls with a // stack. const m = load.apply(this, arguments) - return _postLoad(agent, m, file, filepathStack.pop()) + return _postLoad(agent, m, file, filepathMap[file]) } }) },
4
diff --git a/src/tests/controllers/messageLength.test.ts b/src/tests/controllers/messageLength.test.ts @@ -37,6 +37,7 @@ export async function messageLengthTest(t, node1, node2) { //t.true(messageSent.success, 'node1 should send text message to node2') const newMessages = await getCheckMsgs(t, node2) + console.log(JSON.stringify(newMessages)) t.true( newMessages.new_messages_total == 1, 'node2 should only have 1 new message'
0
diff --git a/src/components/common/IntlForm.js b/src/components/common/IntlForm.js @@ -47,7 +47,7 @@ function composeIntlForm(Component) { <Checkbox name={name} label={this.intlIfObject(label)} - checked={input.value === true} + checked={input.value === true || input.value === 1} onCheck={input.onChange} disabled={this.intlIfObject(disabled)} />
9
diff --git a/core/api-server/config/main/config.base.js b/core/api-server/config/main/config.base.js +const path = require('path'); const packageJson = require(process.cwd() + '/package.json'); const formatter = require(process.cwd() + '/lib/utils/formatters'); @@ -33,10 +34,7 @@ config.cachingServer = { }; config.debugUrl = { - protocol: process.env.DEBUG_PROTOCOL, - host: process.env.DEBUG_HOST, - port: process.env.DEBUG_PORT, - path: 'hkube/debug' + path: path.join(process.env.INGRESS_PREFIX || '', 'hkube/debug') }; config.addDefaultAlgorithms = process.env.ADD_DEFAULT_ALGORITHMS || true;
0
diff --git a/src/components/accounts/two_factor/EnableTwoFactor.js b/src/components/accounts/two_factor/EnableTwoFactor.js @@ -142,7 +142,7 @@ export function EnableTwoFactor(props) { data={MULTISIG_MIN_AMOUNT} button='twoFactor.alertBanner.button' theme='light-blue' - linkTo='https://docs.near.org/docs/concepts/storage' + linkTo='https://docs.near.org/docs/concepts/storage-staking' /> <form onSubmit={e => { handleNext(); e.preventDefault();}}> <h1><Translate id='twoFactor.enable' /></h1>
3
diff --git a/test/keyMode-test.cjs b/test/keyMode-test.cjs @@ -15,10 +15,13 @@ tape("graphviz().keyMode() affects transitions and order of rendering.", functio ]; const nCheckPoints = 8; const nItemsPerCheckPoint = 4; - test.plan(keyModes.length * nCheckPoints * nItemsPerCheckPoint); + const nRenderings = nCheckPoints * nItemsPerCheckPoint; + const expected_num_assertion = keyModes.length * nRenderings; var delay = 500; var duration = 500; var keyModeIndex = 0; + var num_assertions = 0; + renderKeyMode(); function renderKeyMode() { @@ -92,6 +95,7 @@ tape("graphviz().keyMode() affects transitions and order of rendering.", functio var count = counts[name]; const objectName = name.replace('.', ''); test.equal(d3.select('#graph-' + keyMode).selectAll(name).size(), count, 'Number of ' + objectName + 's is ' + count + ' ' + state + ' transition with keyMode ' + keyMode); + ++num_assertions; } } @@ -166,6 +170,7 @@ tape("graphviz().keyMode() affects transitions and order of rendering.", functio } function endTest() { + test.equal(num_assertions, expected_num_assertion); test.end(); }
14
diff --git a/sigal/plugins/encrypt/static/decrypt.js b/sigal/plugins/encrypt/static/decrypt.js @@ -35,8 +35,12 @@ class Decryptor { return; } this._role = "main"; - this._galleryId = config.galleryId; - this._mSetupServiceWorker(config); + this._config = config; + const localConfig = this._mGetLocalConfig(); + if (localConfig) { + this._config = localConfig; + } + this._mSetupServiceWorker(); } console.info("Decryptor initialized"); @@ -79,10 +83,8 @@ class Decryptor { Decryptor.decrypt(crypto, encrypted_blob_arraybuffer, aes_key, gcm_tag); this._swNotifyWorkerReady(); } else { - const array_clients = await self.clients.matchAll({includeUncontrolled: true}); - for (let client of array_clients) { - this._proxyWrap(client)._mNotifyIncorrectPassword(); - } + this.workerReady = false; + this._swNotifyIncorrectPassword() } } @@ -111,7 +113,14 @@ class Decryptor { async _swNotifyWorkerReady() { const array_clients = await self.clients.matchAll({includeUncontrolled: true}); for (let client of array_clients) { - this._proxyWrap(client)._mReload(); + this._proxyWrap(client)._mSetWorkerReady(); + } + } + + async _swNotifyIncorrectPassword() { + const array_clients = await self.clients.matchAll({includeUncontrolled: true}); + for (let client of array_clients) { + this._proxyWrap(client)._mUnsetWorkerReady(); } } @@ -135,15 +144,25 @@ class Decryptor { } } - _mReload() { + _mSetWorkerReady() { + this.workerReady = true; + const had_been_ready_before = localStorage.getItem(this._config.galleryId) !== null; + localStorage.setItem(this._config.galleryId, JSON.stringify(this._config)); + if (!had_been_ready_before) { window.location.reload(); } + } + + _mUnsetWorkerReady() { + this.workerReady = false; + localStorage.removeItem(this._config.galleryId); + } - _mNotifyIncorrectPassword() { - localStorage.removeItem(this._galleryId); + _mGetLocalConfig() { + return JSON.parse(localStorage.getItem(this._config.galleryId)); } - async _mSetupServiceWorker(config) { + async _mSetupServiceWorker() { if (!('serviceWorker' in navigator)) { console.error("Fatal: Your browser does not support service worker"); throw new Error("no service worker support"); @@ -152,7 +171,7 @@ class Decryptor { if (navigator.serviceWorker.controller) { this.serviceWorker = navigator.serviceWorker.controller; } else { - navigator.serviceWorker.register(config.sw_script); + navigator.serviceWorker.register(this._config.sw_script); const registration = await navigator.serviceWorker.ready; this.serviceWorker = registration.active; } @@ -162,10 +181,10 @@ class Decryptor { this.serviceWorker = this._proxyWrap(this.serviceWorker); if (!(await this.serviceWorker.Decryptor.isInitialized())) { - if (!('password' in config && config.password)) { - config.password = await this._mAskPassword(); + if (!('password' in this._config && this._config.password)) { + this._config.password = await this._mAskPassword(); } - this.serviceWorker._swInitServiceWorker(config); + this.serviceWorker._swInitServiceWorker(this._config); } } @@ -187,18 +206,17 @@ class Decryptor { /* main thread only */ async _mAskPassword() { - let password = localStorage.getItem(this._galleryId); - if (!password) { + const config = JSON.parse(localStorage.getItem(this._config.galleryId)); + if (config && config.password) { + return config.password; + } const password = prompt("Input password to view this gallery:"); if (password) { - localStorage.setItem(this._galleryId, password); + this._config.password = password; return password; } else { return "__wrong_password__"; } - } else { - return password; - } } static async _initAesKey(crypto, kdf_salt, kdf_iters, shared_key) { @@ -460,10 +478,26 @@ class Decryptor { } console.debug(`Fetch succeeded with encrypted image ${request.url}, trying to decrypt`); + if (!Decryptor.isInitialized()) { + if ('decryptor' in self) { + try{ + const clients = await self.clients.matchAll({type: "window"}); + const races = Promise.race( + clients.map((client) => { + return self.decryptor._proxyWrap(client)._mGetLocalConfig(); + }) + ); + const config = await Promise.timeout(races, 100); + await self.decryptor._swInitServiceWorker(config); + } catch (error) { + // do nothing + } + } if (!Decryptor.isInitialized()) { console.debug(`Service worker not initialized on fetch event`); return Decryptor.errorResponse.clone(); } + } let decrypted_blob; try { @@ -533,3 +567,13 @@ Decryptor.errorResponse = new Response( } ); +Promise.timeout = function(cb_or_pm, timeout) { + return Promise.race([ + cb_or_pm instanceof Function ? new Promise(cb) : cb_or_pm, + new Promise((resolve, reject) => { + setTimeout(() => { + reject('Timed out'); + }, timeout); + }) + ]); +} \ No newline at end of file
9
diff --git a/userscript.user.js b/userscript.user.js @@ -106514,6 +106514,11 @@ var $$IMU_EXPORT$$; break; } + if (our_source === null && other.length > 0) { + our_source = other[0]; + other.splice(0, 1); + } + if (our_source) { if (options.use_elcache) { if (replaceimgs_elcache.has(our_source.el)) { @@ -106556,12 +106561,6 @@ var $$IMU_EXPORT$$; replace_single_media(options, source, data, finish_img); }); } else { - // what's the point of this? shouldn't this be above? - if (our_source === null && other.length > 0) { - our_source = other[0]; - other.splice(0, 1); - } - currently_processing--; } };
5
diff --git a/webaverse.js b/webaverse.js @@ -4,11 +4,8 @@ it uses the help of various managers and stores, and executes the render loop. */ import * as THREE from 'three'; -import WSRTC from 'wsrtc/wsrtc.js'; import Avatar from './avatars/avatars.js'; -// import * as CharacterHupsModule from './character-hups.js'; import * as sounds from './sounds.js'; -import * as CharacterSfxModule from './character-sfx.js'; import physx from './physx.js'; import ioManager from './io-manager.js'; import physicsManager from './physics-manager.js'; @@ -17,8 +14,6 @@ import * as blockchain from './blockchain.js'; import cameraManager from './camera-manager.js'; import game from './game.js'; import hpManager from './hp-manager.js'; -// import equipmentRender from './equipment-render.js'; -// import * as characterController from './character-controller.js'; import {playersManager} from './players-manager.js'; import minimapManager from './minimap.js'; import postProcessing from './post-processing.js'; @@ -83,12 +78,6 @@ const frameEvent = new MessageEvent('frame', { }); const rendererStats = Stats(); -/* const _loadAudioContext = async () => { - const audioContext = WSRTC.getAudioContext(); - Avatar.setAudioContext(audioContext); - await audioContext.audioWorklet.addModule('avatars/microphone-worklet.js'); -}; */ - /* const voiceFiles = `\ B6_somnium_65_01 - Part_1.wav B6_somnium_66_01 - Part_1.wav
2
diff --git a/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java b/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java @@ -7,10 +7,12 @@ import android.content.Intent; import android.content.IntentFilter; import android.database.Cursor; import android.net.Uri; +import android.os.Build; import android.util.Base64; import com.RNFetchBlob.Response.RNFetchBlobDefaultResp; import com.RNFetchBlob.Response.RNFetchBlobFileResp; +import com.facebook.common.logging.FLog; import com.facebook.react.bridge.Arguments; import com.facebook.react.bridge.Callback; import com.facebook.react.bridge.ReactApplicationContext; @@ -21,6 +23,7 @@ import com.facebook.react.bridge.WritableArray; import com.facebook.react.bridge.WritableMap; import com.facebook.react.modules.core.DeviceEventManagerModule; import com.facebook.react.modules.network.OkHttpClientProvider; +import com.facebook.react.modules.network.TLSSocketFactory; import java.io.File; import java.io.FileOutputStream; @@ -35,11 +38,14 @@ import java.nio.charset.CharacterCodingException; import java.nio.charset.Charset; import java.nio.charset.CharsetEncoder; import java.util.ArrayList; +import java.util.List; import java.util.HashMap; + import java.util.concurrent.TimeUnit; import okhttp3.Call; import okhttp3.ConnectionPool; +import okhttp3.ConnectionSpec; import okhttp3.Headers; import okhttp3.Interceptor; import okhttp3.MediaType; @@ -48,6 +54,8 @@ import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; import okhttp3.ResponseBody; +import okhttp3.TlsVersion; + public class RNFetchBlobReq extends BroadcastReceiver implements Runnable { @@ -366,9 +374,10 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable { clientBuilder.retryOnConnectionFailure(false); clientBuilder.followRedirects(options.followRedirect); clientBuilder.followSslRedirects(options.followRedirect); + clientBuilder.retryOnConnectionFailure(true); + OkHttpClient client = enableTls12OnPreLollipop(clientBuilder).build(); - OkHttpClient client = clientBuilder.retryOnConnectionFailure(true).build(); Call call = client.newCall(req); taskTable.put(taskId, call); call.enqueue(new okhttp3.Callback() { @@ -683,5 +692,28 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable { } } + public static OkHttpClient.Builder enableTls12OnPreLollipop(OkHttpClient.Builder client) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN && Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT) { + try { + client.sslSocketFactory(new TLSSocketFactory()); + + ConnectionSpec cs = new ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS) + .tlsVersions(TlsVersion.TLS_1_2) + .build(); + + List< ConnectionSpec > specs = new ArrayList < > (); + specs.add(cs); + specs.add(ConnectionSpec.COMPATIBLE_TLS); + specs.add(ConnectionSpec.CLEARTEXT); + + client.connectionSpecs(specs); + } catch (Exception exc) { + FLog.e("OkHttpClientProvider", "Error while enabling TLS 1.2", exc); + } + } + + return client; + } + }
0
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml @@ -9,7 +9,7 @@ jobs: build: runs-on: ubuntu-latest env: - AWS_ACCESS_KEY_ID: AKIAVIULH47FJUBBUV5U + AWS_ACCESS_KEY_ID: AKIAVIULH47FMHXU2IXE AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} steps: - uses: actions/checkout@v2
3
diff --git a/modules/site/parent_templates/site/common/js/application.js b/modules/site/parent_templates/site/common/js/application.js @@ -201,7 +201,7 @@ function getStartPage(urlHash) { thisPage = thisPage < 0 ? 0 : thisPage; } else { - if (pageLink.substring(4).indexOf('section') > -1) { + if (pageLink.indexOf('section') > -1) { thisPage = pageLink.substring(0, pageLink.indexOf('section')); thisSection = pageLink.substring(pageLink.indexOf('section') + 7); } else {
1
diff --git a/views/stats.ejs b/views/stats.ejs @@ -2150,14 +2150,16 @@ twitterDescription += '. Click to view more stats!' <% if('burrows' in calculated.misc){ %> <div class="minion-category-header"><div class="minion-category-icon"><div class="item-icon custom-icon" style="background-image: url(/head/4c27e3cb52a64968e60c861ef1ab84e0a0cb5f07be103ac78da67761731f00c8)"></div></div><span>griffin burrows</span></div> <p class="stat-raw-values"> - <% for(const key in calculated.misc.burrows){ + <% let burrow_naming = {"dug_next": "dug_arrows", "dug_combat": "dug_monsters"} + for(const key in calculated.misc.burrows){ + let name = burrow_naming[key] || key; let tooltip = ""; for(const rarity in calculated.misc.burrows[key]) if(rarity != "total" && rarity != "null") tooltip += `<span class="stat-name piece-${ rarity }-fg">${ helper.capitalizeFirstLetter(rarity) }: </span><span class="stat-value">${ calculated.misc.burrows[key][rarity] }</span><br>`; %> - <span <%- tooltip ? `data-tippy-content='${tooltip}'` : "" %>><span class="stat-name"><%= helper.capitalizeFirstLetter(key.split("_").join(" ")); %>: </span><span class="stat-value"><%= calculated.misc.burrows[key].total.toLocaleString() %></span></span><br> + <span <%- tooltip ? `data-tippy-content='<span class="stat-name">Rarities used:</span><br>${tooltip}'` : "" %>><span class="stat-name"><%= helper.capitalizeFirstLetter(name.split("_").join(" ")); %>: </span><span class="stat-value"><%= calculated.misc.burrows[key].total.toLocaleString() %></span></span><br> <% } %> </p> <% } %>
7