code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/local_modules/Exchange/Views/ExchangeContentView.web.js b/local_modules/Exchange/Views/ExchangeContentView.web.js @@ -264,14 +264,6 @@ class ExchangeContentView extends ListView {
self.emptyStateMessageContainerView = view
self.addSubview(view)
-
-
-
- // setInterval((context, options) => {
- // console.log(options);
- // console.log(self.context);
- // console.log(self.context.walletsListController);
- // }, 5000);
}
Balance_JSBigInt(wallet)
@@ -374,14 +366,6 @@ class ExchangeContentView extends ListView {
return displayString
}
-/**
- * let exchangeRate = document.getElementById('exchangeRate');
-
- exchangeRate.addEventListener('click', function() {
- const rateObj = await ExchangeFunctions.getRatesAndLimits();
- console.log(rateObj);
- })
-*/
Navigation_Title() {
return "Exchange"
}
@@ -409,24 +393,6 @@ class ExchangeContentView extends ListView {
}
}
-
- // view.layer.addEventListener(
- // "click",
- // function(e)
- // {
- // e.preventDefault()
- // //
- // let orderElement = document.getElementById("")
- // //
- // // const view = new AddContactFromContactsTabView({}, self.context)
- // // self.currentlyPresented_AddContactView = view
- // // const navigationView = new StackAndModalNavigationView({}, self.context)
- // // navigationView.SetStackViews([ view ])
- // // self.navigationController.PresentView(navigationView, true)
- // //
- // return false
- // }
- // )
return view
}
}
| 2 |
diff --git a/layouts/partials/helpers/fragments.html b/layouts/partials/helpers/fragments.html {{- $directory_same_name := in ($page_scratch.Get "fragments_directory_name") (printf "%s%s/" $root.File.Dir (replace $name ".md" "")) -}}
{{- if and (not .Params.disabled) (isset .Params "fragment") (not $directory_same_name) -}}
{{- if or $is_404 (ne .Params.fragment "404") -}}
- {{- if and (eq .Params.fragment "config") (not (where ($page_scratch.Get "page_config") ".Name" $name)) -}}
+ {{- if and (eq .Params.fragment "config") (not (where ($page_scratch.Get "page_config") ".Name" $name)) (ne .Params.hide true) -}}
{{- $page_scratch.Add "page_config" . -}}
{{- else if not (where ($page_scratch.Get "page_fragments") ".Name" $name) -}}
{{- $page_scratch.Add "page_fragments" . -}}
| 0 |
diff --git a/components/Profile/Page.js b/components/Profile/Page.js @@ -689,7 +689,9 @@ class Profile extends Component {
loadMore={makeLoadMore('documents', {
firstComments: 0,
firstDocuments: 20,
- afterDocument: user.documents.pageInfo.endCursor
+ afterDocument:
+ user.documents.pageInfo &&
+ user.documents.pageInfo.endCursor
})}
/>
<Comments
@@ -697,7 +699,9 @@ class Profile extends Component {
loadMore={makeLoadMore('comments', {
firstDocuments: 0,
firstComments: 40,
- afterComment: user.comments.pageInfo.endCursor
+ afterComment:
+ user.comments.pageInfo &&
+ user.comments.pageInfo.endCursor
})}
/>
</div>
| 9 |
diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js @@ -467,14 +467,20 @@ Blockly.blockRendering.RenderInfo.prototype.getSpacerRowHeight_ = function(
/**
* Calculate the centerline of an element in a rendered row.
* @param {Blockly.blockRendering.Row} row The row containing the element.
- * @param {Blockly.blockRendering.Measurable} _elem The element to place.
+ * @param {Blockly.blockRendering.Measurable} elem The element to place.
* @return {number} The desired centerline of the given element, as an offset
* from the top left of the block.
* @protected
*/
Blockly.blockRendering.RenderInfo.prototype.getElemCenterline_ = function(row,
- _elem) {
- return row.yPos + row.height / 2;
+ elem) {
+ var result = row.yPos;
+ if (elem.isNextConnection()) {
+ result += (row.height - row.overhangY + elem.height / 2);
+ } else {
+ result += (row.height / 2);
+ }
+ return result;
};
/**
| 1 |
diff --git a/src/components/Plotter/PercentageHeatmap.js b/src/components/Plotter/PercentageHeatmap.js @@ -12,20 +12,26 @@ import moment from "moment";
const scaleLevels = [
0,
- .15,
- // .25,
- .5,
+ .05,
+ .1,
+ .2,
+ .3,
+ .6,
.7,
- 1,
+ .95,
+ 1
];
export const scaleColours = [
- "#43244C",
- // "#4f2a5a",
+ "#1f0f23",
+ "#391d40",
+ "#6d31c2",
+ "#865ad7",
"#946FFF",
"#a7a7fa",
"#B2BCFF",
"#e2e5ff",
+ "#eff1ff",
];
| 7 |
diff --git a/site/package.json b/site/package.json "react-emotion": "^8.0.12"
},
"devDependencies": {
+ "babel-cli": "^6.26.0",
+ "babel-core": "^6.26.0",
+ "babel-loader": "^7.1.2",
+ "babel-preset-env": "^1.6.1",
+ "babel-preset-react": "^6.24.1",
"webpack": "^3.10.0",
"webpack-dev-server": "^2.9.7"
}
| 3 |
diff --git a/apps/messages/app.js b/apps/messages/app.js @@ -83,7 +83,7 @@ function getMessageImage(msg) {
if (s=="calendar") return atob("GBiBAAAAAAAAAAAAAA//8B//+BgAGBgAGBgAGB//+B//+B//+B9m2B//+B//+Btm2B//+B//+Btm+B//+B//+A//8AAAAAAAAAAAAA==");
if (s=="facebook") return getFBIcon();
if (s=="hangouts") return atob("FBaBAAH4AH/gD/8B//g//8P//H5n58Y+fGPnxj5+d+fmfj//4//8H//B//gH/4A/8AA+AAHAABgAAAA=");
- if (s=="instagram") return atob("GBiBAf////////////////wAP/n/n/P/z/f/b/eB7/c87/d+7/d+7/d+7/d+7/c87/eB7/f/7/P/z/n/n/wAP////////////////w==");
+ if (s=="instagram") return atob("GBiBAAAAAAAAAAAAAAAAAAP/wAYAYAwAMAgAkAh+EAjDEAiBEAiBEAiBEAiBEAjDEAh+EAgAEAwAMAYAYAP/wAAAAAAAAAAAAAAAAA==");
if (s=="gmail") return getNotificationImage();
if (s=="google home") return atob("GBiCAAAAAAAAAAAAAAAAAAAAAoAAAAAACqAAAAAAKqwAAAAAqroAAAACquqAAAAKq+qgAAAqr/qoAACqv/6qAAKq//+qgA6r///qsAqr///6sAqv///6sAqv///6sAqv///6sA6v///6sA6v///qsA6qqqqqsA6qqqqqsA6qqqqqsAP7///vwAAAAAAAAAAAAAAAAA==");
if (s=="mail") return getNotificationImage();
| 1 |
diff --git a/readme.md b/readme.md @@ -40,7 +40,7 @@ lighthouse --help
## Lighthouse Viewer
-If you run Lighthouse with the `--output=json` flag, it will generate a json dump of the run. You can view this report online by visiting <http://googlechrome.github.io/lighthouse/viewer/> and dragging the file onto the app. Reports can also be shared by clicking the share icon in the top right corner and signing in to GitHub.
+If you run Lighthouse with the `--output=json` flag, it will generate a json dump of the run. You can view this report online by visiting <https://googlechrome.github.io/lighthouse/viewer/> and dragging the file onto the app. Reports can also be shared by clicking the share icon in the top right corner and signing in to GitHub.
Note: shared reports are stashed as a secret Gist in GitHub, under your account.
| 4 |
diff --git a/Source/Scene/ImageryLayer.js b/Source/Scene/ImageryLayer.js @@ -857,7 +857,7 @@ define([
function finalizeReprojectTexture(imageryLayer, context, imagery, texture) {
var minificationFilter = imageryLayer.minificationFilter;
var magnificationFilter = imageryLayer.magnificationFilter;
- var usesLinearTextureFilter = minificationFilter === TextureMinificationFilter.LINEAR && magnificationFilter === TextureMinificationFilter.LINEAR;
+ var usesLinearTextureFilter = minificationFilter === TextureMinificationFilter.LINEAR && magnificationFilter === TextureMagnificationFilter.LINEAR;
// Use mipmaps if this texture uses linear filters and has power-of-two dimensions.
if (usesLinearTextureFilter && !PixelFormat.isCompressedFormat(texture.pixelFormat) && CesiumMath.isPowerOfTwo(texture.width) && CesiumMath.isPowerOfTwo(texture.height)) {
if (minificationFilter === TextureMinificationFilter.NEAREST) {
| 1 |
diff --git a/modules/core/src/lib/deck-picker.js b/modules/core/src/lib/deck-picker.js @@ -116,7 +116,9 @@ export default class DeckPicker {
}
// Resize it to current canvas size (this is a noop if size hasn't changed)
this.pickingFBO.resize({width: gl.canvas.width, height: gl.canvas.height});
+ if (this.depthFBO) {
this.depthFBO.resize({width: gl.canvas.width, height: gl.canvas.height});
+ }
return this.pickingFBO;
}
| 1 |
diff --git a/token-metadata/0x3505F494c3f0fed0B594E01Fa41Dd3967645ca39/metadata.json b/token-metadata/0x3505F494c3f0fed0B594E01Fa41Dd3967645ca39/metadata.json "symbol": "SWM",
"address": "0x3505F494c3f0fed0B594E01Fa41Dd3967645ca39",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/sirepo/server.py b/sirepo/server.py @@ -739,7 +739,7 @@ def _json_input():
req = flask.request
if req.mimetype != 'application/json':
pkdlog('{}: req.mimetype is not application/json', req.mimetype)
- raise werkzeug.Exceptions.BadRequest('expecting application/json')
+ raise werkzeug.exceptions.BadRequest('expecting application/json')
# Adapted from flask.wrappers.Request.get_json
# We accept a request charset against the specification as
# certain clients have been using this in the past. This
@@ -889,9 +889,15 @@ def _simulation_run_status(data, quiet=False):
else:
is_running = False
if rep.run_dir.exists():
- res, err = simulation_db.read_result(rep.run_dir)
+ res2, err = simulation_db.read_result(rep.run_dir)
if err:
+ if simulation_db.is_parallel(data):
+ # allow parallel jobs to use template to parse errors below
+ res['state'] = 'error'
+ else:
return _simulation_error(err, 'error in read_result', rep.run_dir)
+ else:
+ res = res2
if simulation_db.is_parallel(data):
template = sirepo.template.import_module(data)
new = template.background_percent_complete(
| 11 |
diff --git a/docs/api-reference/internal/layer-manager.md b/docs/api-reference/internal/layer-manager.md > The `LayerManager` class is gradually being refactor into a `ComponentManager` class and will be made part of the `lifecycle` directory. It is now an internal class, use the `Deck` class (or the [`DeckGL`](/docs/api-reference/react/deckgl.md) React Component) which creates a `LayerManager` under the hood.
-The `LayerManager` class handles updates, drawing and picking for a set of layers.
+The `LayerManager` class manages a set of layers' lifecycle.
For more information consult the [Using Standalone](/docs/get-started/using-standalone.md) article.
@@ -61,47 +61,6 @@ Notes:
* layer id matching checks that a layer id *starts with* one of the supplied strings. This ensures that sublayers rendered by a composite layer with the given id will also be included in the matched list.
-##### `setParameters`
-
-Updates parameters.
-
-```js
-layerManager.setParameters({
- useDevicePixels,
- pickingRadius,
- onLayerClick,
- onLayerHover
-});
-```
-
-Parameters:
-
-* `useDevicePixels` (`Boolean`, optional) - Whether to use retina/HD display or not.
-* `eventManager` - A source of DOM input events
-* `pickingRadius` (`Number`, optional) - "Fuzziness" of picking (px), to support fat-fingering.
-* `onLayerClick` (`Function`, optional) - A handler to be called when any layer is clicked.
-* `onLayerHover` (`Function`, optional) - A handler to be called when any layer is hovered over.
-
-Notes:
-
-* The event "source" is expected to provide `on()`/`off()` methods for registration, and to call registered handlers with an "Event" object of the following shape:
- + `offsetCenter` (Object: {x, y}) - center of the event
- + `srcEvent` (Object) - native JS Event object
-
-
-##### `setViews`
-
-Updates the current views.
-
-```js
-layerManager.setViews(views);
-```
-
-Parameters:
-
-* `views` (`View[]`) - The new [View](/docs/api-reference/view.md) instances.
-
-
##### `setLayers`
Provide a new list of layers. Layers will be matched against old layers, and any composite layers will be recursively expanded into primitive layers.
@@ -118,47 +77,6 @@ layerManager.updateLayers({newLayers});
Updates the current list of layers.
-##### `drawLayers`
-
-Draw all layers.
-
-```js
-layerManager.drawLayers({pass});
-```
-
-Parameters:
-
-* `pass` (String) - The render pass identifier, for debugging purpose
-
-
-##### `pickObject`
-
-Pick the closest info at given coordinate.
-
-```js
-layerManager.pickLayer({x, y, mode, radius = 0, layerIds})
-```
-
-Parameters:
-
-* `x` (Number) - The x position of the pointer
-* `y` (Number) - The y position of the pointer
-* `mode` (String) - One of `hover` or `click`
-
-##### `pickObjects`
-
-Get all unique infos within a bounding box.
-
-```js
-layerManager.queryLayer({x, y, width, height, layerIds});
-```
-
-Parameters:
-
-* `x` (Number) - The x position of the pointer
-* `y` (Number) - The y position of the pointer
-
-
## Source
[modules/core/src/lib/layer-manager.js](https://github.com/uber/deck.gl/blob/master/modules/core/src/lib/layer-manager.js)
| 3 |
diff --git a/spec/lib/carto/ghost_tables_manager_spec.rb b/spec/lib/carto/ghost_tables_manager_spec.rb @@ -249,7 +249,7 @@ module Carto
end
it 'should link raster tables' do
- skip unless user.db_service.tables_effective.include?('raster_overviews')
+ next unless user.db_service.tables_effective.include?('raster_overviews')
run_in_user_database(%{
CREATE TABLE manolo_raster ("cartodb_id" uuid, "the_raster_webmercator" raster);
| 14 |
diff --git a/test/pieces.js b/test/pieces.js @@ -36,10 +36,10 @@ describe('Pieces', function() {
}
}
},
- things: {
+ thing: {
extend: '@apostrophecms/piece-type',
options: {
- alias: 'things',
+ alias: 'thing',
name: 'thing',
label: 'Thing',
publicApiProjection: {
@@ -56,10 +56,10 @@ describe('Pieces', function() {
}
}
},
- people: {
+ person: {
extend: '@apostrophecms/piece-type',
options: {
- alias: 'people',
+ alias: 'person',
name: 'person',
label: 'Person',
publicApiProjection: {
@@ -71,6 +71,17 @@ describe('Pieces', function() {
add: {
_things: {
type: 'relationship'
+ },
+ _tools: {
+ type: 'relationship',
+ withType: 'thing',
+ fields: {
+ add: {
+ skillLevel: {
+ type: 'integer'
+ }
+ }
+ }
}
}
}
@@ -195,13 +206,13 @@ describe('Pieces', function() {
}
}
});
- assert(apos.modules.things);
- assert(apos.modules.things.schema);
+ assert(apos.modules.thing);
+ assert(apos.modules.thing.schema);
});
// little test-helper function to get piece by id regardless of archive status
async function findPiece(req, id) {
- const piece = apos.modules.things.find(req, { _id: id })
+ const piece = apos.modules.thing.find(req, { _id: id })
.permission('edit')
.archived(null)
.toObject();
@@ -245,22 +256,22 @@ describe('Pieces', function() {
// Test pieces.newInstance()
it('should be able to create a new piece', function() {
- assert(apos.modules.things.newInstance);
- const thing = apos.modules.things.newInstance();
+ assert(apos.modules.thing.newInstance);
+ const thing = apos.modules.thing.newInstance();
assert(thing);
assert(thing.type === 'thing');
});
// Test pieces.insert()
it('should be able to insert a piece into the database', async () => {
- assert(apos.modules.things.insert);
- await apos.modules.things.insert(apos.task.getReq(), testThing);
+ assert(apos.modules.thing.insert);
+ await apos.modules.thing.insert(apos.task.getReq(), testThing);
});
it('should be able to retrieve a piece by id from the database', async () => {
- assert(apos.modules.things.requireOneForEditing);
+ assert(apos.modules.thing.requireOneForEditing);
const req = apos.task.getReq();
- req.piece = await apos.modules.things.requireOneForEditing(req, { _id: 'testThing:en:published' });
+ req.piece = await apos.modules.thing.requireOneForEditing(req, { _id: 'testThing:en:published' });
assert(req.piece);
assert(req.piece._id === 'testThing:en:published');
assert(req.piece.title === 'hello');
@@ -269,13 +280,13 @@ describe('Pieces', function() {
// Test pieces.update()
it('should be able to update a piece in the database', async () => {
- assert(apos.modules.things.update);
+ assert(apos.modules.thing.update);
testThing.foo = 'moo';
- const piece = await apos.modules.things.update(apos.task.getReq(), testThing);
+ const piece = await apos.modules.thing.update(apos.task.getReq(), testThing);
assert(testThing === piece);
// Now let's get the piece and check if it was updated
const req = apos.task.getReq();
- req.piece = await apos.modules.things.requireOneForEditing(req, { _id: 'testThing:en:published' });
+ req.piece = await apos.modules.thing.requireOneForEditing(req, { _id: 'testThing:en:published' });
assert(req.piece);
assert(req.piece._id === 'testThing:en:published');
assert(req.piece.foo === 'moo');
@@ -328,7 +339,7 @@ describe('Pieces', function() {
});
it('should be able to archive a piece with proper deduplication', async () => {
- assert(apos.modules.things.requireOneForEditing);
+ assert(apos.modules.thing.requireOneForEditing);
const req = apos.task.getReq();
const id = 'testThing:en:published';
req.body = { _id: id };
@@ -336,7 +347,7 @@ describe('Pieces', function() {
const piece = await findPiece(req, id);
assert(!piece.archived);
piece.archived = true;
- await apos.modules.things.update(req, piece);
+ await apos.modules.thing.update(req, piece);
// let's get the piece to make sure it is archived
const piece2 = await findPiece(req, id);
assert(piece2);
@@ -355,7 +366,7 @@ describe('Pieces', function() {
const piece = await findPiece(req, id);
assert(piece.archived === true);
piece.archived = false;
- await apos.modules.things.update(req, piece);
+ await apos.modules.thing.update(req, piece);
const piece2 = await findPiece(req, id);
assert(piece2);
assert(!piece2.archived);
@@ -390,10 +401,10 @@ describe('Pieces', function() {
it('people can find things via a relationship', async () => {
const req = apos.task.getReq();
for (const person of testPeople) {
- await apos.people.insert(req, person);
+ await apos.person.insert(req, person);
}
for (const thing of additionalThings) {
- await apos.things.insert(req, thing);
+ await apos.thing.insert(req, thing);
}
const person = await apos.doc.getManager('person').find(req, {}).toObject();
assert(person);
| 4 |
diff --git a/src/routes.js b/src/routes.js @@ -8,7 +8,6 @@ import Settings from './app/AppSettings';
import Page from './feed/Page';
import User from './user/User';
-import Transfer from './wallet/Transfer';
import Tags from './tags/Tags';
import Donors from './statics/Donors';
import Post from './post/Post';
@@ -29,13 +28,6 @@ export default (
<Route path="/team" component={Team} />
<Route path="/tags" component={Tags} />
<Route path="/donors" component={Donors} />
- <Route
- path="/transfer"
- render={() =>
- (<RequireLogin>
- <Transfer />
- </RequireLogin>)}
- />
<Route
path="/bookmarks"
render={() =>
| 2 |
diff --git a/articles/getting-started/index.md b/articles/getting-started/index.md @@ -22,15 +22,19 @@ Let's get started!
<ul class="topic-links">
<li>
<i class="icon icon-budicon-715"></i><a href="/getting-started/overview">Auth0 Overview</a>
- <p>Learn what Auth0 is and how you can use it</p>
+ <p>Learn what Auth0 is and how you can use it.</p>
</li>
<li>
<i class="icon icon-budicon-715"></i><a href="/getting-started/the-basics">Learn the Basics</a>
- <p>Learn the basics and familiarize yourself with the identity terminology</p>
+ <p>Learn the Auth0 basics and familiarize yourself with the basic terminology.</p>
+ </li>
+ <li>
+ <i class="icon icon-budicon-715"></i><a href="/getting-started/dashboard-overview">Dashboard Overview</a>
+ <p>The Dashboard is where you configure and manage all things Auth0. This article offers a brief overview of the sections it contains and what you can do on each one.</p>
</li>
<li>
<i class="icon icon-budicon-715"></i><a href="/getting-started/deployment-models">Deployment Models</a>
- <p>Read about the four different deployment models that Auth0 offers</p>
+ <p>Read about the four different deployment models that Auth0 offers.</p>
</li>
<li>
<i class="icon icon-budicon-715"></i><a href="/videos">Developer Videos</a>
| 0 |
diff --git a/docs/sphinx_greenlight_instructions.md b/docs/sphinx_greenlight_instructions.md ## Getting Started
-1. Flash our installer onto your raspberry pi using your preferred method.
+1. Flash our installer onto your raspberry pi using your preferred method. We like to use balena echer, which you can download [here](https://www.balena.io/etcher/).
2. Follow the instructions [here](https://www.raspberrypi.org/documentation/configuration/wireless/headless.md) to set up your raspberry pi's connection if you are connecting to a wireless network.
3. Place your sd card into the raspberry pi, and plug the pi into a power source.
4. Wait around 5 minutes.
@@ -16,9 +16,30 @@ All you need to do is backup the file `home/pi/sphinx.db` and the file `home/pi/
Unlike a lightning node, these files do not backup the state of your channels - they backup your sphinx chat data and the secret from which all your bitcoin keys are derived.
-## Caveats
-
-Unfortunately at the moment we are still working on being able to connect to the raspberry pi with the sphinx chat app from an external network - so don't expect your node to be reachable from outside your home network yet! :smile:
+## Using the app outside the home network
+
+Here's how you can connect your sphinx chat app to your raspberry pi at home.
+
+1. Tell your router to forward all traffic on port 3001 to your raspberry pi.
+2. Set up a dynamic DNS service and point it to your router.
+3. SSH into your raspberry pi using the username `pi` and the password `raspberry` - take the opportunity to change it using the command `passwd`.
+4. Edit the `public_url` field of the production section of the file `~/sphinx-relay/config/app.json` with the domain name provided by your DNS service as shown below:
+
+```diff
+ "hub_check_invite_url": "https://hub.sphinx.chat/check_invite",
+ "media_host": "memes.sphinx.chat",
+ "tribes_host": "tribes.sphinx.chat",
+- "public_url": "",
++ "public_url": "http://www.example.com:3001",
+ "connection_string_path": "connection_string.txt",
+ "ssl": {
+ "enabled": false,
+```
+
+5. On your computer, connect to an external network, and load the page `http://www.[your domain name]:3001/connect`.
+6. Uninstall your app from your phone ( don't worry, your messages and keys are all backed up on your raspberry pi, so you won't lose anything ).
+7. Reinstall the app, and scan the qr code shown in step 5.
+8. Done! Congratulations, you are now able to use your sphinx chat app wherever you go!
## File Integrity
| 0 |
diff --git a/PostBanDeletedPosts.user.js b/PostBanDeletedPosts.user.js // @description When user posts on SO Meta regarding a post ban, fetch and display deleted posts (must be mod) and provide easy way to copy the results into a comment
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 1.5.7
+// @version 1.5.8
//
// @include https://meta.stackoverflow.com/questions/*
//
function doPageload() {
const post = $('#question');
- const postOwner = $('.post-signature:last a', post);
+ const postOwner = $('.post-signature:last a[href*="/users/"]', post).first();
const postText = $('h1 .question-hyperlink').text() + $('.post-text', post).text();
// Is a deleted user, do nothing
if(postOwner.length === 0) return;
const uid = postOwner.attr('href').match(/\d+/)[0];
- const username = $('.user-details', post).last().children().first().text().trim();
- const userRep = $('.user-details', post).last().find('.reputation-score').text().replace(',', '');
+ const username = postOwner.text().trim();
+ const userRep = postOwner.find('.reputation-score').text().replace(',', '') || null;
const hasDupeLink = $('.question-originals-of-duplicate a, .comments-list a', post).filter((i, el) => /(https:\/\/meta\.stackoverflow\.com)?\/q(uestions)?\/255583\/?.*/.test(el.href)).length > 0;
const hasTags = $('a.post-tag', post).filter((i, el) => ['post-ban', 'banning', 'deleted-'].some(v => el.innerText.contains(v))).length > 0;
const hasKeywords = ['unable', 'cannot', 'ban', 'block', 'well received'].some(v => postText.contains(v)) && ['question', 'answer', 'post'].some(v => postText.contains(v));
// Definitely not a post ban question, ignore post
- if((!hasDupeLink && !hasTags && !hasKeywords) || userRep.indexOf('k') > 0 || Number(userRep) >= 1000) return;
+ if((!hasDupeLink && !hasTags && !hasKeywords) || userRep == null || userRep.indexOf('k') > 0 || Number(userRep) >= 1000) return;
const qnsUrl = `https://${mainDomain}/search?q=user%3a${uid}%20is%3aquestion%20deleted%3a1%20score%3a..0&tab=newest`;
const ansUrl = `https://${mainDomain}/search?q=user%3a${uid}%20is%3aanswer%20deleted%3a1%20score%3a..0&tab=newest`;
| 8 |
diff --git a/Gemfile b/Gemfile @@ -24,7 +24,6 @@ gem 'oauth-plugin', git: 'https://github.com/CartoDB/oauth-plugin.git
gem 'hiredis', '~> 0.6.1'
gem 'redis', '~> 3.3.5'
-gem 'loofah', '~> 2.3.1'
gem 'nokogiri', '~> 1.10'
gem 'statsd-client', '0.0.7', require: 'statsd'
gem 'aws-sdk-s3', '~> 1'
| 2 |
diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js @@ -4,6 +4,7 @@ import lodashGet from 'lodash/get';
import Str from 'expensify-common/lib/str';
import ONYXKEYS from '../../ONYXKEYS';
import * as DeprecatedAPI from '../deprecatedAPI';
+import * as API from '../API';
import CONST from '../../CONST';
import Log from '../Log';
import Performance from '../Performance';
@@ -52,10 +53,24 @@ function setCurrentURL(url) {
* @param {String} locale
*/
function setLocale(locale) {
- if (currentUserAccountID) {
- DeprecatedAPI.PreferredLocale_Update({name: 'preferredLocale', value: locale});
- }
+ // If user is not signed in, change just locally.
+ if (!currentUserAccountID) {
Onyx.merge(ONYXKEYS.NVP_PREFERRED_LOCALE, locale);
+ return;
+ }
+
+ // Optimistically change preferred locale
+ const optimisticData = [
+ {
+ onyxMethod: 'merge',
+ key: ONYXKEYS.NVP_PREFERRED_LOCALE,
+ value: locale,
+ },
+ ];
+
+ API.write('UpdatePreferredLocale', {
+ value: locale,
+ }, {optimisticData});
}
function getLocale() {
| 4 |
diff --git a/src/charts/BarStacked.js b/src/charts/BarStacked.js @@ -92,6 +92,11 @@ class BarStacked extends Bar {
'data:realIndex': realIndex
})
+ let elGoalsMarkers = this.graphics.group({
+ class: 'apexcharts-bar-goals-markers',
+ style: `pointer-events: none`
+ })
+
let barHeight = 0
let barWidth = 0
@@ -162,6 +167,19 @@ class BarStacked extends Bar {
barHeight = this.series[i][j] / this.yRatio[this.yaxisIndex]
}
+ const barGoalLine = this.barHelpers.drawGoalLine({
+ barXPosition: paths.barXPosition,
+ barYPosition: paths.barYPosition,
+ goalX: paths.goalX,
+ goalY: paths.goalY,
+ barHeight,
+ barWidth
+ })
+
+ if (barGoalLine) {
+ elGoalsMarkers.add(barGoalLine)
+ }
+
y = paths.y
x = paths.x
@@ -185,6 +203,7 @@ class BarStacked extends Bar {
barHeight,
barWidth,
elDataLabelsWrap,
+ elGoalsMarkers,
type: 'bar',
visibleSeries: 0
})
@@ -244,6 +263,7 @@ class BarStacked extends Bar {
}
zeroH =
+ w.globals.gridHeight -
this.baseLineY[this.yaxisIndex] +
(this.isReversed ? w.globals.gridHeight : 0) -
(this.isReversed ? this.baseLineY[this.yaxisIndex] * 2 : 0)
@@ -344,6 +364,8 @@ class BarStacked extends Bar {
return {
pathTo: paths.pathTo,
pathFrom: paths.pathFrom,
+ goalX: this.barHelpers.getGoalValues('x', zeroW, null, i, j),
+ barYPosition,
x,
y
}
@@ -428,14 +450,14 @@ class BarStacked extends Bar {
this.prevYF.slice(1, i).every((arr) => arr.every((val) => isNaN(val)))
) {
// Use the same calc way as line #485
- barYPosition = w.globals.gridHeight - zeroH
+ barYPosition = zeroH
} else {
// Nothing special
barYPosition = bYP
}
} else {
// the first series will not have prevY values, also if the prev index's series X doesn't matches the current index's series X, then start from zero
- barYPosition = w.globals.gridHeight - zeroH
+ barYPosition = zeroH
}
y =
@@ -472,6 +494,8 @@ class BarStacked extends Bar {
return {
pathTo: paths.pathTo,
pathFrom: paths.pathFrom,
+ goalY: this.barHelpers.getGoalValues('y', null, zeroH, i, j),
+ barXPosition,
x: w.globals.isXNumeric ? x - xDivision : x,
y
}
| 11 |
diff --git a/lib/classes/Variables.js b/lib/classes/Variables.js @@ -216,8 +216,9 @@ class Variables {
const matchedFileRefString = variableString.match(this.fileRefSyntax)[0];
const referencedFileRelativePath = matchedFileRefString
.replace(this.fileRefSyntax, (match, varName) => varName.trim());
- const referencedFileFullPath = path.join(this.serverless.config.servicePath,
- referencedFileRelativePath);
+ const referencedFileFullPath = (path.isAbsolute(referencedFileRelativePath) ?
+ referencedFileRelativePath :
+ path.join(this.serverless.config.servicePath, referencedFileRelativePath));
let fileExtension = referencedFileRelativePath.split('.');
fileExtension = fileExtension[fileExtension.length - 1];
| 9 |
diff --git a/src/map/spatial-reference/SpatialReference.js b/src/map/spatial-reference/SpatialReference.js @@ -10,7 +10,7 @@ const DefaultSpatialRef = {
'resolutions': (function () {
const resolutions = [];
const d = 2 * 6378137 * Math.PI;
- for (let i = 0; i < 20; i++) {
+ for (let i = 0; i < 21; i++) {
resolutions[i] = d / (256 * Math.pow(2, i));
}
return resolutions;
| 12 |
diff --git a/lib/ejs.js b/lib/ejs.js @@ -482,10 +482,10 @@ Template.prototype = {
if (!this.source) {
this.generateSource();
if (opts.client) {
- prepended += 'var __output = [], __append = caller_append || __output.push.bind(__output);' + '\n';
+ prepended += 'var __output = [], __append = callerAppend || __output.push.bind(__output);' + '\n';
}
else {
- prepended += 'var __append = caller_append;' + '\n';
+ prepended += 'var __append = callerAppend;' + '\n';
}
if (opts._with !== false) {
@@ -493,7 +493,7 @@ Template.prototype = {
appended += ' }' + '\n';
}
if (opts.client) {
- appended += ' if (! caller_append) { return __output.join("");} ' + '\n';
+ appended += ' if (! callerAppend) { return __output.join("");} ' + '\n';
}
this.source = prepended + this.source + appended;
}
@@ -529,7 +529,7 @@ Template.prototype = {
}
try {
- fn = new Function(opts.localsName + ', escapeFn, include, rethrow, caller_append', src);
+ fn = new Function(opts.localsName + ', escapeFn, include, rethrow, callerAppend', src);
}
catch(e) {
// istanbul ignore else
@@ -552,9 +552,9 @@ Template.prototype = {
// Return a callable function which will execute the function
// created by the source-code, with the passed data as locals
// Adds a local `include` function which allows full recursive include
- var returnedFn = function (data, caller_append) {
- var __output, __append = caller_append;
- if (! caller_append) {
+ var returnedFn = function (data, callerAppend) {
+ var __output, __append = callerAppend;
+ if (! callerAppend) {
__output = [];
__append = __output.push.bind(__output);
}
@@ -566,7 +566,7 @@ Template.prototype = {
return includeFile(path, opts)(d, __append);
};
fn.apply(opts.context, [data || {}, escapeFn, include, rethrow, __append]);
- if (! caller_append) { return __output.join(''); }
+ if (! callerAppend) { return __output.join(''); }
};
returnedFn.dependencies = this.dependencies;
return returnedFn;
| 10 |
diff --git a/packages/@uppy/thumbnail-generator/types/index.d.ts b/packages/@uppy/thumbnail-generator/types/index.d.ts @@ -3,8 +3,12 @@ import ThumbnailGeneratorLocale = require('./generatedLocale')
declare module ThumbnailGenerator {
interface ThumbnailGeneratorOptions extends Uppy.PluginOptions {
- thumbnailWidth?: number
- locale?: ThumbnailGeneratorLocale
+ thumbnailWidth?: number,
+ thumbnailHeight?: number,
+ thumbnailType?: string,
+ waitForThumbnailsBeforeUpload?: boolean,
+ lazy?: boolean,
+ locale?: ThumbnailGeneratorLocale,
}
}
| 0 |
diff --git a/lib/windshaft/metadata/mapnik-layer-metadata.js b/lib/windshaft/metadata/mapnik-layer-metadata.js 'use strict';
-var queue = require('queue-async');
var PSQL = require('cartodb-psql');
var _ = require('underscore');
var assert = require('assert');
@@ -49,38 +48,32 @@ MapnikLayerMetadata.prototype.getMetadata = function (mapConfig, layer, layerId,
next(null, pg, result.rows[0].tablenames);
});
},
-
function getTableStats(err, pg, tablenames) {
assert.ifError(err);
-
- var tableQueue = queue(tablenames.length);
-
+ var group = this.group();
tablenames.forEach(function (table) {
- tableQueue.defer(function (pg, table, done) {
+ var next = group();
+ var query = queryUtils.getTableStats(table, layer.options.geom_column);
var tableStats = {
type: 'table',
name: table,
};
- var query = queryUtils.getTableStats(table, layer.options.geom_column);
- pg.query(query, function (err, resultTable) {
+ pg.query(query, function (err, res) {
if (err) {
tableStats.features = -1;
} else {
try {
- tableStats.features = JSON.parse(resultTable.rows[0].result.stats).table_features;
+ tableStats.features = JSON.parse(res.rows[0].result.stats).table_features;
} catch (e) {
tableStats.features = -1;
}
}
- done(null, tableStats);
+ next(null, tableStats);
});
- }, pg, table);
});
-
- tableQueue.awaitAll(this);
},
- function finnish(err, result) {
+ function finish(err, result) {
if (err) {
return callback(err);
}
| 14 |
diff --git a/metaversefile-api.js b/metaversefile-api.js @@ -102,6 +102,14 @@ class App extends THREE.Object3D {
type: 'activate',
});
}
+ wear() {
+ localPlayer.wear(this);
+ }
+ use() {
+ this.dispatchEvent({
+ type: 'use',
+ });
+ }
destroy() {
this.dispatchEvent({
type: 'destroy',
| 0 |
diff --git a/src/components/FullPageOfflineView.js b/src/components/FullPageOfflineView.js @@ -31,10 +31,10 @@ const FullPageOfflineView = (props) => {
style={[styles.flex1, styles.alignItemsCenter, styles.justifyContentCenter]}
>
<Icon
- src={Expensicons.Offline}
+ src={Expensicons.OfflineCloud}
fill={themeColors.offline}
- width={30}
- height={30}
+ width={50}
+ height={50}
/>
<Text style={[styles.h1]}>{props.translate('reportActionCompose.youAppearToBeOffline')}</Text>
</View>
| 4 |
diff --git a/token-metadata/0x26E75307Fc0C021472fEb8F727839531F112f317/metadata.json b/token-metadata/0x26E75307Fc0C021472fEb8F727839531F112f317/metadata.json "symbol": "C20",
"address": "0x26E75307Fc0C021472fEb8F727839531F112f317",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/CHANGELOG.md b/CHANGELOG.md # Changelog
+## v1.2.1 (2019-6-10)
+
+### Bug Fixes
+
+* Fixed a Chrome 75 compatibility issue when `t.typeText` typed each character at the beginning of the input ([#3865](https://github.com/DevExpress/testcafe/issues/3865))
+* Fixed a bug when a test with an unhandled promise rejection passed ([#3787](https://github.com/DevExpress/testcafe/issues/3787))
+* The native dialog handler is now applied when a role redirects to the login page ([#2969](https://github.com/DevExpress/testcafe/issues/2969))
+
## v1.2.0 (2019-5-28)
### Enhancements
| 0 |
diff --git a/src/struct/commands/Command.js b/src/struct/commands/Command.js @@ -10,7 +10,6 @@ const Parser = require('./arguments/Parser');
* @typedef {Object} CommandOptions
* @prop {string[]} [aliases=[]] - Command names.
* @prop {Array<Argument|Control>|Argument|Control|ArgumentFunction} [args=[]] - Arguments to parse.
- * When an item is an array of arguments, the first argument that is allowed to run will be ran.
* @prop {boolean} [quoted=true] - Whether or not to consider quotes.
* @prop {string} [channel] - Restricts channel to either 'guild' or 'dm'.
* @prop {string} [category='default'] - Category ID for organization purposes.
@@ -22,9 +21,9 @@ const Parser = require('./arguments/Parser');
* @prop {string|string[]|PrefixFunction} [prefix] - The prefix(es) to overwrite the global one for this command.
* @prop {PermissionResolvable|PermissionResolvable[]|PermissionFunction} [userPermissions] - Permissions required by the user to run this command.
* @prop {PermissionResolvable|PermissionResolvable[]|PermissionFunction} [clientPermissions] - Permissions required by the client to run this command.
- * @prop {RegExp|TriggerFunction} [trigger] - A regex to match in messages that are NOT commands.
+ * @prop {RegExp|RegexFunction} [regex] - A regex to match in messages that are not directly commands.
* The args object will have `match` and `matches` properties.
- * @prop {ConditionFunction} [condition] - Whether or not to run on messages that are NOT commands.
+ * @prop {ConditionFunction} [condition] - Whether or not to run on messages that are not directly commands.
* @prop {ArgumentPromptOptions} [defaultPrompt={}] - The default prompt options.
* @prop {string|string[]} [description=''] - Description of the command.
*/
@@ -39,7 +38,7 @@ const Parser = require('./arguments/Parser');
/**
* A function used to return a regular expression.
- * @typedef {Function} TriggerFunction
+ * @typedef {Function} RegexFunction
* @param {Message} message - Message to get regex for.
* @returns {RegExp}
*/
@@ -84,7 +83,7 @@ class Command extends AkairoModule {
prefix = this.prefix,
clientPermissions = this.clientPermissions,
userPermissions = this.userPermissions,
- trigger = this.trigger,
+ regex = this.regex,
condition = this.condition || (() => false)
} = options;
@@ -176,7 +175,7 @@ class Command extends AkairoModule {
* The regex trigger for this command.
* @type {RegExp|TriggerFunction}
*/
- this.trigger = typeof trigger === 'function' ? trigger.bind(this) : trigger;
+ this.regex = typeof trigger === 'function' ? regex.bind(this) : regex;
/**
* Checks if the command should be ran by using an arbitrary condition.
| 10 |
diff --git a/assets/js/modules/analytics/components/dashboard/DashboardAllTrafficWidget/UserDimensionsPieChart.js b/assets/js/modules/analytics/components/dashboard/DashboardAllTrafficWidget/UserDimensionsPieChart.js @@ -292,11 +292,17 @@ export default function UserDimensionsPieChart( { dimensionName, dimensionValue,
: { __html: '' };
const options = { ...UserDimensionsPieChart.chartOptions };
+
if ( report?.[ 0 ]?.data?.rows?.length < 2 ) {
// Hide pie slice text when there is just one slice because it will overlap with the chart title.
options.pieSliceTextStyle.color = 'transparent';
}
+ if ( report?.[0]?.data?.rows?.length === 1 ) {
+ // When there is only one row, the chart will add a label which we need to hide - see issue #2660
+ options.pieSliceText = 'none';
+ }
+
const { slices } = UserDimensionsPieChart.chartOptions;
return (
| 1 |
diff --git a/package.json b/package.json "test": "npm run test:all",
"test:all": "npm run test:unit && npm run test:integration && npm run test:acceptance",
"test:acceptance": "NODE_ENV=test mocha -t 5000 --exit --recursive test/acceptance",
- "test:integration": "NODE_ENV=test mocha -t 5000 --exit --recursive test/integration",
- "test:unit": "NODE_ENV=test mocha -t 5000 --exit --recursive test/unit",
+ "test:integration": "NODE_ENV=test mocha --exit --recursive test/integration",
+ "test:unit": "NODE_ENV=test mocha --exit --recursive test/unit",
"posttest": "npm run test:teardown",
"test:teardown": "NODE_ENV=test node test teardown",
"precover": "npm run test:setup",
| 12 |
diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -2,15 +2,9 @@ version: 2
jobs:
build:
- branches:
- ignore:
- - gh-pages
docker:
- image: circleci/node:10
working_directory: ~/repo
- environment:
- - SOURCE_BRANCH: master
- - TARGET_BRANCH: gh-pages
steps:
- checkout
- restore_cache:
@@ -24,6 +18,14 @@ jobs:
key: v1-dependencies-{{ checksum "package.json" }}
- run: npm test
- run: npm run build
+ deploy:
+ docker:
+ - image: circleci/node:10
+ working_directory: ~/repo
+ environment:
+ - SOURCE_BRANCH: master
+ - TARGET_BRANCH: gh-pages
+ steps:
- deploy:
name: Deploy to Github Pages
command: |
@@ -47,3 +49,65 @@ jobs:
git commit -m "Deployed: website to Github Pages (automatic): ${CIRCLE_SHA1}" --allow-empty
git push -q https://${GH_TOKEN}@github.com/developersdo/opensource.git $TARGET_BRANCH
fi
+ scrape:
+ docker:
+ - image: circleci/node:10
+ working_directory: ~/repo
+ environment:
+ - SOURCE_BRANCH: master
+ - TARGET_BRANCH: gh-pages
+ steps:
+ - run:
+ name: Scraping Github data
+ command: |
+ if [ $CIRCLE_BRANCH == $SOURCE_BRANCH ]; then
+ git config --global user.email $GH_EMAIL
+ git config --global user.name $GH_NAME
+
+ npm run refresh
+
+ git add -A
+ git commit -m "Updated: Github data (automatic): ${CIRCLE_SHA1}" --allow-empty
+ git push -q https://${GH_TOKEN}@github.com/developersdo/opensource.git $SOURCE_BRANCH
+ fi
+
+workflows:
+ version: 2
+ build_scrape_and_deploy_daily:
+ jobs:
+ - build
+ - scrape:
+ requires:
+ - build
+ - deploy:
+ requires:
+ - scrape
+ triggers:
+ - schedule:
+ cron: "0 0 * * *"
+ filters:
+ branches:
+ only:
+ - master
+ build:
+ jobs:
+ - build:
+ filters:
+ branches:
+ ignore:
+ - gh-pages
+ - master
+ build_and_deploy:
+ jobs:
+ - build:
+ filters:
+ branches:
+ only:
+ - master
+ - deploy:
+ requires:
+ - build
+ filters:
+ branches:
+ only:
+ - master
\ No newline at end of file
| 3 |
diff --git a/src/modules/app/services/User.js b/src/modules/app/services/User.js /**
* @type {number}
*/
- this.lastConfirmPassword = null;
- /**
- * @type {number}
- */
- this.lastNotificationTimeStamp = null;
+ this.lastPasswordInput = null;
/**
* @type {DefaultSettings}
* @private
* @return {Object} data
* @return {string} data.address
* @return {string} data.encryptedSeed
- * @return {number} data.lastConfirmPassword
+ * @return {number} data.lastPasswordInput
* @return {number} data.lastNotificationTimeStamp
* @return {number} data.lastLogin
*/
| 10 |
diff --git a/sparta_main.go b/sparta_main.go @@ -5,14 +5,14 @@ import (
"crypto/sha1"
"encoding/hex"
"fmt"
- "github.com/Sirupsen/logrus"
- "github.com/asaskevich/govalidator"
- "github.com/spf13/cobra"
"os"
"path"
"runtime"
- "strings"
"time"
+
+ "github.com/Sirupsen/logrus"
+ "github.com/asaskevich/govalidator"
+ "github.com/spf13/cobra"
)
// CommandLineOptions defines the commands available via the Sparta command
@@ -34,6 +34,7 @@ var CommandLineOptions = struct {
type optionsGlobalStruct struct {
Noop bool `valid:"-"`
LogLevel string `valid:"matches(panic|fatal|error|warn|info|debug)"`
+ LogFormat string `valid:"matches(txt|text|json)"`
Logger *logrus.Logger `valid:"-"`
Command string `valid:"-"`
BuildTags string `valid:"-"`
@@ -50,6 +51,7 @@ type optionsProvisionStruct struct {
S3Bucket string `valid:"required,matches(\\w+)"`
BuildID string `valid:"matches(\\S+)"` // non-whitespace
PipelineTrigger string `valid:"-"`
+ InPlace bool `valid:"-"`
}
var optionsProvision optionsProvisionStruct
@@ -114,6 +116,11 @@ func init() {
"l",
"info",
"Log level [panic, fatal, error, warn, info, debug]")
+ CommandLineOptions.Root.PersistentFlags().StringVarP(&OptionsGlobal.LogFormat,
+ "format",
+ "f",
+ "text",
+ "Log format [text, json]")
CommandLineOptions.Root.PersistentFlags().StringVarP(&OptionsGlobal.BuildTags,
"tags",
"t",
@@ -155,6 +162,11 @@ func init() {
"p",
"",
"Provision for CodePipeline integration")
+ CommandLineOptions.Provision.Flags().BoolVarP(&optionsProvision.InPlace,
+ "inplace",
+ "c",
+ false,
+ "If the provision operation results in *only* function updates, bypass CloudFormation")
// Delete
CommandLineOptions.Delete = &cobra.Command{
@@ -237,6 +249,11 @@ func ParseOptions(handler CommandLineOptionsHook) error {
"l",
"info",
"Log level [panic, fatal, error, warn, info, debug]")
+ parseCmdRoot.PersistentFlags().StringVarP(&OptionsGlobal.LogFormat,
+ "format",
+ "f",
+ "text",
+ "Log format [text, json]")
parseCmdRoot.PersistentFlags().StringVarP(&OptionsGlobal.BuildTags,
"tags",
"t",
@@ -255,7 +272,15 @@ func ParseOptions(handler CommandLineOptionsHook) error {
if nil != validateErr {
return validateErr
}
- logger, loggerErr := NewLogger(OptionsGlobal.LogLevel)
+ // Format?
+ var formatter logrus.Formatter
+ switch OptionsGlobal.LogFormat {
+ case "text", "txt":
+ formatter = &logrus.TextFormatter{}
+ case "json":
+ formatter = &logrus.JSONFormatter{}
+ }
+ logger, loggerErr := NewLoggerWithFormatter(OptionsGlobal.LogLevel, formatter)
if nil != loggerErr {
return loggerErr
}
@@ -391,15 +416,22 @@ func MainEx(serviceName string,
if nil != validateErr {
return validateErr
}
- logger, loggerErr := NewLogger(OptionsGlobal.LogLevel)
+ // Format?
+ var formatter logrus.Formatter
+ switch OptionsGlobal.LogFormat {
+ case "text", "txt":
+ formatter = &logrus.TextFormatter{}
+ case "json":
+ formatter = &logrus.JSONFormatter{}
+ }
+ logger, loggerErr := NewLoggerWithFormatter(OptionsGlobal.LogLevel, formatter)
if nil != loggerErr {
return loggerErr
}
OptionsGlobal.Logger = logger
welcomeMessage := fmt.Sprintf("Welcome to %s", serviceName)
- welcomeDivider := strings.Repeat("=", len(welcomeMessage))
- logger.Info(welcomeDivider)
+ logger.Info(headerDivider)
logger.WithFields(logrus.Fields{
"Option": cmd.Name(),
"SpartaVersion": SpartaVersion,
@@ -407,7 +439,7 @@ func MainEx(serviceName string,
"UTC": (time.Now().UTC().Format(time.RFC3339)),
"LinkFlags": OptionsGlobal.LinkerFlags,
}).Info(welcomeMessage)
- logger.Info(welcomeDivider)
+ logger.Info(headerDivider)
return nil
}
@@ -442,6 +474,7 @@ func MainEx(serviceName string,
site,
optionsProvision.S3Bucket,
useCGO,
+ optionsProvision.InPlace,
buildID,
optionsProvision.PipelineTrigger,
OptionsGlobal.BuildTags,
| 0 |
diff --git a/config/sidebar.yml b/config/sidebar.yml @@ -799,10 +799,6 @@ articles:
- title: "Jumpstart"
url: "/services/jumpstart"
- - title: "Compliance"
- hidden: true
- url: "/compliance"
- children:
- title: "GDPR"
hidden: true
url: "/compliance/gdpr"
| 2 |
diff --git a/src/modules/Fill.js b/src/modules/Fill.js @@ -120,7 +120,7 @@ class Fill {
}
if (cnf.fill.type === 'gradient') {
- gradientFill = this.handleGradientFill(gradientFill, fillColor, fillOpacity)
+ gradientFill = this.handleGradientFill(gradientFill, fillColor, fillOpacity, this.seriesIndex)
}
if (cnf.fill.image.src.length > 0 && cnf.fill.type === 'image') {
@@ -238,7 +238,7 @@ class Fill {
return patternFill
}
- handleGradientFill (gradientFill, fillColor, fillOpacity) {
+ handleGradientFill (gradientFill, fillColor, fillOpacity, i) {
const cnf = this.w.config
const opts = this.opts
let graphics = new Graphics(this.ctx)
@@ -248,10 +248,10 @@ class Fill {
let gradientFrom, gradientTo
let opacityFrom = cnf.fill.gradient.opacityFrom === undefined
? fillOpacity
- : cnf.fill.gradient.opacityFrom
+ : Array.isArray(cnf.fill.gradient.opacityFrom) ? cnf.fill.gradient.opacityFrom[i] : cnf.fill.gradient.opacityFrom
let opacityTo = cnf.fill.gradient.opacityTo === undefined
? fillOpacity
- : cnf.fill.gradient.opacityTo
+ : Array.isArray(cnf.fill.gradient.opacityTo) ? cnf.fill.gradient.opacityTo[i] : cnf.fill.gradient.opacityTo
gradientFrom = fillColor
if (
| 11 |
diff --git a/package.json b/package.json "url": "https://github.com/unexpectedjs/unexpected"
},
"scripts": {
- "test": "make test && make test-phantomjs",
+ "test": "make test && make test-chrome-headless",
"lint": "eslint .",
"generate-site": "generate-site --require ./bootstrap-unexpected-markdown.js",
"update-examples": "generate-site --require ./bootstrap-unexpected-markdown.js --update-examples",
| 1 |
diff --git a/packages/app/src/styles/theme/_apply-colors-dark.scss b/packages/app/src/styles/theme/_apply-colors-dark.scss @@ -38,8 +38,9 @@ $border-color: $border-color-global;
*/
input.form-control,
select.form-control,
+select.custom-select,
textarea.form-control {
- color: lighten($color-global, 30%);
+ color: $color-global;
background-color: darken($bgcolor-global, 5%);
border-color: $border-color-global;
&:focus {
@@ -69,6 +70,10 @@ textarea.form-control {
border-color: $border-color-global;
}
+label.custom-control-label::before {
+ background-color: darken($bgcolor-global, 5%);
+}
+
/*
* Dropdown
*/
| 7 |
diff --git a/bot/src/discord_commands/quiz.js b/bot/src/discord_commands/quiz.js @@ -58,15 +58,15 @@ function createTitleOnlyEmbed(title) {
}
function getFinalAnswerLineForQuestionAndAnswerLinkAnswer(card) {
- return `${card.question} ([${card.answer.join(', ')}](${card.dictionaryLink}))`;
+ return `${card.question.replace(/\n/g, ' ')} ([${card.answer.join(', ')}](${card.dictionaryLink}))`;
}
function getFinalAnswerLineForQuestionAndAnswerBoldAnswer(card) {
- return `-- ${card.question} (**${card.answer.join(', ')}**)`;
+ return `-- ${card.question.replace(/\n/g, ' ')} (**${card.answer.join(', ')}**)`;
}
function getFinalAnswerLineForQuestionAndAnswerLinkQuestion(card) {
- return `[${card.question}](${card.dictionaryLink}) (${card.answer.join(', ')})`;
+ return `[${card.question.replace(/\n/g, ' ')}](${card.dictionaryLink}) (${card.answer.join(', ')})`;
}
function getFinalAnswerLineForAnswerOnly(card) {
@@ -74,7 +74,7 @@ function getFinalAnswerLineForAnswerOnly(card) {
}
function getFinalAnswerLineForQuestionOnly(card) {
- return `[${card.question}](${card.dictionaryLink})`;
+ return `[${card.question.replace(/\n/g, ' ')}](${card.dictionaryLink})`;
}
function getFinalAnswerLineForJpTestAudio(card) {
| 14 |
diff --git a/app/stylesheets/builtin-pages/library.less b/app/stylesheets/builtin-pages/library.less @@ -966,12 +966,15 @@ body.drag {
.dropdown-item {
position: relative;
+ text-align: left;
- .badge {
+ .fa-check {
position: absolute;
right: 15px;
top: 50%;
transform: translateY(-50%);
+ font-size: 13px;
+ color: @color-text;
}
&.active {
| 4 |
diff --git a/assets/js/modules/thank-with-google/index.js b/assets/js/modules/thank-with-google/index.js @@ -27,13 +27,13 @@ import { isFeatureEnabled } from '../../features';
export { registerStore } from './datastore';
-const ifSwgIsEnabled = ( func ) => ( ...args ) => {
- if ( isFeatureEnabled( 'swgModule' ) ) {
+const ifTwgIsEnabled = ( func ) => ( ...args ) => {
+ if ( isFeatureEnabled( 'twgModule' ) ) {
func( ...args );
}
};
-export const registerModule = ifSwgIsEnabled( ( modules ) => {
+export const registerModule = ifTwgIsEnabled( ( modules ) => {
modules.registerModule( 'thank-with-google', {
storeName: MODULES_THANK_WITH_GOOGLE,
SettingsEditComponent: SettingsEdit,
| 10 |
diff --git a/packages/rekit-studio/src/features/home/ProjectExplorer.js b/packages/rekit-studio/src/features/home/ProjectExplorer.js @@ -75,8 +75,8 @@ export class ProjectExplorer extends Component {
getMenuItems(treeNode) {
const evtKey = treeNode.props.eventKey;
// eventKey is 'file' property of most items
- const { home } = this.props;
- let ele = home.elementById[evtKey] || home.featureById[evtKey];
+ const { elementById, featureById } = this.props;
+ let ele = elementById[evtKey] || featureById[evtKey];
if (!ele) {
const key = treeNode.props.eventKey;
const i = key.lastIndexOf('-');
@@ -122,8 +122,8 @@ export class ProjectExplorer extends Component {
// when right click a menu item, need to cache the node context for context menu usage.
const key = evt.node.props.eventKey;
- const { home } = this.props;
- const ele = home.elementById[key] || home.featureById[key];
+ const { elementById, featureById } = this.props;
+ const ele = elementById[key] || featureById[key];
if (ele) {
this.cmdContext = {
feature: ele.feature,
@@ -185,7 +185,7 @@ export class ProjectExplorer extends Component {
// feature's routes
history.push(`/element/${encodeURIComponent(key)}/rules`); // eslint-disable-line
} else {
- const tabItem = _.find(this.props.home.openTabs, { key });
+ const tabItem = _.find(this.props.openTabs, { key });
const subTab = tabItem ? tabItem.subTab : 'code';
history.push(`/element/${encodeURIComponent(key)}/${subTab}`);
}
@@ -251,7 +251,7 @@ export class ProjectExplorer extends Component {
handleMenuClick = evt => {
const cmdContext = this.cmdContext;
- const prjRoot = this.props.home.projectRoot;
+ const prjRoot = this.props.projectRoot;
switch (evt.key) {
case 'add-feature':
this.props.actions.showCmdDialog('cmd', {
@@ -340,7 +340,7 @@ export class ProjectExplorer extends Component {
};
hasSyntaxError(nodeData) {
- return this.props.home.filesHasSyntaxError[nodeData.key];
+ return this.props.filesHasSyntaxError[nodeData.key];
}
renderLoading() {
@@ -424,16 +424,23 @@ export class ProjectExplorer extends Component {
);
render() {
- const { home, treeData, searchKey } = this.props;
+ const { features, srcFiles, featureById, treeData, searchKey } = this.props;
- if (!home.features) {
+ if (!features) {
return this.renderLoading();
}
const treeNodes = treeData.children.map(this.renderTreeNode);
let expandedKeys = this.state.expandedKeys;
if (searchKey) {
- expandedKeys = getExpandedKeys(home, searchKey);
+ expandedKeys = getExpandedKeys(
+ {
+ srcFiles,
+ features,
+ featureById,
+ },
+ searchKey
+ );
}
return (
@@ -478,8 +485,21 @@ export class ProjectExplorer extends Component {
/* istanbul ignore next */
function mapStateToProps(state, props) {
+ // const home = state.home,
return {
- home: state.home,
+ // elementById: elementById,
+ // features: features,
+ // featureById: featureById,
+ // home: _.
+ ..._.pick(state.home, [
+ 'elementById',
+ 'features',
+ 'featureById',
+ 'openTabs',
+ 'projectRoot',
+ 'filesHasSyntaxError',
+ 'srcFiles',
+ ]),
treeData: getFilteredExplorerTreeData(state.home, props.searchKey),
router: state.router,
};
| 7 |
diff --git a/.gitignore b/.gitignore *.pfx
node_modules/
-.vscode/
coverage/
typings/
cov-int/
npm-debug.log
+
# core does not use a package lock file
package-lock.json
# ignore Apple's desktop store files
**/.DS_Store
+# ignore VS and Eclipse files
+.vscode/
+.settings/
| 8 |
diff --git a/CHANGELOG.md b/CHANGELOG.md All notable changes to this project are documented in this file.
-## Head
+## 13.0.0
- Removed: Node.js 8.x support. Node.js 10 is now required. We can guarantee stylelint works on the latest Node.js 10 release. ([#4500](https://github.com/stylelint/stylelint/pull/4500)).
- Removed: types declarations for Flow ([#4451](https://github.com/stylelint/stylelint/pull/4451)).
| 6 |
diff --git a/src/botPage/bot/TradeEngine/Proposal.js b/src/botPage/bot/TradeEngine/Proposal.js @@ -133,9 +133,7 @@ export default Engine =>
const { proposals } = this.data;
if (proposals.length > 0) {
- const hasEqualLength = proposals.length === this.proposalTemplates.length;
- const hasEqualProposals = () =>
- this.proposalTemplates.every(
+ const hasEqualProposals = this.proposalTemplates.every(
template =>
proposals.findIndex(
proposal =>
@@ -144,7 +142,7 @@ export default Engine =>
) !== -1
);
- if (hasEqualLength && hasEqualProposals()) {
+ if (hasEqualProposals) {
this.startPromise.then(() => this.store.dispatch(proposalsReady()));
}
}
| 8 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -9,6 +9,12 @@ To see all merged commits on the master branch that will be part of the next plo
where X.Y.Z is the semver of most recent plotly.js release.
+## [1.58.5] -- 2021-07-06
+
+### Fixed
+ - Fix to improve sanitizing href inputs for SVG and HTML text elements [[#5803](https://github.com/plotly/plotly.js/pull/5803)]
+
+
## [1.58.4] -- 2020-12-21
### Fixed
| 3 |
diff --git a/source/api.rst b/source/api.rst <link href="_static/css/api.css" rel="stylesheet">
<redoc hide-loading spec-url="_downloads/swagger.yaml"></redoc>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/redoc.min.js"></script>
+ <script src="https://rebilly.github.io/ReDoc/releases/v1.22.0/redoc.min.js"></script>
.. rst-class:: text-right
| 1 |
diff --git a/src/components/categories/CategoryRenderables.js b/src/components/categories/CategoryRenderables.js import React from 'react'
import PropTypes from 'prop-types'
import { Link } from 'react-router'
+import classNames from 'classnames'
import {
CheckCircleIcon,
} from '../assets/Icons'
@@ -127,25 +128,49 @@ const categorySubNavStyle = css(
),
)
-export function CategorySubNav({ stream }) {
+export function CategorySubNav({ stream, kind }) {
if (stream === 'global') {
return (
<ul className={categorySubNavStyle}>
- <li><Link to="/discover" className="selected">Featured</Link></li>
- <li><Link to="/discover/trending">Trending</Link></li>
- <li><Link to="/discover/recent">Recent</Link></li>
+ <li>
+ <Link to="/discover" className={classNames({ selected: kind === 'featured' })}>
+ Featured
+ </Link>
+ </li>
+ <li>
+ <Link to="/discover/trending" className={classNames({ selected: kind === 'trending' })}>
+ Trending
+ </Link>
+ </li>
+ <li>
+ <Link to="/discover/recent" className={classNames({ selected: kind === 'recent' })}>
+ Recent
+ </Link>
+ </li>
</ul>
)
}
return (
<ul className={categorySubNavStyle}>
- <li><Link to={`/discover/${stream}`} className="selected">Featured</Link></li>
- <li><Link to={`/discover/${stream}/trending`}>Trending</Link></li>
+ <li>
+ <Link to={`/discover/${stream}`} className={classNames({ selected: kind === 'featured' })}>
+ Featured
+ </Link>
+ </li>
+ <li>
+ <Link
+ to={`/discover/${stream}/trending`}
+ className={classNames({ selected: kind === 'trending' })}
+ >
+ Trending
+ </Link>
+ </li>
</ul>
)
}
CategorySubNav.propTypes = {
stream: PropTypes.string.isRequired,
+ kind: PropTypes.string.isRequired,
}
const categoryCardLinkStyle = css(
| 12 |
diff --git a/src/components/barters-table/index.js b/src/components/barters-table/index.js @@ -92,6 +92,9 @@ function BartersTable(props) {
imageLink
wikiLink
avg24hPrice
+ traderPrices {
+ price
+ }
}
count
}
@@ -255,7 +258,9 @@ function BartersTable(props) {
return false;
}
- cost = cost + requiredItem.item.avg24hPrice * requiredItem.count;
+ const requiredItemPrice = requiredItem.item.avg24hPrice || Math.max(...requiredItem.item.traderPrices.map(priceObject => priceObject.price))
+
+ cost = cost + requiredItemPrice * requiredItem.count;
if(cost === 0){
hasZeroCostItem = true;
@@ -264,7 +269,7 @@ function BartersTable(props) {
return {
count: requiredItem.count,
name: requiredItem.item.name,
- avg24hPrice: requiredItem.item.avg24hPrice,
+ avg24hPrice: requiredItemPrice,
iconLink: requiredItem.item.iconLink,
wikiLink: requiredItem.item.wikiLink,
itemLink: `/item/${requiredItem.item.normalizedName}`,
@@ -291,9 +296,9 @@ function BartersTable(props) {
tradeData.savings = 0;
}
- if(hasZeroCostItem){
- return false;
- }
+ // if(hasZeroCostItem){
+ // return false;
+ // }
return tradeData;
})
| 7 |
diff --git a/en/option/series/line.md b/en/option/series/line.md @@ -121,26 +121,19 @@ If is typed in `boolean`, then it means whether to enable smoothing. If is typed
Please refer to [smoothMonotone](~series-line.smoothMonotone) to change smoothing algorithm.
## smoothMonotone(string)
-Whether the broken line keep the monotonicity when it is smoothed. It can be set as `'x'`, `'y'` to keep the monotonicity on x axis or y axis. Or it can be set to be `'none'` to use non-monotone smoothing algorithm.
+Whether the broken line keep the monotonicity when it is smoothed. It can be set as `'x'`, `'y'` to keep the monotonicity on x axis or y axis.
-From ECharts 4.0.3, we improved our default smoothing algorithm. The old algorithm can be used by setting `smoothMonotone` to be `'none'`. Here's the difference between old and new algorithm. In the following chart, old algorithm is in green color, and new algorithm is in red color.
+It is usually used on dual value axis.
-
+Here are 2 examples of broken line chart with dual value axis, showing the differences when `smoothMonotone` is without any setting, and `smoothMonotone` is set as `'x'`.
-The old algorithm has many problems:
++ No setting about `smoothMonotone`:
-
+
-Old algorithm uses the previous and next point to form control points' direction, while they are always horizontal (when the first dimension of data is monotone) or vertical (when the second dimension of data is monotone) in new algorithm.
-
-
-
-But new algorithm doesn't work with non-monotone data.
-
-
-
-So we suggest that default value of `smoothMonotone` be used in most situations. If data on Y axis is monotone, it should be set to be `'y'`. If data is non-monotone, it should be set to be `'none'` to use the old algorithm.
++ It is set as `'x'`:
+
## sampling(string)
| 13 |
diff --git a/website/src/css/customTheme.scss b/website/src/css/customTheme.scss @@ -580,6 +580,7 @@ html[data-theme="dark"] .avatar__name a {
padding: 12px;
.menu__list-item a {
+ color: var(--ifm-color-emphasis-700);
padding: 6px 12px 8px;
}
}
@@ -630,8 +631,21 @@ html[data-theme="dark"] .navbar-sidebar {
aside[class^="docSidebarContainer"] {
margin-right: 16px;
-
--doc-sidebar-width: 266px;
+
+ .menu__list .menu__link--sublist {
+ font-size: 15px !important;
+ font-weight: 700 !important;
+ padding: 5px 12px !important;
+ color: var(--subtle) !important;
+
+ &:after {
+ background-size: 1.66rem 1.66rem;
+ margin-right: -6px;
+ margin-top: -1px;
+ }
+ }
+
@media only screen and (max-width: 1120px) {
--doc-sidebar-width: 240px;
}
@@ -677,19 +691,6 @@ aside[class^="docSidebarContainer"] {
}
}
- .menu__link--sublist {
- font-size: 15px !important;
- font-weight: 700 !important;
- padding: 5px 12px !important;
- color: var(--subtle) !important;
-
- &:after {
- background-size: 1.66rem 1.66rem;
- margin-right: -6px;
- margin-top: -1px;
- }
- }
-
.menu__link--active.active {
border-left-width: 4px;
border-left-style: solid;
@@ -708,6 +709,12 @@ aside[class^="docSidebarContainer"] {
bottom: 1.3rem;
}
+html[data-theme="light"] .menu {
+ .menu__link--sublist:after {
+ filter: hue-rotate(45deg);
+ }
+}
+
html[data-theme="dark"] .menu {
@extend %scrollbar-style-dark;
}
| 1 |
diff --git a/jobs/capsules.js b/jobs/capsules.js @@ -26,15 +26,24 @@ module.exports = async () => {
const result = await got(REDDIT_CAPSULES);
const $ = cheerio.load(result.body);
- const v1Capsules = $('body > div.content > div > div > table:nth-child(8) > tbody').text();
- const v2Capsules = $('body > div.content > div > div > table:nth-child(10) > tbody').text();
- const caps = v1Capsules.concat(v2Capsules);
- const capsuleRow = caps.split('\n').filter((v) => v !== '');
- const capsuleIds = capsuleRow.filter((value, index) => index % 7 === 0);
- if (!capsuleIds.length) {
- throw new Error('No capsules found');
+ const v1Capsules = $('div.md:nth-child(2) > table:nth-child(8) > tbody:nth-child(2)').text();
+ const v1CapsuleRow = v1Capsules.split('\n').filter((v) => v !== '');
+ const v1CapsuleIds = v1CapsuleRow.filter((value, index) => index % 7 === 0);
+ if (!v1CapsuleIds.length) {
+ throw new Error('No v1 capsules found');
}
- const capsuleStatus = capsuleRow.filter((value, index) => (index + 1) % 7 === 0).map((x) => x.replace(/\[source\]/gi, ''));
+ const v1CapsuleStatus = v1CapsuleRow.filter((value, index) => (index + 1) % 7 === 0).map((x) => x.replace(/\[source\]/gi, ''));
+
+ const v2Capsules = $('div.md:nth-child(2) > table:nth-child(10) > tbody:nth-child(2)').text();
+ const v2CapsuleRow = v2Capsules.split('\n').filter((v) => v !== '');
+ const v2CapsuleIds = v2CapsuleRow.filter((value, index) => index % 8 === 0).map((x) => x.split(',')[0]);
+ if (!v2CapsuleIds.length) {
+ throw new Error('No v2 capsules found');
+ }
+ const v2CapsuleStatus = v2CapsuleRow.filter((value, index) => (index + 1) % 8 === 0).map((x) => x.replace(/\[source\]/gi, ''));
+
+ const capsuleIds = [...v1CapsuleIds, ...v2CapsuleIds];
+ const capsuleStatus = [...v1CapsuleStatus, ...v2CapsuleStatus];
const updates = capsules.docs.map(async (capsule) => {
const waterLandings = await got.post(`${API}/payloads/query`, {
| 1 |
diff --git a/src/components/dashboard/Claim/useClaimQueue.js b/src/components/dashboard/Claim/useClaimQueue.js @@ -10,8 +10,10 @@ import { showSupportDialog } from '../../common/dialogs/showSupportDialog'
import { showQueueDialog } from '../../common/dialogs/showQueueDialog'
import Config from '../../../config/config'
import logger from '../../../lib/logger/pino-logger'
+import { isE2ERunning } from '../../../lib/utils/platform'
const log = logger.child({ from: 'useClaimQueue' })
+const isQueueDisabled = !Config.claimQueue
const ClaimQueuePopupText = ({ styles }) => (
<View style={styles.paddingVertical20}>
@@ -86,12 +88,23 @@ export default () => {
}
}
+ const initializeQueue = async () => {
+ try {
+ await checkQueueStatus()
+ } catch (exception) {
+ const { message } = exception
+
+ log.error('checkQueueStatus API request failed', message, exception)
+ }
+ }
+
useEffect(() => {
- if (Config.claimQueue) {
- checkQueueStatus().catch(e => log.error('checkQueueStatus API request failed', e.message, e))
- } else {
+ if (isQueueDisabled || isE2ERunning) {
setQueueStatus({ status: 'approved' })
+ return
}
+
+ initializeQueue()
}, [])
return { queueStatus, handleClaim }
| 0 |
diff --git a/lib/plugins/html/templates/url/summary/index.pug b/lib/plugins/html/templates/url/summary/index.pug @@ -43,10 +43,6 @@ block content
tr
td Total Page Transfer Size:
td #{h.size.format(d.pagexray.pageSummary.transferSize)}
- if d.pagexray && d.pagexray.pageSummary
- tr
- td Total Page Size:
- td #{h.size.format(d.pagexray.pageSummary.contentSize)}
if d.pagexray && d.pagexray.pageSummary
tr
td Requests:
| 13 |
diff --git a/src/components/progress/README.md b/src/components/progress/README.md @@ -40,7 +40,7 @@ export default {
Set the maximum value with the `max` prop (default is `100`), and the current value via the
`value` prop (default `0`).
-When creating multiple bars in a sinple process, place hte value prop on the individual
+When creating multiple bars in a single process, place the value prop on the individual
`<b-progress-bar>` sub components (see the **Multiple Bars** section below for more details)
## Labels
| 1 |
diff --git a/core/field_bound_variable.js b/core/field_bound_variable.js @@ -428,9 +428,9 @@ Blockly.FieldBoundVariable.prototype.getBlockShapedPath_ = function(width) {
height = 23;
}
var rectWidth = width - Blockly.BlockSvg.TAB_WIDTH;
- inlineSteps.push('M 0,0');
- inlineSteps.push('l 0 ' + height + ' l ' + rectWidth + ' 0 l 0 -' +
- height + ' l -' + rectWidth + ' 0');
+ inlineSteps.push('M 0,' + height);
+ inlineSteps.push('l ' + rectWidth + ' 0 l 0 -' + height + ' l -' +
+ rectWidth + ' 0');
}
return {height: height, path: inlineSteps.join(' ')};
};
| 1 |
diff --git a/index.html b/index.html <rapi-doc
id = "thedoc"
- spec-url="./specs/guy.json"
+ spec-url = "./specs/multiple-example.yaml"
theme = "light"
allow-api-list-style-selection = "false"
- render-style = "read"
+ render-style = "view"
regular-font = 'Open Sans'
schema-style = 'tree'
schema-expand-level = "3"
default-schema-tab = "model"
- show-components = "true"
- show-extra-info = "true"
+ allow-server-selection = "false"
> </rapi-doc>
<!--
| 13 |
diff --git a/src/themes/spectre.js b/src/themes/spectre.js // Spectre Theme using Spectre CSS framework. <https://picturepan2.github.io/spectre/index.html>
import { AbstractTheme } from '../theme'
+import { $each } from '../utilities';
+
export var spectreTheme = AbstractTheme.extend({
// Config options that allows changing various aspects of the output
options: {
| 1 |
diff --git a/core/worker/.travis.yml b/core/worker/.travis.yml @@ -45,3 +45,5 @@ deploy:
script: PRIVATE_REGISTRY=docker.io/hkube npm run build
on:
branch: master
+after_deploy:
+ - curl -X POST -H 'accept:application/json' -H "authorization:token ${TRAVIS_API_TOKEN}" -H 'content-type:application/json' -H 'travis-api-version:3' -d "{\"request\":{\"branch\":\"master\",\"message\":\"triggered by ${TRAVIS_REPO_SLUG}\"}}" "https://api.travis-ci.org/repo/kube-HPC%2Frelease-manager/requests"
| 0 |
diff --git a/articles/connector/test-dc.md b/articles/connector/test-dc.md ---
description: How to create and test an Active Directory Domain Controller.
+toc: true
---
# Creating a Test Active Directory Domain Controller
Auth0's AD/LDAP integration is relatively easy to set up, but it does require that you have access to an existing AD service and sufficient privileges to [install and configure the Connector](/connector/install). What if, however, you'd just like to try out the Connector or set up a dev/test environment? The following steps guides you in creating a minimal AD Domain Controller installation on a cloud-deployed virtual machine for these purposes.
-In these instructions you will:
-1. [Create a New Windows Server VM on Azure](#create-a-new-windows-server-vm-on-azure)
-2. [Install Active Directory Domain Services](#install-active-directory-domain-services)
-3. [Promote the Server to a Domain Controller](#promote-the-server-to-a-domain-controller)
-4. [Add Test Groups and Users](#add-test-groups-and-users)
-5. [Install and Configure the AD/LDAP Connector](#add-a-few-test-groups-and-users)
-6. [Test an Authentication Flow from Auth0](#test-an-authentication-flow-from-auth0)
-
## Create a New Windows Server VM on Azure
You can run your VM on any cloud platform, but this guide will walk through how to set one up on Microsoft Azure.
| 14 |
diff --git a/Gruntfile.js b/Gruntfile.js @@ -109,7 +109,7 @@ module.exports = function(grunt) {
// used by watch to copy shared/js to build dir
exec: {
- copyjs: `cp shared/js/*.js build/${browser}/${buildType}/js/`
+ copyjs: `cp shared/js/*.js build/${browser}/${buildType}/js/ && rm build/${browser}/${buildType}/js/*.es6.js`
},
watch: {
| 2 |
diff --git a/src/compiler/nodes.imba1 b/src/compiler/nodes.imba1 @@ -5890,13 +5890,6 @@ export class TagHandlerSpecialArg < ValueNode
def c
"'~${value}'"
-export class TagDynamicArg < ValueNode
- def isPrimitive
- yes
-
- def c
- "'~&{value}'"
-
export class TagModifier < TagPart
prop params
@@ -5989,6 +5982,10 @@ export class TagData < TagPart
else
"data=({val.c})"
+export class TagDynamicArg < ValueNode
+ def c
+ value.c
+
export class TagHandler < TagPart
def isStatic
@@ -6000,12 +5997,12 @@ export class TagHandler < TagPart
def extractDynamicParts
var dynamics = []
- for part in @chain when part isa TagModifier
- for param in part.params
+ for part,i in @chain when part isa TagModifier
+ for param,k in part.params
if !param.isPrimitive
- let nr = dynamics.push(param)
- let ref = TagDynamicArg.new(String(nr - 1))
- part.params.swap(param,ref)
+ let ref = TagDynamicArg.new(param).set(path: [i,k + 1])
+ part.params.swap(param,LIT('null'))
+ dynamics.push(ref)
return dynamics
def add item, type
@@ -6020,18 +6017,16 @@ export class TagHandler < TagPart
value = item
@last = null
else
- # console.log "TagHandler add",item
@chain.push(@last = TagModifier.new(item))
return self
def js o
- let parts = [quoted].concat(@chain)
- let parts = [].concat(@chain)
- let scope = scope__
- # let scopes = scope.root.context.reference(scope).c
- # parts.push(value) if value
- return "on$({quoted},[{AST.cary(parts)}],{scope.context.c})"
- # return "on$({slot},[{AST.cary(parts)}],{scope__.context.c})"
+ let parts = @chain
+
+ if parts isa Array
+ parts = Arr.new(parts)
+
+ return "on$({quoted},{parts.c},{scope__.context.c})"
class TagLike < Node
@@ -6683,11 +6678,15 @@ export class Tag < TagLike
elif item isa TagHandler
let specials = item.extractDynamicParts()
- add "{vvar} = {iref} || ({iref}={ref}.{item.js(o)})"
+ # first create the reference to the array
+ let parts = Arr.new(item.@chain)
+ add "{vvar} = {iref}E || ({iref}E={parts.c(o)})"
for special,i in specials
- # add "{fragment.cvar}.{special.oid}_$ = {special.c(o)}"
- add "{vvar}[{i}]={special.c(o)}"
- # add "{ref}.{special.oid}_$ = {special.c(o)}"
+ let p = special.option(:path)
+ add "{vvar}[{p[0]}][{p[1]}]={special.c(o)}"
+ item.@chain = vvar
+ add "{bvar} || {ref}.{item.js(o)}"
+
elif item isa TagAttr and item.ns == 'bind'
let rawVal = item.value
let val = PATHIFY(rawVal)
| 7 |
diff --git a/js/background.js b/js/background.js @@ -31,16 +31,6 @@ load.JSONfromLocalFile(settings.getSetting('tosdr'), (data) => {
tosdrRegexList = Object.keys(tosdr).map(x => new RegExp(`${x}\\.`))
})
-// // Load the tracker whitelist
-// load.JSONfromLocalFile(settings.getSetting('trackerWhitelist'), (data) => {
-
-// // quote regex special chars
-// let quoted = data.trackers.map(d => d.replace(/[.?*+^$[\]\\(){}|-]/g, "\\$&"));
-// whitelistRegExp = new RegExp(quoted.join('|'));
-
-// console.log("tracker whitelist: ", whitelistRegExp);
-// })
-
// Set browser for popup asset paths
// chrome doesn't have getBrowserInfo so we'll default to chrome
// and try to detect if this is firefox
| 2 |
diff --git a/test/server/cards/07-WotW/MotoChagatai.spec.js b/test/server/cards/07-WotW/MotoChagatai.spec.js @@ -11,7 +11,7 @@ describe('Moto Chagatai', function() {
},
player2: {
inPlay: ['steward-of-law'],
- hand: ['for-shame', 'tailsman-of-the-sun'],
+ hand: ['for-shame', 'talisman-of-the-sun'],
provinces: ['public-forum', 'endless-plains']
}
});
@@ -20,8 +20,8 @@ describe('Moto Chagatai', function() {
this.shrineMaiden = this.player1.findCardByName('shrine-maiden');
this.steward = this.player2.findCardByName('steward-of-law');
- this.endlessPlains = this.player2.findCardByName('endless-plains', 'province 1');
- this.publicForum = this.player2.findCardByName('public-forum', 'province 1');
+ this.endlessPlains = this.player2.findCardByName('endless-plains');
+ this.publicForum = this.player2.findCardByName('public-forum');
this.noMoreActions();
});
@@ -29,20 +29,25 @@ describe('Moto Chagatai', function() {
it('should work if a opponent uses endless plains and moves the conflict', function () {
this.initiateConflict({
type: 'political',
- attackers: [this.chagatai, this.shrineMaiden],
- defenders: [this.steward],
- province: this.endlessPlains
+ province: this.endlessPlains,
+ attackers: [this.chagatai, this.shrineMaiden]
});
this.player2.clickCard(this.endlessPlains);
+ this.player1.clickPrompt('Yes');
this.player1.clickCard(this.shrineMaiden);
- this.player2.playAttachment('tailsman-of-the-sun', this.steward);
+ this.player2.clickPrompt('Pass');
+ this.player2.clickCard(this.steward);
+ this.player2.clickPrompt('Done');
+ this.player2.playAttachment('talisman-of-the-sun', this.steward);
this.player1.pass();
- this.player2.clickCard('tailsman-of-the-sun');
+ this.player2.clickCard('talisman-of-the-sun');
this.player2.clickCard(this.publicForum);
this.player1.pass();
this.player2.pass();
expect(this.chagatai.bowed).toBe(false);
+ expect(this.endlessPlains.isBroken).toBe(true);
+ expect(this.publicForum.isBroken).toBe(false);
});
});
});
| 1 |
diff --git a/config/redirects.js b/config/redirects.js @@ -1043,10 +1043,6 @@ module.exports = [
from: '/architecture-scenarios/application/web-app-sso/implementation-aspnetcore',
to: '/architecture-scenarios/web-app-sso/implementation-aspnetcore'
},
- {
- from: '/architecture-scenarios/b2b/b2b-authentication',
- to: '/architecture-scenarios/implementation/b2b/b2b-authentication'
- },
/* CONTENTFUL REDIRECTS */
| 2 |
diff --git a/src/modules/app/__tests__/CameraModule.spec.js b/src/modules/app/__tests__/CameraModule.spec.js @@ -26,14 +26,15 @@ describe('CameraModule', () => {
const far = 70;
const params = {
- position: position,
- fov: fov,
- aspect: aspect,
- near: near,
- far: far
+ position,
+ fov,
+ aspect,
+ near,
+ far
};
const customCameraModule = new CameraModule(params);
+ const customCameraNative = customCameraModule.camera.native;
test('has the custom Camera Position', () => {
expect(customCameraModule.camera.position.x).toBeCloseTo(position.x, 5);
@@ -42,18 +43,18 @@ describe('CameraModule', () => {
});
test('passes a custom fov value', () => {
- expect(customCameraModule.camera.native.fov).toBeCloseTo(fov, 5);
+ expect(customCameraNative.fov).toBeCloseTo(fov, 5);
});
test('passes a custom aspect value', () => {
- expect(customCameraModule.camera.native.aspect).toBeCloseTo(aspect, 5);
+ expect(customCameraNative.aspect).toBeCloseTo(aspect, 5);
});
test('passes a custom near value', () => {
- expect(customCameraModule.camera.native.near).toBeCloseTo(near, 5);
+ expect(customCameraNative.near).toBeCloseTo(near, 5);
});
test('passes a custom far value', () => {
- expect(customCameraModule.camera.native.far).toBeCloseTo(far, 5);
+ expect(customCameraNative.far).toBeCloseTo(far, 5);
});
});
| 7 |
diff --git a/assets/js/modules/analytics/components/module/ModuleAcquisitionChannelsWidget/PieChart.js b/assets/js/modules/analytics/components/module/ModuleAcquisitionChannelsWidget/PieChart.js */
import Data from 'googlesitekit-data';
import { DATE_RANGE_OFFSET, STORE_NAME } from '../../../datastore/constants';
-import { CORE_SITE } from '../../../../../googlesitekit/datastore/site/constants';
import GoogleChart from '../../../../../components/GoogleChart';
import { extractAnalyticsDataForPieChart } from '../../../util';
import { CORE_USER } from '../../../../../googlesitekit/datastore/user/constants';
@@ -60,7 +59,6 @@ export default function PieChart() {
},
],
limit: 10,
- url,
};
return {
@@ -70,8 +68,6 @@ export default function PieChart() {
};
} );
- const url = useSelect( ( select ) => select( CORE_SITE ).getCurrentEntityURL() );
-
if ( ! report || error || ! hasFinishedResolution ) {
return <PreviewBlock width="282px" height="282px" shape="circular" />;
}
| 2 |
diff --git a/src/puppeteer_utils.js b/src/puppeteer_utils.js @@ -82,6 +82,18 @@ const injectFile = async (page, filePath) => {
* Beware that the injected jQuery object will be set to the `window.$` variable and thus it might cause conflicts with
* libraries included by the page that use the same variable (e.g. another version of jQuery).
*
+ * Example usage:
+ * ```javascript
+ * await Apify.utils.puppeteer.injectJQuery(page);
+ * const title = await page.evaluate(() => {
+ * return $('head title').text();
+ * });
+ * ```
+ *
+ * Note that `injectJQuery()` does not affect the Puppeteer's
+ * <a href="https://pptr.dev/#?product=Puppeteer&show=api-pageselector" target="_blank"><code>Page.$()</code></a>
+ * function in any way.
+ *
* @param {Page} page
* Puppeteer <a href="https://pptr.dev/#?product=Puppeteer&show=api-class-page" target="_blank"><code>Page</code></a> object.
* @return {Promise}
| 7 |
diff --git a/binding.js b/binding.js @@ -73,7 +73,7 @@ module.exports.download_vips = function () {
// Ensure glibc >= 2.15
const lddVersion = process.env.LDD_VERSION;
if (lddVersion) {
- if (/(glibc|gnu libc)/i.test(lddVersion)) {
+ if (/(glibc|gnu libc|gentoo)/i.test(lddVersion)) {
const glibcVersion = lddVersion ? lddVersion.split(/\n/)[0].split(' ').slice(-1)[0].trim() : '';
if (glibcVersion && semver.lt(glibcVersion + '.0', '2.13.0')) {
error('glibc version ' + glibcVersion + ' requires manual installation - please see http://sharp.dimens.io/en/stable/install/');
| 0 |
diff --git a/site/oauth2-examples-oauth0.md b/site/oauth2-examples-oauth0.md @@ -13,7 +13,7 @@ Let's test the following 3 OAuth flows:
## Create RabbitMQ API
-In OAuth0, resources are mapped to Application APIs.
+In Auth0, resources are mapped to Application APIs.
1. Once you have logged onto your account in https://auth0.com/, go to **dashboard > Applications > APIs > Create an API**.
2. Give it the name `rabbitmq`. The important thing here is the `identifier` which must have the name of the *resource_server_id* we configured in RabbitMQ. This `identifier` goes into the `audience` JWT field. In our case, it is called `rabbitmq`.
@@ -54,7 +54,7 @@ In the settings, choose:
## Create a new user
-You can use your current OAuth0 user to login to RabbitMQ or create a dedicated user for that. Up to you.
+You can use your current Auth0 user to login to RabbitMQ or create a dedicated user for that. Up to you.
### Authorize rabbitmq-management application
@@ -70,16 +70,16 @@ You can use your current OAuth0 user to login to RabbitMQ or create a dedicated
list of users which have this role.
-## Configure RabbitMQ with OAuth0 signing key
+## Configure RabbitMQ with Auth0 signing key
-1. From Oauth0 dashboard, go to **Settings > List of Valid Keys**, and **Copy Signing Certificate** from the **CURRENTLY USED** signing key.
+1. From Auth0 dashboard, go to **Settings > List of Valid Keys**, and **Copy Signing Certificate** from the **CURRENTLY USED** signing key.
2. Create `/tmp/certiicate.pem` and paste the certificate.
3. Run `openssl x509 -in /tmp/certificate.pem -pubkey -noout > /tmp/public.pem` to extract the public key from the certificate and paste the public key into `rabbitmq.config`.
Below we have a sample RabbitMQ configuration where we have set the `default_key` identifier that we copied from
-Oauth0 and also the public key we extracted from `/tmp/public.pem`.
+Auth0 and also the public key we extracted from `/tmp/public.pem`.
<pre class="lang-erlang">
{key_config, [
@@ -105,16 +105,16 @@ CwIDAQAB
Run the following commands to run RabbitMQ:
<pre class="lang-bash">
-export MODE=oauth0
+export MODE=auth0
make start-rabbitmq
</pre>
## Verify Management UI flows
1. Go to management UI `http://localhost:15672`.
-2. Click on the single button, authenticate with your secondary OAuth0 user. You should be redirected back to the management UI.
+2. Click on the single button, authenticate with your secondary Auth0 user. You should be redirected back to the management UI.
-OAuth0 issues an access token like this one below. Where we receive in the `scope` claim
+Auth0 issues an access token like this one below. Where we receive in the `scope` claim
the requested scopes, and in the `permissions` claim the permissions. We have configured
RabbitMQ with `{extra_scopes_source, <<"permissions">>},` which means RabbitMQ uses
the scopes in the `permissions` claim too.
| 10 |
diff --git a/package.json b/package.json "name": "inferno-build",
"private": true,
"license": "MIT",
- "version": "1.3.0-rc.9",
+ "version": "1.3.0-rc.10",
"author": {
"name": "Dominic Gannaway",
"email": "[email protected]"
"chalk": "^1.1.3",
"concat-stream-es6": "0.0.1",
"convert-source-map": "^1.4.0",
- "coveralls": "^2.11.16",
+ "coveralls": "^2.12.0",
"cross-env": "^3.2.3",
"es5-shim": "^4.5.9",
"es6-shim": "^0.35.3",
"lodash": "^4.17.4",
"merge-source-map": "^1.0.3",
"mkdirp": "^0.5.1",
- "mobx": "^3.1.2",
+ "mobx": "^3.1.3",
"mocha": "^3.2.0",
"mocha-lcov-reporter": "^1.3.0",
"most": "^1.2.2",
| 6 |
diff --git a/views/partials/trendingAssets.handlebars b/views/partials/trendingAssets.handlebars {{#unless this.nsfw}}
<a href="/{{this.name}}/{{this.claimId}}">
{{#ifConditional this.fileType '===' 'video/mp4'}}
- <video class="grid-item trending-video" controls>
+ <video class="grid-item trending-video" controls onloadeddata="resetLayout()">
<source src="/media/{{this.fileName}}" >
{{!--fallback--}}
Your browser does not support the <code>video</code> element.
</video>
{{else}}
- <img class="grid-item trending-image" src="/media/{{this.fileName}}" />
+ <img class="grid-item trending-image" src="/media/{{this.fileName}}" onload="resetLayout()"/>
{{/ifConditional}}
</a>
{{/unless}}
+
{{/each}}
</div>
</div>
+
<script>
var elem = document.querySelector('.grid');
- var trendingImages = document.querySelectorAll('.trending-image');
- var trendingVideos = document.querySelectorAll('.trending-video');
var msnry = new Masonry( elem, {
itemSelector: '.grid-item'
});
- // after images are loaded, reset layout
- for (var i = 0; i < trendingVideos.length; i++) {
- trendingImages[i].addEventListener('load', function(){
- msnry.layout();
- })
- }
- // after videos are loaded, reset layout
- for (var i = 0; i < trendingVideos.length; i++) {
- trendingVideos[i].addEventListener('loadeddata', function(){
+
+ function resetLayout() {
+ console.log('resetting layout');
msnry.layout();
- })
}
</script>
+
| 1 |
diff --git a/packages/app/src/styles/theme/kibela.scss b/packages/app/src/styles/theme/kibela.scss @@ -109,4 +109,22 @@ html[dark] {
@include btn-page-editor-mode-manager(darken($primary, 15%), lighten($primary, 45%), lighten($primary, 50%));
}
}
+
+ /*
+ * GROWI Sidebar
+ */
+ .grw-sidebar {
+ // Pagetree
+ .grw-pagetree {
+ @include override-list-group-item-for-pagetree(
+ $color-list,
+ $bgcolor-sidebar-list-group,
+ $color-list-hover,
+ $bgcolor-list-hover,
+ $color-list-active,
+ lighten($bgcolor-list-active, 55%),
+ $gray-400
+ );
+ }
+ }
}
| 7 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,12 @@ 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.48.3] -- 2019-06-13
+
+### Fixed
+- Fix `hoverinfo` and `hovertemplate` behavior for `funnel` traces [#3958]
+
+
## [1.48.2] -- 2019-06-11
### Fixed
| 3 |
diff --git a/src/webroutes/resources.js b/src/webroutes/resources.js @@ -49,7 +49,12 @@ module.exports = async function action(res, req) {
//Send command request
let cmdSuccess = globals.fxRunner.srvCmd(`txaReportResources`);
if(!cmdSuccess){
- let out = await webUtils.renderMasterView('basic/generic', req.session, {message: `Couldn't load the resources list. Make sure the server is online.`});
+ let message = `Couldn't load the resources list. <br>
+ - Make sure the server is online. <br>
+ - Make sure your fxserver is build/artifact 1550 or above. <br>
+ - Make sure you are not running the fxserver outside txAdmin.`;
+
+ let out = await webUtils.renderMasterView('basic/generic', req.session, {message});
return res.send(out);
}
@@ -81,7 +86,12 @@ module.exports = async function action(res, req) {
clearInterval(intHandle);
logWarn('the future is now, old man', context);
try {
- let out = await webUtils.renderMasterView('basic/generic', req.session, {message: `Couldn't load the resources list. Make sure the server is online and txAdminClient is running.`});
+ let message = `Couldn't load the resources list. <br>
+ - Make sure the server is online. <br>
+ - Make sure your fxserver is build/artifact 1550 or above. <br>
+ - Make sure you are not running the fxserver outside txAdmin.`;
+
+ let out = await webUtils.renderMasterView('basic/generic', req.session, {message});
return res.send(out);
} catch (error) {logError(error, context)}
}
| 7 |
diff --git a/lib/carto/tracking/events.rb b/lib/carto/tracking/events.rb @@ -300,7 +300,6 @@ module Carto
def initialize(name, reporter_id, properties)
@name = name
- # TODO: remove this filtering as frontend stops sending "user_id: '-'"
@properties = properties
@format = SegmentFormat.new(@properties)
@reporter = Carto::User.where(id: reporter_id).first
| 2 |
diff --git a/Source/Scene/Model.js b/Source/Scene/Model.js @@ -5329,7 +5329,7 @@ Model.prototype.update = function (frameState) {
loadResources.resourcesParsed &&
loadResources.pendingShaderLoads === 0
) {
- if (!this.showOutline) {
+ if (this.showOutline) {
ModelOutlineLoader.outlinePrimitives(this);
}
createResources(this, frameState);
| 3 |
diff --git a/components/Vote/ElectionCandidacy.js b/components/Vote/ElectionCandidacy.js @@ -28,6 +28,7 @@ import UsernameField from '../Profile/UsernameField'
import GenderField from '../Profile/GenderField'
import withMe from '../../lib/apollo/withMe'
import Loader from '../Loader'
+import SignIn from '../Auth/SignIn'
const { H2, P } = Interaction
@@ -300,7 +301,22 @@ class ElectionCandidacy extends React.Component {
render={() => {
const { me, election } = data
if (!election) {
- return <P>404</P>
+ return null
+ }
+ if (!election.userIsEligible) {
+ return (
+ <>
+ <H2>{t('withMembership/title')}</H2>
+ {!me && (
+ <div style={{ margin: '20px 0' }}>
+ <SignIn />
+ </div>
+ )}
+ <P style={{ marginTop: 20 }}>
+ {vt('info/candidacy/notEligable')}
+ </P>
+ </>
+ )
}
const {
values,
@@ -635,6 +651,7 @@ const query = gql`
election(slug: $slug) {
id
candidacyEndDate
+ userIsEligible
}
me {
id
| 9 |
diff --git a/packages/vulcan-forms/lib/components/Form.jsx b/packages/vulcan-forms/lib/components/Form.jsx @@ -74,6 +74,8 @@ class Form extends Component {
this.initialDocument = merge({}, this.props.prefilledProps, this.props.document);
}
+ defaultValues = {};
+
submitFormCallbacks = [];
successFormCallbacks = [];
failureFormCallbacks = [];
@@ -108,16 +110,11 @@ class Form extends Component {
/*
- Get the current document (for edit forms)
-
- for each field, we apply the following logic:
- - if its value was provided by prefilledProps, use that
- - unless its value was provided by the db (i.e. props.document)
- - unless its value is currently being inputted
+ Get the current document
*/
getDocument = () => {
- const document = merge({}, this.initialDocument, this.state.currentValues);
+ const document = merge({}, this.initialDocument, this.defaultValues, this.state.currentValues);
return document;
};
@@ -147,6 +144,15 @@ class Form extends Component {
return data;
};
+ /*
+
+
+
+ */
+ getDefaultValues = () => {
+
+ }
+
// --------------------------------------------------------------------- //
// -------------------------------- Fields ----------------------------- //
// --------------------------------------------------------------------- //
@@ -254,6 +260,10 @@ class Form extends Component {
layout: this.props.layout,
};
+ if (field.defaultValue) {
+ set(this.defaultValues, fieldPath, field.defaultValue);
+ }
+
// if field has a parent field, pass it on
if (parentFieldName) {
field.parentFieldName = parentFieldName;
| 9 |
diff --git a/semantics.json b/semantics.json "H5P.GoToQuestion 1.3",
"H5P.IVHotspot 1.2",
"H5P.Questionnaire 1.3",
- "H5P.FreeTextQuestion 1.0"
+ "H5P.FreeTextQuestion 1.0",
+ "H5P.MultiMediaChoice 0.3"
]
},
{
| 0 |
diff --git a/extension/data/tbutils.js b/extension/data/tbutils.js @@ -258,7 +258,7 @@ function initwrapper ({userDetails, newModSubs, cacheDetails}) {
* @param {string} subreddit when present cache is threated as an object and the value will be written to subreddit property. If missing the value is pushed.
*/
TBUtils.updateCache = function updateCache (cacheName, value, subreddit) {
- console.log('update cache', cacheName, subreddit, value);
+ logger.debug('update cache', cacheName, subreddit, value);
if (subreddit) {
TBUtils[cacheName][subreddit] = value;
| 4 |
diff --git a/app/models/carto/api_key_grants.rb b/app/models/carto/api_key_grants.rb @@ -37,7 +37,6 @@ module Carto
attr_reader :granted_apis
def initialize(grants_json = [])
- @granted_apis = []
@table_permissions = {}
# TODO: this should be removed when complete, previous json schema validation grants it
@@ -47,7 +46,7 @@ module Carto
grants_json.each { |grant| process_grant(grant) }
- raise EmptyGrantedApisError.new if @granted_apis.empty?
+ raise EmptyGrantedApisError.new unless granted_apis
end
def table_permissions
@@ -73,6 +72,7 @@ module Carto
type = grant[:type]
case type
when 'apis'
+ @granted_apis ||= []
@granted_apis += generate_apis_grant(grant[:apis])
when 'database'
process_database_grant(grant[:tables])
@@ -82,6 +82,7 @@ module Carto
end
def generate_apis_grant(grant)
+ grant ||= []
grant.select { |api| ALLOWED_APIS.include?(api.downcase) }
end
| 11 |
diff --git a/articles/cms/wordpress/jwt-authentication.md b/articles/cms/wordpress/jwt-authentication.md @@ -30,6 +30,10 @@ If you've also installed and enabled the latest version of the [Auth0 WordPress
## Authenticating requests
+::: note
+See [access tokens](/tokens/access-token) (both JWTs and opaque strings) for additional information.
+:::
+
To authenticate a request using JWT, add an `Authorization` header to the request:
```txt
| 0 |
diff --git a/api/src/server.js b/api/src/server.js @@ -19,7 +19,7 @@ const api = express();
setupExpressRequestHandler(api);
-api.use(cors());
+api.use(cors({ maxAge: 1728000 }));
api.use(compression());
api.use(bodyParser.urlencoded({ extended: true }));
api.use(bodyParser.json({ limit: '5mb' }));
@@ -81,7 +81,7 @@ api.use(function setPoweredByHeaders(req, res, next) {
next();
});
-fs.readdirSync(path.join(__dirname, 'routes')).map(file => {
+fs.readdirSync(path.join(__dirname, 'routes')).map((file) => {
require('./routes/' + file)(api);
});
@@ -90,7 +90,7 @@ if (require.main === module) {
startSampling('winds.event_loop.api.delay');
- api.listen(config.server.port, err => {
+ api.listen(config.server.port, (err) => {
if (err) {
logger.error({ err });
process.exit(1);
| 12 |
diff --git a/admin-base/materialize/custom/_global.scss b/admin-base/materialize/custom/_global.scss @@ -39,11 +39,13 @@ dl {
.fade-enter, .fade-leave-to /* .fade-leave-active in <2.1.8 */ {
opacity: 0
}
+
.svg-icon {
display: inline-block;
position: relative;
- width: 100%;
- padding-bottom: 100%;
+ width: 24px;
+ padding-bottom: 24px;
+ line-height: 1em;
vertical-align: middle;
overflow: hidden;
.svg-content {
@@ -55,34 +57,6 @@ dl {
}
}
-.svg-icons {
- font-weight: normal;
- font-style: normal;
- font-size: 24px;
- width: 24px;
- height: 24px;
- line-height: 1;
- display: inline-block;
- background-size: 100%;
- background-position: center center;
- background-repeat: no-repeat;
- &.svg-icon-copy {
- background-image: url('/etc/felibs/admin/images/icon-copy.svg')
- }
- &.svg-icon-paste {
- background-image: url('/etc/felibs/admin/images/icon-paste.svg')
- }
- &.svg-icon-rename {
- background-image: url('/etc/felibs/admin/images/icon-rename.svg')
- }
- &.svg-icon-open-folder {
- background-image: url('/etc/felibs/admin/images/icon-open-folder.svg')
- }
- &.svg-icon-edit-page {
- background-image: url('/etc/felibs/admin/images/icon-edit-page.svg')
- }
-}
-
.clearfix:before,
.clearfix:after {
display: table;
| 12 |
diff --git a/server.js b/server.js @@ -49,29 +49,12 @@ app.prepare().then(async () => {
server.get("/experiences", async (r, s) => s.redirect("/_/system"));
server.get("/_/experiences", async (r, s) => s.redirect("/_/system"));
server.get("/system/:c", async (r, s) => s.redirect(`/_/system/${r.params.c}`));
-
server.get("/experiences/:m", async (r, s) => s.redirect(`/_/experiences/${r.params.m}`));
server.all("/api/:a", async (r, s, next) => {
return handler(r, s, r.url);
});
- // NOTE(jim): Upload data
- server.post("/api/data/:b", async (req, res) => {
- // NOTE(jim): Let this request take as long as it needs to.
- req.setTimeout(0);
-
- return await handler(req, res, req.url);
- });
-
- // NOTE(jim): Upload data for deal
- server.post("/api/data/deal/:b", async (req, res) => {
- // NOTE(jim): Let this request take as long as it needs to.
- req.setTimeout(0);
-
- return await handler(req, res, req.url);
- });
-
server.all("/api/:a/:b", async (r, s, next) => {
return handler(r, s, r.url);
});
| 2 |
diff --git a/tests/uri_router_test.py b/tests/uri_router_test.py @@ -23,7 +23,7 @@ def test_error_for_bots():
r = fc.post(uri, json=d)
pkeq(200, r.status_code)
- r = fc.post(uri, environ_base={'HTTP_USER_AGENT': f'I AM A BOT'}, json=d)
+ r = fc.post(uri, environ_base={'HTTP_USER_AGENT': 'SPIDER'}, json=d)
pkeq(500, r.status_code)
| 12 |
diff --git a/Makefile b/Makefile .DEFAULT_GOAL=build
GO_LINT := $(GOPATH)/bin/golint
+WORK_DIR := ./sparta
################################################################################
# Meta
@@ -96,6 +97,10 @@ describe: build
################################################################################
# ALM commands
################################################################################
+.PHONY: ensure-preconditions
+ensure-preconditions:
+ mkdir -pv $(WORK_DIR)
+
.PHONY: clean
clean:
go clean .
@@ -105,6 +110,13 @@ clean:
test: validate
go test -v -cover ./...
+.PHONY: test-cover
+test-cover: ensure-preconditions
+ go test -coverprofile=$(WORK_DIR)/cover.out -v .
+ go tool cover -html=$(WORK_DIR)/cover.out
+ rm $(WORK_DIR)/cover.out
+ open $(WORK_DIR)/cover.html
+
.PHONY: build
build: validate test
go build .
| 0 |
diff --git a/src/containers/language-selector.jsx b/src/containers/language-selector.jsx @@ -27,6 +27,7 @@ class LanguageSelector extends React.Component {
children,
...props
} = this.props;
+ document.documentElement.lang = this.props.currentLocale; //update the lang attribute of the html for screenreaders
return (
<LanguageSelectorComponent
onChange={this.handleChange}
| 12 |
diff --git a/test/unit/specs/store/user.spec.js b/test/unit/specs/store/user.spec.js @@ -158,12 +158,14 @@ describe('Module: User', () => {
store.dispatch('setErrorCollection', { account: 'abc', optin: true })
expect(store.state.user.errorCollection).toBe(true)
expect(window.analytics).toBeTruthy()
+ expect(ravenSpy).toHaveBeenCalled()
+ expect(ravenSpy).not.toHaveBeenCalled('')
expect(ravenSpy.mock.calls).toMatchSnapshot()
store.dispatch('setErrorCollection', { account: 'abc', optin: false })
expect(store.state.user.errorCollection).toBe(false)
expect(window.analytics).toBeFalsy()
- expect(ravenSpy).toBeCalledWith('')
+ expect(ravenSpy).toHaveBeenCalledWith('')
})
it('should persist the error collection opt in', () => {
| 7 |
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml -# name: Dependabot auto-merge
-# on: pull_request
+name: Dependabot auto-merge
+on: pull_request
-# permissions:
-# contents: write
+permissions:
+ contents: write
-# jobs:
-# dependabot:
-# runs-on: ubuntu-latest
-# if: ${{ github.actor == 'dependabot[bot]' }}
-# steps:
-# - name: Dependabot metadata
-# id: metadata
-# uses: dependabot/[email protected]
-# with:
-# github-token: "${{ secrets.GITHUB_TOKEN }}"
-# - 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}}
-# GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+jobs:
+ dependabot:
+ runs-on: ubuntu-latest
+ if: ${{ github.actor == 'dependabot[bot]' }}
+ steps:
+ - name: Dependabot metadata
+ id: metadata
+ uses: dependabot/[email protected]
+ with:
+ github-token: "${{ secrets.GITHUB_TOKEN }}"
+ - name: Enable auto-merge for Stripe SDKs Dependabot PRs
+ if: ${{ 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}}
+ GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
| 3 |
diff --git a/packages/emergency-response/src/components/App/index.js b/packages/emergency-response/src/components/App/index.js @@ -6,6 +6,7 @@ import React from 'react';
import '@hackoregon/component-library/assets/global.styles.css';
import '@hackoregon/component-library/assets/vendor/leaflet.css';
+import firstFiveMinutesTimeline from '../../../assets/emergency-response-5min.svg';
import { PageLayout, StoryCard, CivicStoryCard } from '@hackoregon/component-library';
@@ -101,7 +102,7 @@ function App(props) {
>
<img
style={{ maxWidth: '100%' }}
- src="https://s3-us-west-2.amazonaws.com/hacko-emergency-response-staging/emergency-response-5min-lg.png"
+ src={firstFiveMinutesTimeline}
alt="Timeline of a fire response"
/>
<p className="Description">
| 14 |
diff --git a/src/consumer/offsetManager/index.js b/src/consumer/offsetManager/index.js @@ -293,10 +293,9 @@ module.exports = class OffsetManager {
}
offsets.forEach(({ topic, partitions }) => {
- this.committedOffsets[topic] = partitions.reduce(
- indexPartitions,
- { ...this.committedOffsets[topic] },
- )
+ this.committedOffsets[topic] = partitions.reduce(indexPartitions, {
+ ...this.committedOffsets[topic],
+ })
})
}
| 1 |
diff --git a/articles/guides/ip-whitelist.md b/articles/guides/ip-whitelist.md @@ -35,19 +35,20 @@ The IP addresses are region-specific.
### United States
```text
-35.167.74.121, 35.166.202.113, 35.160.3.103, 54.183.64.135, 54.67.77.38, 54.67.15.170, 54.183.204.205
+35.167.74.121, 35.166.202.113, 35.160.3.103, 54.183.64.135, 54.67.77.38, 54.67.15.170, 54.183.204.205, 35.171.156.124, 18.233.90.226, 3.211.189.167
```
### Europe
```text
-52.28.56.226, 52.28.45.240, 52.16.224.164, 52.16.193.66, 34.253.4.94, 52.50.106.250, 52.211.56.181, 52.213.38.246, 52.213.74.69, 52.213.216.142, 35.156.51.163, 35.157.221.52, 52.28.184.187, 52.28.212.16, 52.29.176.99, 52.57.230.214
+52.28.56.226, 52.28.45.240, 52.16.224.164, 52.16.193.66, 34.253.4.94, 52.50.106.250, 52.211.56.181, 52.213.38.246, 52.213.74.69, 52.213.216.142, 35.156.51.163, 35.157.221.52, 52.28.184.187, 52.28.212.16, 52.29.176.99, 52.57.230.214, 54.76.184.103, 52.210.122.50, 52.208.95.174, 52.210.122.50, 52.208.95.174, 54.76.184.103
+
```
### Australia
```text
-54.153.131.0, 13.210.52.131, 13.55.232.24, 13.54.254.182, 52.62.91.160, 52.63.36.78, 52.64.120.184, 54.66.205.24, 54.79.46.4
+52.64.84.177, 52.64.111.197, 54.153.131.0, 13.210.52.131, 13.55.232.24, 13.54.254.182, 52.62.91.160, 52.63.36.78, 52.64.120.184, 54.66.205.24, 54.79.46.4
```
## Inbound Calls
| 3 |
diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js @@ -593,26 +593,27 @@ BlazeComponent.extendComponent({
this.term.set(evt.target.searchTerm.value);
},
'click .js-minicard'(evt) {
- // LINK CARD
- const card = Blaze.getData(evt.currentTarget);
- const _id = Cards.insert({
- title: card.title, //dummy
- listId: this.listId,
- swimlaneId: this.swimlaneId,
- boardId: this.boardId,
- sort: Lists.findOne(this.listId).cards().count(),
- type: 'cardType-linkedCard',
- linkedId: card.linkedId || card._id,
- });
+ let card = Blaze.getData(evt.currentTarget);
+ let _id = '';
+ // Common
+ card.listId = this.listId;
+ card.swimlaneId = this.swimlaneId;
+ card.boardId = this.boardId;
+ card.sort = Lists.findOne(this.listId).cards().count();
+ // From template
+ if (this.isTemplateSearch) {
+ card.type = 'cardType-card';
+ card.linkedId = '';
+ _id = card.copy();
+ } else { // Linked
+ card._id = null;
+ card.type = 'cardType-linkedCard';
+ card.linkedId = card.linkedId || card._id;
+ _id = Cards.insert(card);
+ }
Filter.addException(_id);
Popup.close();
},
}];
},
}).register('searchCardPopup');
-
-Template.searchCardPopup.helpers({
- isTemplateSearch() {
- return $(Popup._getTopStack().openerElement).hasClass('js-search-template');
- },
-});
| 11 |
diff --git a/src/lib/taxcalc.js b/src/lib/taxcalc.js @@ -3,6 +3,10 @@ function isSpecialPriceActive(fromDate, toDate) {
fromDate = new Date(fromDate) || false
toDate = new Date(toDate) || false
+ if (!fromDate && !toDate) {
+ return true
+ }
+
if (fromDate && toDate) {
return fromDate < now && toDate > now
}
| 12 |
diff --git a/layouts/partials/fragments/content-split.html b/layouts/partials/fragments/content-split.html {{- printf " text-muted text-%s" "secondary" -}}
{{- end -}}
">
- {{- $self.Content | markdownify -}}
+ {{- .content | markdownify -}}
</div>
</div>
{{end}}
| 1 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.