code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/src/App.js b/src/App.js // @flow
import { isMobile } from 'mobile-device-detect'
-import React, { memo, useCallback, useState } from 'react'
+import React, { memo, useCallback, useEffect, useState } from 'react'
import { Platform, SafeAreaView, StyleSheet } from 'react-native'
import PaperProvider from 'react-native-paper/src/core/Provider'
import './lib/gundb/gundb'
| 0 |
diff --git a/articles/libraries/lock/v11/configuration.md b/articles/libraries/lock/v11/configuration.md @@ -67,7 +67,6 @@ var lock = new Auth0Lock('clientID', 'account.auth0.com', options);
| [redirectUrl](#redirecturl-string-) | The URL to redirect to after auth |
| [responseMode](#responsemode-string-) | Option to send response as POST |
| [responseType](#responsetype-string-) | Response as a code or token |
-| [sso](#sso-boolean-) | Whether or not to enable Single Sign On behavior in Lock |
### Database
@@ -579,22 +578,6 @@ var options = {
When the `responseType` is set to `code`, Lock will never show the **Last time you logged in with** message, and will always prompt the user for credentials.
:::
-#### sso {Boolean}
-
-Tells Lock to use or not the Single Sign On session created by Auth0 so it can prompt the user to login with the last logged in user. The Auth0 session is not tied to this value since it depends on the application's or tenant' settings.
-
-::: warning
-Failing to set this to true will result in multi-factor authentication not working correctly.
-:::
-
-```js
-var options = {
- auth: {
- sso: true
- }
-};
-```
-
## Database Options
### additionalSignUpFields {Array}
| 2 |
diff --git a/accessibility-checker-engine/src/v2/dom/ColorUtil.ts b/accessibility-checker-engine/src/v2/dom/ColorUtil.ts @@ -341,7 +341,8 @@ export class ColorUtil {
delete thisStackBG.alpha;
} else {
thisStackBG = thisBgColor.getOverlayColor(thisStackBG);
- thisStackAlpha = thisBgColor.alpha || 1.0
+ //thisStackAlpha = thisBgColor.alpha || 1.0;
+ thisStackAlpha = thisStackBG.alpha || 1.0;
}
// #526: If thisBgColor had an alpha value, it may not expose through thisStackBG in the above code
// We can't wipe out the gradient info if this layer was transparent
@@ -475,7 +476,6 @@ export class ColorObj {
}
let retVal = this.mix(bgColor, this.alpha);
delete retVal.alpha;
- delete this.alpha;
return retVal;
}
| 3 |
diff --git a/src/graphics/program-lib/chunks/msdf.frag b/src/graphics/program-lib/chunks/msdf.frag @@ -6,8 +6,8 @@ float median(float r, float g, float b) {
vec4 applyMsdf(vec4 color) {
- vec3 sample = texture2D(texture_msdfMap, vUv0).rgb;
- float distance = median(sample.r, sample.g, sample.b) - 0.5;
+ vec3 tsample = texture2D(texture_msdfMap, vUv0).rgb;
+ float distance = median(tsample.r, tsample.g, tsample.b) - 0.5;
vec4 msdf;
| 10 |
diff --git a/util.js b/util.js @@ -616,3 +616,7 @@ export function angleDifference(angle1, angle2) {
a = mod(a + Math.PI, Math.PI*2) - Math.PI;
return a;
}
+
+export function getVelocityDampingFactor(dampingPer60Hz, timeDiff) {
+ return Math.pow(dampingPer60Hz, timeDiff / 60);
+}
\ No newline at end of file
| 0 |
diff --git a/includes/Modules/Analytics.php b/includes/Modules/Analytics.php @@ -594,23 +594,6 @@ final class Analytics extends Module implements Module_With_Screen, Module_With_
};
case 'report':
$date_range = $data['dateRange'] ?: 'last-28-days';
- $data = array_merge(
- array(
- 'dateRange' => 'last-28-days',
- 'url' => '',
- // List of strings (comma-separated) of dimension names.
- 'dimensions' => '',
- // List of objects with expression and optional alias properties.
- 'metrics' => array(),
- // List of objects with fieldName and sortOrder properties.
- 'orderby' => array(),
- // Whether or not to double the requested range for comparison.
- 'compareDateRanges' => false,
- // Whether or not to include an additional previous range from the given dateRange.
- 'multiDateRange' => false,
- ),
- $data
- );
$dimensions = array_map(
function ( $name ) {
@@ -619,7 +602,7 @@ final class Analytics extends Module implements Module_With_Screen, Module_With_
return $dimension;
},
- explode( ',', $data['dimensions'] )
+ array_filter( explode( ',', $data['dimensions'] ) )
);
$request_args = compact( 'dimensions' );
| 2 |
diff --git a/android/app/build.gradle b/android/app/build.gradle @@ -237,7 +237,7 @@ dependencies {
implementation project(':react-native-config')
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation "com.android.support:appcompat-v7:${versions.supportLibrary}"
- implementation "com.facebook.react:react-native:+" // From node_modules
+ implementation "com.facebook.react:react-native:0.55.4" // From node_modules
implementation('com.crashlytics.sdk.android:crashlytics:2.9.2@aar') {
transitive = true
}
| 1 |
diff --git a/vis/js/io.js b/vis/js/io.js @@ -470,6 +470,8 @@ IO.prototype = {
term_array = term_array.concat(query_wt_rest.trim().replace(/\s+/g, " ").split(" "));
+ term_array = [...new Set(term_array)];
+
return term_array;
},
| 2 |
diff --git a/test/cli.js b/test/cli.js @@ -199,7 +199,7 @@ test('improper use of t.throws, even if caught and then rethrown too slowly, wil
});
});
-test('babel require hook only does not apply to source files', t => {
+test('precompiler require hook does not apply to source files', t => {
t.plan(3);
execCli('fixture/babel-hook.js', (err, stdout, stderr) => {
| 10 |
diff --git a/docs/StyleSheet.md b/docs/StyleSheet.md ## StyleSheet
-### Stylesheet is now a JS object, see [CHANGELOG.txt](../CHANGELOG.txt) for more details
+### Stylesheet is now a JS object, see [CHANGELOG.md](../CHANGELOG.md) for more details
See (Mapbox expression specs)[https://docs.mapbox.com/mapbox-gl-js/style-spec/#expressions] for reference on expressions.
| 1 |
diff --git a/tests/js/track-timeouts.js b/tests/js/track-timeouts.js * @return {void}
*/
export function setupTimeoutTracker() {
+ let originalTimeoutAPI;
+
global.useTrackedTimeouts = () => {
- const originalTimeoutAPI = {
+ originalTimeoutAPI = originalTimeoutAPI || {
setTimeout: global.setTimeout,
clearTimeout: global.clearTimeout,
};
| 11 |
diff --git a/src/lib/hooks/useUpgradeDialog.js b/src/lib/hooks/useUpgradeDialog.js -import React, { useEffect, useRef } from 'react'
+import React, { useEffect } from 'react'
import { StyleSheet, TouchableOpacity } from 'react-native'
-import { defer, from as fromPromise } from 'rxjs'
-import { share } from 'rxjs/operators'
+import { once } from 'lodash'
import API from '../../lib/API/api'
import Config from '../../config/config'
@@ -19,6 +18,15 @@ import useOnPress from './useOnPress'
const log = logger.child({ from: 'useUpgradeDialog' })
+// will be executed once, then cached with
+// the promise returned on the first call
+const isPhaseActual = once(async () => {
+ const { phase } = Config
+ const actualPhase = await API.getActualPhase()
+
+ return phase === actualPhase
+})
+
const styles = StyleSheet.create({
serviceWorkerDialogButtonsContainer: {
display: 'flex',
@@ -51,18 +59,7 @@ export default () => {
const store = SimpleStore.useStore()
const serviceWorkerUpdated = store.get('serviceWorkerUpdated')
- // observable won't start until first subscription
- // sharing observable between many subscribers to keep single API call
- const actualPhaseRef = useRef(defer(() => fromPromise(API.getActualPhase())).pipe(share()))
-
useEffect(() => {
- // calling api on mount
- actualPhaseRef.current.subscribe()
- }, [])
-
- useEffect(() => {
- const { phase } = Config
-
log.info('service worker updated', {
serviceWorkerUpdated,
})
@@ -71,13 +68,10 @@ export default () => {
return
}
- // subscribing to actualPhase observable stream
- // API request will performed anyway
- // even if this code will execute before on mount hook
- actualPhaseRef.current.subscribe(actualPhase =>
+ isPhaseActual().then(isActual =>
showDialog({
showCloseButtons: false,
- content: phase === actualPhase ? <RegularDialog /> : <NewReleaseDialog />,
+ content: isActual ? <RegularDialog /> : <NewReleaseDialog />,
buttonsContainerStyle: styles.serviceWorkerDialogButtonsContainer,
buttons: [
{
| 1 |
diff --git a/src/containers/LeftPanel/TestCase/EndpointTestStatements.jsx b/src/containers/LeftPanel/TestCase/EndpointTestStatements.jsx import React from 'react';
-/*
-Add imports here. Ex:
-import Middleware from '../Middleware/Middleware'
-*/;
+import Endpoint from '../Endpoint/Endpoint';
-const EndpointTestStatements = function endpointTestStatements({ endpointStatements, dispatchToendpointTestCase }) {
+const EndpointTestStatements = function endpointTestStatements({ endpointStatements, dispatchToEndpointTestCase }) {
return endpointStatements.map((statement, i) => {
switch (statement.type) {
/* add statements here. Ex: */
- /*case 'middleware':
+ case 'endpoint':
return (
- <Middleware
+ <Endpoint
key={statement.id}
- middleware={statement}
+ endpoint={statement}
index={i}
- dispatchToendpointTestCase={dispatchToendpointTestCase}
+ dispatchToEndpointTestCase={dispatchToEndpointTestCase}
/>
- );*/
+ );
default:
return <></>;
}
| 3 |
diff --git a/books/serializers.py b/books/serializers.py @@ -32,7 +32,7 @@ class BookCopySerializer(serializers.ModelSerializer):
class Meta:
model = BookCopy
- fields = ('user', 'borrow_date')
+ fields = ('user', 'borrow_date', 'missing')
class BookSerializer(serializers.ModelSerializer):
| 0 |
diff --git a/assets/js/components/ReportTable.js b/assets/js/components/ReportTable.js @@ -41,7 +41,7 @@ export default function ReportTable( { rows, columns, className } ) {
<thead className="googlesitekit-table__head">
<tr className="googlesitekit-table__head-row">
{ columns.map(
- ( { title, description, primary, className: columnClassName }, i ) => (
+ ( { title, description, primary, className: columnClassName }, colIndex ) => (
<th
className={ classnames(
'googlesitekit-table__head-item',
@@ -49,7 +49,7 @@ export default function ReportTable( { rows, columns, className } ) {
columnClassName,
) }
data-tooltip={ description }
- key={ `googlesitekit-table__head-row-${ i }` }
+ key={ `googlesitekit-table__head-row-${ colIndex }` }
>
{ title }
</th>
@@ -59,18 +59,18 @@ export default function ReportTable( { rows, columns, className } ) {
</thead>
<tbody className="googlesitekit-table__body">
- { rows.map( ( row, i ) => (
+ { rows.map( ( row, rowIndex ) => (
<tr
className="googlesitekit-table__body-row"
- key={ `googlesitekit-table__body-row-${ i }` }
+ key={ `googlesitekit-table__body-row-${ rowIndex }` }
>
{ columns
.filter( ( { Component, field } ) => Component || field )
- .map( ( { Component, field, className: columnClassName }, j ) => {
+ .map( ( { Component, field, className: columnClassName }, colIndex ) => {
const fieldValue = field && get( row, field );
return (
<td
- key={ `googlesitekit-table__body-item-${ j }` }
+ key={ `googlesitekit-table__body-item-${ colIndex }` }
className={ classnames(
'googlesitekit-table__body-item',
columnClassName
| 4 |
diff --git a/README.md b/README.md @@ -143,36 +143,44 @@ While this project's installation instructions defaults to using [npm][npm] for
- Install the entire project as a [command-line utility](#install_command_line_utility).
-- I am building a **web application** and plan on using [Browserify][browserify], [Webpack][webpack], and other bundlers for use in web browsers.
+- I am building a **web application**.
+
+ - I plan on using [Browserify][browserify], [Webpack][webpack], and other bundlers for use in web browsers.
- Install [individual packages](#install_individual_packages). Installing the entire project is likely unnecessary and will lead to slower installation times.
-- I am building a **web application** and would like to **vendor** a custom bundle containing various stdlib functionality.
+ - I would like to **vendor** a custom bundle containing various stdlib functionality.
- Follow the steps for creating [custom bundles](#install_custom_bundles).
-- I am building a **web application** and would like to include stdlib functionality by just using a `script` tag.
+ - I would like to include stdlib functionality by just using a `script` tag.
- Install one of the pre-built UMD [browser bundles](#install_browser_bundles) or consume one of the pre-built bundles via a CDN, such as [unpkg][unpkg].
-- I would like to use stdlib functionality in an [Observable][observable] notebook.
+ - I am interested in using a substantial amount of functionality found in a top-level stdlib namespace and don't want to separately install hundreds of individual packages (e.g., if building an on-line calculator application and wanting all of stdlib's math functionality).
- - Consume one of the pre-built [browser bundles](#install_browser_bundles) via a CDN, such as [unpkg][unpkg].
+ - Install one or more top-level [namespaces](#install_namespaces). Installing the entire project is likely unnecessary and will lead to slower installation times. Installing a top-level namespace is likely to mean installing functionality which will never be used; however, installing a top-level namespace is likely to be easier and less time-consuming than installing many individual packages separately.
+
+ Concerning bundling, installing a top-level namespace should not be a concern, as individual functionality can still be independently required/imported. Project installation times may, however, be somewhat slower.
+
+- I am building a [Node.js][node-js] **server application**.
-- I am building a [Node.js][node-js] **server application** and am interested in using various functionality found in stdlib.
+ - I am interested in using various functionality found in stdlib.
- Install [individual packages](#install_individual_packages). Installing the entire project is likely unnecessary and will lead to slower installation times.
-- I am building a **web application** or [Node.js][node-js] **server application** and am interested in using a substantial amount of functionality found in a top-level stdlib namespace and don't want to separately install hundreds of individual packages (e.g., if building an on-line calculator application and wanting all of stdlib's math functionality).
+ - I am interested in using a substantial amount of functionality found in a top-level stdlib namespace and don't want to separately install hundreds of individual packages (e.g., if building an on-line calculator application and wanting all of stdlib's math functionality).
- Install one or more top-level [namespaces](#install_namespaces). Installing the entire project is likely unnecessary and will lead to slower installation times. Installing a top-level namespace is likely to mean installing functionality which will never be used; however, installing a top-level namespace is likely to be easier and less time-consuming than installing many individual packages separately.
- For web applications, installing a top-level namespace should not be a concern, as individual functionality can still be independently required/imported. Project installation times may, however, be somewhat slower.
-
- I am using **Deno**.
- Use [skypack][skypack] to import [individual packages](#install_individual_packages).
+- I would like to use stdlib functionality in an [Observable][observable] notebook.
+
+ - Consume one of the pre-built [browser bundles](#install_browser_bundles) via a CDN, such as [unpkg][unpkg].
+
- I want to hack at stdlib, possibly even creating **customized** builds to link to platform-specific native libraries (such as Intel's MKL or some other numerical library).
- Install the project as a [system library](#install_system_library) by cloning this repository and following the [installation][stdlib-development] instructions as described in the [development guide][stdlib-development].
| 4 |
diff --git a/src/encoded/audit/replicate.py b/src/encoded/audit/replicate.py @@ -68,7 +68,7 @@ def audit_inconsistent_construct_tag(value, system):
if ab_target['name'] == exp_target['name']:
matching_flag = True
break
- if not matching_flag:
+ if len(antibody_targets) > 0 and not matching_flag:
detail = 'Replicate {}-{} in experiment {} '.format(
value['biological_replicate_number'],
value['technical_replicate_number'],
| 1 |
diff --git a/plugins/api/src/getCategory.js b/plugins/api/src/getCategory.js @@ -42,6 +42,7 @@ const makeUrl = function (title, options, append) {
}
const getCategory = async function (title, options, http) {
+ options = { ...defaults, ...options }
let list = []
let getMore = true
let append = ''
| 1 |
diff --git a/layouts/partials/head.html b/layouts/partials/head.html {{- end -}}
{{ if and (not .favicon) (not .favicon_png) (not .favicon_svg) }}
- <link rel="icon" type="image/svg+xml" href="favicon.svg">
+ <link rel="icon" href="/favicon.png">
+ <link rel="apple-touch-icon-precomposed" href="/favicon.png">
+ <link rel="icon" type="image/svg+xml" href="/favicon.svg">
{{ end }}
{{- end }}
| 0 |
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml @@ -59,6 +59,7 @@ jobs:
use-tls: 0
- node-version: "18.x"
mysql_connection_url_key: "PS_MYSQL_URL"
+ filter: "test-select"
use-compression: 0
use-tls: 0
env:
| 4 |
diff --git a/android/fastlane/metadata/android/en-GB/short_description.txt b/android/fastlane/metadata/android/en-GB/short_description.txt -Discover the love and events that happen in London during Pride Festival and Parade
+Discover the love and events that happen in London during Pride Festival!
\ No newline at end of file
| 13 |
diff --git a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/index.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/index.js @@ -395,7 +395,7 @@ function createProject(user, metadata) {
}
function setActiveProject(user, projectName) {
return loadProject(projectName).then(function(project) {
- var globalProjectSettings = settings.get("projects");
+ var globalProjectSettings = settings.get("projects")||{};
globalProjectSettings.activeProject = project.name;
return settings.set("projects",globalProjectSettings).then(function() {
log.info(log._("storage.localfilesystem.projects.changing-project",{project:(activeProject&&activeProject.name)||"none"}));
| 9 |
diff --git a/articles/extensions/authorization-extension/v2/implementation/setup.md b/articles/extensions/authorization-extension/v2/implementation/setup.md @@ -20,13 +20,13 @@ If you have a large number of users, managing the access rights and permissions
* Client-Facing Applications
* Support
-
+
You can add users to your groups manually or dynamically based on the Connection(s) they're using to access your app. For example, if someone logs in using the Active Directory Connection and their AD profile indicates that they're in the Marketing group, the Authorization Extension can also add them to the Marketing group you're managing with the extension.
Finally, we have permissions and roles, which are groups of permissions. The purpose of the latter is to make it easier to assign several permissions simultaneously to either a user or a group.
-
+
For example, let's say that you want to grant permissions to:
@@ -35,7 +35,7 @@ For example, let's say that you want to grant permissions to:
Rather than assigning both permissions to groups/users, you can roll the two (along with many others) into a role called **Travel Administrator**. You can then assign Travel Administrator to individual users or to one or more groups.
-
+
## Users
| 0 |
diff --git a/pages/bases-locales/commune/[codeCommune].js b/pages/bases-locales/commune/[codeCommune].js @@ -10,6 +10,7 @@ import Page from '@/layouts/main'
import Head from '@/components/head'
import CommuneInfos from '@/components/bases-locales/commune/commune-infos'
import BALState from '@/components/bases-locales/commune/bal-state'
+import Historique from '@/components/bases-locales/commune/historique'
function Commune({communeInfos, mairieContact, revisions}) {
const currentRevision = revisions.find(revision => revision.current)
@@ -26,6 +27,7 @@ function Commune({communeInfos, mairieContact, revisions}) {
mairieContact={mairieContact}
revision={currentRevision}
/>
+ <Historique revisions={revisions} communeName={communeInfos.nomCommune} />
</Page>
)
}
@@ -39,7 +41,7 @@ Commune.getInitialProps = async ({query}) => {
const {telephone, email} = mairie.features[0].properties
const revisions = await getRevisions(codeCommune)
- console.log(revisions)
+
return {
communeInfos: commune,
mairieContact: {telephone, email},
| 0 |
diff --git a/source/views/controls/ButtonView.js b/source/views/controls/ButtonView.js @@ -277,24 +277,31 @@ const ButtonView = Class({
// --- Keep state in sync with render ---
/**
- Property (private): O.ButtonView#_ignoreUntil
+ Property: O.ButtonView#noRepeatWithin
Type: Number
- Time before which we should not reactive.
+ Time in ms to ignore further clicks after being clicked. By default,
+ this is 200ms, which encompasses most double clicks. So for people that
+ automatically double click everything (yep! that's a type of user), we
+ won't trigger twice. This is important if you automatically select the
+ next item after applying an action.
+ .
+ */
+ noRepeatWithin: 200,
+
+ /**
+ Property (private): O.ButtonView#_ignoreUntil
+ Type: Number
We want to trigger on mouseup so that the button can be used in a menu
in a single click action. However, we also want to trigger on click for
accessibility reasons. We don't want to trigger twice though, and at the
time of the mouseup event there's no way to know if a click event will
- follow it. However, if a click event *is* following it, in most
- browsers, the click event will already be in the event queue, so we
- temporarily ignore clicks and put a callback function onto the end of
- the event queue to stop ignoring them. This will only run after the
- click event has fired (if there is one). The exception is Opera, where
- it gets queued before the click event. By adding a minimum 200ms delay
- we can more or less guarantee it is queued after, and it also prevents
- double click from activating the button twice, which could have
- unintended effects.
+ follow it. However, if a click event *is* following it, the click event
+ will already be in the event queue, so we temporarily ignore clicks and
+ put a callback function onto the end of the event queue to stop
+ ignoring them. We can also add any delay for the noRepeatWithin property
+ to extend the time we ignore further clicks.
*/
_ignoreUntil: 0,
@@ -302,7 +309,7 @@ const ButtonView = Class({
Method (private): O.ButtonView#_setIgnoreUntil
*/
_setIgnoreUntil() {
- this._ignoreUntil = Date.now() + 200;
+ this._ignoreUntil = Date.now() + this.get('noRepeatWithin');
},
/**
| 0 |
diff --git a/src/components/loader/loader.jsx b/src/components/loader/loader.jsx @@ -120,15 +120,13 @@ class LoaderComponent extends React.Component {
constructor (props) {
super(props);
this.state = {
- messageNumber: 0
+ messageNumber: this.chooseRandomMessage()
};
}
componentDidMount () {
- this.chooseRandomMessage();
-
// Start an interval to choose a new message every 5 seconds
this.intervalId = setInterval(() => {
- this.chooseRandomMessage();
+ this.setState({messageNumber: this.chooseRandomMessage()});
}, 5000);
}
componentWillUnmount () {
@@ -145,7 +143,7 @@ class LoaderComponent extends React.Component {
break;
}
}
- this.setState({messageNumber});
+ return messageNumber;
}
render () {
return (
| 12 |
diff --git a/routes/spec.graphql b/routes/spec.graphql @@ -289,7 +289,7 @@ type SkyblockQuery {
e.g. 'Mango'. Note: profile name can be different (although unlikely) for
different members of a co-op!
"""
- profile_id: String!
+ profile_id: String
): JSON
"""
| 11 |
diff --git a/package.json b/package.json },
"license": "MIT",
"dependencies": {
- "minecraft-data": "^2.47.0",
+ "minecraft-data": "^2.50.0",
"minecraft-protocol": "^1.8.1",
"mojangson": "^0.2.1",
"prismarine-biome": "^1.0.1",
| 3 |
diff --git a/app/shared/actions/accounts.js b/app/shared/actions/accounts.js @@ -92,33 +92,31 @@ export function getAccount(account = '') {
};
}
-export function getAccountActions(amount) {
+export function getActions(account, start, offset) {
return (dispatch: () => void, getState) => {
const {
connection,
settings
} = getState();
- const accountName = settings.account;
-
dispatch({
- type: types.GET_ACCOUNT_ACTIONS_REQUEST,
- payload: { account_name: accountName }
+ type: types.GET_ACTIONS_REQUEST,
+ payload: { account_name: account }
});
- if (accountName && (settings.node || settings.node.length !== 0)) {
- eos(connection).getActions(accountName, -1, -amount).then((results) => dispatch({
- type: types.GET_ACCOUNT_ACTIONS_SUCCESS,
+ if (account && (settings.node || settings.node.length !== 0)) {
+ eos(connection).getActions(account, start, offset).then((results) => dispatch({
+ type: types.GET_ACTIONS_SUCCESS,
payload: { list: results.actions.reverse() }
})).catch((err) => dispatch({
- type: types.GET_ACCOUNT_ACTIONS_FAILURE,
- payload: { err, account_name: accountName },
+ type: types.GET_ACTIONS_FAILURE,
+ payload: { err, account_name: account },
}));
return;
}
dispatch({
- type: types.GET_ACCOUNT_ACTIONS_FAILURE,
- payload: { account_name: accountName },
+ type: types.GET_ACTIONS_FAILURE,
+ payload: { account_name: account },
});
};
}
| 13 |
diff --git a/main_process/test_controllers/main_testHttpController.js b/main_process/test_controllers/main_testHttpController.js @@ -73,7 +73,6 @@ testHttpController.runTest = (inputScript, reqResObj, gqlResponse) => {
// if the assertion test fails and throws an error, also include the expected and actual
return `
try {
- ${variableString}
if (${JSON.stringify(script[0])} === '.') {
assert${script};
addOneResult({
@@ -104,6 +103,7 @@ testHttpController.runTest = (inputScript, reqResObj, gqlResponse) => {
const testScript =
`
const { assert, expect } = require('chai');
+ ${variableString}
${arrOfTestScripts.join('')}
`;
| 5 |
diff --git a/src/article/shared/SupplementaryFileComponent.js b/src/article/shared/SupplementaryFileComponent.js @@ -5,13 +5,19 @@ export default class SupplementaryFileComponent extends NodeComponent {
render ($$) {
const model = this.props.model
const node = model._node
- let el = $$('div').addClass('sc-supplementary-file')
- el.append($$('div').text('TODO: Implement SupplementaryFileComponent'))
- el.append($$('div').text('href:' + node.href))
- el.append($$('div').text('legend:'))
- el.append(
- renderModelComponent(this.context, $$, { model: model.getLegend() }).ref('legend')
+ const SectionLabel = this.getComponent('section-label')
+ let el = $$('div').addClass('sc-supplementary-file').append(
+ $$('div').addClass('se-header').append(
+ $$('div').addClass('se-label').text(node.label),
+ $$('div').addClass('se-href').text(node.href)
+ ),
+ $$(SectionLabel, {label: 'caption-label'}),
+ renderModelComponent(this.context, $$, {
+ label: this.getLabel('caption'),
+ model: model.getLegend()
+ }).ref('legend')
)
+
return el
}
}
| 7 |
diff --git a/articles/validating-xml-using-dtd/index.md b/articles/validating-xml-using-dtd/index.md @@ -262,7 +262,8 @@ To summarize:
- https://en.wikipedia.org/wiki/Document_type_definition
- https://en.wikipedia.org/wiki/XML
- https://en.wikipedia.org/wiki/HTML
-- https://web.archive.org/web/20100311063223/http://www.isoc.org/isoc/conferences/inet/99/proceedings/1i/1i_1.htm
+- https://web.archive.org/web/20100311063223/
+- http://www.isoc.org/isoc/conferences/inet/99/proceedings/1i/1i_1.htm
- https://en.wikipedia.org/wiki/XML_validation
- https://levelup.gitconnected.com/json-vs-yaml-6aa0243aefc6
- https://devopedia.org/data-serialization
| 1 |
diff --git a/src/frontend/package.json b/src/frontend/package.json "license": "Apache-2.0",
"scripts": {
"bootstrap": "lerna bootstrap",
- "build": "lerna run pre-publish && git add -A && git commit -m 'build dist'",
+ "build": "lerna run pre-publish && git add -A && git commit -m 'Build packages for distribution'",
"version": "lerna version --force-publish='*' --exact --tag-version-prefix='frontend-v'",
"publish": "lerna publish from-package",
"prettier": "prettier --single-quote --print-width 120 --write '**/*.js'",
| 7 |
diff --git a/bin/oref0-subg-ww-radio-parameters.sh b/bin/oref0-subg-ww-radio-parameters.sh #!/bin/bash
-# Set this to the directory where you've run this. By default:
-# cd ~
+# This script must be started in the OpenAPS directory.
+# It requires subg_rfspy in installed. This can be installated with
+# cd ~/src
# git clone https://github.com/ps2/subg_rfspy.git
#
SUBG_RFSPY_DIR=$HOME/src/subg_rfspy
@@ -9,44 +10,74 @@ SUBG_RFSPY_DIR=$HOME/src/subg_rfspy
# If you're on an ERF, set this to 0:
# export RFSPY_RTSCTS=0
+# If you're using a TI USB set this to 1, otherwise set it to 0
+# export TI_USB=0
+export TI_USB=1
+
+# Remember current directory.
+OPENAPS_DIR=`pwd`
+
################################################################################
set -e
set -x
-# We'll use the device that is set in the pump.ini config file in the openaps directory
-# This script must be started from the openaps dir
-echo "Searching for pump device: "
-
-# We'll try to find the TI device
-# If it does not exist we will use oref0-reset usb each minute (12*5 seconds) to get it back up
-# If it fails the second time exit with error status code
+# We'l try to find the TI device
+# If it does not exist after the first minute (12*5 seconds), we'll try to get it back up:
+# - we will use oref0-reset-usb (if you have a TI USB stick)
+# - we will use the reset_spi_serial.py (if you have an Explorer board (with SERIAL_PORT that contains 'spi'))
+# - otherwise we'll use the subg_rfspy reset.py
+# If it does not exist after approx two minutes we'll issue a reset.py
+# If still fails after 30*5+(2*15)=180 seconds it will exit with error status code
loop=0
until SERIAL_PORT=`oref0-get-pump-device`; do
- if [[ "$loop" -gt "11" || "$loop" -gt "23" ]]; then
+ if [[ "$loop" -eq "11" ]]; then
+ if [[ "TI_USB" -eq "1" ]]; then
sudo oref0-reset-usb
# wait a bit more to let everything settle back
- sleep 10
+ sleep 15
+ else
+ if [[ "$SERIAL_PORT" =~ "spi" ]]; then
+ echo Resetting spi_serial
+ reset_spi_serial.py
+ else # no a TI usb and not a spidev (Explorer board)
+ # Reset to defaults
+ cd $SUBG_RFSPY_DIR/tools
+ ./reset.py $SERIAL_PORT
+ sleep 15
+ fi
+ fi
+ fi
+ if [[ "$loop" -eq "23" ]]; then
+ # Reset to defaults
+ cd $SUBG_RFSPY_DIR/tools
+ ./reset.py $SERIAL_PORT
+ sleep 15
fi
if [[ "$loop" -gt "30" ]]; then
# exit the script with an error status
exit 1
fi
+ # wait 5 seconds each iteration
sleep 5
+ # increment loop
((loop=loop+1))
+ # change back to openaps dir
+ cd $OPENAPS_DIR
done
echo
echo Your TI device is located at $SERIAL_PORT
+# change to subg_rfspy tools directory
cd $SUBG_RFSPY_DIR/tools
-#disabled killing openaps, because we want it to be able to use this with openaps mmtune
+#Disabled killing openaps, because we want it to be able to use this with openaps mmtune
#echo -n "Killing running openaps processes... "
#killall -g openaps
#echo
-# Reset to defaults
-./reset.py $SERIAL_PORT
+# Disabled Reset to defaults, because it can hang the pump loop with TI USB stick
+#./reset.py $SERIAL_PORT
sleep 2
| 7 |
diff --git a/src/angular/projects/spark-core-angular/package.json b/src/angular/projects/spark-core-angular/package.json {
"name": "@sparkdesignsystem/spark-core-angular",
"description": "A collection of Spark Design System components in Angular 6+",
- "version": "8.0.8",
+ "version": "8.0.9",
"scripts": {
"lint": "ng lint spark-core-angular",
"test": "ng test spark-core-angular --watch=false",
"@angular/platform-browser": "^6.1.4",
"@angular/platform-browser-dynamic": "^6.1.4",
"@angular/router": "^6.1.4",
- "@sparkdesignsystem/spark-core": "^10.0.0",
+ "@sparkdesignsystem/spark-core": "^10.1.1",
"lodash": "^4.17.10",
"tiny-date-picker": "^3.2.6"
},
| 3 |
diff --git a/assets/js/googlesitekit/datastore/site/notifications.test.js b/assets/js/googlesitekit/datastore/site/notifications.test.js @@ -32,10 +32,9 @@ describe( 'core/site notifications', () => {
beforeEach( () => {
registry = createTestRegistry();
- const response = true;
fetchMock.post(
/^\/google-site-kit\/v1\/core\/site\/data\/mark-notification/,
- { body: JSON.stringify( response ), status: 200 }
+ { body: 'true', status: 200 }
);
} );
| 2 |
diff --git a/articles/api-auth/tutorials/migration/implicit.md b/articles/api-auth/tutorials/migration/implicit.md @@ -85,7 +85,7 @@ Location: https://app.example.com/#
&token_type=Bearer</code></pre>
<ul>
<li>The returned access token is valid for calling the <a href="/api/authentication#get-user-info">/userinfo endpoint</a> and optionally the resource server specified by the <code>audience</code> parameter.</li>
- <li>If using <code>response_type=token</code> or <code>response_type=id_token</code>, Auth0 will only return an access token or ID token respectively.</li>
+ <li>If using <code>response_type=id_token</code>, Auth0 will only return an ID token.</li>
<li>Refresh tokens are not allowed in the implicit grant. <a href="/api-auth/tutorials/silent-authentication">Use <code>prompt=none</code> instead</a>.</li>
</ul>
</div>
| 2 |
diff --git a/README.md b/README.md @@ -9,7 +9,7 @@ Be sure to [watch the tutorials](http://bit.do/vizor), [read the documentation](
### Installing
-Installing a local instance of Patches requires [MongoDB](http://mongodb.org) (Use v3.2.12), [Redis](http://redis.io), [node.js](https://nodejs.org) (Get [v6.11](https://nodejs.org/en/download/)) and graphicsmagick. To install the required packages, issue the following commands (on Mac using Homebrew):
+Installing a local instance of Patches requires [MongoDB](http://mongodb.org), [Redis](http://redis.io), [node.js](https://nodejs.org) (Get [v6.11](https://nodejs.org/en/download/)) and graphicsmagick. To install the required packages, issue the following commands (on Mac using Homebrew):
```
$ /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
| 2 |
diff --git a/src/botPage/view/blockly/customBlockly.js b/src/botPage/view/blockly/customBlockly.js +import { translate } from '../../../common/utils/tools';
+
/* eslint-disable */
Blockly.WorkspaceAudio.prototype.preload = function() {};
Blockly.FieldDropdown.prototype.render_ = function() {
@@ -288,3 +290,47 @@ Blockly.FieldTextInput.prototype.showInlineEditor_ = function(quietInput) {
this.bindEvents_(htmlInput);
};
+const originalContextMenuFn = Blockly.ContextMenu.show;
+Blockly.ContextMenu.show = (e, menuOptions, rtl) => {
+ // Rename 'Clean up blocks'
+ menuOptions.some(option => {
+ if (option.text === Blockly.Msg.CLEAN_UP) {
+ option.text = translate('Rearrange vertically'); // eslint-disable-line no-param-reassign
+ return true;
+ }
+ return false;
+ }) &&
+ /* Remove delete all blocks, but only when 'Clean up blocks' is available (i.e. workspace)
+ * This allows users to still delete root blocks containing blocks
+ */
+ menuOptions.some((option, i) => {
+ if (
+ option.text === Blockly.Msg.DELETE_BLOCK ||
+ option.text.replace(/[0-9]+/, '%1') === Blockly.Msg.DELETE_X_BLOCKS
+ ) {
+ menuOptions.splice(i, 1);
+ return true;
+ }
+ return false;
+ });
+ // Open the Elev.io widget when clicking 'Help'
+ // eslint-disable-next-line no-underscore-dangle
+ if (window._elev) {
+ menuOptions.some(option => {
+ if (option.text === Blockly.Msg.HELP) {
+ option.callback = () => window._elev.open(); // eslint-disable-line no-param-reassign, no-underscore-dangle
+ return true;
+ }
+ return false;
+ });
+ }
+ originalContextMenuFn(e, menuOptions, rtl);
+};
+Blockly.Input.prototype.attachShadowBlock = function(value, name, shadowBlockType) {
+ const shadowBlock = this.sourceBlock_.workspace.newBlock(shadowBlockType);
+ shadowBlock.setShadow(true);
+ shadowBlock.setFieldValue(value, name); // Refactor when using shadow block for strings in future
+ shadowBlock.outputConnection.connect(this.connection);
+ shadowBlock.initSvg();
+ shadowBlock.render();
+};
| 5 |
diff --git a/src/video/canvas/canvas_renderer.js b/src/video/canvas/canvas_renderer.js dy = ~~dy;
}
- this.backBufferContext2D.drawImage(image, sx, sy, sw, sh, ~~dx, ~~dy, dw, dh);
+ this.backBufferContext2D.drawImage(image, sx, sy, sw, sh, dx, dy, dw, dh);
},
/**
| 1 |
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md Have you read Fractal's [Code of Conduct](/.github/CODE_OF_CONDUCT.md)? By filing an Issue, you are expected to comply with it, including treating everyone with respect
-Do you want to ask a question? Are you looking for support? The Fractal Slack channel is the best place for getting support: https://fractalize.slack.com
+Do you want to ask a question? Are you looking for support? The Fractal Discord server is the best place for getting support:
+https://discord.gg/vuRz4Yx
### Prerequisites
| 14 |
diff --git a/angular/projects/spark-angular/src/lib/components/sprk-modal/sprk-modal.component.ts b/angular/projects/spark-angular/src/lib/components/sprk-modal/sprk-modal.component.ts @@ -56,10 +56,19 @@ import * as _ from 'lodash';
<footer
*ngIf="modalType === 'choice'"
- class="sprk-o-Stack__item sprk-c-Modal__footer sprk-o-Stack sprk-o-Stack--split@xxs sprk-o-Stack--end-row"
+ class="
+ sprk-o-Stack__item
+ sprk-c-Modal__footer
+ sprk-o-Stack
+ sprk-o-Stack--split@xxs
+ sprk-o-Stack--end-row"
>
<button
- class="sprk-c-Button sprk-c-Button--tertiary sprk-u-mrm sprk-o-Stack__item"
+ class="
+ sprk-c-Button
+ sprk-c-Button--tertiary
+ sprk-u-mrm
+ sprk-o-Stack__item"
[attr.data-analytics]="cancelAnalyticsString"
(click)="emitCancelClick($event)"
>
| 3 |
diff --git a/client/components/main/dueCards.js b/client/components/main/dueCards.js @@ -69,7 +69,7 @@ class DueCardsComponent extends CardSearchPagedComponent {
queryParams.addPredicate(OPERATOR_USER, Meteor.user().username);
}
- this.runGlobalSearch(queryParams.getParams());
+ this.runGlobalSearch(queryParams.getQueryParams());
}
dueCardsView() {
| 1 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,7 +10,19 @@ 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.44.4] -- 2019-01-22
+## [1.44.1] -- 2019-01-24
+
+### Fixed
+- Fix `mesh3d` rendering on (some) mobile devices (bug introduced in 1.44.0) [#3463]
+- Fix scene camera update when changing to `turntable` mode when `up.z` is zero
+ (bug introduced in 1.43.0) [#3465, #3475]
+- Fix `react` when cartesian axis `scaleanchor` patterns change [#3461]
+- Fix "days" entries in polish (`pl`) locales [#3464]
+- Remove inner function declarations in our `vectorize-text` that caused
+ bundling errors for some (bug introduced in 1.43.0) [#3474]
+
+
+## [1.44.0] -- 2019-01-22
### Added
- Add `isosurface` gl3d trace type [#3438]
| 3 |
diff --git a/blog/2020-11-11-version-1-6/index.md b/blog/2020-11-11-version-1-6/index.md @@ -13,8 +13,8 @@ We have updated the Corona-Warn-App to version 1.6, which is now available in Ap
<!-- overview -->
-If the risk status changes from an increased risk (red) back to a low risk (green), the Corona-Warn-App informs users about the reason for this change. This can be the case if the encounter with an increased risk took place more than 14 days ago.
+If the risk status changes from an increased risk (red) back to a low risk (green), the Corona-Warn-App now shows the reason for this change. This can be the case if the encounter that led to the increased risk took place more than 14 days ago.
-Furthermore, the interaction of app and QR codes has been improved. Additionally, users will receive explanatory error messages if there are problems reading QR Codes. This could be the case if users try to scan an invalid QR code or if the code is older than 21 days and can no longer be registered in the app.
+Furthermore, the processing of QR codes has been improved. Users will receive explanatory error messages if there are problems reading QR codes. This could be the case if someone tries to scan an invalid QR code or if the code is older than 21 days and can no longer be registered in the app.
Additionally, users will receive a reminder to allow prioritized background refresh on devices where manufacturers switched off the automatic background refresh. This way the Corona-Warn-App can determine the risk status in the background at any time.
| 7 |
diff --git a/assets/js/modules/analytics/datastore/tags.test.js b/assets/js/modules/analytics/datastore/tags.test.js @@ -283,7 +283,14 @@ describe( 'modules/analytics tags', () => {
} );
it( 'returns undefined if existing tag has not been loaded yet', async () => {
- muteConsole( 'error' );
+ fetch
+ .doMockOnceIf(
+ /^\/google-site-kit\/v1\/modules\/analytics\/data\/tag-permission/
+ )
+ .mockResponseOnce(
+ JSON.stringify( fixtures.getTagPermissionsAccess ),
+ { status: 200 }
+ );
const hasPermission = registry.select( STORE_NAME ).hasTagPermission( fixtures.getTagPermissionsNoAccess.propertyID );
expect( hasPermission ).toEqual( undefined );
| 14 |
diff --git a/src/web/html/index.html b/src/web/html/index.html <div class="title no-select">
<label for="output-text">Output</label>
<span class="float-right">
+ <button type="button" class="btn btn-primary bmd-btn-icon tab-buttons" id="btn-previous-tab" data-toggle="tooltip" title="Go to the previous tab">
+ <i class="material-icons">keyboard_arrow_left</i>
+ </button>
+ <button type="button" class="btn btn-primary bmd-btn-icon tab-buttons" id="btn-go-to-tab" data-toggle="tooltip" title="Go to a specific tab">
+ <i class="material-icons">more_horiz</i>
+ </button>
+ <button type="button" class="btn btn-primary bmd-btn-icon tab-buttons" id="btn-next-tab" data-toggle="tooltip" title="Go to the next tab">
+ <i class="material-icons">keyboard_arrow_right</i>
+ </button>
<button type="button" class="btn btn-primary bmd-btn-icon" id="save-to-file" data-toggle="tooltip" title="Save output to file">
<i class="material-icons">save</i>
</button>
<i class="material-icons">fullscreen</i>
</button>
</span>
+ <div class="io-info" id="bake-info"></div>
<div class="io-info" id="output-info"></div>
<div class="io-info" id="output-selection-info"></div>
<button type="button" class="btn btn-primary bmd-btn-icon hidden" id="magic" data-toggle="tooltip" title="Magic!" data-html="true">
</span>
</div>
<div id="output-wrapper">
- <div id="output-tabs" style="display: none">
- <ul>
- <li id="output-tab-1" class="active-output-tab">
- <div class="output-tab-content">
- Tab 1
- </div>
- </li>
+ <div id="output-tabs-wrapper" style="display: none">
+ <ul id="output-tabs">
</ul>
</div>
<div class="textarea-wrapper">
| 0 |
diff --git a/Source/Core/EllipsoidalOccluder.js b/Source/Core/EllipsoidalOccluder.js @@ -42,7 +42,7 @@ define([
*/
function EllipsoidalOccluder(ellipsoid, cameraPosition) {
//>>includeStart('debug', pragmas.debug);
- Check.defined('ellipsoid', ellipsoid);
+ Check.typeOf.object('ellipsoid', ellipsoid);
//>>includeEnd('debug');
this._ellipsoid = ellipsoid;
@@ -157,7 +157,7 @@ define([
*/
EllipsoidalOccluder.prototype.computeHorizonCullingPoint = function(directionToPoint, positions, result) {
//>>includeStart('debug', pragmas.debug);
- Check.defined('directionToPoint', directionToPoint);
+ Check.typeOf.object('directionToPoint', directionToPoint);
Check.defined('positions', positions);
//>>includeEnd('debug');
@@ -200,9 +200,9 @@ define([
*/
EllipsoidalOccluder.prototype.computeHorizonCullingPointFromVertices = function(directionToPoint, vertices, stride, center, result) {
//>>includeStart('debug', pragmas.debug);
- Check.defined('directionToPoint', directionToPoint);
+ Check.typeOf.object('directionToPoint', directionToPoint);
Check.defined('vertices', vertices);
- Check.defined('stride', stride);
+ Check.typeOf.number('stride', stride);
//>>includeEnd('debug');
if (!defined(result)) {
@@ -242,7 +242,7 @@ define([
*/
EllipsoidalOccluder.prototype.computeHorizonCullingPointFromRectangle = function(rectangle, ellipsoid, result) {
//>>includeStart('debug', pragmas.debug);
- Check.defined('rectangle', rectangle);
+ Check.typeOf.object('rectangle', rectangle);
//>>includeEnd('debug');
var positions = Rectangle.subsample(rectangle, ellipsoid, 0.0, subsampleScratch);
| 3 |
diff --git a/common/lib/client/auth.js b/common/lib/client/auth.js @@ -424,7 +424,7 @@ var Auth = (function() {
return;
}
var objectSize = JSON.stringify(tokenRequestOrDetails).length;
- if(objectSize > MAX_TOKENOBJECT_LENGTH) {
+ if(objectSize > MAX_TOKENOBJECT_LENGTH && !authOptions.suppressMaxLengthCheck) {
callback(new ErrorInfo('Token request/details object exceeded max permitted stringified size (was ' + objectSize + ' bytes)', 40170, 401));
return;
}
| 11 |
diff --git a/src/commands/PublishCommand.js b/src/commands/PublishCommand.js @@ -247,7 +247,7 @@ export default class PublishCommand extends Command {
publishPackagesToNpm(callback) {
this.logger.info("publish", "Publishing packages to npm...");
- this.npmPublishAsPrerelease((err) => {
+ this.npmPublish((err) => {
if (err) {
callback(err);
return;
@@ -659,8 +659,8 @@ export default class PublishCommand extends Command {
}
}
- npmPublishAsPrerelease(callback) {
- const tracker = this.logger.newItem("npmPublishAsPrerelease");
+ npmPublish(callback) {
+ const tracker = this.logger.newItem("npmPublish");
// if we skip temp tags we should tag with the proper value immediately
// therefore no updates will be needed
| 10 |
diff --git a/app/shell-window/pages.js b/app/shell-window/pages.js @@ -745,7 +745,7 @@ function onDidFailLoad (e) {
}
// render failure page
- var errorPageHTML = errorPage(e.errorDescription)
+ var errorPageHTML = errorPage(e)
page.webviewEl.getWebContents().executeJavaScript('document.documentElement.innerHTML = \''+errorPageHTML+'\'')
}
}
| 9 |
diff --git a/packages/core/parcel-bundler/src/Bundler.js b/packages/core/parcel-bundler/src/Bundler.js @@ -329,7 +329,7 @@ class Bundler extends EventEmitter {
// If not in watch mode, stop the worker farm so we don't keep the process running.
if (!this.watcher && this.options.killWorkers) {
- this.stop();
+ await this.stop();
}
}
}
| 4 |
diff --git a/packages/bpk-component-graphic-promotion/src/BpkGraphicPromo.module.scss b/packages/bpk-component-graphic-promotion/src/BpkGraphicPromo.module.scss }
&__sponsor-logo {
- width: 9.25rem;
+ width: auto;
+ max-width: 9.25rem;
+ height: auto;
+ max-height: 3.75rem;
}
&__cta {
| 12 |
diff --git a/src/lib/API/api.js b/src/lib/API/api.js @@ -294,9 +294,9 @@ export class APIService {
/**
* `/verify/topwallet` post api call. Tops users wallet
*/
- verifyTopWallet(): Promise<$AxiosXHR<any>> {
- return this.client.post('/verify/topwallet')
- }
+ verifyTopWallet: Promise<$AxiosXHR<any>> = throttle(() => this.client.post('/verify/topwallet'), 60000, {
+ trailing: false,
+ })
/**
* `/verify/sendemail` post api call
| 0 |
diff --git a/src/canvas/view/FrameWrapView.js b/src/canvas/view/FrameWrapView.js @@ -106,26 +106,19 @@ export default Backbone.View.extend({
*/
updateDim() {
const { em, el, $el, model, classAnim } = this;
- const { width, height } = model.attributes;
- const { style } = el;
- const currW = style.width || '';
- const currH = style.height || '';
- const newW = width || '';
- const newH = height || '';
- const noChanges = currW == newW && currH == newH;
- const un = 'px';
this.frame.rect = 0;
$el.addClass(classAnim);
- style.width = isNumber(newW) ? `${newW}${un}` : newW;
- style.height = isNumber(newH) ? `${newH}${un}` : newH;
+ const { noChanges, width, height } = this.__handleSize();
// Set width and height from DOM (should be done only once)
if (isNull(width) || isNull(height)) {
- const newDims = {
+ model.set(
+ {
...(!width ? { width: el.offsetWidth } : {}),
...(!height ? { height: el.offsetHeight } : {})
- };
- model.set(newDims, { silent: 1 });
+ },
+ { silent: 1 }
+ );
}
// Prevent fixed highlighting box which appears when on
@@ -149,9 +142,25 @@ export default Backbone.View.extend({
this.updateDim();
},
+ __handleSize() {
+ const un = 'px';
+ const { model, el } = this;
+ const { style } = el;
+ const { width, height } = model.attributes;
+ const currW = style.width || '';
+ const currH = style.height || '';
+ const newW = width || '';
+ const newH = height || '';
+ const noChanges = currW == newW && currH == newH;
+ style.width = isNumber(newW) ? `${newW}${un}` : newW;
+ style.height = isNumber(newH) ? `${newH}${un}` : newH;
+ return { noChanges, width, height, newW, newH };
+ },
+
render() {
const { frame, $el, ppfx, cv, model, el } = this;
const { onRender } = model.attributes;
+ this.__handleSize();
frame.render();
$el
.empty()
| 12 |
diff --git a/src/client/js/services/UserGroupDetailContainer.js b/src/client/js/services/UserGroupDetailContainer.js @@ -132,8 +132,7 @@ export default class UserGroupDetailContainer extends Container {
async fetchApplicableUsers(searchWord) {
const res = await this.appContainer.apiv3.get(`/user-groups/${this.state.userGroup._id}/unrelated-users`, {
searchWord,
- // TODO GW-716 switch value
- isForwardMatch: false,
+ isForwardMatch: this.state.searchType,
isAlsoMailSearched: this.state.isAlsoMailSearched,
isAlsoNameSearched: this.state.isAlsoNameSearched,
});
| 12 |
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml @@ -14,8 +14,13 @@ jobs:
uses: dependabot/[email protected]
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- - name: Enable auto-merge for Dependabot PRs on Stripe SDKs
- if: ${{contains(steps.metadata.outputs.dependency-name, 'Stripe.net') && steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
+ - name: Enable auto-merge for Stripe SDKs Dependabot PRs
+ if: >
+ ${{(contains(steps.metadata.outputs.dependency-names, 'Stripe.net') ||
+ contains(steps.metadata.outputs.dependency-names, 'com.stripe:stripe-java') ||
+ contains(steps.metadata.outputs.dependency-names, 'stripe')
+ contains(steps.metadata.outputs.dependency-names, 'github.com/stripe/stripe-go/v72')
+ ) && steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
run: gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
| 0 |
diff --git a/ui/scss/component/_file-render.scss b/ui/scss/component/_file-render.scss .vjs-big-play-button {
@extend .button--icon;
@extend .button--play;
+ background-color: rgba(0,0,0,0.6);
border: none;
position: static;
z-index: 2;
}
}
}
+
+ .video-js:hover {
+
+ .vjs-big-play-button {
+ background-color: rgba(var(--color-primary),0.6);
+ }
+ }
}
.video-overlay__wrapper {
| 7 |
diff --git a/assets/js/components/activation/activation-app.js b/assets/js/components/activation/activation-app.js @@ -99,7 +99,6 @@ export function ActivationApp() {
<Button
id="start-setup-link"
className="googlesitekit-start-setup"
- href={ buttonURL }
onClick={ onButtonClick }
>
{ buttonLabel }
| 2 |
diff --git a/magda-web-client/src/config.ts b/magda-web-client/src/config.ts @@ -33,9 +33,9 @@ const defaultDateFormats: string[] = [
];
// Local minikube/docker k8s cluster
-const fallbackApiHost = "http://localhost:30100/";
+// const fallbackApiHost = "http://localhost:30100/";
// Dev server
-// const fallbackApiHost = "https://dev.magda.io/";
+const fallbackApiHost = "https://dev.magda.io/";
const DEV_FEATURE_FLAGS = {
cataloguing: true,
| 5 |
diff --git a/sox.features.js b/sox.features.js const [[name, text]] = Object.entries(opt);
$('#currentValues').append(`
<div>
- ${name} - <i>${text}</i>
- <button class="grid--cell s-btn s-btn__muted discard-question sox-editComment-editDialogButton" data-name="${name}">Edit</button>
- <button class="grid--cell s-btn s-btn__danger discard-question sox-editComment-deleteDialogButton" data-name="${name}">Delete</button>
+ <section>${name}</section><i><section style="padding-left: 10px">${text}</section></i>
+ <button class="grid--cell s-btn sox-editComment-editDialogButton" data-name="${name}">Edit</button>
+ <button class="grid--cell s-btn s-btn__danger sox-editComment-deleteDialogButton" data-name="${name}">Delete</button>
</div>`);
});
addCheckboxes();
},
'html': `<div id="currentValues" class="sox-editComment-currentValues"></div>
<br />
- <h3>Add a custom reason</h3>
- Display Reason: <input type="text" id="displayReason">
- <br />
- Actual Reason: <input type="text" id="actualReason">
- <br />
- <input type="button" id="submitUpdate" value="Submit">
- <input type="button" id="resetEditReasons" style="float:right;" value="Reset">`,
+ <h3 style="color: var(--fc-dark)">Add a custom reason</h3>
+
+ <div class="grid gs4 gsy fd-column" style="display: inline">
+ <div class="grid--cell" style="float: left">
+ <label class="d-block s-label" style="padding-top: 5px">Display reason: </label>
+ </div>
+ <div class="grid ps-relative" style="padding-left: 5px">
+ <input class="s-input" type="text" style="width: 40% !important" id="displayReason">
+ </div>
+ </div>
+ <div class="grid gs4 gsy fd-column" style="display: inline">
+ <div class="grid--cell" style="float: left">
+ <label class="d-block s-label" style="padding-top: 5px">Actual reason: </label>
+ </div>
+ <div class="grid ps-relative" style="padding-left: 5px">
+ <input class="s-input" type="text" style="width: 40% !important" id="actualReason">
+ </div>
+ </div>
+
+ <input class="s-btn s-btn__primary" type="button" id="submitUpdate" value="Submit">
+ <input class="s-btn s-btn__primary" type="button" id="resetEditReasons" style="float:right;" value="Reset">`,
});
$(document).on('click', '#resetEditReasons', () => { //manual reset
options.forEach(opt => {
const [[name, text]] = Object.entries(opt);
$reasons.append(`
- <label class="sox-editComment-reason"><input type="checkbox" value="${text}"</input>${name}</label>
+ <label class="sox-editComment-reason"><input class="s-checkbox" type="checkbox" value="${text}"</input>${name}</label>
`);
});
const options = getOptions();
const index = options.findIndex(opt => opt[optionToEdit]);
- const [[name, text]] = Object.entries(options[index]);
- const newName = window.prompt('Enter new name', name);
- const newText = window.prompt('Enter new text', text);
-
- if (!newName || !newText) return;
+ $(this).html('Save').addClass('sox-editComment-saveDialogButton').parent().find('section').attr('contenteditable', true).css('border', '1px solid var(--black-200)');
+ $(document).on('click', '.sox-editComment-saveDialogButton', function() {
+ $(this).html('Edit').removeClass('sox-editComment-saveDialogButton').parent().find('section').attr('contenteditable', true).css('border', 'none');
+ const newName = $(this).parent().find('section').first().html();
+ const newText = $(this).parent().find('section').eq(1).html();
options[index] = { [newName]: newText };
saveOptions(options);
addOptionsToDialog(); //display the items again (update them)
});
+ });
$(document).on('click', '#dialogEditReasons #submitUpdate', () => { //Click handler to update the array with custom value
const name = $('#displayReason').val();
| 4 |
diff --git a/.travis.yml b/.travis.yml @@ -26,6 +26,10 @@ script:
- npm pack
- echo -en 'travis_fold:end:script.makeZipFile\\r'
+ - echo 'buildApps' && echo -en 'travis_fold:start:script.buildApps\\r'
+ - npm run buildApps
+ - echo -en 'travis_fold:end:script.buildApps\\r'
+
- echo 'deploy' && echo -en 'travis_fold:start:script.deploy\\r'
- npm run deploy-s3 -- -b cesium-dev -d cesium/$TRAVIS_BRANCH --confirm -c 'no-cache'
- npm run deploy-status -- --status success --message Deployed
| 3 |
diff --git a/packages/gatsby/src/schema/infer-graphql-type.js b/packages/gatsby/src/schema/infer-graphql-type.js @@ -589,10 +589,12 @@ export function inferObjectStructureFromNodes({
// pointing to a file (from another file).
} else if (
nodes[0].internal.type !== `File` &&
- ((_.isString(value) && shouldInferFile(nodes, nextSelector, value)) ||
+ ((_.isString(value) &&
+ !_.isEmpty(value) &&
+ shouldInferFile(nodes, nextSelector, value)) ||
(_.isArray(value) &&
- value.length === 1 &&
_.isString(value[0]) &&
+ !_.isEmpty(value[0]) &&
shouldInferFile(nodes, `${nextSelector}[0]`, value[0])))
) {
inferredField = inferFromUri(key, types, _.isArray(value))
| 11 |
diff --git a/api/readme.md b/api/readme.md - [Rand Strings](./syntax/rand.md)
- [Property Maps](./syntax/property-maps.md)
- [Available Units](./syntax/units.md)
-
-## License
-
-(The MIT License)
-
-Copyright (c) Oleg Solomka [@LegoMushroom](https://twitter.com/legomushroom) [[email protected]](mailto:[email protected])
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
| 2 |
diff --git a/src/plots/gl2d/scene2d.js b/src/plots/gl2d/scene2d.js @@ -525,11 +525,23 @@ proto.updateTraces = function(fullData, calcData) {
};
proto.updateFx = function(dragmode) {
+ // switch to svg interactions in lasso/select mode
if(dragmode === 'lasso' || dragmode === 'select') {
this.mouseContainer.style['pointer-events'] = 'none';
} else {
this.mouseContainer.style['pointer-events'] = 'auto';
}
+
+ // set proper cursor
+ if(dragmode === 'pan') {
+ this.mouseContainer.style.cursor = 'move';
+ }
+ else if(dragmode === 'zoom') {
+ this.mouseContainer.style.cursor = 'crosshair';
+ }
+ else {
+ this.mouseContainer.style.cursor = null;
+ }
};
proto.emitPointAction = function(nextSelection, eventType) {
| 12 |
diff --git a/tools/cfpack/src/index.js b/tools/cfpack/src/index.js @@ -51,11 +51,13 @@ const mkdirs = (root, additional, cb) => {
// Adjust a file: dependency to our packed app structure, by converting
// relative path from the module to a relative path to our package root
const local = (root, additional, d) => {
+ if (!/file:/.test(d[1]))
+ return d;
const vendoredPath = path.resolve(d[1].substr(5)).
replace(additional, additionalDir);
const dependencyPath = path.join('file:.cfpack',
path.relative(root, vendoredPath));
- return !/file:/.test(d[1]) ? d : [d[0], dependencyPath];
+ return [d[0], dependencyPath];
};
// Fixes dependencies locations for npm-shrinkwrap.json
| 7 |
diff --git a/src/angular/projects/spark-angular/package-lock.json b/src/angular/projects/spark-angular/package-lock.json "lockfileVersion": 1,
"requires": true,
"dependencies": {
- "minimist": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
- "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+ "core-js": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz",
+ "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==",
"dev": true
},
- "mkdirp": {
- "version": "0.5.1",
- "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
- "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
- "dev": true,
- "requires": {
- "minimist": "0.0.8"
+ "lory.js": {
+ "version": "2.5.3",
+ "resolved": "https://registry.npmjs.org/lory.js/-/lory.js-2.5.3.tgz",
+ "integrity": "sha512-9FKuaeLtSKupM9BNmcCY0W31yhloZv2vEMD/v0hnwsdajqzb8bQacD5ZxZw+WUD0dRAXM+qx65Vk1m++4qkcsQ=="
},
- "dependencies": {
- "minimist": {
- "version": "0.0.8",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
- "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+ "tiny-date-picker": {
+ "version": "3.2.8",
+ "resolved": "https://registry.npmjs.org/tiny-date-picker/-/tiny-date-picker-3.2.8.tgz",
+ "integrity": "sha512-XrZ2ujRDZLom3DtquzjtEh+kBLbivErqfbqbNG8sVA7ZCUxerIiorxfM87akQNbBnKttBaiXAZwZi46e2mFX7Q==",
"dev": true
- }
- }
},
- "source-map": {
- "version": "0.7.3",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
- "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+ "zone.js": {
+ "version": "0.8.29",
+ "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.29.tgz",
+ "integrity": "sha512-mla2acNCMkWXBD+c+yeUrBUrzOxYMNFdQ6FGfigGGtEVBPJx07BQeJekjt9DmH1FtZek4E9rE1eRR9qQpxACOQ==",
"dev": true
- },
- "tsickle": {
- "version": "0.36.0",
- "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.36.0.tgz",
- "integrity": "sha512-lrEMU5e+efx5DXtrRSGsxgkCOVRw4WeVaOkQ2pMIxCZDY5rISagVyP4yi7t6M396POFSbMHgQMT/vz0HmfxWVA==",
- "dev": true,
- "requires": {
- "minimist": "1.2.0",
- "mkdirp": "0.5.1",
- "source-map": "0.7.3"
- }
}
}
}
| 3 |
diff --git a/articles/api-auth/tutorials/verify-access-token.md b/articles/api-auth/tutorials/verify-access-token.md @@ -120,16 +120,12 @@ You can find a sample API implementation, in Node.js, in [Server Client + API: N
This document is part the [Server + API Architecture Scenario](/architecture-scenarios/application/server-api), an implementation of a Client Credentials grant for a hypothetical scenario. For more information on the complete solution refer to [Server + API Architecture Scenario](/architecture-scenarios/application/server-api).
-## More information
-
-[RFC 7519 - JSON Web Token (JWT)](https://tools.ietf.org/html/rfc7519)
-
-[JSON Web Tokens (JWT) in Auth0](/jwt)
-
-[APIs in Auth0](/apis)
-
-[Tokens used by Auth0](/tokens)
-
-[Server Client + API: Node.js Implementation for the API](/architecture-scenarios/application/server-api/api-implementation-nodejs#check-the-client-permissions)
-
-[How to implement API authentication and authorization scenarios](/api-auth)
+## Read more
+
+- [RFC 7519 - JSON Web Token (JWT)](https://tools.ietf.org/html/rfc7519)
+- [JSON Web Tokens (JWT) in Auth0](/jwt)
+- [APIs in Auth0](/apis)
+- [Why you should always use access tokens to secure an API](/api-auth/why-use-access-tokens-to-secure-apis)
+- [Tokens used by Auth0](/tokens)
+- [Server Client + API: Node.js Implementation for the API](/architecture-scenarios/application/server-api/api-implementation-nodejs#check-the-client-permissions)
+- [How to implement API authentication and authorization scenarios](/api-auth)
| 0 |
diff --git a/web/viewer.css b/web/viewer.css @@ -977,6 +977,7 @@ a.secondaryToolbarButton[href="#"] {
white-space: normal;
border-radius: 0;
box-sizing: border-box;
+ display: inline-block;
}
.secondaryToolbarButton > span {
padding-inline-end: 4px;
@@ -1454,8 +1455,7 @@ dialog :link {
}
.visibleLargeView,
-.visibleMediumView,
-.visibleSmallView {
+.visibleMediumView {
display: none;
}
@@ -1501,9 +1501,6 @@ dialog :link {
.hiddenSmallView * {
display: none;
}
- .visibleSmallView {
- display: inherit;
- }
.toolbarButtonSpacer {
width: 0;
}
| 12 |
diff --git a/magda-web-client/src/Components/Header/Header.scss b/magda-web-client/src/Components/Header/Header.scss position: absolute;
width: 100%;
z-index: 1;
+ li {
+ border-bottom: 1px solid gray;
+ padding-left: 10px;
+ }
+ li:last-child {
+ border-bottom: none;
+ }
+ ul {
+ padding-bottom: 0px;
+ }
}
.mobile-nav {
background: #fff;
overflow-y: hidden;
height: 0;
+ border-bottom: 1px solid rgba(73, 73, 73, 0.15);
&.isOpen {
height: auto;
}
- ul {
- padding: 0;
- }
- li {
- padding: 0;
- margin: 0;
- a {
- display: block;
- padding: 10px 8px;
- border-left: 10px;
- border-bottom: 1px solid rgba($AU-color-foreground-action, 0.2);
- border-left: 10px solid $AU-color-foreground-action;
- margin: 0;
- &:hover,
- &:focus {
- background: #fafafa;
- }
- }
- }
}
}
| 13 |
diff --git a/packages/app/src/server/routes/page.js b/packages/app/src/server/routes/page.js import { pagePathUtils } from '@growi/core';
-import urljoin from 'url-join';
import { body } from 'express-validator';
import mongoose from 'mongoose';
+import urljoin from 'url-join';
import loggerFactory from '~/utils/logger';
+
import UpdatePost from '../models/update-post';
const { isCreatablePage, isTopPage, isUsersHomePage } = pagePathUtils;
@@ -431,6 +432,7 @@ module.exports = function(crowi, app) {
// redirect to page (path) url
const url = new URL('https://dummy.origin');
url.pathname = page.path;
+ url.searchParams.append('originalEmptyPageId', page._id); // add this to distingish if user access the empty page intentionally
Object.entries(req.query).forEach(([key, value], i) => {
url.searchParams.append(key, value);
});
@@ -600,23 +602,6 @@ module.exports = function(crowi, app) {
res.render('layout-growi/page_list', renderVars);
};
- async function redirectOperationForMultiplePages(builder, res, redirectFrom, path) {
- // populate to list
- builder.populateDataToList(User.USER_FIELDS_EXCEPT_CONFIDENTIAL);
- const pages = await builder.query.lean().exec('find');
-
- // remove empty pages if any.
- const identicalPathPages = pages.filter(p => !p.isEmpty);
- // render identical-path-page if count of remaining pages are 2 or more after removal
- if (identicalPathPages.length >= 2) {
- return res.render('layout-growi/identical-path-page', {
- identicalPathPages,
- redirectFrom,
- path,
- });
- }
- }
-
async function redirectOperationForSinglePage(page, req, res) {
const url = new URL('https://dummy.origin');
url.pathname = `/${page._id}`;
@@ -625,34 +610,46 @@ module.exports = function(crowi, app) {
});
return res.safeRedirect(urljoin(url.pathname, url.search));
}
+
/**
* redirector
*/
async function redirector(req, res, next, path) {
- const { redirectFrom } = req.query;
+ const { redirectFrom, originalEmptyPageId } = req.query;
+
+ // originalEmptyPageId exists when user accesses an empty page by pageId
+ if (originalEmptyPageId != null) {
+ req.pageId = originalEmptyPageId;
+ return _notFound(req, res);
+ }
const includeEmpty = true;
const builder = new PageQueryBuilder(Page.find({ path }), includeEmpty);
- await Page.addConditionToFilteringByViewerForList(builder, req.user, true);
- const pages = await builder.query.lean().clone().exec('find');
+ builder.populateDataToList(User.USER_FIELDS_EXCEPT_CONFIDENTIAL);
- const nonEmptyPageCount = pages.reduce((prev, current) => {
- return prev + (current.isEmpty ? 0 : 1);
- }, 0);
+ await Page.addConditionToFilteringByViewerForList(builder, req.user, true);
+ const pages = await builder.query.lean().clone().exec('find');
+ const nonEmptyPages = pages.filter(p => !p.isEmpty);
- if (nonEmptyPageCount >= 1) { // Perform the operation only if nonEmptyPage(s) exist
- if (nonEmptyPageCount >= 2) {
- return redirectOperationForMultiplePages(builder, res, redirectFrom, path, next);
+ if (nonEmptyPages.length >= 2) {
+ return res.render('layout-growi/identical-path-page', {
+ identicalPathPages: nonEmptyPages,
+ redirectFrom,
+ path,
+ });
}
+
+ if (nonEmptyPages.length === 1) {
const nonEmptyPage = pages.find(p => !p.isEmpty); // find the nonEmpty Page
return redirectOperationForSinglePage(nonEmptyPage, req, res);
}
// Processing of nonEmptyPage is finished by the time this code is read
- // If any pages exists then it should be empty pages
- if (pages.length >= 1) {
- req.pageId = pages[0]._id;
+ // If any pages exist then they should be empty
+ const emptyPage = pages[0]; // null or undefined
+ if (emptyPage != null) {
+ req.pageId = emptyPage._id;
return _notFound(req, res);
}
// redirect by PageRedirect
| 9 |
diff --git a/README.md b/README.md @@ -48,6 +48,26 @@ And install dependencies
* Install Xcode from the App Store and accept the license agreement.
* Run Xcode once so that it can install additional components it will need.
+To develop on a real device locally you will need to install the development provisioning profile from fastlane.
+
+Install fastlane using
+
+```
+[sudo] gem install fastlane -NV
+```
+
+or alternatively using `brew cask install fastlane`
+
+You can then run the following command from the ios folder:
+
+```
+fastlane match --readonly
+```
+
+You will need access to the private `match-ios-certificates` repo and will be prompted for the passphrase. Ask on the channel to get this sent to you in a secure way ;) On success you should be presented with the installed certificates and provisioning profile for org.prideinlondon.festival.
+
+Next, open Xcode and the PrideLondonApp.xcodeproj. Plug in your device via USB, and select it in the device dropdown in the top left of Xcode. Then hit the build (Play) button.
+
#### Android
* Install [Android Studio](https://developer.android.com/studio/index.html).
| 0 |
diff --git a/docs/user-guide/faq.md b/docs/user-guide/faq.md @@ -27,7 +27,7 @@ The CLI can also be used from within [npm run scripts](https://blog.keithcirkel.
## How do I lint using Git pre-commit hooks?
-[lint-staged](https://github.com/okonet/lint-staged) is a NodeJS script that supports running stylelint against Git staged files.
+[lint-staged](https://github.com/okonet/lint-staged) is a Node.js script that supports running stylelint against Git staged files.
## How do I lint using my task runner of choice?
@@ -124,7 +124,6 @@ a { color: red; }
To allow single-line blocks but enforce newlines with multi-line blocks, use the `"always-multi-line"` option for both rules.
-
## How do I configure the `*-pattern` rules for common CSS naming conventions like kebab-case?
Use the regex that corresponds to your chosen convention:
| 4 |
diff --git a/rocket/bot.js b/rocket/bot.js @@ -28,6 +28,6 @@ const processMessages = async (err, message, messageOptions) => {
export const sendToUser = async (message, user) => {
await driver.sendDirectToUser(message, user);
-}
+};
runBot();
| 3 |
diff --git a/src/dev/fdm/Ultimaker.Ultimaker2 b/src/dev/fdm/Ultimaker.Ultimaker2 "M104 S{temp} T{tool} ; set extruder temperature",
"M140 S{bed_temp} T{tool} ; set bed temperature",
"G90 ; set absolute positioning mode",
- "M83 ; set relative positioning for extruder",
+ "M82 ; set absolute positioning for extruder",
"M107 ; turn off filament cooling fan",
- "G28 X0 Y0 ; home XY axes",
- "G28 Z0 ; home Z",
- "G92 X0 Y0 Z0 E0 ; reset all axes positions",
- "G1 Z0.25 F180 ; move z to 0.25mm over bed",
"G92 E0 ; zero the extruded",
"M109 S{temp} T{tool} ; wait for extruder to reach target temp",
"G1 E15 F200 ; purge 15mm from extruder",
"cmd":{
"fan_power": "M106 S{fan_speed}"
},
+ "extruders":[
+ {
+ "nozzle": 0.4,
+ "filament": 2.85,
+ "offset_x": 0,
+ "offset_y": 0,
+ "select": [ "T0" ]
+ }
+ ],
"settings":{
"origin_center": false,
"bed_width": 223,
"bed_depth": 223,
- "build_height": 205
+ "build_height": 205,
+ "extrude_abs": true
}
}
| 3 |
diff --git a/app/src/scripts/utils/orcid.js b/app/src/scripts/utils/orcid.js @@ -75,12 +75,13 @@ let orcid = {
// Setup a timer to check for the redirect URI
this.oauthTimer = window.setInterval(() => {
try {
- if (this.oauthWindow.closed) {
- clearInterval(this.oauthTimer)
- return callback(true)
- }
+ if (
+ this.oauthWindow.document &&
+ this.oauthWindow.document.URL.indexOf(
+ config.auth.orcid.redirectURI,
+ ) !== -1
+ ) {
const url = this.oauthWindow.document.URL
- if (url.indexOf(config.auth.orcid.redirectURI) != -1) {
const code = url.toString().match(/code=([^&]+)/)[1]
clearInterval(this.oauthTimer)
crn.getORCIDToken(code, (err, res) => {
@@ -91,6 +92,12 @@ let orcid = {
this.getCurrentUser(callback)
}
})
+ } else {
+ // If not the redirect page - check if closed and unregister
+ if (this.oauthWindow.closed) {
+ clearInterval(this.oauthTimer)
+ return callback(true)
+ }
}
} catch (e) {
// DOMException means the oauth window is inaccessible due to the origin
@@ -98,7 +105,6 @@ let orcid = {
// Any other errors should stop polling
// TODO - could reset login state here in case of failures
clearInterval(this.oauthTimer)
- } else {
console.log(e)
}
}
| 9 |
diff --git a/src/createLogger.js b/src/createLogger.js @@ -13,7 +13,7 @@ governing permissions and limitations under the License.
import window from "@adobe/reactor-window";
/**
- * Prefix to use on all messages. The rocket unicode doesn't work on IE 10.
+ * Prefix to use on all messages.
* @type {string}
*/
const SDK_PREFIX = "[AEP]";
| 2 |
diff --git a/src/UnitTests/Core/Commands/ScheduleCommandTests/ProcessShould.cs b/src/UnitTests/Core/Commands/ScheduleCommandTests/ProcessShould.cs @@ -22,10 +22,8 @@ public ScheduleCommandShould()
{
var entities = new List<ScheduleEntity>
{
- new ScheduleEntity { ExampleDateTime = new DateTimeOffset(2018,6,18,18, 0, 0, 0, TimeSpan.Zero)},
new ScheduleEntity { ExampleDateTime = new DateTimeOffset(2018, 6, 19, 18, 0, 0, 0, TimeSpan.Zero)},
new ScheduleEntity { ExampleDateTime = new DateTimeOffset(2018, 6, 21, 16, 0, 0, 0, TimeSpan.Zero)},
- new ScheduleEntity { ExampleDateTime = new DateTimeOffset(2018,6,23,17, 0, 0, 0, TimeSpan.Zero)},
};
_repositoryMock.Setup(x => x.List(It.IsAny<DataItemPolicy<ScheduleEntity>>())).Returns(entities);
_scheduleCommand = new ScheduleCommand(_repositoryMock.Object);
@@ -34,6 +32,7 @@ public ScheduleCommandShould()
[Theory]
[InlineData("-19")]
[InlineData("+999")]
+ [InlineData("19")]
[InlineData("stoptryingtobreakstuff")]
public void SendErrorMessage_GivenInvalidArguments(string argument)
{
@@ -47,15 +46,16 @@ public void SendErrorMessage_GivenInvalidArguments(string argument)
}
[Theory]
- [InlineData("", "Our usual schedule (at UTC +0) is: Mondays at 6:00 PM, Tuesdays at 6:00 PM, Thursdays at 4:00 PM, Saturdays at 5:00 PM")]
- [InlineData("-4", "Our usual schedule (at UTC -4) is: Mondays at 2:00 PM, Tuesdays at 2:00 PM, Thursdays at 12:00 PM, Saturdays at 1:00 PM")]
- [InlineData("+8", "Our usual schedule (at UTC +8) is: Tuesdays at 2:00 AM, Wednesdays at 2:00 AM, Fridays at 12:00 AM, Sundays at 1:00 AM")]
+ [InlineData("", "Our usual schedule (at UTC +0) is: Tuesdays at 6:00 PM, Thursdays at 4:00 PM")]
+ [InlineData("-4", "Our usual schedule (at UTC -4) is: Tuesdays at 2:00 PM, Thursdays at 12:00 PM")]
+ [InlineData("+8", "Our usual schedule (at UTC +8) is: Wednesdays at 2:00 AM, Fridays at 12:00 AM")]
public void SendMatchingScheduleMessage_GivenValidArguments(string argument, string expectedMessage)
{
- List<string> arguments = new List<string>
+ List<string> arguments = new List<string>();
+ if (!string.IsNullOrWhiteSpace(argument))
{
- argument
- };
+ arguments.Add(argument);
+ }
_commandReceivedEventArgs.Arguments = arguments;
_scheduleCommand.Process(_chatClientMock.Object, _commandReceivedEventArgs);
_chatClientMock.Verify(x => x.SendMessage(expectedMessage));
| 9 |
diff --git a/backend/app/app.routes.js b/backend/app/app.routes.js import express from "express";
-import auth from "./app.auth";
-import passport from "passport";
+import authenticate from "./middlewares/authenticate";
+import {
+ authStrategy,
+ authenticationHandler,
+ authenticationCallbackHandler,
+ currentUser,
+ login,
+ logout,
+ isUserLoggedIn
+} from "./services/auth";
const router = express.Router();
-router.get("/", (req, res) => {
- if (auth.isUserLoggedIn(req)) {
- return res.redirect("/morpheus");
+const routes = {
+ loginPath: "/",
+ logoutPath: "/auth/logout",
+ createRoomPath: "/new",
+ removeRoomPath: "/remove",
+ listRoomsPath: "/rooms",
+ officePath: id => `/morpheus/office/${id}`,
+ roomPath: id => `/morpheus/room/${id}`,
+ homePath: "/morpheus/",
+ loginStrategyPath: `/auth/${authStrategy}`,
+ loginStrategyCallbackPath: `/auth/${authStrategy}/callback`
+};
+
+router.get(routes.loginPath, (req, res) => {
+ if (isUserLoggedIn(req)) {
+ return res.redirect(routes.homePath);
}
return res.render("index", { error: req.query.error });
});
-router.get("/new", auth.authenticate({ loginURL: "/" }), (req, res) => {
+router.get(
+ routes.createRoomPath,
+ authenticate({ loginPath: routes.loginPath }),
+ (req, res) => {
const newRoom = {
id: req.query.roomId,
name: req.query.roomName,
@@ -28,49 +52,51 @@ router.get("/new", auth.authenticate({ loginURL: "/" }), (req, res) => {
req.app.locals.roomsDetail.splice(1, 0, newRoom);
}
- res.redirect(`/morpheus/room/${req.query.roomId}`);
-});
+ res.redirect(routes.roomPath(req.query.roomId));
+ }
+);
-router.get("/remove", auth.authenticate({ loginURL: "/ " }), (req, res) => {
+router.get(
+ routes.removeRoomPath,
+ authenticate({ loginPath: routes.loginPath }),
+ (req, res) => {
req.app.locals.roomsDetail = req.app.locals.roomsDetail.filter(
value => value.id !== req.query.roomId || value.temporary !== true
);
- res.redirect(`/morpheus/office/${req.app.locals.roomsDetail[0].id}`);
-});
+ const defaultRoom = req.app.locals.roomsDetail[0].id;
+
+ res.redirect(routes.officePath(defaultRoom));
+ }
+);
-router.get("/rooms", auth.authenticate(), (req, res) => {
+router.get(routes.listRoomsPath, authenticate(), (req, res) => {
res.json(req.app.locals.roomsDetail);
});
-router.get("/morpheus*", auth.authenticate({ loginURL: "/" }), (req, res) => {
- const userString = JSON.stringify(auth.currentUser(req));
+router.get(
+ `${routes.homePath}*`,
+ authenticate({ loginPath: routes.loginPath }),
+ (req, res) => {
+ const userString = JSON.stringify(currentUser(req));
res.render("morpheus", { userString });
-});
-
-router.get(
- "/auth/google",
- passport.authenticate("google", { scope: ["profile", "email"] })
+ }
);
-router.get("/auth/google/callback", (req, res, next) => {
- passport.authenticate("google", (err, profile) => {
- if (err || !profile) {
- const message = (err && err.message) || "Unknown error";
- return res.redirect(`/?error=${encodeURIComponent(message)}`);
- }
+router.get(routes.loginStrategyPath, authenticationHandler());
- auth
- .login(req, profile)
- .then(user => res.redirect("/"))
- .catch(err => next(err));
- })(req, res, next);
-});
+router.get(
+ routes.loginStrategyCallbackPath,
+ authenticationCallbackHandler({
+ successRedirect: routes.homePath,
+ failureRedirect: routes.loginPath
+ })
+);
-router.post("/auth/logout", (req, res) => {
- auth.logout(req);
- res.redirect("/");
+router.post(routes.logoutPath, (req, res) => {
+ logout(req);
+ res.redirect(routes.loginPath);
});
-module.exports = router;
+export default router;
| 7 |
diff --git a/src/assets/style/reqres.scss b/src/assets/style/reqres.scss font-weight: bold;
}
-// .reqResContainer-inner {
-// // position: relative;
-// // height: auto;
-// width: auto;
-// height: auto;
-// overflow-x: hidden;
-// overflow-y: scroll;
-// white-space: nowrap;
-// transition: transform 0.3s ease-in-out;
-// padding-bottom: 20px !important;
-// }
-
-// .response_display {
-// weight: 500px;
-// height: 100px;
-// overflow: scroll;
-// }
-
.httptwo {
padding: 10px 15px;
background-color: white;
| 1 |
diff --git a/OutputCachingMiddleware/src/OutputCachingMiddleware.Web/OutputCachingMiddlewareWebModule.cs b/OutputCachingMiddleware/src/OutputCachingMiddleware.Web/OutputCachingMiddlewareWebModule.cs @@ -198,6 +198,7 @@ public class OutputCachingMiddlewareWebModule : AbpModule
app.UseAuthentication();
app.UseAbpOpenIddictValidation();
+ app.UseOutputCache();
if (MultiTenancyConsts.IsEnabled)
{
app.UseMultiTenancy();
@@ -214,6 +215,5 @@ public class OutputCachingMiddlewareWebModule : AbpModule
app.UseAbpSerilogEnrichers();
app.UseConfiguredEndpoints();
- app.UseOutputCache();
}
}
| 5 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [Unreleased]
+## [v1.0.0-rc.2] - 2021-03-30
+
### Added
### Changed
@@ -400,6 +402,7 @@ Thanks @hgs-msmith, @matthewhanson, @hgs-trutherford, @rouault, @joshfix, @alkam
[Unreleased]: <https://github.com/radiantearth/stac-spec/compare/master...dev>
+[v1.0.0-rc.1]: <https://github.com/radiantearth/stac-spec/compare/v1.0.0-rc.1..v1.0.0-rc.2>
[v1.0.0-rc.1]: <https://github.com/radiantearth/stac-spec/compare/v1.0.0-beta.2..v1.0.0-rc.1>
[v1.0.0-beta.2]: <https://github.com/radiantearth/stac-spec/compare/v1.0.0-beta.1..v1.0.0-beta.2>
[v1.0.0-beta.1]: <https://github.com/radiantearth/stac-spec/compare/v0.9.0...v1.0.0-beta.1>
| 3 |
diff --git a/bin/oref0-bash-common-functions.sh b/bin/oref0-bash-common-functions.sh @@ -64,10 +64,12 @@ print_usage () {
echo "$HELP_TEXT"
}
-# Check that the current working directory is the myopenaps directory; if it
-# isn't, print a message to stderr and exit with status 1 (failure). We assume
-# we're in the right directory if there's a file named "openaps.ini" here.
-assert_pwd_is_myopenaps () {
+# Check that the current working directory contains openaps.ini, ie, is an
+# OpenAPS session directory. This is presumably the myopenaps directory (though
+# in principle it could also be ~/myopenaps-cgm-loop or something not part of
+# the standard install). If it isn't, print a message saying it should be run
+# from ~/myopenaps to stderr and exit with status 1 (failure).
+assert_cwd_contains_ini () {
if [[ ! -e "openaps.ini" ]]; then
echo "$self: This script should be run from the myopenaps directory, but was run from $PWD which does not contain openaps.ini." 1>&2
exit 1
| 10 |
diff --git a/app/builtin-pages/views/history.js b/app/builtin-pages/views/history.js @@ -96,7 +96,7 @@ export function render () {
Clear Browsing History
</button>
<select id="delete-period">
- <option value="day">from today</option>
+ <option value="day" selected>from today</option>
<option value="week">from this week</option>
<option value="month">from this month</option>
<option value="all">from all time</option>
| 12 |
diff --git a/RobotNXT/src/main/java/de/fhg/iais/roberta/visitor/codegen/NxtNxcVisitor.java b/RobotNXT/src/main/java/de/fhg/iais/roberta/visitor/codegen/NxtNxcVisitor.java @@ -1292,10 +1292,14 @@ public final class NxtNxcVisitor extends AbstractCppVisitor implements INxtVisit
private void generateSensors() {
Map<String, UsedSensor> usedSensorMap = new HashMap<>();
for ( UsedSensor usedSensor : this.getBean(UsedHardwareBean.class).getUsedSensors() ) {
- nlIndent();
- this.sb.append("SetSensor(");
ConfigurationComponent configurationComponent = this.brickConfiguration.getConfigurationComponent(usedSensor.getPort());
String sensorType = configurationComponent.getComponentType();
+ nlIndent();
+ if ( sensorType.equals(SC.LIGHT) ) {
+ this.sb.append("SetSensorLight(");
+ } else {
+ this.sb.append("SetSensor(");
+ }
this.sb.append(configurationComponent.getInternalPortName()).append(", ");
switch ( sensorType ) {
@@ -1306,7 +1310,11 @@ public final class NxtNxcVisitor extends AbstractCppVisitor implements INxtVisit
this.sb.append("SENSOR_LOWSPEED);");
break;
case SC.LIGHT:
- this.sb.append("SENSOR_LIGHT);");
+ if ( usedSensor.getMode().equals("LIGHT") ) {
+ this.sb.append("true);");
+ } else {
+ this.sb.append("false);");
+ }
break;
case SC.TOUCH:
this.sb.append("SENSOR_TOUCH);");
| 14 |
diff --git a/css/base/base.scss b/css/base/base.scss /**
- * DDG Chrome Extension Base Styles
+ * DDG Chrome Extension Resets & Base Styles
*/
html, body {
@@ -37,6 +37,14 @@ section, ul, ol, li {
}
}
+form, input, select, option, button {
+ outline: none;
+
+ * {
+ outline: none;
+ }
+}
+
/* Fonts */
@@ -72,11 +80,13 @@ a {
/* Position */
+
.pull-right {
position: absolute;
right: 14px;
}
+
/* Icons */
/* Standard icon display within the extension */
.icon {
| 2 |
diff --git a/src/cljs_api_gen/parse.clj b/src/cljs_api_gen/parse.clj docstring (let [d (first form)]
(when (string? d) d))
form (if docstring (drop 1 form) form)
+ [opts form] (loop [opts {}
+ [a b & etc :as form] form]
+ (if (keyword? a)
+ (recur (assoc opts a b) etc)
+ [opts form]))
method-lists form
pmethods (mapv parse-protocol-method method-lists)]
(when (or *parse-private-defs?*
(not private?))
{:docstring docstring
+ :options opts
:signature nil
:methods pmethods
:type "protocol"})))
| 11 |
diff --git a/src/components/pages/homepage/large-project.module.scss b/src/components/pages/homepage/large-project.module.scss @import '~scss/breakpoints.module.scss';
+@import '~scss/colors.module.scss';
.wrapper {
padding: 60px 0;
- border-top: 1px solid black;
- border-bottom: 1px solid black;
+ border-top: 1px solid $color-slate-400;
+ border-bottom: 1px solid $color-slate-400;
text-align: center;
@media (min-width: $viewport-lg) {
padding: 120px 0;
h3 {
a {
text-decoration: none;
- color: black;
+ color: $text;
&:hover,
&:focus {
text-decoration: underline;
| 1 |
diff --git a/lib/winston/transports/file.js b/lib/winston/transports/file.js @@ -339,7 +339,7 @@ File.prototype.stat = function stat(callback) {
}
if (err) {
- debug(`err ${err.code}`, fullpath);
+ debug('err ' + err.code, fullpath);
return callback(err);
}
| 2 |
diff --git a/cypress/integration/other/configuration.spec.js b/cypress/integration/other/configuration.spec.js @@ -110,11 +110,10 @@ describe('Configuration', () => {
cy.viewport(1440, 1024);
cy.visit(url);
- cy.get('svg').then((svgs) => {
- svgs[0].matchImageSnapshot(
+ cy.get('svg');
+ cy.matchImageSnapshot(
'configuration.spec-should-not-taint-initial-configuration-when-using-multiple-directives'
);
});
});
});
-});
| 1 |
diff --git a/generators/server/templates/src/main/java/package/web/rest/UserResource.java.ejs b/generators/server/templates/src/main/java/package/web/rest/UserResource.java.ejs @@ -196,6 +196,7 @@ public class UserResource {
*/
@GetMapping("/users")
@Timed
+ @Secured(AuthoritiesConstants.ADMIN)
<%_ if (databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'couchbase') { _%>
public ResponseEntity<List<UserDTO>> getAllUsers(Pageable pageable) {
final Page<UserDTO> page = userService.getAllManagedUsers(pageable);
| 11 |
diff --git a/src/og/shaders/drawnode.js b/src/og/shaders/drawnode.js @@ -40,6 +40,27 @@ const __BLEND1__ =
const DEF_BLEND = `#define blend(DEST, SAMPLER, OFFSET, OPACITY) src = texture( SAMPLER, OFFSET.xy + vTextureCoord.xy * OFFSET.zw ); DEST = DEST * (1.0 - src.a * OPACITY) + src * OPACITY;`;
const DEF_BLEND_WEBGL1 = `#define blend(DEST, SAMPLER, OFFSET, OPACITY) src = texture2D( SAMPLER, OFFSET.xy + vTextureCoord.xy * OFFSET.zw ); DEST = DEST * (1.0 - src.a * OPACITY) + src * OPACITY;`;
+const __BLEND_PICKING__ = `void blendPicking(
+ out vec4 dest,
+ in vec4 tileOffset,
+ in sampler2D sampler,
+ in sampler2D pickingMask,
+ in vec4 pickingColor,
+ in float opacity)
+{
+ vec2 tc = tileOffset.xy + vTextureCoord.xy * tileOffset.zw;
+ vec4 t = texture2D(sampler, tc);
+ vec4 p = texture2D(pickingMask, tc);
+ dest = mix(dest, vec4(max(pickingColor.rgb, p.rgb), opacity), (t.a == 0.0 ? 0.0 : 1.0) * pickingColor.a);
+}`
+
+const BLEND_PICKING = `#define blendPicking(DEST, OFFSET, SAMPLER, MASK, COLOR, OPACITY) \
+ tc = OFFSET.xy + vTextureCoord.xy * OFFSET.zw; \
+ t = texture2D(SAMPLER, tc); \
+ p = texture2D(MASK, tc); \
+ DEST = mix(DEST, vec4(max(COLOR.rgb, p.rgb), OPACITY), (t.a == 0.0 ? 0.0 : 1.0) * COLOR.a);`
+
+
const SLICE_SIZE = 4;
export function drawnode_screen_nl() {
@@ -494,24 +515,16 @@ export function drawnode_colorPicking() {
uniform int samplerCount;
varying vec2 vTextureCoord;
- void blendPicking(
- out vec4 dest,
- in vec4 tileOffset,
- in sampler2D sampler,
- in sampler2D pickingMask,
- in vec4 pickingColor,
- in float opacity)
- {
- vec2 tc = tileOffset.xy + vTextureCoord.xy * tileOffset.zw;
- vec4 t = texture2D( sampler, tc );
- vec4 p = texture2D( pickingMask, tc );
- dest = mix( dest, vec4(max(pickingColor.rgb, p.rgb), opacity), (t.a == 0.0 ? 0.0 : 1.0) * pickingColor.a);
- }
+ ${BLEND_PICKING}
void main(void) {
gl_FragColor = vec4(0.0);
if( samplerCount == 0 ) return;
+ vec2 tc;
+ vec4 t;
+ vec4 p;
+
blendPicking(gl_FragColor, tileOffsetArr[0], samplerArr[0], pickingMaskArr[0], pickingColorArr[0], 1.0);
if( samplerCount == 1 ) return;
| 1 |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md @@ -302,7 +302,7 @@ favorite environment and rerun tests inside the docker environment.
**hint** sometimes building inside the image has problems with `node-sass` library
```text
-Error: Missing binding /cypress-monorepo/packages/desktop-gui/node_modules/node-sass/vendor/linux-x64-48/binding.node
+Error: Missing binding /cypress/packages/desktop-gui/node_modules/node-sass/vendor/linux-x64-48/binding.node
Node Sass could not find a binding for your current environment: Linux 64-bit with Node.js 6.x
Found bindings for the following environments:
@@ -378,7 +378,7 @@ The repository is setup with two main (protected) branches.
### Testing
-This repository is exhaustively tested by [CircleCI](https://circleci.com/gh/cypress-io/cypress-monorepo). Additionally we test the code by running it against various other example projects. See CI badges and links at the top of this document.
+This repository is exhaustively tested by [CircleCI](https://circleci.com/gh/cypress-io/cypress). Additionally we test the code by running it against various other example projects. See CI badges and links at the top of this document.
## Deployment
| 10 |
diff --git a/articles/product-lifecycle/migrations.md b/articles/product-lifecycle/migrations.md @@ -53,14 +53,6 @@ We are actively migrating customers to new behaviors for all **Deprecations** li
The Webtask engine powering Auth0 extensibility points currently uses Node 4. Beginning <strong>30 April 2018</strong>, <a href="https://github.com/nodejs/Release#release-schedule">Node.js v4 will no longer be under long-term support (LTS)</a>. This means that critical security fixes will no longer be back-ported to this version. As such, Auth0 will be migrating the Webtask runtime from Node.js v4 to Node.js v8.<br><br>On <strong>17 April 2018</strong> we will make the Node 8 runtime available for extensibility to all public cloud customers. You will be provided a migration switch that allows you to control your environment's migration to the new runtime environment.<br><br>For more information on this migration and the steps you should follow to upgrade your implementation, see <a href="/migrations/guides/extensibility-node8">Migration Guide: Extensibility and Node.js v8</a>.
</td>
</tr>
- <tr>
- <td><a href="/migrations/guides/migration-oauthro-oauthtoken">oauth/ro</a></td>
- <td>26 December 2017</td>
- <td>TBD</td>
- <td>
- If you are currently implementing the <a href="/api/authentication#resource-owner">/oauth/ro</a> endpoint, your application can be updated to use the <a href="/api/authentication#authorization-code">/oauth/token</a> endpoint. For details on how to make this transition, see the <a href="/migrations/guides/migration-oauthro-oauthtoken">Migration Guide for Resource Owner Password Credentials Exchange</a>.
- </td>
- </tr>
</tbody>
</table>
| 2 |
diff --git a/lib/node/index.js b/lib/node/index.js @@ -468,18 +468,30 @@ Request.prototype._redirect = function(res){
* .auth('tobi', 'learnboost')
* .auth('tobi:learnboost')
* .auth('tobi')
+ * .auth(accessToken, { type: 'bearer' })
*
* @param {String} user
- * @param {String} pass
+ * @param {String} [pass]
+ * @param {Object} [options] options with authorization type 'basic' or 'bearer' ('basic' is default)
* @return {Request} for chaining
* @api public
*/
-Request.prototype.auth = function(user, pass){
+Request.prototype.auth = function(user, pass, options){
if (1 === arguments.length) pass = '';
+ if (2 === arguments.length && typeof pass === 'object') options = pass;
+ if (!options) {
+ options = { type: 'basic' };
+ }
+ switch (options.type) {
+ case 'bearer':
+ return this.set('Authorization', 'Bearer ' + user);
+
+ default: // 'basic'
if (!~user.indexOf(':')) user = user + ':';
var str = new Buffer(user + pass).toString('base64');
return this.set('Authorization', 'Basic ' + str);
+ }
};
/**
| 0 |
diff --git a/buildout.cfg b/buildout.cfg @@ -53,7 +53,7 @@ webtest = git https://github.com/Pylons/webtest.git
WSGIProxy2 = git https://github.com/lrowe/WSGIProxy2.git
zope.sqlalchemy = git https://github.com/zopefoundation/zope.sqlalchemy.git
pytest-bdd = git https://github.com/lrowe/pytest-bdd.git branch=allow-any-step-order
-snovault = git https://github.com/ENCODE-DCC/snovault.git rev=1.0.12
+snovault = git https://github.com/ENCODE-DCC/snovault.git rev=1.0.13
[versions]
# Hand set versions
| 3 |
diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json "wallet_text": "Control the details of your local wallet.",
"accounts_text": "Your accounts list.",
"password_text": "Change your password.",
- "backup_text": "**IMPORTANT** NOTICE: To provide enhanced security, the web-based wallet will move to the subdomain https://wallet.bitshares.org by November 15, 2017. We will phase out https://bitshares.org/wallet. Please backup your wallet now and restore the backup file to https://wallet.bitshares.org, which will be your new address for the web wallet. Thanks for your continued support.",
+ "backup_text": "Create backups here.",
"restore_text": "Restore from a backup or import keys.",
"access_text": "",
"view_keys": "View keys",
| 13 |
diff --git a/src/sdk/conference/channel.js b/src/sdk/conference/channel.js @@ -860,8 +860,8 @@ export class ConferencePeerConnectionChannel extends EventDispatcher {
const pcConfiguration = this._config.rtcConfiguration || {};
if (Utils.isChrome()) {
pcConfiguration.sdpSemantics = 'unified-plan';
- }
pcConfiguration.bundlePolicy = 'max-bundle';
+ }
this._pc = new RTCPeerConnection(pcConfiguration);
this._pc.onicecandidate = (event) => {
this._onLocalIceCandidate.apply(this, [event]);
| 12 |
diff --git a/components/labelsviewer/labelsviewer.css b/components/labelsviewer/labelsviewer.css -.labels-editor, .labels-viewer, .labels-container {
+.labels-editor, .labels-viewer {
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -moz-box; /* OLD - Firefox 19- (buggy but mostly works) */
display: -ms-flexbox; /* TWEENER - IE 10 */
background:#F5F5F5;
}
+.labels-container {
+ background:#F5F5F5;
+}
.labels-editor > .btn-group > .btn, .labels-viewer > .btn {
padding: 3px 12px;
}
| 1 |
diff --git a/src/encoded/tests/data/inserts/user.json b/src/encoded/tests/data/inserts/user.json ],
"timezone": "US/Pacific",
"uuid": "7dfbe70c-995d-4bc5-94c3-7d39d2baf001"
+ },
+ {
+ "email": "[email protected]",
+ "first_name": "Kriti",
+ "groups": [
+ "admin"
+ ],
+ "job_title": "Software Engineer",
+ "lab": "/labs/j-michael-cherry/",
+ "last_name": "Jain",
+ "status": "current",
+ "submits_for": [
+ "/labs/j-michael-cherry/"
+ ],
+ "timezone": "US/Pacific",
+ "uuid": "4136f132-304e-4ddd-b87a-db04605f47b7"
}
-
]
| 0 |
Subsets and Splits