code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/lambda/fulfillment/lib/middleware/lexRouter.js b/lambda/fulfillment/lib/middleware/lexRouter.js @@ -196,10 +196,6 @@ async function processResponse(req, res, hook, msg) {
res.card = {
"send": true,
"title": "Info",
- "text": "",
- "url": "",
- "subTitle": "",
- "imageUrl": "",
"buttons": [
{
"text": "Yes",
| 2 |
diff --git a/src/plots/mapbox/layout_attributes.js b/src/plots/mapbox/layout_attributes.js @@ -39,7 +39,10 @@ var attrs = module.exports = overrideAll({
description: [
'Sets the mapbox access token to be used for this mapbox map.',
'Alternatively, the mapbox access token can be set in the',
- 'configuration options under `mapboxAccessToken`.'
+ 'configuration options under `mapboxAccessToken`.',
+ 'Note that accessToken are only required when `style`',
+ '(e.g with values :', constants.styleValuesMapbox.join(', '), ')',
+ 'and/or a layout layer references the Mapbox server.'
].join(' ')
},
style: {
@@ -48,12 +51,13 @@ var attrs = module.exports = overrideAll({
dflt: constants.styleValueDflt,
role: 'style',
description: [
- 'Sets the Mapbox base map style.',
+ 'Sets the base map style.',
'Base map styles are rendered below all traces and layout layers.',
- 'Either input one of the default Mapbox style names:', constants.styleValuesMapbox, '.',
+ 'Base map styles can include multiple layers.',
+ 'Either input one of the default Mapbox style names: ', constants.styleValuesMapbox.join(', '), '.',
'Note that to use these, a Mapbox access token must be set either in the `accesstoken` attribute',
'or in the `mapboxAccessToken` config option.',
- 'From OpenStreetMap raster tiles, use:', constants.styleValueOSM, '.',
+ 'For OpenStreetMap raster tiles, use: ', constants.styleValueOSM, '.',
'No access token is required to render the', constants.styleValueOSM, 'style.',
'One can also set `style` as a URL to a Mapbox custom style, e.g. created in Mapbox Studio.',
'Finally, one can set `style` as a Mapbox style JSON, see',
@@ -123,7 +127,7 @@ var attrs = module.exports = overrideAll({
'Sets the source data for this layer (mapbox.layer.source).',
'Source can be either a URL,',
'a geojson object (with `sourcetype` set to *geojson*)',
- 'or an array of tile URLS (with `sourcetype` set to *vector*).'
+ 'or an array of URLs (with `sourcetype` set to *vector* or *raster*).'
].join(' ')
},
@@ -144,9 +148,11 @@ var attrs = module.exports = overrideAll({
role: 'info',
description: [
'Sets the layer type (mapbox.layer.type).',
- 'Support for *raster*, *background* types is coming soon.',
- 'Note that *line* and *fill* are not compatible with Point',
- 'GeoJSON geometries.'
+ 'With `sourcetype` set to *geojson*, *circle*, *line*, *fill* and *symbol* are available',
+ 'but note that *line* and *fill* are not compatible with Point',
+ 'GeoJSON geometries.',
+ 'With `sourcetype` set to *vector*, *circle*, *line*, *fill* and *symbol* are available.',
+ 'With `sourcetype` set to *raster* or `*image*`, only the *raster* value is available.'
].join(' ')
},
| 7 |
diff --git a/app/shared/actions/accounts.js b/app/shared/actions/accounts.js @@ -282,9 +282,11 @@ export function getCurrencyBalance(account, requestedTokens = false) {
} = getState();
if (account && (settings.node || settings.node.length !== 0)) {
const { customTokens } = settings;
+ let newCustomTokens = customTokens;
+ newCustomTokens = newCustomTokens.filter((token) => (connection.chainKey === token.split(':')[0]));
let selectedTokens = [`${connection.chainKey}:eosio.token:${connection.chainSymbol || 'EOS'}`];
- if (customTokens && customTokens.length > 0) {
- selectedTokens = [...customTokens, ...selectedTokens];
+ if (newCustomTokens && newCustomTokens.length > 0) {
+ selectedTokens = [...newCustomTokens, ...selectedTokens];
}
// if specific tokens are requested, use them
if (requestedTokens) {
| 7 |
diff --git a/app/controllers/carto/api/connectors_controller.rb b/app/controllers/carto/api/connectors_controller.rb @@ -145,7 +145,7 @@ module Carto
raise Carto::Connector::InvalidParametersError.new(message: "Provider doesn't match")
end
parameters[:provider] = provider_id
- parameters.merge! request_params.except(:provider_id)
+ parameters.merge! request_params.except(:provider_id, :format, :controller, :action)
end
def check_availability
| 2 |
diff --git a/lambda/genesys/flowsv2/QnABot-CallFlow.yaml b/lambda/genesys/flowsv2/QnABot-CallFlow.yaml inboundCall:
- name: QnABotCallFlow
+ name: QnABot
division: Home
startUpRef: "/inboundCall/menus/menu[Main Menu_10]"
defaultLanguage: en-us
@@ -13,6 +13,10 @@ inboundCall:
initialGreeting:
tts: Welcome.
variables:
+ - stringVariable:
+ name: Flow.appContext
+ initialValue:
+ noValue: true
- stringVariable:
name: Flow.connect_nextPrompt
initialValue:
@@ -37,10 +41,6 @@ inboundCall:
name: Flow.nextAction
initialValue:
noValue: true
- - stringVariable:
- name: Flow.prompt
- initialValue:
- noValue: true
- stringVariable:
name: Flow.qnabot_gotanswer
initialValue:
@@ -120,14 +120,14 @@ inboundCall:
seconds: 20
minConfidenceLevel:
lit: 50
- asrCompanyDir: none
+ asrCompanyDir: startUpObject
asrEnabledOnFlow: true
menus:
- menu:
name: Main Menu
refId: Main Menu_10
audio:
- tts: You are at the Main Menu, press 1 to go to the Q and A Bot demo, or press 9 to disconnect
+ tts: You are at the Main Menu, press 1 or say q and a bot to go to the Q and A Bot demo, or press 9 to disconnect
settingsMenu:
extensionDialingMaxDelay:
noValue: true
@@ -194,10 +194,6 @@ inboundCall:
name:
lit: qnabot_gotanswer
variable: Flow.qnabot_gotanswer
- - outputSessionVariable:
- name:
- lit: connect_nextPrompt
- variable: Flow.prompt
- outputSessionVariable:
name:
lit: nextAction
@@ -206,6 +202,10 @@ inboundCall:
name:
lit: connect_nextPrompt
variable: Flow.connect_nextPrompt
+ - outputSessionVariable:
+ name:
+ lit: appContext
+ variable: Flow.appContext
sessionVariables:
- sessionVariable:
name:
@@ -219,14 +219,29 @@ inboundCall:
exp: Flow.qnabotcontext
- sessionVariable:
name:
- lit: connect_nextPrompt
+ lit: qnabot_gotanswer
value:
- exp: Flow.prompt
+ exp: Flow.qnabot_gotanswer
- sessionVariable:
name:
lit: connect_nextPrompt
value:
exp: Flow.connect_nextPrompt
+ - sessionVariable:
+ name:
+ lit: nextAction
+ value:
+ exp: Flow.nextAction
+ - sessionVariable:
+ name:
+ lit: appContext
+ value:
+ exp: Flow.appContext
+ - sessionVariable:
+ name:
+ lit: qnabotUserId
+ value:
+ exp: ToString(ToPhoneNumber(Call.Ani).subscriberNumber)
lexBot:
QNABOT_REGION:
QNABOT_NAME:
@@ -281,6 +296,10 @@ inboundCall:
tts: This is embarrassing. I'm sorry I don't know the answer to your questions. I'm still learning, so check back tomorrow.
- disconnect:
name: Disconnect
+ speechRecTerms:
+ en-us:
+ terms:
+ - q and a bot
defaultChildMenuRef: "./choices/menuTask[QnABot Flow_28]"
tasks:
- task:
@@ -331,36 +350,15 @@ inboundCall:
- case:
value:
exp: Flow.nextAction=="AGENT"
- actions:
- - transferToAcd:
- name: Transfer to ACD
- targetQueue:
- lit:
- name: Default Inbound
- preTransferAudio:
- tts: Transferring to Agent
- failureTransferAudio:
- tts: Failed to transfer to agent.
- priority:
- lit: 2
- preferredAgents:
- noValue: true
- languageSkill:
- noValue: true
- failureOutputs:
- errorType:
- noValue: true
- errorMessage:
- noValue: true
- outputs:
- failure:
actions:
- playAudio:
name: Play Audio
audio:
- tts: There has been an issue transferring. Please call us again.
- - disconnect:
- name: Disconnect
+ tts: This is where you would be transferred to a queue.
+ - playAudio:
+ name: Play Audio
+ audio:
+ exp: AudioPlaybackOptions(ToAudioTTS(Flow.connect_nextPrompt), true)
- case:
value:
exp: Flow.nextAction=="END"
| 3 |
diff --git a/src/styles/main.scss b/src/styles/main.scss @import "vendors/font-awesome/font-awesome";
-@import "vendors/codemirror";
@import "normalize";
@import "variables";
@import "mixins";
@import "datagui";
@import "breadcrumbs";
@import "editor";
+@import "mdeditor";
@import "button";
@import "staticfiles";
| 7 |
diff --git a/test/jasmine/tests/modebar_test.js b/test/jasmine/tests/modebar_test.js @@ -1435,7 +1435,7 @@ describe('ModeBar', function() {
});
});
- describe('modebar styling', function() {
+ describe('modebar relayout', function() {
var gd;
var colors = ['rgba(128, 128, 128, 0.7)', 'rgba(255, 0, 128, 0.2)'];
var targetBtn = 'pan2d';
@@ -1559,6 +1559,81 @@ describe('ModeBar', function() {
})
.then(done, done.fail);
});
+
+ it('add and remove predefined shape drawing and hover buttons via layout.modebar.buttonstoadd', function(done) {
+ function countButtons() {
+ var modeBarEl = gd._fullLayout._modeBar.element;
+ return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
+ }
+
+ var initial = 10;
+ Plotly.newPlot(gd, [{y: [1, 2]}], {})
+ .then(function() {
+ expect(countButtons()).toBe(initial);
+
+ return Plotly.relayout(gd, 'modebar.buttonstoadd', [
+ 'drawline',
+ 'drawopenpath',
+ 'drawclosedpath',
+ 'drawcircle',
+ 'drawrect',
+ 'eraseshape'
+ ].join('+'));
+ })
+ .then(function() {
+ expect(countButtons()).toBe(initial + 6);
+
+ return Plotly.relayout(gd, 'modebar.buttonstoadd', '');
+ })
+ .then(function() {
+ expect(countButtons()).toBe(initial);
+
+ return Plotly.relayout(gd, 'modebar.buttonstoadd', [
+ 'hovercompare',
+ 'hoverclosest',
+ 'togglespikelines'
+ ].join('+'));
+ })
+ .then(function() {
+ expect(countButtons()).toBe(initial + 3);
+
+ return Plotly.relayout(gd, 'modebar.buttonstoadd', '');
+ })
+ .then(function() {
+ expect(countButtons()).toBe(initial);
+
+ return Plotly.relayout(gd, 'modebar.buttonstoadd', [
+ 'v1hovermode',
+ 'togglespikelines'
+ ].join('+'));
+ })
+ .then(function() {
+ expect(countButtons()).toBe(initial + 3);
+
+ return Plotly.relayout(gd, 'modebar.buttonstoadd', [
+ 'v1hovermode',
+ 'togglespikelines',
+ 'togglehover',
+ 'hovercompare',
+ 'hoverclosest',
+ 'eraseshape',
+ 'eraseshape',
+ 'eraseshape'
+ ].join('+'));
+ })
+ .then(function() {
+ expect(countButtons()).toBe(initial + 4, 'skip duplicates');
+
+ return Plotly.relayout(gd, 'modebar.buttonstoadd', [
+ 'drawline',
+ 'invalid'
+ ].join('+'));
+ })
+ .then(function() {
+ expect(countButtons()).toBe(initial + 1, 'skip invalid');
+ })
+ .then(done, done.fail);
+ });
});
describe('modebar html', function() {
| 0 |
diff --git a/contribs/gmf/examples/editfeature.js b/contribs/gmf/examples/editfeature.js @@ -17,7 +17,7 @@ import olFeature from 'ol/Feature.js';
import olMap from 'ol/Map.js';
import olView from 'ol/View.js';
import * as olExtent from 'ol/extent.js';
-import olGeomPoint from 'ol/geom/Point.js';
+import olGeomMultiPoint from 'ol/geom/MultiPoint.js';
import olLayerTile from 'ol/layer/Tile.js';
import olLayerImage from 'ol/layer/Image.js';
import olSourceOSM from 'ol/source/OSM.js';
@@ -217,7 +217,7 @@ exports.MainController.prototype.insertFeature = function() {
];
const feature = new olFeature({
- 'geometry': new olGeomPoint(coordinate),
+ 'geometry': new olGeomMultiPoint([coordinate]),
'name': 'New point'
});
| 4 |
diff --git a/src/browser/nw_chrome_browser_hooks.cc b/src/browser/nw_chrome_browser_hooks.cc #include "extensions/common/extension.h"
#include "net/cert/x509_certificate.h"
+#include "net/cert/test_root_certs.h"
#include "net/url_request/url_request_context.h"
#include "sql/connection.h"
#include "sql/meta_table.h"
@@ -75,6 +76,7 @@ gfx::Image g_app_icon;
int g_cdt_process_id = -1;
std::string g_extension_id;
bool g_reloading_app = false;
+net::CertificateList trust_anchors;
#if defined(OS_WIN)
base::win::ScopedHICON g_window_hicon;
@@ -338,7 +340,6 @@ void MainPartsPreMainMessageLoopRunHook() {
nw::Package* package = nw::package();
const base::ListValue *additional_trust_anchors = NULL;
if (package->root()->GetList("additional_trust_anchors", &additional_trust_anchors)) {
- net::CertificateList trust_anchors;
for (size_t i = 0; i<additional_trust_anchors->GetSize(); i++) {
std::string certificate_string;
if (!additional_trust_anchors->GetString(i, &certificate_string)) {
@@ -360,7 +361,13 @@ void MainPartsPreMainMessageLoopRunHook() {
trust_anchors.insert(trust_anchors.end(), loaded.begin(), loaded.end());
}
if (!trust_anchors.empty()) {
+#if !defined(OS_MACOSX)
SetTrustAnchors(trust_anchors);
+#else
+ net::TestRootCerts* certs = net::TestRootCerts::GetInstance();
+ for (size_t i = 0; i < trust_anchors.size(); i++)
+ certs->Add(trust_anchors[i].get());
+#endif
}
}
}
| 4 |
diff --git a/CommentFlagsHelper.user.js b/CommentFlagsHelper.user.js // @description Always expand comments (with deleted) and highlight expanded flagged comments, Highlight common chatty and rude keywords
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 4.3
+// @version 4.3.1
//
// @include https://*stackoverflow.com/admin/dashboard*
// @include https://*serverfault.com/admin/dashboard*
$('.js-flagged-comment .js-dismiss-flags').text('decline').append(`<span class="cancel-delete-comment-flag" title="dismiss flags AND delete comment">+delete</span>`);
// If there are lots of comment flags
- if($('.js-flagged-comments').length > 3) {
+ if($('.js-comments-container').length > 3) {
const actionBtns = $('<div id="actionBtns"></div>');
const thisYear = new Date().getFullYear();
$('.js-comment-link .relativetime').filter((i, el) => Number(el.title.substr(0,4)) < thisYear).addClass('old-comment');
+ // Shorten additional actions descriptions after comment flag
+ $('.js-flag-text').find('span:last:not([title])').html(function(i, v) {
+ return v.replace(/(added (\d+) comments?)/, '<span title="$1">$2C</span>').replace(/(Vote Up)/gi, '<span title="$1">VU</span>').replace(/(Vote Down)/gi, '<span title="$1">VD</span>');
+ });
+
// On delete/dismiss comment action
$('.js-comment-delete, .js-dismiss-flags', '.js-flagged-comment').on('click', function() {
@@ -654,8 +659,11 @@ table.flagged-posts tr.js-flagged-post:first-child > td {
color: coral;
}
-#actionBtns button {
+#actionBtns {
margin-top: 10px;
+}
+#actionBtns button {
+ margin-bottom: 10px;
margin-right: 10px;
}
@@ -669,6 +677,9 @@ table.flagged-posts tr.js-flagged-post:first-child > td {
margin: 0 !important;
background: #f6f6f6;
}
+.js-mod-history {
+ padding: 5px 0 5px 10px;
+}
.visited-post {
opacity: 0.7;
}
@@ -684,6 +695,9 @@ table.flagged-posts tr.js-flagged-post:first-child > td {
.js-post-flag-group > .grid--cell > div {
padding: 2px 0;
}
+.js-admin-dashboard span[title]:hover {
+ cursor: help !important;
+}
/* Other new mod interface stuff */
.comment-form .grid--cell.ta-right.py8.fl-shrink0 {
| 7 |
diff --git a/edit.js b/edit.js @@ -375,6 +375,72 @@ scene.add(floorMesh);
} */
})();
+
+const geometry = new THREE.CircleBufferGeometry(1, 32)
+ .applyMatrix4(new THREE.Matrix4().makeScale(0.5, 1, 1));
+const material = new THREE.ShaderMaterial({
+ uniforms: {
+ // tex: {type: 't', value: texture, needsUpdate: true},
+ iTime: {value: 0, needsUpdate: true},
+ },
+ vertexShader: `\
+ // uniform float iTime;
+ varying vec2 uvs;
+ /* varying vec3 vNormal;
+ varying vec3 vWorldPosition; */
+ void main() {
+ uvs = uv;
+ gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
+ // vNormal = normal;
+ // vec4 worldPosition = modelMatrix * vec4( position, 1.0 );
+ /// vWorldPosition = worldPosition.xyz;
+ }
+ `,
+ fragmentShader: `\
+ #define PI 3.1415926535897932384626433832795
+
+ uniform float iTime;
+ // uniform sampler2D tex;
+ varying vec2 uvs;
+ /* arying vec3 vNormal;
+ varying vec3 vWorldPosition; */
+
+ const vec3 c = vec3(${new THREE.Color(0x1565c0).toArray().join(', ')});
+
+ void main() {
+ vec2 uv = uvs;
+ /* uv.x *= 1.7320508075688772;
+ uv *= 8.0;
+
+ vec3 direction = vWorldPosition - cameraPosition;
+ float d = dot(vNormal, normalize(direction));
+ float glow = d < 0.0 ? max(1. + d * 2., 0.) : 0.;
+
+ float animationFactor = (1.0 + sin((uvs.y*2. + iTime) * PI*2.))/2.;
+ float a = glow + (1.0 - texture2D(tex, uv).r) * (0.01 + pow(animationFactor, 10.0) * 0.5); */
+
+ const vec3 c = vec3(${new THREE.Color(0x29b6f6).toArray().join(', ')});
+
+ vec2 distanceVector = abs(uv - 0.5)*2.;
+ float a = pow(length(distanceVector), 5.);
+ vec2 normalizedDistanceVector = normalize(distanceVector);
+ float angle = atan(normalizedDistanceVector.y, normalizedDistanceVector.x) + iTime*PI*2.;
+ float skirt = pow(sin(angle*50.) * cos(angle*20.), 5.) * 0.2;
+ a += skirt;
+ // if (length(f) > 0.8) {
+ gl_FragColor = vec4(c, a);
+ /* } else {
+ discard;
+ } */
+ }
+ `,
+ side: THREE.DoubleSide,
+ transparent: true,
+});
+const portalMesh = new THREE.Mesh(geometry, material);
+portalMesh.position.y = 1;
+scene.add(portalMesh);
+
/* const redBuildMeshMaterial = new THREE.ShaderMaterial({
vertexShader: `
void main() {
@@ -517,6 +583,10 @@ function animate(timestamp, frame) {
const timeDiff = Math.min((timestamp - lastTimestamp) / 1000, 0.05);
lastTimestamp = timestamp;
+ const portalRate = 30000;
+ portalMesh.material.uniforms.iTime.value = (Date.now()/portalRate) % 1;
+ portalMesh.material.uniforms.iTime.needsUpdate = true;
+
const now = Date.now();
if (skybox) {
for (const material of geometryManager.currentChunkMesh.material) {
| 0 |
diff --git a/src/Views/tickets/index.blade.php b/src/Views/tickets/index.blade.php <div class="panel panel-default">
<div class="panel-heading">
- @if( isset($counts['owner']))
- <div class="pull-left">Owner
- <a href="{{ session('ticketit_filter_owner')==''?'#':action('\Kordy\Ticketit\Controllers\TicketsController@index').'/filter/owner/remove' }}" class="btn {{ session('ticketit_filter_owner')==''?'btn-warning':'btn-default' }} btn-sm">All <span class="badge">{{ $counts['owner']['all'] }}</span></a>
- <a href="{{ session('ticketit_filter_owner')=='me'?'#':action('\Kordy\Ticketit\Controllers\TicketsController@index').'/filter/owner/me' }}" class="btn {{ session('ticketit_filter_owner')=='me'?'btn-warning':'btn-default' }} btn-sm">Me <span class="badge">{{ $counts['owner']['me'] }}</span></a>
- </div>
- @endif
- <h2><?php
-
-
+ <?php
$cons='ticketit::lang.index';
$vars=array();
$cons.="-in";
$vars['category']=$category_name;
}
- echo trans($cons,$vars);?>
+ ?>
+
+ <div class="row">
+ <div class="col-sm-2">
+ @if( isset($counts['owner']))
+ <div class="pull-left">Owner
+ <a href="{{ session('ticketit_filter_owner')==''?'#':action('\Kordy\Ticketit\Controllers\TicketsController@index').'/filter/owner/remove' }}" class="btn {{ session('ticketit_filter_owner')==''?'btn-warning':'btn-default' }} btn-sm">All <span class="badge">{{ $counts['owner']['all'] }}</span></a>
+ <a href="{{ session('ticketit_filter_owner')=='me'?'#':action('\Kordy\Ticketit\Controllers\TicketsController@index').'/filter/owner/me' }}" class="btn {{ session('ticketit_filter_owner')=='me'?'btn-warning':'btn-default' }} btn-sm">Me <span class="badge">{{ $counts['owner']['me'] }}</span></a>
+ </div>
+ @endif
+ </div>
+ <div class="col-sm-8">
+ <h2 class="text-center" style="margin: 0em;">{{ trans($cons, $vars)}}</h2>
+ </div>
+ <div class="col-sm-2">
{!! link_to_route($setting->grab('main_route').'.create', trans('ticketit::lang.btn-create-new-ticket'), null, ['class' => 'btn btn-primary pull-right']) !!}
- </h2>
+ </div>
+ </div>
</div>
<div class="panel-body">
| 7 |
diff --git a/assets/js/components/DashboardNavigation.js b/assets/js/components/DashboardNavigation.js @@ -244,8 +244,6 @@ export default function DashboardNavigation() {
const throttledOnScroll = throttle( onScroll, 150 );
global.addEventListener( 'scroll', throttledOnScroll );
- throttledOnScroll( undefined );
-
return () => {
global.removeEventListener( 'scroll', throttledOnScroll );
};
@@ -259,6 +257,15 @@ export default function DashboardNavigation() {
setValue,
] );
+ useEffect( () => {
+ if ( ! global.location.hash ) {
+ setSelectedID( ANCHOR_ID_TRAFFIC );
+ setTimeout( () =>
+ global.history.replaceState( {}, '', `#${ ANCHOR_ID_TRAFFIC }` )
+ );
+ }
+ }, [] );
+
return (
<nav
className={ classnames(
| 12 |
diff --git a/server/preprocessing/other-scripts/openaire.R b/server/preprocessing/other-scripts/openaire.R @@ -185,6 +185,7 @@ fill_dois <- function(df) {
olog$debug("Time for filling missing DOIs")
olog$debug(system.time(cr_works(query=queries(titles), async=TRUE)))
}
+ tryCatch({
if (length(titles) > 1) {
response <- cr_works(query=queries(titles))
candidates <- lapply(response, get_doi_candidates)
@@ -197,6 +198,10 @@ fill_dois <- function(df) {
dois <- ""
}
df$doi[c(missing_doi_indices)] <- dois
+ }, error=function(err){
+ olog$error(paste("vis_id:", .GlobalEnv$VIS_ID, "DOI enrichment failed:", paste(err)))
+ }
+ )
return (df)
}
| 7 |
diff --git a/src/app.js b/src/app.js @@ -39,7 +39,7 @@ const v3_roadster = require('./routes/v3/roadster');
const v3_ships = require('./routes/v3/ships');
// Production read-only DB
-const url = process.env.MONGO_URL || 'mongodb+srv://public:[email protected]/spacex-api';
+const url = 'mongodb+srv://public:[email protected]/spacex-api';
const app = new Koa();
| 3 |
diff --git a/lib/model.js b/lib/model.js @@ -309,7 +309,7 @@ Model.prototype.$__handleSave = function(options, callback) {
callback(null, ret);
});
} else {
- this.constructor.exists({_id:this._id})
+ this.constructor.exists(this.$__where())
.then((documentExists)=>{
if (!documentExists) throw new DocumentNotFoundError(this.$__where(),this.constructor.modelName);
| 4 |
diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js @@ -276,7 +276,8 @@ function removeMembers(members, policyID) {
// Show the user feedback that the removal failed
console.error(data.message);
- Growl.show(Localize.translateLocal('workspace.people.genericFailureMessage'), CONST.GROWL.ERROR, 5000);
+ const errorMessage = data.jsonCode === 666 ? data.message : Localize.translateLocal('workspace.people.genericFailureMessage');
+ Growl.show(errorMessage, CONST.GROWL.ERROR, 5000);
});
}
| 9 |
diff --git a/src/app/controllers/Smoothie/SmoothieController.js b/src/app/controllers/Smoothie/SmoothieController.js @@ -934,8 +934,8 @@ class SmoothieController {
spindleOverride = 100;
} else if ((spindleOverride + value) > 200) {
spindleOverride = 200;
- } else if ((spindleOverride + value) < 0) {
- spindleOverride = 0;
+ } else if ((spindleOverride + value) < 10) {
+ spindleOverride = 10;
} else {
spindleOverride += value;
}
| 12 |
diff --git a/CHANGELOG.md b/CHANGELOG.md 0.26.4 / 11-07-2017
===================
- Update Chromium to [62.0.3202.89](https://chromereleases.googleblog.com/2017/11/stable-channel-update-for-desktop.html)
-- Allow inject script into main world of webview [(#6229)](https://github.com/nwjs/nw.js/issues/6229)
- Fix: Frameless transparent window is maximizing/overflowing outside window limits [(#6248)](https://github.com/nwjs/nw.js/issues/6248)
- Fix: NW.js loading files does not seem to provide file's MIME type [(#6106)](https://github.com/nwjs/nw.js/issues/6106)
- Fix: Empty temp directory not properly deleted [(#5208)](https://github.com/nwjs/nw.js/issues/5208)
| 1 |
diff --git a/vis/js/io.js b/vis/js/io.js @@ -411,8 +411,8 @@ IO.prototype = {
highlightTerms: function(full_string, term_array) {
let result_string = full_string;
for (let term of term_array) {
- let re = new RegExp("(^|\\s)(" + term + ")(\\s|$)" ,"gi");
- result_string = result_string.replace(re, " <span class=\"query_term_highlight\">$2</span> ");
+ let re = new RegExp("\\b(" + term + ")\\b" ,"gi");
+ result_string = result_string.replace(re, " <span class=\"query_term_highlight\">$1</span>");
}
return result_string;
},
@@ -436,7 +436,7 @@ IO.prototype = {
//Remove phrases, and, or, +, -, (, ) from query string
let query_wt_phrases = full_query.replace(match_query, " ");
- let query_wt_rest = query_wt_phrases.replace(/(^|\s)and\s/g, " ").replace(/(^|\s)or\s/g, " ").replace(/(^|\s)-/g, " ").replace(/\+|\(|\)/g, " ")
+ let query_wt_rest = query_wt_phrases.replace(/\band\b|\bor\b|\(|\)/g, "").replace(/(^|\s)-|\+/g, " ");
term_array = term_array.concat(query_wt_rest.trim().replace(/\s+/g, " ").split(" "));
| 7 |
diff --git a/js/webcomponents/bisweb_filedialog.js b/js/webcomponents/bisweb_filedialog.js @@ -161,6 +161,10 @@ class FileDialogElement {
if (this.currentPath[0] === '') { this.currentPath.splice(0,1); }
navbar.empty();
+ //create 'home' button that will bring user back to ~/
+ let homeButton = $(`<button type='button' class='btn btn-sm btn-link'><span class='glyphicon glyphicon-folder-close'></span>home</button>`);
+ navbar.append(homeButton);
+
for (let folder of this.currentPath) {
let button = $(`<button type='button' class='btn btn-sm btn-link'><span class='glyphicon glyphicon-folder-close'></span> ${folder}</button>`);
button.on('click', () => {
@@ -169,7 +173,7 @@ class FileDialogElement {
//e.g. if the path is javascript/bisweb/node_modules and bisweb is clicked, set currentPath to javascript/bisweb
for (let i = 0; i < this.currentPath.length; i++) {
if (this.currentPath[i] === folder) {
- this.currentPath.splice(i, this.currentPath.length);
+ this.currentPath = this.currentPath.slice(0, i + 1);
console.log('new path', this.currentPath);
break;
}
@@ -180,7 +184,7 @@ class FileDialogElement {
console.log('newPathContents', newPathContents);
for (let entry of this.currentPath) {
for (let file of newPathContents) {
- if (file.text = entry) {
+ if (file.text === entry) {
console.log('matched', file, 'with name', entry);
newPathContents = file.children;
foundEntry = true;
| 1 |
diff --git a/src/app/controllers/TinyG/TinyGController.js b/src/app/controllers/TinyG/TinyGController.js @@ -459,7 +459,7 @@ class TinyGController {
// TinyG settings
if (this.settings !== this.controller.settings) {
this.settings = this.controller.settings;
- this.emit('controller:settings', TINYG, this.settigns);
+ this.emit('controller:settings', TINYG, this.settings);
this.emit('TinyG:settings', this.settings); // Backward compatibility
}
| 1 |
diff --git a/src/components/sideMenu/view/sideMenuView.js b/src/components/sideMenu/view/sideMenuView.js @@ -10,7 +10,6 @@ import {
} from 'react-native';
import { injectIntl, useIntl } from 'react-intl';
import LinearGradient from 'react-native-linear-gradient';
-import ActionSheet from 'react-native-actionsheet';
import VersionNumber from 'react-native-version-number';
import { isEmpty } from 'lodash';
import { getStorageType } from '../../../realm/realm';
@@ -28,6 +27,7 @@ import { getVotingPower } from '../../../utils/manaBar';
// Styles
import styles from './sideMenuStyles';
+import { OptionsModal } from '../../atoms';
// Images
const SIDE_MENU_BACKGROUND = require('../../../assets/side_menu_background.png');
@@ -165,7 +165,7 @@ const SideMenuView = ({
<FlatList data={menuItems} keyExtractor={(item) => item.id} renderItem={_renderItem} />
</View>
<Text style={styles.versionText}>{`v${appVersion}, ${buildVersion}${storageT}`}</Text>
- <ActionSheet
+ <OptionsModal
ref={ActionSheetRef}
options={[
intl.formatMessage({ id: 'side_menu.logout' }),
| 14 |
diff --git a/src/themes/foundation.js b/src/themes/foundation.js @@ -442,7 +442,7 @@ JSONEditor.defaults.themes.foundation6 = JSONEditor.defaults.themes.foundation5.
markTabInactive: function(row) {
row.tab.classList.remove('is-active');
row.tab.firstChild.removeAttribute('aria-selected');
- row.container.classList.add('is-active');
+ row.container.classList.remove('is-active');
row.container.removeAttribute('aria-selected');
},
addTab: function(holder, tab) {
| 1 |
diff --git a/tests/operations/index.mjs b/tests/operations/index.mjs @@ -26,6 +26,7 @@ global.ENVIRONMENT_IS_WEB = function() {
import TestRegister from "./TestRegister";
import "./tests/BCD";
import "./tests/BSON";
+import "./tests/BaconCipher";
import "./tests/Base58";
import "./tests/Base64";
import "./tests/Base62";
| 0 |
diff --git a/assets/js/components/ReportTable.stories.js b/assets/js/components/ReportTable.stories.js @@ -91,9 +91,6 @@ ReportTableGatheringData.args = {
],
gatheringData: true,
};
-ReportTableGatheringData.parameters = {
- features: [ 'zeroDataStates' ],
-};
export default {
title: 'Components/ReportTable',
| 2 |
diff --git a/src/kiri/init.js b/src/kiri/init.js @@ -1982,9 +1982,9 @@ gapp.register("kiri.init", [], (root, exports) => {
camOriginTop: uc.newBoolean(LANG.or_topp_s, onBooleanClick, {title:LANG.or_topp_l, modes:CAM}),
camOriginCenter: uc.newBoolean(LANG.or_cntr_s, onBooleanClick, {title:LANG.or_cntr_l, modes:CAM}),
camSep: uc.newBlank({class:"pop-sep", modes:CAM}),
- camOriginOffX: uc.newInput(LANG.co_offx_s, {title:LANG.co_offx_l, convert:uc.toInt, modes:CAM}),
- camOriginOffY: uc.newInput(LANG.co_offy_s, {title:LANG.co_offy_l, convert:uc.toInt, modes:CAM}),
- camOriginOffZ: uc.newInput(LANG.co_offz_s, {title:LANG.co_offz_l, convert:uc.toInt, modes:CAM}),
+ camOriginOffX: uc.newInput(LANG.co_offx_s, {title:LANG.co_offx_l, convert:uc.toFloat, modes:CAM}),
+ camOriginOffY: uc.newInput(LANG.co_offy_s, {title:LANG.co_offy_l, convert:uc.toFloat, modes:CAM}),
+ camOriginOffZ: uc.newInput(LANG.co_offz_s, {title:LANG.co_offz_l, convert:uc.toFloat, modes:CAM}),
camExpert: uc.newGroup(LANG.op_xprt_s, null, {group: "cam_expert", modes:CAM, marker: false}),
camExpertFast: uc.newBoolean(LANG.cx_fast_s, onBooleanClick, {title:LANG.cx_fast_l, modes:CAM, show: () => !ui.camTrueShadow.checked }),
| 11 |
diff --git a/src/client/js/components/Admin/ImportData/ImportDataPageContents.jsx b/src/client/js/components/Admin/ImportData/ImportDataPageContents.jsx @@ -69,7 +69,7 @@ class ImportDataPageContents extends React.Component {
className="form-control"
type="text"
name="esaTeamName"
- value={adminImportContainer.state.esaTeamName}
+ value={adminImportContainer.state.esaTeamName || ''}
onChange={adminImportContainer.handleInputValue}
/>
</div>
@@ -85,7 +85,7 @@ class ImportDataPageContents extends React.Component {
className="form-control"
type="password"
name="esaAccessToken"
- value={adminImportContainer.state.esaAccessToken}
+ value={adminImportContainer.state.esaAccessToken || ''}
onChange={adminImportContainer.handleInputValue}
/>
</div>
@@ -174,7 +174,7 @@ class ImportDataPageContents extends React.Component {
className="form-control"
type="text"
name="qiitaTeamName"
- value={adminImportContainer.state.qiitaTeamName}
+ value={adminImportContainer.state.qiitaTeamName || ''}
onChange={adminImportContainer.handleInputValue}
/>
</div>
@@ -189,7 +189,7 @@ class ImportDataPageContents extends React.Component {
className="form-control"
type="password"
name="qiitaAccessToken"
- value={adminImportContainer.state.qiitaAccessToken}
+ value={adminImportContainer.state.qiitaAccessToken || ''}
onChange={adminImportContainer.handleInputValue}
/>
</div>
| 12 |
diff --git a/bin/components/path.js b/bin/components/path.js const Operation = require('./operation');
const util = require('../util');
-const validationsMap = {
- 2: {
- bodyOk: { head: true, options: true, patch: true, post: true, put: true },
- methods: ['delete', 'get', 'head', 'options', 'patch', 'post', 'put'],
- parametersIn: ['body', 'formData', 'header', 'path', 'query']
- },
- 3: {
- bodyOk: { head: true, options: true, patch: true, post: true, put: true, trace: true },
- methods: ['delete', 'get', 'head', 'options', 'patch', 'post', 'put', 'trace'],
- parametersIn: ['cookie', 'header', 'path', 'query']
- }
-};
-
+const methods = ['get', 'put', 'post', 'delete', 'options', 'head', 'patch', 'trace'];
module.exports = Path;
-function Path(enforcer, exception, definition, map) {
-
- if (!util.isPlainObject(definition)) {
- exception('Must be a plain object');
- return;
- }
-
- // if this definition has already been processed then return result
- const existing = map.get(definition);
- if (existing) return existing;
- map.set(definition, this);
-
- // validate and build parameters
- const parameters = Operation.buildParameters(enforcer, exception, definition, map);
-
- // build operation objects
- this.methods = [];
- const validations = validationsMap[enforcer.version];
- validations.methods.forEach(method => {
- if (definition.hasOwnProperty(method)) {
-
- // create the operation
- const operation = new Operation(enforcer, exception.at(method), definition[method], map);
-
- // add path wide parameters
- Object.keys(parameters).forEach(at => {
- Object.keys(parameters[at].map).forEach(name => {
- const store = operation.parameters[at];
- const wideParam = parameters[at].map[name];
- if (!store.map[name]) {
- store.map[name] = wideParam;
- store.empty = false;
- if (wideParam.required) store.required.push(name);
- }
- });
- });
-
-
- if (operation.requestBody && !validations.bodyOk[method]) {
- exception('Cannot use request body with method: ' + method);
- }
+function Path() {
- this[method] = operation;
- this.methods.push(method);
+ Object.defineProperties(this, {
+ // an array of all methods used by this path
+ methods: {
+ value: methods.filter(method => !!this[method])
}
});
| 2 |
diff --git a/publish/src/commands/owner.js b/publish/src/commands/owner.js @@ -250,7 +250,6 @@ const owner = async ({
warnings.push(msg);
continue;
}
- if (contract !== 'Synthetix') continue;
const { address, source } = deployment.targets[contract];
const { abi } = deployment.sources[source];
const deployedContract = new ethers.Contract(address, abi, provider);
| 2 |
diff --git a/index.html b/index.html return;
}
- $.getJSON("/authoring-services/projects/" + project + "/tasks").done(function(result) {
+ $.getJSON("/authoring-services/projects/" + project + "/tasks?lightweight=true").done(function(result) {
var $taskDdl = $('#taskDdl');
$taskDdl.html("");
$('<option>').val("None").text("None").appendTo($taskDdl);
| 4 |
diff --git a/lib/windshaft/renderers/pg-mvt/renderer.js b/lib/windshaft/renderers/pg-mvt/renderer.js @@ -99,7 +99,7 @@ module.exports = class PostgresVectorRenderer {
});
}
- _vectorQuery ({z, x, y, layerId, columns, query}) {
+ _vectorLayerQuery ({z, x, y, layerId, columns, query}) {
return `
SELECT ST_AsMVT(geom, '${layerId}')
FROM (
| 4 |
diff --git a/desktop/sources/scripts/programs/_.js b/desktop/sources/scripts/programs/_.js @@ -121,25 +121,26 @@ function Program_Default(x,y)
this.left = function(target = null)
{
var g = pico.program.glyph_at(this.x-1,this.y);
- return g == target || !target ? {x:this.x-1,y:this.y,glyph:g} : null;
+
+ return g != "." && (g == target || !target) ? {x:this.x-1,y:this.y,glyph:g} : null;
}
this.right = function(target)
{
var g = pico.program.glyph_at(this.x+1,this.y);
- return g == target || !target ? {x:this.x+1,y:this.y,glyph:g} : null;
+ return g != "." && (g == target || !target) ? {x:this.x+1,y:this.y,glyph:g} : null;
}
this.up = function(target)
{
var g = pico.program.glyph_at(this.x,this.y-1);
- return g == target || !target ? {x:this.x,y:this.y-1,glyph:g} : null;
+ return g != "." && (g == target || !target) ? {x:this.x,y:this.y-1,glyph:g} : null;
}
this.down = function(target)
{
var g = pico.program.glyph_at(this.x,this.y+1);
- return g == target || !target ? {x:this.x,y:this.y+1,glyph:g} : null;
+ return g != "." && (g == target || !target) ? {x:this.x,y:this.y+1,glyph:g} : null;
}
this.docs = function()
| 1 |
diff --git a/components/base-adresse-nationale/postal-codes.js b/components/base-adresse-nationale/postal-codes.js -import {useState} from 'react'
import PropTypes from 'prop-types'
-import {ChevronUp, ChevronDown} from 'react-feather'
-import ActionButtonNeutral from '@/components/action-button-neutral'
-import colors from '@/styles/colors'
+import theme from '@/styles/theme'
function PostalCodes({codes}) {
- const [showCodes, setShowCodes] = useState(false)
- return (
- <div className='postal-codes-container'>
- {codes.length === 1 ? (
- <div>
- Code postal : <b>{codes[0]}</b>
- </div>
+ return codes.length === 1 ? (
+ <div>{codes[0]}</div>
) : (
- <div className='postal-codes'>
- <div>
- <ActionButtonNeutral
- label={showCodes ? 'Masquer les codes postaux' : 'Afficher les codes postaux'}
- onClick={() => setShowCodes(!showCodes)}
- >
- <div className='wrapper'>
- <div>Codes postaux</div> {showCodes ? <ChevronUp alt aria-hidden='true' /> : <ChevronDown alt aria-hidden='true' />}
- </div>
- </ActionButtonNeutral>
- </div>
- {showCodes && (
- <ul className='codes-list'>
+ <div className='dropdown'>
+ <div className='dropdown-action'>Codes</div>
+ <ul className='dropdown-content'>
{codes.map(code => <li key={code}>{code}</li>)}
</ul>
- )}
- </div>
- )}
<style jsx>{`
- .postal-codes {
- padding: 5px;
- background: ${colors.lighterGrey};
+ .dropdown-action {
+ text-decoration: underline;
+ cursor: pointer;
}
- .wrapper {
- display: flex;
- justify-content: space-between;
- border-radius: 4px;
- align-items: center;
-
+ .dropdown {
+ position: relative;
+ display: inline-block;
}
- .with-icon > div {
- margin-right: 0.4em;
+ .dropdown-content {
+ display: none;
+ position: absolute;
+ background-color: ${theme.backgroundDark};
+ width: fit-content;
+ list-style: none;
+ text-align: center;
+ padding: 10px;
+ border-radius: 5px;
+ left: 0;
+ top: 10px;
+ z-index: 1;
}
- .codes-list {
- margin: 0;
+ .dropdown-action:hover .dropdown-content {
+ display: inline-block;
}
`}</style>
</div>
| 0 |
diff --git a/articles/libraries/index.md b/articles/libraries/index.md section: libraries
classes: topic-page
title: Auth0 Libraries
-description: Auth0 Libraries - helping you implement Auth0 with simple efficiency
+description: Overview of the Auth0 Libraries and SDKs
+toc: true
---
<div class="topic-page-header">
@@ -21,9 +22,9 @@ You can customize the page in the [Hosted Pages Editor](${manage_url}/#/login_pa
If the Hosted Login Page does not meet your requirements, however, Auth0 has a variety of options which can be embedded in your applications to assist with authentication.
-* [Lock](#lock-login-signup-widgets) is a drop-in authentication widget that provides a standard set of behaviors and a customizable user interface.
-* [Auth0 SDKs](#auth0-sdks) are client-side libraries that *do not* come with a user interface. These allow for expanded customization of the behavior and appearance of the login process.
-* The [Authentication API](/api-auth) can be used to integrate applications with Auth0 without requiring the use of Auth0's libraries.
+* [Lock](#lock) is a drop-in authentication widget that provides a standard set of behaviors and a customizable user interface.
+* [Auth0 SDKs](#auth0-sdks) are client-side libraries that do not come with a user interface. These allow for expanded customization of the behavior and appearance of the login process.
+* The [Authentication API](/api/authentication) can be used to integrate applications with Auth0 without using any of the Auth0's libraries.
The best option to choose will depend on the needs of your app. Check out [When to Use Lock](/libraries/when-to-use-lock) for more information to help you decide between using Lock or an SDK.
| 0 |
diff --git a/README.md b/README.md @@ -166,8 +166,8 @@ http://solidity.readthedocs.io/en/develop/style-guide.html
# Links
-[polymath]: https://polymath.network
-[ethereum]: https://www.ethereum.org/
-[solidity]: https://solidity.readthedocs.io/en/develop/
-[truffle]: http://truffleframework.com/
-[testrpc]: https://github.com/ethereumjs/testrpc
+[Polymath](https://polymath.network)
+[Ethereum](https://www.ethereum.org/)
+[Solidity](https://solidity.readthedocs.io/en/develop/)
+[Truffle](http://truffleframework.com/)
+[Testrpc](https://github.com/ethereumjs/testrpc)
| 7 |
diff --git a/changelog/55_UNRELEASED_2019-xx-xx.md b/changelog/55_UNRELEASED_2019-xx-xx.md - => When moving a product from/to a freezer location, the best before date is changed accordingly
- There is also a new sub feature flag `FEATURE_FLAG_STOCK_PRODUCT_FREEZING` to disable this if you don't need it (defaults to `true`)
+### Other new things to note
+- There is now a RSS feed for this changelog, use it to get notified about new releases: https://grocy.info/changelog/feed
+
### Stock improvements/fixes
- The productcard gets now also refreshed after a transaction was posted (purchase/consume/etc.) (thanks @kriddles)
- The product field calories (kcal) now also allows decimal numbers
| 0 |
diff --git a/models/checklists.js b/models/checklists.js @@ -283,8 +283,15 @@ if (Meteor.isServer) {
'POST',
'/api/boards/:boardId/cards/:cardId/checklists',
function(req, res) {
- Authentication.checkUserId(req.userId);
-
+ // Check user is logged in
+ Authentication.checkLoggedIn(req.userId);
+ const paramBoardId = req.params.boardId;
+ // Check user has permission to add checklist to the card
+ const board = Boards.findOne({
+ _id: paramBoardId
+ });
+ const addPermission = allowIsBoardMemberCommentOnly(req.userId, board);
+ Authentication.checkAdminOrCondition(req.userId, addPermission);
const paramCardId = req.params.cardId;
const id = Checklists.insert({
title: req.body.title,
| 11 |
diff --git a/src/components/general/inventory/Inventory.jsx b/src/components/general/inventory/Inventory.jsx @@ -31,6 +31,11 @@ const objects = {
start_url: 'https://webaverse.github.io/dragon-mount/',
level: 5,
},
+ {
+ name: 'Bow',
+ start_url: 'https://webaverse.github.io/bow/',
+ level: 9,
+ },
],
};
| 0 |
diff --git a/dev/emit-latency.js b/dev/emit-latency.js const { ServiceBroker } = require("../");
-const transporter = "TCP";
+const transporter = "NATS";
-// Create broker Client
-const brokerClient = new ServiceBroker({
- nodeID: "client",
- transporter,
- logger: console,
- logLevel: "info"
-});
-
-// Create broker #1
-const broker1 = new ServiceBroker({
- nodeID: "demo1",
- transporter,
- logger: console,
- logLevel: "info"
-});
-
-// Create broker #2
-const broker2 = new ServiceBroker({
- nodeID: "demo2",
- transporter,
- logger: console,
- logLevel: "info"
-});
-
-// Create broker #3
-const broker3 = new ServiceBroker({
- nodeID: "demo3",
+function createBroker(nodeID) {
+ return new ServiceBroker({
+ nodeID,
transporter,
logger: console,
logLevel: "info"
});
+}
-// Create brokerListen
-const brokerListen = new ServiceBroker({
- nodeID: "listen",
- transporter,
- logger: console,
- logLevel: "info"
-});
+// Create brokers
+const brokerClient = createBroker("client");
+const broker1 = createBroker("demo1");
+const broker2 = createBroker("demo2");
+const broker3 = createBroker("demo3");
+const brokerListen = createBroker("listen");
broker1.createService({
name: "demo1",
+ dependencies: ["demo2"],
actions: {
hello1(ctx) {
// console.log("call demo1.hello1 at: ", Date.now());
@@ -59,6 +36,7 @@ broker1.createService({
broker2.createService({
name: "demo2",
+ dependencies: ["demo3"],
actions: {
hello2(ctx) {
// console.log("call demo2.hello2 at: ", Date.now());
@@ -74,6 +52,7 @@ broker2.createService({
broker3.createService({
name: "demo3",
+ dependencies: ["listen"],
actions: {
hello3(ctx) {
// console.log("call demo3.hello3 at: ", Date.now());
@@ -103,7 +82,8 @@ brokerListen.createService({
});
brokerClient.Promise.all([brokerClient.start(), broker1.start(), broker2.start(), broker3.start(), brokerListen.start()])
- .delay(5000)
+ .delay(1000)
+ .then(() => brokerClient.waitForServices("demo1"))
/*.then(async () => {
let startTime = Date.now();
| 7 |
diff --git a/apps/circlesclock/settings.js b/apps/circlesclock/settings.js storage.write(SETTINGS_FILE, settings);
}
- const valuesCircleTypes = ["steps", "stepsDist", "hr", "battery", "weather", "sunprogress", "empty", "temperature", "pressure", "altitude"];
- const namesCircleTypes = ["steps", "distance", "heart", "battery", "weather", "sun progress", "empty", "temperature", "pressure", "altitude"];
+ const valuesCircleTypes = ["empty", "steps", "stepsDist", "hr", "battery", "weather", "sunprogress", "temperature", "pressure", "altitude"];
+ const namesCircleTypes = ["empty", "steps", "distance", "heart", "battery", "weather", "sun", "temperature", "pressure", "altitude"];
const valuesColors = ["", "#ff0000", "#00ff00", "#0000ff", "#ffff00", "#ff00ff", "#00ffff", "#fff", "#000", "green-red", "red-green"];
const namesColors = ["default", "red", "green", "blue", "yellow", "magenta", "cyan", "white", "black", "green->red", "red->green"];
- const weatherData = ["humidity", "wind", "empty"];
+ const weatherData = ["empty", "humidity", "wind"];
function showMainMenu() {
let menu ={
onchange: x => save('showWidgets', x),
},
/*LANG*/'weather circle': {
- value: settings.weatherCircleData ? weatherData.indexOf(settings.weatherCircleData) : 0,
+ value: settings.weatherCircleData ? weatherData.indexOf(settings.weatherCircleData) : 1,
min: 0, max: 2,
format: v => weatherData[v],
onchange: x => save('weatherCircleData', weatherData[x]),
/*LANG*/'< Back': ()=>showMainMenu(),
/*LANG*/'data': {
value: settings[circleName] ? valuesCircleTypes.indexOf(settings[circleName]) : 0,
- min: 0, max: valuesCircleTypes.length,
+ min: 0, max: valuesCircleTypes.length - 1,
format: v => namesCircleTypes[v],
onchange: x => save(circleName, valuesCircleTypes[x]),
},
/*LANG*/'color': {
value: settings[colorKey] ? valuesColors.indexOf(settings[colorKey]) : 0,
- min: 0, max: valuesColors.length,
+ min: 0, max: valuesColors.length - 1,
format: v => namesColors[v],
onchange: x => save(colorKey, valuesColors[x]),
},
| 7 |
diff --git a/changelog/53_UNRELEASED_2019-xx-xx.md b/changelog/53_UNRELEASED_2019-xx-xx.md - Improved the responsiveness of the meal plan and calendar page by automatically switching to a day calendar view on smaller screens (thanks for the idea @kriddles)
- The calendar now also contains all planned recipes from the meal plan on the corresponding day
- When adding a product to the shopping list from the new context/more menu from the stock overview page and if the product is already on the shopping list, the amount of that entry will be updated acccordingly instead of adding a new (double) shopping list item
+- Fixed that the browser barcode scanner button was not clickable on iOS Safari (thanks @DeeeeLAN)
- The API Endpoint `GET /files/{group}/{fileName}` now also returns a `Cache-Control` header (defaults fixed to 30 days) to further increase page load times
- Fixed that the API endpoint `/stock/shoppinglist/add-product` failed when a product should be added which was not already on the shopping list (thanks @Forceu)
- Some style/CSS detail-refinements
| 3 |
diff --git a/src/web/containers/Workspace/index.styl b/src/web/containers/Workspace/index.styl .workspace-table {
display: table;
width: 100%;
- height: calc(100vh - $navbar-height);
+ height: 'calc(100vh - %s)' % ($navbar-height);
}
.workspace-table-row {
display: table-row;
| 1 |
diff --git a/test/e2e/beta/metamask-beta-ui.spec.js b/test/e2e/beta/metamask-beta-ui.spec.js @@ -100,15 +100,21 @@ describe('MetaMask', function () {
await delay(regularDelayMs)
// Close all other tabs
- let [oldUi, infoPage, newUi] = await driver.getAllWindowHandles()
- newUi = newUi || infoPage
+ let [oldUi, tab1, tab2] = await driver.getAllWindowHandles()
await driver.switchTo().window(oldUi)
await driver.close()
- if (infoPage !== newUi) {
- await driver.switchTo().window(infoPage)
+
+ await driver.switchTo().window(tab1)
+ const tab1Url = await driver.getCurrentUrl()
+ if (tab1Url.match(/metamask.io/)) {
+ await driver.switchTo().window(tab1)
+ await driver.close()
+ await driver.switchTo().window(tab2)
+ } else if (tab2) {
+ await driver.switchTo().window(tab2)
await driver.close()
+ await driver.switchTo().window(tab1)
}
- await driver.switchTo().window(newUi)
await delay(regularDelayMs)
const continueBtn = await findElement(driver, By.css('.welcome-screen__button'))
| 7 |
diff --git a/src/pages/index.js b/src/pages/index.js @@ -6,11 +6,8 @@ import { rhythm } from '../utils/typography'
import BlogPostTemplate from '../components/Layouts/BlogLayout'
import Layout from '../components/Layouts/Layout'
import DeveloperCard from '../components/DeveloperCard'
-import Search from 'antd/lib/input/Search'
-import 'antd/dist/antd.css'
-import { Button, Input, Popover, Select, Tag } from 'antd'
-import { ArrowUpOutlined, ArrowDownOutlined } from '@ant-design/icons'
+import { AiOutlineArrowUp, AiOutlineArrowDown } from "react-icons/ai";
class DeveloperCommunityHome extends React.Component {
constructor(props) {
super(props)
@@ -208,8 +205,7 @@ class DeveloperCommunityHome extends React.Component {
]}
/>
<div className="filter-bar">
- <Input
- enterButton="Search"
+ <input
size="large"
className="search-bar"
placeholder="Search dev by username"
@@ -218,93 +214,20 @@ class DeveloperCommunityHome extends React.Component {
/>
<div className="sort-list">
{this.state.sortableFields.map(sort => (
- <div
+ <button
key={sort.type}
onClick={() => this.toggleSort(sort)}
- className="sort-field"
+ className="button"
>
{sort.name}{' '}
{this.state.sort && sort.type === this.state.sort.type ? (
this.state.sort.order === 'asc' ? (
- <ArrowUpOutlined />
+ <AiOutlineArrowUp />
) : (
- <ArrowDownOutlined />
+ <AiOutlineArrowDown />
)
) : null}
- </div>
- ))}
- </div>
- <Popover
- overlayClassName="add-filter-overlay"
- onVisibleChange={this.onPopoverVisibilityChange}
- visible={this.state.isAddFilterPopoverOpen}
- placement="bottom"
- content={
- <div className="add-filter-container">
- <Select
- placeholder="Select a filter"
- allowClear
- style={{ width: 120 }}
- onChange={this.updateSelectedFilterType}
- >
- {this.state.filterableFields.map(filter => (
- <Select.Option
- value={JSON.stringify({
- name: filter.name,
- type: filter.type,
- })}
- >
- {filter.name}
- </Select.Option>
- ))}
- </Select>
- <Input
- placeholder="Enter a filter value"
- onChange={this.updateSelectedFilterValue}
- />
- {!!this.state.selectedFilter.name && (
- <span className="filter-preview">
- {this.state.selectedFilter.name} ={' '}
- {this.state.selectedFilter.value}
- </span>
- )}
- <div className="action-buttons">
- <Button type="outline" onClick={this.hidePopover}>
- Cancel
- </Button>
- <Button type="primary" onClick={this.addFilter}>
- Apply
- </Button>
- </div>
- </div>
- }
- destroyTooltipOnHide
- title="Add filter"
- trigger="click"
- disabled={
- this.state.filters.length === this.state.filterableFields.length
- }
- >
- <Button
- disabled={
- this.state.filters.length === this.state.filterableFields.length
- }
- className="add-filter-button"
- type="primary"
- >
- Add filter
- </Button>
- </Popover>
- <div className="filters-list">
- {this.state.filters.map((filter, index) => (
- <Tag
- className="filter"
- closable
- key={index}
- onClose={() => this.deleteFilter(index)}
- >
- {`${filter.name} = ${filter.value}`}
- </Tag>
+ </button>
))}
</div>
</div>
| 2 |
diff --git a/generators/entity/templates/server/src/main/java/package/service/_EntityService.java b/generators/entity/templates/server/src/main/java/package/service/_EntityService.java @@ -28,7 +28,9 @@ import <%=packageName%>.domain.<%= entityClass %>;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
<%_ } _%>
+<%_ if (pagination === 'no' || fieldsContainNoOwnerOneToOne === true) { _%>
import java.util.List;
+<%_ } _%>
/**
* Service Interface for managing <%= entityClass %>.
| 2 |
diff --git a/codegens/nodejs-request/lib/parseRequest.js b/codegens/nodejs-request/lib/parseRequest.js @@ -102,10 +102,10 @@ function parseBody (requestbody, indentString, trimBody, contentType) {
return `body: JSON.stringify(${JSON.stringify(jsonBody)})\n`;
}
catch (error) {
- return `body: ${JSON.stringify(requestbody[requestbody.mode])}\n`;
+ return `body: '${sanitize(requestbody[requestbody.mode])}'\n`;
}
}
- return `body: ${JSON.stringify(requestbody[requestbody.mode])}\n`;
+ return `body: '${sanitize(requestbody[requestbody.mode])}'\n`;
// eslint-disable-next-line no-case-declarations
case 'graphql':
let query = requestbody[requestbody.mode].query,
| 14 |
diff --git a/src/components/annotations/draw.js b/src/components/annotations/draw.js @@ -225,10 +225,13 @@ function drawOne(gd, index) {
}
var annotationIsOffscreen = false;
- ['x', 'y'].forEach(function(axLetter) {
- var axRef = options[axLetter + 'ref'] || axLetter,
+ var letters = ['x', 'y'];
+
+ for(var i = 0; i < letters.length; i++) {
+ var axLetter = letters[i],
+ axRef = options[axLetter + 'ref'] || axLetter,
tailRef = options['a' + axLetter + 'ref'],
- ax = Axes.getFromId(gd, axRef),
+ ax = {x: xa, y: ya}[axLetter],
dimAngle = (textangle + (axLetter === 'x' ? 0 : -90)) * Math.PI / 180,
// note that these two can be either positive or negative
annSizeFromWidth = outerWidth * Math.cos(dimAngle),
@@ -350,7 +353,7 @@ function drawOne(gd, index) {
// size/shift are used during dragging
options['_' + axLetter + 'size'] = annSize;
options['_' + axLetter + 'shift'] = textShift;
- });
+ }
if(annotationIsOffscreen) {
annTextGroupInner.remove();
| 14 |
diff --git a/includes/Modules/Analytics/Advanced_Tracking.php b/includes/Modules/Analytics/Advanced_Tracking.php @@ -76,10 +76,6 @@ final class Advanced_Tracking {
} else {
$this->plugin_detector = $plugin_detector;
}
-
- // TODO: Move the following two lines into SiteKit-defined hooks.
- $active_plugin_configurations = $this->plugin_detector->determine_active_plugins( $this->get_supported_plugins() );
- $this->register_event_lists( $active_plugin_configurations );
}
/**
@@ -89,17 +85,34 @@ final class Advanced_Tracking {
*/
public function register() {
add_action(
- 'wp_enqueue_scripts',
+ 'googlesitekit_analytics_init_tag',
+ function() {
+ $active_plugin_configurations = $this->plugin_detector->determine_active_plugins( $this->get_supported_plugins() );
+ $this->register_event_lists( $active_plugin_configurations );
+ add_action(
+ 'wp_footer',
function() {
$this->set_up_advanced_tracking();
},
15
);
+ },
+ 15
+ );
+ add_action(
+ 'googlesitekit_analytics_init_tag_amp',
+ function() {
+ $active_plugin_configurations = $this->plugin_detector->determine_active_plugins( $this->get_supported_plugins() );
+ $this->register_event_lists( $active_plugin_configurations );
add_filter(
'googlesitekit_amp_gtag_opt',
function( $gtag_amp_opt ) {
return $this->set_up_advanced_tracking_amp( $gtag_amp_opt );
- }
+ },
+ 15
+ );
+ },
+ 15
);
}
@@ -109,18 +122,8 @@ final class Advanced_Tracking {
* @since n.e.x.t.
*/
private function set_up_advanced_tracking() {
- if ( ! wp_script_is( 'google_gtagjs' ) ) {
- return;
- }
-
- add_action(
- 'wp_footer',
- function() {
- $this->configure_events();
+ $this->compile_events();
( new Measurement_Code_Injector() )->inject_event_tracking( $this->event_configurations );
- },
- 15
- );
}
/**
@@ -132,7 +135,7 @@ final class Advanced_Tracking {
* @return array $gtag_amp_opt gtag config options for AMP.
*/
private function set_up_advanced_tracking_amp( $gtag_amp_opt ) {
- $this->configure_events();
+ $this->compile_events();
if ( ! array_key_exists( 'triggers', $gtag_amp_opt ) ) {
$gtag_amp_opt['triggers'] = array();
@@ -161,11 +164,11 @@ final class Advanced_Tracking {
}
/**
- * Builds the list of Measurement_Event objects.
+ * Compiles the list of Measurement_Event objects.
*
* @since n.e.x.t.
*/
- private function configure_events() {
+ private function compile_events() {
$this->event_configurations = array();
foreach ( $this->plugin_event_lists as $plugin_event_list ) {
if ( null !== $plugin_event_list ) {
| 4 |
diff --git a/lib/carto/carto_gears_support.rb b/lib/carto/carto_gears_support.rb @@ -7,7 +7,7 @@ module Carto
# - `/private_gears` (shouldn't be installed)
# Returns install gears first.
def gears
- (public_gears + private_gears).sort { |a, b| a.install ? -1 : 1 }
+ (public_gears + private_gears).sort { |a, _| a.install ? -1 : 1 }
end
private
| 8 |
diff --git a/apps/messages/app.js b/apps/messages/app.js @@ -270,11 +270,11 @@ function showMessage(msgid) {
checkMessages({clockIfNoMsg:1,clockIfAllRead:1,showMsgIfUnread:1});
}});
}
- // If body of message is only one line, use large font.
+ // If body of message is only two lines long w/ large font, use large font.
var body=msg.body, bodyFont = fontLarge, lines;
if (body) {
var w = g.getWidth()-48;
- if (g.setFont(bodyFont).stringWidth(body) > w)
+ if (g.setFont(bodyFont).stringWidth(body) > w * 2)
bodyFont = fontMedium;
if (g.setFont(bodyFont).stringWidth(body) > w) {
lines = g.setFont(bodyFont).wrapString(msg.body, g.getWidth()-10);
| 11 |
diff --git a/tasks/gulp/packages-update.js b/tasks/gulp/packages-update.js @@ -17,6 +17,8 @@ gulp.task('packages:update', () => {
.pipe(replace('../../globals/scss', '@govuk-frontend/globals'))
.pipe(replace('../', '@govuk-frontend/'))
.pipe(readmeComponents)
+ .pipe(replace('[demo](', '[demo](http://govuk-frontend.herokuapp.com/components/'))
+ .pipe(replace('.html)', '/index.html)'))
.pipe(replace('<!--', ''))
.pipe(replace('-->', ''))
.pipe(replace(/---(.|\n)*---/g, ''))
| 14 |
diff --git a/src/userscript.ts b/src/userscript.ts @@ -68345,6 +68345,9 @@ var $$IMU_EXPORT$$;
if (domain === "pics.r18.com" ||
// https://pics.dmm.co.jp/digital/video/bgg00003/bgg00003-12.jpg
// https://pics.dmm.co.jp/digital/video/bgg00003/bgg00003jp-12.jpg
+ // thanks to ggagagg on discord: https://github.com/qsniyg/maxurl/issues/963
+ // https://pics.dmm.co.jp/digital/video/h_1575sgkx00009/h_1575sgkx00009-2.jpg
+ // https://pics.dmm.co.jp/digital/video/h_1575sgkx00009/h_1575sgkx00009jp-2.jpg
domain === "pics.dmm.co.jp" ||
// https://pics.avdmm.top/digital/video/bgg00003/bgg00003-12.jpg
// https://pics.avdmm.top/digital/video/bgg00003/bgg00003jp-12.jpg
@@ -68353,7 +68356,7 @@ var $$IMU_EXPORT$$;
// https://pics.r18.com/digital/video/118sksk00031/118sksk00031jp-1.jpg
// https://pics.r18.com/digital/video/miaa00301/miaa00301-5.jpg
// https://pics.r18.com/digital/video/miaa00301/miaa00301jp-5.jpg
- newsrc = src.replace(/(\/digital\/+video\/+[0-9a-z]+[0-9]+\/+[0-9a-z]+[0-9]+)(-[0-9]+\.[^/.]+)(?:[?#].*)?$/,
+ newsrc = src.replace(/(\/digital\/+video\/+[0-9a-z_]+[0-9]+\/+[0-9a-z_]+[0-9]+)(-[0-9]+\.[^/.]+)(?:[?#].*)?$/,
"$1jp$2");
if (newsrc !== src)
return newsrc;
| 7 |
diff --git a/src/ns_audit_cfg.erl b/src/ns_audit_cfg.erl @@ -277,7 +277,7 @@ read_descriptors() ->
Path = filename:join(path_config:component_path(sec), "audit_events.json"),
{ok, Bin} = file:read_file(Path),
{Json} = ejson:decode(Bin),
- 1 = proplists:get_value(<<"version">>, Json),
+ true = lists:member(proplists:get_value(<<"version">>, Json), [1, 2]),
Modules = proplists:get_value(<<"modules">>, Json),
lists:flatmap(
fun ({Module}) ->
| 11 |
diff --git a/docs/providers/aws/guide/services.md b/docs/providers/aws/guide/services.md @@ -48,7 +48,7 @@ To create a service, use the `create` command. You must also pass in a runtime (
serverless create --template aws-nodejs --path myService
```
-Here are the available runtimes for AWS Lambda:
+Here are the available templates for AWS Lambda:
* aws-clojurescript-gradle
* aws-clojure-gradle
| 14 |
diff --git a/avatars/avatars.js b/avatars/avatars.js @@ -1335,7 +1335,7 @@ class Avatar {
const modelBone = this.modelBones[k];
const modelBoneOutput = this.modelBoneOutputs[k];
- if (k === 'Hips') {
+ if (/hips|thumb|finger/i.test(k)) {
modelBone.position.copy(modelBoneOutput.position);
}
modelBone.quaternion.multiplyQuaternions(modelBoneOutput.quaternion, modelBone.initialQuaternion)
| 0 |
diff --git a/src/og/scene/Planet.js b/src/og/scene/Planet.js @@ -40,6 +40,8 @@ const MIN_LOD = 0.75;
let _tempPickingPix_ = new Uint8Array(4),
_tempDepthColor_ = new Uint8Array(4);
+const DEPTH_DISTANCE = 11;
+
/**
* Maximum created nodes count. The more nodes count the more memory usage.
* @const
@@ -1546,7 +1548,7 @@ class Planet extends RenderNode {
if (!(_tempPickingPix_[0] || _tempPickingPix_[1] || _tempPickingPix_[2])) {
dist = this.getDistanceFromPixelEllipsoid(px) || 0;
- } else if (dist < 11) {
+ } else if (dist < DEPTH_DISTANCE) {
r.screenDepthFramebuffer.activate();
r.screenDepthFramebuffer.readPixels(_tempDepthColor_, spx, spy, 0);
r.screenDepthFramebuffer.deactivate();
| 0 |
diff --git a/package.json b/package.json "mnid": "^0.1.3",
"pino": "^5.11.1",
"qrcode.react": "^0.9.3",
- "react": "^16.8.4",
+ "react": "^16.8.1",
"react-app-polyfill": "^0.1.3",
- "react-art": "^16.8.4",
- "react-dom": "^16.8.4",
+ "react-art": "^16.8.1",
+ "react-dom": "^16.8.1",
"react-native": "^0.57.8",
- "react-native-camera": "^1.13.1",
+ "react-native-camera": "^1.12.0",
"react-native-elements": "^0.19.1",
"react-native-otp": "^1.0.0",
- "react-native-paper": "^2.13.0",
+ "react-native-paper": "^2.11.0",
"react-native-qrcode-scanner": "^1.1.2",
"react-native-recaptcha-v3": "0.0.16",
- "react-native-vector-icons": "^6.4.1",
+ "react-native-vector-icons": "^6.2.0",
"react-native-web": "^0.9.x",
"react-navigation-stack": "^1.0.9",
"react-navigation-tabs": "^1.0.2",
"recaptcha-v3-react": "^3.0.3",
"rxjs": "^6.4.0",
"styled-components": "^4.1.3",
- "truffle-hdwallet-provider": "^1.0.5",
+ "truffle-hdwallet-provider": "^1.0.4",
"undux": "^5.0.0-beta.21",
"validator": "^10.11.0",
"web3": "1.0.0-beta.37"
"dotenv": "6.0.0",
"dotenv-expand": "4.2.0",
"empty": "^0.10.1",
- "eslint": "^5.15.1",
+ "eslint": "^5.13.0",
"eslint-config-prettier": "^3.6.0",
- "eslint-config-react-app": "^3.0.8",
+ "eslint-config-react-app": "^3.0.7",
"eslint-loader": "2.1.1",
"eslint-plugin-dependencies": "^2.4.0",
"eslint-plugin-flowtype": "2.50.1",
"eslint-plugin-jsx-a11y": "6.1.2",
"eslint-plugin-prettier": "^3.0.1",
"eslint-plugin-react": "7.11.1",
- "eslint-plugin-react-hooks": "^1.5.0",
+ "eslint-plugin-react-hooks": "^1.4.0",
"file-loader": "2.0.0",
"flow-bin": "^0.89.0",
"fork-ts-checker-webpack-plugin-alt": "0.4.14",
"jest": "23.6.0",
"jest-pnp-resolver": "1.0.1",
"jest-resolve": "23.6.0",
- "lint-staged": "^8.1.5",
+ "lint-staged": "^8.1.4",
"metro-react-native-babel-preset": "^0.51.0",
"mini-css-extract-plugin": "0.4.3",
"node-webcrypto-ossl": "^1.0.42",
"postcss-preset-env": "6.0.6",
"postcss-safe-parser": "4.0.1",
"react-dev-utils": "^6.1.1",
- "react-hot-loader": "^4.8.0",
+ "react-hot-loader": "^4.6.5",
"react-native-dotenv": "^0.2.0",
- "react-test-renderer": "^16.8.4",
+ "react-test-renderer": "^16.8.1",
"resolve": "1.8.1",
"sass-loader": "7.1.0",
"style-loader": "0.23.0",
| 3 |
diff --git a/OurUmbraco.Client/package.json b/OurUmbraco.Client/package.json "gulp-clean": "0.3.x",
"gulp-combine-media-queries": "0.2.x",
"gulp-concat": "2.2.x",
- "gulp-imagemin": "0.6.x",
+ "gulp-imagemin": "3.3.x",
"gulp-jshint": "^2.0.4",
"gulp-minify-css": "1.1.x",
"gulp-rename": "1.2.x",
| 3 |
diff --git a/package.json b/package.json "@formio/semantic": "^2.5.1",
"autocompleter": "^6.1.0",
"browser-cookies": "^1.2.0",
- "choices.js": "^9.0.1",
+ "choices.js": "formio/Choices#master",
"compare-versions": "^3.6.0",
"core-js": "^3.9.0",
"custom-event-polyfill": "^1.0.7",
| 4 |
diff --git a/docs/configuration.md b/docs/configuration.md @@ -74,7 +74,7 @@ _This means the module called `fontMerge` will be called, then `removeOutOfPage`
Different extractors are available for each input file format.
- PDF files: three extractors are currently available for PDF files: `pdfminer`, which is an advanced python based extractor capable of extracting low and high level textual structures (from characters to paragraphs) and `abbyy` that rely on ABBYY Finereader that is paid software. It is also possible to use `tesseract` in this case. The document will then be converted as an image, so expect the accuracy to be lower on texts.
-- Images: three extractors are supported for images: `tesseract` which is an Open Source OCR software, `google-vision`, which uses the Google Vision API to detect the contents of an image (see the [google vision documentation for more](google-vision.md)) and `abbyy`, that relies on ABBYY Finereader, a paid solution for OCR on documents and images.
+- Images: three extractors are supported for images: `tesseract` which is an Open Source OCR software, `google-vision`, which uses the Google Vision API to detect the contents of an image (see the [google vision documentation for more](../server/src/input/google-vision/README.md)) and `abbyy`, that relies on ABBYY Finereader, a paid solution for OCR on documents and images.
### 2.2. Language
| 1 |
diff --git a/app/components/forms/wizard/basic-details-step.js b/app/components/forms/wizard/basic-details-step.js @@ -221,7 +221,7 @@ export default Component.extend(FormMixin, EventWizardMixin, {
prompt : this.l10n.t('Please give a proper price for you ticket')
},
{
- type : 'integer[1..]',
+ type : 'decimal[0..]',
prompt : this.l10n.t('Ticket price should be greater than 0')
}
]
| 11 |
diff --git a/accessibility-checker-extension/src/ts/devtools/Header.tsx b/accessibility-checker-extension/src/ts/devtools/Header.tsx @@ -359,7 +359,7 @@ export default class Header extends React.Component<IHeaderProps, IHeaderState>
</div>
}
{/* Counts row uses same code for both Assessment and Checker Tabs */}
- <div className={this.props.layout === "main"?"countRow summary mainPanel":"countRow summary subPanel"} role="region" arial-label='Issue count' style={{ marginTop: "14px" }}>
+ <div className={this.props.layout === "main"?"countRow summary mainPanel":"countRow summary subPanel"} role="region" aria-label='Issue count' style={{ marginTop: "14px" }}>
<div className="countItem" style={{ paddingTop: "0", paddingLeft: "0", paddingBottom: "0", height: "34px", textAlign: "left", overflow: "visible" }}>
<span data-tip data-for="filterViolationsTip" style={{ display: "inline-block", verticalAlign: "middle", paddingTop: "4px", paddingRight: "8px" }}>
<Checkbox
| 14 |
diff --git a/articles/appliance/infrastructure/ip-domain-port-list.md b/articles/appliance/infrastructure/ip-domain-port-list.md @@ -197,7 +197,7 @@ Auth0 strives to keep these IP addresses stable, though this is not a given. Fro
<td>SMTP</td>
<td>Outbound</td>
<td>SMTP Server(s)</td>
- <td>25/465/587</td>
+ <td>25/587</td>
<td>Allows sending of emails from the Appliance</td>
<td>No</td>
</tr>
| 2 |
diff --git a/OurUmbraco/Our/Examine/ExamineHelper.cs b/OurUmbraco/Our/Examine/ExamineHelper.cs @@ -60,12 +60,14 @@ namespace OurUmbraco.Our.Examine
simpleDataSet.RowData.Add("updateDate", file.CreationTime.ToString("yyyy-MM-dd HH:mm:ss"));
simpleDataSet.RowData.Add("nodeTypeAlias", "documentation");
- simpleDataSet.RowData.Add("dateCreated", file.CreationTime.ToString("yyyy-MM-dd HH:mm:ss")); always be exactly the same since results all files are written at the same time IIRC
+ simpleDataSet.RowData.Add("dateCreated", file.CreationTime.ToString("yyyy-MM-dd HH:mm:ss"));
+
+ //TODO: This will always be exactly the same since results all files are written at the same time IIRC
simpleDataSet.RowData.Add("Path", file.FullName);
simpleDataSet.RowData.Add("searchAblePath", file.FullName.Replace("\\", " ").Replace(":", ""));
simpleDataSet.RowData.Add("url", BuildUrl(file.FullName));
- // Used to broken link page from the search results.
+ // Used to exclude broken link page from the search results.
if(file.Name == "broken-link.md")
{
simpleDataSet.RowData.Clear();
| 1 |
diff --git a/assets/js/modules/search-console/components/dashboard/DashboardClicksWidget.js b/assets/js/modules/search-console/components/dashboard/DashboardClicksWidget.js @@ -33,7 +33,6 @@ import { CORE_SITE } from '../../../../googlesitekit/datastore/site/constants';
import { CORE_USER } from '../../../../googlesitekit/datastore/user/constants';
import extractForSparkline from '../../../../util/extract-for-sparkline';
import { untrailingslashit, calculateChange } from '../../../../util';
-import { trackEvent } from '../../../../util/tracking';
import { isZeroReport } from '../../util';
import whenActive from '../../../../util/when-active';
import DataBlock from '../../../../components/DataBlock';
@@ -113,7 +112,6 @@ function DashboardClicksWidget( { WidgetReportZero, WidgetReportError } ) {
);
if ( error ) {
- trackEvent( 'plugin_setup', 'search_console_error', error.message );
return (
<WidgetReportError moduleSlug="search-console" error={ error } />
);
| 2 |
diff --git a/src/lib/default-project/project.json b/src/lib/default-project/project.json -{"targets":[{"id":"`jEk@4|i[#Fk?(8x)AV.","name":"Stage","isStage":true,"x":0,"y":0,"size":100,"direction":90,"draggable":false,"currentCostume":0,"costume":{"name":"backdrop1","bitmapResolution":1,"rotationCenterX":240,"rotationCenterY":180,"skinId":2,"dataFormat":"png","assetId":"739b5e2a2435f6e1ec2993791b423146"},"costumeCount":1,"visible":true,"rotationStyle":"all around","blocks":{},"variables":{"`jEk@4|i[#Fk?(8x)AV.-my variable":{"id":"`jEk@4|i[#Fk?(8x)AV.-my variable","name":"my variable","type":"","isCloud":false,"value":0}},"lists":{},"costumes":[{"name":"backdrop1","bitmapResolution":1,"rotationCenterX":240,"rotationCenterY":180,"skinId":2,"dataFormat":"png","assetId":"739b5e2a2435f6e1ec2993791b423146"}],"sounds":[{"name":"pop","format":"","rate":11025,"sampleCount":258,"soundID":1,"md5":"83a9787d4cb6f3b7632b4ddfebf74367.wav","data":null,"dataFormat":"wav","assetId":"83a9787d4cb6f3b7632b4ddfebf74367","soundId":"p=i?*Zt*I]@]x_*V`mut"}]},{"id":"9xJ@2eKXvx:/*Q^3Rib#","name":"Sprite1","isStage":false,"x":0,"y":0,"size":100,"direction":90,"draggable":false,"currentCostume":0,"costume":{"name":"costume1","bitmapResolution":1,"rotationCenterX":47,"rotationCenterY":55,"skinId":0,"dataFormat":"svg","assetId":"09dc888b0b7df19f70d81588ae73420e"},"costumeCount":2,"visible":true,"rotationStyle":"all around","blocks":{},"variables":{},"lists":{},"costumes":[{"name":"costume1","bitmapResolution":1,"rotationCenterX":47,"rotationCenterY":55,"skinId":0,"dataFormat":"svg","assetId":"09dc888b0b7df19f70d81588ae73420e"},{"name":"costume2","bitmapResolution":1,"rotationCenterX":47,"rotationCenterY":55,"skinId":1,"dataFormat":"svg","assetId":"3696356a03a8d938318876a593572843"}],"sounds":[{"name":"Meow","format":"","rate":22050,"sampleCount":18688,"soundID":0,"md5":"83c36d806dc92327b9e7049a565c6bff.wav","data":null,"dataFormat":"wav","assetId":"83c36d806dc92327b9e7049a565c6bff","soundId":"]z6@jLeJ2W%gr/eA1HB+"}]}],"meta":{"semver":"3.0.0","vm":"0.1.0","agent":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.186 Safari/537.36"}}
\ No newline at end of file
+{"targets":[{"id":"`jEk@4|i[#Fk?(8x)AV.","name":"Stage","isStage":true,"x":0,"y":0,"size":100,"direction":90,"draggable":false,"currentCostume":0,"costume":{"name":"backdrop1","bitmapResolution":1,"rotationCenterX":240,"rotationCenterY":180,"skinId":2,"dataFormat":"png","assetId":"739b5e2a2435f6e1ec2993791b423146"},"costumeCount":1,"visible":true,"rotationStyle":"all around","blocks":{},"variables":{"`jEk@4|i[#Fk?(8x)AV.-my variable":{"id":"`jEk@4|i[#Fk?(8x)AV.-my variable","name":"my variable","type":"","isCloud":false,"value":0}},"lists":{},"costumes":[{"name":"backdrop1","bitmapResolution":1,"rotationCenterX":240,"rotationCenterY":180,"skinId":2,"dataFormat":"png","assetId":"739b5e2a2435f6e1ec2993791b423146"}],"sounds":[{"name":"pop","format":"","rate":11025,"sampleCount":258,"soundID":1,"md5ext":"83a9787d4cb6f3b7632b4ddfebf74367.wav","data":null,"dataFormat":"wav","assetId":"83a9787d4cb6f3b7632b4ddfebf74367","soundId":"p=i?*Zt*I]@]x_*V`mut"}]},{"id":"9xJ@2eKXvx:/*Q^3Rib#","name":"Sprite1","isStage":false,"x":0,"y":0,"size":100,"direction":90,"draggable":false,"currentCostume":0,"costume":{"name":"costume1","bitmapResolution":1,"rotationCenterX":47,"rotationCenterY":55,"skinId":0,"dataFormat":"svg","assetId":"09dc888b0b7df19f70d81588ae73420e"},"costumeCount":2,"visible":true,"rotationStyle":"all around","blocks":{},"variables":{},"lists":{},"costumes":[{"name":"costume1","bitmapResolution":1,"rotationCenterX":47,"rotationCenterY":55,"skinId":0,"dataFormat":"svg","assetId":"09dc888b0b7df19f70d81588ae73420e"},{"name":"costume2","bitmapResolution":1,"rotationCenterX":47,"rotationCenterY":55,"skinId":1,"dataFormat":"svg","assetId":"3696356a03a8d938318876a593572843"}],"sounds":[{"name":"Meow","format":"","rate":22050,"sampleCount":18688,"soundID":0,"md5ext":"83c36d806dc92327b9e7049a565c6bff.wav","data":null,"dataFormat":"wav","assetId":"83c36d806dc92327b9e7049a565c6bff","soundId":"]z6@jLeJ2W%gr/eA1HB+"}]}],"meta":{"semver":"3.0.0","vm":"0.1.0","agent":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.186 Safari/537.36"}}
| 10 |
diff --git a/src/libraries/adapters/DatabaseMySql.php b/src/libraries/adapters/DatabaseMySql.php @@ -1857,7 +1857,7 @@ class DatabaseMySql implements DatabaseInterface
switch($name)
{
case 'album':
- $subquery = sprintf("`id` IN (SELECT element FROM `{$this->mySqlTablePrefix}elementAlbum` WHERE `{$this->mySqlTablePrefix}elementAlbum`.`owner`='%s' AND `type`='%s' AND `album`='%s')",
+ $subquery = sprintf("`id` IN (SELECT element FROM `{$this->mySqlTablePrefix}elementAlbum` WHERE `{$this->mySqlTablePrefix}elementAlbum`.`owner`='%s' AND `type`='%s' AND `album`='%s')", $this->_($this->owner), 'photo', $this->_($value));
$this->_($this->owner), 'photo', $value);
$where = $this->buildWhere($where, $subquery);
break;
@@ -2658,6 +2658,6 @@ class DatabaseMySql implements DatabaseInterface
*/
private function _($str)
{
- return addslashes($str);
+ return mysql_real_escape_string($str);
}
}
| 7 |
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js @@ -15,7 +15,7 @@ angular.module('canoeApp.services')
var root = {}
root.profile = null
root.wallet = null
- root.password = 'canoe' // TODO Hardcoded for testing during dev!!!!
+ root.password = 'hubbabubba' // TODO Hardcoded for testing during dev!!!!
// This is where we keep the password entered when you start Canoe
// or when timeout is reached and it needs to be entered again.
@@ -237,9 +237,11 @@ angular.module('canoeApp.services')
return cb(err)
}
root.wallet = wallet
- root.setWalletId(wallet.id)
+ root.setWalletId(wallet.id, function (err) {
+ if (err) return cb(err)
cb(null, wallet)
})
+ })
}
root.getId = function () {
| 1 |
diff --git a/js/hoverzoom.js b/js/hoverzoom.js @@ -600,7 +600,7 @@ var hoverZoom = {
if (url.indexOf('.video') !== -1)
return true;
- url = url.replace('.gif?format=mp4', '.mp4?'); // Fixes reddit preview links, these are mp4 masquerading as
+ url = url.replace(/.gif(\?width=\d*&|\?)format=mp4/, '.mp4?'); // Fixes reddit preview links, these are mp4 masquerading as gif
if (url.lastIndexOf('?') > 0)
url = url.substring(0, url.lastIndexOf('?'));
const ext = url.substring(url.lastIndexOf('.') + 1).toLowerCase();
| 9 |
diff --git a/src/devices/mailbox.js b/src/devices/mailbox.js the vatTP, as 'send(peer, msg)'. When this arrives on vat-VatTP, it invokes
the device's 'add' method, as add(peer, msgnum, msg). The add() function
modifies the mailboxState vector. This all takes place while the kernel run
- loop is processing the run-queue, so no actual messages are transmitted yet.
+ loop is processing the run-queue, so no actual messages are transmitted
+ yet.
Later, when the host has finished processing the run-queue (or decides that
it's done enough work for now, and leaves some items on the queue), the
either a higher msgnum or acknum, it must transmit a [messages, acknum]
pair to the indicated peer.
- ... describe inbound side, acks
+ If the host lives in a replicated consensus environment (i.e. a
+ blockchain), it doesn't need to do anything else. External followers will
+ notice that the outbox has changed, and react to it be delivering the new
+ messages into the receiving side.
+
+ On the intended recipient, outside of the swingset codebase, something
+ becomes aware of the incoming messages and acknum. It submits these (along
+ with the name of the sender) to the `deliverInbound()` function. This
+ performs deduplication, so it is reasonable to re-invoke `deliverInbound()`
+ with the same set of messages multiple times (e.g. if the program is
+ following a blockchain, and each new block triggers another call).
+ deliverInbound then delivers the new messages to the VatTP vat, which
+ forwards them to the comms vat for dispatch to the right target objects.
+ VatTP also updates the outbound `acknum` field with the latest message it
+ has processed.
+
+ As before (on the other machine), the host must examine the mailboxState
+ and notice that the `acknum` has changed, and notify the other side
+ somehow. When that notification arrives, `deliverInbound()` is again
+ invoked (with the new acknum, but perhaps no new messages). The new acknum
+ tells the VatTP on that side that it is now safe to remove the retired
+ messages from its own mailboxState.
+
+ Acks must be delivered next to actual messages, not inside them, because
+ otherwise the acknowledgment process would never converge. Acks can
+ piggyback on top of normal messages, so no extra roundtrips should be
+ necessary.
*/
| 7 |
diff --git a/token-metadata/0x4Fabb145d64652a948d72533023f6E7A623C7C53/metadata.json b/token-metadata/0x4Fabb145d64652a948d72533023f6E7A623C7C53/metadata.json "symbol": "BUSD",
"address": "0x4Fabb145d64652a948d72533023f6E7A623C7C53",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/package.json b/package.json "build:css": "node-sass lib/plugins/html/src/sass/main.scss > lib/plugins/html/assets/css/index.css && cleancss -o lib/plugins/html/assets/css/index.min.css lib/plugins/html/assets/css/index.css"
},
"engines": {
- "node": ">=6.9.1"
+ "node": ">=6.11.1"
},
"devDependencies": {
"chai": "^3.5.0",
| 12 |
diff --git a/assets/js/modules/analytics/components/settings/index.js b/assets/js/modules/analytics/components/settings/index.js export { default as SettingsEdit } from './SettingsEdit';
export { default as SettingsForm } from './SettingsForm';
-export { default as SettingsMain } from './SettingsMain';
export { default as SettingsView } from './SettingsView';
| 2 |
diff --git a/app/views/users/_show.html.haml b/app/views/users/_show.html.haml %p
= link_to t(:edit_account_settings_and_profile).html_safe, edit_person_path(current_user), :class => "btn btn-primary btn-lg btn-group-justified"
= render :partial => 'glance'
- - is_curator_or_site_admin = current_user.is_curator? || current_user.is_site_admin_of?( @user.site )
+ - is_curator_or_site_admin = logged_in? && ( current_user.is_curator? || current_user.is_site_admin_of?( @user.site ) )
- if logged_in? && ( current_user.is_admin? || is_curator_or_site_admin )
.row
.col-md-12
| 1 |
diff --git a/stories/module-analytics-setup.stories.js b/stories/module-analytics-setup.stories.js @@ -122,7 +122,15 @@ storiesOf( 'Analytics Module Setup', module )
dispatch( STORE_NAME ).receiveAccounts( accounts );
dispatch( STORE_NAME ).receiveProperties( properties );
dispatch( STORE_NAME ).receiveProfiles( profiles );
- dispatch( STORE_NAME ).receiveExistingTag( fixtures.getTagPermissionsNoAccess );
+ dispatch( STORE_NAME ).receiveExistingTag( {
+ accountID: '12345678',
+ propertyID: 'UA-12345678-1',
+ } );
+ dispatch( STORE_NAME ).receiveTagPermission( {
+ accountID: '12345678',
+ propertyID: 'UA-12345678-1',
+ permission: false,
+ } );
};
return <Setup callback={ setupRegistry } />;
| 12 |
diff --git a/src/botPage/bot/Interpreter.js b/src/botPage/bot/Interpreter.js @@ -163,7 +163,14 @@ export default class Interpreter {
this.loop();
}
terminateSession() {
+ const { socket } = this.$scope.api;
+ if (socket.readyState === 0) {
+ socket.addEventListener('open', () => {
this.$scope.api.disconnect();
+ });
+ } else if (socket.readyState === 1) {
+ this.$scope.api.disconnect();
+ }
this.stopped = true;
globalObserver.emit('bot.stop');
| 9 |
diff --git a/renderer/components/home/running.js b/renderer/components/home/running.js @@ -162,12 +162,12 @@ const RunningTest = ({
</Text>
</Flex>
)}
- {!logOpen && lottieOptions.animationData && (
+ {!logOpen && testGroup['animation'] && (
<Flex justifyContent='center'>
<Lottie
loop={true}
play={!stopping}
- animationData={testGroup['animation'] || null}
+ animationData={testGroup['animation']}
style={{ width: '300px', height: '300px', alignSelf: 'center' }}
rendererSettings={{
preserveAspectRatio: 'xMidYMid slice'
| 1 |
diff --git a/Source/Scene/ModelUtility.js b/Source/Scene/ModelUtility.js @@ -3,6 +3,7 @@ import Cartesian2 from "../Core/Cartesian2.js";
import Cartesian3 from "../Core/Cartesian3.js";
import Cartesian4 from "../Core/Cartesian4.js";
import clone from "../Core/clone.js";
+import defaultValue from "../Core/defaultValue.js";
import defined from "../Core/defined.js";
import Matrix2 from "../Core/Matrix2.js";
import Matrix3 from "../Core/Matrix3.js";
@@ -169,7 +170,12 @@ ModelUtility.getFailedLoadFunction = function (model, type, path) {
ModelUtility.parseBuffers = function (model, bufferLoad) {
const loadResources = model._loadResources;
- ForEach.buffer(model.gltfInternal, function (buffer, bufferViewId) {
+
+ // Model uses gltfInternal to avoid a deprecation warning,
+ // but ClassificationModel still uses gltf
+ const gltf = defaultValue(model.gltfInternal, model.gltf);
+
+ ForEach.buffer(gltf, function (buffer, bufferViewId) {
if (defined(buffer.extras._pipeline.source)) {
loadResources.buffers[bufferViewId] = buffer.extras._pipeline.source;
} else if (defined(bufferLoad)) {
@@ -195,7 +201,7 @@ const aMinScratch = new Cartesian3();
const aMaxScratch = new Cartesian3();
ModelUtility.computeBoundingSphere = function (model) {
- const gltf = model.gltfInternal;
+ const gltf = defaultValue(model.gltfInternal, model.gltf);
const gltfNodes = gltf.nodes;
const gltfMeshes = gltf.meshes;
const rootNodes = gltf.scenes[gltf.scene].nodes;
| 9 |
diff --git a/server/game/drawcard.js b/server/game/drawcard.js @@ -90,7 +90,7 @@ class DrawCard extends BaseCard {
}
isLimited() {
- return this.hasKeyword('Limited') || this.hasPrintedKeyword('Limited');
+ return this.hasKeyword('limited') || (!this.isBlank() && this.hasPrintedKeyword('limited'));
}
isStealth() {
| 11 |
diff --git a/components/button/__docs__/storybook-stories.jsx b/components/button/__docs__/storybook-stories.jsx @@ -39,7 +39,7 @@ storiesOf(BUTTON, module)
assistiveText: { icon: 'Icon' },
iconSize: 'large',
iconCategory: 'utility',
- iconName: 'edit',
+ iconName: 'answer',
title: 'chat',
})
)
| 13 |
diff --git a/docs_source/content/concepts/_index.md b/docs_source/content/concepts/_index.md @@ -27,7 +27,7 @@ sparta.Main(stackName,
## Lambda Function
-A Sparta-compatible lambda is a standard [AWS Lambda Go](https://docs.aws.amazon.com/lambda/latest/dg/go-programming-model-handler-types.html/) function. The following function signatures are supported:
+A Sparta-compatible lambda is a standard [AWS Lambda Go](https://docs.aws.amazon.com/lambda/latest/dg/go-programming-model-handler-types.html) function. The following function signatures are supported:
* `func ()`
* `func () error`
| 3 |
diff --git a/README.md b/README.md <p align="center">
- <a href="https://github.com/cryptofyre/Apple-Music-Electron"><img src="https://i.imgur.com/2ELPR6I.png" alt="Banner"></a>
+ <a href="https://github.com/cryptofyre/Apple-Music-Electron"><img src="https://i.imgur.com/NwV8LCq.png" alt="Banner"></a>
</p>
<p align="center">
| 3 |
diff --git a/src/structs/ArticleIDResolver.js b/src/structs/ArticleIDResolver.js @@ -3,47 +3,74 @@ const idTypeNames = ['guid', 'pubdate', 'title']
class ArticleIDResolver {
constructor () {
this.idsRecorded = {}
- this.useIdTypes = {}
- this.mergedTypeNames = [] // An extension of idTypeNames - must be an array to maintain order
+ this.useIdTypes = []
this.failedTypeNames = [] // Keep the order in which they are discarded - in case ALL id types fail, use the last one that failed
+ this.failedTypeNamesSet = new Set() // For O(1) access
+ this.mergedTypeNames = new Set()
+ // Push the merged names first - using multiple properties is more reliable
for (let i = 0; i < idTypeNames.length; ++i) {
const idType = idTypeNames[i]
this.idsRecorded[idType] = {}
- this.useIdTypes[idType] = true
for (let j = i + 1; j < idTypeNames.length; ++j) {
const nextIdType = idTypeNames[j]
const mergedName = `${idType},${nextIdType}`
this.idsRecorded[mergedName] = {}
- this.useIdTypes[mergedName] = true
- this.mergedTypeNames.push(mergedName)
+ this.useIdTypes.push(mergedName)
+ this.mergedTypeNames.add(mergedName)
}
}
+
+ // Push the single id types at the end
+ for (const name of idTypeNames) {
+ this.useIdTypes.push(name)
+ }
}
recordArticle (article) {
const { useIdTypes, idsRecorded } = this
- for (const idType in useIdTypes) {
- if (!useIdTypes[idType]) continue
+ // Start from the end, since that's where the non-merged id types are.
+ // The single-property id types should be marked failed first to check the merged id types
+ for (let i = useIdTypes.length - 1; i >= 0; --i) {
+ const idType = useIdTypes[i]
+ if (this.failedTypeNamesSet.has(idType)) continue
+
+ if (this.mergedTypeNames.has(idType)) {
+ const individualIDTypes = idType.split(',')
+ for (const singleIDType of individualIDTypes) {
+ if (this.failedTypeNamesSet.has(singleIDType) && !this.failedTypeNamesSet.has(idType)) {
+ this.failedTypeNames.push(idType)
+ this.failedTypeNamesSet.add(idType)
+ }
+ }
+ if (this.failedTypeNamesSet.has(idType)) continue
+ }
+
const articleValue = ArticleIDResolver.getIDTypeValue(article, idType)
if (!articleValue || idsRecorded[idType][articleValue]) {
- useIdTypes[idType] = false
+ // If the article value doesn't exist, or was already seen for this id type, then don't use it
this.failedTypeNames.push(idType)
- } else idsRecorded[idType][articleValue] = true
+ this.failedTypeNamesSet.add(idType)
+ } else {
+ idsRecorded[idType][articleValue] = true
+ }
}
}
getIDType () {
- const idTypes = idTypeNames.concat(this.mergedTypeNames)
- for (const idType of idTypes) {
- if (this.useIdTypes[idType]) return idType
+ for (const idType of this.useIdTypes) {
+ if (!this.failedTypeNamesSet.has(idType)) return idType
+ }
+ for (let i = this.failedTypeNames.length - 1; i >= 0; --i) {
+ const idType = this.failedTypeNames[i]
+ if (this.mergedTypeNames.has(idType)) return idType
}
- return this.failedTypeNames[this.failedTypeNames.length - 1]
+ // return this.failedTypeNames[this.failedTypeNames.length - 1]
}
static getIDTypeValue (article, idType) {
const properties = idType.split(',')
- return properties.map(property => article[property]).join('')
+ return properties.map(property => article[property] || '').join('')
}
}
| 7 |
diff --git a/docs/_headers b/docs/_headers x-frame-options: SAMEORIGIN
X-XSS-Protection: 1; mode=block
Referrer-Policy: no-referrer
- Content-Security-Policy: default-src 'self'; script-src 'unsafe-inline'; style-src 'unsafe-inline'
+ Content-Security-Policy: default-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'
/search/*
Content-Security-Policy: default-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'unsafe-inline';
| 11 |
diff --git a/token-metadata/0x5c872500c00565505F3624AB435c222E558E9ff8/metadata.json b/token-metadata/0x5c872500c00565505F3624AB435c222E558E9ff8/metadata.json "symbol": "COT",
"address": "0x5c872500c00565505F3624AB435c222E558E9ff8",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/eve/main.yml b/eve/main.yml @@ -561,6 +561,6 @@ stages:
- ShellCommand:
name: push dashboards to the production namespace
command: |
- oras push ${REGISTRY}/${PROJECT}-dev/${PROJECT}-dashboards:$revision ${LAYERS}
+ oras push ${REGISTRY}/${PROJECT}/${PROJECT}-dashboards:%(prop:tag)s ${LAYERS}
env: *oras
workdir: build/monitoring/
| 4 |
diff --git a/lib/assets/test/spec/dashboard/components/support-view.spec.js b/lib/assets/test/spec/dashboard/components/support-view.spec.js @@ -9,7 +9,7 @@ const DISPLAY_EMAIL = '[email protected]';
describe('dashboard/components/support_view', function () {
beforeEach(function () {
- var configModel = new ConfigModel({
+ const configModel = new ConfigModel({
base_url: 'http://pepe.carto.com'
});
@@ -103,7 +103,6 @@ describe('dashboard/components/support_view', function () {
describe('user is org owner', function () {
it('should get user type', function () {
- debugger;
spyOn(this.view._userModel, 'isOrgOwner').and.returnValue(true);
expect(this.view._getUserType()).toBe('org_admin');
| 2 |
diff --git a/app/shared/containers/Global/App/Disconnected.js b/app/shared/containers/Global/App/Disconnected.js @@ -61,6 +61,11 @@ class DisconnectedContainer extends Component<Props> {
const {
open
} = this.state;
+ // If this is a cold wallet, ignore.
+ if (settings.walletMode === 'cold') {
+ return false;
+ }
+ // If node is successfully connected, ignore.
if (validate.NODE === 'SUCCESS') {
return false;
}
| 8 |
diff --git a/packages/pageflow/.eslintrc.js b/packages/pageflow/.eslintrc.js @@ -34,6 +34,12 @@ module.exports = {
"node": true
}
},
+ {
+ "files": ["src/frontend/**/*.js", "spec/frontend/**/*.js"],
+ "globals": {
+ "pageflow": true
+ }
+ },
{
"files": ["spec/**/*.js"],
"env": {
| 11 |
diff --git a/source/index/contracts/Index.sol b/source/index/contracts/Index.sol @@ -153,25 +153,26 @@ contract Index is Ownable {
* @return address The next identifier to provide for pagination
*/
function getLocators(
- address start,
+ address cursor,
uint256 limit
) external view returns (
bytes32[] memory locators,
uint256[] memory scores,
address nextCursor
) {
+ address identifier;
// If a valid start is provided, start there.
- if (start != address(0) && start != HEAD) {
+ if (cursor != address(0) && cursor != HEAD) {
// Check that the provided start exists.
- require(_hasEntry(start), "START_ENTRY_NOT_FOUND");
+ require(_hasEntry(cursor), "START_ENTRY_NOT_FOUND");
// Set the cursor to the provided start.
- nextCursor = start;
+ identifier = cursor;
} else {
- nextCursor = entries[HEAD].next;
+ identifier = entries[HEAD].next;
}
- // Although it's not known how many entries are between `start` and the end
+ // Although it's not known how many entries are between `cursor` and the end
// We know that it is no more than `length`
uint256 size = (length < limit) ? length : limit;
@@ -181,13 +182,13 @@ contract Index is Ownable {
// Iterate over the list until the end or size.
uint256 i;
while (i < size && nextCursor != HEAD) {
- locators[i] = entries[nextCursor].locator;
- scores[i] = entries[nextCursor].score;
+ locators[i] = entries[identifier].locator;
+ scores[i] = entries[identifier].score;
i = i + 1;
- nextCursor = entries[nextCursor].next;
+ identifier = entries[identifier].next;
}
- return (locators, scores, nextCursor);
+ return (locators, scores, identifier);
}
/**
| 10 |
diff --git a/test/updates.spec.js b/test/updates.spec.js -var chai = require('chai');
-var sinonChai = require('sinon-chai');
-var chaiAsPromised = require('chai-as-promised');
-chai.use(sinonChai);
-chai.use(chaiAsPromised);
-var expect = chai.expect;
var fs = require('fs');
var path = require('path');
+const { expect } = require('./test-setup');
var Parser = require('binary-version-reader').HalModuleParser;
describe('the update firmware binaries are all valid', () => {
var updateDir = path.resolve(__dirname, '../assets/updates');
- function getUpdateFiles() {
- return fs.readdirSync(updateDir);
- }
-
- function getFilesizeInBytes(filename) {
- var stats = fs.statSync(filename);
- var fileSizeInBytes = stats.size;
- return fileSizeInBytes;
- }
-
it('has update files', () => {
- expect(getUpdateFiles()).to.have.property('length').greaterThan(0);
+ expect(getUpdateFiles(updateDir)).to.have.property('length').greaterThan(0);
});
describe('update files validity check', () => {
- for (var updateFiles = getUpdateFiles(), i=0; i<updateFiles.length; i++) {
- var updateFile = path.join(updateDir, updateFiles[i]);
- ((updateFile, fileName) => {
- describe('binary file '+fileName, () => {
+ const updateFiles = getUpdateFiles(updateDir);
+
+ updateFiles.forEach(file => {
+ const filename = path.join(updateDir, file);
+
+ describe(`binary file: ${file}`, () => {
it('is non-zero in size', () => {
- expect(getFilesizeInBytes(updateFile)).to.be.greaterThan(0);
+ const size = getFilesizeInBytes(filename);
+ expect(size).to.be.greaterThan(0);
});
it('has a valid crc ', () => {
- var parser = new Parser();
- return parser.parseFile(updateFile).then(fileInfo => {
+ return new Parser().parseFile(filename).then(fileInfo => {
if (fileInfo.suffixInfo.suffixSize === 65535) {
throw new Error(fileInfo.filename + ' does not contain inspection information');
}
@@ -50,7 +37,22 @@ describe('the update firmware binaries are all valid', () => {
});
});
});
- })(updateFile, updateFiles[i]);
- }
});
});
+
+ function getUpdateFiles(dir){
+ const files = fs.readdirSync(dir);
+
+ if (!files || !files.length){
+ throw new Error(`Could not load update files from: ${dir}`);
+ }
+
+ return files.filter(f => f.endsWith('.bin'));
+ }
+
+ function getFilesizeInBytes(filename){
+ var stats = fs.statSync(filename);
+ var fileSizeInBytes = stats.size;
+ return fileSizeInBytes;
+ }
+});
| 8 |
diff --git a/builds/jenkins-build-sls-app/Jenkinsfile b/builds/jenkins-build-sls-app/Jenkinsfile @@ -197,7 +197,7 @@ node() {
stage('Build') {
events.sendStartedEvent('BUILD', 'build starts', context_map, environment_logical_id)
try {
- buildLambda(runtime, repo_name)
+ buildSlsApp(runtime, repo_name)
} catch (ex) {
events.sendFailureEvent('BUILD', ex.getMessage(), context_map, environment_logical_id)
events.sendFailureEvent('UPDATE_DEPLOYMENT', ex.getMessage(), environmentDeploymentMetadata.generateDeploymentMap("failed", environment_logical_id, gitCommitHash), environment_logical_id)
@@ -650,7 +650,7 @@ def LoadConfiguration() {
/** Build project based on runtime
*/
-def buildLambda(String runtime, String repo_name) {
+def buildSlsApp(String runtime, String repo_name) {
echo "installing dependencies for $runtime"
if (runtime.indexOf("nodejs") > -1) {
sh "npm install --save"
| 10 |
diff --git a/token-metadata/0x45f24BaEef268BB6d63AEe5129015d69702BCDfa/metadata.json b/token-metadata/0x45f24BaEef268BB6d63AEe5129015d69702BCDfa/metadata.json "symbol": "YFV",
"address": "0x45f24BaEef268BB6d63AEe5129015d69702BCDfa",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/reducers/account/index.js b/src/reducers/account/index.js @@ -14,7 +14,8 @@ import {
getLedgerKey,
updateStakingAccount,
updateStakingLockup,
- getBalance
+ getBalance,
+ selectAccount
} from '../../actions/account'
const initialState = {
@@ -146,6 +147,9 @@ const account = handleActions({
...payload
}
}),
+ [selectAccount]: () => {
+ return initialState
+ }
}, initialState)
export default reduceReducers(
| 9 |
diff --git a/src/plots/cartesian/axis_defaults.js b/src/plots/cartesian/axis_defaults.js @@ -165,17 +165,19 @@ function rangebreaksDefaults(itemIn, itemOut, containerOut) {
var dfltPattern = '';
var i, q;
- for(i = 0; i < bnds.length; i++) {
+ if(bnds.length === 2) {
+ for(i = 0; i < 2; i++) {
q = indexOfDay(bnds[i]);
if(q) {
dfltPattern = DAY_OF_WEEK;
break;
}
}
+ }
var pattern = coerce('pattern', dfltPattern);
- if(pattern === DAY_OF_WEEK) {
- for(i = 0; i < bnds.length; i++) {
+ if(bnds.length === 2 && pattern === DAY_OF_WEEK) {
+ for(i = 0; i < 2; i++) {
q = indexOfDay(bnds[i]);
if(q) {
// convert to integers i.e 'Sunday' --> 0
| 7 |
diff --git a/appveyor.yml b/appveyor.yml @@ -10,6 +10,7 @@ environment:
install:
- set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
- ps: Install-Product node $env:nodejs_version
+ - bundle config --local path vendor/bundle
- gem install bundler --no-ri --no-rdoc --version '1.13.7'
- sh script/bootstrap
@@ -22,14 +23,11 @@ before_test:
- gem -v
- bundle -v
-after_test:
- - bundle package
-
test_script:
- sh script/cibuild
cache:
- - vendor/cache
+ - vendor/bundle
- node_modules
init:
| 13 |
diff --git a/articles/api/authentication/api-authz/_get-token.md b/articles/api/authentication/api-authz/_get-token.md @@ -105,6 +105,10 @@ If you have just executed the [Authorization Code Grant](#authorization-code-gra
1. At the *OAuth2 / OIDC* tab, set the field **Authorization Code** to the code you retrieved from [Authorization Code Grant](#authorization-code-grant). Click **OAuth2 Code Exchange**.
+### Error Codes
+
+For the complete error code reference for this endpoint refer to [Errors > POST /oauth/token](#post-oauth-token).
+
### More Information
- [Calling APIs from Server-side Web Apps](/api-auth/grant/authorization-code)
@@ -197,6 +201,11 @@ If you have just executed the [Authorization Code Grant (PKCE)](#authorization-c
1. At the *OAuth2 / OIDC* tab, set the field **Authorization Code** to the code you retrieved from [Authorization Code Grant](#authorization-code-grant-pkce-), and the **Code Verifier** to the key. Click **OAuth2 Code Exchange**.
+### Error Codes
+
+For the complete error code reference for this endpoint refer to [Errors > POST /oauth/token](#post-oauth-token).
+
+
### More Information
- [Calling APIs from Mobile Apps](/api-auth/grant/authorization-code-pkce)
@@ -286,6 +295,10 @@ This is the OAuth 2.0 grant that server processes utilize in order to access an
1. At the *OAuth2 / OIDC* tab, click **OAuth2 Client Credentials**.
+### Error Codes
+
+For the complete error code reference for this endpoint refer to [Errors > POST /oauth/token](#post-oauth-token).
+
### More Information
- [Calling APIs from a Service](/api-auth/grant/client-credentials)
@@ -395,6 +408,10 @@ This is the OAuth 2.0 grant that highly trusted apps utilize in order to access
- To add realm support set the `grant_type` to `http://auth0.com/oauth/grant-type/password-realm`, and the `realm` to the realm the user belongs. This maps to a connection in Auth0. For example, if you have configured a database connection for your internal employees and you have named the connection `employees`, then use this value. For more information on how to implement this refer to: [Realm Support](/api-auth/tutorials/password-grant#realm-support).
+### Error Codes
+
+For the complete error code reference for this endpoint refer to [Errors > POST /oauth/token](#post-oauth-token).
+
### More Information
- [Calling APIs from Highly Trusted Clients](/api-auth/grant/password)
| 0 |
diff --git a/tests/integration/did.test.js b/tests/integration/did.test.js @@ -69,8 +69,8 @@ describe('DID Module', () => {
const currentController = getHexIdentifierFromDID(originalDoc.publicKey[0].controller);
// Send key update without changing controller
- const [keyUpdateNone, signatureNone] = await createSignedKeyUpdate(dock.did, dockDID, publicKey, pair);
- await dock.sendTransaction(dock.did.updateKey(keyUpdateNone, signatureNone));
+ const [keyUpdateNoModify, signatureNoModify] = await createSignedKeyUpdate(dock.did, dockDID, publicKey, pair);
+ await dock.sendTransaction(dock.did.updateKey(keyUpdateNoModify, signatureNoModify));
const currentResult = await dock.did.getDocument(dockDID);
const currentControllerFromChain = getHexIdentifierFromDID(currentResult.publicKey[0].controller);
expect(currentControllerFromChain).toBe(currentController);
| 10 |
diff --git a/articles/multifactor-authentication/developer/step-up-authentication.md b/articles/multifactor-authentication/developer/step-up-authentication.md @@ -14,7 +14,7 @@ You can add step-up authentication to your app with Auth0's extensible multifact
## Step-up Authentication for APIs
-You can implement step-up authentication with Auth0 using [scopes](/scopes), [Access Tokens](/tokens/access-token) and [rules](/rules).
+When your audience is an API, you can implement step-up authentication with Auth0 using [scopes](/scopes), [Access Tokens](/tokens/access-token) and [rules](/rules).
::: note
An Access Token is a credential you can use to access an API. The actions that you can perform to that API are defined by the scopes your Access Token includes. The rules are JavaScript functions you can use to run custom logic when a user authenticates.
@@ -32,7 +32,7 @@ The Access Token that the user currently has does not include this scope and the
The solution is that the client performs another authentication call, but this time it requests the required scope. The browser redirects to Auth0 and a rule is used to challenge the user to authenticate with MFA since a high-value scope was requested.
-The result is a new Access Token which includes the high-value scope. The client will discard the token (that is, not store it in local storage like the original token) thereby treating it like a single-use token.
+Once the user successfully authenticates with MFA, a new Access Token which includes the high-value scope is generated and sent. The client will pass the Access Token to the API which will discard it after verification, thereby treating it like a single-use token.
## Step-up Authentication for Web Apps
| 3 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.