code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/package.json b/package.json "node-dir": "0.1.16",
"npm": "5.0.2",
"oc-client-browser": "1.0.1",
- "oc-client": "2.1.20",
+ "oc-client": "2.1.21",
"oc-template-handlebars": "6.0.1",
"oc-template-handlebars-compiler": "6.0.4",
"oc-template-jade-compiler": "6.0.4",
| 3 |
diff --git a/src/components/stats/index.js b/src/components/stats/index.js @@ -12,8 +12,8 @@ import StatsSummary from './stats_summary';
const mapStateToProps = (state) => ({
currentTaskId: TasksSelectors.getCurrentTaskId(state),
currentTask: TasksSelectors.getCurrentTask(state),
- taskSummary: TasksSelectors.getTaskSummary(state),
- taskExtent: TasksSelectors.getTaskExtent(state),
+ currentTaskSummary: TasksSelectors.getCurrentTaskSummary(state),
+ currentTaskExtent: TasksSelectors.getCurrentTaskExtent(state),
statsFrom: StatsSelectors.getFromDate(state),
statsTo: StatsSelectors.getToDate(state),
statsByUser: StatsSelectors.getByUser(state),
@@ -26,14 +26,14 @@ const mapDispatchToProps = {
class Stats extends Component {
fetchData() {
- const { taskExtent } = this.props;
- const { fromDate, toDate } = taskExtent;
+ const { currentTaskExtent } = this.props;
+ const { fromDate, toDate } = currentTaskExtent;
this.fetchStatsByRange(fromDate, toDate);
}
fetchStatsByRange = (fromDate, toDate) => {
const { fetchAllStats, currentTaskId } = this.props;
- fetchAllStats({ idtask: currentTaskId, from: fromDate, to: toDate });
+ fetchAllStats({ taskId: currentTaskId, from: fromDate, to: toDate });
}
componentDidMount() {
@@ -54,7 +54,7 @@ class Stats extends Component {
statsTo,
statsByUser,
statsByDate,
- taskSummary,
+ currentTaskSummary,
} = this.props;
return (
@@ -62,7 +62,7 @@ class Stats extends Component {
<div className='col10 pad2 dark'>
<StatsHeader
task={currentTask}
- taskSummary={taskSummary}
+ taskSummary={currentTaskSummary}
statsFrom={statsFrom}
statsTo={statsTo} />
<StatsGraph
@@ -81,8 +81,8 @@ class Stats extends Component {
Stats.propTypes = {
currentTaskId: PropTypes.string.isRequired,
currentTask: PropTypes.object.isRequired,
- taskSummary: PropTypes.object.isRequired,
- taskExtent: PropTypes.object.isRequired,
+ currentTaskSummary: PropTypes.object.isRequired,
+ currentTaskExtent: PropTypes.object.isRequired,
statsFrom: PropTypes.string.isRequired,
statsTo: PropTypes.string.isRequired,
statsByUser: PropTypes.array.isRequired,
| 10 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -9,6 +9,14 @@ To see all merged commits on the master branch that will be part of the next plo
where X.Y.Z is the semver of most recent plotly.js release.
+## [1.58.4] -- 2020-12-21
+
+### Fixed
+ - Fix `preserveDrawingBuffer` WebGL config for displaying transparent gl3d scenes
+ on Apple devices running latest Safari versions (v13 and higher) [#5351]
+ - Fix spelling [#5349, #5356] with thanks to @jbampton for the contribution!
+
+
## [1.58.3] -- 2020-12-17
### Fixed
| 3 |
diff --git a/README.md b/README.md @@ -373,29 +373,23 @@ Install parity 1.8
3. `cargo build -p bridge-cli --release`
-4. `cd ./jsTests`
-
-5. `npm install`
-
-6. Check for balance of [0x00dB9af45C6f241432F2cBE412c6969cB7778d98](https://kovan.etherscan.io/address/0x00dB9af45C6f241432F2cBE412c6969cB7778d98) in Etherscan. If it is 0, ask in [Kovan faucet gitter](https://gitter.im/kovan-testnet/faucet) to add some KETH to it.
-
-7. `cd ..`
+4. Check for balance of [0x00dB9af45C6f241432F2cBE412c6969cB7778d98](https://kovan.etherscan.io/address/0x00dB9af45C6f241432F2cBE412c6969cB7778d98) in Etherscan. If it is 0, ask in [Kovan faucet gitter](https://gitter.im/kovan-testnet/faucet) to add some KETH to it.
*Attention!* - Change the path to Parity 1.8 bin (`parity-master/target/release/parity`) for both scripts, if it isn't in environment `$PATH` variable
-8. delete `./examples/db.toml` file, if it is exists.
+5. delete `./examples/db.toml` file, if it is exists.
-9. `./examples/parity_start_oracles.sh` - starting of the left-side network
+6. `./examples/parity_start_oracles.sh` - starting of the left-side network
-10. `./examples/parity_start_kovan.sh` - starting of the right-side network. Wait until Kovan is synchronized.
+7. `./examples/parity_start_kovan.sh` - starting of the right-side network. Wait until Kovan is synchronized.
-11. `./target/release/bridge --config ./examples/config_bridge.toml --database ./examples/db.toml` - starting of the bridge to generate db.toml firstly
+8. `./target/release/bridge --config ./examples/config_bridge.toml --database ./examples/db.toml` - starting of the bridge to generate db.toml firstly
*Attention!* - it'll generate bridge contracts at both sides. After we'll lanching wizard, we'll change left side contract with crowdsale from wizard one. It is a lack of bridge for now.
-12. stop the bridge.
+9. stop the bridge.
-13. Verify right-side contract in Etherscan.
+10. Verify right-side contract in Etherscan.
#### Right-side contract verification in Etherscan
| 3 |
diff --git a/source/faq/questions/dashboard-faq.md b/source/faq/questions/dashboard-faq.md @@ -43,7 +43,7 @@ When a run happens and a test fails - instead of going and inspecting your CI pr
## {% fa fa-angle-right %} Can I host the Dashboard data myself?
-No, although we are looking to build an on-premise version of the Dashboard for use in private clouds. If you're interested in our on-premise version, [let us know](mailto:[email protected])!
+No, although we are looking to build an on-premise version of the Dashboard for use in private clouds. If you're interested in our on-premise version, please add your interest to our {% url "Dashboard Product Board" https://portal.productboard.com/cypress-io/1-cypress-dashboard %}!
## {% fa fa-angle-right %} Can I choose not to use the Dashboard?
| 14 |
diff --git a/lib/tasks/db_maintenance.rake b/lib/tasks/db_maintenance.rake @@ -204,25 +204,6 @@ namespace :cartodb do
}, threads, thread_sleep, database_host)
end
- desc 'Replace the routing_provider, isolines_provider and geocoder_provider service providers'
- task :replace_service_providers, [:provider_source_name, :provider_target_name] => :environment do |_, args|
- PROVIDERS = ['routing_provider', 'isolines_provider', 'geocoder_provider'].freeze
-
- def update_provider(provider_type, provider_source_name, provider_target_name)
- ::User.where(provider_type.to_sym => provider_source_name).each do |user|
- begin
- user.send(provider_type + '=', provider_target_name)
- user.save
- end
- end
- end
-
- PROVIDERS.each do |provider|
- update_provider(provider, args[:provider_source_name], args[:provider_target_name])
- puts '%s updated from "%s" to "%s"' % [provider, args[:provider_source_name], args[:provider_target_name]]
- end
- end
-
########################
# LOAD CARTODB FUNCTIONS
########################
| 2 |
diff --git a/ReduceClutter.user.js b/ReduceClutter.user.js // @description Revert recent changes that makes the page more cluttered
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 1.11
+// @version 1.11.1
//
// @include https://*stackoverflow.com/*
// @include https://*serverfault.com/*
// Show announcement bar if it does not contain these keywords
const blacklistedAnnouncementWords = [ 'podcast', 'listen', 'tune' ];
- // Hide clickbaity blog posts titles if they contain these keywords
- const blacklistedBlogWords = [ 'worst', 'bad', 'surprise', 'trick', 'terrible', 'will change', 'actually' ];
+ // Hide ads/clickbaity blog posts titles if they contain these keywords
+ const blacklistedBlogWords = [ 'worst', 'bad', 'surprise', 'trick', 'terrible', 'will change', 'actually', 'team', 'try', 'free', 'easy', 'easier' ];
GM_addStyle(`
@@ -145,15 +145,21 @@ ul.comments-list .comment-up-on {
// Hide clickbaity featured blog post titles from sidebar
const blogheader = $('.s-sidebarwidget__yellow .s-sidebarwidget--header').filter((i, el) => el.innerText.includes('Blog'));
if(blogheader.length) {
- blogheader.next().find('a[href^="https://stackoverflow.blog"]').each(function(i, el) {
+ let itemsRemoved = 0;
+ let items = blogheader.next().find('a[href^="https://stackoverflow.blog"]').each(function(i, el) {
const blogtext = el.innerText.toLowerCase();
const isBlacklisted = blacklistedBlogWords && blacklistedBlogWords.some(v => blogtext.includes(v));
if(isBlacklisted) {
blogheader.next().remove();
- blogheader.remove();
+ itemsRemoved++;
console.log('Featured blogpost has been blocked.', blogtext);
}
});
+
+ // if no items remaining, remove "Blog" heading
+ if(items.length == itemsRemoved) {
+ blogheader.remove();
+ }
}
// Strip unnecessary tracking
| 2 |
diff --git a/lib/assets/core/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/asset-header-view.js b/lib/assets/core/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/asset-header-view.js @@ -17,7 +17,7 @@ module.exports = CoreView.extend({
initialize: function (opts) {
checkAndBuildOpts(opts, REQUIRED_OPTS, this);
- this._assets = this.options.assets;
+ this._assetsCollection = this.options.assetsCollection;
this._initBinds();
},
@@ -27,19 +27,21 @@ module.exports = CoreView.extend({
var selectedCount = this._getSelectedAssetsCount();
+ var assetsCount = this._assetsCollection.size();
+
this.$el.html(template({
title: this._title,
editable: this._editable,
- assetsCount: this._assets.length,
+ assetsCount: assetsCount,
selectedCount: selectedCount,
- allSelected: selectedCount === this._assets.length
+ allSelected: selectedCount === assetsCount
}));
return this;
},
_initBinds: function () {
- this._assets.bind('add change remove', this.render, this);
+ this.listenTo(this._assetsCollection, 'add change remove', this.render);
},
_onClickRemove: function () {
@@ -55,7 +57,7 @@ module.exports = CoreView.extend({
},
_getSelectedAssetsCount: function () {
- var selectedAssets = this._assets.where({ state: 'selected' });
+ var selectedAssets = this._assetsCollection.where({ state: 'selected' });
return selectedAssets ? selectedAssets.length : 0;
}
});
| 10 |
diff --git a/tests/phpunit/integration/Core/Authentication/Setup_Test.php b/tests/phpunit/integration/Core/Authentication/Setup_Test.php @@ -25,9 +25,9 @@ class Setup_Test extends TestCase {
public function set_up() {
parent::set_up();
- // Remove hooked actions for V1 during bootstrap.
remove_all_actions( 'admin_action_' . Google_Proxy::ACTION_SETUP_START );
- remove_all_actions( 'admin_action_' . Google_Proxy::ACTION_SETUP );
+ remove_all_actions( 'admin_action_' . Google_Proxy::ACTION_VERIFY );
+ remove_all_actions( 'admin_action_' . Google_Proxy::ACTION_EXCHANGE_SITE_CODE );
}
/**
@@ -188,7 +188,7 @@ class Setup_Test extends TestCase {
$this->fail( 'Expected redirection to proxy setup URL!' );
} catch ( RedirectException $redirect ) {
$location = $redirect->get_location();
- $this->assertStringStartsWith( 'https://sitekit.withgoogle.com/site-management/setup/', $location );
+ $this->assertStringStartsWith( 'https://sitekit.withgoogle.com/v2/site-management/setup/', $location );
$this->assertStringContainsString( '&step=test-step', $location );
$this->assertStringContainsString( '&verify=true', $location );
$this->assertStringContainsString( '&verification_method=FILE', $location );
@@ -238,7 +238,7 @@ class Setup_Test extends TestCase {
$this->fail( 'Expected redirection to proxy setup URL!' );
} catch ( RedirectException $redirect ) {
$location = $redirect->get_location();
- $this->assertStringStartsWith( 'https://sitekit.withgoogle.com/site-management/setup/', $location );
+ $this->assertStringStartsWith( 'https://sitekit.withgoogle.com/v2/site-management/setup/', $location );
}
$this->assertSame( 1, did_action( 'googlesitekit_verify_site_ownership' ) );
@@ -290,7 +290,7 @@ class Setup_Test extends TestCase {
$this->assertTrue( $no_code ?: $no_site_code );
} catch ( RedirectException $redirect ) {
$location = $redirect->get_location();
- $this->assertStringStartsWith( 'https://sitekit.withgoogle.com/site-management/setup/', $location );
+ $this->assertStringStartsWith( 'https://sitekit.withgoogle.com/v2/site-management/setup/', $location );
$this->assertStringContainsString( '&step=test-step', $location );
$this->assertArrayHasKey( $sync_url, $http_requests );
$sync_request = $http_requests[ $sync_url ];
| 2 |
diff --git a/pages/community/index.tsx b/pages/community/index.tsx @@ -30,7 +30,7 @@ function Index() {
icon: SlackIcon,
title: 'Slack',
description: 'Get answers to your questions.',
- link: 'https://surveys.jetbrains.com/s3/kotlin-slack-sign-up',
+ link: 'https://slack-chats.kotlinlang.org/',
},
{
icon: TwitterIcon,
| 14 |
diff --git a/token-metadata/0x07597255910a51509CA469568B048F2597E72504/metadata.json b/token-metadata/0x07597255910a51509CA469568B048F2597E72504/metadata.json "symbol": "1UP",
"address": "0x07597255910a51509CA469568B048F2597E72504",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/README.md b/README.md @@ -69,10 +69,11 @@ Server side framework is Spring+MyBatis and front-end is based on AngularJS1 and
## Quick Start from docker
We provide a docker image build on centos6 with a sample dataset in it.
```bash
-docker pull peterzhang921/cboard
-docker run --rm -itd --name=cboard -p 8026:8080 --privileged=true cboard
+docker pull peterzhang921/cboard:0.4.1
+docker run --rm -itd --name=cboard -p 8026:8080 --privileged=true peterzhang921/cboard:0.4.1
# after docker container is start then attach into it and start tomcat server
+docker attach cboard
/opt/apache-tomcat/bin/startup.sh
# wait after server successfully started
| 3 |
diff --git a/app/shared/actions/helpers/eos.js b/app/shared/actions/helpers/eos.js @@ -7,9 +7,12 @@ const CryptoJS = require('crypto-js');
const ecc = require('eosjs-ecc');
const Eos = require('eosjs');
-const Api = require('./hardware/ledger').default;
+const LedgerApi = require('./hardware/ledger').default;
-export default function eos(connection, signing = false) {
+import { Api, JsonRpc } from 'eosjs2';
+const JsSignatureProvider = require('eosjs2/node_modules/eosjs/dist/eosjs-jssig').default;
+
+export default function eos(connection, signing = false, v2 = false) {
const decrypted = Object.assign({}, connection);
if (signing && decrypted.keyProviderObfuscated) {
const {
@@ -41,7 +44,7 @@ export default function eos(connection, signing = false) {
const { fc } = Eos(connection);
const buffer = serialize(fc.types.config.chainId, transaction, fc.types);
const { transport } = new HardwareLedger();
- const api = new Api(transport);
+ const api = new LedgerApi(transport);
const result = await api.signTransaction(
decrypted.signPath,
buffer.toString('hex')
@@ -55,5 +58,17 @@ export default function eos(connection, signing = false) {
decrypted.signProvider = undefined;
}
+ if (v2) {
+ const signatureProvider = new JsSignatureProvider(decrypted.keyProvider);
+ const rpc = new JsonRpc(decrypted.httpEndpoint);
+ const api = new Api({
+ rpc,
+ signatureProvider,
+ textDecoder: new TextDecoder(),
+ textEncoder: new TextEncoder()
+ });
+ return api;
+ }
+
return Eos(decrypted);
}
| 11 |
diff --git a/util.js b/util.js @@ -543,8 +543,8 @@ export const unFrustumCull = o => {
o.traverse(o => {
if (o.isMesh) {
o.frustumCulled = false;
- o.castShadow = true;
- o.receiveShadow = true;
+ // o.castShadow = true;
+ // o.receiveShadow = true;
}
});
};
| 2 |
diff --git a/contracts/Court.sol b/contracts/Court.sol @@ -332,7 +332,7 @@ contract Court is Owned, SafeDecimalMath {
view
returns (bool)
{
- return vote[account][motionID] != Court.Vote.Abstention;
+ return vote[account][motionID] != Vote.Abstention;
}
@@ -415,7 +415,7 @@ contract Court is Owned, SafeDecimalMath {
public
{
uint weight = setupVote(motionID);
- vote[msg.sender][motionID] = Court.Vote.Yea;
+ vote[msg.sender][motionID] = Vote.Yea;
votesFor[motionID] = safeAdd(votesFor[motionID], weight);
VoteFor(msg.sender, msg.sender, motionID, motionID, weight);
}
@@ -426,7 +426,7 @@ contract Court is Owned, SafeDecimalMath {
public
{
uint weight = setupVote(motionID);
- vote[msg.sender][motionID] = Court.Vote.Nay;
+ vote[msg.sender][motionID] = Vote.Nay;
votesAgainst[motionID] = safeAdd(votesAgainst[motionID], weight);
VoteAgainst(msg.sender, msg.sender, motionID, motionID, weight);
}
@@ -461,7 +461,7 @@ contract Court is Owned, SafeDecimalMath {
}
voteWeight[msg.sender][motionID] = 0;
- vote[msg.sender][motionID] = Court.Vote.Abstention;
+ vote[msg.sender][motionID] = Vote.Abstention;
}
function _closeMotion(uint motionID)
| 2 |
diff --git a/OpenRobertaParent/pom.xml b/OpenRobertaParent/pom.xml <inceptionYear>2014</inceptionYear>
<properties>
<!-- the server version history is a comma separated list of all versions BEFORE the actual version. New to old (e.g. 2.1.0,2.0.0,1.9.9,1.9.7) -->
- <openRobertaServer.history>3.0.1,3.0.0,2.8.1,2.8.0,2.7.1,2.7.0,2.6.2,2.6.1,2.6.0,2.5.5,2.5.4,2.5.3,2.5.2,2.5.1,2.5.0,2.4.1,2.4.0,2.3.4,2.3.3,2.3.2,2.3.1,2.3.0,2.2.7,2.2.6,2.2.5,2.2.4,2.2.3,2.2.2,2.2.1,2.2.0,2.1.0</openRobertaServer.history>
+ <openRobertaServer.history>3.0.2,3.0.1,3.0.0,2.8.1,2.8.0,2.7.1,2.7.0,2.6.2,2.6.1,2.6.0,2.5.5,2.5.4,2.5.3,2.5.2,2.5.1,2.5.0,2.4.1,2.4.0,2.3.4,2.3.3,2.3.2,2.3.1,2.3.0,2.2.7,2.2.6,2.2.5,2.2.4,2.2.3,2.2.2,2.2.1,2.2.0,2.1.0</openRobertaServer.history>
<!-- UNUSED functionality - the server SHOULD be compatible between(including) the following two versions of software deployed on the ROBOT -->
<validversionrange.From>1.4.0</validversionrange.From>
<validversionrange.To>2.6.0</validversionrange.To>
| 6 |
diff --git a/Source/DataSources/KmlDataSource.js b/Source/DataSources/KmlDataSource.js @@ -595,6 +595,7 @@ import WallGraphics from './WallGraphics.js';
var resource;
if (defined(uriResolver)) {
+ href = href.replace(/\\/g, "/");
var blob = uriResolver[href];
if (defined(blob)) {
resource = new Resource({
| 14 |
diff --git a/materials.js b/materials.js @@ -58,6 +58,14 @@ class WebaverseShaderMaterial extends THREE.ShaderMaterial {
super(opts);
}
}
+class WebaverseRawShaderMaterial extends THREE.RawShaderMaterial {
+ constructor(opts = {}) {
+ opts.vertexShader = formatVertexShader(opts.vertexShader);
+ opts.fragmentShader = formatFragmentShader(opts.fragmentShader);
+ super(opts);
+ }
+}
export {
WebaverseShaderMaterial,
+ WebaverseRawShaderMaterial,
};
\ No newline at end of file
| 0 |
diff --git a/src/core/config/OperationConfig.js b/src/core/config/OperationConfig.js @@ -2417,7 +2417,7 @@ const OperationConfig = {
},
"From UNIX Timestamp": {
module: "Default",
- description: "Converts a UNIX timestamp to a datetime string.<br><br>e.g. <code>978346800</code> becomes <code>Mon 1 January 2001 11:00:00 UTC</code><br><br>A UNIX timestamp is a 32-bit value representing the number of seconds since January 1, 1970 UTC (the UNIX epoch).",
+ description: "Converts a UNIX timestamp to a datetime string.<br><br>e.g. <code>978346800</code> becomes <code>Mon 1 January 2001 11:00:00 UTC</code><br><br>A UNIX timestamp is a 32-bit value representing the number of seconds since January 1, 1970 UTC (the UNIX epoch).<br><br>Note that this operation supports various date formats including the US 'MM/DD/YYYY' format, but not the international 'DD/MM/YYYY' format. For dates in this format, use the 'Translate DateTime format' operation instead.",
inputType: "number",
outputType: "string",
args: [
| 0 |
diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -12,6 +12,15 @@ android-secrets: &android-secrets
git clone [email protected]:redbadger/pride-android-secrets.git
mkdir -p .gradle
echo -e "keystore=$ANDROID_KEYSTORE_PATH\nkeystore.alias=$ANDROID_KEYSTORE_ALIAS\nkeystore.password=$ANDROID_KEYSTORE_PASSWORD\nkeystore.keypass=$ANDROID_KEYSTORE_PASSWORD\nversionCode=$CIRCLE_BUILD_NUM" >> .gradle/gradle.properties
+android-secrets: &android-secrets-prod
+ run:
+ command: |
+ git clone [email protected]:redbadger/pride-android-secrets.git
+ mkdir -p .gradle
+ echo -e "keystore=$ANDROID_PROD_KEYSTORE_PATH\nkeystore.alias=$ANDROID_PROD_KEYSTORE_ALIAS\nkeystore.password=$ANDROID_PROD_KEYSTORE_PASSWORD\nkeystore.keypass=$ANDROID_PROD_KEYSTORE_PASSWORD\nversionCode=$CIRCLE_BUILD_NUM" >> .gradle/gradle.properties
+fabric-secrets: &fabric-secrets
+ run:
+ command: |
echo -e "apiSecret=$FABRIC_BUILD_SECRET\napiKey=$FABRIC_API_KEY" >> ./app/fabric.properties
ruby-dependencies: &ruby-dependencies
run:
@@ -95,6 +104,7 @@ jobs:
- attach_workspace:
at: ~/project
- <<: *android-secrets
+ - <<: *fabric-secrets
- <<: *restore-gradle-cache
- <<: *restore-gems-cache
- <<: *ruby-dependencies
@@ -126,6 +136,7 @@ jobs:
- attach_workspace:
at: ~/project
- <<: *android-secrets
+ - <<: *fabric-secrets
- <<: *restore-gradle-cache
- <<: *restore-gems-cache
- <<: *ruby-dependencies
| 0 |
diff --git a/Source/Scene/GlobeSurfaceTile.js b/Source/Scene/GlobeSurfaceTile.js @@ -309,6 +309,7 @@ define([
// Transition imagery states
var tileImageryCollection = surfaceTile.imagery;
+ var isAnyTileLoaded = tileImageryCollection.length === 0;
var i, len;
for (i = 0, len = tileImageryCollection.length; i < len; ++i) {
var tileImagery = tileImageryCollection[i];
@@ -337,14 +338,16 @@ define([
isDoneLoading = isDoneLoading && thisTileDoneLoading;
// The imagery is renderable as soon as we have any renderable imagery for this region.
- isRenderable = isRenderable && (thisTileDoneLoading || defined(tileImagery.readyImagery));
+ isAnyTileLoaded = isAnyTileLoaded || (thisTileDoneLoading || defined(tileImagery.readyImagery));
isUpsampledOnly = isUpsampledOnly && defined(tileImagery.loadingImagery) &&
(tileImagery.loadingImagery.state === ImageryState.FAILED || tileImagery.loadingImagery.state === ImageryState.INVALID);
}
tile.upsampledFromParent = isUpsampledOnly;
- tile.renderable = isRenderable;
+
+ // Allow rendering if any available layers are loaded
+ tile.renderable = isRenderable && isAnyTileLoaded;
return isDoneLoading;
};
| 3 |
diff --git a/src/month.jsx b/src/month.jsx @@ -62,7 +62,7 @@ export default class Month extends React.Component {
monthShowsDuplicateDaysStart: PropTypes.bool
};
- MONTH_REFS = Array(12).fill().map(() => React.createRef());
+ MONTH_REFS = [...Array(12)].map(() => React.createRef());
isDisabled = date => utils.isDayDisabled(date, this.props);
| 14 |
diff --git a/generators/generator-base.js b/generators/generator-base.js @@ -1542,8 +1542,7 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
try {
return this.fs.readJSON(file);
} catch (error) {
- // not an entity file / malformed?
- this.warning(`Unable to parse entity file ${file}`);
+ this.warning(`Unable to parse ${file}, is the entity file malformed or invalid?`);
this.debug('Error:', error);
return undefined;
}
| 2 |
diff --git a/meadow/meadow-sc/README.md b/meadow/meadow-sc/README.md # Meadow (local server-side version)
Under `meadow-sc` you can find a Meadow version that uses local server-side compilation through Ajax.
-It can be compiled using:
+In order to compile the local server-side version of Meadow, make sure you are in the inner `meadow-sc` folder (the one that contains the `stack.yaml` file, not this folder), otherwise the semantics of Marlowe will be compiled instead:
+
+```
+cd meadow-sc
+```
+
+Then the project can be compiled by using stack:
```
stack build
@@ -13,8 +19,23 @@ And deployed using:
stack exec meadow-sc-exe
```
+After this, the tool should be available in http://localhost:8080/
+
## DISCLAIMER
Do not run this local server in a computer exposed to an untrusted network! The code sent by clients is compiled and run in the server without any safety check. Thus, any client using this version of Meadow will be able to run arbitrary code in the machine hosting it.
+## Troubleshooting
+
+Compilation of this project requires one of the latest versions of stack. If compilation does not work, please, try to install the latest version.
+
+Additionally, when testing this in mac we found a run time issue between stack and libgmp that had already been reported here:
+
+https://ghc.haskell.org/trac/ghc/ticket/15105
+
+A workaround that worked for us was to remove the file `HSinteger-gmp-1.0.2.0.o` as suggested in the following comment:
+
+https://ghc.haskell.org/trac/ghc/ticket/15105#comment:10
+
+But this may have side-effects on other stack haskell projects, do at your own risk.
| 7 |
diff --git a/elements/course-design/lib/activity-box.js b/elements/course-design/lib/activity-box.js @@ -17,6 +17,7 @@ class ActivityBox extends LitElement {
padding-top: var(--activity-box-container-padding-top, 14px);
margin-bottom: var(--activity-box-container-margin-bottom, 20px);
position: relative;
+ min-height: 60px;
}
simple-icon {
--simple-icon-height: 80px;
@@ -133,6 +134,14 @@ class ActivityBox extends LitElement {
description: "Check to stop any colors being applied to the icon",
inputMethod: "boolean",
},
+ {
+ slot: "",
+ title: "Activity Box content:",
+ description:
+ "This is where you enter the content for the activity box.",
+ inputMethod: "code-editor",
+ required: true,
+ },
],
advanced: [],
},
| 11 |
diff --git a/src/components/Form.js b/src/components/Form.js @@ -21,6 +21,7 @@ export default class Form extends Component {
}),
onPrevPage: PropTypes.func,
onNextPage: PropTypes.func,
+ onCancel: PropTypes.func,
onChange: PropTypes.func,
onCustomEvent: PropTypes.func,
onSubmit: PropTypes.func,
@@ -48,14 +49,14 @@ export default class Form extends Component {
}
if (src) {
- this.instance = new (this.props.formioform || FormioForm)(this.element, src, options)
+ this.instance = new (this.props.formioform || FormioForm)(this.element, src, options);
this.createPromise = this.instance.ready.then(formio => {
this.formio = formio;
this.formio.src = src;
});
}
if (form) {
- this.instance = new (this.props.formioform || FormioForm)(this.element, form, options)
+ this.instance = new (this.props.formioform || FormioForm)(this.element, form, options);
this.createPromise = this.instance.ready.then(formio => {
this.formio = formio;
this.formio.form = form;
@@ -89,6 +90,7 @@ export default class Form extends Component {
}
//this.formio.hideComponents([]); (From Components.js)
this.formio.on('prevPage', this.emit('onPrevPage'));
+ this.formio.on('cancel', this.emit('onCancel'));
this.formio.on('nextPage', this.emit('onNextPage'));
this.formio.on('change', this.emit('onChange'));
this.formio.on('customEvent', this.emit('onCustomEvent'));
@@ -108,7 +110,7 @@ export default class Form extends Component {
}
if (src !== nextProps.src) {
- this.instance = new (this.props.formioform || FormioForm)(this.element, nextProps.src, options)
+ this.instance = new (this.props.formioform || FormioForm)(this.element, nextProps.src, options);
this.createPromise = this.instance.ready.then(formio => {
this.formio = formio;
this.formio.src = nextProps.src;
@@ -116,7 +118,7 @@ export default class Form extends Component {
this.initializeFormio();
}
if (form !== nextProps.form) {
- this.instance = new (this.props.formioform || FormioForm)(this.element, nextProps.form, options)
+ this.instance = new (this.props.formioform || FormioForm)(this.element, nextProps.form, options);
this.createPromise = this.instance.ready.then(formio => {
this.formio = formio;
this.formio.form = nextProps.form;
| 0 |
diff --git a/src/components/HOCs/WithPagedProjects/WithPagedProjects.js b/src/components/HOCs/WithPagedProjects/WithPagedProjects.js @@ -46,11 +46,12 @@ export default function(WrappedComponent,
pagedProjects = pinnedProjects.concat(pagedProjects)
}
else {
- // Otherwise sort by the fuzzy search score. We want to move any matching
- // challenges (and their project parents) up toward the top of the results.
+ // Otherwise sort by the fuzzy search score. We want to promote high
+ // challenge scores to their parent projects so they show up in an
+ // appropriate place in the list
_each(this.props.filteredChallenges, (c) => {
const parent = _find(pagedProjects, (p) => p.id === (_isObject(c.parent) ? c.parent.id : c.parent))
- if (parent && (!parent.score || c.score < parent.score)) {
+ if (parent && (!parent.score || c.score > parent.score)) {
parent.score = c.score
}
})
| 7 |
diff --git a/token-metadata/0xd379700999F4805Ce80aa32DB46A94dF64561108/metadata.json b/token-metadata/0xd379700999F4805Ce80aa32DB46A94dF64561108/metadata.json "symbol": "DETS",
"address": "0xd379700999F4805Ce80aa32DB46A94dF64561108",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js @@ -1339,6 +1339,7 @@ RED.view = (function() {
node.n.y = mousePos[1]+node.dy;
node.n.dirty = true;
if (node.n.type === "group") {
+ node.n.groupMoved = true;
RED.group.markDirty(node.n);
minX = Math.min(node.n.x-5,minX);
minY = Math.min(node.n.y-5,minY);
@@ -1711,6 +1712,7 @@ RED.view = (function() {
if (mouse_mode === RED.state.SELECTING_NODE && selectNodesOptions.single) {
return;
}
+ clearSelection();
exitActiveGroup();
activeGroups.forEach(function(g) {
if (!g.g) {
@@ -2912,7 +2914,7 @@ RED.view = (function() {
} else {
dblClickPrimed = false;
}
- selectGroup(nodeGroup, !activeGroup);
+ selectGroup(nodeGroup, !activeGroup, !!groupNodeSelectPrimed);
if (activeGroup) {
mousedown_node.selected = true;
moving_set.push({n:mousedown_node});
@@ -4301,7 +4303,9 @@ RED.view = (function() {
})
}
group[0].reverse();
+ var groupOpCount=0;
group.each(function(d,i) {
+ groupOpCount++
if (d.resize) {
d.minWidth = 0;
delete d.resize;
@@ -4309,12 +4313,16 @@ RED.view = (function() {
if (d.dirty || dirtyGroups[d.id]) {
var g = d3.select(this);
if (d.nodes.length > 0) {
+ // If the group was just moved, all of its contents was
+ // also moved - so no need to recalculate its bounding box
+ if (!d.groupMoved) {
var minX = Number.POSITIVE_INFINITY;
var minY = Number.POSITIVE_INFINITY;
var maxX = 0;
var maxY = 0;
var margin = 26;
d.nodes.forEach(function(n) {
+ groupOpCount++
if (n.type !== "group") {
minX = Math.min(minX,n.x-n.w/2-margin-((n._def.button && n._def.align!=="right")?20:0));
minY = Math.min(minY,n.y-n.h/2-margin);
@@ -4332,6 +4340,9 @@ RED.view = (function() {
d.y = minY;
d.w = maxX - minX;
d.h = maxY - minY;
+ } else {
+ delete d.groupMoved;
+ }
} else {
d.w = 40;
d.h = 40;
| 7 |
diff --git a/src/MUIDataTable.js b/src/MUIDataTable.js @@ -428,7 +428,7 @@ class MUIDataTable extends React.Component {
}
if (typeof column.customBodyRender === 'function') {
- const tableMeta = this.getTableMeta(rowIndex, colIndex, value, [], column, this.state);
+ const tableMeta = this.getTableMeta(rowIndex, colIndex, value, column, [], this.state);
const funcResult = column.customBodyRender(value, tableMeta);
if (React.isValidElement(funcResult) && funcResult.props.value) {
| 5 |
diff --git a/travis/samples/.jhipster/TestManyRelPaginDTO.json b/travis/samples/.jhipster/TestManyRelPaginDTO.json "fields": [],
"changelogDate": "20160208210534",
"dto": "mapstruct",
- "service": "no",
+ "service": "serviceImpl",
"angularJSSuffix": "mySuffix",
"entityTableName": "test_many_many_pagination_dto",
"pagination": "pagination"
| 2 |
diff --git a/aleph/index/entities.py b/aleph/index/entities.py @@ -164,7 +164,10 @@ def index_bulk(collection, entities):
except BulkIndexError as exc:
log.warning('Indexing error: %s', exc)
finally:
+ try:
lock.release()
+ except Exception:
+ log.exception("Cannot release index lock.")
def finalize_index(proxy, context, texts):
| 9 |
diff --git a/core/block.js b/core/block.js @@ -2539,14 +2539,6 @@ Blockly.Blocks['lambda_app_typed'] = {
this.setInputsInline(true);
},
- getVars: function () {
- return [this.argName];
- },
-
- getVarsWithTypes: function() {
- goog.asserts.assert(false, 'No implemented.');
- },
-
clearTypes: function() {
this.getInput('FUN').connection.typeExpr.arg_type.clear();
this.getInput('FUN').connection.typeExpr.return_type.clear();
@@ -2598,10 +2590,6 @@ Blockly.Blocks['match_typed'] = {
this.setInputsInline(false);
},
- getVarsWithTypes: function() {
- goog.asserts.assert(false, 'No implemented.');
- },
-
clearTypes: function() {
this.outputConnection.typeExpr.clear();
this.getInput('INPUT').connection.typeExpr.clear();
@@ -2655,14 +2643,6 @@ Blockly.Blocks['variables_get_typed'] = {
this.setOutputTypeExpr(A);
this.setTooltip(Blockly.Msg.VARIABLES_GET_TOOLTIP);
},
- /**
- * Return all variables referenced by this block.
- * @return {!Array.<string>} List of variable names.
- * @this Blockly.Block
- */
- getVars: function() {
- return [this.getField('VAR').getText()];
- },
/**
* Notification that a variable is renaming.
* If the name matches one of this block's variables, rename it.
@@ -2743,15 +2723,6 @@ Blockly.Blocks['let_typed'] = {
this.setInputsInline(true);
},
- /**
- * Return all variables referenced by this block.
- * @return {!Array.<string>} List of variable names.
- * @this Blockly.Block
- */
- getVars: function() {
- return [this.getField('VAR').getText()];
- },
-
/**
* Return all variables of which is declared in this block, and can be used
* later the given connection's input.
| 2 |
diff --git a/views/layout/default.blade.php b/views/layout/default.blade.php <meta name="author" content="Bernd Bestel ([email protected])">
<link rel="icon" href="{{ $U('/img/grocy_icon.svg?v=', true) }}{{ $version }}">
+ <link rel="apple-touch-icon" href="{{ $U('/img/grocy_icon.svg?v=', true) }}{{ $version }}">
<title>@yield('title') | grocy</title>
| 0 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,39 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master
where X.Y.Z is the semver of most recent plotly.js release.
+## [1.25.0] -- 2017-03-20
+
+### Added
+- Double click handler on legend items to isolate 1 traces / group on graph
+ [#1432]
+
+### Changed
+- Use signed distance fields (SDF) method to render heterogeneous `scattergl`
+ traces improving performance [#1398]
+- Improve first-render performance in `scattergl` traces by only creating
+ visible objects [#1444]
+- Use `color-rgba` instead of `tinycolor2` to convert plotly color definitions to
+ WebGL buffers improving performance for gl3d and gl2d traces [#1443]
+- Bump `uglify-js` minifier to version `2.8.12` [#1450]
+
+### Fixed
+- Fix 3D trace ordering on visibility toggle [#1466]
+- Fix gl2d trace ordering on visibility toggle [#1444]
+- Fix autorange routine for bar traces [#1475]
+- Fix shapes and images referencing a missing subplot [#1481]
+- Ensure array attributes can be restyled in all situations [#1488]
+- Fix XYZ-column-to-2D-z convert routine for columns containing nulls [#1491]
+- Fix range slider display when anchored to log axes [#1472]
+- Make sure all trace types can be deleted from range sliders [#1472]
+- Let the `parcoords` object tree be garbage collected on `restyle` [#1479]
+- Bring back support for histogram colorscales (bug introduced in `1.21.3`)
+ [#1500]
+- Support all axis types for clicktoshow annotations [#1497]
+- Fix 3D margin relayout calls (bug introduced in `1.24.1`) [#1494]
+- Fix `relayout` when trying to update empty axis containers (bug introduced in
+ `1.24.0`) [#1494]
+
+
## [1.24.2] -- 2017-03-10
### Fixed
| 3 |
diff --git a/src/translations/en.global.json b/src/translations/en.global.json "setupLedgerSuccess": {
"header": "Ledger has secured your account!",
- "one": "We recommend that you now remove your existing recovery methods and other devices.",
- "two": "Maintaining multiple recovery methods and devices increases the vulnerability of your account.",
- "primaryCta": "Remove existing methods",
- "secondaryCta": "Keep existing meethods",
+ "one": "We recommend that you remove all existing keys (recovery methods and devices).",
+ "two": "Maintaining multiple keys increases the vulnerability of your account.",
+ "primaryCta": "Remove Existing Keys",
+ "secondaryCta": "Keep existing keys",
"nextStep": {
"header": {
- "remove": "Remove existing recovery methods?",
- "keep": "Keep existing recovery methods?"
+ "remove": "Confirm key removal",
+ "keep": "Keep existing keys?"
},
"one": {
- "remove": "Before removing your existing recovery methods, make sure that you have recorded and securely stored your Ledger seed phrase.",
+ "remove": "Before removing your existing keys, make sure that you have recorded and securely stored your Ledger seed phrase.",
"keep": "<span class='color-red'>Maintaining multiple recovery methods and devices increases the vulnerability of your account.</span>"
},
"two": {
| 3 |
diff --git a/generators/server/templates/src/main/java/package/web/rest/errors/ExceptionTranslator.java.ejs b/generators/server/templates/src/main/java/package/web/rest/errors/ExceptionTranslator.java.ejs @@ -146,11 +146,11 @@ _%>
private ErrorResponseException wrapWithErrorResponse(Throwable ex) {
<%_ if (!skipUserManagement) { _%>
- if(ex instanceof tech.jhipster.sample.service.EmailAlreadyUsedException)
+ if(ex instanceof <%= packageName %>.service.EmailAlreadyUsedException)
return new EmailAlreadyUsedException();
- if(ex instanceof tech.jhipster.sample.service.UsernameAlreadyUsedException )
+ if(ex instanceof <%= packageName %>.service.UsernameAlreadyUsedException )
return new LoginAlreadyUsedException();
- if(ex instanceof tech.jhipster.sample.service.InvalidPasswordException )
+ if(ex instanceof <%= packageName %>.service.InvalidPasswordException )
return new InvalidPasswordException();
<%_ } _%>
if(ex instanceof ErrorResponseException exp)
| 3 |
diff --git a/tests/test_IssuanceController.py b/tests/test_IssuanceController.py @@ -510,7 +510,7 @@ class TestIssuanceController(HavvenTestCase):
nominsAfterFees = self.nomin.amountReceived(nominsToSend)
havvensReceived = self.issuanceController.havvensReceivedForNomins(nominsToSend)
- self.assertClose(havvensReceived, nominsAfterFees / 0.5)
+ self.assertEqual(havvensReceived, nominsAfterFees * UNIT // havvenPrice)
def test_nominExchangeRate(self):
ethPrice = 500 * UNIT # $500 ETH
| 2 |
diff --git a/tests/old-unit/support/OfflineBuilder.js b/tests/old-unit/support/OfflineBuilder.js @@ -6,8 +6,8 @@ import { splitHandlerPathAndName } from '../../../src/utils/index.js'
export default class OfflineBuilder {
constructor(serverlessBuilder, options) {
this.handlers = {}
- this.options = options || {}
- this.serverlessBuilder = serverlessBuilder || new ServerlessBuilder()
+ this.options = options ?? {}
+ this.serverlessBuilder = serverlessBuilder ?? new ServerlessBuilder()
}
addFunctionConfig(functionKey, functionConfig, handler) {
| 4 |
diff --git a/index.js b/index.js @@ -153,7 +153,7 @@ module.exports = {
treeForAddon(tree) {
let dummyAppFiles = new FindDummyAppFiles([ 'tests/dummy/app' ]);
- let addonFiles = new FindAddonFiles([ 'addon' ]);
+ let addonFiles = new FindAddonFiles([ 'addon' ].filter(dir => fs.existsSync(dir)));
return this._super(new MergeTrees([ tree, dummyAppFiles, addonFiles ]));
},
@@ -290,7 +290,7 @@ class FindDummyAppFiles extends Plugin {
class FindAddonFiles extends Plugin {
build() {
let addonPath = this.inputPaths[0];
- let paths = walkSync(addonPath, { directories: false })
+ let paths = addonPath ? walkSync(addonPath, { directories: false }) : [];
let pathsString = JSON.stringify(paths);
fs.writeFileSync(path.join(this.outputPath, 'addon-files.js'), `export default ${pathsString};`);
| 9 |
diff --git a/src/main/webapp/org/cboard/controller/admin/userAdminCtrl.js b/src/main/webapp/org/cboard/controller/admin/userAdminCtrl.js @@ -172,7 +172,7 @@ cBoard.controller('userAdminCtrl', function ($scope, $http, ModalUtils, $filter)
listOut.push({
"id": type + '_' + listIn[i].id.toString(),
"parent": parent,
- "text": a + getCUDRlabel(false, false),
+ "text": a + getCUDRlabel(true, true),
resId: listIn[i].id,
type: type,
icon: icon,
@@ -182,7 +182,7 @@ cBoard.controller('userAdminCtrl', function ($scope, $http, ModalUtils, $filter)
listOut.push({
"id": 'parent' + '_' + type + '_' + newParentId,
"parent": parent,
- "text": a,
+ "text": a
/*icon: 'fa fa-fw fa-folder-o'*/
});
}
@@ -445,7 +445,7 @@ cBoard.controller('userAdminCtrl', function ($scope, $http, ModalUtils, $filter)
tree.treeInstance.jstree(true).uncheck_all();
_.each(tree.resList, function (e) {
if (e.name) {
- tree.treeInstance.jstree(true).rename_node(e, e.name + getCUDRlabel(false, false));
+ tree.treeInstance.jstree(true).rename_node(e, e.name + getCUDRlabel(true, true));
}
var f = _.find(roleRes, function (rr) {
return rr.resId == e.resId && rr.resType == e.type;
@@ -479,7 +479,7 @@ cBoard.controller('userAdminCtrl', function ($scope, $http, ModalUtils, $filter)
}
$http.post("admin/updateRoleRes.do", {
roleIdArr: angular.toJson(roleIds),
- resIdArr: angular.toJson(resIds),
+ resIdArr: angular.toJson(resIds)
}).success(function (serviceStatus) {
if (serviceStatus == '1') {
$scope.selectRole = null;
| 12 |
diff --git a/src/index.scss b/src/index.scss @@ -20,6 +20,10 @@ body {
background: $color-background;
}
+body[data-direction=rtl] #page {
+ direction: rtl;
+}
+
#page, footer {
max-width: $breakpoint-1200-page-width;
margin: 0 auto;
@@ -48,22 +52,25 @@ h1 {
h4 {
font-size: 1.4rem;
line-height: 1.2em;
- margin-bottom: 1rem;
+ margin-block-end: 1rem;
font-weight: $font-weight-bold;
}
h5 {
font-size: 1.1rem;
font-weight: $font-weight-bold;
- margin-bottom: 1rem;
+ margin-block-end: 1rem;
}
.footnote {
display: block;
font-size: 0.9em;
font-style: italic;
- text-align: right;
- margin: 5px 10px 0px 10px;
+ text-align: end;
+ margin-block-start: 5px;
+ margin-inline-end: 10px;
+ margin-block-end: 0;
+ margin-inline-start: 10px;
}
@@ -78,7 +85,7 @@ header {
.lang-picker-title {
font-style: italic;
- margin-right: 0.5rem;
+ margin-block-end: 0.5rem;
}
.lang-picker-button {
@@ -86,15 +93,15 @@ header {
}
.lang-picker {
- padding-inline-start: 0;
- padding-inline-end: 1em;
padding-block-start: 0.5em;
+ padding-inline-end: 1em;
padding-block-end: 0.5em;
+ padding-inline-start: 0;
a {
white-space: nowrap;
text-decoration: none;
- margin-bottom: 0.3rem;
+ margin-block-end: 0.3rem;
&.active {
border-bottom: solid 2px black;
@@ -104,10 +111,13 @@ header {
}
#last-updated {
- padding: 0.5rem 0 0.5em 1em;
+ padding-block-start: 0.5em;
+ padding-inline-end: 0;
+ padding-block-end: 0.5em;
+ padding-inline-start: 1em;
flex-grow: 1;
font-style: italic;
- text-align: right;
+ text-align: end;
}
}
@@ -151,7 +161,10 @@ a, a:hover, a:visited {
}
#daily-increase-chart-box, #trend-chart-box {
- padding: 20px 10px 5px 10px;
+ padding-block-start: 20px;
+ padding-inline-end: 10px;
+ padding-block-end: 5px;
+ padding-inline-start: 10px;
border-radius: $box-border-radius;
background: $color-box-background;
box-shadow: $color-box-shadow;
@@ -197,7 +210,10 @@ a, a:hover, a:visited {
}
#regional-trajectory-chart-box {
- padding: 10px 10px 5px 10px;
+ padding-block-start: 10px;
+ padding-inline-end: 10px;
+ padding-block-end: 5px;
+ padding-inline-start: 10px;
border-radius: $box-border-radius;
background: $color-box-background;
box-shadow: $color-box-shadow;
@@ -221,17 +237,17 @@ a, a:hover, a:visited {
@import 'src/components/PrefectureTable/prefectureTable';
#helpful-links,
-#travel-restrictions, {
+#travel-restrictions {
max-width: 800px;
margin: 0 auto;
li {
- margin-bottom: 20px;
+ margin-block-end: 20px;
word-wrap: break-word;
}
}
#travel-restrictions {
- margin-bottom: 5em;
+ margin-block-end: 5em;
.country-link {
white-space: nowrap;
}
@@ -301,7 +317,10 @@ body {
img.emoji {
height: 1em;
width: 1em;
- margin: 0 .1em 0 .1em;
+ margin-block-start: 0;
+ margin-inline-end: .1em;
+ margin-block-end: 0;
+ margin-inline-start: .1em;
vertical-align: -0.1em;
}
| 14 |
diff --git a/src/pages/using-spark/foundations/space.mdx b/src/pages/using-spark/foundations/space.mdx @@ -23,7 +23,7 @@ in your application.
### Guidelines
-- There are 5 built in spacing sizes:
+- There are five built in spacing sizes:
- Extra Small (4px, .25 rem)
- Small (8px, .5 rem)
- Medium (16px, 1rem)
| 3 |
diff --git a/tests/service/data-util.service.spec.ts b/tests/service/data-util.service.spec.ts @@ -65,7 +65,7 @@ describe('Data Utils Service Test', () => {
expect(tempLink.click).toHaveBeenCalledWith();
}));
- it('should return a promise that rejects with an error message when image is passed but file type is not image', async(() => inject([JhiDataUtils], (service: JhiDataUtils) => {
+ it('should return a promise that rejects with an error message when image is passed but file type is not image', async(inject([JhiDataUtils], (service: JhiDataUtils) => {
const eventSake = {
target: {
@@ -79,9 +79,9 @@ describe('Data Utils Service Test', () => {
(error) => expect(error).toMatch(/^File was expected to be an image but was found to be /)
);
- })()));
+ })));
- it('should return a promise that resolves to the modified entity', async(() => inject([JhiDataUtils], (service: JhiDataUtils) => {
+ it('should return a promise that resolves to the modified entity', async(inject([JhiDataUtils], (service: JhiDataUtils) => {
const eventSake = {
target: {
@@ -92,9 +92,9 @@ describe('Data Utils Service Test', () => {
service.setFileData(eventSake, {}, 'document', false)
.then((modifiedEntity) => expect(modifiedEntity).toEqual({ document: 'ZmlsZSBjb250ZW50', documentContentType: '' }));
- })()));
+ })));
- it('should return a promise that rejects with an error message when passed event does not contain a file', async(() => inject([JhiDataUtils], (service: JhiDataUtils) => {
+ it('should return a promise that rejects with an error message when passed event does not contain a file', async(inject([JhiDataUtils], (service: JhiDataUtils) => {
service.setFileData(null, null, null, false)
.then(
@@ -102,6 +102,6 @@ describe('Data Utils Service Test', () => {
(error) => expect(error).toMatch(/^Base64 data was not set as file could not be extracted from passed parameter: /)
);
- })()));
+ })));
});
| 3 |
diff --git a/src/web/App.js b/src/web/App.js @@ -524,15 +524,24 @@ App.prototype.resetLayout = function() {
App.prototype.setCompileMessage = function() {
// Display time since last build and compile message
let now = new Date(),
- timeSinceCompile = Utils.fuzzyTime(now.getTime() - window.compileTime),
- compileInfo = "<span style=\"font-weight: normal\">Last build: " +
- timeSinceCompile.substr(0, 1).toUpperCase() + timeSinceCompile.substr(1) + " ago";
+ timeSinceCompile = Utils.fuzzyTime(now.getTime() - window.compileTime);
+
+ // Calculate previous version to compare to
+ let prev = PKG_VERSION.split(".").map(n => {
+ return parseInt(n, 10);
+ });
+ if (prev[2] > 0) prev[2]--;
+ else if (prev[1] > 0) prev[1]--;
+ else prev[0]--;
+
+ const compareURL = `https://github.com/gchq/CyberChef/compare/v${prev.join(".")}...v${PKG_VERSION}`;
+
+ let compileInfo = `<a href='${compareURL}'>Last build: ${timeSinceCompile.substr(0, 1).toUpperCase() + timeSinceCompile.substr(1)} ago</a>`;
if (window.compileMessage !== "") {
compileInfo += " - " + window.compileMessage;
}
- compileInfo += "</span>";
document.getElementById("notice").innerHTML = compileInfo;
};
| 0 |
diff --git a/src/reducers/likelyTokens/index.js b/src/reducers/likelyTokens/index.js @@ -8,7 +8,8 @@ const initialState = {
tokens: []
}
-const tokens = handleActions({
+
+const tokensReducer = handleActions({
[likelyTokens.get]: (state, { ready, error, payload }) =>
(!ready || error)
? state
@@ -16,9 +17,16 @@ const tokens = handleActions({
...state,
likelyContracts: payload
}),
+ [tokens.set]: (state, { payload }) => ({
+ ...state,
+ tokens: {
+ ...state.tokens,
+ ...payload
+ }
+ }),
}, initialState)
export default reduceReducers(
initialState,
- tokens
+ tokensReducer
)
| 9 |
diff --git a/docker/rootfs/etc/nginx/conf.d/default.conf b/docker/rootfs/etc/nginx/conf.d/default.conf @@ -30,7 +30,7 @@ server {
set $port "443";
server_name localhost;
- access_log /data/logs/fallback-access.log standard;
+ access_log /data/logs/fallback_access.log standard;
error_log /dev/null crit;
ssl_certificate /data/nginx/dummycert.pem;
ssl_certificate_key /data/nginx/dummykey.pem;
| 1 |
diff --git a/src/views/Details/TransactionDetails.vue b/src/views/Details/TransactionDetails.vue <h2>Status</h2>
<p class="text-grey" id="transaction_details_status_and_confirmations">
{{ status }}
- <span v-if="item.status === 'SUCCESS' && tx && tx.confirmations > 0">
+ <span
+ v-if="item.status === 'SUCCESS' && tx && tx.confirmations > 0"
+ id="transaction_details_status_number_of_confirmations"
+ >
/ {{ tx.confirmations }} Confirmations
</span>
</p>
| 3 |
diff --git a/accessibility-checker-engine/src/v2/checker/accessibility/help/index.ts b/accessibility-checker-engine/src/v2/checker/accessibility/help/index.ts @@ -136,13 +136,7 @@ let a11yHelp = {
"fail_elem_attr": `${Config.helpRoot}/element_attribute_deprecated`,
"fail_aria_role": `${Config.helpRoot}/element_attribute_deprecated`,
"fail_aria_attr": `${Config.helpRoot}/element_attribute_deprecated`,
- "fail_role_attr": `${Config.helpRoot}/element_attribute_deprecated`,
- },
- // ER
- "RPT_Elem_Deprecated": {
- 0: `RPT_Elem_Deprecated`,
- "Pass_0": `RPT_Elem_Deprecated`,
- "Potential_1": `RPT_Elem_Deprecated`
+ "fail_role_attr": `${Config.helpRoot}/element_attribute_deprecated`
},
// JCH - DONE
| 3 |
diff --git a/factory-ai-vision/EdgeSolution/modules/WebModule/ui/src/pages/Setting.tsx b/factory-ai-vision/EdgeSolution/modules/WebModule/ui/src/pages/Setting.tsx @@ -10,6 +10,8 @@ import {
Dropdown,
DropdownItemProps,
Checkbox,
+ Dialog,
+ QuestionCircleIcon,
} from '@fluentui/react-northstar';
import { Link } from 'react-router-dom';
import Axios, { AxiosRequestConfig } from 'axios';
@@ -203,6 +205,28 @@ export const Setting = (): JSX.Element => {
onChange={(_, { value }): void => dispatch({ type: 'UPDATE_NAMESPACE', payload: value })}
fluid
/>
+ <Dialog
+ header="Get Endpoint and Key"
+ content={
+ <Flex column styles={{ maxHeight: '800px', overflow: 'scroll' }}>
+ <p>
+ Step 1: Login Custom vision,{' '}
+ <a href="https://www.customvision.ai/" target="_blank" rel="noopener noreferrer">
+ https://www.customvision.ai/
+ </a>
+ </p>
+ <p>Step 2: Click on the setting icon on the top</p>
+ <img src="guide_step_2.png" style={{ width: '100%' }} />
+ <p>
+ Step 3: Choose the resources under the account, you will see information of
+ "Key" and "Endpoint"
+ </p>
+ <img src="guide_step_3.png" style={{ width: '100%' }} />
+ </Flex>
+ }
+ confirmButton="Close"
+ trigger={<Button text icon={<QuestionCircleIcon />} iconOnly />}
+ />
</Flex>
<Flex vAlign="center">
<Text size="large" design={{ width: '300px' }}>
| 12 |
diff --git a/build.html b/build.html <h1>Bake mesh</h1>
<pre><code>TOKTX_PATH=./bin/toktx ./bin/gltfpack -v -kn -cc -tb -i assets/model.glb -o assets/model2.glb</code></pre>
</form>
- <form id=build-map-form>
- <h1>Render map</h1>
- <div id=map-container></div>
- </form>
<script src="./bin/geometry.js"></script>
<script type=module>
import * as THREE from './three.module.js';
@@ -761,16 +757,6 @@ bakeFormEl.addEventListener('submit', async e => {
});
downloadFile(b, 'target.glb');
}; */
-
-const buildMapForm = document.getElementById('build-map-form');
-const mapContainer = document.getElementById('map-container');
-buildMapForm.addEventListener('submit', e => {
- e.preventDefault();
-
- const canvas = document.createElement('canvas');
-
- mapContainer.appendChild(canvas);
-});
</script>
</body>
</html>
| 2 |
diff --git a/src/components/ExpandableInfo.tsx b/src/components/ExpandableInfo.tsx @@ -6,7 +6,6 @@ import {
Center,
ChakraProps,
Collapse,
- forwardRef,
Heading,
HStack,
Icon,
@@ -28,9 +27,7 @@ export interface IProps extends ChakraProps {
className?: string
}
-const ExpandableInfo = forwardRef<IProps, "div">(
- (
- {
+const ExpandableInfo: React.FC<IProps> = ({
image,
title,
contentPreview,
@@ -39,9 +36,7 @@ const ExpandableInfo = forwardRef<IProps, "div">(
forceOpen,
className,
...rest
- },
- ref
- ) => {
+}) => {
const { isOpen, getButtonProps, getDisclosureProps } = useDisclosure({
defaultIsOpen: forceOpen,
})
@@ -79,7 +74,6 @@ const ExpandableInfo = forwardRef<IProps, "div">(
transition: "transform 0.1s",
},
}}
- ref={ref}
{...rest}
>
<Stack
@@ -157,6 +151,5 @@ const ExpandableInfo = forwardRef<IProps, "div">(
</VStack>
)
}
-)
export default ExpandableInfo
| 13 |
diff --git a/app-template/bitcoincom/appConfig.json b/app-template/bitcoincom/appConfig.json "windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
"pushSenderId": "1036948132229",
"description": "A Secure Bitcoin Wallet",
- "version": "4.1.0",
- "androidVersion": "401000",
+ "version": "4.2.0",
+ "androidVersion": "402000",
"_extraCSS": "",
"_enabledExtensions": {
"coinbase": false,
| 3 |
diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.js b/src/libs/Navigation/AppNavigator/AuthScreens.js @@ -6,7 +6,7 @@ import withWindowDimensions, {windowDimensionsPropTypes} from '../../../componen
import CONST from '../../../CONST';
import compose from '../../compose';
import {
- subscribeToReportCommentEvents,
+ subscribeToReportCommentAndTogglePinnedEvents,
fetchAll as fetchAllReports,
} from '../../actions/Report';
import * as PersonalDetails from '../../actions/PersonalDetails';
@@ -66,7 +66,7 @@ class AuthScreens extends React.Component {
appKey: CONFIG.PUSHER.APP_KEY,
cluster: CONFIG.PUSHER.CLUSTER,
authEndpoint: `${CONFIG.EXPENSIFY.URL_API_ROOT}api?command=Push_Authenticate`,
- }).then(subscribeToReportCommentEvents);
+ }).then(subscribeToReportCommentAndTogglePinnedEvents);
// Fetch some data we need on initialization
NameValuePair.get(CONST.NVP.PRIORITY_MODE, ONYXKEYS.NVP_PRIORITY_MODE, 'default');
| 10 |
diff --git a/src/core/user_presence.ts b/src/core/user_presence.ts @@ -54,12 +54,12 @@ export default class UserPresenceFacade extends EventsDispatcher {
this.pusher.connection.bind('message', event => {
var eventName = event.event;
if (eventName === 'pusher_internal:user_presence') {
- this.handleUserPresenceEvent(event);
+ this.handleEvent(event);
}
});
}
- private handleUserPresenceEvent(event) {
+ private handleEvent(event) {
event.data.events.forEach(userPresenceEvent => {
userPresenceEvent.users
.map(userId => this.buildUserPresenceEvent(userId, userPresenceEvent))
| 10 |
diff --git a/public/app/js/cbus-data.js b/public/app/js/cbus-data.js @@ -503,17 +503,23 @@ cbus.broadcast.listen("showPodcastDetail", function(e) {
function startServerUpdate() {
cbus.server.update([feedData], function(json) {
- var feed = cbus.data.feedsCache.filter(function(feed) {
- return feed.url === Object.keys(json)[0];
- })[0];
- console.log(json)
- let episodes = json[Object.keys(json)[0]].items;
+ let jsonUrl = Object.keys(json)[0];
+
+ var feed;
+ for (let i = 0, l = cbus.data.feedsCache.length; i < l; i++) {
+ if (cbus.data.feedsCache.url === jsonUrl) {
+ feed = cbus.data.feedsCache[i];
+ break;
+ }
+ }
+
+ let episodes = json[jsonUrl].items;
let mediasElem = document.getElementsByClassName("audios")[0];
for (let i = 0, l = episodes.length; i < l; i++) {
let episode = episodes[i];
- episode.feedURL = Object.keys(json)[0];
+ episode.feedURL = jsonUrl;
cbus.data.episodesCache.push(episode);
// create and append audio elements
| 7 |
diff --git a/src/index.js b/src/index.js @@ -14,7 +14,7 @@ import { HttpLink } from 'apollo-link-http';
const client = new ApolloClient({
link: new HttpLink({
- uri: 'https://platform-api.now.sh/graphql',
+ uri: 'https://platform-graphql.opentargets.io/graphql',
}),
cache: new InMemoryCache(),
});
| 4 |
diff --git a/conf/evolutions/default/133.sql b/conf/evolutions/default/133.sql @@ -25,7 +25,7 @@ WHERE label_tag.tag_id = tag.tag_id
OR (label_type.label_type = 'CurbRamp' AND tag.tag = 'surface problem')
OR (label_type.label_type = 'Crosswalk' AND tag.tag = 'brick')
OR (label_type.label_type = 'Crosswalk' AND tag.tag = 'bumpy')
- OR (label_type.label_type = 'Crosswalk' AND tag.tag = 'rail/tram tracks')
+ OR (label_type.label_type = 'Crosswalk' AND tag.tag = 'rail/tram track')
);
DELETE FROM tag
@@ -36,5 +36,5 @@ WHERE tag.label_type_id = label_type.label_type_id
OR (label_type.label_type = 'CurbRamp' AND tag.tag = 'surface problem')
OR (label_type.label_type = 'Crosswalk' AND tag.tag = 'brick')
OR (label_type.label_type = 'Crosswalk' AND tag.tag = 'bumpy')
- OR (label_type.label_type = 'Crosswalk' AND tag.tag = 'rail/tram tracks')
+ OR (label_type.label_type = 'Crosswalk' AND tag.tag = 'rail/tram track')
);
| 1 |
diff --git a/components/README.md b/components/README.md @@ -15,7 +15,7 @@ If you need to add or adjust any of the following for a component, you can send
<li>Box-Shadow style</li>
<li>Background colour</li>
<li>Paddings and Margins</li>
-<li>Icon and icon colour</li>
+<li>Icon, and icon's colour</li>
</ul>
### Contribute
| 14 |
diff --git a/cravat/cravat_class.py b/cravat/cravat_class.py @@ -117,7 +117,7 @@ cravat_cmd_parser.add_argument('--cleanup',
dest='cleanup',
action='store_true',
default=False,
- help='At the end of the run, cravat will erase all intermediary files for the job created by cravat, except the log (.log and .err) and the result (.sqlite) files.')
+ help='At the end of the run, cravat will erase intermediary files, ending with var, gen, crv, crx, crg, crs, crm, crt, or json extension, for the job created by cravat.')
cravat_cmd_parser.add_argument('--version',
dest='show_version',
action='store_true',
| 7 |
diff --git a/.eslintrc.js b/.eslintrc.js @@ -54,17 +54,17 @@ module.exports = {
/**
* Best practices
*/
- 'consistent-return': 2, // http://eslint.org/docs/rules/consistent-return
+ 'consistent-return': 0, // http://eslint.org/docs/rules/consistent-return
'curly': [2, 'multi-line'], // http://eslint.org/docs/rules/curly
'default-case': 2, // http://eslint.org/docs/rules/default-case
'dot-notation': [2, { // http://eslint.org/docs/rules/dot-notation
'allowKeywords': true
}],
- 'eqeqeq': 2, // http://eslint.org/docs/rules/eqeqeq
+ 'eqeqeq': [2, "smart"], // http://eslint.org/docs/rules/eqeqeq
'guard-for-in': 2, // http://eslint.org/docs/rules/guard-for-in
'no-caller': 2, // http://eslint.org/docs/rules/no-caller
'no-else-return': 2, // http://eslint.org/docs/rules/no-else-return
- 'no-eq-null': 2, // http://eslint.org/docs/rules/no-eq-null
+ 'no-eq-null': 0, // http://eslint.org/docs/rules/no-eq-null
'no-eval': 2, // http://eslint.org/docs/rules/no-eval
'no-extend-native': 2, // http://eslint.org/docs/rules/no-extend-native
'no-extra-bind': 2, // http://eslint.org/docs/rules/no-extra-bind
@@ -114,9 +114,7 @@ module.exports = {
}],
'comma-style': [2, 'last'], // http://eslint.org/docs/rules/comma-style
'eol-last': 2, // http://eslint.org/docs/rules/eol-last
- 'func-names': [
- 1, 'as-needed'
- ], // http://eslint.org/docs/rules/func-names
+ 'func-names': 0, // http://eslint.org/docs/rules/func-names
'key-spacing': [2, { // http://eslint.org/docs/rules/key-spacing
'beforeColon': false,
'afterColon': true
| 3 |
diff --git a/readme.md b/readme.md - [Burst](http://mojs.io/tutorials/burst/)
- [Path Easing](http://mojs.io/tutorials/easing/path-easing/)
- [Icon Animations Powered by mo.js](http://tympanus.net/codrops/2016/02/23/icon-animations-powered-by-mo-js/)
+ - [An Introduction to mo.js, by Sarah Drasner](https://css-tricks.com/introduction-mo-js/)
## Docs
- [Reference](https://github.com/legomushroom/mojs/blob/master/api/readme.md)
| 0 |
diff --git a/src/intl/en/page-developers-index.json b/src/intl/en/page-developers-index.json "page-developers-transactions-desc": "The way Ethereum state changes",
"page-developers-transactions-link": "Transactions",
"page-developers-web3-desc": "How the web3 world of development is different",
+ "page-developers-web3-link": "Web2 vs Web3",
"page-developers-data-structures": "Data Structures",
"page-developers-data-structures-link": "Data Structures",
"page-developers-data-structures-desc": "Introduction to the data structures used in the Ethereum stack"
| 14 |
diff --git a/test/issues/279-wrong-canvas-size.js b/test/issues/279-wrong-canvas-size.js function buildKernel(mode) {
var gpu = new GPU({ mode });
-
- var body;
-
var initMatrix = gpu.createKernel(function(value) {
return value;
})
return render;
}
- QUnit.test('Issue #314 Large array addressing - auto', () => {
-
+ QUnit.test('Issue #279 wrong canvas size - auto', () => {
var canvas = buildKernel().getCanvas();
QUnit.assert.equal(canvas.width, WIDTH);
QUnit.assert.equal(canvas.height, HEIGHT);
});
- // QUnit.test('Issue #314 Large array addressing - gpu', () => {
- // QUnit.assert.equal(buildKernel('gpu')[DATA_MAX-1], data[DATA_MAX-1]);
- // });
-
- // QUnit.test('Issue #314 Large array addressing - webgl', () => {
- // QUnit.assert.equal(buildKernel('webgl')[DATA_MAX-1], data[DATA_MAX-1]);
- // });
-
- // QUnit.test('Issue #314 Large array addressing - webgl2', () => {
- // var result = buildKernel('webgl2')
- // var same = true;
- // for (var i = 0; i < DATA_MAX; i++) {
- // if (!result[i] == data[i]) {
- // same = false;
- // break;
- // }
- // }
- // QUnit.assert.ok(same, "not all elements are the same, failed on index:" + i);
- // });
+ QUnit.test('Issue #279 wrong canvas size - cpu', () => {
+ var canvas = buildKernel('cpu').getCanvas();
+ QUnit.assert.equal(canvas.width, WIDTH);
+ QUnit.assert.equal(canvas.height, HEIGHT);
+ });
+
+ QUnit.test('Issue #279 wrong canvas size - gpu', () => {
+ var canvas = buildKernel('gpu').getCanvas();
+ QUnit.assert.equal(canvas.width, WIDTH);
+ QUnit.assert.equal(canvas.height, HEIGHT);
+ });
+
+ QUnit.test('Issue #279 wrong canvas size - webgl', () => {
+ var canvas = buildKernel('webgl').getCanvas();
+ QUnit.assert.equal(canvas.width, WIDTH);
+ QUnit.assert.equal(canvas.height, HEIGHT);
+ });
+
+ QUnit.test('Issue #279 wrong canvas size - webgl2', () => {
+ var canvas = buildKernel('webgl2').getCanvas();
+ QUnit.assert.equal(canvas.width, WIDTH);
+ QUnit.assert.equal(canvas.height, HEIGHT);
+ });
})();
\ No newline at end of file
| 1 |
diff --git a/README.md b/README.md @@ -92,7 +92,7 @@ Use the Moleculer CLI tool to create a new Moleculer based microservices project
```
2. Create a new project (named `first-demo`)
```bash
- $ moleculer init project-simple first-demo
+ $ moleculer init project first-demo
```
> Press Y on API Gateway & `npm install`
| 10 |
diff --git a/src/components/dashboard/Claim.js b/src/components/dashboard/Claim.js @@ -360,6 +360,16 @@ const Claim = props => {
let receipt
let txHash
+ const getTxReceiptByHash = async () => {
+ try {
+ receipt = await goodWallet.wallet.eth.getTransactionReceipt(txHash)
+ } catch (exception) {
+ log.error('getTransactionReceipt error : ', exception.message, exception)
+
+ throw exception
+ }
+ }
+
try {
if (Config.disableClaim) {
throw new Error('Come back later')
@@ -375,16 +385,14 @@ const Claim = props => {
})
} catch (exception) {
const { message } = exception
+
log.error('SendClaimTx error : ', message, exception)
+
if (!txHash || !message.includes('Transaction with the same hash was already imported')) {
throw exception
}
- try {
- receipt = await goodWallet.wallet.eth.getTransactionReceipt(txHash)
- } catch (e) {
- log.error('getTransactionReceipt error : ', e.message, e)
- }
+ receipt = await getTxReceiptByHash()
}
return receipt
| 0 |
diff --git a/articles/architecture-scenarios/spa-api/part-1.md b/articles/architecture-scenarios/spa-api/part-1.md @@ -26,13 +26,12 @@ Because SPAs are public clients and cannot securely store a Client Secret since
With this flow, the calling application requests an Access Token over HTTPS with a transformative value—a Code Verifier (or another type of client secret)—that can be verified by the authorization server.
-This flow is the most secure for Single-Page Applications.
## Implicit Flow
The original specifications for OAuth2 introduced the Implicit Flow, a way for SPAs without a backend to obtain Access Tokens and call APIs directly from the browser. However, mitigation strategies are necessary to use the Implicit Flow because tokens are returned in the URL directly from the authorization endpoint as opposed to the token endpoint. Because web technologies have evolved since the introduction of the Implicit Flow, returning an Access Token in a URL provides multiple opportunities for an attack, such as cross-side scripting, token injection, or credential leakage.
-With the introduction of the Authorization Code Flow with PKCE, mitigating the risks using the Implicit Flow in SPAs is a thing of the past. While you may still use the Implicit Flow with your SPA, Auth0 recommends using Implicit Flow with traditional server-side applications that can maintain a Client Secret.
+With the introduction of the Authorization Code Flow with PKCE, mitigating the risks using the Implicit Flow in SPAs is a thing of the past.
To learn more, read our blog post: [OAuth2 Implicit Grant and SPA](https://auth0.com/blog/oauth2-implicit-grant-and-spa/#The-Implicit-Grant).
| 2 |
diff --git a/packages/cx/src/data/View.js b/packages/cx/src/data/View.js @@ -178,7 +178,8 @@ export class View {
get: ::this.get,
update: ::this.update,
delete: ::this.delete,
- toggle: ::this.toggle
+ toggle: ::this.toggle,
+ init: ::this.init
}
}
}
| 0 |
diff --git a/spec/models/google_street_view_photo_spec.rb b/spec/models/google_street_view_photo_spec.rb @@ -2,19 +2,19 @@ require File.dirname(__FILE__) + '/../spec_helper.rb'
def valid_url?(url)
uri = URI.parse(url)
- Net::HTTP.new(uri.host).request_head(uri.path+'?'+uri.query).should be_a Net::HTTPOK
+ expect( Net::HTTP.new(uri.host).request_head(uri.path+'?'+uri.query) ).to be_a Net::HTTPOK
end
describe GoogleStreetViewPhoto, "get_api_response" do
let(:native_photo_id) { }
it "should return a hash of values based on its native ID, which is a url" do
- api_response = GoogleStreetViewPhoto.get_api_response("http://maps.googleapis.com/maps/api/streetview?size=600x300&location=34.579835,-118.6703479&heading=-31&pitch=7fov=90&sensor=false")
- api_response[:size].should eq "600x300"
+ api_response = GoogleStreetViewPhoto.get_api_response("http://maps.googleapis.com/maps/api/streetview?size=600x300&location=34.579,-118.670&heading=-31&pitch=7fov=90&sensor=false")
+ expect( api_response[:size] ).to eq "600x300"
end
end
describe GoogleStreetViewPhoto, "new_from_api_response" do
- let(:native_photo_id) { "http://maps.googleapis.com/maps/api/streetview?size=600x300&location=34.579835,-118.6703479&heading=-31&pitch=7fov=90&sensor=false" }
+ let(:native_photo_id) { "http://maps.googleapis.com/maps/api/streetview?size=600x300&location=34.579,-118.670&heading=-31&pitch=7fov=90&sensor=false" }
let(:api_response) { GoogleStreetViewPhoto.get_api_response(native_photo_id) }
let(:p) { GoogleStreetViewPhoto.new_from_api_response(api_response) }
@@ -26,23 +26,23 @@ describe GoogleStreetViewPhoto, "new_from_api_response" do
it("should set original url") { valid_url?(p.original_url) }
it "should set medium url with aspect ratio" do
- p.medium_url.should =~ /size=500x250/
+ expect( p.medium_url ).to be =~ /size=500x250/
end
it "should set native_page_url to maps.google.com" do
- p.native_page_url.should =~ /maps.google.com/
+ expect( p.native_page_url ).to be =~ /maps.google.com/
end
it "should set the license to copyright" do
- p.license.should eq Photo::COPYRIGHT
+ expect( p.license ).to eq Photo::COPYRIGHT
end
it "should set the native_realname to Google" do
- p.native_realname.should eq "Google"
+ expect( p.native_realname ).to eq "Google"
end
it "should be valid" do
puts "p.errors: #{p.errors.full_messages.to_sentence}" unless p.valid?
- p.should be_valid
+ expect( p ).to be_valid
end
end
| 1 |
diff --git a/react/src/components/masthead/components/SprkMastheadNarrowNav/SprkMastheadNarrowNav.js b/react/src/components/masthead/components/SprkMastheadNarrowNav/SprkMastheadNarrowNav.js @@ -40,29 +40,69 @@ SprkMastheadNarrowNav.propTypes = {
*/
isOpen: PropTypes.bool,
/**
- * Data to build the links inside the Narrow Navigation.
+ * Configuration to build the links inside the Narrow Navigation.
*/
links: PropTypes.arrayOf(
PropTypes.shape({
+ /**
+ * Determines if link renders as an anchor tag, or router link.
+ */
element: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
+ /**
+ * Text of the link
+ */
text: PropTypes.string,
+ /**
+ * Expects an array containing link objects.
+ * Will be treated as a subnav to the link.
+ */
subNavLinks: PropTypes.arrayOf(
PropTypes.shape({
+ /** Text of subnav link */
text: PropTypes.string,
+ /**
+ * Determines if link renders as an anchor tag, or router link.
+ */
element: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
}),
),
}),
).isRequired,
+ /**
+ * Expects a selector object that
+ * represents choices to be supplied
+ * to the selector in the wide viewport
+ * version of the masthead.
+ */
selector: PropTypes.shape({
+ /** The function that runs once a choice is made. */
choiceFunction: PropTypes.func,
+ /**
+ * Expects a Component to render at the foot of the open selector.
+ */
footer: PropTypes.node,
+ /**
+ * Object that configures the items inside the selector
+ */
items: PropTypes.arrayOf(
PropTypes.shape({
+ /**
+ * Determines if link renders as an anchor tag, or router link.
+ */
element: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
+ /**
+ * Additional text providing context for item.
+ */
information: PropTypes.string,
+ // TODO: get rid of this -- it does nothing but add a nonvalid "text" attribute on the item
text: PropTypes.string,
+ /**
+ * The main headline of the item
+ */
title: PropTypes.string,
+ /**
+ * The value assigned for the selector
+ */
value: PropTypes.string,
}),
),
| 7 |
diff --git a/src/lib/client.js b/src/lib/client.js @@ -121,7 +121,7 @@ StreamClient.prototype = {
url = protocol + '://' + this.location + '-' + serviceName + '.stream-io-api.com/' + serviceName + '/';
}
- if (typeof (process) !== 'undefined' && process.env.LOCAL) {
+ if ((typeof (process) !== 'undefined' && process.env.LOCAL) || this.options.local) {
url = 'http://localhost:8000/' + serviceName + '/';
}
@@ -134,6 +134,9 @@ StreamClient.prototype = {
if (typeof (process) !== 'undefined' && process.env[urlEnvironmentKey]) {
url = process.env[urlEnvironmentKey];
}
+ if (this.options.urlOverride && this.options.urlOverride[serviceName]) {
+ return this.options.urlOverride[serviceName];
+ }
return url;
},
| 11 |
diff --git a/thali/install/ios/nativeInstaller.js b/thali/install/ios/nativeInstaller.js @@ -313,6 +313,14 @@ function biuldCocoaAsyncSocket(checkoutDir, buildDir, buildWithTests) {
buildDir, 'Release' + '-' + sdk, projectName + '.framework');
return fs.copy(frameworkBuildDir, frameworkOutputDir, { clobber: false });
+ })
+ .then(function () {
+ var frameworkBuildDir = path.join(
+ buildDir, projectConfiguration + '-' + sdk, projectName + '.framework');
+ var thaliCoreFrameworkOutputDir = path.join(
+ checkoutDir, '..', '..', projectName + '.framework');
+
+ return fs.copy(frameworkBuildDir, thaliCoreFrameworkOutputDir, { clobber: false });
});
}
@@ -320,6 +328,7 @@ function biuldSwiftXCTest(checkoutDir, buildDir, buildWithTests) {
var projectDir = 'swift-corelibs-xctest';
var projectName = 'XCTest'
var projectScheme = 'SwiftXCTest-iOS';
+ var frameworkName = 'SwiftXCTest';
var projectConfiguration = 'Release';
var sdk = 'iphoneos';
@@ -343,6 +352,17 @@ function biuldSwiftXCTest(checkoutDir, buildDir, buildWithTests) {
.then(function () {
return fs.ensureDir(buildDir);
})
+ .then(function () {
+ var frameworkBuildDir = path.join(
+ buildDir, projectConfiguration + '-' + sdk, frameworkName + '.framework');
+ var thaliCoreFrameworkOutputDir = path.join(
+ checkoutDir, '..', '..', frameworkName + '.framework');
+
+ console.log('from: ', frameworkBuildDir);
+ console.log('to : ', thaliCoreFrameworkOutputDir);
+
+ return fs.copy(frameworkBuildDir, thaliCoreFrameworkOutputDir, { clobber: false });
+ });
}
/**
| 0 |
diff --git a/src/components/appNavigation/AppNavigation.js b/src/components/appNavigation/AppNavigation.js @@ -59,11 +59,7 @@ const AppNavigator = createSwitchNavigator(routes, { initialRouteName })
class AppNavigation extends React.Component<AppNavigationProps, AppNavigationState> {
render() {
const account = this.props.store.get('account')
- if (account.ready) {
- return <AppNavigator navigation={this.props.navigation} screenProps={{ routes }} />
- }
-
- return <Splash />
+ return account.ready ? <AppNavigator navigation={this.props.navigation} screenProps={{ routes }} /> : null
}
}
| 2 |
diff --git a/content/responses/collaboration.yml b/content/responses/collaboration.yml @@ -16,7 +16,7 @@ properties:
id:
type: string
description: The unique identifier for this collaboration.
- example: "11446498"
+ example: "12345678"
type:
type: string
@@ -68,7 +68,7 @@ properties:
type: string
nullable: true
format: date-time
- example: "2012-12-12T10:53:43-08:00"
+ example: "2012-12-26T10:53:43-08:00"
description: |-
When the collaboration will expire, or `null` if no expiration
date is set.
@@ -86,7 +86,7 @@ properties:
acknowledged_at:
type: string
format: date-time
- example: "2012-12-12T10:53:43-08:00"
+ example: "2012-12-12T10:55:20-08:00"
description: |-
When the `status` of the collaboration object changed to
`accepted` or `rejected`
@@ -95,6 +95,11 @@ properties:
allOf:
- $ref: '#/components/schemas/User--Mini'
- description: The user who created the collaboration object
+ - example:
+ - id: 33224412
+ - type: "user"
+ - login: "[email protected]"
+ - name: "Dylan Smith"
created_at:
type: string
| 7 |
diff --git a/package.json b/package.json "react-build": "NODE_ENV=production react-scripts build",
"electron-build": "NODE_ENV=production electron-builder -mwl",
"release": "npm run react-build && electron-builder --publish=always",
- "start-windows": "SET NODE_ENV=development concurrently \"cross-env BROWSER=none npm run react-start\" \"wait-on http://localhost:3000 && electron .\"",
+ "start-windows": "cross-env NODE_ENV=development concurrently \"cross-env BROWSER=none npm run react-start\" \"wait-on http://localhost:3000 && electron .\"",
"start": "NODE_ENV=development concurrently \"cross-env BROWSER=none npm run react-start\" \"wait-on http://localhost:3000 && electron .\""
},
"browserslist": {
| 3 |
diff --git a/lib/sketchPage.js b/lib/sketchPage.js // REMIND THE PRESENTER WHEN INTERFACE IS IN AUTO-SKETCHING MODE.
- if (isk() && sk().sketchProgress < 1) {
- color('rgba(0,32,128,.2)');
- fillRect(0,0,w,h);
- _g.font = 'bold 40pt Calibri';
- var msg = "Finish drawing the sketch";
- color('rgba(0,32,128,.3)');
- _g_ext(msg, [(w - textWidth(msg)) / 2, 80]);
- }
// SHOW PRESENTER THE AUTO-SKETCHING GUIDE PATTERN.
| 2 |
diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/service/entity.service.spec.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/service/entity.service.spec.ts.ejs @@ -186,7 +186,7 @@ describe('Service Tests', () => {
<% const fieldsToIncludeInPartialPatchTest = fields.filter(field => !field.id && !field.transient && faker.random.boolean()); %>
it('should partial update a <%= entityAngularName %>', () => {
- const patchObject = {
+ const patchObject = Object.assign({
<%_ fieldsToIncludeInPartialPatchTest.forEach((field) => {
const fieldType = field.fieldType;
_%>
@@ -204,7 +204,7 @@ describe('Service Tests', () => {
<%= field.fieldName %>: 'BBBBBB',
<%_ } _%>
<%_ }) _%>
- }
+ }, new <%= entityAngularName %>())
const returnedFromService = Object.assign(patchObject, elemDefault);
| 1 |
diff --git a/src/components/utils/FilterUtils.js b/src/components/utils/FilterUtils.js @@ -2,16 +2,16 @@ import ObjectUtils from './ObjectUtils';
export default class FilterUtils {
- static filter(value, fields, filterValue, filterMatchMode) {
+ static filter(value, fields, filterValue, filterMatchMode, filterLocale) {
let filteredItems = [];
- let filterText = ObjectUtils.removeAccents(filterValue).toLowerCase();
+ let filterText = ObjectUtils.removeAccents(filterValue).toLocaleLowerCase(filterLocale);
if (value) {
for (let item of value) {
for (let field of fields) {
- let fieldValue = ObjectUtils.removeAccents(String(ObjectUtils.resolveFieldData(item, field))).toLowerCase();
+ let fieldValue = ObjectUtils.removeAccents(String(ObjectUtils.resolveFieldData(item, field))).toLocaleLowerCase(filterLocale);
- if (FilterUtils[filterMatchMode](fieldValue,filterText)) {
+ if (FilterUtils[filterMatchMode](fieldValue,filterText, filterLocale)) {
filteredItems.push(item);
break;
}
@@ -22,7 +22,7 @@ export default class FilterUtils {
return filteredItems;
}
- static startsWith(value, filter) {
+ static startsWith(value, filter, filterLocale) {
if (filter === undefined || filter === null || filter.trim() === '') {
return true;
}
@@ -31,13 +31,13 @@ export default class FilterUtils {
return false;
}
- let filterValue = ObjectUtils.removeAccents(filter.toString()).toLowerCase();
- let stringValue = ObjectUtils.removeAccents(value.toString()).toLowerCase();
+ let filterValue = ObjectUtils.removeAccents(filter.toString()).toLocaleLowerCase(filterLocale);
+ let stringValue = ObjectUtils.removeAccents(value.toString()).toLocaleLowerCase(filterLocale);
return stringValue.slice(0, filterValue.length) === filterValue;
}
- static contains(value, filter) {
+ static contains(value, filter, filterLocale) {
if (filter === undefined || filter === null || (typeof filter === 'string' && filter.trim() === '')) {
return true;
}
@@ -46,13 +46,13 @@ export default class FilterUtils {
return false;
}
- let filterValue = ObjectUtils.removeAccents(filter.toString()).toLowerCase();
- let stringValue = ObjectUtils.removeAccents(value.toString()).toLowerCase();
+ let filterValue = ObjectUtils.removeAccents(filter.toString()).toLocaleLowerCase(filterLocale);
+ let stringValue = ObjectUtils.removeAccents(value.toString()).toLocaleLowerCase(filterLocale);
return stringValue.indexOf(filterValue) !== -1;
}
- static endsWith(value, filter) {
+ static endsWith(value, filter, filterLocale) {
if (filter === undefined || filter === null || filter.trim() === '') {
return true;
}
@@ -61,13 +61,13 @@ export default class FilterUtils {
return false;
}
- let filterValue = ObjectUtils.removeAccents(filter.toString()).toLowerCase();
- let stringValue = ObjectUtils.removeAccents(value.toString()).toLowerCase();
+ let filterValue = ObjectUtils.removeAccents(filter.toString()).toLocaleLowerCase(filterLocale);
+ let stringValue = ObjectUtils.removeAccents(value.toString()).toLocaleLowerCase(filterLocale);
return stringValue.indexOf(filterValue, stringValue.length - filterValue.length) !== -1;
}
- static equals(value, filter) {
+ static equals(value, filter, filterLocale) {
if (filter === undefined || filter === null || (typeof filter === 'string' && filter.trim() === '')) {
return true;
}
@@ -79,10 +79,10 @@ export default class FilterUtils {
if (value.getTime && filter.getTime)
return value.getTime() === filter.getTime();
else
- return ObjectUtils.removeAccents(value.toString()).toLowerCase() === ObjectUtils.removeAccents(filter.toString()).toLowerCase();
+ return ObjectUtils.removeAccents(value.toString()).toLocaleLowerCase(filterLocale) === ObjectUtils.removeAccents(filter.toString()).toLocaleLowerCase(filterLocale);
}
- static notEquals(value, filter) {
+ static notEquals(value, filter, filterLocale) {
if (filter === undefined || filter === null || (typeof filter === 'string' && filter.trim() === '')) {
return false;
}
@@ -94,7 +94,7 @@ export default class FilterUtils {
if (value.getTime && filter.getTime)
return value.getTime() !== filter.getTime();
else
- return ObjectUtils.removeAccents(value.toString()).toLowerCase() !== ObjectUtils.removeAccents(filter.toString()).toLowerCase();
+ return ObjectUtils.removeAccents(value.toString()).toLocaleLowerCase(filterLocale) !== ObjectUtils.removeAccents(filter.toString()).toLocaleLowerCase(filterLocale);
}
static in(value, filter) {
| 7 |
diff --git a/src/screens/EventDetailsScreen/component.js b/src/screens/EventDetailsScreen/component.js import React, { PureComponent } from "react";
import { View, StyleSheet, ScrollView } from "react-native";
import type { NavigationScreenProp } from "react-navigation";
-import formatDate from "date-fns/format";
-import isSameDay from "date-fns/is_same_day";
import Header from "./Header";
import IconButton from "./IconButton";
import IconItem from "./IconItem";
-import CategoryLabel from "./CategoryLabel";
import EventMap from "./EventMap";
+import EventOverview from "./EventOverview";
import Text from "../../components/Text";
import Button from "../../components/Button";
import ContentPadding from "../../components/ContentPadding";
@@ -19,7 +17,6 @@ import {
whiteColor
} from "../../constants/colors";
import text from "../../constants/text";
-import strings from "../../constants/strings";
import type { Event, LocalizedFieldRef } from "../../data/event";
import locale from "../../data/locale";
import chevronLeftWhite from "../../../assets/images/chevron-left-white.png";
@@ -31,84 +28,6 @@ type Props = {
getAssetUrl: LocalizedFieldRef => string
};
-const removeTimezoneFromDateString = isoString => isoString.slice(0, -6);
-
-const renderEventOverview = event => {
- const startTime = removeTimezoneFromDateString(
- event.fields.startTime[locale]
- );
- const endTime = removeTimezoneFromDateString(event.fields.endTime[locale]);
- const dateFormat = "DD MMMM YYYY";
- const timeFormat = "HH:mm";
- const dateDisplay = isSameDay(startTime, endTime)
- ? formatDate(startTime, dateFormat)
- : `${formatDate(startTime, dateFormat)} - ${formatDate(
- endTime,
- dateFormat
- )}`;
- const timeDisplay = `${formatDate(startTime, timeFormat)} - ${formatDate(
- endTime,
- timeFormat
- )}`;
-
- return (
- <ContentPadding style={styles.content}>
- <Text type="h1">{event.fields.name[locale]}</Text>
- <View style={styles.categoryLabelContainer}>
- {event.fields.eventCategories[locale].map(categoryName => (
- <CategoryLabel key={categoryName} categoryName={categoryName} />
- ))}
- </View>
- <View style={styles.iconItemWrapper}>
- <IconItem
- icon={<Text type="small">icn</Text>}
- title={dateDisplay}
- content={<Text type="small">{timeDisplay}</Text>}
- />
- </View>
- <View style={styles.iconItemWrapper}>
- <IconItem
- icon={<Text type="small">icn</Text>}
- title={event.fields.locationName[locale]}
- />
- </View>
- <View style={styles.iconItemWrapper}>
- <IconItem
- icon={<Text type="small">icn</Text>}
- title={`${text.eventDetailsPrice}${
- event.fields.eventPriceLow[locale]
- }`}
- />
- </View>
- {event.fields.venueDetails &&
- event.fields.venueDetails[locale].includes(
- strings.venueDetailsGenderNeutralToilets
- ) && (
- <View style={styles.iconItemWrapper}>
- <IconItem
- icon={<Text type="small">icn</Text>}
- title={text.eventDetailsGenderNeutralToilets}
- />
- </View>
- )}
- {event.fields.accessibilityOptions &&
- event.fields.accessibilityOptions[locale].length > 0 && (
- <View style={styles.iconItemWrapper}>
- <IconItem
- icon={<Text type="small">icn</Text>}
- title={text.eventDetailsAccessibility}
- content={
- <Text type="small">
- {event.fields.accessibilityOptions[locale].join(", ")}
- </Text>
- }
- />
- </View>
- )}
- </ContentPadding>
- );
-};
-
const renderEventDescription = event => (
<ContentPadding style={styles.content}>
<View style={styles.sectionDivider} />
@@ -200,7 +119,7 @@ class EventDetailsScreen extends PureComponent<Props> {
ratio={5 / 3}
source={{ uri: getAssetUrl(event.fields.individualEventPicture) }}
/>
- {renderEventOverview(event)}
+ <EventOverview event={event} />
{renderEventDescription(event)}
{renderEventDetails(event)}
</ScrollView>
@@ -222,15 +141,6 @@ const styles = StyleSheet.create({
paddingVertical: 15,
backgroundColor: whiteColor
},
- categoryLabelContainer: {
- marginTop: 16,
- marginBottom: 20,
- flexDirection: "row",
- flexWrap: "wrap"
- },
- iconItemWrapper: {
- marginBottom: 20
- },
sectionDivider: {
backgroundColor: lightishGreyColor,
height: 1,
| 4 |
diff --git a/package.json b/package.json "json-fetch-cache": "0.0.5",
"json-query": "^2.2.2",
"mysql2": "^1.4.2",
- "nexus-stats-api": "^0.1.0",
+ "nexus-stats-api": "^0.2.1",
"node-md-config": "^2.0.1",
"node-wikia": "0.0.3",
"pad-left": "^2.1.0",
| 3 |
diff --git a/generators/client/templates/angular/src/main/webapp/app/core/auth/account.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/auth/account.service.ts.ejs @@ -20,6 +20,7 @@ import { Injectable } from '@angular/core';
<%_ if (enableTranslation) { _%>
import { JhiLanguageService } from 'ng-jhipster';
import { SessionStorageService } from 'ngx-webstorage';
+import { LANGUAGES } from 'app/core/language/language.constants';
<%_ } _%>
import { HttpClient, HttpResponse } from '@angular/common/http';
import { Observable, Subject } from 'rxjs';
@@ -109,7 +110,11 @@ export class AccountService {
// After retrieve the account info, the language will be changed to
// the user's preferred language configured in the account setting
const langKey = this.sessionStorage.retrieve('locale') || this.userIdentity.langKey;
+ if (langKey && LANGUAGES.includes(langKey)) {
this.languageService.changeLanguage(langKey);
+ } else {
+ this.languageService.changeLanguage('<%= nativeLanguage %>');
+ }
<%_ } _%>
} else {
this.userIdentity = null;
| 3 |
diff --git a/src/components/Common/NoWeb3.js b/src/components/Common/NoWeb3.js @@ -10,7 +10,7 @@ export default class NoWeb3 extends Component {
<h1 className="title">Wallet not found, or access to Ethereum account not granted</h1>
<p className="description">
If a Wallet extension is installed on your web browser, please verify that the access to Ethereum account has been granted and is available for the corresponding domain.
- . Check Token Wizard GitHub for <a href='https://github.com/poanetwork/token-wizard' target='blank'>the instruction</a>.
+ Check Token Wizard GitHub for <a href='https://github.com/poanetwork/token-wizard' target='blank'>the instruction</a>.
</p>
</div>
</div>
| 2 |
diff --git a/lib/modules/apostrophe-ui/public/js/ui.js b/lib/modules/apostrophe-ui/public/js/ui.js @@ -256,10 +256,10 @@ apos.define('apostrophe-ui', {
options = {};
}
- new Pikaday({
+ new Pikaday(_.merge({
field: $el[0],
format: 'YYYY-MM-DD'
- });
+ }, options));
};
// Converts apostrophe-schemas 24 hour time field strings
| 11 |
diff --git a/modules/service/query-service.js b/modules/service/query-service.js @@ -13,8 +13,7 @@ class QueryService {
async resolve(id, load, isAssetRequested, node) {
let result = await this.networkService.sendMessage('/resolve', id, node);
-
- if (!result) {
+ if (!result || (Array.isArray(result) && result[0] === "ack")) {
return null;
}
| 9 |
diff --git a/lib/connection.js b/lib/connection.js @@ -488,6 +488,11 @@ class Connection extends EventEmitter {
_resolveNamedPlaceholders(options) {
let unnamed;
if (this.config.namedPlaceholders || options.namedPlaceholders) {
+ if (Array.isArray(options.values)) {
+ // if an array is provided as the values, assume the conversion is not necessary.
+ // this allows the usage of unnamed placeholders even if the namedPlaceholders flag is enabled.
+ return
+ }
if (convertNamedPlaceholders === null) {
convertNamedPlaceholders = require('named-placeholders')();
}
| 11 |
diff --git a/src/components/auth/torus/AuthTorus.js b/src/components/auth/torus/AuthTorus.js @@ -97,10 +97,10 @@ const AuthTorus = ({ screenProps, navigation, styles }) => {
}
if (!torusUser.privateKey) {
- const e = new Error('Missing privateKey from torus response')
+ const exception = new Error('Missing privateKey from torus response')
- log.error('torus login failed', e.message, e, { torusUser, provider, curSeed, curMnemonic })
- throw e
+ exception.payload = { torusUser, provider, curSeed, curMnemonic }
+ throw exception
}
// set masterseed so wallet can use it in 'ready' where we check if user exists
@@ -128,11 +128,12 @@ const AuthTorus = ({ screenProps, navigation, styles }) => {
const handleTorusError = (exception, options) => {
const { provider, fromRedirect = false } = options || {}
- const { message = '', name } = exception || {}
+ const { name, message = '', payload = {} } = exception || {}
const { UserCancel, BrowserNotAllowed } = TorusStatusCode
let suggestion
log.error('torus signin failed:', message, exception, {
+ ...payload,
provider,
fromRedirect,
dialogShown: true,
| 0 |
diff --git a/packages/openneuro-server/datalad/draft.js b/packages/openneuro-server/datalad/draft.js @@ -34,7 +34,7 @@ export const updateDatasetRevision = datasetId => gitRef => {
*/
return mongo.collections.crn.datasets.update(
{ id: datasetId },
- { $set: { revision: gitRef, modified: new Date() } },
+ { $set: { revision: gitRef, modified: new Date(), partial: false } },
)
}
| 12 |
diff --git a/userscript.user.js b/userscript.user.js @@ -15573,7 +15573,12 @@ var $$IMU_EXPORT$$;
domain === "image.akiba-souken.k-img.com") {
// https://akiba-souken.k-img.com/assets/images/article/000/602/t640_602120.jpg
// https://akiba-souken.k-img.com/assets/images/article/000/602/602120.jpg
- return src.replace(/(\/images\/+[^/]*\/+(?:[0-9]{3}\/+){2})t[0-9]+_/, "$1");
+ // thanks to fireattack on github: https://github.com/qsniyg/maxurl/issues/199
+ // https://akiba-souken.k-img.com/thumbnail/images/official/71/71cea5d83dfa537e053b8b8e31b98649.jpg?w=60&h=60
+ // https://akiba-souken.k-img.com/assets/images/official/71/71cea5d83dfa537e053b8b8e31b98649.jpg
+ return src
+ .replace(/\/thumbnail\/+images\/+/, "/assets/images/")
+ .replace(/(\/images\/+[^/]+\/+(?:(?:[0-9]{3}\/+){2}|[0-9a-f]{2}\/+))(?:t[0-9]+_)?([^/]+?)(?:[?#].*)?$/, "$1$2");
}
if (domain === "image.yes24.com") {
@@ -18841,6 +18846,8 @@ var $$IMU_EXPORT$$;
src.indexOf("/is/image/") >= 0 ||
// https://c.shld.net/rpx/i/s/i/spin/image/spin_prod_944500112?hei=185&wid=185&op_sharpen=1&qlt=85
// https://c.shld.net/rpx/i/s/i/spin/image/spin_prod_944500112?scl=1&fmt=png-alpha
+ // http://c.shld.net/rpx/i/s/pi/mp/10143589/prod_17215362615?src=http%3A%2F%2Fprodimage.images-bn.com%2Fpimages%2F9780739052204.jpg&d=31514ed0ddc4e4d8bba1651321ad7287b49da72f
+ // http://prodimage.images-bn.com/pimages/9780739052204.jpg
domain === "c.shld.net") {
// https://dyson-h.assetsadobe2.com/is/image//content/dam/dyson/products/hair-care/dyson-supersonic/customisation/personal-care-dyson-supersonic-customisation-homepage.jpg?scl=1
// https://dyson-h.assetsadobe2.com/is/image//content/dam/dyson/icons/owner-footer/register-my-machine.png?scl=1&fmt=png-alpha
@@ -18849,6 +18856,11 @@ var $$IMU_EXPORT$$;
// https://airbus-h.assetsadobe2.com/is/image/content/dam/products-and-solutions/commercial-aircraft/beluga/belugaxl/BelugaXL.jpg?wid=1920&fit=fit,1&qlt=85,0
// https://airbus-h.assetsadobe2.com/is/image/content/dam/products-and-solutions/commercial-aircraft/beluga/belugaxl/BelugaXL.jpg -- much smaller (300x203)
// https://airbus-h.assetsadobe2.com/is/image/content/dam/products-and-solutions/commercial-aircraft/beluga/belugaxl/BelugaXL.jpg?scl=1
+ match = src.match(/\/i\/s\/.*\?(?:.*&)?src=(https?%3A.*?)(?:&.*)?$/);
+ if (match) {
+ return decodeURIComponent(match[1]);
+ }
+
match = src.match(/\/is\/image\/+.*\?(?:.*?&)?src=is{(.*?)}/);
if (match) {
return src.replace(/\/is\/image\/.*/, "/is/image/" + decodeURIComponent(match[1]));
@@ -48740,6 +48752,17 @@ var $$IMU_EXPORT$$;
return src.replace(/(\/fast_photo\.php\?)(.*&)?type=thumbnail/, "$1$2type=photo");
}
+ if (domain === "prodimage.images-bn.com") {
+ // http://prodimage.images-bn.com/pimages/9780739052204.jpg
+ return {
+ url: src,
+ headers: {
+ Referer: ""
+ },
+ can_head: false // doesn't return errors
+ }
+ }
+
| 7 |
diff --git a/includes/Core/User_Input/User_Input.php b/includes/Core/User_Input/User_Input.php @@ -57,12 +57,12 @@ class User_Input {
protected $user_input_user_settings;
/**
- * User Input properties.
+ * User Input questions.
*
* @since n.e.x.t
* @var array|ArrayAccess
*/
- private static $properties = array(
+ private static $questions = array(
'purpose' => array(
'scope' => 'site',
),
@@ -159,8 +159,8 @@ class User_Input {
'settings' => array(
'type' => 'object',
'required' => true,
- 'properties' => array_fill_keys(
- array_keys( static::$properties ),
+ 'questions' => array_fill_keys(
+ array_keys( static::$questions ),
array(
'type' => 'array',
'items' => array( 'type' => 'string' ),
@@ -176,17 +176,6 @@ class User_Input {
);
}
- /**
- * Gets the set of user input properties.
- *
- * @since n.e.x.t
- *
- * @return array The user input properties.
- */
- public static function get_properties() {
- return static::$properties;
- }
-
/**
* Gets user input settings.
*
@@ -200,19 +189,19 @@ class User_Input {
'user' => $this->user_input_user_settings->get(),
);
- $properties = static::$properties;
+ $questions = static::$questions;
$settings = array_merge( $data['site'], $data['user'] );
// If there are no settings, return default empty values.
if ( empty( $settings ) ) {
array_walk(
- $properties,
- function ( &$property ) {
- $property['values'] = array();
+ $questions,
+ function ( &$question ) {
+ $question['values'] = array();
}
);
- return $properties;
+ return $questions;
}
$user_id = get_current_user_id();
@@ -236,10 +225,10 @@ class User_Input {
}
// If there are un-answered questions, return default empty values for them.
- foreach ( $properties as $property_key => $property_value ) {
- if ( ! isset( $settings[ $property_key ] ) ) {
- $settings[ $property_key ] = $property_value;
- $settings[ $property_key ]['values'] = array();
+ foreach ( $questions as $question_key => $question_value ) {
+ if ( ! isset( $settings[ $question_key ] ) ) {
+ $settings[ $question_key ] = $question_value;
+ $settings[ $question_key ]['values'] = array();
}
}
@@ -282,14 +271,14 @@ class User_Input {
* @return array|WP_Error User input settings.
*/
public function set_settings( $settings ) {
- $properties = static::$properties;
+ $questions = static::$questions;
$site_settings = array();
$user_settings = array();
foreach ( $settings as $setting_key => $answers ) {
$setting_data = array();
$setting_data['values'] = $answers;
- $setting_data['scope'] = $properties[ $setting_key ]['scope'];
+ $setting_data['scope'] = $questions[ $setting_key ]['scope'];
if ( 'site' === $setting_data['scope'] ) {
$setting_data['answeredBy'] = get_current_user_id();
@@ -335,10 +324,10 @@ class User_Input {
return $setting->get();
}
- $properties = array_filter(
- static::get_properties(),
- function ( $property ) use ( $scope ) {
- return $scope === $property['scope'];
+ $questions = array_filter(
+ static::$questions,
+ function ( $question ) use ( $scope ) {
+ return $scope === $question['scope'];
}
);
@@ -347,7 +336,7 @@ class User_Input {
foreach ( $settings as $setting_key => $setting_values ) {
// Ensure all the data is valid.
if (
- ! in_array( $setting_key, array_keys( $properties ), true ) ||
+ ! in_array( $setting_key, array_keys( $questions ), true ) ||
! is_array( $setting_values ) ||
! isset( $setting_values['scope'] ) ||
! isset( $setting_values['values'] ) ||
| 10 |
diff --git a/lib/node_modules/@stdlib/ndarray/ctor/examples/c/example.c b/lib/node_modules/@stdlib/ndarray/ctor/examples/c/example.c @@ -36,71 +36,69 @@ void print_ndarray_contents( const struct ndarray *x ) {
printf( "Unable to resolve data pointer.\n" );
exit( 1 );
}
- printf( "data[%lld] = %f\n", i, *(double *)ptr );
+ printf( "data[%lld] = %f\n", i, *(double *)ptr ); // WARNING: assumes `x->dtype` is float64
}
}
int main() {
// Manually create an ndarray (WARNING: this is for illustration purposes only, as the fields of an ndarray are subject to change; for ABI compatibility, use utility functions for accessing ndarray data)...
- struct ndarray *x = malloc( sizeof( struct ndarray ) );
- if ( x == NULL ) {
+ struct ndarray *x1 = malloc( sizeof( struct ndarray ) );
+ if ( x1 == NULL ) {
printf( "Error allocating memory.\n" );
exit( 1 );
}
// Specify the underlying data type:
enum STDLIB_NDARRAY_DTYPE dtype = STDLIB_NDARRAY_FLOAT64;
- x->dtype = dtype;
+ x1->dtype = dtype;
// Create an underlying byte array:
uint8_t buffer[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
- x->data = buffer;
+ x1->data = buffer;
// Explicitly specify the number of bytes per element:
- x->BYTES_PER_ELEMENT = STDLIB_NDARRAY_FLOAT64_BYTES_PER_ELEMENT;
+ x1->BYTES_PER_ELEMENT = STDLIB_NDARRAY_FLOAT64_BYTES_PER_ELEMENT;
// Specify the array shape:
int64_t shape[] = { 3 }; // vector consisting of 3 doubles
- x->shape = shape;
+ x1->shape = shape;
// Specify the array strides:
- int64_t strides[] = { x->BYTES_PER_ELEMENT };
- x->strides = strides;
+ int64_t strides[] = { x1->BYTES_PER_ELEMENT };
+ x1->strides = strides;
// Specify the byte offset:
- x->offset = 0;
+ x1->offset = 0;
// Specify the array order (note: this does not matter for a 1-dimensional array):
enum STDLIB_NDARRAY_ORDER order = STDLIB_NDARRAY_ROW_MAJOR;
- x->order = order;
+ x1->order = order;
// Specify the index mode:
enum STDLIB_NDARRAY_INDEX_MODE imode = STDLIB_NDARRAY_INDEX_ERROR;
+ x1->imode = imode;
// Specify the subscript index modes:
enum STDLIB_NDARRAY_INDEX_MODE submodes[] = { imode };
- x->submodes = submodes;
- x->nsubmodes = 1;
+ x1->submodes = submodes;
+ x1->nsubmodes = 1;
// Explicitly specify the number of array dimensions:
- x->ndims = 1; // vector
+ x1->ndims = 1; // vector
// Explicitly specify the number of array elements (doubles):
- x->length = x->shape[ 0 ];
+ x1->length = x1->shape[ 0 ];
// Explicitly specify the number of bytes:
- x->byteLength = (x->length) * (x->BYTES_PER_ELEMENT);
+ x1->byteLength = (x1->length) * (x1->BYTES_PER_ELEMENT);
// Explicitly set the array flags:
- x->flags = stdlib_ndarray_flags( x );
+ x1->flags = stdlib_ndarray_flags( x1 );
- printf( "dtype = %u\n", stdlib_ndarray_dtype( x ) );
- printf( "length = %lld\n", stdlib_ndarray_length( x ) );
- printf( "byteLength = %lld\n", stdlib_ndarray_bytelength( x ) );
- printf( "ltr = %u\n", stdlib_ndarray_dtype_char( stdlib_ndarray_dtype( x ) ) );
-
- // Free the allocated memory:
- free( x );
+ printf( "dtype = %u\n", stdlib_ndarray_dtype( x1 ) );
+ printf( "length = %lld\n", stdlib_ndarray_length( x1 ) );
+ printf( "byteLength = %lld\n", stdlib_ndarray_bytelength( x1 ) );
+ printf( "ltr = %u\n", stdlib_ndarray_dtype_char( stdlib_ndarray_dtype( x1 ) ) );
// Use the function interface to create an ndarray (NOTE: for future ABI compatibility, using the following function interface should be preferred)...
struct ndarray *x2 = stdlib_ndarray_constructor( dtype, buffer, 1, shape, strides, 0, order, imode, 1, submodes );
@@ -196,5 +194,6 @@ int main() {
print_ndarray_contents( x2 );
// Free the allocated memory:
+ free( x1 );
free( x2 );
}
| 10 |
diff --git a/src/pages/settings/Profile/LoginField.js b/src/pages/settings/Profile/LoginField.js @@ -79,25 +79,17 @@ class LoginField extends Component {
return (
<View style={[styles.ph8]}>
- {!this.props.login.partnerUserID ? (
- <View style={[styles.mln8, styles.mrn8]}>
- <MenuItemWithTopDescription
- key={`common.add.${this.props.type}`}
- description={this.props.label}
- onPress={() => Navigation.navigate(ROUTES.getSettingsAddLoginRoute(this.props.type))}
- shouldShowRightIcon
- />
- </View>
- ) : (
<View>
- {this.props.login.validatedDate ? (
+ {!this.props.login.partnerUserID || this.props.login.validatedDate ? (
<View style={[styles.mln8, styles.mrn8]}>
<MenuItemWithTopDescription
title={this.props.type === CONST.LOGIN_TYPE.PHONE
? this.props.toLocalPhone(this.props.login.partnerUserID)
: this.props.login.partnerUserID}
description={this.props.label}
- interactive={false}
+ interactive={Boolean(!this.props.login.partnerUserID)}
+ onPress={this.props.login.partnerUserID ? () => { } : () => Navigation.navigate(ROUTES.getSettingsAddLoginRoute(this.props.type))}
+ shouldShowRightIcon={Boolean(!this.props.login.partnerUserID)}
/>
</View>
) : (
@@ -125,7 +117,6 @@ class LoginField extends Component {
</View>
)}
</View>
- )}
{note && (
<Text style={[styles.textLabel, styles.colorMuted]}>
{note}
| 7 |
diff --git a/editor.js b/editor.js @@ -2325,6 +2325,11 @@ shilo.vrm`,
u: `https://webaverse.github.io/assets/
sacks3.vrm`,
},
+ {
+ position: new THREE.Vector3(-2, 0, -6),
+ quaternion: new THREE.Quaternion(),
+ u: `https://avaer.github.io/dragon-pet/manifest.json`,
+ },
/* {
position: new THREE.Vector3(-3, 1.5, -1),
quaternion: new THREE.Quaternion(),
| 0 |
diff --git a/lib/webpack.web.js b/lib/webpack.web.js @@ -13,7 +13,6 @@ function webpack(options, callback) {
new WebpackOptionsDefaulter().process(options);
const compiler = new Compiler();
- compiler.options = options;
compiler.options = new WebpackOptionsApply().process(options, compiler);
new WebEnvironmentPlugin(options.inputFileSystem, options.outputFileSystem).apply(compiler);
if(callback) {
| 2 |
diff --git a/token-metadata/0x5150956E082C748Ca837a5dFa0a7C10CA4697f9c/metadata.json b/token-metadata/0x5150956E082C748Ca837a5dFa0a7C10CA4697f9c/metadata.json "symbol": "ZDEX",
"address": "0x5150956E082C748Ca837a5dFa0a7C10CA4697f9c",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/token-metadata/0xD9A947789974bAD9BE77E45C2b327174A9c59D71/metadata.json b/token-metadata/0xD9A947789974bAD9BE77E45C2b327174A9c59D71/metadata.json "symbol": "YSR",
"address": "0xD9A947789974bAD9BE77E45C2b327174A9c59D71",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/articles/api-auth/tutorials/implicit-grant.md b/articles/api-auth/tutorials/implicit-grant.md @@ -41,7 +41,11 @@ Where:
* `client_id`: Your application's Client ID. You can find this value at your [Client's Settings](${manage_url}/#/clients/${account.clientId}/settings).
-* `redirect_uri`: The URL to which the Auth0 will redirect the user's browser after authorization has been granted by the user. The `access_token` (and optionally an `id_token`) will be available in the hash fragment of this URL. This URL must be specified as a valid callback URL under your [Client's Settings](${manage_url}/#/clients/${account.clientId}/settings). **Per the [OAuth 2.0 Specification](https://tools.ietf.org/html/rfc6749#section-3.1.2), Auth0 removes everything after the hash and does *not* honor any fragments.**
+* `redirect_uri`: The URL to which the Auth0 will redirect the user's browser after authorization has been granted by the user. The `access_token` (and optionally an `id_token`) will be available in the hash fragment of this URL. This URL must be specified as a valid callback URL under your [Client's Settings](${manage_url}/#/clients/${account.clientId}/settings).
+
+ ::: warning
+ Per the [OAuth 2.0 Specification](https://tools.ietf.org/html/rfc6749#section-3.1.2), Auth0 removes everything after the hash and does *not* honor any fragments.
+ :::
* `state`: An opaque value the client adds to the initial request that Auth0 includes when redirecting back to the client. This value must be used by the client to prevent CSRF attacks, [click here to learn more](/protocols/oauth-state).
| 0 |
diff --git a/config/sidebar.yml b/config/sidebar.yml @@ -305,10 +305,17 @@ articles:
- title: "Addons/Third-Party Applications"
url: "/addons"
+ children:
+
+ - title: "Overview"
+ url: "/addons"
- title: "Support"
url: "/support"
children:
+ - title: "Support Options"
+ url: "/support"
+
- title: "Support Matrix"
url: "/support/matrix"
| 0 |
diff --git a/fluent-langneg/README.md b/fluent-langneg/README.md Project Fluent, a localization framework designed to unleash
the expressive power of the natural language.
+It's main function is to provide functionality around the
+[Intl.Locale][] API with a focus
+on language negotiation, matching and selection.
+
+
## Installation
`fluent-langneg` can be used both on the client-side and the server-side.
@@ -84,17 +89,6 @@ in case the requested locale is too generic.
An example of that scenario is when the user requests `en` locale, and
the application supportes `en-GB` and `en-US`.
-Unicode CLDR maintains a complete list of likely subtags that the
-user can load into `fluent-langneg` to replace the minimal version.
-
-```javascript
-let data = require('cldr-core/supplemental/likelySubtags.json');
-
-let supported = negotiateLanguages(requested, available, {
- likelySubtags: data.supplemental.likelySubtags
-});
-```
-
## Learn more
Find out more about Project Fluent at [projectfluent.org][], including
@@ -104,3 +98,4 @@ implementations, and information about how to get involved.
[projectfluent.org]: http://projectfluent.org
[FTL]: http://projectfluent.org/fluent/guide/
+[Intl.Locale]: https://github.com/tc39/proposal-intl-locale
| 7 |
diff --git a/token-metadata/0x1Efb2286BF89F01488C6B2a22B2556C0f45e972b/metadata.json b/token-metadata/0x1Efb2286BF89F01488C6B2a22B2556C0f45e972b/metadata.json "symbol": "MYFI",
"address": "0x1Efb2286BF89F01488C6B2a22B2556C0f45e972b",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/articles/api-auth/dynamic-client-registration.md b/articles/api-auth/dynamic-client-registration.md @@ -20,6 +20,8 @@ Third party clients have the following characteristics:
- To authenticate users using [Lock](/libraries/lock), you will have to use a version greater than `10.7`.
+ - [PSaaS Appliance](/appliance) users must use `https://{config.auth0Domain}/` as the value for [the `configurationBaseUrl` option](https://github.com/auth0/lock#other-options).
+
- They cannot skip user consent when consuming APIs. This is for security purposes, as anyone can create a client, but each client relies on the final user to provide consent.
- They cannot use [ID tokens](/tokens/id-token) to invoke [Management APIv2](/api/management/v2) endpoints. Instead, they should get a Management APIv2 Token (see the *How to get a Management APIv2 Token* panel for details). Note that the client should be granted the `current_user_*` scopes, as required by each endpoint.
| 0 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.