code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/lib/applydamage.js b/lib/applydamage.js @@ -174,13 +174,13 @@ export default class ApplyDamageDialog extends Application {
if (!publicly) {
if (this.doofus.hasPlayerOwner) {
- messageData.whisper = [{ alias: this.doofus.data.name, _id: this.doofus._id }]
+ let users = this.doofus.getUsers(CONST.ENTITY_PERMISSIONS.OWNER, true)
+ let ids = users.map(it => it._id)
+ messageData.whisper = ids
messageData.type = CONST.CHAT_MESSAGE_TYPES.WHISPER
}
}
- let ids = CONFIG.ChatMessage.entityClass.getWhisperRecipients(this.doofus.data.name)
-
CONFIG.ChatMessage.entityClass.create(messageData);
this.close()
})
| 1 |
diff --git a/workflow/forms.py b/workflow/forms.py @@ -21,7 +21,7 @@ from .models import (
ActivityUser, Contact, Sector, Country, ProfileType,
)
from indicators.models import (
- CollectedData, Indicator, PeriodicTarget, Level,
+ CollectedData, Indicator, PeriodicTarget,
)
from crispy_forms.layout import LayoutObject, TEMPLATE_PACK
from activity.util import get_country
@@ -373,7 +373,6 @@ class ProjectAgreementSimpleForm(forms.ModelForm):
self.fields['approval'].label = '{} Status'.format(
self.request.user.activity_user.organization.level_2_label)
-
# override the stakeholder queryset to use request.user for country
self.fields['stakeholder'].queryset = Stakeholder.objects.filter(
organization=self.request.user.activity_user.organization)
@@ -1162,7 +1161,7 @@ class SiteProfileForm(forms.ModelForm):
class Meta:
model = SiteProfile
- exclude = ['create_date', 'edit_date']
+ exclude = ['create_date', 'edit_date', 'organizations']
date_of_firstcontact = forms.DateField(
widget=DatePicker.DateInput(), required=False)
| 3 |
diff --git a/test/jasmine/tests/cartesian_interact_test.js b/test/jasmine/tests/cartesian_interact_test.js @@ -2422,6 +2422,12 @@ describe('Cartesian plots with css transforms', function() {
}
};
+ var bbox = {
+ one: { x0: 20, x1: 180, y0: 273.33, y1: 273.33 },
+ two: { x0: 220, x1: 380, y0: 146.67, y1: 146.67 },
+ three: { x0: 420, x1: 580, y0: 20, y1: 20 }
+ };
+
[{
transform: 'scaleX(0.5)',
hovered: 1,
@@ -2436,12 +2442,14 @@ describe('Cartesian plots with css transforms', function() {
selected: {numPoints: 3, selectedLabels: ['one', 'two', 'three']}
}].forEach(function(t) {
var transform = t.transform;
-
it('hover behaves correctly after css transform: ' + transform, function(done) {
+ var _bboxRecordings = {};
+
function _hoverAndAssertEventOccurred(point, label) {
return _hover(point)
.then(function() {
expect(eventRecordings[label]).toBe(t.hovered);
+ expect(_bboxRecordings[label]).toEqual(bbox[label]);
})
.then(function() {
_unhover(point);
@@ -2454,6 +2462,7 @@ describe('Cartesian plots with css transforms', function() {
gd.on('plotly_hover', function(d) {
eventRecordings[d.points[0].x] = 1;
+ _bboxRecordings[d.points[0].x] = d.points[0].bbox;
});
})
.then(function() {_hoverAndAssertEventOccurred(points[0], xLabels[0]);})
| 0 |
diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php @@ -993,15 +993,9 @@ App::get('/v1/account/sessions/:sessionId')
? Auth::sessionVerify($user->getAttribute('sessions'), Auth::$secret)
: $sessionId;
- $session = $projectDB->getCollectionFirst([ // Get user by sessionId
- 'limit' => 1,
- 'filters' => [
- '$collection='.Database::SYSTEM_COLLECTION_SESSIONS,
- '$id='.$sessionId,
- ],
- ]);
+ $session = $projectDB->getDocument($sessionId); // get user by session ID
- if ($session == false) {
+ if (empty($session->getId()) || Database::SYSTEM_COLLECTION_SESSIONS != $session->getCollection()) {
throw new Exception('Session not found', 404);
};
| 14 |
diff --git a/src/mixins/crownConfig.js b/src/mixins/crownConfig.js @@ -78,7 +78,7 @@ export default {
},
removeShape() {
this.graph.getConnectedLinks(this.shape).forEach(shape => this.$emit('remove-node', shape.component.node));
- this.shape.getEmbeddedCells().forEach(cell => {
+ this.shape.getEmbeddedCells({deep: true}).forEach(cell => {
if (cell.component) {
this.graph.getConnectedLinks(cell).forEach(shape => this.$emit('remove-node', shape.component.node));
this.shape.unembed(cell);
| 2 |
diff --git a/core/algorithm-operator/lib/templates/algorithm-builder.js b/core/algorithm-operator/lib/templates/algorithm-builder.js @@ -55,6 +55,14 @@ const jobTemplate = {
}
}
},
+ {
+ name: 'NAMESPACE',
+ valueFrom: {
+ fieldRef: {
+ fieldPath: 'metadata.namespace'
+ }
+ }
+ },
{
name: 'CLUSTER_NAME',
valueFrom: {
| 0 |
diff --git a/bin/build.js b/bin/build.js @@ -43,20 +43,19 @@ function create(temp,name,output){
.tap(env=>{
if(!env["QNA-DEV-BUCKET"]){
console.log("Launch dev/bucket to have scratch space for large template")
- }
- })
- .tap(env=>
- s3.putObject({
+ }else{
+ return s3.putObject({
Bucket:env["QNA-DEV-BUCKET"],
Key:"scratch/"+name+".json",
Body:temp
}).promise()
- )
- .tap(env=>console.log(chalk.green(`uploaded to s3:${env["QNA-DEV-BUCKET"]}/scratch/${name}.json`)))
- .then(env=>cf.validateTemplate({
+ .tap(()=>console.log(chalk.green(`uploaded to s3:${env["QNA-DEV-BUCKET"]}/scratch/${name}.json`)))
+ .then(()=>cf.validateTemplate({
TemplateURL:`http://s3.amazonaws.com/${env["QNA-DEV-BUCKET"]}/scratch/${name}.json`
}).promise())
}
+ })
+ }
return val
.tap(()=>console.log(chalk.green(name+" is valid")))
| 1 |
diff --git a/token-metadata/0x446C9033E7516D820cc9a2ce2d0B7328b579406F/metadata.json b/token-metadata/0x446C9033E7516D820cc9a2ce2d0B7328b579406F/metadata.json "symbol": "SOLVE",
"address": "0x446C9033E7516D820cc9a2ce2d0B7328b579406F",
"decimals": 8,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/bin/resources/app/themes/dark/dark.css b/bin/resources/app/themes/dark/dark.css background: #222222;
color: #D0D0D0;
}
-.treeview .header:hover, .treeview .header:hover > span,
-.treeview .item:hover, .treeview .item:hover > span {
+.treeview .header:not(:active):hover, .treeview .header:not(:active):hover > span,
+.treeview .item:not(:active):hover, .treeview .item:not(:active):hover > span {
background: #495057;
}
.treeview .dir .header, .treeview .item, .treeview .items {
| 1 |
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js @@ -2597,10 +2597,10 @@ axes.drawLabels = function(gd, ax, opts) {
var seq = [allLabelsReady];
- // N.B. during auto-margin redraw, if the axis fixed its label overlaps
+ // N.B. during auto-margin redraws, if the axis fixed its label overlaps
// by rotating 90 degrees, do not attempt to re-fix its label overlaps
// as this can lead to infinite redraw loops!
- if(fullLayout._redrawFromAutoMarginCount && prevAngle === 90) {
+ if(ax.automargin && fullLayout._redrawFromAutoMarginCount && prevAngle === 90) {
autoangle = 90;
seq.push(function() {
positionLabels(tickLabels, prevAngle);
| 0 |
diff --git a/bin/local-env/includes.sh b/bin/local-env/includes.sh @@ -6,6 +6,8 @@ DOCKER_COMPOSE_FILE_OPTIONS="-f $(dirname "$0")/docker-compose.yml"
CLI='cli'
CONTAINER='wordpress'
SITE_TITLE='Google Site Kit Dev'
+# Set the name of the Docker Compose project.
+export COMPOSE_PROJECT_NAME='googlesitekit-e2e'
##
# Ask a Yes/No question, and way for a reply.
| 12 |
diff --git a/src/components/Modeler.vue b/src/components/Modeler.vue @@ -646,8 +646,8 @@ export default {
this.paper.setDimensions(clientWidth, clientHeight);
},
isPointOverPaper(mouseX, mouseY) {
- const { x, y, width, height } = this.$refs['paper-container'].getBoundingClientRect();
- const rect = new joint.g.rect(x, y, width, height);
+ const { left, top, width, height } = this.$refs['paper-container'].getBoundingClientRect();
+ const rect = new joint.g.rect(left, top, width, height);
const point = new joint.g.point(mouseX, mouseY);
return rect.containsPoint(point);
| 14 |
diff --git a/README.md b/README.md @@ -72,4 +72,5 @@ For starter apps and templates, see [create-snowpack-app](./create-snowpack-app)
- [snowpack-plugin-stylus](https://github.com/fansenze/snowpack-plugin-stylus) Use the [Stylus](https://github.com/stylus/stylus) compiler to build `.styl` files from source.
- [snowpack-plugin-inliner](https://github.com/fansenze/snowpack-plugin-inliner) A plugin for snowpack which transforms files into base64 URIs.
- [snowpack-plugin-relative-css-urls](https://github.com/canadaduane/snowpack-plugin-relative-css-urls) Keep your image assets and CSS together within the same component directories.
+- [snowpack-plugin-replace](https://github.com/moonrailgun/snowpack-plugin-replace) A plugin for replace file content with `string` or `RegExp`, useful for migrate or make some magic without modify source code
- PRs that add a link to this list are welcome!
| 0 |
diff --git a/website/themes/uppy/layout/index.ejs b/website/themes/uppy/layout/index.ejs <p><%- config.description %></p>
</div>
<div class="IndexAbout-item">
- <img class="IndexAbout-icon" src="/images/transloadit-logo.png">
+ <a href="https://transloadit.com"><img class="IndexAbout-icon" src="/images/transloadit-logo.png"></a>
<h2 class="IndexSection-title">Open Source</h2>
<p><%- config.descriptionWho %></p>
</div>
| 0 |
diff --git a/test/jasmine/tests/polar_test.js b/test/jasmine/tests/polar_test.js @@ -1138,6 +1138,8 @@ describe('Test polar *gridshape linear* interactions', function() {
});
it('should rotate all non-symmetrical layers on angular drag', function(done) {
+ var evtCnt = 0;
+ var evtData = {};
var dragCoverNode;
var p1;
@@ -1194,6 +1196,12 @@ describe('Test polar *gridshape linear* interactions', function() {
height: 400,
margin: {l: 50, t: 50, b: 50, r: 50}
})
+ .then(function() {
+ gd.on('plotly_relayout', function(d) {
+ evtCnt++;
+ evtData = d;
+ });
+ })
.then(function() {
layersRotateFromZero.forEach(function(q) {
_assertTransformRotate('base', q, null);
@@ -1209,6 +1217,14 @@ describe('Test polar *gridshape linear* interactions', function() {
fromRadialAxis: -82.8
});
})
+ .then(function() {
+ expect(evtCnt).toBe(1, '# of plotly_relayout calls');
+ expect(evtData['polar.angularaxis.rotation'])
+ .toBeCloseTo(82.8, 1, 'polar.angularaxis.rotation event data');
+ // have to rotate radial axis too here, to ensure it remains 'on scale'
+ expect(evtData['polar.radialaxis.angle'])
+ .toBeCloseTo(82.8, 1, 'polar.radialaxis.angle event data');
+ })
.catch(failTest)
.then(done);
});
| 0 |
diff --git a/lib/components/user/user-account-screen.js b/lib/components/user/user-account-screen.js @@ -30,7 +30,7 @@ function getStateForNewUser (auth0User) {
email: auth0User.email,
hasConsentedToTerms: false, // User must agree to terms.
isEmailVerified: auth0User.email_verified,
- notificationChannels: ['email'],
+ notificationChannel: 'email',
phoneNumber: '',
recentLocations: [],
savedLocations: [],
@@ -46,6 +46,10 @@ const allowedNotificationChannels = [
{
type: 'sms',
text: 'SMS'
+ },
+ {
+ type: 'none',
+ text: 'Don\'t notify me'
}
]
@@ -262,7 +266,7 @@ class UserAccountScreen extends Component {
}
_handleNotificationChannelChange = e => {
- this._updateUserState({ notificationChannels: e })
+ this._updateUserState({ notificationChannel: e })
}
_handleToNextPane = async panes => {
@@ -320,7 +324,7 @@ class UserAccountScreen extends Component {
const {
hasConsentedToTerms,
- notificationChannels = [],
+ notificationChannel = 'email',
phoneNumber,
savedLocations,
storeTripHistory
@@ -363,12 +367,12 @@ class UserAccountScreen extends Component {
<ToggleButtonGroup
name='notificationChannels'
onChange={this._handleNotificationChannelChange}
- type='checkbox'
- value={notificationChannels}
+ type='radio'
+ value={notificationChannel}
>
{allowedNotificationChannels.map(({ type, text }, index) => (
<ToggleButton
- bsStyle={notificationChannels.includes(type) ? 'primary' : 'default'}
+ bsStyle={notificationChannel === type ? 'primary' : 'default'}
key={index}
value={type}
>
@@ -381,13 +385,13 @@ class UserAccountScreen extends Component {
<div
style={{height: '150px'}} // preserve height of pane.
>
- {notificationChannels.includes('email') && (
+ {notificationChannel === 'email' && (
<FormGroup>
<ControlLabel>Notification emails will be sent out to:</ControlLabel>
<FormControl disabled type='text' value={userData.email} />
</FormGroup>
)}
- {notificationChannels.includes('sms') && (
+ {notificationChannel === 'sms' && (
<FormGroup>
<ControlLabel>Enter your phone number for SMS notifications:</ControlLabel>
<FormControl onChange={this._handlePhoneNumberChange} type='tel' value={phoneNumber} />
@@ -475,7 +479,7 @@ class UserAccountScreen extends Component {
const panesForNewAccount = {
terms: { title: 'Create a new account', pane: termsOfUsePane, nextId: 'notifications', disableNext: !hasConsentedToTerms },
- notifications: { title: 'Notification preferences', pane: notificationPrefsPane, nextId: notificationChannels.includes('sms') ? 'verifyPhone' : 'places', prevId: 'terms' },
+ notifications: { title: 'Notification preferences', pane: notificationPrefsPane, nextId: notificationChannel === 'sms' ? 'verifyPhone' : 'places', prevId: 'terms' },
verifyPhone: { title: 'Verify your phone', pane: phoneVerificationPane, nextId: 'places', prevId: 'notifications', disableNext: true },
places: { title: 'Add your locations', pane: placesPane, nextId: 'finish', prevId: 'notifications' },
finish: { title: 'Account setup complete!', pane: finishPane, prevId: 'places' }
| 13 |
diff --git a/Makefile b/Makefile @@ -168,7 +168,8 @@ R_FILENAME_EXT ?= R
SHELL_FILENAME_EXT ?= sh
SVG_FILENAME_EXT ?= svg
TEXT_FILENAME_EXT ?= txt
-WEBASSEMBLY_FILENAME_EXT ?= wasm
+WASM_FILENAME_EXT ?= wasm
+WAT_FILENAME_EXT ?= wat
YAML_FILENAME_EXT ?= yml
# Define Node paths:
| 10 |
diff --git a/shared/testing/setup-test-framework.js b/shared/testing/setup-test-framework.js const mockDb = require('./db');
// Wait for 15s before timing out, this is useful for e2e tests which have a tendency to time out
-jest.setTimeout(15000);
+jest.setTimeout(30000);
// Mock the database
jest.mock('iris/models/db', () => ({
| 12 |
diff --git a/src/main/java/org/cboard/dataprovider/aggregator/jvm/JvmAggregator.java b/src/main/java/org/cboard/dataprovider/aggregator/jvm/JvmAggregator.java @@ -124,39 +124,6 @@ public class JvmAggregator extends InnerAggregator {
return new AggregateResult(dimensionList, result);
}
- public AggregateResult queryAggData(AggConfig config, String[][] data) throws Exception {
- Map<String, Integer> columnIndex = getColumnIndex(data);
- Filter rowFilter = new Filter(config, columnIndex);
-
- Stream<ColumnIndex> columns = config.getColumns().stream().map(ColumnIndex::fromDimensionConfig);
- Stream<ColumnIndex> rows = config.getRows().stream().map(ColumnIndex::fromDimensionConfig);
- List<ColumnIndex> valuesList = config.getValues().stream().map(ColumnIndex::fromValueConfig).collect(Collectors.toList());
- List<ColumnIndex> dimensionList = Stream.concat(columns, rows).collect(Collectors.toList());
- dimensionList.forEach(e -> e.setIndex(columnIndex.get(e.getName())));
- valuesList.forEach(e -> e.setIndex(columnIndex.get(e.getName())));
-
- Map<Dimensions, Double[]> grouped = Arrays.stream(data).skip(1).filter(rowFilter::filter)
- .collect(Collectors.groupingBy(row -> {
- String[] ds = dimensionList.stream().map(d -> row[d.getIndex()]).toArray(String[]::new);
- return new Dimensions(ds);
- }, AggregateCollector.getCollector(valuesList)));
-
- String[][] result = new String[grouped.keySet().size()][dimensionList.size() + valuesList.size()];
- int i = 0;
- for (Dimensions d : grouped.keySet()) {
- result[i++] = Stream.concat(Arrays.stream(d.dimensions), Arrays.stream(grouped.get(d)).map(e -> e.toString())).toArray(String[]::new);
- }
- int dimSize = dimensionList.size();
- for (String[] row : result) {
- IntStream.range(0, dimSize).forEach(d -> {
- if (row[d] == null) row[d] = NULL_STRING;
- });
- }
- dimensionList.addAll(valuesList);
- IntStream.range(0, dimensionList.size()).forEach(j -> dimensionList.get(j).setIndex(j));
- return new AggregateResult(dimensionList, result);
- }
-
private class Dimensions {
private String[] dimensions;
| 3 |
diff --git a/src/backend.github.js b/src/backend.github.js @@ -332,7 +332,7 @@ var _ = Mavo.Backend.register($.Class({
// raw API call, stop parsing and just return
return {};
}
- else if (/github.com$/.test(url.host) && path[0] == "blob") {
+ else if (path[0] == "blob") {
path.shift();
ret.branch = path.shift();
}
| 11 |
diff --git a/src/js/components/Grid/__tests__/Grid-test.js b/src/js/components/Grid/__tests__/Grid-test.js @@ -234,7 +234,7 @@ describe('Grid', () => {
expect(tree).toMatchSnapshot();
});
- test.only('border', () => {
+ test('border', () => {
const component = renderer.create(
<Grommet>
<Grid border="all" />
| 1 |
diff --git a/src/encoded/static/components/award.js b/src/encoded/static/components/award.js @@ -641,7 +641,6 @@ const ExperimentDate = (props) => {
const { experiments } = props;
let dateArray;
let accumulator = 0;
- let standardDate;
// 'no-const-assign': 0;
// const experimentsConfig = searchData.experiments;
@@ -650,7 +649,7 @@ const ExperimentDate = (props) => {
dateArray = (categoryFacet && categoryFacet.terms && categoryFacet.terms.length) ? categoryFacet.terms : [];
}
const standardTerms = dateArray.map((term) => {
- standardDate = moment(term.key, 'MMMM, YYYY').format('YYYY-MM');
+ const standardDate = moment(term.key, 'MMMM, YYYY').format('YYYY-MM');
return { key: standardDate, doc_count: term.doc_count };
});
@@ -665,7 +664,7 @@ const ExperimentDate = (props) => {
const accumulatedData = sortedTerms.map((term) => {
accumulator += term.doc_count;
- return { key: standardDate, doc_count: accumulator };
+ return { key: term.key, doc_count: accumulator };
});
| 1 |
diff --git a/packages/vulcan-forms/lib/components/FormWrapper.jsx b/packages/vulcan-forms/lib/components/FormWrapper.jsx @@ -51,6 +51,8 @@ import {
import withCollectionProps from './withCollectionProps';
import { callbackProps } from './propTypes';
+const intlSuffix = '_intl';
+
class FormWrapper extends PureComponent {
constructor(props) {
super(props);
@@ -94,8 +96,11 @@ class FormWrapper extends PureComponent {
// if "fields" prop is specified, restrict list of fields to it
if (typeof fields !== 'undefined' && fields.length > 0) {
- queryFields = _.intersection(queryFields, fields);
- mutationFields = _.intersection(mutationFields, fields);
+ // add "_intl" suffix to all fields in case some of them are intl fields
+ const fieldsWithIntlSuffix = fields.map(field => `${field}${intlSuffix}`);
+ const allFields = [...fields, ...fieldsWithIntlSuffix];
+ queryFields = _.intersection(queryFields, allFields);
+ mutationFields = _.intersection(mutationFields, allFields);
}
// add "addFields" prop contents to list of fields
@@ -105,7 +110,7 @@ class FormWrapper extends PureComponent {
}
const convertFields = field => {
- return field.slice(-5) === '_intl' ? `${field}{ locale value }` : field;
+ return field.slice(-5) === intlSuffix ? `${field}{ locale value }` : field;
};
// generate query fragment based on the fields that can be edited. Note: always add _id.
| 9 |
diff --git a/articles/integrations/aws/tokens.md b/articles/integrations/aws/tokens.md @@ -185,14 +185,12 @@ Here is an example of client-side code used to obtain the token:
var options = {
id_token: LOGGED_IN_USER_ID_TOKEN,
- api: 'aws',
- role: AWS_ROLE_ARN,
- principal: AWS_SAML_PROVIDER_ARN
+ api: 'aws'
};
auth0.getDelegationToken(options, function(err, delegationResult){
if (!err){
- //use delegationResult.Credentials to access AWS API
+ // Use delegationResult.Credentials to access AWS API
}
});
}
| 2 |
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js @@ -415,6 +415,9 @@ function formatReportLastMessageText(lastMessageText) {
function getDefaultAvatar(login = '') {
// There are 24 possible default avatars, so we choose which one this user has based
// on a simple hash of their login
+ if (login === CONST.EMAIL.CONCIERGE) {
+ return CONST.CONCIERGE_ICON_URL;
+ }
const loginHashBucket = (Math.abs(hashCode(login.toLowerCase())) % 24) + 1;
return `${CONST.CLOUDFRONT_URL}/images/avatars/default-avatar_${loginHashBucket}.png`;
}
| 12 |
diff --git a/src/server/node_services/nodes_monitor.js b/src/server/node_services/nodes_monitor.js @@ -2761,7 +2761,6 @@ class NodesMonitor extends EventEmitter {
used_other: 0,
};
const data_activities = {};
- let data_activity_host_count = 0;
_.each(list, item => {
count += 1;
by_mode[item.mode] = (by_mode[item.mode] || 0) + 1;
@@ -2770,10 +2769,8 @@ class NodesMonitor extends EventEmitter {
by_service.GATEWAY += item.s3_nodes && item.s3_nodes.every(i => i.node.decommissioned) ? 0 : 1;
if (item.online) online += 1;
- let has_activity = false;
for (const storage_item of item.storage_nodes) {
if (storage_item.data_activity && !storage_item.data_activity.done) {
- has_activity = true;
const act = storage_item.data_activity;
const a =
data_activities[act.reason] =
@@ -2791,7 +2788,6 @@ class NodesMonitor extends EventEmitter {
a.time.end = Math.max(a.time.end, act.time.end || Infinity);
}
}
- if (has_activity) data_activity_host_count += 1;
const node_storage = item.node.storage;
_.forIn(storage, (value, key) => {
| 2 |
diff --git a/core/background/services/lastfm.js b/core/background/services/lastfm.js @@ -308,7 +308,13 @@ define([
var thumbUrl = song.getTrackArt();
if (thumbUrl === null) {
- thumbUrl = $doc.find('album > image[size="medium"]').text();
+ let imageSizes = ['extralarge', 'large', 'medium'];
+ for (let imageSize of imageSizes) {
+ thumbUrl = $doc.find(`album > image[size="${imageSize}"]`).text();
+ if (thumbUrl) {
+ break;
+ }
+ }
}
song.metadata.attr({
| 7 |
diff --git a/.github/workflows/ci-app.yml b/.github/workflows/ci-app.yml @@ -98,7 +98,7 @@ jobs:
- name: yarn test
working-directory: ./packages/app
run: |
- yarn test --selectProjects unit server
+ yarn test
env:
MONGO_URI: mongodb://localhost:${{ job.services.mongodb.ports['27017'] }}/growi_test
@@ -141,7 +141,7 @@ jobs:
- name: yarn test
working-directory: ./packages/app
run: |
- yarn test --selectProjects server-v5
+ yarn test-v5
env:
MONGO_URI: mongodb://localhost:${{ job.services.mongodb.ports['27017'] }}/growi_test_v5
| 7 |
diff --git a/source/Renderer/shaders/material_info.glsl b/source/Renderer/shaders/material_info.glsl @@ -204,7 +204,7 @@ MaterialInfo getMetallicRoughnessInfo(MaterialInfo info)
#endif
// Achromatic f0 based on IOR.
- info.c_diff = mix(info.baseColor.rgb * (vec3(1.0) - info.f0), vec3(0), info.metallic);
+ info.c_diff = mix(info.baseColor.rgb, vec3(0), info.metallic);
info.f0 = mix(info.f0, info.baseColor.rgb, info.metallic);
return info;
}
| 1 |
diff --git a/constants.js b/constants.js @@ -41,5 +41,6 @@ export const landHost = `https://${chainName}sidechain-land.webaverse.com`;
export const aiHost = `https://ai.webaverse.com`;
export const web3MainnetSidechainEndpoint = 'https://mainnetsidechain.exokit.org';
export const web3TestnetSidechainEndpoint = 'https://testnetsidechain.exokit.org';
-export const homeScnUrl = 'https://webaverse.github.io/street/street.scn';
+
+export const homeScnUrl = './scenes/street.scn';
export const worldUrl = 'worlds.webaverse.com';
\ No newline at end of file
| 4 |
diff --git a/src/traces/isosurface/attributes.js b/src/traces/isosurface/attributes.js @@ -97,7 +97,7 @@ module.exports = extendFlat({
editType: 'calc',
description: [
'Sets the 4th dimension of the vertices. It should be',
- 'one dimensional array containing n=width*height*depth numbers.'
+ 'one dimensional array containing n=X.length*Y.length*Z.length numbers.'
].join(' ')
},
isomin: {
| 2 |
diff --git a/helpers/Grocycode.php b/helpers/Grocycode.php @@ -77,7 +77,7 @@ class Grocycode
$gc = new self($code);
return true;
}
- catch (Exception $e)
+ catch (\Exception $e)
{
return false;
}
@@ -110,7 +110,7 @@ class Grocycode
*/
private function setFromCode($code)
{
- $parts = array_reverse(explode(':', $barcode));
+ $parts = array_reverse(explode(':', $code));
if (array_pop($parts) != self::MAGIC)
{
throw new \Exception('Not a grocycode');
@@ -122,7 +122,7 @@ class Grocycode
}
$this->id = array_pop($parts);
- $this->extra_data = array_reverse($parse);
+ $this->extra_data = array_reverse($parts);
}
/**
| 1 |
diff --git a/src/encoded/static/components/search.js b/src/encoded/static/components/search.js @@ -721,8 +721,9 @@ class Facet extends React.Component {
// Set initial React commponent state.
this.state = {
- filteredTerms: null,
initialState: true,
+ unsanitizedSearchTerm: '',
+ searchTerm: '',
};
// Bind `this` to non-React methods.
@@ -734,26 +735,11 @@ class Facet extends React.Component {
}
handleSearch(event) {
- // search term entered by the user
+ // Unsanitized search term entered by user for display
+ this.setState({ unsanitizedSearchTerm: event.target.value });
+ // Search term entered by the user
const filterVal = String(sanitizedString(event.target.value));
-
- // which facet terms match the search term entered by the user
- let terms = this.props.facet.terms.filter((term) => {
- if (term.doc_count > 0) {
- const termKey = sanitizedString(term.key);
- if (termKey.match(filterVal)) {
- return term;
- }
- return false;
- }
- return false;
- });
- // if the user has entered a value that is all spaces or asterisks, we want to give them an error message
- if (event.target.value.length > 0 && filterVal === '') {
- terms = [];
- }
- // when there is a search term entered, we want to show only filtered terms not all terms
- this.setState({ filteredTerms: terms });
+ this.setState({ searchTerm: filterVal });
}
render() {
@@ -763,6 +749,24 @@ class Facet extends React.Component {
const total = facet.total;
const typeahead = facet.type === 'typeahead';
+ // Filter facet terms to create list of those matching the search term entered by the user
+ // Note: this applies only to Typeahead facets
+ let filteredList = null;
+ if (typeahead && this.state.searchTerm !== '') {
+ filteredList = facet.terms.filter(
+ (term) => {
+ if (term.doc_count > 0) {
+ const termKey = sanitizedString(term.key);
+ if (termKey.match(this.state.searchTerm)) {
+ return term;
+ }
+ return null;
+ }
+ return null;
+ }
+ );
+ }
+
// Make a list of terms for this facet that should appear, by filtering out terms that
// shouldn't. Any terms with a zero doc_count get filtered out, unless the term appears in
// the search result filter list.
@@ -849,19 +853,19 @@ class Facet extends React.Component {
: null}
<ul className={`facet-list nav${statusFacet ? ' facet-status' : ''}`}>
{/* Display searchbar for typeahead facets if there are more than 5 terms */}
- {(typeahead && (terms.length >= displayedTermsCount)) ?
+ {typeahead ?
<div className="typeahead-entry" role="search">
<i className="icon icon-search" />
<div className="searchform">
- <input type="search" aria-label={`search to filter list of terms for facet ${titleComponent}`} placeholder="Search" value={this.state.value} onChange={this.handleSearch} name={`search${titleComponent.replace(/\s+/g, '')}`} />
+ <input type="search" aria-label={`search to filter list of terms for facet ${titleComponent}`} placeholder="Search" value={this.state.unsanitizedSearchTerm} onChange={this.handleSearch} name={`search${titleComponent.replace(/\s+/g, '')}`} />
</div>
</div>
: null}
{/* If user has searched using the typeahead, we will not display the full set of facet terms, just those matching the search */}
- {(this.state.filteredTerms !== null) ?
+ {(filteredList !== null) ?
<div>
{/* Display error message if there is a search but no results found */}
- {(this.state.filteredTerms.length === 0) ?
+ {(filteredList.length === 0) ?
<div className="searcherror">
Try a different search term for results.
</div>
@@ -871,12 +875,12 @@ class Facet extends React.Component {
<div className="top-shading hide-shading" />
{/* List of filtered terms */}
<div className={`term-list search${titleComponent.replace(/\s+/g, '')}`} onScroll={shadeOverflowOnScroll}>
- {this.state.filteredTerms.map(term =>
+ {filteredList.map(term =>
<TermComponent {...this.props} key={term.key} term={term} filters={filters} total={total} canDeselect={canDeselect} statusFacet={statusFacet} />
)}
</div>
{/* Only show bottom shading when list of results overflows */}
- <div className={`shading ${(this.state.filteredTerms.length < displayedTermsCount) ? 'hide-shading' : ''}`} />
+ <div className={`shading ${(filteredList.length < displayedTermsCount) ? 'hide-shading' : ''}`} />
</div>
}
</div>
| 3 |
diff --git a/token-metadata/0x048Fe49BE32adfC9ED68C37D32B5ec9Df17b3603/metadata.json b/token-metadata/0x048Fe49BE32adfC9ED68C37D32B5ec9Df17b3603/metadata.json "symbol": "SKM",
"address": "0x048Fe49BE32adfC9ED68C37D32B5ec9Df17b3603",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/articles/tokens/id-token.md b/articles/tokens/id-token.md @@ -64,7 +64,9 @@ If you are using [OAuth 2.0 API Authorization](/api-auth/tutorials/configuring-t
## Lifetime
-The `id_token` is valid for 10 hours (36000 seconds) by default. The value can be changed in the [Dashboard > Clients > Settings](${manage_url}/#/clients/${account.clientId}/settings) screen using the `JWT Expiration (seconds)` field.
+The purpose of the `id_token` is to cache user information for better performance and experience, and by default, the token is valid for 36000 seconds, or 10 hours. You may change this setting as you see fit; if there are security concerns, you may certainly shorten the time period before the token expires, but remember that the `id_token` helps ensure optimal performance by reducing the need to contact the Identity Provider every time the user performs an action that requires an API call.
+
+The expiration time can be changed in the [Dashboard > Clients > Settings](${manage_url}/#/clients/${account.clientId}/settings) screen using the `JWT Expiration (seconds)` field.
There are cases where you might want to renew your `id_token`. In order to do so, you can either perform another authorization flow with Auth0 (using the `/authorize` endpoint) or use a [Refresh Token](/tokens/refresh-token).
| 0 |
diff --git a/src/stores/tokensStore.js b/src/stores/tokensStore.js @@ -38,14 +38,17 @@ class TokensStore {
// Now we fetch the tokens from the localStorage
const tokens = store.get(this.lsKey);
+
if (!tokens) {
// If there's nothing in the localStorage, we add be default only
// Ethereum. We consider Ethereum as a token, with address 'ETH'
- this.addToken('ETH', {
+ this.tokens.replace({
+ ETH: {
address: 'ETH',
logo: ethereumIcon,
name: 'Ethereum',
symbol: 'ETH'
+ }
});
} else {
this.tokens.replace(tokens);
| 1 |
diff --git a/generators/entity/index.js b/generators/entity/index.js @@ -648,7 +648,9 @@ module.exports = class extends BaseGenerator {
if (relationship.relationshipType === 'many-to-one') {
if (otherEntityData && otherEntityData.relationships) {
otherEntityData.relationships.forEach((otherRelationship) => {
- if (otherRelationship.otherEntityRelationshipName === relationship.relationshipName && otherRelationship.relationshipType === 'one-to-many') {
+ if (_.upperFirst(otherRelationship.otherEntityName) === entityName &&
+ otherRelationship.otherEntityRelationshipName === relationship.relationshipName &&
+ otherRelationship.relationshipType === 'one-to-many') {
relationship.otherEntityRelationshipName = otherRelationship.relationshipName;
relationship.otherEntityRelationshipNamePlural = pluralize(otherRelationship.relationshipName);
}
| 1 |
diff --git a/test/codegen/newman/fixtures/formdataFileCollection.json b/test/codegen/newman/fixtures/formdataFileCollection.json "key": "single file",
"value": "",
"type": "file",
- "src": "/home/wolf/development/codegen_new/redsmoke/postman-code-generators/dummyFile1.txt"
+ "src": "<file path>"
},
{
"key": "multiple files",
"value": "",
"type": "file",
- "src": [
- "/home/wolf/development/codegen_new/redsmoke/postman-code-generators/dummyFile2.txt",
- "/home/wolf/development/codegen_new/redsmoke/postman-code-generators/dummyFile3.txt"
- ]
+ "src": ["<file path 1>","<file path 2>"]
}
]
},
| 13 |
diff --git a/assets/js/modules/analytics-4/components/dashboard/ActivationBanner/SetupBanner.js b/assets/js/modules/analytics-4/components/dashboard/ActivationBanner/SetupBanner.js @@ -43,11 +43,15 @@ import {
MODULES_ANALYTICS,
} from '../../../../analytics/datastore/constants';
import { CORE_USER } from '../../../../../googlesitekit/datastore/user/constants';
-import { ACTIVATION_ACKNOWLEDGEMENT_TOOLTIP_STATE_KEY } from '../../../constants';
+import {
+ ACTIVATION_ACKNOWLEDGEMENT_TOOLTIP_STATE_KEY,
+ GA4_ACTIVATION_BANNER_STATE,
+} from '../../../constants';
import { useTooltipState } from '../../../../../components/AdminMenuTooltip/useTooltipState';
import { useShowTooltip } from '../../../../../components/AdminMenuTooltip/useShowTooltip';
import { AdminMenuTooltip } from '../../../../../components/AdminMenuTooltip/AdminMenuTooltip';
import { getBannerDismissalExpiryTime } from '../../../utils/banner-dismissal-expiry';
+import { CORE_FORMS } from '../../../../../googlesitekit/datastore/forms/constants';
const { useDispatch, useSelect } = Data;
export default function SetupBanner( { onSubmitSuccess } ) {
@@ -74,8 +78,15 @@ export default function SetupBanner( { onSubmitSuccess } ) {
const { submitChanges, selectProperty } =
useDispatch( MODULES_ANALYTICS_4 );
+ const { setValues } = useDispatch( CORE_FORMS );
const handleSubmitChanges = useCallback( async () => {
+ if ( hasExistingProperty === false && hasEditScope === false ) {
+ setValues( GA4_ACTIVATION_BANNER_STATE, {
+ returnToSetupStep: true,
+ } );
+ }
+
const { error } = await submitChanges();
if ( error ) {
@@ -86,7 +97,13 @@ export default function SetupBanner( { onSubmitSuccess } ) {
// Ask the parent component to show the success banner.
onSubmitSuccess();
- }, [ onSubmitSuccess, submitChanges ] );
+ }, [
+ hasEditScope,
+ hasExistingProperty,
+ onSubmitSuccess,
+ setValues,
+ submitChanges,
+ ] );
const { isTooltipVisible } = useTooltipState(
ACTIVATION_ACKNOWLEDGEMENT_TOOLTIP_STATE_KEY
| 12 |
diff --git a/README.md b/README.md @@ -67,21 +67,21 @@ Note:
```html
<!-- Angular -->
- <script src="node_modules/angular-patternfly/node_modules/angular/angular.min.js"></script>
+ <script src="node_modules/angular/angular.min.js"></script>
<!-- Angular-Bootstrap -->
- <script src="node_modules/angular-patternfly/node_modules/angular-ui-bootstrap/dist/ui-bootstrap.js"></script>
- <script src="node_modules/angular-patternfly/node_modules/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js"></script>
+ <script src="node_modules/angular-ui-bootstrap/dist/ui-bootstrap.js"></script>
+ <script src="node_modules/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js"></script>
<!-- Angular-Sanitize -->
- <script src="node_modules/angular-patternfly/node_modules/angular-sanitize/angular-sanitize.min.js"></script>
+ <script src="node_modules/angular-sanitize/angular-sanitize.min.js"></script>
<!-- Angular-PatternFly -->
<script src="node_modules/angular-patternfly/dist/angular-patternfly.min.js"></script>
<!-- C3, D3 - Charting Libraries. Only required if you are using the 'patternfly.charts' module-->
- <script src="node_modules/angular-patternfly/node_modules/patternfly/node_modules/c3/c3.min.js"></script>
- <script src="node_modules/angular-patternfly/node_modules/patternfly/node_modules/d3/d3.min.js"></script>
+ <script src="node_modules/patternfly/node_modules/c3/c3.min.js"></script>
+ <script src="node_modules/patternfly/node_modules/d3/d3.min.js"></script>
```
5. (optional) The 'patternfly.charts' module is not a dependency in the default angular 'patternfly' module.
@@ -171,7 +171,7 @@ In order to let Webpack find the correct jQuery module when assembling all the d
...
resolve: {
alias: {
- "jquery": "angular-patternfly/node_modules/patternfly/node_modules/jquery"
+ "jquery": "patternfly/node_modules/jquery"
}
}
...
| 3 |
diff --git a/src/selectors/events.js b/src/selectors/events.js @@ -38,6 +38,7 @@ const groupByStartTime = (events: Event[]): EventDays => {
const getEventsState = (state: State) => state.events;
+// Type hack to force array filter to one type https://github.com/facebook/flow/issues/1915
export const selectEvents = (state: State): Event[] =>
((getEventsState(state).entries.filter(
entry => entry.sys.contentType.sys.id === "event"
@@ -46,6 +47,7 @@ export const selectFeaturedEvents = (state: State) =>
((getEventsState(state).entries.filter(
entry => entry.sys.contentType.sys.id === "featuredEvents"
): any[]): FeaturedEvents[]);
+
export const selectEventsLoading = (state: State) =>
getEventsState(state).loading;
export const selectEventsRefreshing = (state: State) =>
| 0 |
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md <!--
Please consider the following before submitting a pull request:
-Guidelines for contributing: https://github.com/chartjs/Chart.js/blob/master/docs/docs/developers/contributing.md
+Guidelines for contributing: https://github.com/chartjs/Chart.js/blob/master/docs/developers/contributing.md
Example of changes on an interactive website such as the following:
- https://jsbin.com/
| 1 |
diff --git a/src/data/formatters.js b/src/data/formatters.js @@ -13,7 +13,7 @@ export const formatDateRange = (dateRange: DateRange) =>
].join(" - ")
: formatDate(dateRange.startDate, "D MMM");
-export const formatTime = value => formatDate(value, "HH:mm");
+export const formatTime = (value: string) => formatDate(value, "HH:mm");
export const formatPrice = (price: number) => {
if (price === Math.trunc(price)) {
| 0 |
diff --git a/token-metadata/0x6F02055E3541DD74A1aBD8692116c22fFAFaDc5D/metadata.json b/token-metadata/0x6F02055E3541DD74A1aBD8692116c22fFAFaDc5D/metadata.json "symbol": "TMT",
"address": "0x6F02055E3541DD74A1aBD8692116c22fFAFaDc5D",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/traces/isosurface/convert.js b/src/traces/isosurface/convert.js @@ -313,90 +313,6 @@ function generateIsosurfaceMesh(data) {
}
- function tryCreateTri_OLD(a, b, c, isCore, debug) {
-
- var xyzv = getXYZV([a, b, c]);
-
- var ok = [
- inRange(xyzv[0][3]),
- inRange(xyzv[1][3]),
- inRange(xyzv[2][3])
- ];
-
- var aOk = ok[0];
- var bOk = ok[1];
- var cOk = ok[2];
-
- var A = xyzv[0];
- var B = xyzv[1];
- var C = xyzv[2];
-
- if(aOk && bOk && cOk) {
- drawTri(debug, xyzv);
- return;
- }
-
- if(!aOk && !bOk && !cOk) {
- return;
- }
-
- var p1, p2;
-
- if(aOk && bOk) {
- p1 = calcIntersection(C, A);
- p2 = calcIntersection(C, B);
-
- drawTri(debug, [A, B, p2]);
- drawTri(debug, [p2, p1, A]);
- return;
- }
-
- if(bOk && cOk) {
- p1 = calcIntersection(A, B);
- p2 = calcIntersection(A, C);
-
- drawTri(debug, [B, C, p2]);
- drawTri(debug, [p2, p1, B]);
- return;
- }
-
- if(cOk && aOk) {
- p1 = calcIntersection(B, C);
- p2 = calcIntersection(B, A);
-
- drawTri(debug, [C, A, p2]);
- drawTri(debug, [p2, p1, C]);
- return;
- }
-
- if(aOk) {
- p1 = calcIntersection(B, A);
- p2 = calcIntersection(C, A);
-
- drawTri(debug, [A, p1, p2]);
- return;
- }
-
- if(bOk) {
- p1 = calcIntersection(C, B);
- p2 = calcIntersection(A, B);
-
- drawTri(debug, [B, p1, p2]);
- return;
- }
-
- if(cOk) {
- p1 = calcIntersection(A, C);
- p2 = calcIntersection(B, C);
-
- drawTri(debug, [C, p1, p2]);
- return;
- }
- }
-
-
-
-
function tryCreateTri(a, b, c, isCore, debug) {
var xyzv = getXYZV([a, b, c]);
| 2 |
diff --git a/src/core/operations/HTTP.js b/src/core/operations/HTTP.js @@ -146,6 +146,7 @@ const HTTP = {
return e.toString() +
"\n\nThis error could be caused by one of the following:\n" +
" - An invalid URL\n" +
+ " - Making a request to an insecure resource (HTTP) from a secure source (HTTPS)\n" +
" - Making a cross-origin request to a server which does not support CORS\n";
});
},
| 0 |
diff --git a/src/encoded/schemas/samtools_flagstats_quality_metric.json b/src/encoded/schemas/samtools_flagstats_quality_metric.json "description": "flagstats: mapped - percent"
},
"mapped_qc_failed": {
- "title": "% reads mapped failing QC",
+ "title": "# reads mapped failing QC",
"type": "number",
"description": "flagstats: mapped - qc failed"
},
| 1 |
diff --git a/docs/app/components/layout/main/modules/examples/input_example_1.txt b/docs/app/components/layout/main/modules/examples/input_example_1.txt class InputTest extends React.Component {
- state = { name: '', phone: '', multiline: '', email: '', hint: '', label: '' };
+ state = { name: '', phone: '', multiline: '', email: '', hint: '', label: '', error: '' };
handleChange = (value, ev) => {
this.setState({[ev.target.name]: value});
@@ -16,7 +16,7 @@ class InputTest extends React.Component {
<Input type='tel' label='Phone' name='phone' icon='phone' value={this.state.phone} onChange={this.handleChange} />
<Input type='text' name='hint' value={this.state.hint} label='Required Field' hint='With Hint' required onChange={this.handleChange} icon='share' />
{/* Just an example. Defining functions in a property, such as onClick, is a bad idea: */}
- <Input type='text' label='error' error={<span>Error!! <a href="#!" onClick={e => { e.preventDefault(); console.log('some help'); }}>?</a></span>} />
+ <Input type='text' value={this.state.error} name="error" onChange={this.handleChange.bind(this, 'error')} label='error' error={<span>Error!! <a href="#!" onClick={e => { e.preventDefault(); console.log('some help'); }}>?</a></span>} />
</section>
);
}
| 9 |
diff --git a/source/views/controls/AbstractControlView.js b/source/views/controls/AbstractControlView.js @@ -38,12 +38,12 @@ const AbstractControlView = Class({
/**
Property: O.AbstractControlView#tabIndex
- Type: Number|undefined
- Default: undefined
+ Type: Number
+ Default: 0
If set, this will become the tab index for the control.
*/
- tabIndex: undefined,
+ tabIndex: 0,
/**
Property: O.AbstractControlView#type
@@ -108,10 +108,7 @@ const AbstractControlView = Class({
abstractControlNeedsRedraw: function (self, property, oldValue) {
return this.propertyNeedsRedraw(self, property, oldValue);
- }.observes(
- 'isDisabled',
- 'tabIndex',
- ),
+ }.observes('isDisabled', 'tabIndex'),
/**
Method: O.AbstractControlView#redrawIsDisabled
@@ -130,10 +127,7 @@ const AbstractControlView = Class({
property of the view.
*/
redrawTabIndex() {
- const tabIndex = this.get('tabIndex');
- if (tabIndex !== undefined) {
- this._domControl.tabIndex = tabIndex;
- }
+ this._domControl.tabIndex = this.get('tabIndex');
},
// --- Focus ---
| 12 |
diff --git a/src/framework/components/camera/component.js b/src/framework/components/camera/component.js @@ -365,8 +365,10 @@ class CameraComponent extends Component {
/**
* Convert a point from 2D screen space to 3D world space.
*
- * @param {number} screenx - X coordinate on PlayCanvas' canvas element.
- * @param {number} screeny - Y coordinate on PlayCanvas' canvas element.
+ * @param {number} screenx - X coordinate on PlayCanvas' canvas element. Should be in the range
+ * 0 to `canvas.offsetWidth` of the application's canvas element.
+ * @param {number} screeny - Y coordinate on PlayCanvas' canvas element. Should be in the range
+ * 0 to `canvas.offsetHeight` of the application's canvas element.
* @param {number} cameraz - The distance from the camera in world space to create the new
* point.
* @param {Vec3} [worldCoord] - 3D vector to receive world coordinate result.
| 7 |
diff --git a/contracts/modules/Wallet/VestingEscrowWallet.sol b/contracts/modules/Wallet/VestingEscrowWallet.sol @@ -383,7 +383,7 @@ contract VestingEscrowWallet is IWallet {
* @notice Returns beneficiary's schedule
* @param _beneficiary beneficiary's address
* @param _templateName name of the template
- * @return beneficiary's schedule
+ * @return beneficiary's schedule data (numberOfTokens, duration, frequency, startTime, claimedTokens, State)
*/
function getSchedule(address _beneficiary, bytes32 _templateName) external view returns(uint256, uint256, uint256, uint256, uint256, State) {
_checkSchedule(_beneficiary, _templateName);
| 3 |
diff --git a/Makefile b/Makefile @@ -44,12 +44,12 @@ index.html: docs/index.md docs/head.html docs/tail.html
> $@
docclean:
- rm -f index.html test.html
+ rm -f index.html docs/test.html
test-docs: docs/head.html docs/tail.html
make test REPORTER=doc \
| cat docs/head.html - docs/tail.html \
- > test.html
+ > docs/test.html
clean:
rm -fr superagent.js components
| 2 |
diff --git a/userscript.user.js b/userscript.user.js @@ -14255,6 +14255,8 @@ var $$IMU_EXPORT$$;
domain === "cdn-contents-web.weverse.io" ||
// https://cdn.hashnode.com/res/hashnode/image/upload/v1597244649420/jX9JzFN5o.png?w=1600&h=840&fit=crop&crop=entropy&auto=format&q=60
domain === "cdn.hashnode.com" ||
+ // https://d31wcbk3iidrjq.cloudfront.net/SiseXevjk_gl05K7umA.jpg?w=300&h=300
+ domain === "d31wcbk3iidrjq.cloudfront.net" ||
// http://us.jimmychoo.com/dw/image/v2/AAWE_PRD/on/demandware.static/-/Sites-jch-master-product-catalog/default/dw70b1ebd2/images/rollover/LIZ100MPY_120004_MODEL.jpg?sw=245&sh=245&sm=fit
// https://www.aritzia.com/on/demandware.static/-/Library-Sites-Aritzia_Shared/default/dw3a7fef87/seasonal/ss18/ss18-springsummercampaign/ss18-springsummercampaign-homepage/hptiles/tile-wilfred-lrg.jpg
src.match(/\/demandware\.static\//) ||
@@ -68561,11 +68563,25 @@ var $$IMU_EXPORT$$;
return src.replace(/\/cover_[wh]?[0-9]+\/+/, "/cover/");
}
- if (domain === "d3el26csp1xekx.cloudfront.net") {
+ if (domain === "d3el26csp1xekx.cloudfront.net" ||
+ // https://starboard-media.s3.amazonaws.com/v/no-wm-thumb-XHRVi-XHP-00001.jpg
+ // https://starboard-media.s3.amazonaws.com/v/wm-XHRVi-XHP.mp4 -- watermarked
+ // https://starboard-media.s3.amazonaws.com/v/no-wm-XHRVi-XHP.mp4
+ // https://starboard-media.s3.amazonaws.com/v/no-wm-thumb-lDOcM9sdH-00001.jpg
+ // https://starboard-media.s3.amazonaws.com/v/no-wm-lDOcM9sdH.mp4
+ // https://starboard-media.s3.amazonaws.com/v/no-wm-thumb-iP0TmPq_Q-00001.jpg
+ // https://starboard-media.s3.amazonaws.com/v/no-wm-iP0TmPq_Q.mp4
+ amazon_container === "starboard-media") {
// thanks to remlap on discord (cameo.com)
// https://d3el26csp1xekx.cloudfront.net/v/wm-o5WwywATT.mp4
// https://d3el26csp1xekx.cloudfront.net/v/no-wm-o5WwywATT.mp4
- return src.replace(/(\/v\/+)(wm-)/, "$1no-$2");
+ // https://www.cameo.com/v/5d53255a3f9c0e0124646192
+ // https://d3el26csp1xekx.cloudfront.net/v/no-wm-thumb-obyCY9NVZ-00001.jpg
+ // https://d3el26csp1xekx.cloudfront.net/v/no-wm-obyCY9NVZ.mp4
+ return src
+ .replace(/(\/v\/+)(wm-[-_a-zA-Z0-9]+\.mp4)/, "$1no-$2")
+ .replace(/(\/v\/+)(?:no-)?wm-thumb-([-_a-zA-Z0-9]+)-[0-9]+\.jpg(?:[?#].*)?$/, "$1no-wm-$2.mp4");
+ //return src.replace(/(\/v\/+)(wm-)/, "$1no-$2");
}
if (domain_nowww === "vidcloud9.com" ||
| 7 |
diff --git a/tests/end2end/helpers/E2EApp.js b/tests/end2end/helpers/E2EApp.js @@ -39,6 +39,24 @@ export class E2EApp {
this.loginUserWithCredentials(username, password, autoLogout, '#tab_ldap');
}
+ static loginFailed() {
+ const standardLoginErrorAlertExists = browser.isExisting('.at-error.alert.alert-danger'),
+ generalAlertExists = browser.isExisting('.alert.alert-danger');
+ let generalAlertShowsLoginFailure = false;
+
+ try {
+ generalAlertShowsLoginFailure = browser.getHTML('.alert.alert-danger').includes('403');
+ } catch (e) {
+ const expectedError = `An element could not be located on the page using the given search parameters (".alert.alert-danger")`;
+ if (!e.toString().includes(expectedError)) {
+ throw e;
+ }
+ }
+
+ return standardLoginErrorAlertExists ||
+ (generalAlertExists && generalAlertShowsLoginFailure);
+ }
+
static loginUserWithCredentials(username, password, autoLogout = true, tab = '#tab_standard') {
if (autoLogout) {
E2EApp.logoutUser();
@@ -68,15 +86,12 @@ export class E2EApp {
browser.keys(['Enter']);
browser.waitUntil(_ => {
- const userMenuExists = browser.isExisting('#navbar-usermenu'),
- loginErrorAlertExists = browser.isExisting('.alert.alert-danger');
-
- return userMenuExists || loginErrorAlertExists;
+ const userMenuExists = browser.isExisting('#navbar-usermenu');
+ return userMenuExists || E2EApp.loginFailed();
}, 8000);
- if (browser.isExisting('.alert.alert-danger') &&
- browser.getHTML('.alert.alert-danger').includes('403')) {
- throw new Error ("Unknown user or wrong password.")
+ if (E2EApp.loginFailed()) {
+ throw new Error ("Unknown user or wrong password.");
}
E2EApp.isLoggedIn();
E2EApp._currentlyLoggedInUser = username;
| 7 |
diff --git a/src/platform/web/sw.js b/src/platform/web/sw.js @@ -75,12 +75,8 @@ self.addEventListener('fetch', (event) => {
This has to do with xhr not being supported in service workers.
*/
if (event.request.method === "GET") {
- if (event.request.url.includes("config.json")) {
- event.respondWith(handleConfigRequest(event.request));
- } else {
event.respondWith(handleRequest(event.request));
}
- }
});
function isCacheableThumbnail(url) {
@@ -96,8 +92,12 @@ function isCacheableThumbnail(url) {
const baseURL = new URL(self.registration.scope);
let pendingFetchAbortController = new AbortController();
+
async function handleRequest(request) {
try {
+ if (request.url.includes("config.json")) {
+ return handleConfigRequest(request);
+ }
const url = new URL(request.url);
// rewrite / to /index.html so it hits the cache
if (url.origin === baseURL.origin && url.pathname === baseURL.pathname) {
| 5 |
diff --git a/package.json b/package.json "deepmerge": "^2.0.1",
"devtron": "^1.4.0",
"electron": "^2.0.2",
- "electron-builder": "20.15.1",
- "electron-builder-squirrel-windows": "20.15.0",
+ "electron-builder": "20.10.0",
+ "electron-builder-squirrel-windows": "20.11.0",
"flow-bin": "^0.73.0",
"json-file-plus": "^3.3.0",
"yargs": "^11.0.0"
| 13 |
diff --git a/docs/advanced.rst b/docs/advanced.rst @@ -47,8 +47,18 @@ A datatable (``trade_data.csv``) could look like this:
3 Trade EURUSD test_account 12345678 EURUSD 100000 BUY
= ============ ============= ======== ====== ====== =========
-To use it, you run your flow with ``tagui my_flow.tag trade_data.csv``. TagUI will run ``my_flow.tag`` once for each row in the datatable (except the header). Within the flow, TagUI can use the variables ``trade``, ``username``, ``password``, etc as if they were in the :ref:`local object repository <object-repository>` and the values will be from that run's row. To know which iteration your flow is in you can use the ``iteration`` variable.
+To use it, you run your flow with ``tagui my_flow.tag trade_data.csv``. TagUI will run ``my_flow.tag`` once for each row in the datatable (except for the header).
+Within the flow, TagUI can use the variables ``trade``, ``username``, ``password``, etc as if they were in the :ref:`local object repository <object-repository>` and the values will be from that run's row.
+
+To know which iteration your flow is in you can use the ``iteration`` variable::
+
+ echo current iteration: `iteration`
+ if iteration equals to 1
+ // go to login URL and do the login steps
+ www.xero.com
+
+ // do rest of the steps for every iteration
.. _object-repository:
| 7 |
diff --git a/CHANGELOG.md b/CHANGELOG.md All notable changes to this project are documented in this file.
-## Head
+## 13.3.3
- Fixed: autofix will respect scoped disable comments by turning off autofix for the scoped rules for the entire source; this is a continuation of the workaround added in `13.2.0` ([#4705](https://github.com/stylelint/stylelint/pull/4705)).
| 6 |
diff --git a/www/tablet/js/widget_swiper.js b/www/tablet/js/widget_swiper.js @@ -72,6 +72,7 @@ var Modul_swiper = function () {
prevButton: elemPrev,
autoHeight: true,
observer: true,
+ observeParents: true,
moveStartThreshold: 70,
autoplay: elem.data('autoplay'),
autoplayDisableOnInteraction: false,
| 7 |
diff --git a/magda-web-client/src/Components/Dataset/Add/DatasetAddCommon.ts b/magda-web-client/src/Components/Dataset/Add/DatasetAddCommon.ts @@ -571,10 +571,10 @@ export function createBlankState(user?: User): State {
_createdDate: new Date(),
_lastModifiedDate: new Date(),
ckanPublish: {
- status: "retain",
+ status: "withdraw",
hasCreated: false,
publishAttempted: false,
- publishRequired: false
+ publishRequired: false,
}
};
}
| 12 |
diff --git a/AjaxControlToolkit/AjaxFileUpload/AjaxFileUploadHelper.cs b/AjaxControlToolkit/AjaxFileUpload/AjaxFileUploadHelper.cs @@ -53,7 +53,7 @@ namespace AjaxControlToolkit {
var request = context.Request;
var fileId = request.QueryString["fileId"];
var fileName = request.QueryString["fileName"];
- var extension = Path.GetExtension(fileName).Replace(".", "");
+ var extension = Path.GetExtension(fileName).Substring(1);
var allowedExtensions = DefaultAllowedExtensions.Union(ToolkitConfig.AdditionalUploadFileExtensions.Split(','));
if(!allowedExtensions.Any(ext => String.Compare(ext, extension, StringComparison.InvariantCultureIgnoreCase) == 0))
| 3 |
diff --git a/offscreen-engine.js b/offscreen-engine.js @@ -16,13 +16,10 @@ class OffscreenEngine {
this.iframe = iframe;
this.port = null;
- this.running = false;
- this.queue = [];
-
this.loadPromise = (async () => {
- const contentWindow = await new Promise((resolve, reject) => {
+ await new Promise((resolve, reject) => {
iframe.onload = () => {
- resolve(iframe.contentWindow);
+ resolve();
iframe.onload = null;
iframe.onerror = null;
@@ -47,40 +44,28 @@ class OffscreenEngine {
waitForLoad() {
return this.loadPromise;
}
- async waitForTurn(fn) {
- const _next = () => {
- if (this.queue.length > 0) {
- const fn = this.queue.shift();
- this.waitForTurn(fn);
- }
- };
-
- if (!this.running) {
- this.running = true;
-
- try {
- const result = await fn();
- return result;
- } catch(err) {
- throw err;
- } finally {
- this.running = false;
- _next();
- }
+ createFunction(o) {
+ if (!Array.isArray(o)) {
+ o = [o];
+ }
+ const _formatElement = e => {
+ if (typeof e === 'string') {
+ return e;
+ } else if (typeof e === 'function') {
+ return `\
+const _default_export_ = ${e.toString()};
+export default _default_export_;`;
} else {
- this.queue.push(fn);
+ console.warn('invalid element', e);
+ throw new Error('invalid element');
}
- }
- createFunction(prefix, fn) {
+ };
+ const _formatArray = a => a.map(e => _formatElement(e)).join('\n');
const id = getRandomString();
const loadPromise = (async () => {
await this.waitForLoad();
- await this.waitForTurn(async () => {
- const src = prefix + `
- const _default_export_ = ${fn.toString()};
- export default _default_export_;
- `;
+ const src = _formatArray(o);
this.port.postMessage({
method: 'registerHandler',
id,
@@ -102,7 +87,6 @@ class OffscreenEngine {
};
this.port.addEventListener('message', message);
});
- });
})();
const self = this;
@@ -111,17 +95,13 @@ class OffscreenEngine {
await loadPromise;
- let result;
- let error;
- await self.waitForTurn(async () => {
self.port.postMessage({
method: 'callHandler',
id,
args,
});
- try {
- result = await new Promise((accept, reject) => {
+ const result = await new Promise((accept, reject) => {
const message = e => {
const {method} = e.data;
if (method === 'response') {
@@ -136,16 +116,7 @@ class OffscreenEngine {
};
self.port.addEventListener('message', message);
});
- } catch(err) {
- error = err;
- }
- });
-
- if (!error) {
return result;
- } else {
- throw error;
- }
}
return callRemoteFn;
}
| 2 |
diff --git a/packages/openneuro-server/handlers/sitemap.js b/packages/openneuro-server/handlers/sitemap.js @@ -33,7 +33,9 @@ export const sitemapDynamicUrls = () =>
url: {
$concat: ['/datasets/', '$id', '/versions/', '$snapshots.tag'],
},
- lastmodISO: '$snapshots.created',
+ lastmodISO: {
+ $dateToString: { date: '$snapshots.created' },
+ },
priority: 0.8,
changefreq: 'daily', // To make sure new comments are indexed
},
| 1 |
diff --git a/app/src/renderer/components/PageCandidates.vue b/app/src/renderer/components/PageCandidates.vue <template lang="pug">
.page.page-candidates
page-header
- div(slot="title") Candidates #[span(v-if='isDelegator') ({{candidatesNum }} Selected)]
+ div(slot="title") Candidates #[span(v-if='isSignedIn') ({{candidatesNum }} Selected)]
field(theme='cosmos', type='text', placeholder='Filter...', v-model='query')
btn(
- v-if="isDelegator && candidatesNum > 0"
+ v-if="isSignedIn && candidatesNum > 0"
theme='cosmos'
type='link'
to='/delegate'
icon='angle-right'
icon-pos='right'
:value='btnLabel')
- btn(
- disabled
- v-else-if='isDelegator'
- theme='cosmos'
- icon='angle-right'
- icon-pos='right'
- :value='btnLabel')
panel-sort(:sort='sort')
.candidates
card-candidate(v-for='candidate in filteredCandidates', key='candidate.id', :candidate='candidate')
@@ -70,7 +63,7 @@ export default {
btnLabel () {
return `Delegate`
},
- isDelegator () { return this.user.signedIn && !this.user.nominationActive }
+ isSignedIn () { return this.user.signedIn }
},
data: () => ({
query: ''
| 11 |
diff --git a/activities/Planets.activity/js/activity.js b/activities/Planets.activity/js/activity.js @@ -557,7 +557,6 @@ define(["sugar-web/activity/activity", "sugar-web/env", "sugar-web/datastore", "
var planetDiv = document.createElement("div");
planetDiv.id = "div-" + name;
planetDiv.className = "planet-div";
- // planetDiv.style.backgroundColor = "#FFFFFF";
planetPos.appendChild(planetDiv);
document.getElementById("div-" + name).style.padding = "2%";
document.getElementById("div-" + name).style.marginLeft = textDistance - 1 + "%";
@@ -664,8 +663,16 @@ define(["sugar-web/activity/activity", "sugar-web/env", "sugar-web/datastore", "
e.preventDefault();
canvasBounds = planetPos.getBoundingClientRect();
+
+ if("ontouchend" in renderer.domElement){
+ mouse.x = ( (e.changedTouches[0].clientX - canvasBounds.left) / (canvasBounds.right - canvasBounds.left ) )* 2 - 1;
+ mouse.y = - ( (e.changedTouches[0].clientY - canvasBounds.top) / (canvasBounds.bottom - canvasBounds.top ) ) * 2 + 1;
+ }
+ else{
mouse.x = ( (e.clientX - canvasBounds.left) / (canvasBounds.right - canvasBounds.left ) )* 2 - 1;
mouse.y = - ( (e.clientY - canvasBounds.top) / (canvasBounds.bottom - canvasBounds.top ) ) * 2 + 1;
+ }
+
raycaster.setFromCamera( mouse, camera );
@@ -721,7 +728,12 @@ define(["sugar-web/activity/activity", "sugar-web/env", "sugar-web/datastore", "
return needResize;
}
+ if("ontouchend" in renderer.domElement){
+ renderer.domElement.addEventListener( 'touchend', clickMesh, false );
+ }
+ else{
renderer.domElement.addEventListener( 'click', clickMesh, false );
+ }
//For Smaller Planets
| 11 |
diff --git a/src/components/Map.jsx b/src/components/Map.jsx @@ -22,7 +22,7 @@ function Map() {
alt = {`Map of ${maps[currentMap].displayText}`}
className = "map-image"
title = {`Map of ${maps[currentMap].displayText}`}
- src = {`${maps[currentMap].image}`}
+ src = {`${process.env.PUBLIC_URL}${maps[currentMap].image}`}
/>
}
| 4 |
diff --git a/assets/js/components/adminbar/AdminBarApp.js b/assets/js/components/adminbar/AdminBarApp.js @@ -29,7 +29,7 @@ import AdminBarUniqueVisitors from './AdminBarUniqueVisitors';
import AdminBarSessions from './AdminBarSessions';
import AdminBarImpressions from './AdminBarImpressions';
import AdminBarClicks from './AdminBarClicks';
-import AdminbarModules from './LegacyAdminBarModules';
+import LegacyAdminBarModules from './LegacyAdminBarModules';
import AnalyticsInactiveCTA from '../AnalyticsInactiveCTA';
import CompleteModuleActivationCTA from '../CompleteModuleActivationCTA';
import Data from 'googlesitekit-data';
@@ -111,7 +111,7 @@ export default function AdminBarApp() {
</Fragment>
) }
- <AdminbarModules />
+ <LegacyAdminBarModules />
</div>
</div>
<div className="
| 10 |
diff --git a/tests/test_Havven.py b/tests/test_Havven.py @@ -680,6 +680,19 @@ class TestHavven(unittest.TestCase):
# This should fail because the approver has no tokens.
self.assertReverts(self.transferFrom, spender, no_tokens, receiver, value)
+ def test_double_collect(self):
+ alice = fresh_account()
+ self.h_withdrawFeeEntitlement(alice)
+ self.assertReverts(self.h_withdrawFeeEntitlement, alice)
+
+ def test_withdraw_multiple_periods(self):
+ alice = fresh_account()
+ self.h_withdrawFeeEntitlement(alice)
+ fast_forward(self.h_minFeePeriodDurationSeconds()*2)
+ self.h_postCheckFeePeriodRollover(DUMMY)
+ fast_forward(10)
+ self.h_withdrawFeeEntitlement(alice)
+
# adjustFeeEntitlement - tested above
# rolloverFee - tested above, indirectly
| 5 |
diff --git a/lib/node_modules/@stdlib/_tools/lint/file-license-header/lib/headers.js b/lib/node_modules/@stdlib/_tools/lint/file-license-header/lib/headers.js @@ -110,8 +110,8 @@ function headers() {
h = replace( h, '\\{\\{YEAR\\}\\}', '[0-9]{1,4}' ); // 0-9999
h = replace( h, '\\{\\{COPYRIGHT_OWNER\\}\\}', '.+' );
- // Create a regular expression:
- out[ lang ] = new RegExp( h );
+ // Create a regular expression (setting the `g` flag in order match multiple [duplicate] license headers):
+ out[ lang ] = new RegExp( h, 'g' );
}
return out;
} // end FUNCTION headers()
| 12 |
diff --git a/token-metadata/0x328C4c80BC7aCa0834Db37e6600A6c49E12Da4DE/metadata.json b/token-metadata/0x328C4c80BC7aCa0834Db37e6600A6c49E12Da4DE/metadata.json "symbol": "ASNX",
"address": "0x328C4c80BC7aCa0834Db37e6600A6c49E12Da4DE",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/expressions/sqlRefExpression.ts b/src/expressions/sqlRefExpression.ts @@ -56,11 +56,12 @@ export class SqlRefExpression extends Expression {
public toJS(): ExpressionJS {
const js = super.toJS();
js.sql = this.sql;
+ js.type = this.type;
return js;
}
public toString(): string {
- return `s$\{${this.sql}}`;
+ return `s$\{${this.sql}, ${this.type}`;
}
public changeSql(sql: string): SqlRefExpression {
| 3 |
diff --git a/factory-ai-vision/EdgeSolution/modules/WebModule/ui/src/components/LiveViewContainer/LiveViewScene.tsx b/factory-ai-vision/EdgeSolution/modules/WebModule/ui/src/components/LiveViewContainer/LiveViewScene.tsx @@ -163,7 +163,7 @@ const AOILayer: React.FC<AOILayerProps> = ({
key={e.id}
id={e.id}
polygon={e.vertices}
- visible={true}
+ visible={visible}
removeBox={() => removeAOI(e.id)}
creatingState={creatingState}
handleChange={(idx, vertex) => updateAOI(e.id, { idx, vertex })}
| 12 |
diff --git a/src/structs/ClientManager.js b/src/structs/ClientManager.js @@ -151,9 +151,9 @@ class ClientManager extends EventEmitter {
await initialize.populateKeyValues()
const schedules = await initialize.populateSchedules(this.customSchedules)
this.scheduleManager.addSchedules(schedules)
- this.shardingManager.spawn(shardCount || undefined)
+ await this.shardingManager.spawn(shardCount || undefined)
} catch (err) {
- this.log.error(err, `ClientManager failed to start`)
+ this.log.error(err, `ClientManager failed to start. Verify the correctness of your token.`)
process.exit(1)
}
}
| 9 |
diff --git a/tests/phpunit/integration/PluginTest.php b/tests/phpunit/integration/PluginTest.php @@ -54,8 +54,6 @@ class PluginTest extends TestCase {
$plugin->register();
- $this->assertInstanceOf( Feature_Flags::class, Feature_Flags::get_instance() );
-
$this->assertActionRendersGeneratorTag( 'wp_head' );
$this->assertActionRendersGeneratorTag( 'login_head' );
| 2 |
diff --git a/userscript.user.js b/userscript.user.js @@ -48793,7 +48793,51 @@ var $$IMU_EXPORT$$;
return decodeURIComponent(newsrc);
}
- if (domain_nowww === "instagram.com" && /^[a-z]+:\/\/[^/]+\/+(?:[^/]+\/+)?p\/+/.test(src) && options.do_request && options.cb) {
+ if (domain_nowww === "instagram.com") {
+ newsrc = website_query({
+ website_regex: /^[a-z]+:\/\/[^/]+\/+p\/+([^/]+)(?:\/+(?:(?:media|embed).*)?)?(?:[?#].*)?$/,
+ id: "post:${id}",
+ run: function(cb, match) {
+ var info = [{
+ type: "post",
+ subtype: "link",
+ url: "https://www.instagram.com/p/" + match[1] + "/",
+ image: "first",
+ element: options.element
+ }];
+
+ return common_functions.instagram_parse_el_info(
+ api_cache, options.do_request,
+ options.rule_specific.instagram_use_app_api, options.rule_specific.instagram_dont_use_web, options.rule_specific.instagram_prefer_video_quality,
+ info, options.host_url, cb);
+ }
+ });
+ if (newsrc) return newsrc;
+
+ newsrc = website_query({
+ website_regex: {
+ regex: /^[a-z]+:\/\/[^/]+\/+stories\/+([^/]+)\/+([0-9]+)\/*(?:[?#].*)?$/,
+ groups: ["user", "id"]
+ },
+ id: "story:${user}:${id}",
+ run: function(cb, match) {
+ var info = [{
+ type: "story",
+ url: "https://www.instagram.com/stories/" + match.groups.user + "/" + match.groups.id + "/",
+ image: "first",
+ element: options.element
+ }];
+
+ return common_functions.instagram_parse_el_info(
+ api_cache, options.do_request,
+ options.rule_specific.instagram_use_app_api, options.rule_specific.instagram_dont_use_web, options.rule_specific.instagram_prefer_video_quality,
+ info, options.host_url, cb);
+ }
+ });
+ if (newsrc) return newsrc;
+ }
+
+ if (false && domain_nowww === "instagram.com" && /^[a-z]+:\/\/[^/]+\/+(?:[^/]+\/+)?p\/+/.test(src) && options.do_request && options.cb) {
newsrc = src.replace(/(\/p\/+[^/]+)(?:\/+(?:(?:media|embed).*)?)?(?:[?#].*)?$/, "$1/");
var info = [{
| 7 |
diff --git a/examples/sessions/igvSession.xml b/examples/sessions/igvSession.xml path="/Users/jrobinso/Dropbox/projects/igv.js/examples/sessions/igvSession.xml" version="8">
<Resources>
<Resource name="GM12878 H3K4me3 ChipSeq Signal"
- path="http://hgdownload.cse.ucsc.edu/goldenPath/hg19/encodeDCC/wgEncodeBroadHistone/wgEncodeBroadHistoneGm12878H3k4me3StdSig.bigWig"/>
+ path="https://hgdownload.cse.ucsc.edu/goldenPath/hg19/encodeDCC/wgEncodeBroadHistone/wgEncodeBroadHistoneGm12878H3k4me3StdSig.bigWig"/>
<Resource name="GM12878 H3K27me3 ChipSeq Signal"
- path="http://hgdownload.cse.ucsc.edu/goldenPath/hg19/encodeDCC/wgEncodeBroadHistone/wgEncodeBroadHistoneGm12878H3k27me3StdSigV2.bigWig"/>
+ path="https://hgdownload.cse.ucsc.edu/goldenPath/hg19/encodeDCC/wgEncodeBroadHistone/wgEncodeBroadHistoneGm12878H3k27me3StdSigV2.bigWig"/>
<Resource name="GM12878 H3K36me3 ChipSeq Signal"
- path="http://hgdownload.cse.ucsc.edu/goldenPath/hg19/encodeDCC/wgEncodeBroadHistone/wgEncodeBroadHistoneGm12878H3k36me3StdSig.bigWig"/>
+ path="https://hgdownload.cse.ucsc.edu/goldenPath/hg19/encodeDCC/wgEncodeBroadHistone/wgEncodeBroadHistoneGm12878H3k36me3StdSig.bigWig"/>
</Resources>
<Panel height="439" name="DataPanel" width="1133">
<Track altColor="0,0,178" autoScale="false" clazz="org.broad.igv.track.DataSourceTrack" color="200,0,0"
displayMode="COLLAPSED" featureVisibilityWindow="-1" fontSize="10"
- id="http://hgdownload.cse.ucsc.edu/goldenPath/hg19/encodeDCC/wgEncodeBroadHistone/wgEncodeBroadHistoneGm12878H3k27me3StdSigV2.bigWig"
+ id="https://hgdownload.cse.ucsc.edu/goldenPath/hg19/encodeDCC/wgEncodeBroadHistone/wgEncodeBroadHistoneGm12878H3k27me3StdSigV2.bigWig"
name="GM12878 H3K27me3 ChipSeq Signal" normalize="false" renderer="BAR_CHART" sortable="true"
visible="true" windowFunction="mean">
<DataRange baseline="0.0" drawBaseline="true" flipAxis="false" maximum="55.947006" minimum="0.0"
</Track>
<Track altColor="0,0,178" autoScale="false" clazz="org.broad.igv.track.DataSourceTrack" color="0,0,150"
displayMode="COLLAPSED" featureVisibilityWindow="-1" fontSize="10"
- id="http://hgdownload.cse.ucsc.edu/goldenPath/hg19/encodeDCC/wgEncodeBroadHistone/wgEncodeBroadHistoneGm12878H3k36me3StdSig.bigWig"
+ id="https://hgdownload.cse.ucsc.edu/goldenPath/hg19/encodeDCC/wgEncodeBroadHistone/wgEncodeBroadHistoneGm12878H3k36me3StdSig.bigWig"
name="GM12878 H3K36me3 ChipSeq Signal" normalize="false" renderer="BAR_CHART" sortable="true"
visible="true" windowFunction="mean">
<DataRange baseline="0.0" drawBaseline="true" flipAxis="false" maximum="41.115314" minimum="0.0"
</Track>
<Track altColor="0,0,178" autoScale="false" clazz="org.broad.igv.track.DataSourceTrack" color="0,150,0"
displayMode="COLLAPSED" featureVisibilityWindow="-1" fontSize="10"
- id="http://hgdownload.cse.ucsc.edu/goldenPath/hg19/encodeDCC/wgEncodeBroadHistone/wgEncodeBroadHistoneGm12878H3k4me3StdSig.bigWig"
+ id="https://hgdownload.cse.ucsc.edu/goldenPath/hg19/encodeDCC/wgEncodeBroadHistone/wgEncodeBroadHistoneGm12878H3k4me3StdSig.bigWig"
name="GM12878 H3K4me3 ChipSeq Signal" normalize="false" renderer="BAR_CHART" sortable="true"
visible="true" windowFunction="mean">
<DataRange baseline="0.0" drawBaseline="true" flipAxis="false" maximum="53.69198" minimum="0.0"
| 1 |
diff --git a/renderer/components/Sidebar.js b/renderer/components/Sidebar.js @@ -49,7 +49,7 @@ const NavItem = ({href, icon, label, currentUrl}) => {
const isActive = currentUrl.pathname === href
return (
<StyledNavItem isActive={isActive}>
- <Link href={href} prefetch>
+ <Link href={href}>
<Flex alignItems='center'>
<Box>
{icon}
| 2 |
diff --git a/_data/sites/ecsspert.json b/_data/sites/ecsspert.json {
- "url": "https://www.ecsspert.com/",
- "name": "CSS3 Logos",
- "description": "Famous Logos Designed Entirely in CSS3. Other CSS Experiments comming soon.",
+ "url": "https://ecsspert.com/",
+ "name": "The CSS3 Logos Project",
+ "description": "Famous Logos Designed Entirely in CSS3, plus other CSS experiments",
"twitter": "vladzinculescu",
"source_url": "https://github.com/zoreet/ecsspert"
}
| 3 |
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml @@ -65,7 +65,7 @@ jobs:
push: ${{ startsWith(github.ref, 'refs/tags/v') }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
- platforms: linux/amd64,linux/arm64,linux/riscv64,linux/mips64,linux/s390x,linux/ppc64le,linux/386,linux/arm/v7
+ platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
build_desktop:
name: Build Desktop on ${{ matrix.os }}
| 14 |
diff --git a/src/components/sidemenu/SideMenuPanel.js b/src/components/sidemenu/SideMenuPanel.js // @flow
import React from 'react'
-import { ScrollView, StyleSheet, TouchableOpacity } from 'react-native'
+import { ScrollView, StyleSheet, TouchableOpacity } from 'react-native-web'
import { Icon, normalize } from 'react-native-elements'
import { useSidemenu } from '../../lib/undux/utils/sidemenu'
import { useWrappedApi } from '../../lib/API/useWrappedApi'
@@ -37,6 +37,17 @@ const getMenuItems = ({ API, hideSidemenu, showDialog, hideDialog, navigation, s
hideSidemenu()
}
},
+ {
+ icon: 'person-add',
+ name: 'Profile Privacy',
+ action: () => {
+ navigation.navigate({
+ routeName: 'ProfilePrivacy',
+ type: 'Navigation/NAVIGATE'
+ })
+ hideSidemenu()
+ }
+ },
{
icon: 'person-pin',
name: 'Privacy Policy',
| 0 |
diff --git a/plugins/resources/app/services/service_layer/resources_service.rb b/plugins/resources/app/services/service_layer/resources_service.rb @@ -9,7 +9,7 @@ module ServiceLayer
def elektron_resources
@elektron_resources ||= elektron.service(
- 'resources', path_prefix: '/v1'
+ 'resources', path_prefix: '/v1', interface: 'public'
)
end
| 4 |
diff --git a/components/Discussion/enhancers.js b/components/Discussion/enhancers.js @@ -63,63 +63,26 @@ export const withMe = graphql(meQuery)
// The prop is called 'discussionDisplayAuthor'.
export const withDiscussionDisplayAuthor = graphql(gql`
query discussionDisplayAuthor($discussionId: ID!) {
- me {
- id
- name
- publicUser {
- testimonial {
- image(size: SHARE)
- }
- }
- }
discussion(id: $discussionId) {
id
- rules {
- anonymity
- }
- userPreference {
- anonymity
+ displayAuthor {
+ id
+ name
credential {
description
verified
}
+ profilePicture
}
}
}
`, {
- props: ({ownProps: {t}, data: {me, discussion}}) => {
- if (!me || !discussion) {
+ props: ({ownProps: {t}, data: {discussion}}) => {
+ if (!discussion) {
return {}
}
- const {rules, userPreference} = discussion
-
- const anonymous = (() => {
- switch (rules.anonymity) {
- case 'ALLOWED': return userPreference ? userPreference.anonymity : false
- case 'ENFORCED': return true
- case 'FORBIDDEN': return false
- default: return false
- }
- })()
-
- if (anonymous) {
- return {
- discussionDisplayAuthor: {
- name: t('discussion/displayUser/anonymous'),
- credential: userPreference ? userPreference.credential : null,
- profilePicture: null
- }
- }
- }
-
- return {
- discussionDisplayAuthor: {
- name: me.name,
- credential: userPreference ? userPreference.credential : null,
- profilePicture: me.publicUser && me.publicUser.testimonial && me.publicUser.testimonial.image
- }
- }
+ return {discussionDisplayAuthor: discussion.displayAuthor}
}
})
@@ -500,12 +463,24 @@ export const withDiscussionPreferences = graphql(discussionPreferencesQuery)
export const withSetDiscussionPreferences = graphql(gql`
mutation setDiscussionPreferences($discussionId: ID!, $discussionPreferences: DiscussionPreferencesInput!) {
setDiscussionPreferences(id: $discussionId, discussionPreferences: $discussionPreferences) {
+ id
+ userPreference {
anonymity
credential {
description
verified
}
}
+ displayAuthor {
+ id
+ name
+ credential {
+ description
+ verified
+ }
+ profilePicture
+ }
+ }
}
`, {
props: ({ownProps: {discussionId}, mutate}) => ({
@@ -526,7 +501,8 @@ mutation setDiscussionPreferences($discussionId: ID!, $discussionPreferences: Di
// clone() the data object so that we can mutate it in-place.
const data = JSON.parse(JSON.stringify(immutableData))
- data.discussion.userPreference = setDiscussionPreferences
+ data.discussion.userPreference = setDiscussionPreferences.userPreference
+ data.discussion.displayAuthor = setDiscussionPreferences.displayAuthor
proxy.writeQuery({
query: discussionPreferencesQuery,
| 4 |
diff --git a/test/functional_test.js b/test/functional_test.js @@ -58,10 +58,17 @@ function assertHeaders(uri, header, value) {
assert.ok(Object.prototype.hasOwnProperty.call(responses[uri].headers, header),
`Expects "${header}" in: ${Object.keys(responses[uri].headers).join(', ')}`);
+ // Ignore case in checking equality.
+ const actual = responses[uri].headers[header].toLowerCase();
+
if (typeof value !== 'undefined') {
- assert.strictEqual(responses[uri].headers[header], value);
+ const expected = value.toLowerCase();
+
+ assert.strictEqual(actual, expected);
} else if (expectedHeaders[header]) {
- assert.strictEqual(responses[uri].headers[header], expectedHeaders[header]);
+ const expected = expectedHeaders[header].toLowerCase();
+
+ assert.strictEqual(actual, expected);
}
done();
| 8 |
diff --git a/config/webpack.config.js b/config/webpack.config.js @@ -12,7 +12,7 @@ var config = {
'project-slideshow': './project_slideshow/webpack-entry',
'taxa-show': './taxa/show/webpack-entry',
'taxa-photos': './taxa/photos/webpack-entry',
- 'observations-show': './observations/show/webpack-entry'
+ 'observations-show': './observations/show/webpack-entry',
'computer-vision': './computer_vision/webpack-entry'
},
output: {
| 1 |
diff --git a/assets/sass/components/settings/_googlesitekit-settings-module.scss b/assets/sass/components/settings/_googlesitekit-settings-module.scss align-items: center;
display: flex;
margin: 0;
- min-width: 315px;
width: min-content;
- @media (min-width: $bp-tablet) {
+ @media (min-width: $bp-wpAdminBarTablet) {
min-width: 400px;
}
}
| 2 |
diff --git a/ui/src/utils/date.js b/ui/src/utils/date.js @@ -89,10 +89,10 @@ function getRegexData (mask, locale) {
map.S = index
return '(\\d{1})'
case 'SS':
- map.S = index // bumping to S
+ map.SS = index
return '(\\d{2})'
case 'SSS':
- map.S = index // bumping to S
+ map.SSS = index
return '(\\d{3})'
case 'A':
map.A = index
@@ -251,7 +251,13 @@ export function __splitDate (str, mask, locale, calendar) {
}
if (map.S !== void 0) {
- date.millisecond = parseInt(match[map.S], 10)
+ date.millisecond = parseInt(match[map.S], 10) * 100
+ }
+ else if (map.SS !== void 0) {
+ date.millisecond = parseInt(match[map.SS], 10) * 10
+ }
+ else if (map.SSS !== void 0) {
+ date.millisecond = parseInt(match[map.SSS], 10)
}
date.dateHash = date.year + '/' + pad(date.month) + '/' + pad(date.day)
| 1 |
diff --git a/js/unix_formatting.js b/js/unix_formatting.js var position = new_position;
var result;
input = input.replace(/\r\n\x1b\[1A/g, '');
+ input = input.replace(/\x1b\[([0-9]+)C/g, function(_, num) {
+ return new Array(+num + 1).join(' ');
+ });
var splitted = input.split(/(\x1B\[[0-9;]*[A-Za-z])/g);
if (splitted.length === 1) {
if (settings.unixFormattingEscapeBrackets) {
| 9 |
diff --git a/packages/app/src/components/Admin/ExportArchiveData/SelectCollectionsModal.jsx b/packages/app/src/components/Admin/ExportArchiveData/SelectCollectionsModal.jsx import React from 'react';
import PropTypes from 'prop-types';
-import { withTranslation } from 'react-i18next';
+import { useTranslation } from 'react-i18next';
import {
Modal, ModalHeader, ModalBody, ModalFooter,
} from 'reactstrap';
@@ -242,9 +242,15 @@ SelectCollectionsModal.propTypes = {
collections: PropTypes.arrayOf(PropTypes.string).isRequired,
};
+const SelectCollectionsModalWrapperFc = (props) => {
+ const { t } = useTranslation();
+
+ return <SelectCollectionsModal t={t} {...props} />;
+};
+
/**
* Wrapper component for using unstated
*/
-const SelectCollectionsModalWrapper = withUnstatedContainers(SelectCollectionsModal, [AppContainer]);
+const SelectCollectionsModalWrapper = withUnstatedContainers(SelectCollectionsModalWrapperFc, [AppContainer]);
-export default withTranslation()(SelectCollectionsModalWrapper);
+export default SelectCollectionsModalWrapper;
| 14 |
diff --git a/edit.js b/edit.js @@ -2492,7 +2492,6 @@ const _makeChunkMesh = async (seedString, parcelSize, subparcelSize) => {
await subparcel.load;
if (!live) return;
- const slab = mesh.getSlab(ax, ay, az);
const spec = await geometryWorker.requestMarchingCubes(
seedNum,
meshId,
@@ -2505,6 +2504,7 @@ const _makeChunkMesh = async (seedString, parcelSize, subparcelSize) => {
);
if (!live) return;
+ const slab = mesh.addSlab(ax, ay, az, spec);
mesh.updateGeometry(slab, spec);
if (slab.physxGroupSet) {
| 0 |
diff --git a/lib/hooks/views/res.view.js b/lib/hooks/views/res.view.js @@ -109,9 +109,15 @@ module.exports = function _addResViewMethod(req, res, next) {
if (_.isObject(arguments[0])) {
locals = arguments[0];
}
-
+ // If the second argument is a function, treat it like the callback.
if (_.isFunction(arguments[1])) {
optionalCb = arguments[1];
+ // In which case if the first argument is a string, it means no locals were specified,
+ // so set `locals` to an empty dictionary and log a warning.
+ if (_.isString(arguments[0])) {
+ sails.log.warn('`res.view` called with (path, cb) signature (using path `' + specifiedPath + '`). You should use `res.view(path, {}, cb)` to render a view without local variables.');
+ locals = {};
+ }
}
// if (_.isFunction(locals)) {
| 12 |
diff --git a/src/components/molecules/ImageDownload/index.js b/src/components/molecules/ImageDownload/index.js -import { Flex, Icon, Text, Link } from 'components/atoms'
+import { Flex, Icon, Text, Link, Image } from 'components/atoms'
import PropTypes from 'prop-types'
import React from 'react'
import styles from './styles.module.scss'
@@ -23,7 +23,7 @@ export default function ImageDownload({
padding="3rem 0"
width={width}
>
- <img src={source} alt={altText} width={imageWidth} />
+ <Image src={source} alt={altText} width={imageWidth} />
<div className={styles.caption}>
<Text type="p" color="grey" weight="regular" size="base">
{title}
| 14 |
diff --git a/lib/assets/core/javascripts/cartodb3/editor.js b/lib/assets/core/javascripts/cartodb3/editor.js @@ -288,6 +288,7 @@ var mapCreation = function () {
cartodb_logo: false,
renderMenu: false,
show_empty_infowindow_fields: true,
+ showLimitErrors: true,
state: stateJSON,
interactiveFeatures: true,
layerSelectorEnabled: false,
| 6 |
diff --git a/scenes/street.scn b/scenes/street.scn "position": [-2, 1, 2],
"quaternion": [0, 0.7071067811865475, 0, 0.7071067811865476],
"start_url": "https://webaverse.github.io/helm/"
- },
- {
- "position": [
- -95,
- 0,
- 55
- ],
- "start_url": "../metaverse_modules/spawner/",
- "components": [
- {
- "key": "spawnUrl",
- "value": "https://webaverse.github.io/ghost/"
- }
- ]
}
]
}
| 2 |
diff --git a/package.json b/package.json "js-test-cloud": "npm-run-all --parallel --race http-server saucelabs-test",
"coveralls": "shx cat js/coverage/lcov.info | coveralls",
"js-vendor": "shx mkdir -p dist/js/vendor && shx cp node_modules/swiper/dist/js/swiper.min.js dist/js/vendor/ && shx cp node_modules/swiper/dist/js/swiper.min.js.map dist/js/vendor/",
- "docs": "npm-run-all --parallel css-docs js-docs --sequential docs-compile docs-lint",
+ "docs": "npm-run-all --parallel css-docs js-docs --sequential docs-compile docs-rtl docs-lint",
"docs-compile": "bundle exec jekyll build",
"postdocs-compile": "npm run docs-workbox-precache",
"docs-autoshot": "node build/autoshot.js",
| 12 |
diff --git a/articles/policies/penetration-testing.md b/articles/policies/penetration-testing.md @@ -35,7 +35,7 @@ Auth0 requires that:
* The test be restricted to only your tenant
* You disclose any suspected findings to the Auth0 Security team for explanation/discussion
-* You understand that your tenant will be moved between environments during testing. Auth0 will move your tenant from the stable environment to the preview environment before the testing commences. Auth0 will then return your tenant to the stable environment once the testing period ends. While your tenant is on the preview environment, it may receive updates more rapidly and have lowered rate limits when calling the Management API.
+* You understand that your tenant will be moved between environments during testing. Auth0 will move your tenant from the stable environment to the preview environment before the testing commences. Auth0 will then return your tenant to the stable environment once the testing period ends. Note that while your tenant is on the preview environment it may receive updates more rapidly.
## PSaaS Appliance customers
| 3 |
diff --git a/accessibility-checker-engine/help/HAAC_BackgroundImg_HasTextOrTitle.mdx b/accessibility-checker-engine/help/HAAC_BackgroundImg_HasTextOrTitle.mdx @@ -32,7 +32,7 @@ Background images that convey meaning must have a text alternative that describe
* Do not use background images to convey information;
* OR, if the background image conveys meaning, verify the information is available as text when viewing content in system high contrast mode;
-* OR, use the `"title"` attribute to provide a text alternative.
+* OR, use the `title` attribute to provide a text alternative.
</Column>
| 2 |
diff --git a/src/renderer/component/video/index.js b/src/renderer/component/video/index.js @@ -44,7 +44,8 @@ const perform = dispatch => ({
changeVolume: volume => dispatch(doChangeVolume(volume)),
doPlay: () => dispatch(doPlay()),
doPause: () => dispatch(doPause()),
- savePosition: (id, position) => dispatch(savePosition(id, position)),
+ savePosition: (claimId, position) =>
+ dispatch(savePosition(claimId, position)),
});
export default connect(select, perform)(Video);
| 10 |
diff --git a/packages/insomnia-app/app/ui/containers/app.js b/packages/insomnia-app/app/ui/containers/app.js @@ -91,10 +91,9 @@ class App extends PureComponent {
vcs: null,
forceRefreshCounter: 0,
forceRefreshHeaderCounter: 0,
+ isMigratingChildren: false,
};
- this._isMigratingChildren = false;
-
this._getRenderContextPromiseCache = {};
this._savePaneWidth = debounce(paneWidth => this._updateActiveWorkspaceMeta({ paneWidth }));
@@ -1025,7 +1024,7 @@ class App extends PureComponent {
document.removeEventListener('mousemove', this._handleMouseMove);
}
- async _ensureWorkspaceChildren(props) {
+ _ensureWorkspaceChildren(props) {
const { activeWorkspace, activeCookieJar, environments } = props;
const baseEnvironments = environments.filter(e => e.parentId === activeWorkspace._id);
@@ -1035,19 +1034,23 @@ class App extends PureComponent {
}
// We already started migrating. Let it finish.
- if (this._isMigratingChildren) {
+ if (this.state.isMigratingChildren) {
return;
}
// Prevent rendering of everything
- this._isMigratingChildren = true;
-
+ this.setState({ isMigratingChildren: true }, async () => {
+ console.log('START');
const flushId = await db.bufferChanges();
+ console.log('.');
await models.environment.getOrCreateForWorkspace(activeWorkspace);
+ console.log('.');
await models.cookieJar.getOrCreateForParentId(activeWorkspace._id);
+ console.log('.');
await db.flushChanges(flushId);
- this._isMigratingChildren = false;
+ this.setState({ isMigratingChildren: false });
+ });
}
componentWillReceiveProps(nextProps) {
@@ -1065,11 +1068,13 @@ class App extends PureComponent {
}
render() {
- if (this._isMigratingChildren) {
+ if (this.state.isMigratingChildren) {
console.log('[app] Waiting for migration to complete');
return null;
}
+ console.log('MIGRATION COMPLETE');
+
const { activeWorkspace } = this.props;
const {
| 1 |
diff --git a/lib/monitoring/addon/components/enable-monitoring/component.js b/lib/monitoring/addon/components/enable-monitoring/component.js @@ -57,7 +57,7 @@ export default Component.extend(ReservationCheck, CatalogUpgrade, {
nodeExporterLimitsMemory: '200',
operatorLimitsMemory: '500',
requestsMemory: '750',
- limitsMemory: '1000',
+ limitsMemory: '2000',
prometheusStorageClass: null,
grafanaStorageClass: null,
nodeSelectors: null,
| 3 |
diff --git a/functions/payments.js b/functions/payments.js const functions = require('firebase-functions'),
admin = require('firebase-admin');
-const stripe = require('stripe')(functions.config().stripe.test_token),
+const stripe = require('stripe')(functions.config().stripe.token),
currency = functions.config().stripe.currency || 'USD';
const cors = require('cors')({ origin: true });
| 12 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.