code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/app/src/components/Containers/Me.js b/app/src/components/Containers/Me.js @@ -531,12 +531,17 @@ const Me = (props) =>
<Tooltip title={micTip} placement='left'>
{ smallContainer ?
<div>
- <IconButton
+ <Fab
+ // <IconButton
aria-label={intl.formatMessage({
id : 'device.muteAudio',
defaultMessage : 'Mute audio'
})}
- className={classes.smallContainer}
+ // className={classes.smallContainer}
+ className={classnames(
+ classes.fab,
+ smallContainer ? 'smallest': null
+ )}
disabled={
!me.canSendMic ||
!hasAudioPermission ||
@@ -589,16 +594,22 @@ const Me = (props) =>
:
<MicOffIcon />
}
- </IconButton>
+ </Fab>
+ {/* </IconButton> */}
</div>
:
<div>
<Fab
+ // style={classes.smallest}
aria-label={intl.formatMessage({
id : 'device.muteAudio',
defaultMessage : 'Mute audio'
})}
- className={classes.fab}
+ // className={classes.fab}
+ className={classnames(
+ classes.fab,
+ smallContainer ? 'smallest': null
+ )}
disabled={
!me.canSendMic ||
!hasAudioPermission ||
@@ -661,12 +672,17 @@ const Me = (props) =>
<Tooltip title={webcamTip} placement='left'>
{ smallContainer ?
<div>
- <IconButton
+ <Fab
+ // <IconButton
aria-label={intl.formatMessage({
id : 'device.startVideo',
defaultMessage : 'Start video'
})}
- className={classes.smallContainer}
+ // className={classes.smallContainer}
+ className={classnames(
+ classes.fab,
+ smallContainer ? 'smallest': null
+ )}
disabled={
!me.canSendWebcam ||
!hasVideoPermission ||
@@ -686,7 +702,8 @@ const Me = (props) =>
:
<VideoOffIcon />
}
- </IconButton>
+ {/* </IconButton> */}
+ </Fab>
</div>
:
<div>
@@ -695,7 +712,11 @@ const Me = (props) =>
id : 'device.startVideo',
defaultMessage : 'Start video'
})}
- className={classes.fab}
+ // className={classes.fab}
+ className={classnames(
+ classes.fab,
+ smallContainer ? 'smallest': null
+ )}
disabled={
!me.canSendWebcam ||
!hasVideoPermission ||
@@ -731,12 +752,17 @@ const Me = (props) =>
>
{ smallContainer ?
<div>
- <IconButton
+ <Fab
+ // <IconButton
aria-label={intl.formatMessage({
id : 'device.startScreenSharing',
defaultMessage : 'Start screen sharing'
})}
- className={classes.smallContainer}
+ // className={classes.smallContainer}
+ className={classnames(
+ classes.fab,
+ smallContainer ? 'smallest': null
+ )}
disabled={
!hasScreenPermission ||
!me.canShareScreen ||
@@ -754,7 +780,8 @@ const Me = (props) =>
}}
>
<ScreenIcon/>
- </IconButton>
+ {/* </IconButton> */}
+ </Fab>
</div>
:
<div>
@@ -763,7 +790,11 @@ const Me = (props) =>
id : 'device.startScreenSharing',
defaultMessage : 'Start screen sharing'
})}
- className={classes.fab}
+ // className={classes.fab}
+ className={classnames(
+ classes.fab,
+ smallContainer ? 'smallest': null
+ )}
disabled={
!hasScreenPermission ||
!me.canShareScreen ||
@@ -800,24 +831,34 @@ const Me = (props) =>
placement={smallContainer ? 'top' : 'left'}
>
{ smallContainer ?
- <IconButton
+ <Fab
+ // <IconButton
aria-label={intl.formatMessage({
id : 'device.options',
defaultMessage : 'Options'
})}
- className={classes.smallContainer}
+ // className={classes.smallContainer}
+ className={classnames(
+ classes.fab,
+ smallContainer ? 'smallest': null
+ )}
size='small'
onClick={handleMenuOpen}
>
<MoreHorizIcon />
- </IconButton>
+ {/* </IconButton> */}
+ </Fab>
:
<Fab
aria-label={intl.formatMessage({
id : 'device.options',
defaultMessage : 'Options'
})}
- className={classes.fab}
+ // className={classes.fab}
+ className={classnames(
+ classes.fab,
+ smallContainer ? 'smallest': null
+ )}
size={buttonSize}
onClick={handleMenuOpen}
@@ -955,12 +996,17 @@ const Me = (props) =>
<Tooltip title={webcamTip} placement='left'>
{ smallContainer ?
<div>
- <IconButton
+ <Fab
+ // <IconButton
aria-label={intl.formatMessage({
id : 'device.stopVideo',
defaultMessage : 'Stop video'
})}
- className={classes.smallContainer}
+ // className={classes.smallContainer}
+ className={classnames(
+ classes.fab,
+ smallContainer ? 'smallest': null
+ )}
disabled={!me.canSendWebcam || me.webcamInProgress}
size='small'
color='primary'
@@ -971,7 +1017,8 @@ const Me = (props) =>
>
<VideoIcon />
- </IconButton>
+ {/* </IconButton> */}
+ </Fab>
</div>
:
<div>
@@ -980,7 +1027,11 @@ const Me = (props) =>
id : 'device.stopVideo',
defaultMessage : 'Stop video'
})}
- className={classes.fab}
+ // className={classes.fab}
+ className={classnames(
+ classes.fab,
+ smallContainer ? 'smallest': null
+ )}
disabled={!me.canSendWebcam || me.webcamInProgress}
size={smallContainer ? 'small' : 'large'}
onClick={() =>
| 14 |
diff --git a/src/pages/using-spark/components/dictionary.mdx b/src/pages/using-spark/components/dictionary.mdx @@ -9,7 +9,7 @@ import { SprkDivider } from '@sparkdesignsystem/spark-react';
The Dictionary component displays a list of key-value pairs.
<ComponentPreview
- componentName="dictionary--default-dictionary"
+ componentName="dictionary--default-story"
hasReact
hasAngular
hasHTML
@@ -42,7 +42,7 @@ exceed two lines of wrapped text.
Use the Basic Dictionary when there are fewer than ten rows.
<ComponentPreview
- componentName="dictionary--default-dictionary"
+ componentName="dictionary--default-story"
hasReact
hasAngular
hasHTML
@@ -55,7 +55,7 @@ greater than ten or when the Dictionary is wide enough
to need an additional visual cue.
<ComponentPreview
- componentName="dictionary--striped-dictionary"
+ componentName="dictionary--striped"
hasReact
hasAngular
hasHTML
| 3 |
diff --git a/lib/modules/ens/index.js b/lib/modules/ens/index.js @@ -127,7 +127,7 @@ class ENS {
if (isKnownNetwork || !shouldRegisterSubdomain) {
return cb();
}
- process.exit();
+
self.registerConfigDomains(config, cb);
});
}
@@ -274,8 +274,6 @@ class ENS {
self.events.request('blockchain:networkId', (networkId) => {
if (ENS_CONTRACTS_CONFIG[networkId]) {
self.ensConfig = utils.recursiveMerge(self.ensConfig, ENS_CONTRACTS_CONFIG[networkId]);
- } else {
- process.exit();
}
async.waterfall([
| 2 |
diff --git a/includes/Core/Authentication/Authentication.php b/includes/Core/Authentication/Authentication.php @@ -166,7 +166,7 @@ final class Authentication {
$this->verification = new Verification( $this->user_options );
$this->verification_meta = new Verification_Meta( $this->user_options, $this->transients );
$this->verification_file = new Verification_File( $this->user_options );
- $this->profile = new Profile( $user_options, $this->get_oauth_client() );
+ $this->profile = new Profile( $user_options );
$this->first_admin = new First_Admin( $this->options );
}
| 2 |
diff --git a/test/image/mocks/gl3d_ibm-plot.json b/test/image/mocks/gl3d_ibm-plot.json 20.0538,
17.7003,
15.4519
- ],
- [
- 31.7202,
- 28.0013,
- 25.1881,
- 24.006999999999998,
- 23.4612,
- 23.1983,
- 22.9418,
- 22.6914,
- 22.4469,
- 21.9752,
- 21.1062,
- 18.9972,
- 16.6826
]
],
"x": [
| 2 |
diff --git a/docs/docs/creating-and-modifying-pages.md b/docs/docs/creating-and-modifying-pages.md @@ -141,7 +141,7 @@ well as client-only routes (e.g. an app that combines marketing pages and your
app that lives under `/app/*`), you want to add code to your `gatsby-node.js`
like the following:
-_Note: There's also a plugin that will set up the creation of client-paths automatically:
+_Note: There's also a plugin that will set up the creation of client-paths declaratively:
[gatsby-plugin-create-client-paths](/packages/gatsby-plugin-create-client-paths/)_.
```javascript
| 4 |
diff --git a/src/matrix/room/ArchivedRoom.js b/src/matrix/room/ArchivedRoom.js @@ -22,7 +22,7 @@ export class ArchivedRoom extends BaseRoom {
constructor(options) {
super(options);
this._kickDetails = null;
- this._kickAuthor = null;
+ this._kickedBy = null;
}
async _getKickAuthor(sender, txn) {
@@ -38,7 +38,7 @@ export class ArchivedRoom extends BaseRoom {
const {summary, kickDetails} = archivedRoomSummary;
this._kickDetails = kickDetails;
if (this._kickDetails) {
- this._kickAuthor = await this._getKickAuthor(this._kickDetails.sender, txn);
+ this._kickedBy = await this._getKickAuthor(this._kickDetails.sender, txn);
}
return super.load(summary, txn, log);
}
@@ -50,16 +50,16 @@ export class ArchivedRoom extends BaseRoom {
const newKickDetails = findKickDetails(roomResponse, this._user.id);
if (newKickDetails || joinedSummaryData) {
const kickDetails = newKickDetails || this._kickDetails;
- let kickAuthor;
+ let kickedBy;
if (newKickDetails) {
- kickAuthor = await this._getKickAuthor(newKickDetails.sender, txn);
+ kickedBy = await this._getKickAuthor(newKickDetails.sender, txn);
}
const summaryData = joinedSummaryData || this._summary.data;
txn.archivedRoomSummary.set({
summary: summaryData.serialize(),
kickDetails,
});
- return {kickDetails, kickAuthor, summaryData};
+ return {kickDetails, kickedBy, summaryData};
}
} else if (membership === "join") {
txn.archivedRoomSummary.remove(this.id);
@@ -73,7 +73,7 @@ export class ArchivedRoom extends BaseRoom {
* Called with the changes returned from `writeSync` to apply them and emit changes.
* No storage or network operations should be done here.
*/
- afterSync({summaryData, kickDetails, kickAuthor}, log) {
+ afterSync({summaryData, kickDetails, kickedBy}, log) {
log.set("id", this.id);
if (summaryData) {
this._summary.applyChanges(summaryData);
@@ -81,8 +81,8 @@ export class ArchivedRoom extends BaseRoom {
if (kickDetails) {
this._kickDetails = kickDetails;
}
- if (kickAuthor) {
- this._kickAuthor = kickAuthor;
+ if (kickedBy) {
+ this._kickedBy = kickedBy;
}
this._emitUpdate();
}
| 10 |
diff --git a/token-metadata/0x6B3595068778DD592e39A122f4f5a5cF09C90fE2/metadata.json b/token-metadata/0x6B3595068778DD592e39A122f4f5a5cF09C90fE2/metadata.json "symbol": "SUSHI",
"address": "0x6B3595068778DD592e39A122f4f5a5cF09C90fE2",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/web/app/components/Blockchain/Operation.jsx b/web/app/components/Blockchain/Operation.jsx @@ -96,11 +96,11 @@ class Row extends React.Component {
</div>
<div style={{fontSize: 14, paddingTop: 5}}>
{/*<span>{counterpart.translate("explorer.block.title").toLowerCase()} <Link to={`/block/${block}`}>{utils.format_number(block, 0)}</Link></span>*/}
- {!this.props.hideDate ? <BlockTime block_number={block}/> : null}
{!this.props.hideFee ? <span className="facolor-fee"> - <FormattedAsset amount={fee.amount} asset={fee.asset_id} /></span> : null}
{pending ? <span> - {pending}</span> : null}
</div>
</td>
+ <td>{!this.props.hideDate ? <BlockTime block_number={block}/> : null}</td>
</tr>
);
}
| 5 |
diff --git a/reference/api/indexes.md b/reference/api/indexes.md @@ -76,7 +76,7 @@ An index is automatically created when adding [documents](/reference/api/documen
| Variable | Description |
| -------------- | ---------------------------------------------------------- |
-| **index_uid** | The index unique identifier (_mandatory_) |
+| **uid** | The index unique identifier (_mandatory_) |
| **primaryKey** | The <clientGlossary word="primary key" /> of the documents |
```json
| 1 |
diff --git a/js/control/Profile.js b/js/control/Profile.js @@ -40,8 +40,8 @@ BR.Profile = L.Evented.extend({
empty = !this.editor.getValue(),
clean = this.editor.isClean();
- this.profileName = profileName;
if (profileName && BR.conf.profilesUrl && (empty || clean)) {
+ this.profileName = profileName;
if (!(profileName in this.cache)) {
profileUrl = BR.conf.profilesUrl + profileName + '.brf';
BR.Util.get(
| 1 |
diff --git a/doc/reporting.html b/doc/reporting.html @@ -44,9 +44,8 @@ CodeMirror. But first, please read over these points:</p>
<li>Mention very precisely what went wrong. "X is broken" is not a
good bug report. What did you expect to happen? What happened
- instead? Describe the exact steps a maintainer has to take to make
- the problem occur. We can not fix something that we can not
- observe.</li>
+ instead? Describe the exact steps a maintainer has to take to reproduce
+ the error. We can not fix something that we can not observe.</li>
<li>If the problem can not be reproduced in any of the demos
included in the CodeMirror distribution, please provide an HTML
| 7 |
diff --git a/runner/src/main/java/com/codingame/gameengine/runner/Renderer.java b/runner/src/main/java/com/codingame/gameengine/runner/Renderer.java @@ -248,7 +248,7 @@ class Renderer {
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
String relativePath = sourceFolderPath.relativize(file).toString();
if (relativePath.startsWith("config") || relativePath.startsWith("src") || relativePath.equals("pom.xml")) {
- zos.putNextEntry(new ZipEntry(sourceFolderPath.relativize(file).toString()));
+ zos.putNextEntry(new ZipEntry(sourceFolderPath.relativize(file).toString().replace('\\', '/')));
Files.copy(file, zos);
zos.closeEntry();
}
| 14 |
diff --git a/tutorial.js b/tutorial.js @@ -42,7 +42,7 @@ export async function tryTutorial() {
/* ftuPhase = ftuDone ? 4 : 1;
ftu.classList.add('phase-' + ftuPhase);
ftuUsername.focus();
- ftuUsername.select();
+ ftuUsername.select(); */
}
ftuUsername.addEventListener('keydown', e => {
| 0 |
diff --git a/tests/codeceptjs/editors/advanced_test.js b/tests/codeceptjs/editors/advanced_test.js @@ -8,4 +8,5 @@ Scenario('test validation & delete', (I) => {
I.fillField('root[0][location][city]', 'Stuttgart');
I.waitForValue("[name='root[0][location][city]']", 'Stuttgart');
I.click('.json-editor-btn-delete');
+ I.acceptPopup();
});
| 1 |
diff --git a/packages/idyll-template-projects/templates/multipage/README.md b/packages/idyll-template-projects/templates/multipage/README.md Template for an Idyll blog with multiple posts.
### Quick Start
-The multipage template uses an index, or main, page (in this directory) alongside multiple sub-pages (in the `posts` directory).
-To run the main page, use the `idyll` command in this directory.
-To create a new page, `cd posts` to navigate to the `posts` directory, then use `idyll create --template ../template --no-install` to create a new post.*
-To run a sub-page, `cd posts/name-of-page` to navigate to that page's directory, then use `idyll`.
-Any pages that have been built will go to the `docs` directory (found within the top level of the multipage post).
+* The multipage template uses an index, or main, page (in this directory) alongside multiple sub-pages (in the `posts` directory).
+* To run the main page, use the `idyll` command in this directory.
+* To create a new page, `cd posts` to navigate to the `posts` directory, then use `idyll create --template ../template --no-install` to create a new post.
+* To run a sub-page, `cd posts/name-of-page` to navigate to that page's directory, then use `idyll`.
+* Any pages that have been built will go to the `docs` directory (found within the top level of the multipage post).
### Project overview
@@ -24,10 +24,14 @@ Any pages that have been built will go to the `docs` directory (found within the
## Creating a post
-Navigate to the posts directory and run `idyll create --template ../template/ --no-install`.
+Navigate to the `posts` directory and run `idyll create --template ../template/ --no-install`.
+Alternatively, use `idyll create`, select `Custom` for the template when prompted, and provide the path `../template/`.
+
+Using the `idyll create` command without one of the other templates will work, but the above will automatically follow the default structure of the multipage post, while the other preset templates will not.
+If you do choose to use another template, your build files will go to `posts/name-of-post/build` instead of `docs/name-of-post`.
+
+To change the output location, change the `output` option in `package.json` in the template directory (if using the provided template) and at the root of this project (and any existing posts!).
-Using the `idyll create` command without these additional arguments will work, but the above will automatically follow the default structure of the multipage post.
-If you do not use these arguments, your build files will go to `posts/name-of-post/build` instead of `docs/name-of-post`.
## Developing a post locally
@@ -39,7 +43,9 @@ Navigate to the root of this project and run `idyll`.
## Building a post for production
-Navigate to the post's directory and run `idyll build`. The output will appear in the top-level `docs` folder. To change the output location, change the `output` option in `package.json` in the template directory and at the root of this project (and any existing posts!).
+Navigate to the post's directory and run \`idyll build\`. The output will appear in the top-level \`docs\` folder.
+To change the output location, change the \`output\` option in \`package.json\` in the template directory and at the root of this project (and any existing posts!).
+(This assumes that you are using the template provided for multipage blogs.)
## Deploying
| 3 |
diff --git a/embark-ui/src/components/Transactions.js b/embark-ui/src/components/Transactions.js @@ -29,7 +29,7 @@ const Transactions = ({transactions}) => (
</Table.Header>
<Table.Body>
{
- transactions.reduce((transaction) => {
+ transactions.map((transaction) => {
return (
<Table.Row key={transaction.hash}>
<Table.Col><Link to={`/embark/explorer/transactions/${transaction.hash}`}>{transaction.hash}</Link></Table.Col>
| 14 |
diff --git a/packages/components/src/components/as-layer-selector-slot/as-layer-selector-slot.scss b/packages/components/src/components/as-layer-selector-slot/as-layer-selector-slot.scss display: none;
}
}
+
+.as-layer-selector-slot--wrapper {
+ padding-bottom: 12px;
+
+ .as-checkbox {
+ margin: 12px 12px 0;
+ }
+
+ .as-caption {
+ font-size: 16px;
+ }
+}
| 7 |
diff --git a/src/ApiGatewayWebSocket.js b/src/ApiGatewayWebSocket.js @@ -118,10 +118,10 @@ module.exports = class ApiGatewayWebSocket {
// end COPY PASTE FROM HTTP SERVER CODE
}
- async _doAction(websocketClient, connectionId, name, event, doDefaultAction) {
+ async _doAction(websocketClient, connectionId, name, event, doDefaultRoute) {
let route = this._webSocketRoutes.get(name)
- if (!route && doDefaultAction) {
+ if (!route && doDefaultRoute) {
route = this._webSocketRoutes.get('$default')
}
@@ -145,7 +145,7 @@ module.exports = class ApiGatewayWebSocket {
websocketClient.close()
}
- debugLog(`Error in handler of action ${route}`, err)
+ debugLog(`Error in route handler '${route}'`, err)
}
const { functionName, functionObj } = route
@@ -237,44 +237,46 @@ module.exports = class ApiGatewayWebSocket {
debugLog(`message:${message}`)
- let actionName = null
+ let route = null
if (
this._websocketsApiRouteSelectionExpression.startsWith(
'$request.body.',
)
) {
- // actionName = request.payload
- actionName = message // TODO
+ // route = request.payload
+ route = message // TODO
- if (typeof actionName === 'object') {
+ if (typeof route === 'object') {
this._websocketsApiRouteSelectionExpression
.replace('$request.body.', '')
.split('.')
.forEach((key) => {
- if (actionName) {
- actionName = actionName[key]
+ if (route) {
+ route = route[key]
}
})
- } else actionName = null
+ } else {
+ route = null
+ }
}
- if (typeof actionName !== 'string') {
- actionName = null
+ if (typeof route !== 'string') {
+ route = null
}
- const action = actionName || '$default'
+ route = route || '$default'
- debugLog(`action:${action} on connection=${connectionId}`)
+ debugLog(`route:${route} on connection=${connectionId}`)
const event = new WebSocketEvent(
- action,
+ route,
'MESSAGE',
connectionId,
message,
)
- this._doAction(webSocketClient, connectionId, action, event, true)
+ this._doAction(webSocketClient, connectionId, route, event, true)
// return h.response().code(204)
})
@@ -372,7 +374,7 @@ module.exports = class ApiGatewayWebSocket {
functionObj,
})
- serverlessLog(`Action '${route}'`)
+ serverlessLog(`route '${route}'`)
}
_extractAuthFunctionName(endpoint) {
| 10 |
diff --git a/README.md b/README.md @@ -490,7 +490,12 @@ When downloading large files on Android it is recommended to use `Download Manag
<img src="img/download-manager.png" width="256">
-When using DownloadManager, `fileCache` and `path` properties in `config` will not take effect, because Android DownloadManager can only store files to external storage. When download complete, DownloadManager will generate a file path so that you can deal with it.
+When using DownloadManager, `fileCache` and `path` properties in `config` will not take effect, because Android DownloadManager can only store files to external storage, also notice that Download Manager can only support `GET` method, which means the request body will be ignored.
+
+When download complete, DownloadManager will generate a file path so that you can deal with it.
+
+
+
```js
RNFetchBlob
| 0 |
diff --git a/src/components/signup/SignupState.js b/src/components/signup/SignupState.js @@ -591,7 +591,7 @@ const Signup = ({ navigation }: { navigation: any, screenProps: any }) => {
.catch(e => {
log.error('failed auth:', e.message, e)
- // showErrorDialog('Failed authenticating with server', e)
+ throw e
})
return apiReady()
| 0 |
diff --git a/package.json b/package.json {
"name": "prettier-atom",
"main": "./dist/main.js",
- "version": "0.47.1",
+ "version": "0.47.2",
"description": "Atom plugin for formatting JavaScript using prettier with (optional) prettier-eslint integration",
"keywords": [
"atom",
| 6 |
diff --git a/services/web-ui/src/component/flows/detail-page/index.js b/services/web-ui/src/component/flows/detail-page/index.js @@ -270,6 +270,7 @@ class FlowDetails extends React.PureComponent {
}
childrenContent.push(this.generateGraphVisualization([], node, false, nodeAlignment));
}
+ console.log('childContent', childrenContent)
currentContent.push(<div key={parent.id} className={`${styles.nodeWrapper} ${nodeAlignment}`}>
@@ -278,7 +279,8 @@ class FlowDetails extends React.PureComponent {
<p onClick={this.onElementClick.bind(this, parent)}>{(parent.nodeSettings && parent.nodeSettings.basaasFlows ? parent.nodeSettings.basaasFlows.stepName : parent.id)}</p>
</div>
- {parent.children.length ? <div className={styles.childrenWrapper} style={{position: 'relative'}}><hr style={{transform: 'rotate(90deg)', width: '20px'}}/>{childrenContent} </div> : null}
+ {(parent.children.length && childrenContent.length === 1) ? <div className={styles.childrenWrapper} style={{position: 'relative'}}><hr style={{transform: 'rotate(90deg)', width: '20px'}}/>{childrenContent} </div> :
+ (parent.children.length && childrenContent.length > 1) ? <div className={styles.childrenWrapper} style={{position: 'relative'}}><hr style={{transform: 'rotate(90deg)', width: '20px'}}/><div style={{position: 'absolute', right: 300, top: -30, width: 120}}>{childrenContent[0]}<hr style={{position: 'absolute', left: '120px', top: 30, width: '240px', zIndex: -1}}/></div><div style={{position: 'absolute', left: 300, top: -30}}><hr style={{position: 'absolute', right: '120px', top: 30, width: '240px', zIndex: -1}}/>{childrenContent[1]}</div> </div> : null}
{!parent.children.length ? <div className={styles.childrenWrapper}><button onClick={()=>this.openBranchEditor(parent)}>Branch</button>
{/* {this.state.leftNodeAdded ? <div>Testing</div>} */}
| 1 |
diff --git a/test/functional/helpers/constants/testServerUrl.js b/test/functional/helpers/constants/testServerUrl.js @@ -11,7 +11,7 @@ const alloyWithVisitorPages = {
prod: "alloyVisitorTestPageProd.html"
};
-const alloyWithVisitorTestPageUrl = `https://alloyio.com/functional-test/${alloyWithVisitorPages[env]}`;
+const alloyWithVisitorTestPageUrl = `https://alloyio.com/functional-test/${alloyWithVisitorPages[alloyEnv]}`;
export { alloyWithVisitorTestPageUrl };
| 4 |
diff --git a/js/views/Map.js b/js/views/Map.js @@ -30,15 +30,12 @@ function particles(sprite, size, vertices, color) {
return new THREE.Points(geometry, material);
}
-function tooltipPoint(size, sprite) {
- const geometry = new THREE.BufferGeometry();
- geometry.setAttribute('position', new THREE.Float32BufferAttribute([0, 0, 0], 3));
- var material = new THREE.PointsMaterial({size, sizeAttenuation: true,
- map: sprite, alphaTest: 0.5, transparent: false});
- material.color.setHSL([255, 0, 0]);
- var points = new THREE.Points(geometry, material);
- points.visible = false;
- return points;
+function tooltipPoint(size) {
+ const geometry = new THREE.SphereGeometry(size / 6, 32, 32);
+ var material = new THREE.MeshBasicMaterial({color: 0x000000});
+ var tooltip = new THREE.Mesh(geometry, material);
+ tooltip.visible = false;
+ return tooltip;
}
function textTexture(text, sz) {
@@ -237,7 +234,7 @@ function points(el, props) {
tooltip.forEach(t => scene.remove(t));
tooltip = [tooltipPoint(size * 1.2, sprite)];
-// tooltip.renderOrder = 2; // XXX not working. Need to bring tooltip to front.
+ tooltip[0].renderOrder = 2; // XXX layering is still odd. Not sure of sol'n.
tooltip.forEach(t => scene.add(t));
| 7 |
diff --git a/lib/v2/twitter/web-api/twitter-got.js b/lib/v2/twitter/web-api/twitter-got.js @@ -6,8 +6,8 @@ const config = require('@/config').value;
// https://github.com/mikf/gallery-dl/blob/a53cfc845e12d9e98fefd07e43ebffaec488c18f/gallery_dl/extractor/twitter.py#L716-L726
const headers = {
authorization: config.twitter.authorization,
- // every single user and guest share the same token:
- // Bearer AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA
+ // Bearer AAAAAAAAAAAAAAAAAAAAAPYXBAAAAAAACLXUNDekMxqa8h%2F40K4moUkGsoc%3DTYfbDKbT3jJPCEVnMYqilB28NHfOPqkca3qaAxGfsyKCs0wRbw
+ // reference: https://github.com/dangeredwolf/FixTweet/blob/f3082bbb0d69798687481a605f6760b2eb7558e0/src/constants.ts#L23-L25
'x-guest-token': undefined,
'x-twitter-auth-type': undefined,
'x-twitter-client-language': 'en',
| 1 |
diff --git a/lib/CT_DrawModel.js b/lib/CT_DrawModel.js +"use strict";
// USER FUNCTIONS
@@ -16,7 +17,7 @@ CT._defaultModel = new CT.Object();
CT.createDrawFunction = function(type) {
eval('CT.Object.prototype.draw' + type + ' = function(a,b,c,d) { return this._drawChild("' + type + '",a,b,c,d); }');
- eval('m' + type + ' = function(a,b,c,d) { sk()._isModel = true; return sk().glyphTransition > 0 ? sk().model().draw' +
+ eval('window.m' + type + ' = function(a,b,c,d) { sk()._isModel = true; return sk().glyphTransition > 0 ? sk().model().draw' +
type + '(a,b,c,d).xform(m._m()) : CT._defaultModel; };');
}
| 12 |
diff --git a/articles/email/templates.md b/articles/email/templates.md @@ -137,6 +137,10 @@ For example, you can refer to attributes in the template to control flow as foll
{% endif %}
```
+##### Debugging Liquid Template Variables
+
+To assist your template development, we've added a custom `{% debug %}` liquid tag, which outputs a summary of the template variables available to your template when it was rendered. _Remember to remove this tag from any "live" templates._
+
#### Using Markdown Syntax
::: panel-danger Deprecation Notice
| 0 |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md @@ -19,7 +19,7 @@ Hi there! We're thrilled that you'd like to contribute to this project. Your hel
## Notices
-Contributions to this project are [released](https://help.github.com/articles/github-terms-of-service/#6-contributions-under-repository-license) to the public under the [project's open source license](LICENSE.md).
+Contributions to this project are [released](https://help.github.com/articles/github-terms-of-service/#6-contributions-under-repository-license) to the public under the [project's open source license](LICENSE).
Please note that this project is released with a [Contributor Code of Conduct][code-of-conduct]. By participating in this project you agree to abide by its terms.
| 1 |
diff --git a/aleph/index/collections.py b/aleph/index/collections.py @@ -60,11 +60,11 @@ def index_collection(collection):
data['schemata'][schema['key']] = schema['doc_count']
# if no countries or langs are given, take the most common from the data.
- if not len(data.get('countries', [])):
+ if not data.get('countries'):
countries = aggregations['countries']['buckets']
data['countries'] = [c['key'] for c in countries]
- if not len(data.get('languages', [])):
+ if not data.get('languages'):
countries = aggregations['languages']['buckets']
data['languages'] = [c['key'] for c in countries]
| 9 |
diff --git a/core/server/api/v2/utils/validators/input/users.js b/core/server/api/v2/utils/validators/input/users.js const Promise = require('bluebird');
const debug = require('@tryghost/debug')('api:v2:utils:validators:input:users');
-const i18n = require('../../../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
const errors = require('@tryghost/errors');
+const messages = {
+ newPasswordsDoNotMatch: 'Your new passwords do not match'
+};
module.exports = {
changePassword(apiConfig, frame) {
@@ -11,7 +14,7 @@ module.exports = {
if (data.newPassword !== data.ne2Password) {
return Promise.reject(new errors.ValidationError({
- message: i18n.t('errors.models.user.newPasswordsDoNotMatch')
+ message: tpl(messages.newPasswordsDoNotMatch)
}));
}
}
| 14 |
diff --git a/assets/src/Main.js b/assets/src/Main.js @@ -3,6 +3,7 @@ import { BrowserRouter, Route } from 'react-router-dom';
import Header from './Header';
import LibrarySelector from './home/LibrarySelector';
import Library from './libraries/Library';
+import MyBooks from './mybooks/MyBooks';
function Main() {
return (
@@ -11,6 +12,7 @@ function Main() {
<Header />
<div id="content">
<Route exact path="/" component={LibrarySelector} />
+ <Route exact path="/my-books" component={MyBooks} />
<Route path="/libraries/:slug" render={({ match }) => (
<Library slug={match.params.slug} />
)} />
| 0 |
diff --git a/js/bitget.js b/js/bitget.js @@ -2355,7 +2355,7 @@ module.exports = class bitget extends Exchange {
};
}
- async fetchFundingRateHistory (symbol = undefined, since = undefined, limit = 100, params = {}) {
+ async fetchFundingRateHistory (symbol = undefined, since = undefined, limit = undefined, params = {}) {
if (symbol === undefined) {
throw new ArgumentsRequired (this.id + ' fetchFundingRateHistory() requires a symbol argument');
}
| 12 |
diff --git a/App.js b/App.js @@ -361,7 +361,7 @@ export default class App extends Component {
ref={(ref) => { this.input = ref }}
autoCapitalize={'none'}
autoCorrect={false}
- placeholder={'demo.coopcycle.org'}
+ placeholder={'Exemple : demo.coopcycle.org'}
onChangeText={(text) => this.setState({ text })} />
</Item>
</Form>
| 7 |
diff --git a/packages/openneuro-server/datalad/snapshots.js b/packages/openneuro-server/datalad/snapshots.js @@ -173,7 +173,7 @@ export const getSnapshot = async (datasetId, tag) => {
if (dataset.public) {
externalFiles = await c.crn.files
.findOne({ datasetId, tag }, { files: true })
- .then(result => (result ? result.files : []))
+ .then(result => (result ? result.files : false))
}
let created = await c.crn.snapshots
.findOne({ datasetId, tag })
| 1 |
diff --git a/packages/gatsby-theme-apollo/package.json b/packages/gatsby-theme-apollo/package.json "keywords": [
"gatsby",
"gatsby-plugin",
- "apollo",
"apollo-client"
],
"peerDependencies": {
- "@apollo/client": ">=3.0.0-beta.1",
+ "@apollo/client": "^3.0.2",
"gatsby": ">=2.13.80"
},
"devDependencies": {
- "@apollo/client": "^3.0.0-beta.1",
+ "@apollo/client": "^3.0.2",
"gatsby": "^2.19.49"
}
}
| 14 |
diff --git a/customcommands/tmplextensions.go b/customcommands/tmplextensions.go @@ -131,7 +131,11 @@ func (pa *ParsedArgs) Get(index int) interface{} {
switch pa.parsed[index].Def.Type.(type) {
case *dcmd.IntArg:
- return pa.parsed[index].Int()
+ i := pa.parsed[index]
+ if i.Value == nil {
+ return nil
+ }
+ return i.Int()
case *dcmd.ChannelArg:
i := pa.parsed[index].Value
if i == nil {
| 1 |
diff --git a/test/Synthetix.js b/test/Synthetix.js @@ -1259,7 +1259,7 @@ contract('Synthetix', async accounts => {
const debtBalance1 = await synthetix.debtBalanceOf(account1, sUSD);
assert.bnClose(debtBalance1, account1AmountToIssue);
- // Issue and burn from account 2
+ // Issue and burn from account 2 all debt
await synthetix.issueSynths(sUSD, toUnit('43'), { from: account2 });
let debt = await synthetix.debtBalanceOf(account2, sUSD);
await synthetix.burnSynths(sUSD, toUnit('43'), { from: account2 });
@@ -1267,9 +1267,10 @@ contract('Synthetix', async accounts => {
assert.bnEqual(debt, 0);
+ // Should set user issuanceData to 0 debtOwnership and retain debtEntryIndex of last action
assert.deepEqual(await synthetixState.issuanceData(account2), {
initialDebtOwnership: 0,
- debtEntryIndex: 0,
+ debtEntryIndex: 2,
});
});
| 1 |
diff --git a/src/panel/category_panel.js b/src/panel/category_panel.js @@ -25,7 +25,7 @@ export class CategoryPanel {
restore(urlShard) {
listen('map_loaded', () => {
- this.categoryName = urlShard.match(/type=(.*)/)
+ this.categoryName = urlShard.match(/type=(.*)/)[1]
this.search()
let bbox = window.mapGetBounds()
console.log(bbox)
@@ -38,13 +38,13 @@ export class CategoryPanel {
.map((cardinal) => cardinal.toFixed(7))
.join(',')
- /* to remove */ this.categoryName = 'leisure'
-
this.pois = await IdunnPoi.poiCategoryLoad(urlBBox, 50, this.categoryName)
- //this.pois = await Ajax.get('https://maps.dev.qwant.ninja/maps/geocoder/places_list/', {bbox : bbox,size : '', category : 'leisure'})
this.panel.update()
- document.querySelector(".category__panel__scroll").scrollTop = 0;
+ let container = document.querySelector(".category__panel__scroll");
+ if(container){
+ container.scrollTop = 0;
+ }
}
showPhoneNumber(options){
| 4 |
diff --git a/src/encoded/static/components/dataset.js b/src/encoded/static/components/dataset.js @@ -421,6 +421,10 @@ const Reference = React.createClass({
context: React.PropTypes.object, // Reference object to display
},
+ contextTypes: {
+ session: React.PropTypes.object, // Login session information
+ },
+
mixins: [AuditMixin],
render: function () {
@@ -578,6 +582,10 @@ const Project = React.createClass({
context: React.PropTypes.object, // Project object to display
},
+ contextTypes: {
+ session: React.PropTypes.object, // Login session information
+ },
+
mixins: [AuditMixin],
render: function () {
@@ -759,6 +767,10 @@ const UcscBrowserComposite = React.createClass({
context: React.PropTypes.object, // UCSC browser composite object to display
},
+ contextTypes: {
+ session: React.PropTypes.object, // Login session information
+ },
+
mixins: [AuditMixin],
render: function () {
| 0 |
diff --git a/src/view/preheat-a-node.js b/src/view/preheat-a-node.js @@ -61,7 +61,7 @@ function preheatANode(aNode) {
else {
var sourceNode;
if (isBrowser && aNode.tagName
- && !/^(template|slot|select|input|option|button|video|audio)$/i.test(aNode.tagName)
+ && !/^(template|slot|select|input|option|button|video|audio|canvas|img|embed|object|iframe)$/i.test(aNode.tagName)
) {
sourceNode = createEl(aNode.tagName);
}
| 14 |
diff --git a/scripts/jest/jest-cli.js b/scripts/jest/jest-cli.js @@ -317,7 +317,17 @@ function main() {
}
// Run Jest.
- spawn('node', args, {stdio: 'inherit', env: {...envars, ...process.env}});
+ const jest = spawn('node', args, {
+ stdio: 'inherit',
+ env: {...envars, ...process.env},
+ });
+ // Ensure we close our process when we get a failure case.
+ jest.on('close', code => {
+ // Forward the exit code from the Jest process.
+ if (code === 1) {
+ process.exit(1);
+ }
+ });
}
main();
| 9 |
diff --git a/public/javascripts/AccessibilityChoropleth.js b/public/javascripts/AccessibilityChoropleth.js @@ -84,12 +84,22 @@ function AccessibilityChoropleth(_, $, turf, difficultRegionIds) {
for (var i = 0; i < rates.length; i++) {
//if (rates[i].region_id === feature.properties.region_id) {
if (rates[i].region_id === feature.properties.region_id) {
+ var totalIssues = 0;
+ for(var issue in rates[i].labels){
+ totalIssues += rates[i].labels[issue];
+ }
+
+ var significantData = rates[i].rate > .15;
+ var fillColor = significantData ? getColor(1000.0 * totalIssues/rates[i].completed_distance_m) : '#888';
+ var fillOpacity = significantData ? 0.25 + (0.5 * totalIssues/rates[i].completed_distance_m) : .25;
return {
color: '#888',
weight: 1,
opacity: 0.25,
- fillColor: getColor(100.0 * rates[i].rate),
- fillOpacity: 0.25 + (0.5 * rates[i].rate)
+ //fillColor: getColor(100.0 * rates[i].rate),
+ //fillOpacity: 0.25 + (0.5 * rates[i].rate)
+ fillColor: fillColor,
+ fillOpacity: fillOpacity
}
}
}
| 3 |
diff --git a/examples/extensions-collection/sentinel-1-example/sentinel-1-example.json b/examples/extensions-collection/sentinel-1-example/sentinel-1-example.json {
"type": "Feature",
"stac_version": "1.0.0-beta.2",
+ "stac_extensions": [
+ "sar",
+ "sat",
+ "file"
+ ],
"id": "sentinel-1-example",
"properties": {
"datetime": "2018-11-03T23:58:55.617217Z",
| 0 |
diff --git a/KeycloakDemo/keycloak/keycloak-data/data/h2/keycloakdb.mv.db b/KeycloakDemo/keycloak/keycloak-data/data/h2/keycloakdb.mv.db Binary files a/KeycloakDemo/keycloak/keycloak-data/data/h2/keycloakdb.mv.db and b/KeycloakDemo/keycloak/keycloak-data/data/h2/keycloakdb.mv.db differ
| 4 |
diff --git a/lambda/fulfillment/lib/middleware/lex.js b/lambda/fulfillment/lib/middleware/lex.js @@ -134,9 +134,6 @@ function slackifyResponse(response) {
console.log("Converted markdown: ", JSON.stringify(md));
}
console.log("Converting Slack message javascript string to utf8 (for multi-byte compatibility).");
- let txt = response.message;
- txt = utf8.encode(txt); // encode as utf8
- response.message = txt;
return response;
}
| 3 |
diff --git a/assets/src/components/mybooks/MyBooks.test.jsx b/assets/src/components/mybooks/MyBooks.test.jsx import React from 'react';
-import { render, waitForElement } from '@testing-library/react';
+import { waitForElement } from '@testing-library/react';
import { getMyBooks, getWaitlistBooks } from '../../services/BookService';
import { someBookWithACopyFromMe } from '../../../test/booksHelper';
+import { renderWithRouter as render } from '../../../test/renderWithRouter';
import MyBooks from './MyBooks';
jest.mock('../../services/BookService');
| 1 |
diff --git a/includes/Context.php b/includes/Context.php @@ -160,7 +160,7 @@ final class Context {
* @return string Reference site URL.
*/
public function get_reference_site_url() {
- return untrailingslashit( $this->filter_reference_url() );
+ return $this->filter_reference_url();
}
/**
@@ -368,7 +368,7 @@ final class Context {
* @return string URL that starts with the reference site URL.
*/
private function filter_reference_url( $url = '' ) {
- $orig_site_url = home_url();
+ $orig_site_url = untrailingslashit( home_url() );
$site_url = $orig_site_url;
/**
@@ -386,6 +386,8 @@ final class Context {
// Ensure this is not empty.
if ( empty( $site_url ) ) {
$site_url = $orig_site_url;
+ } else {
+ $site_url = untrailingslashit( $site_url );
}
// If no URL given, just return the reference site URL.
| 1 |
diff --git a/src/sections/disease/Ontology/OntologySubgraph.js b/src/sections/disease/Ontology/OntologySubgraph.js @@ -174,7 +174,7 @@ function OntologySubgraph({
fill="#5a5f5f"
>
<title>{node.data.name}</title>
- {textWithEllipsis(node.data.name, textLimit)}
+ {textWithEllipsis(node.data.name || 'No name', textLimit)}
</text>
<Link to={`/disease/${node.data.id}`}>
{node.data.parentIds.length === 0 ? (
| 9 |
diff --git a/src/core/operations/Hash.js b/src/core/operations/Hash.js @@ -240,6 +240,7 @@ const Hash = {
output = "MD2: " + Hash.runMD2(input, []) +
"\nMD4: " + Hash.runMD4(input, []) +
"\nMD5: " + Hash.runMD5(input, []) +
+ "\nMD6: " + Hash.runMD6(input, []) +
"\nSHA0: " + Hash.runSHA0(input, []) +
"\nSHA1: " + Hash.runSHA1(input, []) +
"\nSHA2 224: " + Hash.runSHA224(input, []) +
| 0 |
diff --git a/SECURITY.md b/SECURITY.md # Reporting a Vulnerability
-If you discover a security vulnerability within axios, please submit a report via [huntr.dev](https://huntr.dev/bounties/?target=https%3A%2F%2Fgithub.com%2Faxios%2Faxios). Bounties and CVEs are automatically managed and allocated via the platform.
+If you discover a security vulnerability in axios please disclose it via [our huntr page](https://huntr.dev/repos/axios/axios/). Bounty eligibility, CVE assignment, response times and past reports are all there.
-All security vulnerabilities will be promptly addressed.
+
+Thank you for improving the security of axios.
| 3 |
diff --git a/packages/neutrine/src/layout/toolbar/index.js b/packages/neutrine/src/layout/toolbar/index.js @@ -29,9 +29,9 @@ ToolbarWrapper.defaultProps = {
export const Toolbar = function (props) {
//Sidebar base class styles
let classList = [baseClass];
- //Check the toolbar color
- if (props.color === "light" || props.color === "dark") {
- classList.push(baseClass + "--" + props.color);
+ //Check the toolbar theme color
+ if (props.theme === "light" || props.theme === "dark") {
+ classList.push(baseClass + "--" + props.theme);
}
//Build toolbar props
let toolbarProps = {
@@ -44,7 +44,7 @@ export const Toolbar = function (props) {
//Toolbar default props
Toolbar.defaultProps = {
- "color": "light"
+ "theme": "light"
};
//Toolbar toggle
| 10 |
diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -39,44 +39,40 @@ commands:
command: |
cd && touch $BASH_ENV
- if [ "${CIRCLE_BRANCH}" == "master" ]; then
- echo 'export INFRA_PATH=iac/conf/websites/prod/lunie.io' >> $BASH_ENV
- echo 'export DEPLOYMENT_ENV=lunie.io' >> $BASH_ENV
- echo 'export GIT_BRANCH=${CIRCLE_BRANCH}' >> $BASH_ENV
+ if [ "${CIRCLE_BRANCH}" = "master" ]; then
+ echo 'export DISTRIBUTION_ID=E3NNXI2PHNC362' >> $BASH_ENV
+ echo 'export DIST_ID_TESTNET=E27N83VZ9QZFET' >> $BASH_ENV
+
+ echo 'export BUCKET_NAME=lunie.io' >> $BASH_ENV
+ echo 'export BUCKET_NAME_TESTNET=test.lunie.io ' >> $BASH_ENV
else
- echo 'export INFRA_PATH=iac/conf/websites/dev/beta.lunie.io' >> $BASH_ENV
- echo 'export DEPLOYMENT_ENV=beta.lunie.io' >> $BASH_ENV
- echo 'export GIT_BRANCH=${CIRCLE_BRANCH}' >> $BASH_ENV
+ echo 'export DISTRIBUTION_ID=E1KBKFOGFYCD32' >> $BASH_ENV
+ echo 'export BUCKET_NAME=staging.lunie.io' >> $BASH_ENV
fi
- - run:
- name: Set the terragrunt iam role
- command: |
- source $BASH_ENV
- echo "role_arn = `chamber read $DEPLOYMENT_ENV terragrunt_iam_role -q`" >> /root/.aws/config
- - run:
- name: Run terraform plan
- command: |
- source $BASH_ENV
- git clone [email protected]:tendermint/devops.git && cd devops
- git checkout $GIT_BRANCH
- cd $INFRA_PATH
- terragrunt plan
- terragrunt output -json > ~/project/terraform_output
- run:
name: Sync dist folder to s3 bucket
command: |
- export BUCKET_NAME=`cat terraform_output | jq --raw-output '.website_s3_bucket.value'`
+ source $BASH_ENV
cd << parameters.dist_path >>
+
echo "deployment job ID = $CIRCLE_BUILD_NUM<br>" >> version.html
echo "deployment job URL = $CIRCLE_BUILD_URL<br>" >> version.html
- chamber exec $DEPLOYMENT_ENV -- aws s3 sync . s3://$BUCKET_NAME --profile terraform --delete
+
+ aws s3 sync . s3://$BUCKET_NAME --delete
+
+ if [[ ! -z "${BUCKET_NAME_TESTNET}" ]]; then
+ aws s3 sync . s3://$BUCKET_NAME_TESTNET --delete
+ fi
- run:
name: Invalidate the cloudfront distribution
command: |
- export DISTRIBUTION_ID=`cat terraform_output | jq --raw-output '.distribution_id.value'`
- chamber exec $DEPLOYMENT_ENV -- aws cloudfront create-invalidation --distribution-id $DISTRIBUTION_ID \
- --profile terraform \
- --path "/*"
+ source $BASH_ENV
+
+ aws cloudfront create-invalidation --distribution-id $DISTRIBUTION_ID --path "/*"
+
+ if [[ ! -z "$DIST_ID_TESTNET" ]]; then
+ aws cloudfront create-invalidation --distribution-id $DIST_ID_TESTNET --path "/*"
+ fi
# a reusable executor
executors:
@@ -111,7 +107,7 @@ jobs:
- run: |
mkdir -p app/dist
- if [ "${CIRCLE_BRANCH}" == "master" ]; then
+ if [ "${CIRCLE_BRANCH}" = "master" ]; then
STARGATE=https://stargate.cosmos.network RPC=https://rpc.cosmos.network CIRCLECI=true yarn build:ui
else
CIRCLECI=true yarn build:ui
| 3 |
diff --git a/token-metadata/0xcd453276f4db9c38855056a036C4A99A8cac7b8d/metadata.json b/token-metadata/0xcd453276f4db9c38855056a036C4A99A8cac7b8d/metadata.json "symbol": "YKZ",
"address": "0xcd453276f4db9c38855056a036C4A99A8cac7b8d",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/packages/rmw-shell/cra-template-rmw/template/continuous_deployment/bs.js b/packages/rmw-shell/cra-template-rmw/template/continuous_deployment/bs.js @@ -7,25 +7,25 @@ var test = require('./bs_test.js')
// Input capabilities
var iPhone = {
browserName: 'iPhone',
- device: 'iPhone 7',
+ device: 'iPhone 12',
realMobile: 'true',
- os_version: '10.3',
+ os_version: '14.0',
'browserstack.user': process.argv[2],
'browserstack.key': process.argv[3],
}
var android = {
browserName: 'android',
- device: 'Samsung Galaxy S8',
+ device: 'Samsung Galaxy S20',
realMobile: 'true',
- os_version: '7.0',
+ os_version: '10.0',
'browserstack.user': process.argv[2],
'browserstack.key': process.argv[3],
}
var desktopFF = {
browserName: 'Firefox',
- browser_version: '59.0',
+ browser_version: '85.0',
os: 'Windows',
os_version: '10',
resolution: '1024x768',
@@ -35,7 +35,7 @@ var desktopFF = {
var desktopEdge = {
browserName: 'Edge',
- browser_version: '16.0',
+ browser_version: '88.0',
os: 'Windows',
os_version: '10',
resolution: '1024x768',
@@ -45,7 +45,7 @@ var desktopEdge = {
var desktopIE = {
browserName: 'Chrome',
- browser_version: '69.0',
+ browser_version: '88.0',
os: 'Windows',
os_version: '10',
resolution: '1024x768',
| 3 |
diff --git a/src/reducers/account/index.js b/src/reducers/account/index.js @@ -57,7 +57,7 @@ const globalAlertReducer = handleActions({
globalAlert: ready ? {
success: !error,
errorMessage: (error && payload && payload.toString()) || undefined,
- messageCode: error ? payload.messageCode || meta.errorCode || payload.id : meta.successCode,
+ messageCode: error ? `errors.ledger.${payload.type}` || payload.messageCode || meta.errorCode || payload.id : meta.successCode,
data: {
...meta.data,
...payload
| 9 |
diff --git a/lib/global-admin/addon/components/cru-cloud-credential/template.hbs b/lib/global-admin/addon/components/cru-cloud-credential/template.hbs {{/unless}}
<hr />
- {{form-name-description
- model=primaryResource
- nameDisabled=originalModel
- namePlaceholder="modalAddCloudKey.name.placeholder"
- descriptionPlaceholder="modalAddCloudKey.description.placeholder"
- }}
+ <FormNameDescription
+ @model={{primaryResource}}
+ @namePlaceholder="modalAddCloudKey.name.placeholder"
+ @descriptionPlaceholder="modalAddCloudKey.description.placeholder"
+ />
<div class="row">
<div class="col span-6">
| 11 |
diff --git a/core/command/report.js b/core/command/report.js var path = require('path');
var chalk = require('chalk');
-var junitWriter = new (require('junitwriter'))();
var allSettled = require('../util/allSettled');
var fs = require('../util/fs');
@@ -59,6 +58,7 @@ function writeBrowserReport (config, reporter) {
function writeJunitReport (config, reporter) {
logger.log('Writing jUnit Report');
+ var junitWriter = new (require('junitwriter'))();
var testSuite = junitWriter.addTestsuite(reporter.testSuite);
for (var i in reporter.tests) {
| 3 |
diff --git a/tooling/rollup/rollup-plugin-manifest.js b/tooling/rollup/rollup-plugin-manifest.js * @return {Object}
*/
export default function (config) {
+ if (!config) {
+ config = {};
+ }
const manifest = {
files: [],
entries: {},
};
- const trimPrefix = (config && config.trimPrefix) || /^.*[/]/;
+ const trimPrefix = config.trimPrefix || /^.*[/]/;
return {
name: 'manifest',
generateBundle(options, bundle) {
@@ -36,9 +39,9 @@ export default function (config) {
this.emitFile({
type: 'asset',
- fileName: options.compact
- ? 'manifest.min.json'
- : 'manifest.json',
+ fileName:
+ config.output ||
+ (options.compact ? 'manifest.min.json' : 'manifest.json'),
source: JSON.stringify(manifest, null, 2),
});
},
| 11 |
diff --git a/src/technologies/p.json b/src/technologies/p.json 87,
89
],
- "description": "Polylang is a WordPress plugin which allows you to create a bilingual or multilingual WordPress site.",
+ "description": "Polylang is a WordPress plugin which allows you to create multilingual WordPress site.",
"dom": "img[src*='/wp-content/plugins/polylang/']",
+ "cookies": {
+ "pll_language": ""
+ },
+ "headers": {
+ "x-redirected-by" : "(Polylang)(\\s[a-zA-Z]*)*"
+ },
"icon": "Polylang.svg",
"oss": true,
"requires": "WordPress",
- "website": "https://github.com/polylang/polylang"
+ "website": "https://polylang.pro"
},
"Polymer": {
"cats": [
| 7 |
diff --git a/models/import.js b/models/import.js @@ -128,8 +128,8 @@ class TrelloCreator {
name: String,
checkItems: [Match.ObjectIncluding({
state: String,
- name: String
- })]
+ name: String,
+ })],
})]);
}
@@ -387,7 +387,7 @@ class TrelloCreator {
const checklistToCreate = {
cardId: this.cards[checklist.idCard],
title: checklist.name,
- createdAt: this._now()
+ createdAt: this._now(),
};
const checklistId = Checklists.direct.insert(checklistToCreate);
// Now add the items to the checklist
@@ -396,7 +396,7 @@ class TrelloCreator {
itemsToCreate.push({
_id: checklistId + itemsToCreate.length,
title: item.name,
- isFinished: item.state == 'complete'
+ isFinished: item.state === 'complete',
});
});
Checklists.direct.update(checklistId, {$set: {items: itemsToCreate}});
| 1 |
diff --git a/lib/assets/javascripts/new-dashboard/pages/Home/WelcomeSection/Welcome.vue b/lib/assets/javascripts/new-dashboard/pages/Home/WelcomeSection/Welcome.vue @@ -93,10 +93,3 @@ export default {
}
};
</script>
-<style scoped lang="scss">
-@import 'new-dashboard/styles/variables';
-
-.welcome-section.is-user-notification {
- margin-top: $notification-warning__height;
-}
-</style>
\ No newline at end of file
| 2 |
diff --git a/.gitignore b/.gitignore .idea
node_modules
+
src/Aethcord/plugins/stylemanager/styles
!src/Aethcord/plugins/stylemanager/styles/codeblocks.css
!src/Aethcord/plugins/stylemanager/styles/spotifyModal.css
+
+config.json
\ No newline at end of file
| 8 |
diff --git a/src/server/middlewares/password-reset.js b/src/server/middlewares/password-reset.js module.exports = (crowi, app) => {
- // const { configManager } = crowi;
- // when disabled
- // if (!configManager.getConfig('crowi', 'promster:isEnabled')) {
- // return (req, res, next) => next();
- // }
-
- // const { createMiddleware } = require('@promster/express');
- // return createMiddleware({ app });
- console.log('middleware');
- return (req, res, next) => next();
+ return (req, res, next) => {
+ // check the oneTimeToken is valid
+ if (req.token == null /* || token.isExpired() */) {
+ return res.redirect('/login');
+ }
+ return next();
+ };
};
| 7 |
diff --git a/generators/client/templates/angularjs/src/test/javascript/spec/app/account/settings/_settings.controller.spec.js b/generators/client/templates/angularjs/src/test/javascript/spec/app/account/settings/_settings.controller.spec.js @@ -35,8 +35,7 @@ describe('Controller Tests', function() {
activated: true,
email: "[email protected]",
langKey: "<%= nativeLanguage %>",
- login: "john",
- imageUrl: "http://placehold.it/50x50"
+ login: "john"
};
MockPrincipal.identity.and.returnValue($q.resolve(accountValues));
MockAuth.updateAccount.and.returnValue($q.resolve());
| 2 |
diff --git a/apps/numberchaser/metadata.json b/apps/numberchaser/metadata.json "version":"0.01",
"description": "A number guessing game, but the number goes up or down based on if you're guessing too high or too low.",
"icon": "numberchaser.png",
- "tags": "games",
+ "tags": "game,fun"
"supports": ["BANGLEJS","BANGLEJS2"],
"storage": [
{"name":"numberchaser.app.js","url":"app.js"},
| 3 |
diff --git a/db/migrate/20180727174523_create_oauth_authorizations.rb b/db/migrate/20180727174523_create_oauth_authorizations.rb @@ -7,8 +7,8 @@ migration(
create_table :oauth_access_tokens do
Uuid :id, primary_key: true, default: 'uuid_generate_v4()'.lit
foreign_key :oauth_app_user_id, :oauth_app_users, type: :uuid, null: false, index: true, on_delete: :cascade
- foreign_key :api_key_id, :api_keys, type: :uuid, null: true, on_delete: :restrict,
- index: { where: 'api_key_id IS NOT NULL', unique: true }
+ foreign_key :api_key_id, :api_keys, type: :uuid, null: false, on_delete: :restrict,
+ index: { unique: true }
column :scopes, 'text[]', null: false, default: "'{}'".lit
DateTime :created_at, null: false, default: Sequel::CURRENT_TIMESTAMP
end
@@ -17,7 +17,7 @@ migration(
Uuid :id, primary_key: true, default: 'uuid_generate_v4()'.lit
foreign_key :oauth_app_user_id, :oauth_app_users, type: :uuid, null: false, index: true, on_delete: :cascade
column :scopes, 'text[]', null: false, default: "'{}'".lit
- String :code, null: true, index: { where: 'code IS NOT NULL' }
+ String :code, null: false, index: { unique: true }
String :redirect_uri, null: true
DateTime :created_at, null: false, default: Sequel::CURRENT_TIMESTAMP
end
| 2 |
diff --git a/src/styles/schema-styles.js b/src/styles/schema-styles.js @@ -25,6 +25,8 @@ export default css`
overflow:hidden;
}
+.expanded-descr .more-content { display:none; }
+
.key-descr {
font-family:var(--font-regular);
color:var(--light-fg);
| 7 |
diff --git a/manager/src/backend/internal/ssl.js b/manager/src/backend/internal/ssl.js @@ -39,11 +39,14 @@ const internalSsl = {
// This host is due to expire in 1 day, time to renew
logger.info('Host ' + host.hostname + ' is due for SSL renewal');
- internalSsl.configureSsl(host)
+ internalSsl.renewSsl(host)
.then(() => {
- return internalNginx.generateConfig(host);
+ // Certificate was requested ok, update the timestamp on the host
+ db.hosts.update({_id: host._id}, {ssl_expires: timestamp.now('+90d')}, {
+ multi: false,
+ upsert: false
+ });
})
- .then(internalNginx.reload)
.then(next)
.catch(err => {
logger.error(err);
@@ -88,6 +91,20 @@ const internalSsl = {
});
},
+ /**
+ * @param {Object} host
+ * @returns {Promise}
+ */
+ renewSsl: host => {
+ logger.info('Renewing SSL certificates for ' + host.hostname);
+
+ return utils.exec('/usr/bin/letsencrypt renew --force-renewal --disable-hook-validation --cert-name "' + host.hostname + '"')
+ .then(result => {
+ logger.info(result);
+ return result;
+ });
+ },
+
/**
* @param {Object} host
* @returns {Promise}
| 4 |
diff --git a/new-client/src/plugins/search/search.js b/new-client/src/plugins/search/search.js @@ -18,7 +18,7 @@ import { Tooltip } from "@material-ui/core";
import IconButton from "@material-ui/core/IconButton";
import MenuIcon from "@material-ui/icons/Menu";
-import { CircularProgress, Divider, InputBase, Paper } from "@material-ui/core";
+import { CircularProgress, InputBase, Paper } from "@material-ui/core";
import SearchIcon from "@material-ui/icons/Search";
import ClearIcon from "@material-ui/icons/Clear";
@@ -155,10 +155,6 @@ const styles = theme => {
},
iconButton: {
padding: 10
- },
- divider: {
- height: 28,
- margin: 4
}
};
};
@@ -388,7 +384,6 @@ class Search extends React.PureComponent {
))}
</IconButton>
</Tooltip>
- <Divider className={classes.divider} orientation="vertical" />
<SpatialSearchMenu
onToolChanged={toolType => {
this.setState({
| 5 |
diff --git a/mobile/components/Message/index.js b/mobile/components/Message/index.js @@ -67,8 +67,8 @@ const Message = ({
return (
<TouchableOpacity onPress={onPress}>
<Bubble me={me}>
- {/* $FlowIssue */}
{message.parent ? (
+ /* $FlowIssue */
<QuotedMessage message={message.parent} />
) : null}
<TextWrapper>
| 5 |
diff --git a/lib/assets/core/locale/en.json b/lib/assets/core/locale/en.json "cartocss-applied": {
"title": "CARTOCSS APPLIED",
"body": "You just applied styles with CartoCSS editor. You can continue or clear all styles.",
- "accept": "CONTINUE",
- "cancel": "CLEAR"
+ "continue": "CONTINUE",
+ "clear": "CLEAR"
},
"layer-hidden": {
"title": "LAYER HIDDEN",
"torque-exists": {
"title": "TORQUE LAYER",
"body": "There is already a torque layer in the layers collection. If you continue, this layer will get the default style.",
- "accept": "CONTINUE",
+ "continue": "CONTINUE",
"cancel": "CANCEL"
},
},
| 1 |
diff --git a/core/server/api/canary/webhooks.js b/core/server/api/canary/webhooks.js const models = require('../../models');
-const i18n = require('../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
const errors = require('@tryghost/errors');
const getWebhooksServiceInstance = require('../../services/webhooks/webhooks-service');
+const messages = {
+ resourceNotFound: '{resource} not found.',
+ noPermissionToEdit: {
+ message: 'You do not have permission to {method} this webhook.',
+ context: 'You may only {method} webhooks that belong to the authenticated integration. Check the supplied Admin API Key.'
+ }
+};
+
const webhooksService = getWebhooksServiceInstance({
WebhookModel: models.Webhook
});
@@ -32,7 +40,7 @@ module.exports = {
.then((webhook) => {
if (!webhook) {
throw new errors.NotFoundError({
- message: i18n.t('errors.api.resource.resourceNotFound', {
+ message: tpl(messages.resourceNotFound, {
resource: 'Webhook'
})
});
@@ -40,10 +48,10 @@ module.exports = {
if (webhook.get('integration_id') !== frame.options.context.integration.id) {
throw new errors.NoPermissionError({
- message: i18n.t('errors.api.webhooks.noPermissionToEdit.message', {
+ message: tpl(messages.noPermissionToEdit.message, {
method: 'edit'
}),
- context: i18n.t('errors.api.webhooks.noPermissionToEdit.context', {
+ context: tpl(messages.noPermissionToEdit.context, {
method: 'edit'
})
});
@@ -73,7 +81,7 @@ module.exports = {
return models.Webhook.edit(data.webhooks[0], Object.assign(options, {require: true}))
.catch(models.Webhook.NotFoundError, () => {
throw new errors.NotFoundError({
- message: i18n.t('errors.api.resource.resourceNotFound', {
+ message: tpl(messages.resourceNotFound, {
resource: 'Webhook'
})
});
@@ -101,7 +109,7 @@ module.exports = {
.then((webhook) => {
if (!webhook) {
throw new errors.NotFoundError({
- message: i18n.t('errors.api.resource.resourceNotFound', {
+ message: tpl(messages.resourceNotFound, {
resource: 'Webhook'
})
});
@@ -109,10 +117,10 @@ module.exports = {
if (webhook.get('integration_id') !== frame.options.context.integration.id) {
throw new errors.NoPermissionError({
- message: i18n.t('errors.api.webhooks.noPermissionToEdit.message', {
+ message: tpl(messages.noPermissionToEdit.message, {
method: 'destroy'
}),
- context: i18n.t('errors.api.webhooks.noPermissionToEdit.context', {
+ context: tpl(messages.noPermissionToEdit.context, {
method: 'destroy'
})
});
@@ -128,7 +136,7 @@ module.exports = {
.then(() => null)
.catch(models.Webhook.NotFoundError, () => {
return Promise.reject(new errors.NotFoundError({
- message: i18n.t('errors.api.resource.resourceNotFound', {
+ message: tpl(messages.resourceNotFound, {
resource: 'Webhook'
})
}));
| 14 |
diff --git a/website/lexonomy.py b/website/lexonomy.py @@ -466,9 +466,10 @@ def check_login():
if request.forms.email != "" and request.forms.password != "":
res = ops.login(request.forms.email, request.forms.password)
if res["success"]:
- print(res)
- response.set_cookie("email", res["email"], path="/")
- response.set_cookie("sessionkey", res["key"], path="/")
+ #response.set_cookie("email", res["email"], path="/")
+ #response.set_cookie("sessionkey", res["key"], path="/")
+ response.add_header('Set-Cookie', "email="+res["email"]+"; Path=/; SameSite=None; Secure")
+ response.add_header('Set-Cookie', "sessionkey="+res["key"]+"; Path=/; SameSite=None; Secure")
return {"success": True, "email": res["email"], "sessionkey": res["key"], "ske_username": res["ske_username"], "ske_apiKey": res["ske_apiKey"], "apiKey": res["apiKey"], "consent": res["consent"]}
if request.cookies.email != "" and request.cookies.sessionkey != "":
res = ops.verifyLogin(request.cookies.email, request.cookies.sessionkey)
| 12 |
diff --git a/deepfence_ui/app/scripts/components/vulnerability-view/registry-scan/image-list.js b/deepfence_ui/app/scripts/components/vulnerability-view/registry-scan/image-list.js @@ -275,15 +275,11 @@ class RegistryImageList extends React.PureComponent {
renderSubComponent(rowInfo) {
const imageTags = rowInfo.row.original.tags;
- let showPagination = false;
- if(rowInfo.row.original.total_tags > 15) {
- showPagination = true;
- }
return (
<DfTableV2
data={imageTags}
defaultPageSize={15}
- showPagination={showPagination}
+ showPagination
columns={[
{
Header: 'Pushed at',
@@ -412,15 +408,11 @@ class RegistryImageList extends React.PureComponent {
isToasterVisible,
initiatedByPollableIm = Map(),
} = this.props;
- let pagination = false;
const data = registryIndexIm.getIn([registryType, registryId], []);
const initiatedByPollable = initiatedByPollableIm.getIn(
[registryType, registryId],
false
);
- if(data.length > 15) {
- pagination = true;
- }
const loading =
loadingIm.getIn([registryType, registryId], false) &&
!initiatedByPollable;
@@ -454,7 +446,7 @@ class RegistryImageList extends React.PureComponent {
</div>
<DfTableV2
data={data}
- showPagination={pagination}
+ showPagination
onPageChange={this.handlePageChange}
// manual
totalRows={data.length}
| 13 |
diff --git a/src/renderer/redux/reducers/navigation.js b/src/renderer/redux/reducers/navigation.js @@ -3,7 +3,7 @@ import * as ACTIONS from 'constants/action_types';
const getCurrentPath = () => {
const { hash } = document.location;
if (hash !== '') return hash.replace(/^#/, '');
- return '/publish';
+ return '/discover';
};
const reducers = {};
| 12 |
diff --git a/shared/scss/_tracker-network-icons.scss b/shared/scss/_tracker-network-icons.scss /* Tracker Network Icons */
-$icons: ("adobe", "adtech", "amazon", "aol", "appnexus", "casale", "chartbeat", "comscore", "criteo", "facebook", "fox", "generic", "google", "mixpanel", "moat", "newrelic", "nielsen", "openx", "outbrain", "quantcast", "salesforce", "taboola", "twitter", "yahoo", "yandex");
+$icons: ("adobe", "adtech", "amazon", "aol", "appnexus", "chartbeat", "comscore", "facebook", "fox", "generic", "google", "mixpanel", "moat", "nielsen", "outbrain", "quantcast", "taboola", "twitter", "yahoo", "yandex");
@mixin tracker_network_icons () {
| 2 |
diff --git a/src/easeljs/filters/DisplacementFilter.js b/src/easeljs/filters/DisplacementFilter.js @@ -96,14 +96,9 @@ this.createjs = this.createjs||{};
"uniform vec2 pixelAdjustment;" +
"void main(void) {" +
- "vec4 dispSample = texture2D(" +
- "uDudvSampler, " +
- "vTextureCoord" +
- ");" +
- "gl_FragColor = texture2D(" +
- "uSampler, " +
- "vTextureCoord + (dispSample.xy-0.5)*fPower*pixelAdjustment" +
- ");" +
+ "vec4 dudvValue = texture2D(uDudvSampler, vTextureCoord);" +
+ "vec2 sampleOffset = mix(vec2(0.0), dudvValue.rg-0.5, dudvValue.a) * (fPower*pixelAdjustment);" +
+ "gl_FragColor = texture2D(uSampler, vTextureCoord + sampleOffset);" +
"}"
);
@@ -167,13 +162,14 @@ this.createjs = this.createjs||{};
for (var i=0; i<height; i++) {
offset = i * width;
- dudvOffset = ((i*(width/dudvWidth)) * dudvWidth) |0;
+ dudvOffset = ((i*(dudvHeight/height))|0) * dudvWidth;
for (var j=0; j<width; j++) {
pixel = (offset + j) *4;
- dudvPixel = (dudvOffset + ((j*(height/dudvHeight)) |0) )*4;
+ dudvPixel = (dudvOffset + ((j*(dudvWidth/width)) |0) ) *4;
- var xDelta = (((dudvPixels[dudvPixel] - 128)/128)*this.distance) |0;
- var yDelta = (((dudvPixels[dudvPixel+1] - 128)/128)*this.distance) |0;
+ var deltaPower = dudvPixels[dudvPixel+3] / 255;
+ var xDelta = ((((dudvPixels[dudvPixel] - 128)/128) * deltaPower) * this.distance) |0;
+ var yDelta = ((((dudvPixels[dudvPixel+1] - 128)/128) * deltaPower) * this.distance |0);
if (j+xDelta < 0) { xDelta = -j; }
if (j+xDelta > width) { xDelta = width-j; }
| 7 |
diff --git a/src/plugins/animation.js b/src/plugins/animation.js +import _ from 'lodash'
+
export default function() {
return function({ addBase, addUtilities, e, theme, variants }) {
const keyframesConfig = theme('keyframes')
- const keyframesStyles = Object.fromEntries(
- Object.entries(keyframesConfig).map(([name, keyframes]) => {
+ const keyframesStyles = _.fromPairs(
+ _.toPairs(keyframesConfig).map(([name, keyframes]) => {
return [`@keyframes ${name}`, keyframes]
})
)
addBase(keyframesStyles)
const animationConfig = theme('animation')
- const utilities = Object.fromEntries(
- Object.entries(animationConfig).map(([suffix, animation]) => {
+ const utilities = _.fromPairs(
+ _.toPairs(animationConfig).map(([suffix, animation]) => {
return [
`.${e(`animate-${suffix}`)}`,
{
| 14 |
diff --git a/local_modules/Wallets/Views/TransactionDetailsView.web.js b/local_modules/Wallets/Views/TransactionDetailsView.web.js @@ -260,82 +260,30 @@ class TransactionDetailsView extends View
details_containerLayer.appendChild(commonComponents_tables.New_separatorLayer())
}
{ // Transaction ID
- const div = commonComponents_tables.New_fieldContainerLayer()
- {
- const hash = transaction.hash
- const isTxHashNil = hash === null || typeof hash === 'undefined' || hash === ""
- { // left
- const labelLayer = commonComponents_tables.New_fieldTitle_labelLayer("Transaction ID")
- div.appendChild(labelLayer)
- }
- { // right
- const buttonLayer = commonComponents_tables.New_copyButton_aLayer(
- hash,
- isTxHashNil === false ? true : false,
- self.context.pasteboard
+ const fieldLabelTitle = "Transaction ID"
+ const value = transaction.hash
+ const valueToDisplayIfValueNil = "N/A"
+ const div = commonComponents_tables.New_copyable_longStringValueField_component_fieldContainerLayer(
+ fieldLabelTitle,
+ value,
+ self.context.pasteboard,
+ valueToDisplayIfValueNil
)
- buttonLayer.style.float = "right"
- div.appendChild(buttonLayer)
- }
- { // to put the tx hash on the next line in the UI to make way for the COPY button
- const clearingBreakLayer = document.createElement("br")
- clearingBreakLayer.clear = "both"
- div.appendChild(clearingBreakLayer)
- }
- const value = isTxHashNil === false ? hash : "N/A"
- const valueLayer = commonComponents_tables.New_fieldValue_labelLayer("" + value)
- { // special case
- valueLayer.style.float = "left"
- valueLayer.style.textAlign = "left"
- //
- valueLayer.style.width = "270px"
- //
- // valueLayer.style.webkitUserSelect = "all" // commenting for now as we have the COPY button
- }
- div.appendChild(valueLayer)
- }
- div.appendChild(commonComponents_tables.New_clearingBreakLayer()) // preserve height; better way?
details_containerLayer.appendChild(div)
}
{
details_containerLayer.appendChild(commonComponents_tables.New_separatorLayer())
}
{ // Payment ID
- const div = commonComponents_tables.New_fieldContainerLayer()
- {
- const payment_id = transaction.payment_id
- const isTxPaymentIDNil = typeof payment_id === 'undefined' || payment_id === null || payment_id === ""
- { // left
- const labelLayer = commonComponents_tables.New_fieldTitle_labelLayer("Payment ID")
- div.appendChild(labelLayer)
- }
- { // right
- const buttonLayer = commonComponents_tables.New_copyButton_aLayer(
- payment_id,
- isTxPaymentIDNil === false ? true : false,
- self.context.pasteboard
+ const fieldLabelTitle = "Payment ID"
+ const value = transaction.payment_id
+ const valueToDisplayIfValueNil = "N/A"
+ const div = commonComponents_tables.New_copyable_longStringValueField_component_fieldContainerLayer(
+ fieldLabelTitle,
+ value,
+ self.context.pasteboard,
+ valueToDisplayIfValueNil
)
- buttonLayer.style.float = "right"
- div.appendChild(buttonLayer)
- }
- { // to put the tx hash on the next line in the UI to make way for the COPY button
- const clearingBreakLayer = document.createElement("br")
- clearingBreakLayer.clear = "both"
- div.appendChild(clearingBreakLayer)
- }
- const value = isTxPaymentIDNil === false ? payment_id : "N/A"
- const valueLayer = commonComponents_tables.New_fieldValue_labelLayer("" + value)
- { // special case
- valueLayer.style.float = "left"
- valueLayer.style.textAlign = "left"
- //
- valueLayer.style.width = "270px"
- //
- // valueLayer.style.webkitUserSelect = "all" // commenting for now as we have the COPY button
- }
- div.appendChild(valueLayer)
- }
- div.appendChild(commonComponents_tables.New_clearingBreakLayer()) // preserve height; better way?
details_containerLayer.appendChild(div)
}
}
| 4 |
diff --git a/server/game/cards/08-MotC/LetterFromTheDaimyo.js b/server/game/cards/08-MotC/LetterFromTheDaimyo.js @@ -11,7 +11,7 @@ class LetterFromTheDaimyo extends DrawCard {
event.conflict.winner === context.source.parent.controller &&
event.conflict.conflictType === 'political'
},
- gameAction: AbilityDsl.actions.chosenDiscard(context => ({ target: context.player.opponent, amount: 2 }))
+ gameAction: AbilityDsl.actions.chosenDiscard({ amount: 2 })
});
}
| 2 |
diff --git a/api/src/config/dev.js b/api/src/config/dev.js module.exports = {
url: 'https://winds.getstream.io',
logger: { level: process.env.LOGGER_LEVEL || 'info' },
+ email: {
+ backend: 'not-sendgrid',
+ sender: { support: { email: '[email protected]' } },
+ },
};
| 11 |
diff --git a/checkfiles/checkfiles.py b/checkfiles/checkfiles.py @@ -718,9 +718,6 @@ def check_file(config, session, url, job):
if item['status'] != 'uploading':
errors['status_check'] = \
"status '{}' is not 'uploading'".format(item['status'])
- update_content_error(errors, 'Submitted file status was {} '.format(
- item['status']) +
- 'instead of \'uploading\'.')
if errors:
errors['gathered information'] = 'Gathered information about the file was: {}.'.format(
str(result))
| 2 |
diff --git a/src/slider.js b/src/slider.js @@ -91,7 +91,9 @@ export default class Slider extends React.Component {
if (settings === 'unslick') {
// if 'unslick' responsive breakpoint setting used, just return the <Slider> tag nested HTML
return (
- <div>{children}</div>
+ <div className={`${this.props.className} unslicked`}>
+ {children}
+ </div>
);
} else {
return (
| 0 |
diff --git a/src/events/http/HttpServer.js b/src/events/http/HttpServer.js @@ -802,6 +802,23 @@ export default class HttpServer {
} else if (integration === 'AWS_PROXY') {
/* LAMBDA PROXY INTEGRATION HAPIJS RESPONSE CONFIGURATION */
+ if (
+ endpoint.isHttpApi &&
+ endpoint.payload === '2.0' &&
+ (typeof result === 'string' || !result.statusCode)
+ ) {
+ const body =
+ typeof result === 'string' ? result : JSON.stringify(result)
+ result = {
+ isBase64Encoded: false,
+ statusCode: 200,
+ body,
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ }
+ }
+
if (result && !result.errorType) {
statusCode = result.statusCode || 200
} else {
@@ -828,18 +845,18 @@ export default class HttpServer {
debugLog('headers', headers)
- Object.keys(headers).forEach((header) => {
- if (header.toLowerCase() === 'set-cookie') {
- headers[header].forEach((headerValue) => {
+ const parseCookies = (headerValue) => {
const cookieName = headerValue.slice(0, headerValue.indexOf('='))
- const cookieValue = headerValue.slice(
- headerValue.indexOf('=') + 1,
- )
+ const cookieValue = headerValue.slice(headerValue.indexOf('=') + 1)
h.state(cookieName, cookieValue, {
encoding: 'none',
strictHeader: false,
})
- })
+ }
+
+ Object.keys(headers).forEach((header) => {
+ if (header.toLowerCase() === 'set-cookie') {
+ headers[header].forEach(parseCookies)
} else {
headers[header].forEach((headerValue) => {
// it looks like Hapi doesn't support multiple headers with the same name,
@@ -849,6 +866,14 @@ export default class HttpServer {
}
})
+ if (
+ endpoint.isHttpApi &&
+ endpoint.payload === '2.0' &&
+ result.cookies
+ ) {
+ result.cookies.forEach(parseCookies)
+ }
+
response.header('Content-Type', 'application/json', {
duplicate: false,
override: false,
| 9 |
diff --git a/src/components/TableBody.js b/src/components/TableBody.js @@ -170,7 +170,7 @@ class TableBody extends React.Component {
) : (
<TableBodyRow options={options}>
<TableBodyCell
- colSpan={options.selectableRows ? visibleColCnt + 1 : visibleColCnt}
+ colSpan={options.selectableRows || options.expandableRows ? visibleColCnt + 1 : visibleColCnt}
options={options}
colIndex={0}
rowIndex={0}>
| 1 |
diff --git a/build_filterNames.js b/build_filterNames.js @@ -122,19 +122,31 @@ function mergeConfig() {
if (rIndex[k]) return;
var obj = canonical[k];
-
- if (!obj) {
var parts = k.split('|', 2);
var tag = parts[0].split('/', 2);
var key = tag[0];
var value = tag[1];
var name = parts[1];
+ if (!obj) {
obj = { count: 0, tags: {} };
obj.tags.name = name;
obj.tags[key] = value;
}
+ // https://www.regular-expressions.info/unicode.html
+ if (/[\u0590-\u05FF]/.test(name)) { // Hebrew
+ obj.countryCodes = ['il'];
+ } else if (/[\u0E00-\u0E7F]/.test(name)) { // Thai
+ obj.countryCodes = ['th'];
+ } else if (/[\u1000-\u109F]/.test(name)) { // Myanmar
+ obj.countryCodes = ['mm'];
+ } else if (/[\u1700-\u171F]/.test(name)) { // Tagalog
+ obj.countryCodes = ['ph'];
+ } else if (/[\u3040-\u30FF]/.test(name)) { // Hirgana or Katakana
+ obj.countryCodes = ['jp'];
+ }
+
obj.count = keep[k];
obj.tags = sort(obj.tags);
| 12 |
diff --git a/packages/diffhtml/lib/node/patch.js b/packages/diffhtml/lib/node/patch.js @@ -69,7 +69,7 @@ const setAttribute = (vTree, domNode, name, value) => {
const noValue = value === null || value === undefined;
// If we cannot set the value as a property, try as an attribute.
- htmlElement.setAttribute(lowerName, noValue ? EMPTY.STR : value);
+ htmlElement.setAttribute(lowerName, noValue ? EMPTY.STR : (value === true ? '' : value));
}
// Support patching an object representation of the style object.
else if (isObject && lowerName === 'style') {
| 12 |
diff --git a/aleph/search/facet.py b/aleph/search/facet.py @@ -14,6 +14,8 @@ class Facet(object):
self.cardinality = self.extract(aggregations, '%s.cardinality' % name)
def extract(self, aggregations, name):
+ if aggregations is None:
+ return {}
data = aggregations.get('scoped', {}).get(name, {}).get(name)
return data or aggregations.get(name, {})
| 9 |
diff --git a/src/pages/apply/index.js b/src/pages/apply/index.js @@ -276,6 +276,7 @@ export default class extends Component {
this.populateApplications = this.populateApplications.bind(this)
this.createNewApplication = this.createNewApplication.bind(this)
+ this.resetApplication = this.resetApplication.bind(this)
}
createNewApplication(firstTime = false) {
@@ -293,6 +294,15 @@ export default class extends Component {
})
}
+ resetApplication() {
+ this.createNewApplication().then(app => {
+ this.setState({
+ status: 'finished',
+ app: app
+ })
+ })
+ }
+
populateApplications(application = null) {
if (application) {
this.setState({
@@ -366,14 +376,7 @@ export default class extends Component {
userId={userId}
authToken={authToken}
callback={this.populateApplications}
- resetCallback={() => {
- this.createNewApplication.then(app => {
- this.setState({
- status: 'finished',
- app: app
- })
- })
- }}
+ resetCallback={this.resetApplication}
/>
</Fragment>
)
| 1 |
diff --git a/src/parsers/linter/GmlLinterMFunc.hx b/src/parsers/linter/GmlLinterMFunc.hx @@ -106,14 +106,13 @@ class GmlLinterMFunc {
case Plain: {};
case Quoted: {
// it's a valid string, do we care
- q.pushSource("", mcArgContext);
+ q.pushSource('"`magic`"', mcArgContext);
};
case Magic: {
- var p0 = q.pos;
- q.pos = mfStart;
- q.pushSource(GmlExtMFunc.magicMap[ord.asArray()[1]](self.editor, q),
- 'magic[${ord.asArray()[1]}] in $mfName in $mcArgContext');
- q.pos = p0;
+ // note: doesn't pass valid reader state into magicMap handler,
+ // but that's OK for the time being
+ var mv = GmlExtMFunc.magicMap[ord.asArray()[1]](self.editor, q);
+ q.pushSource(mv, 'magic[${ord.asArray()[1]}] in $mfName in $mcArgContext');
};
case Pre, Post, PrePost: {
ai = ord.arg;
| 1 |
diff --git a/OurUmbraco.Site/Views/Partials/Community/Home.cshtml b/OurUmbraco.Site/Views/Partials/Community/Home.cshtml @@ -135,13 +135,21 @@ else
<div class="container">
<div class="row">
<div class="col-md-12">
- <h1 class="text-center">GitHub Contributors</h1>
+ <h1 class="text-center">Community GitHub Contributions</h1>
<p>
Contributions to Umbraco GitHub repositories
+ <small>
+ <a href="https://github.com/umbraco/Umbraco-CMS" target="_blank" title="Umbraco-CMS">Umbraco-CMS</a>,
+ <a href="https://github.com/umbraco/UmbracoDocs" target="_blank" title="UmbracoDocs">UmbracoDocs</a>,
+ <a href="https://github.com/umbraco/OurUmbraco" target="_blank" title="OurUmbraco">OurUmbraco</a>,
+ <a href="https://github.com/umbraco/Umbraco.Deploy.Contrib" target="_blank" title="Umbraco.Deploy.Contrib">Umbraco.Deploy.Contrib</a>,
+ <a href="https://github.com/umbraco/Umbraco.Courier.Contrib" target="_blank" title="Umbraco.Courier.Contrib">Umbraco.Courier.Contrib</a>,
+ <a href="https://github.com/umbraco/Umbraco.Deploy.ValueConnectors" target="_blank" title="Umbraco.Deploy.ValueConnectors">Umbraco.Deploy.ValueConnectors</a>
+ </small>
</p>
</div>
<div class="col-md-12">
- <small>Top GitHub contributors</small>
+ <small>GitHub contributors</small>
</div>
<div class="col-md-12 flex forum-thread" id="github-contributors">
| 3 |
diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js @@ -58,6 +58,10 @@ function parseOpts(options, resolvedTarget, projectRoot) {
if (options.argv.gradle || options.argv.studio)
ret.buildMethod = options.argv.studio ? 'studio' : 'gradle';
+ //This comes from cordova/run
+ if (options.studio) ret.buildMethod = 'studio';
+ if (options.gradle) ret.buildMethod = 'gradle';
+
if (options.nobuild) ret.buildMethod = 'none';
if (options.argv.versionCode)
@@ -148,6 +152,7 @@ module.exports.runClean = function(options) {
*/
module.exports.run = function(options, optResolvedTarget) {
var opts = parseOpts(options, optResolvedTarget, this.root);
+ console.log(opts.buildMethod);
var builder = builders.getBuilder(opts.buildMethod);
return builder.prepEnv(opts)
.then(function() {
| 1 |
diff --git a/articles/topics/guides/index.md b/articles/topics/guides/index.md @@ -22,7 +22,7 @@ useCase: development
</p>
</div>
-<%= include('../_includes/_topic-links', { links: [
+<%= include('../../_includes/_topic-links', { links: [
'architecture-scenarios',
'tokens',
'users',
| 1 |
diff --git a/src/components/general/map-gen/MapGen.jsx b/src/components/general/map-gen/MapGen.jsx @@ -3,6 +3,7 @@ import React, { useState, useEffect, useRef } from 'react';
// import classnames from 'classnames';
// import {world} from '../../../../world.js';
// import webaverse from '../../../../webaverse.js';
+import {registerKeyHandler, unregisterKeyHandler} from '../../../KeyHandlers.jsx';
import game from '../../../../game.js';
import cameraManager from '../../../../camera-manager.js';
import alea from '../../../../alea.js';
@@ -734,6 +735,11 @@ export const MapGen = ({
const [width, setWidth] = useState(window.innerWidth);
const [height, setHeight] = useState(window.innerHeight);
const [open, setOpen] = useState(false);
+ const [offset, setOffset] = useState({
+ x: 0,
+ y: 0,
+ });
+ const [mouseState, setMouseState] = useState(null);
const canvasRef = useRef();
useEffect(() => {
@@ -777,10 +783,76 @@ export const MapGen = ({
}
}, [canvasRef, open, width, height]);
+ function mouseDown(e) {
+ e.preventDefault();
+ e.stopPropagation();
+
+ setMouseState({
+ x: e.clientX,
+ y: e.clientY,
+ });
+ }
+ useEffect(() => {
+ function mouseMove(e) {
+ if (mouseState) {
+ const dx = e.clientX - mouseState.x;
+ const dy = e.clientY - mouseState.y;
+
+ setOffset({
+ x: offset.x + dx,
+ y: offset.y + dy,
+ });
+
+ setMouseState({
+ x: e.clientX,
+ y: e.clientY,
+ });
+ }
+ }
+ document.addEventListener('mousemove', mouseMove);
+ return () => {
+ document.removeEventListener('mousemove', mouseMove);
+ };
+ }, [mouseState]);
+ useEffect(() => {
+ function click(e) {
+ if (open) {
+ return false;
+ } else {
+ return true;
+ }
+ }
+ function mouseUp(e) {
+ if (open) {
+ setMouseState(null);
+ return false;
+ } else {
+ return true;
+ }
+ }
+ registerKeyHandler('click', click);
+ registerKeyHandler('mouseup', mouseUp);
+ return () => {
+ unregisterKeyHandler('click', click);
+ unregisterKeyHandler('mouseup', mouseUp);
+ };
+ }, [open]);
+
return (
<div className={styles.mapGen}>
- {open > 0 ? (
- <canvas width={width} height={height} className={styles.canvas} ref={canvasRef} />
+ {open ? (
+ <canvas
+ width={width}
+ height={height}
+ className={styles.canvas}
+ onMouseDown={mouseDown}
+ // onMouseMove={mouseMove}
+ // onClick={click}
+ style={{
+ transform: `translate3d(${offset.x}px, ${offset.y}px, 0)`,
+ }}
+ ref={canvasRef}
+ />
) : null}
</div>
| 0 |
diff --git a/package.json b/package.json "classnames": "^2.2.5",
"create-react-class": "^15.5.2",
"enquire.js": "^2.1.6",
- "json2mq": "^0.2.0"
+ "json2mq": "^0.2.0",
+ "resize-observer-polyfill": "^1.5.0"
},
"peerDependencies": {
"react": "^0.14.0 || ^15.0.1 || ^16.0.0",
| 0 |
diff --git a/closure/goog/streams/lite_test_cases.js b/closure/goog/streams/lite_test_cases.js @@ -268,13 +268,25 @@ class TestCases {
});
}
- testReleaseLock_WhileOutstandingReads() {
+ async testReleaseLock_WhileOutstandingReads() {
const {stream} = this.newReadableStreamWithController();
const reader = stream.getReader();
- reader.read();
- assertThrows(() => {
+ const readResult = reader.read();
+ // NOTE: Older browsers (i.e. Chrome < 106, Safari, Firefox) used to have
+ // releaseLock() immediately throw if a read is outstanding, but this is
+ // contrary to the spec. The spec requires that instead the releaseLock()
+ // call should succeed, but the promise returned from read() should
+ // immediately reject. The following structure checks for either behavior.
+ await assertRejects((async () => {
+ // Await a meaningless value to wait for a new microtask (ensuring
+ // synchronous throws are converted to a rejected promise instead).
+ await 0;
+ // In older browsers, this will throw synchronously. Chrome >= 106 does
+ // not throw here, but instead causes readResult to immediately reject.
reader.releaseLock();
- });
+ // This will only reject if readResult is already rejected.
+ await Promise.race([readResult, Promise.resolve()]);
+ })());
}
testReleaseLock_Released() {
| 1 |
diff --git a/src/drivers/webextension/images/icons/Gomag.svg b/src/drivers/webextension/images/icons/Gomag.svg <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M18.5846 13.6598C21.5385 13.6598 26.0923 13.6598 29.0462 13.6598C28.4308 19.6906 26.2154 25.106 21.5385 26.706C16.4923 28.4291 11.6923 27.4445 8.98463 24.2445C7.0154 21.906 6.89232 19.1983 6.89232 16.3675C6.89232 14.5214 6.89232 12.7983 6.76924 10.8291C6.52309 8.61369 5.16924 5.53677 3.69232 3.44446C6.89232 4.42907 10.4616 9.5983 11.0769 13.5368C11.4462 15.3829 11.5692 17.106 11.8154 18.9521C12.1846 21.7829 13.6616 23.506 16.3692 23.6291C19.4462 23.7522 22.0308 22.7675 22.8923 20.0598C23.1385 19.3214 23.2616 18.5829 23.5077 17.5983C21.6616 17.5983 19.9385 17.5983 17.9692 17.5983" fill="#E42226"/>
-<path d="M10.1144 7.52367L11.7294 5.69327C11.7295 5.69321 11.7296 5.69315 11.7296 5.69309C16.1317 0.802042 23.4666 0.298845 28.8642 2.61202L28.3361 4.72462L28.0265 5.96308L27.9272 6.36019L27.9003 6.46769C27.8924 6.46675 27.883 6.46557 27.872 6.4641C27.8153 6.45655 27.7162 6.44131 27.5474 6.41063C27.2098 6.34925 26.5952 6.22633 25.4877 5.98024C22.7095 5.36285 20.2353 5.57818 18.0227 6.75413C15.8412 7.91353 13.9195 10.0037 12.2113 13.1363C11.9523 11.5329 11.3843 10.1956 10.8747 9.25146C10.6122 8.76496 10.365 8.38258 10.1833 8.12163C10.0925 7.99115 10.018 7.89101 9.96609 7.82338C9.94343 7.79384 9.92509 7.77049 9.91157 7.75353L9.91247 7.75252L10.1144 7.52367Z" fill="white" stroke="#8B8A8A" stroke-width="0.1"/>
+<path d="M10.1144 7.52367L11.7294 5.69327C16.1315 0.802225 23.4666 0.298848 28.8642 2.61202L28.3361 4.72462L28.0265 5.96308L27.9272 6.36019L27.9003 6.46769C27.8924 6.46675 27.883 6.46557 27.872 6.4641C27.8153 6.45655 27.7162 6.44131 27.5474 6.41063C27.2098 6.34925 26.5952 6.22633 25.4877 5.98024C22.7095 5.36285 20.2353 5.57818 18.0227 6.75413C15.8412 7.91353 13.9195 10.0037 12.2113 13.1363C11.9523 11.5329 11.3843 10.1956 10.8747 9.25146C10.6122 8.76496 10.365 8.38258 10.1833 8.12163C10.0925 7.99115 10.018 7.89101 9.96608 7.82338C9.94342 7.79384 9.92508 7.77049 9.91156 7.75353L9.91246 7.75252L10.1144 7.52367Z" fill="white" stroke="#5F5A5A" stroke-width="0.5"/>
<path d="M18.0923 28.5522C19.9385 28.6753 21.4154 28.3061 22.8923 27.5676C23.1385 29.1676 22.7693 30.2753 21.1693 30.6446C19.6923 30.8907 18.5847 30.3984 18.0923 28.5522Z" fill="#E42226"/>
<path d="M15.5077 28.5522C13.6616 28.5522 12.1847 28.1829 10.8308 27.3214C10.4616 28.9214 10.8308 30.0291 12.3077 30.3983C13.7847 30.8906 15.0154 30.3983 15.5077 28.5522Z" fill="#E42226"/>
</svg>
| 7 |
diff --git a/protocols/swap/package.json b/protocols/swap/package.json "openzeppelin-solidity": "^v2.2",
"solidity-coverage": "^0.6.3",
"solidity-docgen": "0.3.0-beta.3",
- "truffle-flattener": "^1.4.0",
- "truffle": "^5.0.30"
+ "truffle-hdwallet-provider-privkey": "1.0.3",
}
}
| 2 |
diff --git a/gulpfile.js b/gulpfile.js @@ -160,7 +160,13 @@ gulp.task("i18n", function() {
locales.forEach(locale => {
let filepath = getLocalePath(locale);
let contents = fs.readFileSync(filepath, { encoding: "utf8" });
- let parsed = JSON.parse(contents);
+ let parsed;
+
+ try {
+ parsed = JSON.parse(contents)
+ } catch (exp) {
+ parsed = {};
+ }
if (!parsed.hasOwnProperty("__redirect__")) {
let lines = [];
| 7 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.