code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md <!--- Provide a general summary of your changes in the Title above -->
-## Description
+### Description
<!--- Describe your changes in detail -->
-## Motivation and Context
+
+
+### Motivation and Context
<!--- Why is this change required? What problem does it solve? -->
<!--- If it fixes an open issue, please link to the issue here. -->
<!--- Use the magic "Fixes #1234" format, so the issues are -->
<!--- automatically closed when this PR is merged. -->
-## How Has This Been Tested?
+
+
+### How Has This Been Tested?
<!--- Please describe in detail how you manually tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran to -->
<!--- see how your change affects other areas of the code, etc. -->
-## Screenshots (if appropriate):
-## Types of changes
+### Screenshots (if appropriate):
+
+
+
+### Types of changes
<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
- [ ] No code changes (changes to documentation, CI, metadata, etc)
- [ ] Dependency changes (any modification to dependencies in `package.json`)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
-## Checklist:
+### Checklist:
<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
- [ ] My code follows the code style of this project.
| 7 |
diff --git a/assets/js/app/core/layout/01_layout-controllers.js b/assets/js/app/core/layout/01_layout-controllers.js }
+
+ $scope.$on('kong.node.deleted',function(ev,node){
+ if(node.id == $rootScope.$node.id) setNode(null)
+
+ })
+
$scope.$on('kong.node.updated',function(ev,node){
if(node.active) {
setNode(node)
| 9 |
diff --git a/src/main/webapp/org/cboard/view/config/chart/template/schema.html b/src/main/webapp/org/cboard/view/config/chart/template/schema.html -<div class="tree tree-bg-dragout " style="min-height: 600px; max-height: 820px;overflow:auto; overflow-x: auto; border:none;">
+<div class="tree tree-bg-dragout " style="overflow:auto; overflow-x: auto; border:none; max-height: 79vh; margin-bottom: 0px;">
<ul style="padding-left: 5px" ng-if="schema.dimension">
<li class="parent_li">
<span><img src="imgs/schema/dimension.gif"><b>{{'CONFIG.DATASET.DIMENSION'|translate}}</b></span>
| 12 |
diff --git a/includes/Modules/Analytics/Advanced_Tracking.php b/includes/Modules/Analytics/Advanced_Tracking.php @@ -63,13 +63,6 @@ final class Advanced_Tracking {
*/
private $plugin_detector;
- /**
- * Main class code injector instance.
- *
- * @var Measurement_Code_Injector
- */
- private $measurement_code_injector;
-
/**
* Advanced_Tracking constructor.
*
@@ -83,7 +76,6 @@ final class Advanced_Tracking {
} else {
$this->plugin_detector = $plugin_detector;
}
- $this->measurement_code_injector = null;
}
/**
@@ -108,11 +100,8 @@ final class Advanced_Tracking {
add_action(
'wp_footer',
function() {
- if ( null === $this->measurement_code_injector ) {
- return;
- }
$this->configure_events();
- $this->measurement_code_injector->inject_event_tracking( $this->event_configurations );
+ ( new Measurement_Code_Injector() )->inject_event_tracking( $this->event_configurations );
},
15
);
@@ -130,8 +119,6 @@ final class Advanced_Tracking {
$active_plugin_configurations = $this->plugin_detector->determine_active_plugins( $this->get_supported_plugins() );
$this->register_event_lists( $active_plugin_configurations );
-
- $this->measurement_code_injector = new Measurement_Code_Injector();
}
/**
| 2 |
diff --git a/content/hacktoberfest-2021-announcement-and-contribution-guidelines/Hacktoberfest-2021.png b/content/hacktoberfest-2021-announcement-and-contribution-guidelines/Hacktoberfest-2021.png Binary files a/content/hacktoberfest-2021-announcement-and-contribution-guidelines/Hacktoberfest-2021.png and b/content/hacktoberfest-2021-announcement-and-contribution-guidelines/Hacktoberfest-2021.png differ
| 7 |
diff --git a/ChatImprovements.user.js b/ChatImprovements.user.js // @description New responsive userlist with usernames and total count, more timestamps, use small signatures only, mods with diamonds, message parser (smart links), timestamps on every message, collapse room description and room tags, mobile improvements, expand starred messages on hover, highlight occurances of same user link, room owner changelog, pretty print styles, and more...
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 2.10.1
+// @version 2.11
//
// @include https://chat.stackoverflow.com/*
// @include https://chat.stackexchange.com/*
$('.reply-info').off('click');
}
+ // Remove system messages if there are only ignored users messages between
+ $('.monologue:hidden').remove();
+ $('.system-message-container').prev('.system-message-container').hide();
}
@@ -1160,6 +1163,10 @@ a.topbar-icon.topbar-icon-on .topbar-dialog,
return false;
});
+ // Remove system messages if there are only ignored users messages between
+ $('.monologue:hidden').remove();
+ $('.system-message-container').prev('.system-message-container').hide();
+
// If on mobile chat
if(document.body.classList.contains('mob')) {
| 2 |
diff --git a/src/components/Widgets/PreviewHOC.js b/src/components/Widgets/PreviewHOC.js @@ -2,7 +2,11 @@ import React from 'react';
class PreviewHOC extends React.Component {
shouldComponentUpdate(nextProps) {
- return nextProps.value !== this.props.value;
+ // Only re-render on value change, but always re-render objects and lists.
+ // Their child widgets will each also be wrapped with this component, and
+ // will only be updated on value change.
+ const isWidgetContainer = ['object', 'list'].includes(nextProps.field.get('widget'));
+ return isWidgetContainer || this.props.value !== nextProps.value;
}
render() {
| 11 |
diff --git a/packages/app/test/cypress/support/index.ts b/packages/app/test/cypress/support/index.ts @@ -20,6 +20,16 @@ import './screenshot'
// Alternatively you can use CommonJS syntax:
// require('./commands')
+// Ignore 'ResizeObserver loop limit exceeded' exception
+// https://github.com/cypress-io/cypress/issues/8418
+const resizeObserverLoopErrRe = /^[^(ResizeObserver loop limit exceeded)]/
+Cypress.on('uncaught:exception', (err) => {
+ /* returning false here prevents Cypress from failing the test */
+ if (resizeObserverLoopErrRe.test(err.message)) {
+ return false
+ }
+})
+
declare global {
// eslint-disable-next-line @typescript-eslint/no-namespace
namespace Cypress {
| 8 |
diff --git a/src/components/staking/PageValidator.vue b/src/components/staking/PageValidator.vue @@ -378,6 +378,7 @@ export default {
apollo: {
validator: {
query() {
+ /* istanbul ignore next */
return ValidatorProfile(this.network)
},
variables() {
@@ -387,6 +388,7 @@ export default {
}
},
update(data) {
+ /* istanbul ignore next */
return ValidatorResult(this.network)(data)
}
}
| 8 |
diff --git a/templates/customdashboard/program_list.html b/templates/customdashboard/program_list.html {% block breadcrumbs %}
<ul class="breadcrumb">
<li><a href="{% url 'index' %}">Home Dashboard</a></li>
- <li class="active">{{ user.activity_user.organization.level_1_label }} Dashboards</li>
+ <li class="active">
+ {{ user.activity_user.organization.level_1_label }} Dashboards
+ </li>
</ul>
{% endblock %}
<div class="sub-navigation">
<div class="sub-navigation-header">
- <h4 class="page-title">{{ user.activity_user.organization.level_1_label }} Dashboards</h4>
+ <h4 class="page-title">
+ {{ user.activity_user.organization.level_1_label }} Dashboards
+ </h4>
</div>
<div class="sub-navigation-actions">
<div class="sub-nav-item">
- <div class="btn-group" role="group" aria-label="...">
<div class="btn-group" role="group">
<button
type="button"
aria-haspopup="true"
aria-expanded="false"
>
- Countries
+ Filter by Sectors
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
- <li><a href="#">--All--</a></li>
+ <li role="presentation"><a href="#">--All--</a></li>
{% for country in get_country %}
- <li>
- <a href="/customdashboard/program_list/{{ country.id }}">{{
- country.country
- }}</a>
+ <li role="presentation">
+ <a href="/customdashboard/program_list/{{ country.id }}">
+ {{ country.country }}
+ </a>
</li>
{% endfor %}
</ul>
</div>
</div>
+
+ <div class="sub-nav-item">
+ <div class="btn-group" role="group">
+ <button
+ type="button"
+ class="btn btn-sm btn-default dropdown-toggle"
+ data-toggle="dropdown"
+ aria-haspopup="true"
+ aria-expanded="false"
+ >
+ Filter by Countries
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu">
+ <li role="presentation"><a href="#">--All--</a></li>
+ {% for country in get_country %}
+ <li role="presentation">
+ <a href="/customdashboard/program_list/{{ country.id }}">
+ {{ country.country }}
+ </a>
+ </li>
+ {% endfor %}
+ </ul>
+ </div>
</div>
</div>
</div>
{% for item in get_program %} {% if item.name %}
<tr>
<td>
- <a href="/customdashboard/program_dashboard/{{item.id}}/0/">{{ item.name }}</a>
+ <a href="/customdashboard/program_dashboard/{{ item.id }}/0/">
+ {{ item.name }}
+ </a>
</td>
<td>
{% if item.public_dashboard %}<a
<td class="text-right">
<!-- Split button -->
<div class="btn-group">
- <button type="button" class="btn btn-default btn-sm disabled">Links</button>
- <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ <button type="button" class="btn btn-default btn-sm disabled">
+ Links
+ </button>
+ <button
+ type="button"
+ class="btn btn-default btn-sm dropdown-toggle"
+ data-toggle="dropdown"
+ aria-haspopup="true"
+ aria-expanded="false"
+ >
<span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span>
</button>
<ul class="dropdown-menu">
- <li><a href="/customdashboard/program_dashboard/{{ item.id }}/0/">Internal</a></li>
+ <li>
+ <a href="/customdashboard/program_dashboard/{{ item.id }}/0/"
+ >Internal</a
+ >
+ </li>
<li role="separator" class="divider"></li>
- <li><a href="/customdashboard/program_dashboard/{{ item.id }}/1/">Public</a></li>
+ <li>
+ <a href="/customdashboard/program_dashboard/{{ item.id }}/1/"
+ >Public</a
+ >
+ </li>
</ul>
</div>
</td>
| 0 |
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml @@ -34,6 +34,9 @@ steps:
artifact_paths: "bundle-analysis/*"
plugins:
docker-compose#v1.3.1:
+ config:
+ - docker-compose.yml
+ - .buildkite/docker-compose.ci.yml
run: frontend
- name: ":webpack:"
| 4 |
diff --git a/src/main/java/org/cboard/services/MenuService.java b/src/main/java/org/cboard/services/MenuService.java @@ -23,7 +23,7 @@ public class MenuService {
static {
menuList.add(new DashboardMenu(1, -1, "SIDEBAR.CONFIG", "config"));
menuList.add(new DashboardMenu(2, 1, "SIDEBAR.DATA_SOURCE", "config.datasource"));
- menuList.add(new DashboardMenu(3, 1, "SIDEBAR.CUBE", "config.dataset"));
+ menuList.add(new DashboardMenu(3, 1, "SIDEBAR.DATASET", "config.dataset"));
menuList.add(new DashboardMenu(4, 1, "SIDEBAR.WIDGET", "config.widget"));
menuList.add(new DashboardMenu(5, 1, "SIDEBAR.DASHBOARD", "config.board"));
menuList.add(new DashboardMenu(6, 1, "SIDEBAR.DASHBOARD_CATEGORY", "config.category"));
| 3 |
diff --git a/assets/js/components/surveys/SurveyQuestionMultiSelect.js b/assets/js/components/surveys/SurveyQuestionMultiSelect.js @@ -165,8 +165,6 @@ const SurveyQuestionMultiSelect = ( {
disabled={
hasMaximumNumberOfChoices &&
! answer.selected
- ? true
- : undefined
}
onChange={ () =>
handleCheck( answer_ordinal )
| 4 |
diff --git a/ios/Gemfile.lock b/ios/Gemfile.lock @@ -64,7 +64,7 @@ GEM
xcodeproj (>= 1.6.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
- fastlane-plugin-bugsnag (1.4.1)
+ fastlane-plugin-bugsnag (1.3.2)
git
xml-simple
fastlane-plugin-get_unprovisioned_devices_from_hockey (0.1.1)
| 13 |
diff --git a/docs/KeyBase.md b/docs/KeyBase.md @@ -6,12 +6,12 @@ they contain.
## Key Terms:
-- UserProfile: A collection of User materials. Includes multiple `keyringEntries` associated with a UserProfile.
-- Keyring: An object containing `keyringEntry`'s.
-- KeyringEntry: An object which houses ONE `SecretIdentity` and N `PublicIdentities`.
-- SecretIdentity: Single Private material entry in a `KeyringEntry`, used for signing transactions and deriving `PublicIdentities`.
-- PublicIdentities: Public materials collection. Contains the an array of objects related to `SecretIdentity`.
-- PublicIdentity: A collection of information derived from a `SecretIdentity`. It includes an address, publicKey, and HD path data which is always defined via the HD specifications. Used for end user queries for balances and transaction histories.
+- `UserProfile`: A collection of User materials. Includes multiple `keyringEntries` associated with a `UserProfile`.
+- `Keyring`: An object containing `keyringEntry`'s.
+- `KeyringEntry`: An object which houses ONE `SeedIdentity` and N `PublicIdentities`.
+- `SeedIdentity`: Single Private material entry in a `KeyringEntry`, used for deriving a `secret` to sign transactions and generate `PublicIdentities`.
+- `PublicIdentities`: Public materials collection. Contains the an array of objects related to a `SeedIdentity`.
+- `PublicIdentity`: A collection of information derived from a `secret`. It includes an address, publicKey, and HD path data which is always defined via the HD specifications. Used for end user queries for balances and transaction histories.
## Feature Set:
@@ -110,7 +110,7 @@ UserProfileController (1 UserProfileController)
|
| > keyringEntries (1 Keyring : N KeyringEntries)
|
- | > SecretIdentity (1 KeyringEntry : 1 SecretIdentity)
+ | > SeedIdentity (1 KeyringEntry : 1 SeedIdentity)
|
| > PublicIdentities (1 SecretIdentity : N PublicIdentities)
```
@@ -229,25 +229,25 @@ of the `UserProfile`'s `KeyringEntry`s. This is a `1:1` relation inside of a
## KeyringEntry
-A `KeyringEntry` contains all of the related `SecretIdentity`,
-`PublicIdentities` and personality information for an associated `SecretIdentity`.
+A `KeyringEntry` contains all of the related `SeedIdentity`,
+`PublicIdentities` and personality information for an associated `SeedIdentity`.
-A `SecretIdentity` is only an HD Seed value (`Mnemonic Passphrase`) or a
+A `SeedIdentity` is only an HD Seed value (`Mnemonic Passphrase`) or a
hardware device identifier for a `Ledger`.
-This is a `1:1` relation, where each `KeyringEntry` has one `SecretIdentity`.
+This is a `1:1` relation, where each `KeyringEntry` has one `SeedIdentity`.
### Functions:
-- CreateSecretIdentity: Creates a `SecretIdentity`, if the `KeyRingEntry` has none.
-- RenameSecretIdentity: Changes the label of the `keyringEntry`.
-- DeleteSecretIdentity: Removes the `SecretIdentity` from the `keyringEntry`.
-- ExportSecretIdentity: Exports the `SecretIdentity` in plain text. Only the type of `HD` can be exported.
+- CreateSeedIdentity: Creates a `SeedIdentity`, if the `KeyRingEntry` has none.
+- RenameSeedIdentity: Changes the label of the `keyringEntry`.
+- DeleteSeedIdentity: Removes the `SeedIdentity` from the `keyringEntry`.
+- ExportSeedIdentity: Exports the `SeedIdentity` in plain text. Only the type of `HD` can be exported.
### Object Definition:
```
"KeyringEntry": {
"label": "My Account",
- "SecretIdentity": {
+ "SeedIdentity": {
"seed": "shift nature mean excess demise mule winter between swing success bitter patch",
"type": "HD" || "hardware"
},
@@ -262,12 +262,12 @@ This is a `1:1` relation, where each `KeyringEntry` has one `SecretIdentity`.
A `PublicIdentities` are derived from `seed:curve` pairs, which are used to
create a `PublicIdentity`.
-This is a `1:N` relation, where 1 is the `SecretIdentity` for which the
+This is a `1:N` relation, where 1 is the `SeedIdentity` for which the
`PublicIdentity` is related and N are the generated `PublicIdentities`.
### Functions:
- GetPublicIdentity: Returns `PublicIdentity` details for a specific algorithm.
-- CreatePublicIdentity: Creates a `PublicIdentity` from the `SecretIdentity`.
+- CreatePublicIdentity: Creates a `PublicIdentity` from the `SeedIdentity`.
- DeletePublicIdentity: Removes a `PublicIdentity` from `PublicIdentities`.
- ExportPublicIdentity: Exports a `PublicIdentity` in plain text.
@@ -311,7 +311,7 @@ The following is what a fully initialized profile will look like. This includes
"keyring": {
"keyringEntries": [
"KeyringEntry": {
- "SecretIdentity": {
+ "SeedIdentity": {
"label": "My Account",
"seed": "shift nature mean excess demise mule winter between swing success bitter patch",
"type": "HD" || "hardware"
| 10 |
diff --git a/src/css/docs/components/docs-footer.css b/src/css/docs/components/docs-footer.css .DocsFooter--content {
display: flex;
}
+
+@media (max-width: 414px) {
+ .DocsFooter--edit-on-gh-link-wrapper {
+ display: block;
+ margin-bottom: .5em;
+ }
+
+ .DocsFooter--content-dot-spacer {
+ display: none;
+ }
+}
| 7 |
diff --git a/versioned_docs/version-6.x/native-stack-navigator.md b/versioned_docs/version-6.x/native-stack-navigator.md @@ -181,7 +181,7 @@ Supported values:
- `systemThinMaterialDark`
- `systemMaterialDark`
- `systemThickMaterialDark`
-- `systemChromeMaterialDark'`
+- `systemChromeMaterialDark`
Only supported on iOS.
| 1 |
diff --git a/lib/assets/javascripts/dashboard/data/api-key-model.js b/lib/assets/javascripts/dashboard/data/api-key-model.js @@ -85,14 +85,14 @@ module.exports = Backbone.Model.extend({
},
_parseApiGrants: function (grants) {
- const apis = grants.find(grant => grant.type === GRANT_TYPES.APIS).apis;
+ const apis = _.find(grants, grant => grant.type === GRANT_TYPES.APIS).apis;
const apisObj = this._arrayToObj(apis);
return Object.assign({}, this.defaults.apis, apisObj);
},
_parseTableGrants: function (grants) {
- const tables = grants.find(grant => grant.type === GRANT_TYPES.DATABASE).tables;
+ const tables = _.find(grants, grant => grant.type === GRANT_TYPES.DATABASE).tables;
const tablesObj = tables.reduce((total, table) => {
const permissions = this._arrayToObj(table.permissions);
return Object.assign(total, { [table.name]: { ...table, permissions } });
| 2 |
diff --git a/server/game/cards/02.5-FHNS/CrisisBreaker.js b/server/game/cards/02.5-FHNS/CrisisBreaker.js const DrawCard = require('../../drawcard.js');
class CrisisBreaker extends DrawCard {
- setupCardAbilities(ability) { // eslint-disable-line no-unused-vars
+ setupCardAbilities() {
+ this.action({
+ title: 'Ready and bring into play',
+ condition: () => {
+ const currentConflict = this.game.currentConflict;
+
+ if (!currentConflict || currentConflict.conflictType !== 'military') {
+ return false;
+ }
+
+ const originalSkillFunction = currentConflict.skillFunction;
+
+ currentConflict.skillFunction = (card) => card.getSkill('military');
+ currentConflict.calculateSkill();
+
+ const conditionFulfilled = currentConflict.attackingPlayer === this.controller ?
+ currentConflict.attackerSkill < currentConflict.defenderSkill :
+ currentConflict.defenderSkill < currentConflict.attackerSkill;
+
+ currentConflict.skillFunction = originalSkillFunction;
+ currentConflict.calculateSkill();
+
+ return conditionFulfilled;
+ },
+ target: {
+ activePromptTitle: 'Choose a character',
+ cardType: 'character',
+ cardCondition: card => card.location === 'play area' && card.hasTrait('berserker') && (!card.isParticipating() || card.bowed)
+ },
+ handler: context => {
+ this.game.addMessage('{0} uses {1} to ready {2} and move it into the conflict', this.controller, this, context.target);
+ this.controller.readyCard(context.target, this);
+ this.game.currentConflict.moveToConflict(context.target);
+ }
+ });
}
}
-CrisisBreaker.id = 'crisis-breaker'; // This is a guess at what the id might be - please check it!!!
+CrisisBreaker.id = 'crisis-breaker';
module.exports = CrisisBreaker;
| 5 |
diff --git a/bower.json b/bower.json "assets",
"config",
"test",
+ "testem.json",
+ "tslint.json",
".babelrc",
- ".editorcofig",
+ ".editorconfig",
".gitignore",
".sass-lint.yml",
".travis.yml",
- "contributing.md",
+ ".github",
"gulpfile.js",
- "package.json"
+ "package.json",
+ "yarn.lock",
+ "DONATIONS.md"
],
"description": "A beautiful, responsive, customizable and accessible (WAI-ARIA) replacement for JavaScript's popup boxes, supported fork of sweetalert",
"main": [
| 8 |
diff --git a/articles/api/authentication/_login.md b/articles/api/authentication/_login.md @@ -404,10 +404,10 @@ Use this endpoint for API-based (active) authentication. Given the user credenti
| `username` <br/><span class="label label-danger">Required</span> | Username/email of the user to login |
| `password` <br/><span class="label label-danger">Required</span> | Password of the user to login |
| `connection` <br/><span class="label label-danger">Required</span> | The name of the connection to use for login |
-| `grant_type` <br/><span class="label label-danger">Required</span> | Set to `password` or `urn:ietf:params:oauth:grant-type:jwt-bearer` |
| `scope` | Set to `openid` to retrieve also an `id_token`, leave null to get only an `access_token` |
+| `grant_type` <br/><span class="label label-danger">Required</span> | Set to `password` to authenticate using username/password or `urn:ietf:params:oauth:grant-type:jwt-bearer` to authenticate using an `id_token` (used to [Authenticate users with Touch ID](/connections/passwordless/ios-touch-id-swift)) |
| `device` | String value. Required when `grant_type` is `urn:ietf:params:oauth:grant-type:jwt-bearer` |
-| `id_token` | Used to authenticate using a token instead of username/password, in [TouchID](/libraries/lock-ios/touchid-authentication) scenarios. |
+| `id_token` | Used to authenticate using a token instead of username/password, in [TouchID](/libraries/lock-ios/touchid-authentication) scenarios. Required when `grant_type` is `urn:ietf:params:oauth:grant-type:jwt-bearer` |
### Test this endpoint
@@ -436,6 +436,7 @@ For the complete error code reference for this endpoint refer to [Errors > POST
- [Database Identity Providers](/connections/database)
- [Rate Limits on User/Password Authentication](/connections/database/rate-limits)
- [Active Directory/LDAP Connector](/connector)
+- [Authenticate users with Touch ID](/connections/passwordless/ios-touch-id-swift)
| 0 |
diff --git a/src/pages/Armor.jsx b/src/pages/Armor.jsx @@ -81,11 +81,11 @@ function Armor() {
accessor: 'armorClass',
Cell: centerCell,
},
- {
- Header: 'Material',
- accessor: 'material',
- Cell: centerCell,
- },
+ // {
+ // Header: 'Material',
+ // accessor: 'material',
+ // Cell: centerCell,
+ // },
{
Header: 'Max Durability',
accessor: 'maxDurability',
@@ -139,7 +139,7 @@ function Armor() {
return {
name: itemName,
- armorClass: item.itemProperties.armorClass,
+ armorClass: `${item.itemProperties.armorClass}/6`,
material: item.itemProperties.ArmorMaterial,
maxDurability: item.itemProperties.MaxDurability,
repairability: `${materialRepairabilityMap[item.itemProperties.ArmorMaterial]}/6`,
| 7 |
diff --git a/CHANGELOG.md b/CHANGELOG.md All notable changes to this project are documented in this file.
-## Head
+## 14.2.0
-- Added: `cwd` option ([#5721](https://github.com/stylelint/stylelint/pull/5721)).
-- Added: `resolveConfig` to Node.js API ([#5734](https://github.com/stylelint/stylelint/pull/5734)).
+- Added: `cwd` option to Node.js API ([#5721](https://github.com/stylelint/stylelint/pull/5721)).
+- Added: `resolveConfig` option to Node.js API ([#5734](https://github.com/stylelint/stylelint/pull/5734)).
- Fixed: showing of incorrect missing package in `customSyntax` require handling ([#5763](https://github.com/stylelint/stylelint/pull/5763)).
- Fixed: `color-function-notation` false positives for variables and color functions ([#5793](https://github.com/stylelint/stylelint/pull/5793))
- Fixed: `color-named` false positives for hex with alpha-channel and false negatives for modern syntax ([#5718](https://github.com/stylelint/stylelint/pull/5718)).
| 6 |
diff --git a/src/test/service/page.test.js b/src/test/service/page.test.js +/* eslint-disable no-unused-vars */
const mongoose = require('mongoose');
const { getInstance } = require('../setup-crowi');
@@ -20,7 +21,7 @@ let childForDeleteCompletely;
let childForRevert;
describe('PageService', () => {
- // eslint-disable-next-line no-unused-vars
+
let crowi;
let Page;
let User;
@@ -125,10 +126,60 @@ describe('PageService', () => {
done();
});
- describe('verifySAMLResponseByABLCRule()', () => {
- test('should return true', () => {
+ describe('rename page', () => {
+ test('renamePage()', () => {
expect(3).toBe(3);
});
+
+ test('renameDescendants()', () => {
+ expect(3).toBe(3);
+ });
+ });
+
+
+ describe('duplicate page', () => {
+ test('duplicate()', () => {
+ expect(3).toBe(3);
});
+ test('duplicateDescendants()', () => {
+ expect(3).toBe(3);
+ });
+
+ test('duplicateTags()', () => {
+ expect(3).toBe(3);
+ });
+ });
+
+ describe('delete page', () => {
+ test('deletePage()', () => {
+ expect(3).toBe(3);
+ });
+
+ test('deleteDescendants()', () => {
+ expect(3).toBe(3);
+ });
+ });
+
+ describe('delete page completely', () => {
+ test('deleteCompletely()', () => {
+ expect(3).toBe(3);
+ });
+
+ test('deleteMultipleCompletely()', () => {
+ expect(3).toBe(3);
+ });
+ });
+
+ describe('revert page', () => {
+ test('revertDeletedPage()', () => {
+ expect(3).toBe(3);
+ });
+
+ test('revertDeletedPages()', () => {
+ expect(3).toBe(3);
+ });
+ });
+
+
});
| 6 |
diff --git a/src/tokens/eth/0xba3a79d758f19efe588247388754b8e4d6edda81.json b/src/tokens/eth/0xba3a79d758f19efe588247388754b8e4d6edda81.json "decimals": 18,
"website": "https://verisafe.io/",
"logo": {
- "src": "https://uploads-ssl.webflow.com/5bb626a3d5b0897767e1fdca/5c82bee056338f42f21c3785_VeriSafe-128.png",
+ "src": "https://www.verisafe.io/logo-128.png",
"width": "128",
"height": "128",
"ipfs_hash": ""
| 4 |
diff --git a/articles/libraries/auth0js/v9/index.md b/articles/libraries/auth0js/v9/index.md @@ -84,7 +84,7 @@ The `authorize()` method can be used for logging in users via the [Hosted Login
| `responseType` | optional | (String) It can be any space separated list of the values `code`, `token`, `id_token`. It defaults to `'token'`, unless a `redirectUri` is provided, then it defaults to `'code'`. |
| `clientID` | optional | (String) Your Auth0 client ID. |
| `redirectUri` | optional | (String) The URL to which Auth0 will redirect the browser after authorization has been granted for the user. |
-| `leeway` | optional | (Integer) Add leeway for clock skew to JWT expiration times. |
+| `leeway` | optional | (Integer) A value in seconds; leeway to allow for clock skew with regard to JWT expiration times. |
::: note
Because of clock skew issues, you may occasionally encounter the error `The token was issued in the future`. The `leeway` parameter can be used to allow a few seconds of leeway to JWT expiration times, to prevent that from occuring.
| 0 |
diff --git a/src/components/dashboard/Claim.js b/src/components/dashboard/Claim.js @@ -58,7 +58,7 @@ class Claim extends Component<ClaimProps, {}> {
const { entitlement } = store.get('account')
const ClaimButton = (
<CustomButton
- disabled={entitlement <= 0 && this.state.isCitizen}
+ // disabled={entitlement <= 0 && this.state.isCitizen}
mode="contained"
onPress={async () => {
;(await goodWallet.isCitizen()) ? this.handleClaim() : this.faceRecognition()
| 2 |
diff --git a/packages/mobile-bridge/src/index.js b/packages/mobile-bridge/src/index.js @@ -80,7 +80,8 @@ class MobileBridge {
rpcUrl,
getAccounts: this.getAccounts.bind(this),
processTransaction: this.processTransaction.bind(this),
- signMessage: this.signMessage.bind(this)
+ signMessage: this.signMessage.bind(this),
+ signPersonalMessage: this.signMessage.bind(this)
})
// Disable caching subProviders, because they interfere with the provider
| 9 |
diff --git a/src/ObjectPreview.jsx b/src/ObjectPreview.jsx @@ -3,6 +3,8 @@ import React, {useEffect, useRef} from 'react';
import classnames from 'classnames';
import style from './ObjectPreview.module.css';
import dioramaManager from '../diorama.js';
+import {OrbitControls} from 'three/examples/jsm/controls/OrbitControls.js';
+import {fitCameraToBoundingBox} from '../util.js';
const canvasWidth = 300;
const canvasHeight = 400;
@@ -33,12 +35,28 @@ const ObjectPreview = ({
lightningBackground: false,
radialBackground: false,
glyphBackground: false, */
+ autoCamera: false,
});
- diorama.setAspect(canvasWidth / canvasHeight);
+ const {camera} = diorama;
+ camera.position.set(0, 0, 1);
+ camera.updateMatrixWorld();
+ camera.aspect = canvasWidth / canvasHeight;
+ camera.updateProjectionMatrix();
diorama.addCanvas(canvas);
+ const controls = new OrbitControls(camera, canvas);
+ // controls.update() must be called after any manual changes to the camera's transform
+ // camera.position.set( 0, 20, 100 );
+
+ const _updateControls = () => {
+ controls.update();
+ frame = requestAnimationFrame(_updateControls);
+ };
+ let frame = requestAnimationFrame(_updateControls);
+
return () => {
diorama.destroy();
+ cancelAnimationFrame(frame);
};
}
}, [canvasRef, object]);
| 0 |
diff --git a/src/gml/GmlImports.hx b/src/gml/GmlImports.hx @@ -164,7 +164,7 @@ class GmlImports {
if (ns != null) cache.enumNsComps = nsComps;
}
for (comp in comps) this.comp.push(comp);
- for (comp in nsComps) ns.comp.push(comp);
+ if (ns != null) for (comp in nsComps) ns.comp.push(comp);
} else for (comp in en.compList) {
this.comp.push(enumCompToFullComp(comp, short));
if (ns != null) ns.comp.push(enumCompToNsComp(comp));
| 1 |
diff --git a/docusaurus/docs/making-a-progressive-web-app.md b/docusaurus/docs/making-a-progressive-web-app.md @@ -4,7 +4,7 @@ title: Making a Progressive Web App
---
The production build has all the tools necessary to generate a first-class
-[Progressive Web App](https://developers.google.com/web/progressive-web-apps/),
+[Progressive Web App](https://developer.mozilla.org/en-US/docs/Web/Progressive_web_apps),
but **the offline/cache-first behavior is opt-in only**.
Starting with Create React App 4, you can add a `src/service-worker.js` file to
| 1 |
diff --git a/index.js b/index.js @@ -72,8 +72,8 @@ function createWindow () {
})
// create system tray icon
- if(process.platform == 'win32') trayIcon = new Tray('./assets/icon.ico')
- else trayIcon = new Tray('./assets/icon.png')
+ if(process.platform == 'win32') trayIcon = new Tray(path.join(__dirname, './assets/icon.ico'))
+ else trayIcon = new Tray(path.join(__dirname, './assets/icon.png'))
// right click menu to quit and show app
var contextMenu = Menu.buildFromTemplate([
| 1 |
diff --git a/src/structures/MiniGames/SkyWars.js b/src/structures/MiniGames/SkyWars.js @@ -367,7 +367,7 @@ function getSkyWarsPrestige (level) {
*/
function getSkyWarsLevel (xp) {
const totalXp = [0, 2, 7, 15, 25, 50, 100, 200, 350, 600, 1000, 1500];
- if (xp >= 15000) return (xp - 15000) / 10000 + 12;
+ if (xp >= 15000) return Math.floor((xp - 15000) / 10000 + 12);
const level = totalXp.findIndex((x) => x * 10 - xp > 0);
return level; /* + (xp - (totalXp[level - 1] * 10 || 0)) / (totalXp[level] - totalXp[level - 1]) / 10*/
}
@@ -390,7 +390,7 @@ function getSkyWarsLevelProgress (xp) {
} while (currentLevelXp >= 10000);
}
xpToNextLevel = 10000 - currentLevelXp;
- percent = (Math.round(((currentLevelXp / 10000) * 100) * 100) / 100);
+ percent = (Math.round(currentLevelXp) / 100);
return {
currentLevelXp,
xpToNextLevel,
@@ -404,7 +404,7 @@ function getSkyWarsLevelProgress (xp) {
currentLevelXp -= xpToNextLvl[i] * 10;
}
xpToNextLevel = totalXptoNextLevel - currentLevelXp;
- percent = (Math.round(((currentLevelXp / totalXptoNextLevel) * 100) * 100) / 100);
+ percent = (Math.round((currentLevelXp / totalXptoNextLevel) * 10000) / 100);
return {
currentLevelXp,
xpToNextLevel,
| 1 |
diff --git a/lib/worker/line-numbers.js b/lib/worker/line-numbers.js @@ -61,7 +61,7 @@ function findTest(locations, declaration) {
const range = (start, end) => Array.from({length: end - start + 1}).fill(start).map((element, index) => element + index);
const translate = (sourceMap, pos) => {
- if (sourceMap === undefined) {
+ if (sourceMap === null) {
return pos;
}
@@ -88,7 +88,7 @@ export default function lineNumberSelection({file, lineNumbers = []}) {
let locations = parse(file);
let lookedForSourceMap = false;
- let sourceMap;
+ let sourceMap = null;
return () => {
if (!lookedForSourceMap) {
@@ -98,7 +98,13 @@ export default function lineNumberSelection({file, lineNumbers = []}) {
// Source maps are not available before then.
sourceMap = findSourceMap(file);
- if (sourceMap !== undefined) {
+ if (sourceMap === undefined) {
+ // Prior to Node.js 18.8.0, the value when a source map could not be found was `undefined`.
+ // This changed to `null` in <https://github.com/nodejs/node/pull/43875>.
+ sourceMap = null;
+ }
+
+ if (sourceMap !== null) {
locations = locations.map(({start, end}) => ({
start: translate(sourceMap, start),
end: translate(sourceMap, end),
| 9 |
diff --git a/test/utils/expected-files.js b/test/utils/expected-files.js @@ -818,7 +818,7 @@ const expectedFiles = {
`${CLIENT_TEST_SRC_DIR}cypress/integration/account/reset-password-page.spec.ts`,
],
- cypressWithOauth2: [`${CLIENT_TEST_SRC_DIR}cypress/support/keycloak-oauth2.ts`, `${CLIENT_TEST_SRC_DIR}cypress/support/utils.ts`],
+ cypressWithOauth2: [`${CLIENT_TEST_SRC_DIR}cypress/support/keycloak-oauth2.ts`],
};
module.exports = expectedFiles;
| 2 |
diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js @@ -747,16 +747,16 @@ function generateDefaultWorkspaceName(email = '') {
}
// Check if this name already exists in the policies
- let suffix = 0;
+ let count = 0;
_.forEach(allPolicies, (policy) => {
const name = lodashGet(policy, 'name', '');
if (name.toLowerCase().includes(defaultWorkspaceName.toLowerCase())) {
- suffix += 1;
+ count += 1;
}
});
- return suffix > 0 ? `${defaultWorkspaceName} ${suffix}` : defaultWorkspaceName;
+ return count > 0 ? `${defaultWorkspaceName} ${count + 1}` : defaultWorkspaceName;
}
/**
| 4 |
diff --git a/articles/compliance/gdpr/features-aiding-compliance/data-portability.md b/articles/compliance/gdpr/features-aiding-compliance/data-portability.md @@ -21,9 +21,4 @@ To export a user's data manually from the Dashboard:
## Export data using the API
-You can export a user's full profile using our Management API. The response will be in JSON format. There are several endpoints you can use, depending on your use case and the search criteria you want to use:
-
-- [Search for a user using their email address](/users/search#users-by-email)
-- [Search for a user using their ID](/users/search#users-by-id)
-- [Search for a set of users](/users/search#users)
-- [Export a list of your users](/users/search#user-export)
\ No newline at end of file
+You can export a user's full profile using our Management API. The response will be in JSON format. You can either [search for a user using their ID](/users/search#users-by-id), or [export a list of your users](/users/search#user-export).
| 2 |
diff --git a/common/actions.js b/common/actions.js @@ -12,18 +12,6 @@ const REQUEST_HEADERS = {
"Content-Type": "application/json",
};
-const API_HEADERS = {
- Accept: "application/json",
- "Content-Type": "application/json",
- Authorization: "Basic SLA42887290-7073-4f7c-961d-db84aea29b41TE",
-};
-
-const API_OPTIONS = {
- method: "POST",
- headers: API_HEADERS,
- credentials: "include",
-};
-
const DEFAULT_OPTIONS = {
method: "POST",
headers: REQUEST_HEADERS,
@@ -457,142 +445,86 @@ export const cleanDatabase = async () => {
});
};
-export const v1GetSlate = async (data) => {
- return await returnJSON(`/api/v1/get-slate`, {
- ...API_OPTIONS,
- body: JSON.stringify({ data }),
- });
-};
-
-export const v1Get = async (data) => {
- return await returnJSON(`/api/v1/get`, {
- ...API_OPTIONS,
- body: JSON.stringify({ data }),
- });
-};
-
-export const v1UpdateSlate = async (data) => {
- return await returnJSON(`/api/v1/update-slate`, {
- ...API_OPTIONS,
- body: JSON.stringify({ data }),
- });
-};
-
-export const v2GetSlate = async (data) => {
- return await returnJSON(`/api/v2/get-slate`, {
- ...API_OPTIONS,
- body: JSON.stringify({ data }),
- });
-};
-
-export const v2GetUser = async (data) => {
- return await returnJSON(`/api/v2/get-user`, {
- ...API_OPTIONS,
- body: JSON.stringify({ data }),
- });
-};
-
-export const v2Get = async (data) => {
- return await returnJSON(`/api/v2/get`, {
- ...API_OPTIONS,
- body: JSON.stringify({ data }),
- });
-};
-
-export const v2UpdateSlate = async (data) => {
- return await returnJSON(`/api/v2/update-slate`, {
- ...API_OPTIONS,
- body: JSON.stringify({ data }),
- });
-};
-
-export const v2UpdateFile = async (data) => {
- return await returnJSON(`/api/v2/update-file`, {
- ...API_OPTIONS,
- body: JSON.stringify({ data }),
- });
-};
-
export const createTwitterEmailVerification = async (data) => {
return await returnJSON(`/api/verifications/twitter/create`, {
- ...API_OPTIONS,
+ ...DEFAULT_OPTIONS,
body: JSON.stringify({ data }),
});
};
export const verifyTwitterEmail = async (data) => {
return await returnJSON(`/api/verifications/twitter/verify`, {
- ...API_OPTIONS,
+ ...DEFAULT_OPTIONS,
body: JSON.stringify({ data }),
});
};
export const createPasswordResetVerification = async (data) => {
return await returnJSON(`/api/verifications/password-reset/create`, {
- ...API_OPTIONS,
+ ...DEFAULT_OPTIONS,
body: JSON.stringify({ data }),
});
};
export const resendPasswordResetVerification = async (data) => {
return await returnJSON(`/api/verifications/password-reset/resend`, {
- ...API_OPTIONS,
+ ...DEFAULT_OPTIONS,
body: JSON.stringify({ data }),
});
};
export const verifyPasswordResetEmail = async (data) => {
return await returnJSON(`/api/verifications/password-reset/verify`, {
- ...API_OPTIONS,
+ ...DEFAULT_OPTIONS,
body: JSON.stringify({ data }),
});
};
export const resetPassword = async (data) => {
return await returnJSON(`/api/users/reset-password`, {
- ...API_OPTIONS,
+ ...DEFAULT_OPTIONS,
body: JSON.stringify({ data }),
});
};
export const createLegacyVerification = async (data) => {
return await returnJSON(`/api/verifications/legacy/create`, {
- ...API_OPTIONS,
+ ...DEFAULT_OPTIONS,
body: JSON.stringify({ data }),
});
};
export const migrateUser = async (data) => {
return await returnJSON(`/api/users/migrate`, {
- ...API_OPTIONS,
+ ...DEFAULT_OPTIONS,
body: JSON.stringify({ data }),
});
};
export const createVerification = async (data) => {
return await returnJSON(`/api/verifications/create`, {
- ...API_OPTIONS,
+ ...DEFAULT_OPTIONS,
body: JSON.stringify({ data }),
});
};
export const verifyEmail = async (data) => {
return await returnJSON(`/api/verifications/verify`, {
- ...API_OPTIONS,
+ ...DEFAULT_OPTIONS,
body: JSON.stringify({ data }),
});
};
export const resendVerification = async (data) => {
return await returnJSON(`/api/verifications/resend`, {
- ...API_OPTIONS,
+ ...DEFAULT_OPTIONS,
body: JSON.stringify({ data }),
});
};
export const getUserVersion = async (data) => {
return await returnJSON(`/api/users/get-version`, {
- ...API_OPTIONS,
+ ...DEFAULT_OPTIONS,
body: JSON.stringify({ data }),
});
};
| 2 |
diff --git a/token-metadata/0x2C537E5624e4af88A7ae4060C022609376C8D0EB/metadata.json b/token-metadata/0x2C537E5624e4af88A7ae4060C022609376C8D0EB/metadata.json "symbol": "TRYB",
"address": "0x2C537E5624e4af88A7ae4060C022609376C8D0EB",
"decimals": 6,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/articles/quickstart/webapp/python/01-login.md b/articles/quickstart/webapp/python/01-login.md @@ -7,6 +7,12 @@ budicon: 448
You can get started by either downloading the complete sample or following the tutorial steps to integrate Auth0 with an existing application.
+<%= include('../../../_includes/_package', {
+ org: 'auth0-samples',
+ repo: 'auth0-python-web-app',
+ path: '01-Login'
+}) %>
+
<%= include('../_includes/_getting_started', { library: 'Python', callback: 'http://localhost:3000/callback' }) %>
## Add the Dependencies
| 0 |
diff --git a/js/main.js b/js/main.js @@ -3863,6 +3863,7 @@ class V2C_PluginCard extends BDV2.reactComponent {
constructor(props) {
super(props);
let self = this;
+ self.settingsPanel = self.props.plugin.getSettingsPanel();
self.onChange = self.onChange.bind(self);
self.showSettings = self.showSettings.bind(self);
self.setInitialState();
@@ -3877,16 +3878,20 @@ class V2C_PluginCard extends BDV2.reactComponent {
componentDidUpdate() {
if (this.state.settings) {
- // this.refs.settingspanel.innerHTML = this.props.plugin.getSettingsPanel();
+ if (typeof this.settingsPanel === "object") {
+ this.refs.settingspanel.appendChild(this.settingsPanel);
+ }
}
}
render() {
+ let self = this;
let { plugin } = this.props;
let name = plugin.getName();
let author = plugin.getAuthor();
let description = plugin.getDescription();
let version = plugin.getVersion();
+ let { settingsPanel } = this;
if (this.state.settings) {
return BDV2.react.createElement(
@@ -3895,11 +3900,12 @@ class V2C_PluginCard extends BDV2.reactComponent {
BDV2.react.createElement(
"div",
{ style: { float: "right", cursor: "pointer" }, onClick: () => {
- this.setState({ 'settings': false });
+ this.refs.settingspanel.innerHTML = "";self.setState({ 'settings': false });
} },
BDV2.react.createElement(V2Components.XSvg, null)
),
- BDV2.react.createElement("div", { ref: "settingspanel", dangerouslySetInnerHTML: { __html: plugin.getSettingsPanel() } })
+ typeof settingsPanel === 'object' && BDV2.react.createElement("div", { ref: "settingspanel" }),
+ typeof settingsPanel !== 'object' && BDV2.react.createElement("div", { ref: "settingspanel", dangerouslySetInnerHTML: { __html: plugin.getSettingsPanel() } })
);
}
| 11 |
diff --git a/admin-base/ui.apps/src/main/content/jcr_root/apps/admin/components/contentview/template.vue b/admin-base/ui.apps/src/main/content/jcr_root/apps/admin/components/contentview/template.vue <div
id = "editviewoverlay"
v-on:click = "click"
+ v-on:mousewheel = "scrollEditView"
v-on:mousemove= "mouseMove"
v-on:mouseout = "leftArea"
v-on:dragover = "dragOver"
@@ -31,6 +32,18 @@ export default {
perHelperModelAction('getConfig', perAdminView.pageView.path)
},
+ scrollEditView(ev){
+ var timer = null
+ var editViewOverlay = ev.target
+ editViewOverlay.style['pointer-events'] = 'none'
+ if(timer !== null) {
+ clearTimeout(timer)
+ }
+ timer = setTimeout(function() {
+ editViewOverlay.style['pointer-events'] = 'auto'
+ }, 150)
+ },
+
getPosFromMouse: function(e) {
var elRect = this.$el.getBoundingClientRect()
@@ -89,6 +102,7 @@ export default {
mouseMove: function(e) {
if(!e) return
+ if(perAdminView.state.editorVisible) return
var targetEl = this.getTargetEl(e)
if(targetEl) {
var targetBox = targetEl.getBoundingClientRect()
| 11 |
diff --git a/test/db/header.js b/test/db/header.js @@ -25,13 +25,11 @@ function main(options, dc) {
if (options && typeof options === 'object') {
if (!('pgNative' in options)) {
options.pgNative = true;
- options.noWarnings = true;
}
} else {
if (!options) {
options = {
- pgNative: true,
- noWarnings: true
+ pgNative: true
};
}
}
| 1 |
diff --git a/app/controllers/ApplicationController.scala b/app/controllers/ApplicationController.scala @@ -88,7 +88,7 @@ class ApplicationController @Inject() (implicit val env: Environment[User, Sessi
}
case None =>
// When there are no referrers, just load the landing page but store the query parameters that were passed anyway
- val activityLogText: String = "/"+qString.keys.map(i => i.toString +"="+ y(i).toString).mkString("&")
+ val activityLogText: String = "/?"+qString.keys.map(i => i.toString +"="+ qString(i).toString).mkString("&")
request.identity match {
case Some(user) =>
if(qString.isEmpty){
| 1 |
diff --git a/assets/scripts/lobby.js b/assets/scripts/lobby.js @@ -204,9 +204,15 @@ function addToAllChat(data){
if(data.date < 10){data.date = "0" + data.date;}
var date = "[" + hour + ":" + data.date + "]";
+ //prevent XSS injection
var filteredMessage = data.message.replace(/</g, "<").replace(/>/g, ">");
- var str = "<li class=other><span class='date-text'>" + date + "</span> <span class='username-text'>" + data.username + ":</span> " + filteredMessage;
+ var str = "";
+ if(classStr === "server-text"){
+ str = "<li class='" + classStr + "'>" + filteredMessage;
+ } else{
+ str = "<li class='" + classStr + "'><span class='date-text'>" + date + "</span> <span class='username-text'>" + data.username + ":</span> " + filteredMessage;
+ }
$(".all-chat-list").append(str);
scrollDown();
@@ -217,7 +223,7 @@ function addToAllChat(data){
}
}
-function addToRoomChat(data){
+function addToRoomChat(data, classStr){
//format the date
var d = new Date();
@@ -229,7 +235,14 @@ function addToRoomChat(data){
//prevent XSS injection
var filteredMessage = data.message.replace(/</g, "<").replace(/>/g, ">");
- var str = "<li class=other><span class='date-text'>" + date + "</span> <span class='username-text'>" + data.username + ":</span> " + filteredMessage;
+ var str = "";
+
+ if(classStr && classStr !== ""){
+ str = "<li class='" + classStr + "'>" + filteredMessage;
+ }
+ else{
+ str = "<li class='" + classStr + "'><span class='date-text'>" + date + "</span> <span class='username-text'>" + data.username + ":</span> " + filteredMessage;
+ }
$(".room-chat-list").append(str);
scrollDown();
@@ -267,19 +280,24 @@ socket.on("player-joined-lobby", function(username){
});
socket.on("player-left-lobby", function(username){
- var str = "<li class=server-text>" + username + " has left the lobby.";
- $(".all-chat-list").append(str);
- scrollDown();
+ var str = "" + username + " has left the lobby.";
+ var data = {message: str};
+
+ addToAllChat(data, "server-text");
});
socket.on("player-joined-room", function(username){
- var str = "<li class=server-text>" + username + " has joined the room.";
- addToRoomChat(str);
+ var str = "" + username + " has joined the room.";
+ var data = {message: str};
+
+ addToRoomChat(data, "server-text");
});
socket.on("player-left-room", function(username){
- var str = "<li class=server-text>" + username + " has left the room.";
- addToRoomChat(str);
+ var str = "" + username + " has left the room.";
+ var data = {message: str};
+
+ addToRoomChat(data, "server-text");
});
socket.on("update-current-players-list", function(currentPlayers){
@@ -461,8 +479,10 @@ socket.on("game-data", function(data){
});
socket.on("lady-info", function(message){
- var str = "<li class='special-text noselect'>" + message + " (this message is only shown to you)</li>";
- addToRoomChat(str);
+ var str = message + " (this message is only shown to you)";
+ var data = {message: str};
+
+ addToRoomChat(data, "special-text noselect");
});
socket.on("update-status-message", function(data){
@@ -477,9 +497,10 @@ socket.on("update-status-message", function(data){
var oldGameplayText = "";
function newPrintGameplayText(){
if(gameData && gameData.gameplayMessage !== oldGameplayText){
- var str = "<li class='gameplay-text'>" + gameData.gameplayMessage + "</li>";
+ var str = gameData.gameplayMessage;
+ var data = {message: str};
- addToRoomChat(str);
+ addToRoomChat(data, "gameplay-text");
oldGameplayText = gameData.gameplayMessage;
}
| 1 |
diff --git a/protocols/indexer/contracts/Indexer.sol b/protocols/indexer/contracts/Indexer.sol @@ -41,25 +41,25 @@ contract Indexer is IIndexer, Ownable {
mapping (address => uint256) public blacklist;
// The whitelist contract for checking whether a peer is whitelisted
- address public whitelist;
+ address public locatorWhitelist;
/**
* @notice Contract Constructor
*
* @param _stakeToken address
* @param _stakeMinimum uint256
- * @param _whitelist address
+ * @param _locatorWhitelist address
*/
constructor(
address _stakeToken,
uint256 _stakeMinimum,
- address _whitelist
+ address _locatorWhitelist
) public {
stakeToken = IERC20(_stakeToken);
stakeMinimum = _stakeMinimum;
emit SetStakeMinimum(_stakeMinimum);
- whitelist = _whitelist;
+ locatorWhitelist = _locatorWhitelist;
}
/**
@@ -163,8 +163,8 @@ contract Indexer is IIndexer, Ownable {
) public {
// Ensure the locator is whitelisted, if relevant
- if (whitelist != address(0)) {
- require(IWhitelist(whitelist).isWhitelisted(_locator),
+ if (locatorWhitelist != address(0)) {
+ require(IWhitelist(locatorWhitelist).isWhitelisted(_locator),
"LOCATOR_NOT_WHITELISTED");
}
| 10 |
diff --git a/test/jasmine/tests/hover_label_test.js b/test/jasmine/tests/hover_label_test.js @@ -5377,29 +5377,29 @@ describe('hovermode: (x|y)unified', function() {
.then(function(gd) {
_hover(gd, { xpx: 40, ypx: 200 });
assertLabel({title: 'Jan', items: [
- 'bar : (Jan 1, 2000, 1)',
- 'start : 1',
- 'end : 1'
+ 'start : 1'
]});
_hover(gd, { xpx: 100, ypx: 200 });
+ assertLabel({title: 'Jan 1, 2000', items: [
+ 'bar : 1'
+ ]});
+
+ _hover(gd, { xpx: 210, ypx: 200 });
assertLabel({title: 'Jan', items: [
'bar : (Jan 1, 2000, 1)',
- 'start : 1',
- 'end : 1'
+ 'start : (Feb, 2)',
+ 'end : 1',
]});
_hover(gd, { xpx: 360, ypx: 200 });
- assertLabel({title: 'Feb', items: [
- 'bar : (Feb 1, 2000, 2)',
- 'start : 2',
- 'end : 2'
+ assertLabel({title: 'Feb 1, 2000', items: [
+ 'bar : 2'
]});
_hover(gd, { xpx: 400, ypx: 200 });
assertLabel({title: 'Feb', items: [
'bar : (Feb 1, 2000, 2)',
- 'start : 2',
'end : 2'
]});
})
@@ -5407,7 +5407,53 @@ describe('hovermode: (x|y)unified', function() {
});
});
- it('two end positioned scatter period', function(done) {
+ [{
+ type: 'scatter',
+ alignment: 'start'
+ }, {
+ type: 'scatter',
+ alignment: 'middle'
+ }, {
+ type: 'scatter',
+ alignment: 'end'
+ }, {
+ type: 'bar',
+ barmode: 'overlay',
+ alignment: 'start'
+ }, {
+ type: 'bar',
+ barmode: 'group',
+ alignment: 'middle'
+ }, {
+ type: 'bar',
+ barmode: 'group',
+ alignment: 'end'
+ }, {
+ type: 'bar',
+ barmode: 'group',
+ alignment: 'start'
+ }, {
+ type: 'bar',
+ barmode: 'overlay',
+ alignment: 'middle'
+ }, {
+ type: 'bar',
+ barmode: 'overlay',
+ alignment: 'end'
+ }, {
+ type: 'bar',
+ barmode: 'stacked',
+ alignment: 'start'
+ }, {
+ type: 'bar',
+ barmode: 'stacked',
+ alignment: 'middle'
+ }, {
+ type: 'bar',
+ barmode: 'stacked',
+ alignment: 'end'
+ }].forEach(function(t) {
+ it('two ' + t.alignment + ' period positioned ' + (t.barmode ? t.barmode + ' ' : '') + t.type + 's', function(done) {
var fig = {
data: [{
x: [
@@ -5416,8 +5462,10 @@ describe('hovermode: (x|y)unified', function() {
'1971-01-01'
],
xperiod: 'M6',
- xperiodalignment: 'end',
- y: [1, 2, 3]
+ xperiodalignment: t.alignment,
+ type: t.type,
+ hovertemplate: '%{y}',
+ y: [11, 12, 13]
}, {
x: [
'1970-01-01',
@@ -5425,10 +5473,13 @@ describe('hovermode: (x|y)unified', function() {
'1971-01-01',
],
xperiod: 'M6',
- xperiodalignment: 'end',
- y: [11, 12, 13]
+ xperiodalignment: t.alignment,
+ type: t.type,
+ hovertemplate: '%{y}',
+ y: [1, 2, 3]
}],
layout: {
+ barmode: t.barmode,
showlegend: false,
width: 600,
height: 400,
@@ -5440,18 +5491,19 @@ describe('hovermode: (x|y)unified', function() {
.then(function(gd) {
_hover(gd, { xpx: 200, ypx: 200 });
assertLabel({title: 'Jul 1, 1970', items: [
- 'trace 0 : 2',
- 'trace 1 : 12'
+ 'trace 0 : 12',
+ 'trace 1 : 2'
]});
_hover(gd, { xpx: 400, ypx: 200 });
assertLabel({title: 'Jan 1, 1971', items: [
- 'trace 0 : 3',
- 'trace 1 : 13'
+ 'trace 0 : 13',
+ 'trace 1 : 3'
]});
})
.then(done, done.fail);
});
+ });
it('period with hover distance -1 include closest not farthest', function(done) {
Plotly.newPlot(gd, {
| 7 |
diff --git a/storybook-utilities/storybook-theming/storybook-spark-theme.js b/storybook-utilities/storybook-theming/storybook-spark-theme.js @@ -6,16 +6,16 @@ let sparkLogo;
switch (storybookInstance) {
case 'react':
- sparkLogo = 'https://spark-assets.netlify.com/spark-logo-black-text.svg';
+ sparkLogo = 'https://spark-assets.netlify.com/spark-logo-react.svg';
break;
case 'angular':
- sparkLogo = 'https://spark-assets.netlify.com/spark-logo-black-text.svg';
+ sparkLogo = 'https://spark-assets.netlify.com/spark-logo-angular.svg';
break;
case 'html':
- sparkLogo = 'https://spark-assets.netlify.com/spark-logo-black-text.svg';
+ sparkLogo = 'https://spark-assets.netlify.com/spark-logo-html.svg';
break;
default:
- sparkLogo = 'https://spark-assets.netlify.com/spark-logo-black-text.svg';
+ sparkLogo = 'https://spark-assets.netlify.com/spark-logo-mark.svg';
}
export default create({
| 3 |
diff --git a/src/diagrams/flowchart/graphDb.js b/src/diagrams/flowchart/graphDb.js @@ -248,7 +248,7 @@ export const getClasses = function () {
const setupToolTips = function (element) {
let tooltipElem = d3.select('.mermaidTooltip')
- if (tooltipElem[0][0] === null) {
+ if ((tooltipElem._groups || tooltipElem)[0][0] === null) {
tooltipElem = d3.select('body')
.append('div')
.attr('class', 'mermaidTooltip')
| 1 |
diff --git a/src/components/postElements/body/view/postBodyView.js b/src/components/postElements/body/view/postBodyView.js @@ -22,6 +22,7 @@ import { toastNotification } from '../../../../redux/actions/uiAction';
import { default as ROUTES } from '../../../../constants/routeNames';
import getYoutubeId from '../../../../utils/getYoutubeId';
import VideoPlayerSheet from './videoPlayerSheet';
+import { OptionsModal } from '../../../atoms';
const WIDTH = Dimensions.get('window').width;
@@ -48,24 +49,12 @@ const PostBody = ({
const actionLink = useRef(null);
const youtubePlayerRef = useRef(null);
- useEffect(() => {
- if (selectedLink) {
- actionLink.current.show();
- }
- }, [selectedLink]);
-
useEffect(() => {
if (body) {
setHtml(body.replace(/<a/g, '<a target="_blank"'));
}
}, [body]);
- useEffect(() => {
- if (postImages.length > 0 && selectedImage) {
- actionImage.current.show();
- }
- }, [postImages, selectedImage]);
-
const _handleOnLinkPress = (event) => {
if ((!event && !get(event, 'nativeEvent.data'), false)) {
return;
@@ -96,6 +85,7 @@ const PostBody = ({
case '_external':
case 'markdown-external-link':
setSelectedLink(href);
+ actionLink.current.show();
//_handleBrowserLink(href);
break;
case 'markdown-author-link':
@@ -127,6 +117,7 @@ const PostBody = ({
case 'image':
setPostImages(images);
setSelectedImage(image);
+ actionImage.current.show();
break;
default:
@@ -466,7 +457,7 @@ const PostBody = ({
<VideoPlayerSheet youtubeVideoId={youtubeVideoId} />
</ActionSheetView>
- <ActionSheet
+ <OptionsModal
ref={actionImage}
options={[
intl.formatMessage({ id: 'post.copy_link' }),
@@ -480,7 +471,7 @@ const PostBody = ({
handleImagePress(index);
}}
/>
- <ActionSheet
+ <OptionsModal
ref={actionLink}
options={[
intl.formatMessage({ id: 'post.copy_link' }),
| 14 |
diff --git a/token-metadata/0x10Bae51262490B4f4AF41e12eD52A0E744c1137A/metadata.json b/token-metadata/0x10Bae51262490B4f4AF41e12eD52A0E744c1137A/metadata.json "symbol": "SLINK",
"address": "0x10Bae51262490B4f4AF41e12eD52A0E744c1137A",
"decimals": 9,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/js/common_shim.js b/src/js/common_shim.js @@ -266,9 +266,10 @@ module.exports = {
dc.send = function() {
var data = arguments[0];
var length = data.length || data.size || data.byteLength;
- if (length > pc.sctp.maxMessageSize) {
- throw new DOMException('Message too large (can send a maximum of ' +
- pc.sctp.maxMessageSize + ' bytes)', 'TypeError');
+ if (dc.readyState === 'open' &&
+ pc.sctp && length > pc.sctp.maxMessageSize) {
+ throw new TypeError('Message too large (can send a maximum of ' +
+ pc.sctp.maxMessageSize + ' bytes)');
}
return origDataChannelSend.apply(dc, arguments);
};
| 7 |
diff --git a/packages/bitcore-lib-doge/test/transaction/transaction.js b/packages/bitcore-lib-doge/test/transaction/transaction.js @@ -1788,7 +1788,7 @@ describe('Transaction', function() {
txId: '1d732950d99f821b8a8d11972ea56000b0666e4d31fa71861ffd80a83797dc61',
outputIndex: 1,
script: Script.buildScriptHashOut(nestedAddress).toHex(),
- satoshis: 1e8
+ satoshis: 2e8
};
var witnessAddress = Address.createMultisig([
publicKey1
@@ -1809,8 +1809,8 @@ describe('Transaction', function() {
.change('mqWDcnW3jMzthB8qdB9SnFam6N96GDqM4W')
.sign(privateKey1);
var sighash = tx.inputs[0].getSighash(tx, privateKey1, 0, bitcore.crypto.Signature.SIGHASH_ALL);
- sighash.toString('hex').should.equal('e132a913b5c0e90d49c1b2017d934f78796a10c784d669cc11d51093a773c0c5');
- tx.toBuffer().toString('hex').should.equal('010000000161dc9737a880fd1f8671fa314d6e66b00060a52e97118d8a1b829fd95029731d010000006f004730440220223d1cb249d063b743781607c2b3e59195d4b9a15a5e2df7a6c64818f0106e7a02202081733a14e8bcd99582a5a7893dd6e6cd1368e5c0e49a0cec627e9dbe0a9830012551210304c1a51134235dc282641432811a26d367d4ea52b4ac5e20c107668b010fdd4b51aeffffffff0250c30000000000001976a914ef6aa14d8f5ba65a12c327a9659681c44cd821b088acc0d3f205000000001976a9146d8da2015c6d2890896485edd5897b3b2ec9ebb188ac00000000');
+ sighash.toString('hex').should.equal('f2b2dace70c98ecfb8b9b8bfd4697275ca683a250a5437956e120fd4e526aa01');
+ tx.toBuffer().toString('hex').should.equal('010000000161dc9737a880fd1f8671fa314d6e66b00060a52e97118d8a1b829fd95029731d0100000070004830450221009c709313381b0f53fcb2b197862eb23147eceef3ae6714c3b60e9c6cfc2c720402207872f44bdd4f3668c03fac20a922dac16bebe657c3bcd65c3a77a5917449da99012551210304c1a51134235dc282641432811a26d367d4ea52b4ac5e20c107668b010fdd4b51aeffffffff0250c30000000000001976a914ef6aa14d8f5ba65a12c327a9659681c44cd821b088acc0b4e80b000000001976a9146d8da2015c6d2890896485edd5897b3b2ec9ebb188ac00000000');
});
});
});
| 3 |
diff --git a/packages/idyll-document/test/vars.js b/packages/idyll-document/test/vars.js @@ -58,63 +58,71 @@ describe('Component state initialization', () => {
const checks = [
{
id: 'varDisplay',
- html: '<span>2.00</span>'
+ html: '<span class="idyll-display">2.00</span>'
},
{
id: 'derivedVarDisplay',
- html: '<span>4.00</span>'
+ html: '<span class="idyll-display">4.00</span>'
},
{
id: 'derivedVarDisplay2',
- html: '<span>8.00</span>'
+ html: '<span class="idyll-display">8.00</span>'
},
{
id: 'strDisplay',
- html: '<span>string</span>'
+ html: '<span class="idyll-display">string</span>'
},
{
id: 'staticObjectDisplay',
- html: `<span>${JSON.stringify({ static: 'object' })}</span>`
+ html: `<span class="idyll-display">${JSON.stringify({
+ static: 'object'
+ })}</span>`
},
{
id: 'dynamicObjectDisplay',
- html: `<span>${JSON.stringify({ dynamic: 2.0 })}</span>`
+ html: `<span class="idyll-display">${JSON.stringify({
+ dynamic: 2.0
+ })}</span>`
},
{
id: 'dataDisplay',
- html: `<span>${FAKE_DATA}</span>`
+ html: `<span class="idyll-display">${FAKE_DATA}</span>`
},
{
id: 'bareDataDisplay',
- html: `<span>${FAKE_DATA}</span>`
+ html: `<span class="idyll-display">${FAKE_DATA}</span>`
},
{
id: 'bareVarDisplay',
- html: '<span>2.00</span>'
+ html: '<span class="idyll-display">2.00</span>'
},
{
id: 'bareDerivedDisplay',
- html: '<span>4.00</span>'
+ html: '<span class="idyll-display">4.00</span>'
},
{
id: 'bareDerivedDisplay2',
- html: '<span>8.00</span>'
+ html: '<span class="idyll-display">8.00</span>'
},
{
id: 'objectVarDisplay',
- html: `<span>${JSON.stringify({ an: 'object' })}</span>`
+ html: `<span class="idyll-display">${JSON.stringify({
+ an: 'object'
+ })}</span>`
},
{
id: 'bareObjectVarDisplay',
- html: `<span>${JSON.stringify({ an: 'object' })}</span>`
+ html: `<span class="idyll-display">${JSON.stringify({
+ an: 'object'
+ })}</span>`
},
{
id: 'arrayVarDisplay',
- html: `<span>${JSON.stringify(['array'])}</span>`
+ html: `<span class="idyll-display">${JSON.stringify(['array'])}</span>`
},
{
id: 'bareArrayVarDisplay',
- html: `<span>${JSON.stringify(['array'])}</span>`
+ html: `<span class="idyll-display">${JSON.stringify(['array'])}</span>`
}
];
@@ -217,67 +225,75 @@ describe('Component state initialization', () => {
const checks = [
{
id: 'varDisplay',
- html: '<span>8.00</span>'
+ html: '<span class="idyll-display">8.00</span>'
},
{
id: 'derivedVarDisplay',
- html: '<span>64.00</span>'
+ html: '<span class="idyll-display">64.00</span>'
},
{
id: 'derivedVarDisplay2',
- html: '<span>512.00</span>'
+ html: '<span class="idyll-display">512.00</span>'
},
{
id: 'strDisplay',
- html: '<span>string</span>'
+ html: '<span class="idyll-display">string</span>'
},
{
id: 'staticObjectDisplay',
- html: `<span>${JSON.stringify({ static: 'object' })}</span>`
+ html: `<span class="idyll-display">${JSON.stringify({
+ static: 'object'
+ })}</span>`
},
{
id: 'dynamicObjectDisplay',
- html: `<span>${JSON.stringify({ dynamic: 8.0 })}</span>`
+ html: `<span class="idyll-display">${JSON.stringify({
+ dynamic: 8.0
+ })}</span>`
},
{
id: 'dataDisplay',
- html: `<span>${FAKE_DATA}</span>`
+ html: `<span class="idyll-display">${FAKE_DATA}</span>`
},
{
id: 'bareDataDisplay',
- html: `<span>${FAKE_DATA}</span>`
+ html: `<span class="idyll-display">${FAKE_DATA}</span>`
},
{
id: 'bareDerivedDisplay',
- html: '<span>64.00</span>'
+ html: '<span class="idyll-display">64.00</span>'
},
{
id: 'bareDerivedDisplay2',
- html: '<span>512.00</span>'
+ html: '<span class="idyll-display">512.00</span>'
},
{
id: 'bareVarDisplay',
- html: '<span>8.00</span>'
+ html: '<span class="idyll-display">8.00</span>'
},
{
id: 'objectVarDisplay',
- html: `<span>${JSON.stringify({ an: 'object' })}</span>`
+ html: `<span class="idyll-display">${JSON.stringify({
+ an: 'object'
+ })}</span>`
},
{
id: 'bareObjectVarDisplay',
- html: `<span>${JSON.stringify({ an: 'object' })}</span>`
+ html: `<span class="idyll-display">${JSON.stringify({
+ an: 'object'
+ })}</span>`
},
{
id: 'arrayVarDisplay',
- html: `<span>${JSON.stringify(['array'])}</span>`
+ html: `<span class="idyll-display">${JSON.stringify(['array'])}</span>`
},
{
id: 'bareArrayVarDisplay',
- html: `<span>${JSON.stringify(['array'])}</span>`
+ html: `<span class="idyll-display">${JSON.stringify(['array'])}</span>`
},
{
id: 'lateVarDisplay',
- html: `<span>50.00</span>`
+ html: `<span class="idyll-display">50.00</span>`
}
];
| 1 |
diff --git a/factory-ai-vision/EdgeSolution/modules/WebModule/ui/src/store/project/projectActions.ts b/factory-ai-vision/EdgeSolution/modules/WebModule/ui/src/store/project/projectActions.ts @@ -373,13 +373,7 @@ export const thunkGetInferenceMetrics = (projectId: number, isDemo: boolean) =>
data.unidentified_num,
data.gpu,
data.average_time,
- // TODO: Get it from server
- Array.from({ length: 20 })
- .map((_, i) => i)
- .reduce((acc, cur) => {
- acc[`${cur} part`] = cur;
- return acc;
- }, {}),
+ data.count,
isDemo,
),
);
| 9 |
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md @@ -28,7 +28,7 @@ For example:
- [ ] Android
### Screenshots
-<Add any necessary screenshots for all platforms if your change added or updated UI>
+<Add screenshots for all platforms tested. Pull requests won't be merged unless the screenshots show the app was tested on all platforms.>
#### Web
<!-- Insert screenshots of your changes on the web platform or write "no changes"-->
| 7 |
diff --git a/token-metadata/0x4889F721f80C5E9fadE6Ea9B85835D405D79a4f4/metadata.json b/token-metadata/0x4889F721f80C5E9fadE6Ea9B85835D405D79a4f4/metadata.json "symbol": "MAFI",
"address": "0x4889F721f80C5E9fadE6Ea9B85835D405D79a4f4",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/reputation/plugin_bot.go b/reputation/plugin_bot.go @@ -34,9 +34,16 @@ func (p *Plugin) BotInit() {
var thanksRegex = regexp.MustCompile(`(?i)( |\n|^)(thanks?\pP*|danks|ty|thx|\+rep|\+ ?\<\@[0-9]*\>)( |\n|$)`)
+var repDisabledError = "**Rep command is disabled on this server. Enable it from the control panel.**"
+
func handleMessageCreate(evt *eventsystem.EventData) {
msg := evt.MessageCreate()
+ conf, err := GetConfig(evt.Context(), msg.GuildID)
+ if err != nil || !conf.Enabled || conf.DisableThanksDetection {
+ return
+ }
+
if !bot.IsNormalUserMessage(msg.Message) {
return
}
@@ -58,11 +65,6 @@ func handleMessageCreate(evt *eventsystem.EventData) {
return
}
- conf, err := GetConfig(evt.Context(), msg.GuildID)
- if err != nil || !conf.Enabled || conf.DisableThanksDetection {
- return
- }
-
target, err := bot.GetMember(msg.GuildID, who.ID)
sender := dstate.MemberStateFromMember(msg.Member)
if err != nil {
@@ -140,6 +142,10 @@ var cmds = []*commands.YAGCommand{
return "An error occurred while finding the server config", err
}
+ if !conf.Enabled {
+ return repDisabledError, nil
+ }
+
if !IsAdmin(parsed.GuildData.GS, parsed.GuildData.MS, conf) {
return "You're not a reputation admin. (no manage server perms and no rep admin role)", nil
}
@@ -175,6 +181,10 @@ var cmds = []*commands.YAGCommand{
return "An error occurred while finding the server config", err
}
+ if !conf.Enabled {
+ return repDisabledError, nil
+ }
+
if !IsAdmin(parsed.GuildData.GS, parsed.GuildData.MS, conf) {
return "You're not an reputation admin. (no manage servers perms and no rep admin role)", nil
}
@@ -384,6 +394,10 @@ func CmdGiveRep(parsed *dcmd.Data) (interface{}, error) {
return nil, err
}
+ if !conf.Enabled {
+ return repDisabledError, nil
+ }
+
pointsName := conf.PointsName
if target.ID == parsed.Author.ID {
| 11 |
diff --git a/src/navigationStore.js b/src/navigationStore.js @@ -335,7 +335,7 @@ class NavigationStore {
props.init = true;
if (!this[key]) {
this[key] = new Function('actions', 'props', 'type', // eslint-disable-line no-new-func
- `return function ${key}(params){ actions.execute(type, '${key}', props, params)}`)(this, { ...commonProps, ...props }, type);
+ `return function ${key.replace(/\W/g, '_')}(params){ actions.execute(type, '${key}', props, params)}`)(this, { ...commonProps, ...props }, type);
}
if ((onEnter || on || (component && component.onEnter)) && !this[key + OnEnter]) {
| 11 |
diff --git a/articles/protocols/saml/samlsso-auth0-to-auth0.md b/articles/protocols/saml/samlsso-auth0-to-auth0.md @@ -145,7 +145,7 @@ Copy and save this URL. This is the URL on tenant 1 that will receive the SAML a
In this section you will go back and add some information about the Service Provider (tenant 1) to the Identity Provider (tenant 2) so the Identity Provider Auth0 tenant knows how to receive and respond to SAML-based authentication requests from the Service Provider Auth0 tenant.
-Switch back to **Tenant 2**.
+* Switch back to **Tenant 2**.
**In the Auth0 dashboard:** for Tenant 2
| 0 |
diff --git a/token-metadata/0x74faaB6986560fD1140508e4266D8a7b87274Ffd/metadata.json b/token-metadata/0x74faaB6986560fD1140508e4266D8a7b87274Ffd/metadata.json "symbol": "HDAO",
"address": "0x74faaB6986560fD1140508e4266D8a7b87274Ffd",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/js/findIntrons.js b/js/findIntrons.js @@ -37,6 +37,9 @@ function mergeTop(groups, exon) {
//
// exons in the returned groups are sorted by start position.
function exonGroups(exons) {
+ if (exons.length < 1) {
+ return [];
+ }
var sorted = _.sortBy(exons, 'start'),
[first, ...rest] = sorted;
return rest.reduce(mergeTop, [initGroup(first)]).reverse();
| 9 |
diff --git a/magda-web-server/src/buildSitemapRouter.ts b/magda-web-server/src/buildSitemapRouter.ts @@ -130,7 +130,9 @@ export default function buildSitemapRouter({
function catchError<T>(res: express.Response, promise: Promise<T>) {
return promise.catch(e => {
console.error(e);
- res.status(500).send("Internal Server Error");
+ res.status(500)
+ .set("Content-Type", "text/plain")
+ .send("Internal Server Error");
});
}
| 12 |
diff --git a/js/xss.js b/js/xss.js @@ -39,6 +39,7 @@ var whiteList = {
header: ['style'],
hr: ['style'],
i: ['style'],
+ iframe: ['src', 'width', 'height', 'frameborder', 'allowfullscreen'],
img: ['src', 'alt', 'title', 'width', 'height', 'style'],
ins: ['datetime', 'style'],
li: ['style'],
| 11 |
diff --git a/src/containers/NavBar/ExportFileModal/ExportFileModal.jsx b/src/containers/NavBar/ExportFileModal/ExportFileModal.jsx @@ -9,6 +9,7 @@ const remote = window.require('electron').remote;
const fs = remote.require('fs');
const path = remote.require('path');
const beautify = remote.require('js-beautify');
+const beautify_html = remote.require('js-beautify').html;
const ExportFileModal = ({ isModalOpen, closeModal }) => {
const [fileName, setFileName] = useState('');
@@ -35,20 +36,26 @@ const ExportFileModal = ({ isModalOpen, closeModal }) => {
indent_size: 2,
space_in_empty_paren: true,
});
+ testFileCode = beautify_html(testFileCode, {
+ unformatted: true,
+ });
};
const addImportStatements = () => {
addComponentImportStatement();
testFileCode += `import { render, fireEvent } from 'react-testing-library';
import { build, fake } from 'test-data-bot';
- import 'react-testing-library/cleanup-after-each'; \n`;
+ import 'react-testing-library/cleanup-after-each';
+ import 'jest-dom/extend-expect'
+
+ \n`;
};
const addComponentImportStatement = () => {
const renderStatement = testCase.statements[0];
let filePath = path.relative(projectFilePath, renderStatement.filePath);
filePath = filePath.replace(/\\/g, '/');
- testFileCode += `import ${renderStatement.componentName} from './${filePath}';`;
+ testFileCode += `import ${renderStatement.componentName} from '../${filePath}';`;
};
const addMockData = () => {
mockData.forEach(mockDatum => {
@@ -115,8 +122,7 @@ const ExportFileModal = ({ isModalOpen, closeModal }) => {
const addRender = (render, methods) => {
let props = createRenderProps(render);
if (render.id === 0) {
- testFileCode += `const { ${methods} } =
- render(<${render.componentName} ${props} />);`;
+ testFileCode += `const {${methods}} = render(<${render.componentName} ${props}/>);`;
} else {
testFileCode += `rerender(<${render.componentName} ${props}/>);`;
}
| 1 |
diff --git a/docs/introduction/vr-headsets-and-webxr-browsers.md b/docs/introduction/vr-headsets-and-webxr-browsers.md @@ -145,10 +145,10 @@ front-facing changes to A-Frame developers, involving mostly renaming of APIs.
- Chrome (WebXR under origin trials)
- Exokit (experimental early support)
-[webxrpolyfill]: https://github.com/immersive-web/webxr-polyfill
+[webvrpolyfill]: https://github.com/googlevr/webvr-polyfill
A-Frame supports most modern mobile browsers that don't have WebXR support
-through the [WebXR polyfill][webxrpolyfill]. Note that these browsers do not
+through the [WebVR polyfill][webvrpolyfill]. Note that these browsers do not
have official WebXR support, and we are using a polyfill; it is important to
lower the expectations that these browsers will provide a quality experience
and not have quirks:
| 14 |
diff --git a/src/client/components/containers/SingleReqResContainer.jsx b/src/client/components/containers/SingleReqResContainer.jsx @@ -39,6 +39,7 @@ const SingleReqResContainer = (props) => {
},
reqResUpdate,
reqResDelete,
+ index,
} = props;
const network = content.request.network;
const method = content.request.method;
@@ -258,10 +259,23 @@ const SingleReqResContainer = (props) => {
Send
</button>
)}
+ {/* SEND BUTTON */}
+ {connection === "uninitialized" && (
+ <button
+ className="is-flex-basis-0 is-flex-grow-1 button is-primary-100 is-size-7 br-border-curve"
+ id={`send-button-${index}`}
+ onClick={() => {
+ ReqResCtrl.openReqRes(content.id);
+ }}
+ >
+ Send
+ </button>
+ )}
{/* VIEW RESPONSE BUTTON */}
{connection !== "uninitialized" && (
<button
className="is-flex-basis-0 is-flex-grow-1 button is-neutral-100 is-size-7 br-border-curve"
+ id={`view-button-${index}`}
onClick={() => {
dispatch(actions.saveCurrentResponseData(content));
}}
| 1 |
diff --git a/public/locales/nl/common.json b/public/locales/nl/common.json "cracks": "scheuren",
"grass": "gras",
"narrow sidewalk": "smal trottoir",
- "brick": "steen",
+ "brick/cobblestone": "steen",
"very broken": "erg beschadigd",
"rail/tram track": "spoor/trambaan",
"sand/gravel": "zand/grind",
| 1 |
diff --git a/src/navigationStore.js b/src/navigationStore.js @@ -673,7 +673,7 @@ class NavigationStore {
}
// add all clones
for (const child of children) {
- if (child.props.clone) {
+ if (child && child.props.clone) {
if (clones.indexOf(child) === -1) {
clones.push(child);
}
@@ -682,6 +682,10 @@ class NavigationStore {
let initialRouteName;
let initialRouteParams;
for (const child of children) {
+ // allow null/false child, useful for conditionals
+ if (!child) {
+ continue;
+ }
const key = child.key || `key${(counter += 1)}`;
const init = key === children[0].key;
assert(reservedKeys.indexOf(key) === -1, `Scene name cannot be reserved word: ${child.key}`);
| 11 |
diff --git a/test/unit/components/join-flow-step.test.jsx b/test/unit/components/join-flow-step.test.jsx @@ -4,7 +4,7 @@ import JoinFlowStep from '../../../src/components/join-flow/join-flow-step';
describe('JoinFlowStep', () => {
- test('test components exist when props present', () => {
+ test('components exist when props present', () => {
const props = {
children: null,
className: 'join-flow-step-class',
@@ -33,15 +33,27 @@ describe('JoinFlowStep', () => {
expect(component.find('div.join-flow-description').text()).toEqual(props.description);
- component.find('button[type="submit"]').simulate('submit');
- expect(props.onSubmit).toHaveBeenCalled();
-
expect(component.find('NextStepButton').prop('waiting')).toEqual(true);
expect(component.find('NextStepButton').prop('content')).toEqual(props.nextButton);
+
+ component.unmount();
+ });
+
+ test('components do not exist when props not present', () => {
+ const component = mountWithIntl(
+ <JoinFlowStep />
+ );
+
+ expect(component.find('div.join-flow-header-image').exists()).toEqual(false);
+ expect(component.find('.join-flow-inner-content').exists()).toEqual(true);
+ expect(component.find('.join-flow-title').exists()).toEqual(false);
+ expect(component.find('div.join-flow-description').exists()).toEqual(false);
+ expect(component.find('NextStepButton').prop('waiting')).toEqual(false);
+
component.unmount();
});
- test('test components do not exist when props not present', () => {
+ test('clicking submit calls passed in function', () => {
const props = {
onSubmit: jest.fn()
};
@@ -50,20 +62,8 @@ describe('JoinFlowStep', () => {
{...props}
/>
);
- expect(component.find('div.join-flow-header-image').exists()).toEqual(false);
-
- expect(component.find('.join-flow-inner-content').exists()).toEqual(true);
- expect(component.find('.join-flow-title').exists()).toEqual(false);
-
-
- expect(component.find('div.join-flow-description').exists()).toEqual(false);
-
component.find('button[type="submit"]').simulate('submit');
expect(props.onSubmit).toHaveBeenCalled();
-
- expect(component.find('NextStepButton').prop('waiting')).toEqual(false);
-
-
component.unmount();
});
});
| 10 |
diff --git a/packages/rollup/package-lock.json b/packages/rollup/package-lock.json "slash": "^3.0.0"
}
},
+ "@rollup/plugin-commonjs": {
+ "version": "11.0.2",
+ "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-11.0.2.tgz",
+ "integrity": "sha512-MPYGZr0qdbV5zZj8/2AuomVpnRVXRU5XKXb3HVniwRoRCreGlf5kOE081isNWeiLIi6IYkwTX9zE0/c7V8g81g==",
+ "requires": {
+ "@rollup/pluginutils": "^3.0.0",
+ "estree-walker": "^1.0.1",
+ "is-reference": "^1.1.2",
+ "magic-string": "^0.25.2",
+ "resolve": "^1.11.0"
+ }
+ },
"@rollup/plugin-json": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.0.2.tgz",
"@rollup/pluginutils": "^3.0.4"
}
},
+ "@rollup/plugin-node-resolve": {
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.1.tgz",
+ "integrity": "sha512-14ddhD7TnemeHE97a4rLOhobfYvUVcaYuqTnL8Ti7Jxi9V9Jr5LY7Gko4HZ5k4h4vqQM0gBQt6tsp9xXW94WPA==",
+ "requires": {
+ "@rollup/pluginutils": "^3.0.6",
+ "@types/resolve": "0.0.8",
+ "builtin-modules": "^3.1.0",
+ "is-module": "^1.0.0",
+ "resolve": "^1.14.2"
+ }
+ },
+ "@rollup/plugin-replace": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.3.1.tgz",
+ "integrity": "sha512-qDcXj2VOa5+j0iudjb+LiwZHvBRRgWbHPhRmo1qde2KItTjuxDVQO21rp9/jOlzKR5YO0EsgRQoyox7fnL7y/A==",
+ "requires": {
+ "@rollup/pluginutils": "^3.0.4",
+ "magic-string": "^0.25.5"
+ }
+ },
"@rollup/pluginutils": {
"version": "3.0.8",
"resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.8.tgz",
}
}
},
- "imba": {
- "version": "2.0.0-alpha.29",
- "resolved": "https://registry.npmjs.org/imba/-/imba-2.0.0-alpha.29.tgz",
- "integrity": "sha512-WlfmFdUOtArHi+XBMl9UtwHPBxcLrQgqIma11/oUEHC2NpRoC05Dp17pkLyGnUGQmdyi30yvYXsJ9W1nClalFA=="
- },
"inherits": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
| 11 |
diff --git a/src/components/ProjectPreview/ImageCollage.js b/src/components/ProjectPreview/ImageCollage.js @@ -26,42 +26,45 @@ const ImageCollage = ({ images }) => {
// slideNumber % 3 === 0 ? 3 : slideNumber % 2 === 0 ? 2 : 1;
const selectedClass = () => 1;
- // Prepare fixed images data for art-directed images using media queries.
+ // Pass array of fixed images with media query for art direction.
// @see https://www.gatsbyjs.org/packages/gatsby-image/#art-directing-multiple-images
- const srcset = {
- primary: [
- images.primary.mobile.fixed,
+ return (
+ <article css={flexWrap}>
+ <div className='twoStack'>
+ <Img
+ fixed={[
+ images.secondary.mobile.fixed,
{
- ...images.primary.desktop.fixed,
- media: `${mediaQueries.desktop}`,
+ ...images.secondary.desktop.fixed,
+ media: mediaQueries.desktop.replace(`@media`, ``).trim(),
},
- ],
- secondary: [
- images.secondary.mobile.fixed,
+ ]}
+ alt='secondary'
+ className={`secondary${selectedClass()}`}
+ />
+ <Img
+ fixed={[
+ images.primary.mobile.fixed,
{
...images.secondary.desktop.fixed,
- media: `(min-width: 1200px)`,
+ media: mediaQueries.desktop.replace(`@media`, ``).trim(),
},
- ],
- tertiary: [
+ ]}
+ alt='primary'
+ className={`primary${selectedClass()}`}
+ />
+ </div>
+ <Img
+ fixed={[
images.tertiary.mobile.fixed,
{
...images.tertiary.desktop.fixed,
- media: `${mediaQueries.desktop}`,
+ media: mediaQueries.desktop.replace(`@media`, ``).trim(),
},
- ],
- };
-
- return (
- <article css={flexWrap}>
- <div className='twoStack'>
- <Img
- // src={images.secondary.mobile.fixed.src}
- fixed={images.secondary.mobile.fixed}
- alt='secondary'
- className={`secondary${selectedClass()}`}
+ ]}
+ alt='primary'
+ className={`tertiary${selectedClass()}`}
/>
- </div>
</article>
);
};
| 12 |
diff --git a/tools/make/lib/benchmark/cpp.mk b/tools/make/lib/benchmark/cpp.mk @@ -11,7 +11,7 @@ benchmark-cpp:
echo "Running benchmark: $$file"; \
cd `dirname $$file` && \
$(MAKE) clean && \
- $(MAKE) && \
+ BOOST=$(DEPS_BOOST_BUILD_OUT) $(MAKE) && \
$(MAKE) run || exit 1; \
done
| 12 |
diff --git a/src/client/components/composer/ComposerContainer.jsx b/src/client/components/composer/ComposerContainer.jsx @@ -124,8 +124,8 @@ const ComposerContainer = (props) => {
...props.newRequestFields,
protocol: '',
url: props.newRequestFields.webRTCInitiator,
-
method: 'openapi',
+ openapi: true,
graphQL: false,
gRPC: false,
ws: false,
@@ -148,6 +148,7 @@ const ComposerContainer = (props) => {
method: '',
graphQL: false,
gRPC: true,
+
webrtc: false,
network,
testContent: '',
| 12 |
diff --git a/package.json b/package.json "carbon-factory": "git+ssh://[email protected]/Sage/carbon-factory.git#build-npm-6-audit",
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "^1.1.1",
- "express": "^4.16.3",
+ "express": "~4.16.3",
"flux": "^3.1.1",
"gulp": "~3.9.0",
"highlight.js": "~9.6.0",
| 14 |
diff --git a/app/components/wallet/WalletAdd.js b/app/components/wallet/WalletAdd.js @@ -26,6 +26,10 @@ const messages = defineMessages({
id: 'wallet.add.dialog.hardware.description',
defaultMessage: '!!!Connect to hardware wallet',
},
+ useTrezorDescription: {
+ id: 'wallet.add.dialog.trezor.description',
+ defaultMessage: '!!!Connect to Trezor',
+ },
useLedgerDescription: {
id: 'wallet.add.dialog.ledger.description',
defaultMessage: '!!!Connect to Ledger',
| 13 |
diff --git a/articles/sso/current/single-page-apps.md b/articles/sso/current/single-page-apps.md @@ -172,7 +172,7 @@ setInterval(function() {
// if the token is not in local storage, there is nothing to check (i.e. the user is already logged out)
if (!localStorage.getItem('userToken')) return;
- auth0.getSSOData(function (err, data) {
+ auth0.checkSession(function (err, data) {
// if there is still a session, do nothing
if (err || (data && data.sso)) return;
| 14 |
diff --git a/app/views/console/users/oauth/gitlab.phtml b/app/views/console/users/oauth/gitlab.phtml @@ -6,7 +6,7 @@ $provider = $this->getParam('provider', '');
<input name="appId" id="oauth2<?php echo $this->escape(ucfirst($provider)); ?>Appid" type="text" autocomplete="off" data-ls-bind="{{console-project.provider<?php echo $this->escape(ucfirst($provider)); ?>Appid}}" />
<label for="oauth2<?php echo $this->escape(ucfirst($provider)); ?>Secret">App Secret</label>
<input name="clientSecret" id="oauth2<?php echo $this->escape(ucfirst($provider)); ?>ClientSecret" type="text" autocomplete="off" data-ls-bind="{{console-project.provider<?php echo $this->escape(ucfirst($provider)); ?>ClientSecret}}" />
-<label for="oauth2<?php echo $this->escape(ucfirst($provider)); ?>Endpoint">Endpoint (optional)<span class="tooltip" data-tooltip="If you have self-hosted instance, provide the host.'"><i class="icon-info-circled"></i></span></label>
-<input name="endpoint" id="oauth2<?php echo $this->escape(ucfirst($provider)); ?>Endpoint" type="text" autocomplete="off" data-ls-bind="{{console-project.provider<?php echo $this->escape(ucfirst($provider)); ?>Endpoint}}" />
+<label for="oauth2<?php echo $this->escape(ucfirst($provider)); ?>Endpoint">Endpoint (optional)<span class="tooltip" data-tooltip="If you have self-hosted instance, provide the host."><i class="icon-info-circled"></i></span></label>
+<input name="endpoint" id="oauth2<?php echo $this->escape(ucfirst($provider)); ?>Endpoint" type="text" autocomplete="off" data-ls-bind="{{console-project.provider<?php echo $this->escape(ucfirst($provider)); ?>Endpoint}}" placeholder="https://gitlab.com" />
<input name="secret" data-forms-oauth-custom="<?php echo $this->escape(ucfirst($provider)); ?>" id="oauth2<?php echo $this->escape(ucfirst($provider)); ?>Secret" type="hidden" autocomplete="off" data-ls-bind="{{console-project.provider<?php echo $this->escape(ucfirst($provider)); ?>Secret}}" />
| 7 |
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml @@ -33,7 +33,7 @@ services:
volumes:
- graphite:/opt/graphite/storage/whisper
grafana-setup:
- image: sitespeedio/grafana-bootstrap:grafana-4.1.1-4
+ image: sitespeedio/grafana-bootstrap:sitespeed.io-4.6
links:
- grafana
environment:
| 4 |
diff --git a/stories/notifications.stories.js b/stories/notifications.stories.js @@ -43,7 +43,7 @@ import ThumbsUpSVG from '../assets/svg/thumbs-up.svg';
storiesOf( 'Global/Notifications', module )
.add( 'Module Setup Complete', () => {
const setupRegistry = ( registry ) => {
- registry.dispatch( CORE_MODULES ).receiveGetModules( withConnected( 'search-console', 'adsense', 'analytics', 'pagespeed-insights' ) );
+ registry.dispatch( CORE_MODULES ).receiveGetModules( withConnected( 'search-console', 'analytics', 'pagespeed-insights' ) );
provideModuleRegistrations( registry );
registry.dispatch( MODULES_ADSENSE ).receiveIsAdBlockerActive( false );
};
| 1 |
diff --git a/.github/workflows/crawler.yml b/.github/workflows/crawler.yml @@ -20,11 +20,12 @@ jobs:
run: |
python "data/crawlWorldData.py"
python "data/crawlKoreaRegionalData.py"
+ python "data/crawlKoreaRegionalCumulativeData.py"
- name: Commit files
run: |
git config --local user.email "[email protected]"
git config --local user.name "LiveCoronaBot"
- git add data/worldData.js data/koreaRegionalData.js
+ git add data/worldData.js data/koreaRegionalData.js data/koreaRegionalCumulativeData.js
git commit -m "Run crawler and update data"
- name: Push changes
uses: ad-m/github-push-action@master
| 0 |
diff --git a/test/unit/renderers/mapnik-factory.test.js b/test/unit/renderers/mapnik-factory.test.js @@ -35,27 +35,27 @@ describe('renderer-mapnik-factory', function() {
var factory = new MapnikRendererFactory({ mapnik: {
bufferSize: 128
}});
- assert.equal(factory.getMetatile('png'), 128);
+ assert.equal(factory.getBufferSize('png'), 128);
});
it('should use provided formatBufferSize value', function() {
var factory = new MapnikRendererFactory({mapnik: {
- metatile: 64,
+ bufferSize: 64,
formatBufferSize: {
png: 128
}
}});
- assert.equal(factory.getMetatile('png'), 128);
+ assert.equal(factory.getBufferSize('png'), 128);
});
it('should use provided buffer-size value', function() {
var factory = new MapnikRendererFactory({mapnik: {
- metatile: 64,
+ bufferSize: 64,
formatBufferSize: {
png: 128
}
}});
- assert.equal(factory.getMetatile('mvt'), 64);
+ assert.equal(factory.getBufferSize('mvt'), 64);
});
});
| 4 |
diff --git a/generators/server/templates/gradle/_liquibase.gradle b/generators/server/templates/gradle/_liquibase.gradle @@ -73,13 +73,17 @@ def liquibaseCommand(command) {
}
}
-task liquibaseDiffChangeLog(dependsOn: initPaths) << {
+task liquibaseDiffChangeLog(dependsOn: initPaths) {
+ doLast {
liquibaseCommand("diffChangeLog")
}
+}
-task liquibaseClearChecksums(dependsOn: initPaths) << {
+task liquibaseClearChecksums(dependsOn: initPaths) {
+ doLast {
liquibaseCommand("clearChecksums")
}
+}
def buildTimestamp() {
def date = new Date()
| 2 |
diff --git a/AttackMaster/script.json b/AttackMaster/script.json {
"$schema": "",
"name": "AttackMaster",
-<<<<<<< HEAD
"script": "attackMaster.js",
-<<<<<<< HEAD
-=======
- "script": "AttackMaster.js",
->>>>>>> parent of d534e416 (Attempt to resolve pull request conflict)
"version": "1.038",
"previousversions": ["1.036"],
-=======
- "version": "1.036",
- "previousversions": [],
->>>>>>> parent of bc560605 (Improved indexing & performance)
"description": "AttackMaster API provides functions to manage weapons, armour & shields, including taking weapons in hand and using them to attack. It uses standard AD&D 2e rules to the full extent, taking into account: ranged weapon ammo management with ranges varying appropriately and range penalties/bonuses applied; Strength & Dexterity bonuses where appropriate; any magic bonuses to attacks that is in effect (if used with RoundMaster API effects); penalties & bonuses for non-proficiency, proficiency, specialisation & mastery; penalties for non-Rangers attacking with two weapons; use of 1-handed, 2-handed or many-handed weapons and restrictions on the number of weapons & shields that can be held at the same time; plus many other features. This API works best with the MagicMaster API and its databases which hold the data for automatic definition of weapons and armour. However, some attack commands will generally work with manual entry of weapons onto the character sheet. The CommandMaster API can be used by the GM to easily manage weapon proficiencies.",
"authors": "Richard E.",
"roll20userid": "6497708",
| 3 |
diff --git a/html/settings/_settings.scss b/html/settings/_settings.scss @@ -1065,7 +1065,7 @@ $sprk-checkbox-custom-input-background-color-disabled: transparent !default;
$sprk-checkbox-huge-container-transition: $sprk-checkbox-transition !default;
$sprk-checkbox-huge-container-border: 2px $sprk-black-tint-50 solid !default;
$sprk-checkbox-huge-container-border-radius: 4px !default;
-$sprk-checkbox-huge-container-padding: 20px 16px 20px 63px !default;
+$sprk-checkbox-huge-container-padding: 20px 16px 20px 55px !default;
$sprk-checkbox-huge-container-flex-basis: 100% !default;
$sprk-checkbox-huge-container-line-height: 1rem !default;
$sprk-checkbox-huge-container-disabled-box-shadow: none !default;
@@ -1082,16 +1082,16 @@ $sprk-checkbox-huge-container-focus-checked-border-color: $sprk-black !default;
$sprk-checkbox-huge-custom-input-height: 1.5rem !default;
$sprk-checkbox-huge-custom-input-weight: 1.5rem !default;
-$sprk-checkbox-huge-custom-input-top: 14px !default;
-$sprk-checkbox-huge-custom-input-left: 14px !default;
+$sprk-checkbox-huge-custom-input-top: 16px !default;
+$sprk-checkbox-huge-custom-input-left: 16px !default;
$sprk-checkbox-huge-custom-input-hover-border-color: $sprk-black !default;
$sprk-checkbox-huge-custom-input-disabled-border-color: $sprk-black-tint-25 !default;
$sprk-checkbox-huge-custom-input-checkbox-element-checked-border-color: $sprk-green !default;
$sprk-checkbox-huge-checkmark-icon-height: 0.53125rem !default;
$sprk-checkbox-huge-checkmark-icon-width: 0.53125rem * 1.44444444444444 !default;
-$sprk-checkbox-huge-checkmark-icon-left: 20px !default;
-$sprk-checkbox-huge-checkmark-icon-top: 19px !default;
+$sprk-checkbox-huge-checkmark-icon-left: 22px !default;
+$sprk-checkbox-huge-checkmark-icon-top: 21px !default;
| 3 |
diff --git a/packages/cx/src/ui/Restate.js b/packages/cx/src/ui/Restate.js @@ -78,13 +78,20 @@ Restate.prototype.detached = false;
class RestateStore extends Store {
+ constructor(config) {
+ super(config);
+ this.parentData = {};
+ }
+
setParentData(data) {
let changed = this.silently(() => {
for (let key in data) {
- this.set(key, data[key]);
+ super.setItem(key, data[key]);
}
});
+ this.parentData = data;
+
if (changed && this.detached)
this.notify();
}
@@ -104,15 +111,21 @@ class RestateStore extends Store {
}
bubble() {
- let notified = this.store.batch(() => {
+ this.store.batch(() => {
let data = this.getData();
for (let key in this.bindings) {
let value = data[key];
+
+ //Only values that have actually changed in the RestateStore are propagated to the parent store
+ // to avoid race conditions that can happen due to async functions keeping the reference of the
+ // restate store of an invisible widget
+ if (value !== this.parentData[key]) {
if (value === undefined)
this.store.delete(this.bindings[key]);
else
this.store.set(this.bindings[key], value);
}
+ }
});
}
| 1 |
diff --git a/packages/app/package.json b/packages/app/package.json "build:server": "yarn cross-env NODE_ENV=production tsc -p tsconfig.build.server.json && tsc-alias -p tsconfig.build.server.json",
"clean": "npx -y shx rm -rf dist transpiled",
"prebuild": "yarn cross-env NODE_ENV=production run-p clean resources:*",
- "postbuild": "npx -y shx mv transpiled/src dist && npx -y shx mv transpiled/config/* config && npx -y shx cp -r src/server/views dist/server/ && npx -y shx rm -rf transpiled",
+ "postbuild": "npx -y shx mv transpiled/src dist && npx -y shx cp -r transpiled/config/* config && npx -y shx cp -r src/server/views dist/server/ && npx -y shx rm -rf transpiled",
"server": "yarn cross-env NODE_ENV=production node -r dotenv-flow/config dist/server/app.js",
"server:ci": "yarn server --ci",
"preserver": "yarn cross-env NODE_ENV=production yarn migrate",
| 7 |
diff --git a/src/ace.jsx b/src/ace.jsx @@ -104,7 +104,7 @@ export default class ReactAce extends Component {
}
if (className) {
- this.refs.editor.className += ' ' + className;
+ this.refEditor.className += ' ' + className;
}
if (focus) {
@@ -127,14 +127,14 @@ export default class ReactAce extends Component {
}
if (nextProps.className !== oldProps.className) {
- let appliedClasses = this.refs.editor.className;
+ let appliedClasses = this.refEditor.className;
let appliedClassesArray = appliedClasses.trim().split(' ');
let oldClassesArray = oldProps.className.trim().split(' ');
oldClassesArray.forEach((oldClass) => {
let index = appliedClassesArray.indexOf(oldClass);
appliedClassesArray.splice(index, 1);
});
- this.refs.editor.className = ' ' + nextProps.className + ' ' + appliedClassesArray.join(' ');
+ this.refEditor.className = ' ' + nextProps.className + ' ' + appliedClassesArray.join(' ');
}
if (nextProps.mode !== oldProps.mode) {
@@ -266,11 +266,13 @@ export default class ReactAce extends Component {
});
}
+ updateRef = item => this.refEditor = item;
+
render() {
const { name, width, height, style } = this.props;
const divStyle = { width, height, ...style };
return (
- <div ref={item => this.refEditor = item}
+ <div ref={this.updateRef}
id={name}
style={divStyle}
>
| 14 |
diff --git a/userscript.user.js b/userscript.user.js @@ -10283,8 +10283,8 @@ var $$IMU_EXPORT$$;
},
mouseover_allow_partial: {
name: "Allow showing partially loaded",
- description: "This will allow the popup to open for partially loaded media",
- description_userscript: "This will allow the popup to open for partially loaded media, but this might break some images",
+ description: "This will allow the popup to open for partially loaded media.\nPartially loaded media will contain the source URL directly (where possible), whereas fully loaded media will use a blob or data URL.",
+ description_userscript: "This will allow the popup to open for partially loaded media, but this might break images that require custom headers to display properly.\nPartially loaded media will contain the source URL directly (where possible), whereas fully loaded media will use a blob or data URL.",
requires: "action:popup",
options: {
_type: "or",
| 7 |
diff --git a/js/cloud/bisweb_awsmodule.js b/js/cloud/bisweb_awsmodule.js @@ -80,8 +80,6 @@ class AWSModule extends BaseServerClient {
createLoadImageModal(filters, modalTitle, suffixes) {
this.s3.listObjectsV2( { 'Delimiter' : '/' }, (err, data) => {
if (err) { console.log('an error occured', err); return; }
-
- console.log('contents', data);
let formattedFiles = this.formatRawS3Files(data.Contents, data.CommonPrefixes, suffixes);
this.fileDisplayModal.openDialog(formattedFiles, {
@@ -161,29 +159,24 @@ class AWSModule extends BaseServerClient {
* Called by bis_genericio starting from when a user types a filename into the save filename modal and clicks confirm.
*
* @param {String} filename - The name of the file
+ * @param {Uint8Array} data - The raw image data
*
*/
- uploadFile(filename, data, isbinary = false) {
+ uploadFile(filename, data) {
return new Promise( (resolve, reject) => {
- let sendData;
- if (!isbinary) {
- sendData = bis_genericio.string2binary(data);
- } else {
- //binary data is assumed to be image data, which should be compressed before sending
- sendData = pako.gzip(data);
+ let sendData = pako.gzip(data);
- console.log('zipped data', sendData);
- }
+ //a leading '/' will create an empty folder with no name in the s3 bucket, so we want to trim it here.
+ if (filename[0] === '/') filename = filename.substring(1,filename.length);
+ console.log('filename', filename);
let uploadParams = {
'Key' : filename,
- 'Bucket' : AWSParameters.BucketName,
+ 'Bucket' : AWSParameters.BucketName(),
'Body' : sendData
};
- console.log('s3', this.s3);
-
this.s3.upload(uploadParams, (err) => {
if (err) {
bis_webutil.createAlert('Failed to upload ' + filename + ' to S3 bucket', true, 0, 3000);
@@ -211,7 +204,6 @@ class AWSModule extends BaseServerClient {
this.fileDisplayModal.dialogOpts.title = modalTitle;
this.fileDisplayModal.dialogOpts.mode = 'save';
- this.fileDisplayModal.fileRequestFn = this.uploadFile;
this.fileDisplayModal.openDialog(formattedFiles, {
'filters' : filters,
'title' : modalTitle,
@@ -291,7 +283,7 @@ class AWSModule extends BaseServerClient {
break;
}
case 'uploadfile' : {
- this.fileDisplayModal.fileRequestFn = opts.callback;
+ this.fileDisplayModal.fileRequestFn = opts.callback.bind(this);
this.createSaveImageModal(opts.filters, opts.title, opts.suffix);
break;
}
| 1 |
diff --git a/test/test-generator-base.js b/test/test-generator-base.js @@ -63,7 +63,8 @@ describe('Generator Base', () => {
});
it('returns an up-to-date state', () => {
assert.deepEqual(
- BaseGenerator.prototype.getExistingEntities()[0]
+ BaseGenerator.prototype.getExistingEntities()
+ .find(it => it.name === 'Region')
.definition.fields[1],
{ fieldName: 'regionDesc', fieldType: 'String' }
);
| 1 |
diff --git a/src/service_status_keeper.erl b/src/service_status_keeper.erl @@ -103,7 +103,7 @@ handle_cast({update, Status}, #state{source = local} = State) ->
handle_cast({update, _}, State) ->
?log_warning("Got unexpected status update when source is not local. Ignoring."),
{noreply, State};
-handle_cast({refresh_done, Result}, State) ->
+handle_cast({refresh_done, Result}, #state{service = Service} = State) ->
NewState =
case Result of
{ok, Items} ->
@@ -111,6 +111,7 @@ handle_cast({refresh_done, Result}, State) ->
{stale, Items} ->
set_stale(Items, State);
{error, _} ->
+ ?log_error("Service ~p returned incorrect status", [Service]),
increment_stale(State)
end,
@@ -179,11 +180,8 @@ refresh_status(State) ->
grab_status(#state{service = Service,
source = local}) ->
case Service:get_local_status() of
- {ok, {[_|_] = Status}} ->
+ {ok, Status} ->
Service:process_status(Status);
- {ok, Other} ->
- ?log_error("Got invalid status from the ~p:~n~p", [Service, Other]),
- {error, bad_status};
Error ->
Error
end;
@@ -222,7 +220,7 @@ grab_status(#state{service = Service,
end
end.
-process_indexer_status(Mod, Status, Mapping) ->
+process_indexer_status(Mod, {[_|_] = Status}, Mapping) ->
case lists:keyfind(<<"code">>, 1, Status) of
{_, <<"success">>} ->
RawIndexes =
@@ -238,7 +236,11 @@ process_indexer_status(Mod, Status, Mapping) ->
?log_error("Indexer ~p returned unsuccessful status:~n~p",
[Mod, Status]),
{error, bad_status}
- end.
+ end;
+process_indexer_status(Mod, Other, _Mapping) ->
+ ?log_error("~p got invalid status: ~p", [Mod, Other]),
+ {error, bad_status}.
+
process_indexes(Indexes, Mapping) ->
lists:map(
| 11 |
diff --git a/runtime.js b/runtime.js @@ -337,6 +337,7 @@ const _loadImg = async file => {
side: THREE.DoubleSide,
vertexColors: true,
transparent: true,
+ alphaTest: 0.5,
});
/* const material = meshComposer.material.clone();
material.uniforms.map.value = texture;
| 0 |
diff --git a/src/utils/wallet.ts b/src/utils/wallet.ts @@ -369,6 +369,7 @@ export const fetchCoinsData = async ({
coins,
currentAccount,
vsCurrency,
+ currencyRate,
globalProps,
refresh,
quotes,
@@ -376,6 +377,7 @@ export const fetchCoinsData = async ({
coins: CoinBase[],
currentAccount: any,
vsCurrency: string,
+ currencyRate: number,
globalProps: GlobalProps,
quotes: { [key: string]: QuoteItem }
refresh: boolean,
@@ -397,7 +399,7 @@ export const fetchCoinsData = async ({
const userdata = refresh ? await getAccount(username) : currentAccount;
const _ecencyUserData = refresh ? await getEcencyUser(username) : currentAccount.ecencyUserData
//TODO: cache data in redux or fetch once on wallet startup
- const _prices = !refresh && quotes ? quotes : await getLatestQuotes(); //TODO: figure out a way to handle other currencies
+ const _prices = !refresh && quotes ? quotes : await getLatestQuotes(currencyRate); //TODO: figure out a way to handle other currencies
coins.forEach((coinBase) => {
| 4 |
diff --git a/src/adapters/autocomplete.js b/src/adapters/autocomplete.js @@ -40,7 +40,7 @@ function SearchInput(tagSelector) {
const suggestPromise = ajax.query(geocoderConfig.url, {q: term, center : center, bbox : bbox})
const suggestHistoryPromise = store.getPrefixes(term)
Promise.all([suggestPromise, suggestHistoryPromise]).then((responses) => {
- this.pois = extractMapzenData(responses[0])
+ this.pois = buildPoi(responses[0])
let historySuggestData = responses[1]
historySuggestData = historySuggestData.map((historySuggest) => {
let poi = Poi.load(historySuggest)
@@ -83,7 +83,7 @@ function select(poi) {
}
}
-function extractMapzenData(response) {
+function buildPoi(response) {
return response.features.map((feature) => {
let zoomLevel = 0
| 10 |
diff --git a/content/getting-started/hosting-providers.md b/content/getting-started/hosting-providers.md @@ -7,7 +7,7 @@ tag = "hostprov"
## Tlon
-[Tlon](https://tlon.io) is the company responsible for creating Urbit, Landscape, Groups and Talk. They also offer hosting services that seamlessly integrate with the rest of their products. [Tlon Hosting](https://tlon.network/) offers Urbit hosting for $20/month.
+[Tlon](https://tlon.io) is the company responsible for creating Urbit, Landscape, Groups and Talk. They also offer hosting services that seamlessly integrate with the rest of their products. [Tlon Hosting](https://tlon.io/hosting) offers Urbit hosting for $20/month.
[](https://tlon.network/)
| 4 |
diff --git a/src/physics/collision.js b/src/physics/collision.js @@ -117,7 +117,7 @@ var collision = {
* // ...
* }
*/
- rayCast(line, result) { return game.world.rayCast(line, result); }
+ rayCast(line, result) { return game.world.detector.rayCast(line, result); }
};
export default collision;
| 1 |
diff --git a/src/apps.json b/src/apps.json "cats": [
20
],
- "html": "(?:<!--[^>]*(?:InstanceBeginEditable|Dreamweaver([^>]+)target|DWLayoutDefaultTable)|function MM_preloadImages\\(\\) \\{)\\;version:\\1",
+ "html": "<!--[^>]*(?:InstanceBeginEditable|Dreamweaver([^>]+)target|DWLayoutDefaultTable)\\;version:\\1",
+ "js": {
+ "MM_showMenu": "",
+ "MM_preloadImages": "",
+ "MM_showHideLayers": ""
+ },
"icon": "DreamWeaver.png",
- "website": "http://www.adobe.com/products/dreamweaver"
+ "website": "https://www.adobe.com/products/dreamweaver.html"
},
"Drupal": {
"cats": [
| 7 |
diff --git a/test/Persistence.test.js b/test/Persistence.test.js @@ -37,6 +37,7 @@ function InvariantLoadSaveTest (archiveId, memory) {
let testVfs = setupTestVfs(vfs, archiveId)
let { app, archive, manuscriptSession } = setupTestApp(t, {
vfs: testVfs,
+ writable: true,
archiveId
})
@@ -110,6 +111,7 @@ function LoadSaveShouldNotThrow (archiveId, title, change) {
let testVfs = setupTestVfs(vfs, archiveId)
let { app, archive, manuscriptSession } = setupTestApp(t, {
vfs: testVfs,
+ writeable: true,
archiveId
})
// change the content
| 11 |
diff --git a/src/DateComboBox.js b/src/DateComboBox.js @@ -171,14 +171,15 @@ class DateComboBox extends Base {
refineState(state) {
let result = super.refineState ? super.refineState(state) : true;
state[previousStateKey] = state[previousStateKey] || {
+ date: null,
opened: false,
value: null
};
const changed = stateChanged(state, state[previousStateKey]);
const { date, opened } = state;
- const closing = changed.opened && !opened;
- if (closing) {
- // Update value from date if we're closing.
+ // Update value from date if we're closing or date is being changed while we
+ // are closed.
+ if ((changed.opened || changed.date) && !opened) {
if (date !== null) {
const formattedDate = formatDate(state, date);
if (state.value !== formattedDate) {
| 11 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.