code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/app/assets/stylesheets/editor-3/_custom-list.scss b/app/assets/stylesheets/editor-3/_custom-list.scss max-width: 272px;
z-index: 100;
}
+
.CustomList-inner {
top: 0;
right: auto;
left: 0;
}
+
.CustomList--small {
width: 215px;
}
+
.CustomList--inputs {
padding: 10px;
white-space: nowrap;
}
+
.CustomList.is-visible {
display: block;
}
+
.CustomList.is-up {
bottom: 36px;
}
+
.CustomList-listWrapper {
position: relative;
}
+
.CustomList-list {
position: relative;
width: 100%;
max-height: 168px;
overflow: hidden;
}
+
.CustomList-list.is-customized .CustomList-item--add {
display: none;
}
+
.CustomList--full {
width: 100%;
}
+
.CustomList-message {
padding: 16px;
text-align: center;
}
+
.CustomList-messageText {
max-width: 100%;
white-space: normal;
overflow: auto;
word-break: break-word;
}
-.CustomList-item.is-highlighted,
-.CustomList-item:hover {
+
+.CustomList-item {
+ &.is-highlighted,
+ &:hover {
background: rgba($cBlue, 0.08);
cursor: pointer;
}
-.CustomList-item.is-disabled {
+
+ &.is-disabled {
&:hover {
background: inherit;
cursor: default;
}
}
-.CustomList-item--invert {
- @include display-flex();
+
+ &--invert {
+ display: flex;
+ }
}
+
/* TODO move to cartoassets and change to border-top and :first-child */
.CDB-ListDecoration-item {
min-height: 41px;
+
+ &:last-type-of {
+ border-bottom: 0;
+ }
+
+ .CDB-NavMenu-item:last-child {
+ margin-right: 0;
+ }
}
+
.CDB-ListDecoration-itemDisplay--flex {
- @include display-flex();
- @include justify-content(space-between);
+ display: flex;
+ justify-content: space-between;
}
+
.CDB-ListDecoration-itemPadding--vertical {
min-height: auto;
}
-.CDB-ListDecoration-item:last-type-of {
- border-bottom: 0;
-}
-.CDB-ListDecoration-item .CDB-NavMenu-item:last-child {
- margin-right: 0;
-}
+
.CDB-ListDecoration-secondaryContainer {
- @include display-flex();
- @include flex-direction(row);
- @include justify-content(space-between);
- @include align-items(center);
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
}
+
.CDB-ListDecoration-rampNav-item {
- @include display-flex();
- @include align-items(center);
+ display: flex;
+ align-items: center;
height: 40px;
padding: 0;
}
+
.CDB-ListDecoration-rampImg {
- @include display-flex();
- @include align-items(center);
+ display: flex;
+ align-items: center;
}
+
.CDB-ListDecoration-rampItemBar {
width: 20px;
}
| 2 |
diff --git a/ghost/admin/app/components/modals/newsletters/edit/settings.hbs b/ghost/admin/app/components/modals/newsletters/edit/settings.hbs </div>
</div>
</GhFormGroup>
- </div>
- </div>
- {{/liquid-if}}
- {{/let}}
{{#if (feature "audienceFeedback")}}
- {{#let (eq @openSection "audienceFeedback") as |isOpen|}}
- <button class="modal-fullsettings-tab {{if isOpen "active"}}" type="button" {{on "click" (fn @toggleSection "audienceFeedback")}} data-test-nav-toggle="general.audienceFeedback">
- {{svg-jar "newsletter-analytics"}} Newsletter analytics
- <span class="gh-nav-button-expand">{{svg-jar (if isOpen "arrow-up-stroke" "arrow-down-stroke")}}</span>
- </button>
- {{#liquid-if isOpen}}
- <div class="modal-fullsettings-tab-expanded">
- <div class="gh-stack">
<GhFormGroup @classNames="gh-stack-item gh-setting">
- <label for="capture-feedback" class="modal-fullsettings-title" data-test-toggle="feedbackEnabled">Capture feedback on your content</label>
+ <label for="capture-feedback" class="modal-fullsettings-title" data-test-toggle="feedbackEnabled">Ask your readers for feedback</label>
<div class="for-switch small">
<div class="container">
<input
</div>
</div>
</GhFormGroup>
+ {{/if}}
</div>
</div>
{{/liquid-if}}
{{/let}}
- {{/if}}
+
</div>
</fieldset>
| 5 |
diff --git a/content/articles/understanding-machine-learning-algorithms-and-how-to-implement-them/index.md b/content/articles/understanding-machine-learning-algorithms-and-how-to-implement-them/index.md @@ -206,7 +206,7 @@ Weighing options include:
For example:
-
+
We've got N locations in D-space and one unlabeled sample q. We need to identify the point closest to q. For big N and D, the KNN method is unworkable.
| 1 |
diff --git a/avatars/avatars.js b/avatars/avatars.js @@ -273,6 +273,7 @@ const loadPromise = (async () => {
`Hip Hop Dancing.fbx`,
`Crouching Idle.fbx`,
`Standing To Crouched.fbx`,
+ `Crouched To Standing.fbx`,
`Sneaking Forward.fbx`,
];
for (const name of animationFileNames) {
| 0 |
diff --git a/src/js/row.js b/src/js/row.js @@ -23,7 +23,8 @@ RowComponent.prototype.getCells = function(){
};
RowComponent.prototype.getCell = function(column){
- return this.row.getCell(column).getComponent();
+ var cell = this.row.getCell(column);
+ return cell ? cell.getComponent() : false;
};
RowComponent.prototype.getIndex = function(){
| 7 |
diff --git a/server/eb/app.py b/server/eb/app.py @@ -158,7 +158,7 @@ try:
# features are unsupported in the current hosted server
app_config.update_default_dataset_config(
- user_annotations__enable=False, embeddings__enable_reembedding=False,
+ embeddings__enable_reembedding=False,
)
app_config.update_server_config(multi_dataset__allowed_matrix_types=["cxg"],)
app_config.complete_config(logging.info)
| 11 |
diff --git a/src/pages/crafts/index.js b/src/pages/crafts/index.js @@ -289,7 +289,7 @@ function Crafts() {
},
};
- tradeData.profit = (craftRow.rewardItems[0].item.avg24hPrice * craftRow.rewardItems[0].count) - totalCost - fleaMarketFee(Items[craftRow.rewardItems[0].item.id].basePrice, craftRow.rewardItems[0].item.avg24hPrice, craftRow.count);
+ tradeData.profit = Math.floor((craftRow.rewardItems[0].item.avg24hPrice * craftRow.rewardItems[0].count) - totalCost - fleaMarketFee(Items[craftRow.rewardItems[0].item.id].basePrice, craftRow.rewardItems[0].item.avg24hPrice, craftRow.count));
tradeData.profitPerHour = Math.floor(tradeData.profit / (craftRow.duration / 3600));
// If the reward has no value, it's not available for purchase
| 1 |
diff --git a/src/pages/drupalcon-2021-event.js b/src/pages/drupalcon-2021-event.js @@ -4,7 +4,6 @@ import { graphql } from 'gatsby';
import { css } from '@emotion/react';
import Img from 'gatsby-image';
-import ContactForm from '../components/ContactForm';
import FullWidthSection from '../components/FullWidthSection';
import SplitSection from '../components/SplitSection';
import Layout from '../components/layout';
@@ -15,7 +14,7 @@ import InsightsSlider from '../components/InsightsSlider';
import Quote from '../components/ContentBody/Quote';
import ButtonForm from '../components/ButtonForm';
-const Drupalicon = ({ data }) => {
+const Drupalcon2021Event = ({ data }) => {
const [isDate, setDate] = useState(false);
const [exploreLink, setExploreLink] = useState(
'https://events.drupal.org/drupalcon2021'
@@ -31,7 +30,7 @@ const Drupalicon = ({ data }) => {
liveQas,
quote,
swag,
- } = data.allDrupaliconJson.edges[0].node;
+ } = data.allDrupalconJson.edges[0].node;
const images = data.allFile.nodes;
@@ -122,7 +121,6 @@ const Drupalicon = ({ data }) => {
banner: true,
styles: layoutStyles,
navLink: joinLink,
- logo: null,
heroLogo: true,
}}
>
@@ -327,7 +325,7 @@ const Drupalicon = ({ data }) => {
<p>
DrupalCon North America event organizers are working hard to bring
you a virtual version of the DrupalCon experience you know and love.
- The event will take place April 12th-16th, 2021 Online, and{' '}
+ The event will take place April 12th-16th, 2021 Online, and
<a href='https://drupal.regfox.com/drupalcon-north-america-2021'>
you can register for the event now
</a>
@@ -474,11 +472,11 @@ const Drupalicon = ({ data }) => {
);
};
-Drupalicon.propTypes = {
+Drupalcon2021Event.propTypes = {
data: PropTypes.object.isRequired,
};
-export default Drupalicon;
+export default Drupalcon2021Event;
export const query = graphql`
{
@@ -512,7 +510,7 @@ export const query = graphql`
...InsightFragment
}
}
- allDrupaliconJson {
+ allDrupalconJson {
edges {
node {
header {
| 10 |
diff --git a/website/themes/uppy/layout/partials/generated_stargazers.ejs b/website/themes/uppy/layout/partials/generated_stargazers.ejs -19174
\ No newline at end of file
+19227
\ No newline at end of file
| 3 |
diff --git a/src/components/dashboard/FaceRecognition/FaceRecognition.js b/src/components/dashboard/FaceRecognition/FaceRecognition.js @@ -48,8 +48,6 @@ class FaceRecognition extends React.Component<FaceRecognitionProps, State> {
timeout: TimeoutID
- zoomReady: Boolean
-
containerRef = createRef()
width = 720
@@ -63,9 +61,9 @@ class FaceRecognition extends React.Component<FaceRecognitionProps, State> {
componentWillMount = () => {
this.loadedZoom = ZoomSDK
- if (this.loadedZoom) {
- this.zoomReady = true
- }
+ this.timeout = setTimeout(() => {
+ this.setState({ zoomReady: true })
+ }, 0)
}
componentDidMount = () => {
@@ -141,9 +139,9 @@ class FaceRecognition extends React.Component<FaceRecognitionProps, State> {
<View style={styles.bottomContainer}>
<CustomButton
mode="contained"
- disabled={this.zoomReady === false}
+ disabled={this.state.zoomReady === false}
onPress={this.showFaceRecognition}
- loading={this.zoomReady === false || loadingFaceRecognition}
+ loading={this.state.zoomReady === false || loadingFaceRecognition}
>
Quick Face Recognition
</CustomButton>
| 0 |
diff --git a/js/views/modals/BaseModal.js b/js/views/modals/BaseModal.js @@ -8,7 +8,9 @@ import app from '../../app';
export default class BaseModal extends baseVw {
constructor(options = {}) {
const opts = {
- dismissOnOverlayClick: true,
+ // #259 - we've decided not have modals close on an overlay click, so you
+ // probably should never be passing in true for this.
+ dismissOnOverlayClick: false,
dismissOnEscPress: true,
showCloseButton: true,
closeButtonClass: 'cornerTR ion-ios-close-empty iconBtn clrP clrBr clrSh3',
| 12 |
diff --git a/react/features/calendar-sync/functions.any.js b/react/features/calendar-sync/functions.any.js @@ -7,6 +7,25 @@ import { APP_LINK_SCHEME, parseURIString } from '../base/util';
import { MAX_LIST_LENGTH } from './constants';
const logger = require('jitsi-meet-logger').getLogger(__filename);
+const ALLDAY_EVENT_LENGTH = 23 * 60 * 60 * 1000;
+
+/**
+ * Returns true of the calendar entry is to be displayed in the app, false
+ * otherwise.
+ *
+ * @param {Object} entry - The calendar entry.
+ * @returns {boolean}
+ */
+function _isDisplayableCalendarEntry(entry) {
+ // Entries are displayable if:
+ // - Ends in the future (future or ongoing events)
+ // - Is not an all day event and there is only one attendee (these events
+ // are usually placeholder events that don't need to be shown.)
+ return entry.endDate > Date.now()
+ && !((entry.allDay
+ || entry.endDate - entry.startDate > ALLDAY_EVENT_LENGTH)
+ && (!entry.attendees || entry.attendees.length < 2));
+}
/**
* Updates the calendar entries in redux when new list is received. The feature
@@ -29,13 +48,12 @@ export function _updateCalendarEntries(events: Array<Object>) {
// eslint-disable-next-line no-invalid-this
const { dispatch, getState } = this;
const knownDomains = getState()['features/base/known-domains'];
- const now = Date.now();
const entryMap = new Map();
for (const event of events) {
const entry = _parseCalendarEntry(event, knownDomains);
- if (entry && entry.endDate > now) {
+ if (entry && _isDisplayableCalendarEntry(entry)) {
// As was stated above, we don't display subsequent occurrences of
// recurring events, and the repetitions of events coming from
// multiple calendars.
@@ -111,6 +129,8 @@ function _parseCalendarEntry(event, knownDomains) {
);
} else {
return {
+ allDay: event.allDay,
+ attendees: event.attendees,
calendarId: event.calendarId,
endDate,
id: event.id,
| 9 |
diff --git a/website/siteConfig.js b/website/siteConfig.js // See https://docusaurus.io/docs/site-config.html for all the possible
// site configuration options.
+// If BASE_URL environment variable is set, use it as baseUrl.
+// If on netlify, use '/'. Otherwise use '/KaTeX/'.
+const baseUrl = process.env.BASE_URL || (process.env.CONTEXT ? '/' : '/KaTeX/');
+
/* List of projects/orgs using your project for the users page */
const users = [
{
@@ -22,7 +26,7 @@ const siteConfig = {
title: 'KaTeX',
tagline: 'The fastest math typesetting library for the web',
url: 'https://khan.github.io',
- baseUrl: '/KaTeX/',
+ baseUrl,
// Used for publishing and more
projectName: 'KaTeX',
| 12 |
diff --git a/src/transit.js b/src/transit.js @@ -378,7 +378,7 @@ class Transit {
if (!payload.stream) {
// Check stream error
- if (payload.meta["$streamError"]) {
+ if (payload.meta && payload.meta["$streamError"]) {
pass.emit("error", this._createErrFromPayload(payload.meta["$streamError"], payload.sender));
}
| 9 |
diff --git a/lib/i18n.js b/lib/i18n.js @@ -32,10 +32,18 @@ module.exports.__ = function(name) {
};
module.exports.readLocaleFile = function(locale) {
- return JSON.parse(fs.readFileSync(
+ let localeData = JSON.parse(fs.readFileSync(
path.join(__dirname, "..", "locales", locale + ".json"),
{ encoding: "utf8" }
));
+ if (localeData.__redirect__) {
+ return JSON.parse(fs.readFileSync(
+ path.join(__dirname, "..", "locales", localeData.__redirect__ + ".json"),
+ { encoding: "utf8" }
+ ));
+ } else {
+ return localeData;
+ }
};
module.exports.doDOMReplacement = function() {
| 11 |
diff --git a/src/Services/Utils/UtilsParser.js b/src/Services/Utils/UtilsParser.js @@ -21,7 +21,13 @@ function currencyConvertParse(json) {
}
function dataTypeParse(json) {
- return json['util:ReferenceDataItem'];
+ try {
+ json = json['util:ReferenceDataItem'];
+ } catch (e) {
+ throw new UtilsParsingError(json);
+ }
+
+ return json;
}
const errorHandler = function (rsp) {
| 0 |
diff --git a/test/converter/ImportEntities.test.js b/test/converter/ImportEntities.test.js @@ -10,7 +10,7 @@ const fixture = readFixture('element-citation.xml')
const test = module('ImportEntities')
test("Import journal citation", function(t) {
- let { entityDb } = _setup()
+ let { entityDb } = _setupImportTest()
// TODO: how can we turn the original id into a uuid, what to do
// with the old id?, and how to find the record after its id has changed?
@@ -32,7 +32,7 @@ test("Import journal citation", function(t) {
})
test("Import book citation", function(t) {
- let { entityDb } = _setup()
+ let { entityDb } = _setupImportTest()
let r2 = entityDb.get('r2')
t.equal(r2.authors.length, 1)
@@ -53,7 +53,7 @@ test("Import book citation", function(t) {
})
test("Extract persons from element citation", function(t) {
- let { entityDb } = _setup()
+ let { entityDb } = _setupImportTest()
const r1 = entityDb.get('r1')
const authors = r1.authors
@@ -73,6 +73,14 @@ test("Extract persons from element citation", function(t) {
t.end()
})
+test("Export journal citation", function(t) {
+ let { entityDb } = _setupExportTest()
+
+ let r1 = entityDb.get('r1')
+
+ t.end()
+})
+
function _emptyEntityDb() {
// creating an in-memory model of the EntityDB
// which will be used to create records from JATS
@@ -94,13 +102,25 @@ function _createAPI(entityDb) {
}
// Import entities from XML, used in the beginning of each test
-function _setup() {
+function _setupImportTest() {
+ let entityDb = _emptyEntityDb()
+ let dom = DefaultDOMElement.parseXML(fixture)
+ let api = _createAPI(entityDb)
+ let converter = new ImportEntities()
+
+ converter.import(dom, api)
+
+ return { converter, dom, entityDb }
+}
+
+function _setupExportTest() {
let entityDb = _emptyEntityDb()
let dom = DefaultDOMElement.parseXML(fixture)
let api = _createAPI(entityDb)
let converter = new ImportEntities()
converter.import(dom, api)
+ converter.export(dom, api)
return { converter, dom, entityDb }
}
| 6 |
diff --git a/ui/lang/nl.js b/ui/lang/nl.js @@ -25,7 +25,7 @@ export default {
format24h: true
},
table: {
- noData: 'Geen gegevens bechikbaar',
+ noData: 'Geen gegevens beschikbaar',
noResults: 'Geen records gevonden',
loading: 'Laden...',
selectedRecords: function (rows) {
| 1 |
diff --git a/src/components/stepFour/utils.js b/src/components/stepFour/utils.js @@ -258,7 +258,6 @@ export const deployFinalizeAgent = () => {
})
}
-let lc = false
export const setLastCrowdsale = () => {
return tierStore.tiers.map((tier, index) => {
return () => {
@@ -276,7 +275,6 @@ export const setLastCrowdsale = () => {
return method.estimateGas(opts)
.then(estimatedGas => {
opts.gasLimit = calculateGasLimit(estimatedGas)
- if (process.env.NODE_ENV === 'development' && !lc) {opts.gasLimit = 1000; lc = true;}
return sendTXToContract(method.send(opts))
})
})
| 2 |
diff --git a/examples/layer-browser/src/examples/experimental-layers.js b/examples/layer-browser/src/examples/experimental-layers.js @@ -174,6 +174,18 @@ const TextLayerExample = {
}
};
+const TextLayer100KExample = {
+ layer: TextLayer,
+ getData: dataSamples.getPoints100K,
+ props: {
+ id: 'text-layer-100k',
+ getText: x => 'X',
+ getPosition: x => x,
+ getColor: x => [0, 0, 200],
+ sizeScale: 1
+ }
+};
+
/* eslint-disable quote-props */
export default {
'Experimental Layers': {
@@ -183,6 +195,7 @@ export default {
'PathMarkerLayer (LngLat Offset)': PathMarkerExampleLngLatOffset,
'PathMarkerLayer (Meter)': PathMarkerExampleMeter,
'New SolidPolygonLayer': SolidPolygonLayerExample,
- TextLayer: TextLayerExample
+ TextLayer: TextLayerExample,
+ 'TextLayer (100K)': TextLayer100KExample
}
};
| 0 |
diff --git a/plugins/resource_management/app/controllers/resource_management/domain_admin_controller.rb b/plugins/resource_management/app/controllers/resource_management/domain_admin_controller.rb @@ -228,7 +228,7 @@ module ResourceManagement
end
@services_with_error = services.resource_management.apply_current_quota(@project_resources)
- #services.inquiry.set_inquiry_state(@inquiry.id, :approved, 'Approved')
+ services.inquiry.set_inquiry_state(@inquiry.id, :approved, 'Approved')
render action: 'approved_request'
end
| 12 |
diff --git a/client/src/helpers/getClientId.js b/client/src/helpers/getClientId.js import randomWords from "random-words";
-const key = "thorium_clientId";
+const key = "thorium_clientPersistentId";
let clientId = sessionStorage.getItem(key);
let windows = [];
let broadcastChannel;
@@ -79,8 +79,11 @@ function getClientList() {
// It errored - it either doesn't exist or isn't JSON.
// If it's blank, create a new one
}
+
if (!clientList) {
- clientList = [localStorage.getItem(key) || randomWords(3).join("-")];
+ clientList = [
+ localStorage.getItem("thorium_clientId") || randomWords(3).join("-")
+ ];
localStorage.setItem(key, JSON.stringify(clientList));
}
return clientList;
| 1 |
diff --git a/themes/cypress/layout/partial/error-reporting.swig b/themes/cypress/layout/partial/error-reporting.swig if (window.env === 'production') {
Sentry.init({
dsn: '{{ config.sentry.dsn }}',
- environment: window.env
+ environment: window.env,
+ // ignore ResizeObserver loop limit exceeded errors
+ // https://github.com/cypress-io/cypress-documentation/issues/1426
+ ignoreErrors: ['ResizeObserver']
})
}
</script>
| 8 |
diff --git a/aura-impl/src/main/java/org/auraframework/impl/system/RegistryTrie.java b/aura-impl/src/main/java/org/auraframework/impl/system/RegistryTrie.java @@ -90,12 +90,17 @@ public class RegistryTrie implements RegistrySet {
return prefixMap;
}
+ private String getNamespaceKey(String namespace) {
+ // W-3676967: temporarily allow a case-sensitive "duplicate" namespace, should be lower-cased otherwise
+ return "ONE".equals(namespace) ? namespace : namespace.toLowerCase();
+ }
+
private Map<String,Object> insertNamespaceReg(Map<String, Object> namespaceMap, DefRegistry reg) {
if (namespaceMap == null) {
namespaceMap = Maps.newHashMap();
}
for (String namespaceUnknown : reg.getNamespaces()) {
- String namespace = namespaceUnknown.toLowerCase();
+ String namespace = getNamespaceKey(namespaceUnknown);
Object orig = namespaceMap.get(namespace);
EnumMap<DefType, DefRegistry> defTypeMap;
@@ -120,7 +125,7 @@ public class RegistryTrie implements RegistrySet {
for (DefRegistry reg : allRegistries) {
insertPrefixReg(root, reg);
for (String ns : reg.getNamespaces()) {
- allNamespaces.add(ns.toLowerCase());
+ allNamespaces.add(getNamespaceKey(ns));
}
}
allNamespaces.remove("*");
@@ -187,7 +192,7 @@ public class RegistryTrie implements RegistrySet {
if (ns == null) {
ns = "*";
} else {
- ns = ns.toLowerCase();
+ ns = getNamespaceKey(ns);
}
Object top = root.get(prefix);
if (top == null) {
| 11 |
diff --git a/lib/node_modules/@stdlib/random/base/uniform/lib/_uniform.js b/lib/node_modules/@stdlib/random/base/uniform/lib/_uniform.js * @returns {number} pseudorandom number
*/
function uniform( rand, a, b ) {
- return ( (b-a)*rand() ) + a;
+ var r = rand();
+ return ( b*r ) + ( (1.0-r)*a ); // equivalent to (b-a)*r + a
}
| 4 |
diff --git a/scripts/getChanges.js b/scripts/getChanges.js @@ -4,13 +4,14 @@ const readjson = fs.readdirSync(`${__dirname}/../services`);
const result = [];
let buildnumber = 'dev';
-readjson.forEach((service) => {
+const ignoreServices = ["rds"]
+readjson.forEach((service) => {
const directMatch = data.match(new RegExp(`services/${service}/`, 'i'));
const matcher = (directMatch && directMatch.length > 0);
if (matcher) {
+ if (ignoreServices.includes(service)) return
- console.log(service);
const temp = JSON.parse(fs.readFileSync(`${__dirname}/../services/${service}/package.json`));
if (process.env.TRAVIS_BUILD_NUMBER) buildnumber = process.env.TRAVIS_BUILD_NUMBER
if (process.env.CIRCLE_BUILD_NUM) buildnumber = process.env.CIRCLE_BUILD_NUM
| 11 |
diff --git a/src/utils/wallet.js b/src/utils/wallet.js @@ -230,7 +230,7 @@ class Wallet {
return {
...state,
- has2fa: await TwoFactor.has2faEnabled(account),
+ has2fa: account.has2fa,
balance: {
available: ''
},
@@ -654,9 +654,11 @@ class Wallet {
async getAccount(accountId, limitedAccountData = false) {
let account = new nearApiJs.Account(this.connection, accountId);
- if (await TwoFactor.has2faEnabled(account)) {
+ has2fa = await TwoFactor.has2faEnabled(account)
+ if (has2fa) {
account = new TwoFactor(this, accountId);
}
+ account.has2fa = has2fa
// TODO: Check if lockup needed somehow? Should be changed to async? Should just check in wrapper?
if (limitedAccountData) {
| 7 |
diff --git a/packages/cx/src/widgets/form/Label.js b/packages/cx/src/widgets/form/Label.js @@ -2,6 +2,7 @@ import { Widget, VDOM } from "../../ui/Widget";
import { HtmlElement } from "../HtmlElement";
import { FocusManager } from "../../ui/FocusManager";
import { isArray } from "../../util/isArray";
+import { coalesce } from "../../util/coalesce";
export class Label extends HtmlElement {
declareData() {
@@ -18,11 +19,26 @@ export class Label extends HtmlElement {
...data.stateMods,
disabled: data.disabled,
};
+ data._disabled = data.disabled;
super.prepareData(context, instance);
}
explore(context, instance) {
- if (!instance.data.htmlFor) instance.data.htmlFor = context.lastFieldId;
+ let { data } = instance;
+
+ if (!data.htmlFor) data.htmlFor = context.lastFieldId;
+
+ data.disabled = data.stateMods.disabled = coalesce(
+ context.parentStrict ? context.parentDisabled : null,
+ data._disabled,
+ context.parentDisabled
+ );
+
+ if (instance.cache('disabled', data.disabled)) {
+ instance.markShouldUpdate(context);
+ this.prepareCSS(context, instance);
+ }
+
super.explore(context, instance);
}
| 0 |
diff --git a/src/modules/root/selectors.js b/src/modules/root/selectors.js export const selectRoot = (name, state) => state[name];
export const selectError = (name, state) => selectRoot(name, state).error;
+export const selectIsActive = (name, state) => selectRoot(name, state).isActive;
| 0 |
diff --git a/config/glossary.json b/config/glossary.json "definition": "A credential that can be used by an application to access an API. It informs the API that the bearer of the token has been authorized to access the API and perform specific actions specified by the scope that has been granted. An Access Token can be in any format, but two popular options include opaque strings and JSON Web Tokens (JWT). They should be transmitted to the API as a Bearer credential in an HTTP Authorization header.",
"short": "An authorization credential, in the form of an opaque string or JWT, used to access an API."
},
-{
"actions": {
"title": "Actions",
"definition": "Secure, tenant-specific, versioned functions written in Node.js that execute at certain points during the Auth0 runtime. Actions are used to customize and extend Auth0's capabilities with custom logic.",
| 2 |
diff --git a/package.json b/package.json "angular-route": "1.7.8",
"angular-ui-bootstrap": "2.5.6",
"bootstrap": "3.4.1",
- "jointjs": "^3.1.1",
+ "jointjs": "^2.2.1",
"jquery": "^3.4.1",
"json-rules-engine": "3.0.2",
"lodash": "^4.17.15",
| 13 |
diff --git a/src/traces/parcats/attributes.js b/src/traces/parcats/attributes.js @@ -162,7 +162,7 @@ module.exports = {
role: 'info',
editType: 'calc',
description: [
- 'The display index of dimension, from left to right, zero indexed, defaults to dimension' +
+ 'The display index of dimension, from left to right, zero indexed, defaults to dimension',
'index.'
].join(' ')
},
@@ -186,8 +186,8 @@ module.exports = {
role: 'info',
editType: 'calc',
description: [
- 'The number of observations represented by each state. Defaults to 1 so that each state represents ' +
+ 'The number of observations represented by each state. Defaults to 1 so that each state represents',
'one observation'
- ]
+ ].join(' ')
}
};
| 1 |
diff --git a/app/builtin-pages/views/library.js b/app/builtin-pages/views/library.js @@ -442,9 +442,7 @@ function rStagingArea (archiveInfo) {
<div class="changes">
<div class="changes-heading">
<span class="diff-summary">
- ${stats.add} ${pluralize(stats.add, 'addition')},
- ${stats.mod} ${pluralize(stats.mod, 'change')}, and
- ${stats.del} ${pluralize(stats.del, 'deletion')}
+ There are unpublished changes:
</span>
<div class="actions">
<button onclick=${onRevert} class="btn transparent">Revert changes</button>
| 14 |
diff --git a/src/User.jsx b/src/User.jsx import React, { useState, useEffect, useContext } from 'react';
import classnames from 'classnames';
-import * as ceramicApi from '../ceramic.js';
+// import * as ceramicApi from '../ceramic.js';
import { discordClientId } from '../constants';
import { parseQuery } from '../util.js';
// import Modal from './components/modal';
| 2 |
diff --git a/src/primitive.js b/src/primitive.js @@ -409,7 +409,11 @@ var _ = Mavo.Primitive = class Primitive extends Mavo.Node {
// Prevent default actions while editing
// e.g. following links etc
if (!this.modes) {
- $.bind(this.element, "click.mavo:edit", evt => evt.preventDefault());
+ $.bind(this.element, "click.mavo:edit", evt => {
+ if (!this.editor.contains(evt.target)) {
+ evt.preventDefault();
+ }
+ });
}
}
| 1 |
diff --git a/constants.js b/constants.js @@ -17,5 +17,6 @@ export const contractsHost = 'https://contracts.webaverse.com';
export const localstorageHost = 'https://localstorage.webaverse.com';
export const loginEndpoint = 'https://login.exokit.org';
export const tokensHost = 'https://tokens.webaverse.com';
+export const landHost = 'https://land.webaverse.com';
export const web3SidechainEndpoint = 'https://ethereums.exokit.org';
export const homeScnUrl = `https://webaverse.github.io/street/street.scn`;
\ No newline at end of file
| 0 |
diff --git a/assets/js/googlesitekit-module.js b/assets/js/googlesitekit-module.js @@ -25,8 +25,7 @@ import './modules';
* WordPress dependencies
*/
import domReady from '@wordpress/dom-ready';
-import { applyFilters } from '@wordpress/hooks';
-import { Component, render } from '@wordpress/element';
+import { render } from '@wordpress/element';
/**
* Internal dependencies
@@ -37,37 +36,15 @@ import Root from './components/root';
import ModuleApp from './components/module-app';
import Setup from './components/setup/ModuleSetup';
-class GoogleSitekitModule extends Component {
- constructor( props ) {
- super( props );
+function GoogleSitekitModule() {
+ const { moduleToSetup, showModuleSetupWizard } = global._googlesitekitLegacyData.setup;
- this.state = {
- showModuleSetupWizard: global._googlesitekitLegacyData.setup.showModuleSetupWizard,
- };
- }
-
- render() {
- const {
- showModuleSetupWizard,
- } = this.state;
-
- const { moduleToSetup } = global._googlesitekitLegacyData.setup;
- const { currentAdminPage } = global._googlesitekitLegacyData.admin;
-
- /**
- * Filters whether to show the Module setup wizard when showModuleSetupWizard is true.
- *
- * Modules can opt out of the wizard setup flow by returning false.
- */
- const moduleHasSetupWizard = applyFilters( 'googlesitekit.moduleHasSetupWizard', true, currentAdminPage );
-
- if ( showModuleSetupWizard && moduleHasSetupWizard ) {
+ if ( showModuleSetupWizard ) {
return <Setup moduleSlug={ moduleToSetup } />;
}
return <ModuleApp />;
}
-}
// Initialize the app once the DOM is ready.
domReady( () => {
| 2 |
diff --git a/token-metadata/0x1F8f123bf24849443a56eD9fC42b9265b7F3A39a/metadata.json b/token-metadata/0x1F8f123bf24849443a56eD9fC42b9265b7F3A39a/metadata.json "symbol": "UTO",
"address": "0x1F8f123bf24849443a56eD9fC42b9265b7F3A39a",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/components/selections/select.js b/src/components/selections/select.js @@ -59,6 +59,9 @@ function prepSelect(evt, startX, startY, dragOptions, mode) {
var gd = dragOptions.gd;
var fullLayout = gd._fullLayout;
+ var immediateSelect = isSelectMode && fullLayout.newselection.mode === 'immediate' &&
+ !dragOptions.subplot; // N.B. only cartesian subplots have persistent selection
+
var zoomLayer = fullLayout._zoomlayer;
var dragBBox = dragOptions.element.getBoundingClientRect();
var plotinfo = dragOptions.plotinfo;
@@ -392,7 +395,7 @@ function prepSelect(evt, startX, startY, dragOptions, mode) {
throttle.clear(throttleID);
dragOptions.gd.emit('plotly_selected', eventData);
- if(currentPolygon && dragOptions.selectionDefs) {
+ if(!immediateSelect && currentPolygon && dragOptions.selectionDefs) {
// save last polygons
currentPolygon.subtract = subtract;
dragOptions.selectionDefs.push(currentPolygon);
@@ -407,7 +410,7 @@ function prepSelect(evt, startX, startY, dragOptions, mode) {
}
}).catch(Lib.error);
- if(isDrawMode) {
+ if(isDrawMode || immediateSelect) {
clearSelectionsCache(dragOptions);
}
};
| 9 |
diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js @@ -2,7 +2,6 @@ const path = require( 'path' );
const MiniCssExtractPlugin = require( 'mini-css-extract-plugin' );
const mainConfig = require( '../webpack.config' );
const mapValues = require( 'lodash/mapValues' );
-const { ProvidePlugin } = require( 'webpack' );
module.exports = async ( { config } ) => {
// Site Kit loads its API packages as externals,
@@ -30,13 +29,7 @@ module.exports = async ( { config } ) => {
modules: [ path.resolve( __dirname, '..' ), 'node_modules' ],
};
- config.plugins = [
- ...config.plugins,
- new MiniCssExtractPlugin(),
- new ProvidePlugin( {
- React: 'react',
- } ),
- ];
+ config.plugins = [ ...config.plugins, new MiniCssExtractPlugin() ];
config.module.rules.push( {
test: /\.scss$/,
| 2 |
diff --git a/lxc/executors/scala b/lxc/executors/scala #!/bin/bash
+# Scala will complain if JAVA_HOME isn't set
+export JAVA_HOME=/opt/java/jdk-14
+
cp code.code interim.scala
timeout -s KILL 10 xargs -a args.args -d '\n' scala interim.scala < stdin.stdin
| 12 |
diff --git a/build/docs-rtl.js b/build/docs-rtl.js const sh = require('shelljs')
sh.config.fatal = true
-
-sh.exec('find site/docs/4.1/examples/ -mindepth 1 -maxdepth 1 -type d -name \'rtl-*\' -exec bash -c \'rm -rf site/docs/4.1/examples/$(basename "{}")/* ; rmdir site/docs/4.1/examples/$(basename "{}")\' ;', (code, stdout, stderr) => {
+sh.exec('find site/docs/4.1/examples/ -mindepth 1 -maxdepth 1 -type d -name "rtl-*" -exec bash -c \'rm -rf site/docs/4.1/examples/$(basename "{}")/* ; rmdir site/docs/4.1/examples/$(basename "{}")\' \\;', (code, stdout, stderr) => {
console.log('Exit code:', code)
console.log('Program output:', stdout)
console.log('Program stderr:', stderr)
- sh.exec('find site/docs/4.1/examples/ -mindepth 1 -maxdepth 1 -type d ! -name \'screenshots\' -exec bash -c \'mkdir -p site/docs/4.1/examples/rtl-$(basename "{}") ; cp -av "{}"/* site/docs/4.1/examples/rtl-$(basename "{}")/\' ;', (code, stdout, stderr) => {
+ sh.exec('find site/docs/4.1/examples/ -mindepth 1 -maxdepth 1 -type d ! -name "screenshots" -exec bash -c \'mkdir -p site/docs/4.1/examples/rtl-$(basename "{}") ; cp -av "{}"/* site/docs/4.1/examples/rtl-$(basename "{}")/\' \\;', (code, stdout, stderr) => {
console.log('Exit code:', code)
console.log('Program output:', stdout)
console.log('Program stderr:', stderr)
- sh.exec('find site/docs/4.1/examples/rtl-* -type f -name \'*.html\' -exec sed -i \'s/boosted\\.css/boosted-rtl\\.css/gi\' {} ;', (code, stdout, stderr) => {
+ sh.exec('find site/docs/4.1/examples/rtl-* -type f -name "*.html" -exec sed -i \'s/boosted\\.css/boosted-rtl\\.css/gi\' {} \\;', (code, stdout, stderr) => {
console.log('Exit code:', code)
console.log('Program output:', stdout)
console.log('Program stderr:', stderr)
- sh.exec('find site/docs/4.1/examples/rtl-* -type f -name \'*.html\' -exec sed -i \'s/boosted\\.min\\.css/boosted-rtl\\.min\\.css/gi\' {} ;', (code, stdout, stderr) => {
+ sh.exec('find site/docs/4.1/examples/rtl-* -type f -name "*.html" -exec sed -i \'s/boosted\\.min\\.css/boosted-rtl\\.min\\.css/gi\' {} \\;', (code, stdout, stderr) => {
console.log('Exit code:', code)
console.log('Program output:', stdout)
console.log('Program stderr:', stderr)
- sh.exec('find site/docs/4.1/examples/rtl-* -type f -name \'*.html\' -exec sed -i \'s/html lang="en"/html lang="en" dir="rtl"/gi\' {} ;', (code, stdout, stderr) => {
+ sh.exec('find site/docs/4.1/examples/rtl-* -type f -name "*.html" -exec sed -i \'s/html lang="en"/html lang="en" dir="rtl"/gi\' {} \\;', (code, stdout, stderr) => {
console.log('Exit code:', code)
console.log('Program output:', stdout)
console.log('Program stderr:', stderr)
| 1 |
diff --git a/package.json b/package.json {
- "name": "client-sdk",
+ "name": "sdk",
"version": "0.0.1",
- "main": "dist/client-sdk.cjs.js",
- "module": "dist/client-sdk.esm.js",
- "browser": "dist/client-sdk.umd.js",
+ "main": "dist/sdk.cjs.js",
+ "module": "dist/sdk.esm.js",
+ "browser": "dist/sdk.umd.js",
"license": "MIT",
"repository": {
"type": "git",
- "url": "https://github.com/docknetwork/client-sdk"
+ "url": "https://github.com/docknetwork/sdk"
},
"devDependencies": {
"@babel/cli": "^7.8.4",
| 10 |
diff --git a/articles/libraries/auth0js/migration-guide.md b/articles/libraries/auth0js/migration-guide.md @@ -8,7 +8,7 @@ url: /libraries/auth0js/migration-guide
The following instructions assume you are migrating from **auth0.js v7** to **auth0.js v8**.
-The goal of this migration guide is to provide you with all of the information you would need to update Auth0.js in your application. Of course, your first step is to include the latest version of auth0.js. Beyond that, take a careful look at each of the areas on this page. You will need to change your implementation of auth0.js to reflect the new changes. Note that we especially recommend migrating to auth0.js v8 if you have the OAuth2 flag enabled in your tenant.
+The goal of this migration guide is to provide you with all of the information you would need to update Auth0.js in your application. Of course, your first step is to include the latest version of auth0.js. Beyond that, take a careful look at each of the areas on this page. You will need to change your implementation of auth0.js to reflect the new changes. Note that we especially recommend migrating to auth0.js v8 if you have [enabled the new API Authorization flows](/api-auth/tutorials/configuring-tenant-for-api-auth).
Take a look below for more information about changes and additions to auth0.js in version 8!
@@ -34,14 +34,14 @@ This can be avoided by either switching how your id_tokens are signed, or by man
### Switching from HS256 to RS256
To switch from HS256 to RS256 for a specific client, follow these instructions:
-1. Go to [https://manage.auth0.com/#/clients](https://manage.auth0.com/#/clients)
+1. Go to [Dashboard > Clients](https://manage.auth0.com/#/clients)
1. Select your client
-1. Go to Settings
-1. Click on Show Advanced Settings
-1. Click on the OAuth tab in Advanced Settings
-1. Change the JsonWebToken Signature Algorithm to RS256
+1. Go to _Settings_
+1. Click on __Show Advanced Settings__
+1. Click on the _OAuth_ tab in Advanced Settings
+1. Change the __JsonWebToken Signature Algorithm__ to `RS256`
-And remember that if the token is being validated anywhere else, that changes might need to be made there as well to comply.
+Remember that if the token is being validated anywhere else, changes might be needed there as well in order to comply.
### Manually Parsing Hashes
| 0 |
diff --git a/src/pages/settings/Security/SecuritySettingsPage.js b/src/pages/settings/Security/SecuritySettingsPage.js @@ -18,7 +18,7 @@ const AboutPage = (props) => {
const menuItems = [
{
translationKey: 'passwordPage.changePassword',
- icon: Expensicons.Link,
+ icon: Expensicons.Lock,
action: () => {
Navigation.navigate(ROUTES.SETTINGS_PASSWORD);
},
| 14 |
diff --git a/bin/moleculer-runner.js b/bin/moleculer-runner.js @@ -195,7 +195,6 @@ function mergeOptions() {
obj[key] = overwriteFromEnv(obj[key], (prefix ? prefix + "_" : "") + key);
});
- const dots = {};
const moleculerPrefix = "MOLECULER_";
Object.keys(process.env)
.filter(key => key.startsWith(moleculerPrefix))
@@ -220,10 +219,10 @@ function mergeOptions() {
.join("")
)
.join(".");
- dots[dotted] = normalizeEnvValue(process.env[variable.key]);
+ obj = utils.dotSet(obj, dotted, normalizeEnvValue(process.env[variable.key]));
});
- return Object.assign(obj, utils.dotSet(dots));
+ return obj;
}
config = overwriteFromEnv(config);
| 1 |
diff --git a/src/Endpoint.js b/src/Endpoint.js @@ -100,7 +100,7 @@ class Endpoint {
*/
generate() {
- let fullEndpoint = Object.assign({}, JSON.parse(JSON.stringify(endpointStruct)), this.httpData);
+ let fullEndpoint = Object.assign({}, endpointStruct, this.httpData);
if (this.httpData.integration && this.httpData.integration === 'lambda') {
// determine request and response templates or use defaults
| 2 |
diff --git a/components/Pledge/CustomizePackage.js b/components/Pledge/CustomizePackage.js @@ -432,10 +432,13 @@ class CustomizePackage extends Component {
return !getOptionValue(option, values) || option.userPrice
})
- const showMessageToClaimers =
- pkg.name === 'ABO_GIVE' &&
- (accessGrantedOnly ||
- getOptionValue(pkg.options.find(o => o.accessGranted), values) > 0)
+ let showMessageToClaimers = false
+ if (pkg.name === 'ABO_GIVE') {
+ const hasAccessGrantedValue = pkg.options
+ .filter(o => o.accessGranted)
+ .some(o => getOptionValue(o, values) > 0)
+ showMessageToClaimers = accessGrantedOnly || hasAccessGrantedValue
+ }
const optionGroups = nest()
.key(
| 9 |
diff --git a/src/commands/status.js b/src/commands/status.js @@ -28,7 +28,7 @@ function cacheIsStale (
entry.ctime.valueOf() !== stats.ctime.valueOf() ||
entry.uid !== stats.uid ||
entry.gid !== stats.gid ||
- entry.ino !== stats.ino ||
+ entry.ino !== stats.ino >> 0 ||
entry.size !== stats.size
)
}
@@ -141,6 +141,15 @@ export async function status (
})
return workdirOid === indexEntry.oid ? 'added' : '*added'
}
+ } else if (
+ indexEntry !== null &&
+ !cacheIsStale({ entry: indexEntry, stats })
+ ) {
+ if (indexEntry.oid === treeOid) {
+ return 'unmodified'
+ } else {
+ return 'modified'
+ }
} else {
let object = await read(path.join(workdir, pathname))
let workdirOid = await GitObjectManager.hash({
| 4 |
diff --git a/src/css/components/_theme-picker.scss b/src/css/components/_theme-picker.scss color: white;
color: var(--theme-secondary-color);
display: flex;
- overflow: scroll;
+ overflow: scroll hidden;
}
.theme-picker__object {
width: 50px;
| 2 |
diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -14,22 +14,22 @@ references:
nodelts: &nodelts
docker:
- - image: cimg/node:14.7.0
+ - image: cimg/node:14.15
browsers: &browsers
docker:
- - image: cimg/node:14.7.0-browsers
+ - image: cimg/node:14.15-browsers
nodenext: &nodenext
docker:
- - image: cimg/node:15.2.1
+ - image: cimg/node:15.2
node12: &node12
docker:
- - image: cimg/node:12.18.3
+ - image: cimg/node:12.18
node10: &node10
docker:
- - image: cimg/node:10.22.0
+ - image: cimg/node:10.22
node6: &node6
docker:
- - image: cimg/node:6.17.1
+ - image: cimg/node:6.17
workspace: &workspace
attach_workspace:
@@ -160,12 +160,6 @@ workflows:
<<: *triggerable-by-tag
requires:
- checkout_code
- # could be parallel with build, lint, and unit but it's a slow job
- # And circlecifree tier only has 3 concurrent jobs, so overall faster
- # to defer
- - typecheck:
- <<: *triggerable-by-tag
- <<: *build-lint-unit
- lint:
<<: *triggerable-by-tag
requires:
@@ -174,6 +168,12 @@ workflows:
<<: *triggerable-by-tag
requires:
- checkout_code
+ # could be parallel with build, lint, and unit but it's a slow job
+ # And circlecifree tier only has 3 concurrent jobs, so overall faster
+ # to defer
+ - typecheck:
+ <<: *triggerable-by-tag
+ <<: *build-lint-unit
- nodefetch1:
<<: *triggerable-by-tag
<<: *build-lint-unit
@@ -188,8 +188,7 @@ workflows:
<<: *build-lint-unit
- esm:
<<: *triggerable-by-tag
- requires:
- - build
+ <<: *build-lint-unit
- node10:
<<: *triggerable-by-tag
<<: *build-lint-unit
| 1 |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md @@ -37,10 +37,10 @@ There is always lots of coding to be done! Threat Dragon is split into 3 repos,
* [TD desktop app repo](https://github.com/OWASP/threat-dragon-desktop/issues)
* [TD core repo](https://github.com/OWASP/threat-dragon-core/issues)
-There are some [Development Notes](https://github.com/OWASP/threat-dragon-core/blob/main/dev-notes.md) that should help you to get started, as well as a template for the [Pull Requests](.github/PULL_REQUEST_TEMPLATE.md).
+There are some [Development Notes](dev-notes.md) that should help you to get started, as well as a template for the [Pull Requests](.github/PULL_REQUEST_TEMPLATE.md).
### Improve Existing Threat Engine or Write New Ones
The threat engines define how Threat Dragon can automatically suggest threats which could uncover vulnerabilities.
-We are always looking to improve [existing engine rules](https://github.com/OWASP/threat-dragon-core/blob/main/src/services/threatengine.js)
+We are always looking to improve [existing engine rules](src/services/threatengine.js)
and add new ones, so this is a great place to start helping with the Threat Dragon code base.
| 7 |
diff --git a/userscript.user.js b/userscript.user.js @@ -72079,10 +72079,10 @@ var $$IMU_EXPORT$$;
i--;
for (var j = 0; j < tried_urls.length; j++) {
- if (tried_urls[j][2] === obj_url) {
- var orig_url = tried_urls[j][3].url;
+ if (tried_urls[j].newurl === obj_url) {
+ var orig_url = tried_urls[j].newobj.url;
var index = array_indexof(images, orig_url);
- tried_urls[j][4] = true;
+ tried_urls[j].unk = true;
if (index >= 0) {
obj.splice(index, 1);
@@ -72108,27 +72108,36 @@ var $$IMU_EXPORT$$;
}
for (var i = 0; i < fine_urls.length; i++) {
- var index = array_indexof(images, fine_urls[i][0]);
+ var index = array_indexof(images, fine_urls[i].url);
if (index >= 0) {
obj = [obj[index]];
- return options.cb(obj, fine_urls[i][1]);
+ if (_nir_debug_) {
+ console_log("bigimage_recursive_loop's cb: returning fine_url", deepcopy(obj), deepcopy(fine_urls[i]));
+ }
+ return options.cb(obj, fine_urls[i].data);
}
}
var try_any = false;
for (var i = 0; i < tried_urls.length; i++) {
- if (tried_urls[i][0] === url || try_any) {
- if (tried_urls[i][4] === true) {
+ if (tried_urls[i].url === url || try_any) {
+ if (tried_urls[i].unk === true) {
try_any = true;
continue;
}
- var index = array_indexof(images, tried_urls[i][2]);
+ var index = array_indexof(images, tried_urls[i].newurl);
if (index >= 0) {
obj = [obj[index]];
- return options.cb(obj, tried_urls[i][1]);
+ if (_nir_debug_) {
+ console_log("bigimage_recursive_loop's cb: returning tried_url", deepcopy(obj), deepcopy(tried_urls[i]), try_any);
+ }
+ return options.cb(obj, tried_urls[i].data);
} else {
- return options.cb(null, tried_urls[i][1]);
+ if (_nir_debug_) {
+ console_log("bigimage_recursive_loop's cb: returning null tried_url", deepcopy(tried_urls[i]), try_any);
+ }
+ return options.cb(null, tried_urls[i].data);
}
}
}
@@ -72139,15 +72148,31 @@ var $$IMU_EXPORT$$;
query(obj, function (newurl, newobj, data) {
if (_nir_debug_) {
- console_log("bigimage_recursive_loop (query):", deepcopy(newurl), deepcopy(newobj), data);
+ console_log("bigimage_recursive_loop (query: newurl, newobj, data):", deepcopy(newurl), deepcopy(newobj), data);
}
if (!newurl) {
+ if (_nir_debug_) {
+ console_log("bigimage_recursive_loop (query): returning null", data);
+ }
return options.cb(null, data);
}
- fine_urls.push([newurl, data]);
- tried_urls.push([url, data, newurl, deepcopy(newobj), false]);
+ fine_urls.push({
+ url: newurl,
+ data: data
+ });
+
+ tried_urls.push({
+ url: url,
+ data: data,
+ newurl: newurl,
+ newobj: deepcopy(newobj),
+
+ // This is why you use objects instead of arrays
+ // I forgot what exactly this variable was supposed to accomplish
+ unk: false
+ });
//if (array_indexof(images, newurl) < 0 && newurl !== url || true) {
var newurl_index = array_indexof(images, newurl);
@@ -72156,6 +72181,10 @@ var $$IMU_EXPORT$$;
} else {
//obj = obj.slice(array_indexof(images, newurl));
obj = [obj[newurl_index]];
+
+ if (_nir_debug_) {
+ console_log("bigimage_recursive_loop (query): returning", deepcopy(obj), data);
+ }
options.cb(obj, data);
}
});
@@ -72486,6 +72515,10 @@ var $$IMU_EXPORT$$;
if (url === page_url) {
print_orig();
+
+ if (_nir_debug_)
+ console_log("(check_image) url == page_url", url, page_url);
+
ok_cb(url);
} else {
var headers = obj.headers;
@@ -72611,8 +72644,13 @@ var $$IMU_EXPORT$$;
console_log("(check_image) headers", headers);
if (obj.always_ok ||
- (!obj.can_head && !settings.canhead_get))
+ (!obj.can_head && !settings.canhead_get)) {
+ if (_nir_debug_) {
+ console_log("(check_image) always_ok || !can_head", url, deepcopy(obj));
+ }
+
return ok_cb(url);
+ }
var method = "HEAD";
if (!obj.can_head && settings.canhead_get) {
@@ -72749,10 +72787,15 @@ var $$IMU_EXPORT$$;
return err_cb("bad image");
}
- if (!customheaders || is_extension)
+ if (!customheaders || is_extension) {
+ if (_nir_debug_) {
+ console_log("(check_image) finalUrl", resp.finalUrl || url, resp, deepcopy(obj));
+ }
+
ok_cb(resp.finalUrl || url);
- else
+ } else {
console_log("Custom headers needed, currently unhandled");
+ }
};
var req = do_request({
| 7 |
diff --git a/etc/test-setup-users.js b/etc/test-setup-users.js @@ -70,6 +70,16 @@ function setupUsers(manager, done) {
'privilege-name': 'any-uri',
action: 'http://marklogic.com/xdmp/privileges/any-uri',
kind: 'execute'
+ },
+ {
+ 'privilege-name': 'xdmp-set-session-field',
+ action: 'http://marklogic.com/xdmp/privileges/xdmp-set-session-field',
+ kind: 'execute'
+ },
+ {
+ 'privilege-name': 'xdmp-get-session-field',
+ action: 'http://marklogic.com/xdmp/privileges/xdmp-get-session-field',
+ kind: 'execute'
}
]
}
| 0 |
diff --git a/Source/Shaders/GlobeFS.glsl b/Source/Shaders/GlobeFS.glsl @@ -381,6 +381,8 @@ void main()
czm_materialInput materialInput;
materialInput.st = v_textureCoordinates.st;
materialInput.normalEC = normalize(v_normalEC);
+ materialInput.positionToEyeEC = -v_positionEC;
+ materialInput.tangentToEyeMatrix = czm_eastNorthUpToEyeCoordinates(v_positionMC, normalize(v_normalEC));
materialInput.slope = v_slope;
materialInput.height = v_height;
materialInput.aspect = v_aspect;
| 12 |
diff --git a/imports/api/transactions/transaction.js b/imports/api/transactions/transaction.js @@ -822,15 +822,23 @@ const _genesisTransaction = (userId) => {
const _loadExternalCryptoBalance = (userId) => {
const user = Meteor.users.findOne({ _id: userId });
if (user.services.metamask != null){
- user.profile.wallet = _generateWalletAddress(user.profile.wallet);
let publicAddress = user.services.metamask.publicAddress
let weiBalance = getWeiBalance(publicAddress);
+ if (user.profile.wallet.balance == 0 && user.profile.wallet.currency == 'VOTES') {
+ // New metamask publicAddress, loading crypto balance for the first time
+ user.profile.wallet = _generateWalletAddress(user.profile.wallet);
user.profile.wallet.currency = 'WEI';
user.profile.wallet.balance = weiBalance.toNumber();
user.profile.wallet.available = weiBalance.toNumber();
-
Meteor.users.update({ _id: userId }, { $set: { profile: user.profile } });
+ } else if (user.profile.wallet.balance != weiBalance.toNumber()) {
+ // Returning user with new crypto balance
+ // TODO - sync balances following daemon pattern
+ console.log('DEBUG - returning metamask user with new balance');
+ }
+
+
}
};
| 9 |
diff --git a/lib/editor/components/pattern/PatternStopCard.js b/lib/editor/components/pattern/PatternStopCard.js @@ -37,7 +37,6 @@ type Props = {
index: number,
isDragging: boolean,
moveCard: (string, number) => void,
- onChange: () => void,
patternEdited: boolean,
patternStop: PatternStop,
removeStopFromPattern: typeof stopStrategiesActions.removeStopFromPattern,
@@ -53,7 +52,7 @@ type Props = {
title: string,
updateActiveGtfsEntity: typeof activeActions.updateActiveGtfsEntity,
updatePatternStops: typeof tripPatternActions.updatePatternStops,
- value: string
+ value: string | number
}
type State = {
@@ -315,7 +314,6 @@ class PatternStopContents extends Component<Props, State> {
patternStops[index][evt.target.id] = selectedOptionValue
this.setState({update: true})
updatePatternStops(activePattern, patternStops)
- console.log('made it to here')
}
render () {
| 1 |
diff --git a/stories/module-analytics-setup.stories.js b/stories/module-analytics-setup.stories.js @@ -100,7 +100,7 @@ storiesOf( 'Analytics Module/Setup', module )
return <Setup callback={ setupRegistry } />;
} )
- .add( 'No Accounts (legacy)', () => {
+ .add( 'Create Account Legacy (no accounts)', () => {
filterAnalyticsSetup();
const setupRegistry = ( { dispatch } ) => {
@@ -111,23 +111,6 @@ storiesOf( 'Analytics Module/Setup', module )
return <Setup callback={ setupRegistry } />;
} )
- .add( 'No Accounts', () => {
- filterAnalyticsSetup();
-
- const setupRegistry = ( { dispatch } ) => {
- dispatch( CORE_SITE ).receiveSiteInfo( {
- usingProxy: true,
- referenceSiteURL: 'http://example.com',
- timezone: 'America/Detroit',
- siteName: 'My Site Name',
- } );
- dispatch( STORE_NAME ).setSettings( {} );
- dispatch( STORE_NAME ).receiveAccounts( [] );
- dispatch( STORE_NAME ).receiveExistingTag( null );
- };
-
- return <Setup callback={ setupRegistry } />;
- } )
.add( 'Create Account Legacy (new account option)', () => {
filterAnalyticsSetup();
| 2 |
diff --git a/assets/js/modules/idea-hub/components/dashboard/DashboardCTA/index.js b/assets/js/modules/idea-hub/components/dashboard/DashboardCTA/index.js @@ -50,7 +50,7 @@ function DashboardCTA() {
navigateTo( response.moduleReauthURL );
} else {
showErrorNotification( GenericError, {
- id: `idea-hub-setup-error`,
+ id: 'idea-hub-setup-error',
title: __( 'Internal Server Error', 'google-site-kit' ),
description: error.message,
format: 'small',
| 2 |
diff --git a/src/native-bindings.js b/src/native-bindings.js @@ -349,22 +349,16 @@ const _onGl3DConstruct = (gl, canvas, attrs) => {
gl.destroy = (destroy => function() {
destroy.call(this);
- if (gl === GlobalContext.vrPresentState.glContext) {
- throw new Error('destroyed vr presenting context');
- /* bindings.nativeOpenVR.VR_Shutdown();
-
- GlobalContext.vrPresentState.glContextId = 0;
- GlobalContext.vrPresentState.system = null;
- GlobalContext.vrPresentState.compositor = null; */
- }
-
nativeWindow.destroyWindowHandle(windowHandle);
canvas._context = null;
- canvas.ownerDocument.removeListener('domchange', ondomchange);
-
GlobalContext.contexts.splice(GlobalContext.contexts.indexOf(gl), 1);
+ if (gl === GlobalContext.vrPresentState.glContext) {
+ GlobalContext.vrPresentState.glContext = null;
+ }
+ canvas.ownerDocument.removeListener('domchange', ondomchange);
+
if (gl.id === 1) {
process.kill(process.pid); // XXX make this a softer process.exit()
}
| 11 |
diff --git a/apps.json b/apps.json "version":"0.04",
"description": "Combination of the stepo, walkersclock, arrow and waypointer apps into a multiclock format. 'Everything but the kitchen sink'. Requires firmware v2.08.167 or later",
"tags": "tool,outdoors,gps",
+ "type":"clock",
"readme": "README.md",
"interface":"waypoints.html",
"storage": [
| 12 |
diff --git a/addon/mixins/run.js b/addon/mixins/run.js @@ -154,11 +154,13 @@ export default Mixin.create({
scheduleTask(queue, callbackOrName, ...args) {
assert(`Called \`scheduleTask\` without a string as the first argument on ${this}.`, typeof queue === 'string');
assert(`Called \`scheduleTask\` on destroyed object: ${this}.`, !this.isDestroyed);
+
let type = typeof callbackOrName;
+ let pendingTimers = this._getOrAllocateArray('_pendingTimers');
let cancelId = run.schedule(queue, this, () => {
- let cancelIndex = this._pendingTimers.indexOf(cancelId);
- this._pendingTimers.splice(cancelIndex, 1);
+ let cancelIndex = pendingTimers.indexOf(cancelId);
+ pendingTimers.splice(cancelIndex, 1);
if (type === 'function') {
callbackOrName.call(this, ...args);
@@ -169,7 +171,7 @@ export default Mixin.create({
}
});
- this._pendingTimers.push(cancelId);
+ pendingTimers.push(cancelId);
return cancelId;
},
| 4 |
diff --git a/articles/policies/endpoints.md b/articles/policies/endpoints.md @@ -29,4 +29,4 @@ The following endpoints are used by Auth0 public cloud service:
* https://login.[eu|au].auth0.com
* https://cdn.[eu|au].auth0.com
* https://{YOUR ACCOUNT}.[eu|au].auth0.com
-* https://{YOUR ACCOUNT}.[eu|au].guardian.auth0.com
+* https://{YOUR ACCOUNT}.guardian.[eu|au].auth0.com
| 1 |
diff --git a/shared/js/ui/base/safari-ui-wrapper.es6.js b/shared/js/ui/base/safari-ui-wrapper.es6.js @@ -9,7 +9,7 @@ if (safari &&
} else if (safari &&
safari.self &&
safari.self.tab) {
- context = 'options'
+ context = 'extensionPage'
} else {
throw new Error('safari-ui-wrapper couldn\'t figure out the context it\'s in')
}
@@ -36,7 +36,7 @@ let closePopup = () => {
let pendingMessages = {}
-let sendOptionsMessage = (message, resolve, reject) => {
+let sendExtensionPageMessage = (message, resolve, reject) => {
if (message.whitelisted) {
resolve(safari.self.tab.dispatchMessage('whitelisted', message))
} else if (message.getSetting) {
@@ -54,7 +54,7 @@ let sendOptionsMessage = (message, resolve, reject) => {
}
}
-if (context === 'options') {
+if (context === 'extensionPage') {
safari.self.addEventListener('message', (e) => {
if (e.name !== 'backgroundResponse' || !e.message.id) {
return
@@ -74,8 +74,8 @@ let fetch = (message) => {
console.log(`Safari Fetch: ${JSON.stringify(message)}`)
if (context === 'popup') {
safari.extension.globalPage.contentWindow.message(message, resolve)
- } else if (context === 'options') {
- sendOptionsMessage(message, resolve, reject)
+ } else if (context === 'extensionPage') {
+ sendExtensionPageMessage(message, resolve, reject)
}
})
}
| 10 |
diff --git a/docker-compose.yml b/docker-compose.yml @@ -12,6 +12,8 @@ services:
depends_on:
- redis
network_mode: "host"
+ depends_on:
+ - redis
redis:
image: 'redis:4.0-alpine'
@@ -33,6 +35,8 @@ services:
- server/workers/triple/triple.env
restart: always
network_mode: "host"
+ depends_on:
+ - redis
search_gsheets:
build:
@@ -42,6 +46,8 @@ services:
- server/workers/gsheets/gsheets.env
restart: always
network_mode: "host"
+ depends_on:
+ - redis
dataprocessing:
build:
@@ -54,6 +60,8 @@ services:
volumes:
- /var/opt/renv:/renv/cache
- /var/log/headstart:/var/log/headstart
+ depends_on:
+ - redis
volumes:
redis:
| 7 |
diff --git a/src/lib/analytics/AnalyticsClass.js b/src/lib/analytics/AnalyticsClass.js @@ -267,6 +267,8 @@ export class AnalyticsClass {
scope.setTag(key, value)
})
+ scope.setFingerprint([get(extra, 'logContext.from', '{{ default }}'), get(extra, 'eMsg')])
+
sentry.captureException(error)
})
}
| 0 |
diff --git a/src/Services/Air/Air.js b/src/Services/Air/Air.js @@ -165,7 +165,11 @@ module.exports = (settings) => {
.then(
pnrData => Promise.all(
pnrData[0].tickets.map(
- ticket => service.getTicket({ ticketNumber: ticket.number })
+ ticket => this.getTicket({
+ pnr: pnrData[0].pnr,
+ uapi_ur_locator: pnrData[0].uapi_ur_locator,
+ ticketNumber: ticket.number
+ })
)
)
)
| 4 |
diff --git a/js/monogatari.js b/js/monogatari.js @@ -1145,13 +1145,13 @@ $_ready(function () {
$_(this).parent ().find ("[data-string]").text (getLocalizedString ("Hide"));
$_("[data-ui='quick-menu']").removeClass ("transparent");
$_("[data-ui='text']").show();
- } else if ($_(this).text () === "Show") {
+ } else if ($_(this).text () === getLocalizedString ("Show")) {
$_(this).text (getLocalizedString("Hide"));
$_(this).parent ().find (".fa").removeClass ("fa-eye-slash");
$_(this).parent ().find (".fa").addClass ("fa-eye");
$_("[data-ui='quick-menu']").removeClass ("transparent");
$_("[data-ui='text']").show ();
- } else if ($_(this).text () === "Hide") {
+ } else if ($_(this).text () === getLocalizedString ("Hide")) {
$_(this).text (getLocalizedString ("Show"));
$_(this).parent ().find (".fa").removeClass ("fa-eye");
$_(this).parent ().find (".fa").addClass ("fa-eye-slash");
@@ -1176,7 +1176,7 @@ $_ready(function () {
$_(this).addClass("fa-play-circle");
clearTimeout (autoPlay);
autoPlay = null;
- } else if ($_(this).text () === getLocalizedString ("Auto")) {
+ } else if ($_(this).text () === getLocalizedString ("AutoPlay")) {
$_(this).text (getLocalizedString("Stop"));
autoPlay = setTimeout(function () {
if (canProceed() && finishedTyping) {
| 1 |
diff --git a/lib/waterline/utils/query/private/normalize-new-record.js b/lib/waterline/utils/query/private/normalize-new-record.js @@ -340,6 +340,7 @@ module.exports = function normalizeNewRecord(newRecord, modelIdentity, orm, curr
// If this is the primary key attribute, then set it to `null`.
// (https://docs.google.com/spreadsheets/d/1whV739iW6O9SxRZLCIe2lpvuAUqm-ie7j7tn_Pjir3s/edit#gid=1814738146)
+ // (This gets dealt with in the adapter later!)
if (attrName === WLModel.primaryKey) {
newRecord[attrName] = null;
}
| 0 |
diff --git a/assets/js/components/notifications/EnableAutoUpdateBannerNotification.js b/assets/js/components/notifications/EnableAutoUpdateBannerNotification.js @@ -66,7 +66,6 @@ const EnableAutoUpdateBannerNotification = () => {
const { enableAutoUpdate } = useDispatch( CORE_SITE );
const [ notification ] = useQueryArg( 'notification' );
- const [ slug ] = useQueryArg( 'slug' );
const [ isInitialPluginSetup, setIsFirstPluginSetup ] = useState( true );
const [ enabledViaCTA, setEnabledViaCTA ] = useState( undefined );
@@ -124,12 +123,9 @@ const EnableAutoUpdateBannerNotification = () => {
) {
return;
}
- setFirstPluginSetup(
- notification === 'authentication_success' && ! slug
- );
+ setFirstPluginSetup( notification === 'authentication_success' );
}, [
notification,
- slug,
hasUpdatePluginCapacity,
hasChangePluginAutoUpdatesCapacity,
setFirstPluginSetup,
| 2 |
diff --git a/assets/js/modules/pagespeed-insights/dashboard/dashboard-widget-homepage-speed-column.js b/assets/js/modules/pagespeed-insights/dashboard/dashboard-widget-homepage-speed-column.js @@ -44,8 +44,8 @@ import {
PageSpeedReportScoreGauge,
} from './util';
-const isZeroData = ( data ) => {
- return 0 === get( data, 'categories.performance.score' );
+const hasData = ( data ) => {
+ return !! get( data, 'categories.performance.score' );
};
class PageSpeedInsightsDashboardWidgetHomepageSpeedColumn extends Component {
@@ -68,7 +68,7 @@ class PageSpeedInsightsDashboardWidgetHomepageSpeedColumn extends Component {
return null;
}
- if ( isZeroData( data ) ) {
+ if ( ! hasData( data ) ) {
return getDataErrorComponent(
_x( 'PageSpeed Insights', 'Service name', 'google-site-kit' ),
__( 'An unknown error occurred while trying to fetch PageSpeed Insights data. Please try again later.', 'google-site-kit' ),
| 4 |
diff --git a/token-metadata/0xbD301BE09eB78Df47019aa833D29eDc5D815D838/metadata.json b/token-metadata/0xbD301BE09eB78Df47019aa833D29eDc5D815D838/metadata.json "symbol": "YFUEL",
"address": "0xbD301BE09eB78Df47019aa833D29eDc5D815D838",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/screens/EventDetailsScreen/EventOverview.js b/src/screens/EventDetailsScreen/EventOverview.js @@ -83,8 +83,7 @@ const EventOverview = ({ event }: Props) => {
</Text>
</IconItem>
- {event.fields.venueDetails &&
- event.fields.venueDetails.includes(
+ {event.fields.venueDetails.includes(
strings.venueDetailsGenderNeutralToilets
) && (
<IconItem source={genderNeutralIcon}>
| 2 |
diff --git a/src/routes.js b/src/routes.js @@ -143,12 +143,12 @@ export function loadPlanFromCSV(assignmentList, state) {
partCount = cols[3],
pluralType = cols[4];
if (unitId.includes("_")) {
- unitId = unitId.split("_").slice(1).join("_");
+ unitId = unitId.split("_").slice(-1)[0];
}
if (placeId !== state.place.id) {
throw new Error("CSV is for a different module (another state or region).");
- } else if (unitId !== state.units.id) {
+ } else if (unitId !== state.units.id.split("_").slice(-1)[0]) {
throw new Error("CSV is for this module but a different unit map (e.g. blocks, precincts).");
} else if (pluralType !== state.problem.pluralNoun.replace(/\s+/g, "")) {
throw new Error("CSV is for this module but a different division map (e.g. districts)");
| 11 |
diff --git a/assets/js/googlesitekit/modules/datastore/__fixtures__/index.js b/assets/js/googlesitekit/modules/datastore/__fixtures__/index.js @@ -27,6 +27,8 @@ const alwaysActive = [ 'search-console', 'site-verification' ];
/**
* Makes a copy of the modules with the given module activation set.
*
+ * @since n.e.x.t
+ *
* @param {...string} slugs Active module slugs.
* @return {Object[]} Array of module objects.
*/
| 1 |
diff --git a/extensions/README.md b/extensions/README.md @@ -63,9 +63,11 @@ is encouraged to list here.
| Extension Title | Identifier | Field Name Prefix | Scope | Description |
| ------------------------------------------------ | ----------------- | ------------------- | ------------------------- | ----------- |
+| [CARD4L](https://github.com/stac-extensions/card4l) | card4l | card4l | Item | How to comply to the CEOS CARD4L product family specifications (Optical and SAR) |
| [Data Cube](https://github.com/stac-extensions/datacube) | datacube | cube | Item, Collection | Data Cube related metadata, especially to describe their dimensions. |
| [File Info](https://github.com/stac-extensions/file) | file | file | Item, Collection | Provides a way to specify file details such as size, data type and checksum for assets in Items and Collections. |
| [Item Asset Definition](https://github.com/stac-extensions/item-assets) | item-assets | - | Collection | Provides a way to specify details about what assets may be found in Items belonging to a Collection. |
+| [Label](https://github.com/stac-extensions/label) | label | label | Item, Collection | Items that relate labeled AOIs with source imagery |
| [Point Cloud](https://github.com/stac-extensions/pointcloud) | pointcloud | pc | Item, Collection | Provides a way to describe point cloud datasets. The point clouds can come from either active or passive sensors, and data is frequently acquired using tools such as LiDAR or coincidence-matched imagery. |
| [Processing](https://github.com/stac-extensions/processing) | processing | processing | Item, Collection | Indicates from which processing chain data originates and how the data itself has been produced. |
| [SAR](https://github.com/stac-extensions/sar) | sar | sar | Item, Collection | Covers synthetic-aperture radar data that represents a snapshot of the earth for a single date and time. |
@@ -73,7 +75,6 @@ is encouraged to list here.
| [Tiled Assets](https://github.com/stac-extensions/tiled-assets) | tiled-assets | tiles | Item, Catalog, Collection | Allows to specify numerous assets using asset templates via tile matrices and dimensions. |
| [Timestamps](https://github.com/stac-extensions/timestamps) | timestamps | - | Item, Collection | Allows to specify numerous timestamps for assets and metadata. |
| [Versioning Indicators](https://github.com/stac-extensions/version) | version | - | Item, Collection | Provides fields and link relation types to provide a version and indicate deprecation. |
-| [CARD4L](https://github.com/stac-extensions/card4l) | card4l | card4l | Item | How to comply to the CEOS CARD4L product family specifications (Optical and SAR), from [openEO Platform](https://platform.openeo.org) |
### Proposed extensions
| 0 |
diff --git a/public/stylesheets/userProfile.css b/public/stylesheets/userProfile.css @@ -191,16 +191,21 @@ svg {
background-image: none;
}
+/* This is mostly undoing some of the default CSS From the Bootstrap carousel-caption class. */
.carousel-caption {
position: relative;
left: 0;
top: 0;
+ padding-top: 10px;
+ padding-bottom: 0;
color: black;
text-shadow: none;
}
.validation-comment {
text-align: left;
+ height: 70px;
+ overflow-y: auto;
}
.carousel-indicators {
| 12 |
diff --git a/lib/assets/javascripts/new-dashboard/components/NavigationBar/NavigationBar.vue b/lib/assets/javascripts/new-dashboard/components/NavigationBar/NavigationBar.vue </span>
<span class="title is-caption is-regular is-txtWhite">Maps</span>
</router-link>
-<<<<<<< HEAD
<router-link :to="{ name: 'datasets' }" class="navbar-elementItem" active-class="is-active">
-=======
- <router-link :to="{ name: 'data' }" class="navbar-elementItem" active-class="is-active">
->>>>>>> 46ec008d22db430c10b5d02ab0140be1371ee3c2
<span class="navbar-icon">
<img svg-inline class="navbar-iconFill" src="../../assets/icons/navbar/data.svg" />
</span>
| 2 |
diff --git a/server/public/anyplace_architect/controllers/WiFiController.js b/server/public/anyplace_architect/controllers/WiFiController.js @@ -2012,13 +2012,14 @@ app.controller('WiFiController', ['$cookieStore','$scope', 'AnyplaceService', 'G
fltr = function(v) { return !isNaN(v) && v != Number.POSITIVE_INFINITY };
var crlb_clamp = 5.0*4;
- console.log('crlbs: ', values);
+ //console.log('crlbs: ', values);
values = values.map(function(v) { return fltr(v) ? Math.min(v, crlb_clamp) : crlb_clamp});
- console.log('crlbs clamp: ', values);
+ //console.log('crlbs clamp: ', values);
var crlb_max = crlb_clamp;
- console.log("crlb_max: ", crlb_max);
- var weights = values.map(function(v) { return Math.log(1.0 + v / crlb_max) });
- console.log('weights: ', weights);
+ //console.log("crlb_max: ", crlb_max);
+ var weights = values.map(function(v) { return 1-Math.log(1.0 + v / crlb_max) });
+ //console.log('weights: ', weights);
+
while (i--) {
var rp = data[i];
@@ -2029,8 +2030,7 @@ app.controller('WiFiController', ['$cookieStore','$scope', 'AnyplaceService', 'G
weight: weights[i]
}
);
- // console.log("value: ", i , " ", values[i]);
- // console.log("weight: ", i , " ", Math.log(1 + values[i] / crlb_max));
+
data.splice(i, 1);
}
@@ -2055,8 +2055,13 @@ app.controller('WiFiController', ['$cookieStore','$scope', 'AnyplaceService', 'G
'rgba(191, 0, 31, 1)',
'rgba(255, 0, 0, 1)'
];
+
+
+
heatmapAcc.set('gradient', gradient);
+ heatmapAcc.set('radius', 20);
+
heatmapAcc.setMap($scope.gmapService.gmap);
| 1 |
diff --git a/lib/server.js b/lib/server.js @@ -27,7 +27,6 @@ class ServerBase {
))
.join('<br>')
-
res.status = 200
res.headers['Content-Type'] = 'text/html'
res.body = getPageHTML(
@@ -85,7 +84,6 @@ class ServerBase {
))
.join('<br>')
-
res.status = 200
res.headers['Content-Type'] = 'text/html'
@@ -103,7 +101,6 @@ class ServerBase {
res.headers['Access-Control-Max-Age'] = '600'
res.headers['Access-Control-Allow-Methods'] = 'GET,HEAD'
-
if (req.headers['access-control-request-headers']) {
res.headers['Access-Control-Allow-Headers'] = req.headers['access-control-request-headers']
}
@@ -152,7 +149,6 @@ class ServerBase {
res.headers['Content-Length'] = file.length
}
-
const stream = req.method === 'GET' && file.createReadStream(range)
let pipe = null
@@ -395,7 +391,6 @@ class BrowserServer extends ServerBase {
}
}
-
// NOTE: Arguments must already be HTML-escaped
function getPageHTML (title, pageHtml) {
return `
| 1 |
diff --git a/src/scene/materials/standard-material.js b/src/scene/materials/standard-material.js @@ -625,7 +625,7 @@ class StandardMaterial extends Material {
updateShader(device, scene, objDefs, staticLightList, pass, sortedLights) {
// update prefiltered lighting data
this.updateLightingUniforms(device, scene);
- const prefilteredCubeMap128 = this.parameters.texture_prefilteredCubeMap128?.data;
+ const prefilteredCubeMap128 = this.prefilteredCubeMap128 || (this.useSkybox && scene._skyboxPrefiltered[0]);
// Minimal options for Depth and Shadow passes
const minimalOptions = pass > SHADER_FORWARDHDR && pass <= SHADER_PICK;
| 4 |
diff --git a/Dockerfile b/Dockerfile @@ -66,10 +66,9 @@ RUN if [ "$ELEKTRA_EXTENSION" = "true" ]; then \
# install gems, copy app and run rake tasks
RUN bundle install --without "development integration_tests"
# install js packages
-
-RUN if [[ -z "${http_proxy}" ]]; then \
- yarn --proxy $http_proxy --https-proxy $https_proxy \
- else; yarn; fi
+RUN if [ -z ${http_proxy} ]; then \
+ echo do not use proxy && yarn; \
+ else echo use proxy && yarn --proxy $http_proxy --https-proxy $https_proxy; fi
ADD . /home/app/webapp
| 7 |
diff --git a/source/views/RootView.js b/source/views/RootView.js @@ -73,6 +73,8 @@ const RootView = Class({
'wheel',
'cut',
'submit',
+ 'focusin',
+ 'focusout',
];
for (let l = events.length; l--; ) {
node.addEventListener(
| 0 |
diff --git a/token-metadata/0x5F7fA1a0Ae94b5DD6bb6bD1708b5f3AF01b57908/metadata.json b/token-metadata/0x5F7fA1a0Ae94b5DD6bb6bD1708b5f3AF01b57908/metadata.json "symbol": "YFIKING",
"address": "0x5F7fA1a0Ae94b5DD6bb6bD1708b5f3AF01b57908",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/assets/sass/vendor/_mdc-button.scss b/assets/sass/vendor/_mdc-button.scss @include mdc-button-ink-color($c-content-primary);
box-shadow: none;
- text-transform: capitalize;
+ text-transform: none;
@media (max-width: $bp-desktop) {
min-width: auto;
padding-bottom: 8px;
padding-top: 8px;
text-align: center;
- text-transform: capitalize;
&:hover {
text-decoration: none;
| 2 |
diff --git a/lib/index.coffee b/lib/index.coffee @@ -31,4 +31,15 @@ work out script running UX
- bring back panes
* need to be able to scroll
+requirements
+---
+developers will generally work in one repo at a time
+- in terminal, pwd is that repo (packages/core-app)
+- run tests individually per package
+from root:
+- npm install (or run one command to npm install) for all packages
+- start app and run it
+- run watch-dev for all packages
+- run e2e tests
+
###
| 0 |
diff --git a/docs/src/layouts/Layout.vue b/docs/src/layouts/Layout.vue @@ -14,7 +14,7 @@ q-layout.doc-layout(view="lHh LpR lff", @scroll="onScroll")
header-menu.self-stretch.row.no-wrap(v-if="$q.screen.gt.xs")
- q-btn.q-ml-xs(v-show="$store.state.toc.length > 0", flat, dense, round, @click="rightDrawerState = !rightDrawerState", aria-label="Menu")
+ q-btn.q-ml-xs(v-show="hasRightDrawer", flat, dense, round, @click="rightDrawerState = !rightDrawerState", aria-label="Menu")
q-icon(name="assignment")
q-drawer(
@@ -61,7 +61,7 @@ q-layout.doc-layout(view="lHh LpR lff", @scroll="onScroll")
q-drawer(
v-model="rightDrawerState"
- v-if="$store.state.toc.length > 0"
+ v-if="hasRightDrawer"
side="right"
content-class="bg-grey-1"
:width="180"
@@ -146,6 +146,10 @@ export default {
set (val) {
this.$store.commit('updateRightDrawerState', val)
}
+ },
+
+ hasRightDrawer () {
+ return this.$store.state.toc.length > 0 || this.$q.screen.lt.sm === true
}
},
| 1 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -561,6 +561,9 @@ where X.Y.Z is the semver of most recent plotly.js release.
## [1.49.5] -- 2019-09-18
+### Changed
+- Drop support for IE10 and IE9 as part of browserify upgrade [#4168]
+
### Fixed
- Clear rejected promises from queue when calling `Plotly.react` [#4197]
- Do not attempt to remove non-existing mapbox layout source and layers [#4197]
| 0 |
diff --git a/token-metadata/0x1F3F677Ecc58F6A1F9e2CF410dF4776a8546b5DE/metadata.json b/token-metadata/0x1F3F677Ecc58F6A1F9e2CF410dF4776a8546b5DE/metadata.json "symbol": "VNDC",
"address": "0x1F3F677Ecc58F6A1F9e2CF410dF4776a8546b5DE",
"decimals": 0,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/edit.js b/edit.js @@ -450,6 +450,7 @@ class MultiSimplex {
textMesh.position.y = 2;
scene.add(textMesh);
+ const blackMaterial = new THREE.MeshBasicMaterial({color: 0x333333});
const _makeButtonMesh = (text, font, size = 0.1) => {
const object = new THREE.Object3D();
@@ -461,7 +462,6 @@ class MultiSimplex {
const w = x2 - x1;
const h = y2 - y1;
- const blackMaterial = new THREE.MeshBasicMaterial({color: 0x333333});
const leftMesh = new THREE.Mesh(new THREE.RingBufferGeometry(size*0.6, size*0.6 * 1.1, 8, 8, Math.PI/2, Math.PI), blackMaterial);
object.add(leftMesh);
const rightMesh = new THREE.Mesh(new THREE.RingBufferGeometry(size*0.6, size*0.6 * 1.1, 8, 8, -Math.PI/2, Math.PI), blackMaterial);
@@ -487,6 +487,26 @@ class MultiSimplex {
const buttonMesh = _makeButtonMesh('Lol');
buttonMesh.position.y = 1;
scene.add(buttonMesh);
+
+ const rightArrowShape = new THREE.Shape();
+ (function rightArrow(ctx) {
+ const size = 0.05;
+ const thickness = 0.02;
+ ctx.moveTo(-size, size);
+ ctx.lineTo(-size + thickness, size);
+ ctx.lineTo(thickness, 0);
+ ctx.lineTo(-size + thickness, -size);
+ ctx.lineTo(-size, -size);
+ ctx.lineTo(0, 0);
+ })(rightArrowShape);
+ const rightArrowGeometry = new THREE.ShapeBufferGeometry(rightArrowShape);
+ const rightArrowMesh = new THREE.Mesh(rightArrowGeometry, blackMaterial);
+ rightArrowMesh.position.y = 1;
+ scene.add(rightArrowMesh);
+ const leftArrowMesh = new THREE.Mesh(rightArrowGeometry, blackMaterial);
+ leftArrowMesh.position.y = 1;
+ leftArrowMesh.rotation.z = Math.PI;
+ scene.add(leftArrowMesh);
}
const mesh = await runtime.loadFile({
| 0 |
diff --git a/tests/appsTest.js b/tests/appsTest.js @@ -63,8 +63,8 @@ describe('Main: Currently testing apps management,', function () {
}).appendElement('data', '', (data) => {
data.appendElement('apps', '', (apps) => {
apps
- .appendElement('element', '', 'workflow')
- .appendElement('element', '', 'files')
+ .appendElement('element', '', MatchersV3.string('workflow'))
+ .appendElement('element', '', MatchersV3.string('files'))
})
})
})
| 11 |
diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -15,6 +15,8 @@ jobs:
ST2_HOST: localhost
ST2_USERNAME: admin
ST2_PASSWORD: 123
+ ST2_DOCKER_BRANCH:
+ ST2_TEST_ENVIRONMENT: https://github.com/StackStorm/st2-docker
steps:
- checkout
- run:
@@ -71,7 +73,11 @@ jobs:
sudo chmod +x /usr/local/bin/docker-compose
- run:
name: Clone test containers
- command: git clone -b "DEPRECATED/all-in-one" --depth 1 https://github.com/StackStorm/st2-docker ~/st2-docker
+ command: |
+ # Use DEPRECATED/all-in-one for now, we'll have to circle back around
+ # and fix this to use the master branch
+ echo "Cloning ${ST2_DOCKER_BRANCH:-DEPRECATED/all-in-one} branch of st2-docker"
+ git clone --branch ${ST2_DOCKER_BRANCH:-DEPRECATED/all-in-one} --depth 1 ${ST2_TEST_ENVIRONMENT} ~/st2-docker
- run:
name: Update env variables for test containers
command: |
| 4 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,16 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master
where X.Y.Z is the semver of most recent plotly.js release.
+## [1.43.1] -- 2018-12-21
+
+### Fixed
+- Fix z-axis auto-type for cartesian + gl3d graphs (bug introduced in 1.43.0) [#3360]
+- Fix `multicategory` axis coordinate sorting [#3362]
+- Fix `multicategory` y-axes clearance [#3354]
+- Fix contour label clipPath segments for reversed axes [#3352]
+- Fix axis autorange on double-click on graph `fixedrange:true` [#3351]
+
+
## [1.43.0] -- 2018-12-19
### Added
| 3 |
diff --git a/package.json b/package.json "carto-zera": "1.0.2",
"cartocolor": "4.0.0",
"cartodb-pecan": "0.2.x",
- "cartodb.js": "CartoDB/cartodb.js#v4.0.0-beta.23",
+ "cartodb.js": "CartoDB/cartodb.js#13498-make-legends-collapsable",
"clipboard": "1.6.1",
"codemirror": "5.14.2",
"d3-interpolate": "^1.1.6",
| 6 |
diff --git a/shared/js/background/load.es6.js b/shared/js/background/load.es6.js @@ -10,7 +10,7 @@ function JSONfromExternalFile (url) {
return loadExtensionFile({url: url, returnType: 'json', source: 'external'})
}
-function url (url, cb) {
+function url (url) {
return loadExtensionFile({ url: url, source: 'external' })
}
| 2 |
diff --git a/module/actor.js b/module/actor.js @@ -37,7 +37,7 @@ export class GurpsActor extends Actor {
data.data.additionalresources.bodyplan !== this._additionalResources?.bodyplan
) {
let bodyplan = data.data.additionalresources.bodyplan
- let hitlocationTable = hitlocationDictionary[bodyplan]
+ let hitlocationTable = HitLocations.hitlocationDictionary[bodyplan]
if (!hitlocationTable) {
ui.notifications.error(`Unsupported bodyplan value: ${bodyplan}`)
} else {
@@ -48,7 +48,7 @@ export class GurpsActor extends Actor {
let hit = hitlocationTable[loc]
let originalLoc = Object.values(oldlocations).filter((it) => it.where === loc)
let dr = originalLoc.length === 0 ? 0 : originalLoc[0]?.dr
- let it = new HitLocation(loc, dr, hit.penalty, hit.roll)
+ let it = new HitLocations.HitLocation(loc, dr, hit.penalty, hit.roll)
game.GURPS.put(hitlocations, it, count++)
}
// Since we are in the middle of an update now, we have to let it finish, and then change the hitlocations list
@@ -349,8 +349,8 @@ export class GurpsActor extends Actor {
let vitals = locations.filter((value) => value.where === HitLocations.HitLocation.VITALS)
if (vitals.length === 0) {
let hl = new HitLocations.HitLocation(HitLocations.HitLocation.VITALS)
- hl.penalty = HitLocations.hitlocationRolls[HitLocation.VITALS].penalty
- hl.roll = HitLocations.hitlocationRolls[HitLocation.VITALS].roll
+ hl.penalty = HitLocations.hitlocationRolls[HitLocations.HitLocation.VITALS].penalty
+ hl.roll = HitLocations.hitlocationRolls[HitLocations.HitLocation.VITALS].roll
hl.dr = '0'
locations.push(hl)
}
@@ -414,7 +414,7 @@ export class GurpsActor extends Actor {
}
})
locations.forEach((it) => temp.push(it))
- // locations.forEach(it => temp.push(HitLocation.normalized(it)))
+ // locations.forEach(it => temp.push(HitLocations.HitLocation.normalized(it)))
let prot = {}
let index = 0
| 3 |
diff --git a/token-metadata/0x3cC5EB07E0e1227613F1DF58f38b549823d11cB9/metadata.json b/token-metadata/0x3cC5EB07E0e1227613F1DF58f38b549823d11cB9/metadata.json "symbol": "EER",
"address": "0x3cC5EB07E0e1227613F1DF58f38b549823d11cB9",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/lib/modules/ens/contracts/ENSRegistry.sol b/lib/modules/ens/contracts/ENSRegistry.sol @@ -15,8 +15,8 @@ contract ENSRegistry is ENS {
mapping (bytes32 => Record) records;
// Permits modifications only by the owner of the specified node.
- modifier only_owner(bytes32 node) {
- require(records[node].owner == 0 || records[node].owner == msg.sender);
+ modifier only_owner(bytes32 node, address owner) {
+ require(records[node].owner == 0 || records[node].owner == msg.sender || records[node].owner == owner);
_;
}
@@ -32,7 +32,7 @@ contract ENSRegistry is ENS {
* @param node The node to transfer ownership of.
* @param owner The address of the new owner.
*/
- function setOwner(bytes32 node, address owner) public only_owner(node) {
+ function setOwner(bytes32 node, address owner) public only_owner(node, owner) {
Transfer(node, owner);
records[node].owner = owner;
}
@@ -43,19 +43,11 @@ contract ENSRegistry is ENS {
* @param label The hash of the label specifying the subnode.
* @param owner The address of the new owner.
*/
- /*
- function setSubnodeOwner(bytes32 node, bytes32 label, address owner) public only_owner(node) {
+ function setSubnodeOwner(bytes32 node, bytes32 label, address owner) public only_owner(node, owner) {
var subnode = keccak256(node, label);
NewOwner(node, label, owner);
records[subnode].owner = owner;
}
- */
-
- function setSubnodeOwner(bytes32 node, bytes32 label, address owner) public {
- var subnode = sha3(node, label);
- NewOwner(node, label, owner);
- records[subnode].owner = owner;
- }
/**
* @dev Sets the resolver address for the specified node.
@@ -72,7 +64,7 @@ contract ENSRegistry is ENS {
* @param node The node to update.
* @param ttl The TTL in seconds.
*/
- function setTTL(bytes32 node, uint64 ttl) public only_owner(node) {
+ function setTTL(bytes32 node, uint64 ttl) public only_owner(node, 0x0) {
NewTTL(node, ttl);
records[node].ttl = ttl;
}
| 1 |
diff --git a/src/components/general/map-gen/MapGen.jsx b/src/components/general/map-gen/MapGen.jsx @@ -1013,7 +1013,7 @@ const _makeChunkMesh = (x, y) => {
labelMesh.position.set(
x - numBlocks / 2 + w / 2,
1,
- y - numBlocks / 2 - h / 2
+ y + numBlocks / 2 - h / 2
);
labelMesh.scale.set(w, 1, h);
labelMesh.updateMatrixWorld();
@@ -1025,7 +1025,7 @@ const _makeChunkMesh = (x, y) => {
textMesh.position.set(
-numBlocks / 2 + textOffset,
1,
- -numBlocks / 2 - textOffset
+ numBlocks / 2 - textOffset
);
textMesh.quaternion.setFromAxisAngle(new THREE.Vector3(1, 0, 0), -Math.PI / 2);
mesh.add(textMesh);
| 5 |
diff --git a/test/utils.test.js b/test/utils.test.js @@ -280,6 +280,10 @@ describe('#Utils', () => {
expect(utils.getErrorPcc(null)).to.be.a('null');
});
+ it('should not break on any other string', () => {
+ expect(utils.getErrorPcc('123')).to.equal(null);
+ });
+
it('should work with correct data', () => {
expect(utils.getErrorPcc('NO AGREEMENT EXISTS FOR AGENCY - 38KP')).to.equal('38KP');
});
| 0 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.