code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/src/feed.ts b/src/feed.ts @@ -108,7 +108,7 @@ export type EnrichedActivity<
latest_reactions?: ReactionsRecords<ReactionType, ChildReactionType, UserType>;
latest_reactions_extra?: Record<string, { next?: string }>;
- own_reactions?: ReactionsRecords<ReactionType, ChildReactionType, UserType>[];
+ own_reactions?: ReactionsRecords<ReactionType, ChildReactionType, UserType>;
own_reactions_extra?: Record<string, { next?: string }>;
// Reaction posted to feed
reaction?: EnrichedReaction<ReactionType, ChildReactionType, UserType>;
| 1 |
diff --git a/assets/js/modules/analytics/components/dashboard/DashboardUniqueVisitorsWidget.stories.js b/assets/js/modules/analytics/components/dashboard/DashboardUniqueVisitorsWidget.stories.js @@ -69,8 +69,7 @@ const optionsCompareEntityURL = {
const WidgetAreaTemplate = ( args ) => {
return (
<WithRegistrySetup func={ args?.setupRegistry }>
- <WidgetAreaRenderer slug={ areaName }>
- </WidgetAreaRenderer>
+ <WidgetAreaRenderer slug={ areaName } />
</WithRegistrySetup>
);
};
| 2 |
diff --git a/src/navigation/checkout/CreditCard.js b/src/navigation/checkout/CreditCard.js @@ -65,12 +65,16 @@ class CreditCard extends Component {
return (
<Container>
- <Content padder contentContainerStyle={ styles.content }>
- <Text style={{ marginBottom: 10 }}>
+ <View style={ styles.content }>
+ <View style={{ alignSelf: 'stretch' }}>
+ <Text style={{ textAlign: 'center', marginBottom: 10 }}>
{ this.props.t('ENTER_PAY_DETAILS') }
</Text>
+ <View style={ styles.creditCardInputContainer }>
<LiteCreditCardInput onChange={ this._onChange.bind(this) } />
- </Content>
+ </View>
+ </View>
+ </View>
<Footer>
<FooterTab>
<Button full onPress={ this._onClick.bind(this) }>
@@ -90,6 +94,11 @@ const styles = StyleSheet.create({
flex: 1,
justifyContent: 'center',
alignItems: 'center'
+ },
+ creditCardInputContainer: {
+ backgroundColor: '#f7f7f7',
+ paddingVertical: 10,
+ paddingHorizontal: 20,
}
})
| 7 |
diff --git a/src/components/dashboard/Dashboard.js b/src/components/dashboard/Dashboard.js @@ -14,7 +14,7 @@ import TabsView from '../appNavigation/TabsView'
import { Avatar, BigGoodDollar, Section, Wrapper } from '../common'
import Amount from './Amount'
import Claim from './Claim'
-import FaceRecognition from './faceRecognition/FaceRecognition.web'
+import FaceRecognition from './FaceRecognition/FaceRecognition'
import FeedList from './FeedList'
import FeedModalItem from './FeedItems/FeedModalItem'
import Reason from './Reason'
| 1 |
diff --git a/generators/server/templates/src/main/docker/jhipster-control-center.yml.ejs b/generators/server/templates/src/main/docker/jhipster-control-center.yml.ejs @@ -35,24 +35,31 @@ limitations under the License.
# - SPRING_CLOUD_DISCOVERY_CLIENT_SIMPLE_INSTANCES_MYAPP_1_URI=http://host.docker.internal:8082
# Or add a new application named MyNewApp
# - SPRING_CLOUD_DISCOVERY_CLIENT_SIMPLE_INSTANCES_MYNEWAPP_0_URI=http://host.docker.internal:8080
+<%_ let discoveryProfile = serviceDiscoveryType ? serviceDiscoveryType : 'static'; _%>
version: '<%= DOCKER_COMPOSE_FORMAT_VERSION %>'
services:
jhipster-control-center:
image: '<%= DOCKER_JHIPSTER_CONTROL_CENTER %>'
environment:
- _JAVA_OPTIONS=-Xmx512m -Xms256m
- - SPRING_PROFILES_ACTIVE=prod,swagger,static<% if (authenticationType === 'oauth2') { %>,oauth2<% } %>
+ - SPRING_PROFILES_ACTIVE=prod,swagger,<%= discoveryProfile %><% if (authenticationType === 'oauth2') { %>,oauth2<% } %>
+ - JHIPSTER_SLEEP=30 # gives time for other services to boot before the application
<%_ if (authenticationType === 'jwt') { _%>
- SPRING_SECURITY_USER_PASSWORD=admin
- <%_ } _%>
- - MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED=true
- - JHIPSTER_SLEEP=30 # gives time for other services to boot before the application
- <%_ if (authenticationType === 'oauth2') { _%>
+ - JHIPSTER_SECURITY_AUTHENTICATION_JWT_BASE64_SECRET=<%= jwtSecretKey %>
+ <%_ } else if (authenticationType === 'oauth2') { _%>
# For keycloak to work, you need to add '127.0.0.1 keycloak' to your hosts file
- SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/auth/realms/jhipster
- SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=jhipster-control-center
- SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=jhipster-control-center
<%_ } _%>
- - SPRING_CLOUD_DISCOVERY_CLIENT_SIMPLE_INSTANCES_MYAPP_0_URI=http://host.docker.internal:8081
+ <%_ if (discoveryProfile === 'eureka') { _%>
+ - EUREKA_CLIENT_SERVICE_URL_DEFAULTZONE=http://admin:[email protected]:8761/eureka/
+ <%_ } else if (discoveryProfile === 'consul') { _%>
+ - SPRING_CLOUD_CONSUL_HOST=host.docker.internal
+ - SPRING_CLOUD_CONSUL_PORT=8500
+ <%_ } else { _%>
+ - SPRING_CLOUD_DISCOVERY_CLIENT_SIMPLE_INSTANCES_<%= baseName.toUpperCase() %>_0_URI=http://host.docker.internal:<%= serverPort %>
+ <%_ } _%>
ports:
- 7419:7419
| 7 |
diff --git a/server/interpreter.js b/server/interpreter.js @@ -551,12 +551,9 @@ Interpreter.prototype.initBuiltins_ = function() {
// Initialize ES standard global functions.
var intrp = this;
- var eval_ = new this.NativeFunction;
- eval_.setName('eval');
- intrp.setProperty(eval_, 'length', 1, Descriptor.c);
-
- /** @override */
- eval_.call = function(intrp, thread, state, thisVal, args) {
+ var eval_ = new this.NativeFunction({
+ id: 'eval', length: 1,
+ call: function(intrp, thread, state, thisVal, args) {
var code = args[0];
if (typeof code !== 'string') { // eval()
// Eval returns the argument if the argument is not a string.
@@ -576,9 +573,8 @@ Interpreter.prototype.initBuiltins_ = function() {
thread.stateStack_.push(new Interpreter.State(evalNode, scope));
state.value = undefined; // Default value if no explicit return.
return FunctionResult.AwaitValue;
- };
- eval_.call.id = 'eval'; // For serialization.
- this.builtins_['eval'] = eval_;
+ }
+ });
// eval is a special case; it must be added to the global scope at
// startup time (rather than by a "var eval = new 'eval';" statement
// in es5.js) because binding eval is illegal in strict mode.
| 4 |
diff --git a/package.json b/package.json "babel-plugin-transform-amd-system-wrapper": "^0.3.3",
"babel-plugin-transform-cjs-system-wrapper": "^0.5.0",
"babel-plugin-transform-es2015-modules-systemjs": "^6.6.5",
- "babel-plugin-transform-global-system-wrapper": "^0.2.0",
+ "babel-plugin-transform-global-system-wrapper": "^0.3.0",
"babel-plugin-transform-system-register": "^0.0.1",
"bluebird": "^3.3.4",
"data-uri-to-buffer": "0.0.4",
| 3 |
diff --git a/packages/node_modules/@node-red/runtime/lib/api/diagnostics.js b/packages/node_modules/@node-red/runtime/lib/api/diagnostics.js @@ -117,18 +117,15 @@ function buildDiagnosticReport(scope, callback) {
adminAuth: runtime.settings.adminAuth ? "SET" : "UNSET",
- httpAdminRoot: runtime.settings.adminAuth ? "SET" : "UNSET",
- httpAdminCors: runtime.settings.httpAdminCors ? "SET" : "UNSET",
- httpNodeAuth: runtime.settings.httpNodeAuth ? "SET" : "UNSET",
-
httpAdminRoot: runtime.settings.httpAdminRoot || "UNSET",
httpAdminCors: runtime.settings.httpAdminCors ? "SET" : "UNSET",
+ httpNodeAuth: runtime.settings.httpNodeAuth ? "SET" : "UNSET",
httpNodeRoot: runtime.settings.httpNodeRoot || "UNSET",
httpNodeCors: runtime.settings.httpNodeCors ? "SET" : "UNSET",
httpStatic: runtime.settings.httpStatic ? "SET" : "UNSET",
- httpStatic: runtime.settings.httpStaticRoot || "UNSET",
+ httpStaticRoot: runtime.settings.httpStaticRoot || "UNSET",
httpStaticCors: runtime.settings.httpStaticCors ? "SET" : "UNSET",
uiHost: runtime.settings.uiHost ? "SET" : "UNSET",
| 1 |
diff --git a/pages/search.js b/pages/search.js @@ -144,6 +144,11 @@ class Search extends React.Component {
query.until = until
}
+ const since = moment(query.until).utc().subtract(30, 'day').format('YYYY-MM-DD')
+ if (!query.since) {
+ query.since = since
+ }
+
[testNamesR, countriesR] = await Promise.all([
client.get('/api/_/test_names'),
client.get('/api/_/countries')
| 12 |
diff --git a/components/core/SlatePreviewBlock.js b/components/core/SlatePreviewBlock.js @@ -57,7 +57,7 @@ const STYLES_PLACEHOLDER = css`
export class SlatePreviewRow extends React.Component {
render() {
let objects = this.props.objects;
- let components = objects.map((each) => (
+ let components = objects.slice(1).map((each) => (
<div key={each.id} css={STYLES_ITEM_BOX}>
<SlateMediaObjectPreview
file={each}
| 2 |
diff --git a/src/server/routes/apiv3/notification-setting.js b/src/server/routes/apiv3/notification-setting.js @@ -212,9 +212,7 @@ module.exports = (crowi) => {
notification.slackChannels = slackChannels;
break;
default:
- logger.error('GlobalNotificationSetting Type Error: undefined type');
- req.flash('errorMessage', 'Error occurred in creating a new global notification setting: undefined notification type');
- return res.redirect('/admin/notification#global-notification');
+ return res.apiv3Err(new ErrorV3('Error occurred in creating a new global notification setting: undefined notification type'));
}
notification.triggerPath = triggerPath;
| 14 |
diff --git a/create-snowpack-app/cli/README.md b/create-snowpack-app/cli/README.md @@ -31,4 +31,5 @@ npx create-snowpack-app new-dir --template @snowpack/app-template-NAME [--use-ya
- [hyperapp-snowpack](https://github.com/bmartel/hyperapp-snowpack) (Hyperapp + Snowpack + TailwindCSS)
- [snowpack-vue-capacitor-2-demo](https://github.com/brodybits/snowpack-vue-capacitor-2-demo) Demo of Snowpack with Vue and [Capacitor mobile app framework](https://capacitorjs.com/) version 2, originally generated from `@snowpack/vue-template` template, see [discussion #905](https://github.com/snowpackjs/snowpack/discussions/905)
- [snowpack-react-ssr](https://github.com/matthoffner/snowpack-react-ssr) (React + Server Side Rendering)
+- [snowpack-app-template-preact-hmr-tailwind](https://github.com/Mozart409/snowpack-app-template-preact-hmr-tailwind) (Snowpack + Preact + HMR + Tailwindcss)
- PRs that add a link to this list are welcome!
| 0 |
diff --git a/src/components/templates/Articles/index.js b/src/components/templates/Articles/index.js @@ -11,14 +11,12 @@ import { colors } from 'theme'
export default class Articles extends Component {
render() {
const post = this.props.data.mdx
+ const seoDescription = `${post.frontmatter.title}` + '— an article by' + `${post.frontmatter.author.id}` + 'on Liferay.Design'
return (
<div>
<Helmet>
- <title>
- {post.frontmatter.title} — an article by{' '}
- {post.frontmatter.author.id} on Liferay.Design
- </title>
+ <title>{seoDescription}</title>
<meta property="og:type" content="article" />
<meta
property="og:image"
@@ -34,6 +32,7 @@ export default class Articles extends Component {
}
/>
<meta property="og:description" content={post.excerpt} />
+ <meta name="Description" content={seoDescription}></meta>
<meta
property="og:title"
content={
| 7 |
diff --git a/src/platforms/app-plus/service/framework/page.js b/src/platforms/app-plus/service/framework/page.js @@ -59,7 +59,7 @@ export function registerPage ({
route,
options: Object.assign({}, query || {}),
$getAppWebview () {
- return webview
+ return plus.webview.getWebviewById(webview.id)
},
$page: {
id: parseInt(webview.id),
| 1 |
diff --git a/src/node.js b/src/node.js @@ -487,6 +487,16 @@ var _ = Mavo.Node = $.Class({
return path.reduce((acc, cur) => acc.children[cur], this);
},
+ getAll: function() {
+ if (this.closestCollection) {
+ var relativePath = this.pathFrom(this.closestItem);
+ return this.closestCollection.children.map(item => item.getDescendant(relativePath));
+ }
+ else {
+ return [this];
+ }
+ },
+
/**
* Get same node in other item in same collection
* E.g. for same node in the next item, use an offset of -1
@@ -740,17 +750,17 @@ var _ = Mavo.Node = $.Class({
},
$all: function() {
- return this.closestCollection ? this.closestCollection.getLiveData() : null;
+ return this.getAll().map(obj => obj.getLiveData());
},
$next: function() {
- var all = _.special.$all.call(this);
- return all ? all[this.closestItem.index + 1] : null;
+ var ret = this.getCousin(1);
+ return ret? ret.getLiveData() : null;
},
$previous: function() {
- var all = _.special.$all.call(this);
- return all ? all[this.closestItem.index - 1] : null;
+ var ret = this.getCousin(-1);
+ return ret? ret.getLiveData() : null;
}
}
}
| 1 |
diff --git a/src/dashboard/dashboard.tmpl b/src/dashboard/dashboard.tmpl <% if (privateConfig.sentry && privateConfig.sentry.enabled) { %>
<script src="/bower_components/raven-js/dist/raven.min.js"></script>
<script type="text/javascript">
- Raven.config('<%- privateConfig.sentry.publicDsn %>', <%= JSON.stringify(ravenConfig) %>}).install();
+ Raven.config('<%- privateConfig.sentry.publicDsn %>', <%= JSON.stringify(ravenConfig) %>).install();
window.addEventListener('unhandledrejection', function (err) {
Raven.captureException(err.reason);
});
</script>
<!-- other dashboard scripts -->
- <script src="/bower_components/draggabilly/dist/draggabilly.pkgd.min.js" async="async"></script>
- <script src="/bower_components/iframe-resizer/js/iframeResizer.min.js" async="async"></script>
+ <script src="/bower_components/draggabilly/dist/draggabilly.pkgd.min.js" async></script>
+ <script src="/bower_components/iframe-resizer/js/iframeResizer.min.js" async></script>
<script src="/bower_components/packery/dist/packery.pkgd.min.js"></script>
<script src="/bower_components/clipboard/dist/clipboard.min.js"></script>
<script src="/bower_components/webcomponentsjs/webcomponents-loader.js"></script>
window.token = params.key || Cookies.get('socketToken');
if (window.token) {
window.socket = io(undefined, {
- query: 'token=' + window.token
+ query: {
+ token: window.token
+ }
});
} else {
window.socket = io();
| 3 |
diff --git a/server/game/cards/01 - Core/MirumotosFury.js b/server/game/cards/01 - Core/MirumotosFury.js @@ -14,7 +14,7 @@ class MirumotosFury extends DrawCard {
},
handler: context => {
let tmp = _.size(this.game.allCards.filter(card => card.isProvince && card.facedown && card.controller === this.controller));
- this.game.addMessage('{0} uses {1} to bow {2} with glory {3} unrev {4}', this.controller, this, context.target, tmp), context.target.getGlory();
+ this.game.addMessage('{0} uses {1} to bow {2}', this.controller, this), context.target.getGlory();
this.controller.bowCard(context.target);
}
});
| 2 |
diff --git a/package.json b/package.json "scripts": {
"preinstall": "make pre-install",
"test": "make test-all",
- "docker-test": "docker run -v `pwd`:/srv carto/nodejs6-xenial-pg101 bash run_tests_docker.sh && docker ps --filter status=dead --filter status=exited -aq | xargs -r docker rm -v",
- "docker-bash": "docker run -it -v `pwd`:/srv carto/nodejs6-xenial-pg101 bash"
+ "docker-test": "docker run -v `pwd`:/srv carto/nodejs10-xenial-pg101 bash run_tests_docker.sh && docker ps --filter status=dead --filter status=exited -aq | xargs -r docker rm -v",
+ "docker-bash": "docker run -it -v `pwd`:/srv carto/nodejs10-xenial-pg101 bash"
},
"engines": {
"node": ">=6.9",
| 4 |
diff --git a/spark/components/masthead/vanilla/masthead.stories.js b/spark/components/masthead/vanilla/masthead.stories.js @@ -472,9 +472,7 @@ export const extended = () => {
</li>
</ul>
</nav>
-
</div>
-
<nav class="sprk-c-Masthead__narrow-nav sprk-u-Display--none" data-sprk-mobile-nav="mobileNav2" role="navigation" data-id="navigation-narrow-2">
<div data-sprk-masthead-mask="">
| 1 |
diff --git a/js/kraken.js b/js/kraken.js @@ -836,8 +836,13 @@ module.exports = class kraken extends Exchange {
}
}
return {
- 'info': response,
'id': id,
+ 'info': response,
+ 'symbol': symbol,
+ 'type': type,
+ 'side': side,
+ 'price': order['price'],
+ 'amount': order['volume'],
};
}
| 7 |
diff --git a/scripts/dependency_checker.py b/scripts/dependency_checker.py @@ -84,34 +84,22 @@ class DependencyChecker:
return is_stable
def write_fixes(self):
+ # go through the package.jsons and write the updated dependencies
for package in self.dependency_graph.keys():
filename = self.dependency_graph[package]['file_path']
-
with open(str(filename), 'r+') as f:
+ # read old data
data = json.load(f)
+ # update data
package_name = data['name']
if DEV_DEP in data:
data[DEV_DEP] = self.dependency_graph[package_name][DEV_DEP]
if DEP in data:
data[DEP] = self.dependency_graph[package_name][DEP]
-
+ # write new data
f.seek(0)
f.write(json.dumps(data, indent=2))
- # for directory in SEARCH_DIR:
- # for filename in Path(os.getcwd() + directory).rglob('package.json'):
- # #ignore node_modules
- # if "node_modules" in str(filename):
- # continue
- #
- # with open(str(filename), 'r+') as f:
- # data = json.load(f)
- # package_name = data['name']
- # data = self.dependency_graph[package_name]
- # print(data)
- # # f.seek(0)
- # # f.write(json.dumps(data, indent=2))
-
if __name__ == "__main__":
parser = argparse.ArgumentParser()
| 2 |
diff --git a/renderer.js b/renderer.js @@ -113,7 +113,7 @@ dolly.add(camera);
// dolly.add(avatarCamera);
scene.add(dolly);
-// const orthographicCamera = new THREE.OrthographicCamera(-1, 1, 1, -1, 0.1, 100);
+const orthographicCamera = new THREE.OrthographicCamera(-1, 1, 1, -1, 0.01, 100);
// scene.add(orthographicCamera);
window.addEventListener('resize', e => {
@@ -181,7 +181,7 @@ export {
postScene,
// avatarScene,
camera,
- // orthographicCamera,
+ orthographicCamera,
// avatarCamera,
dolly,
/*orbitControls, renderer2,*/
| 0 |
diff --git a/vis/js/io.js b/vis/js/io.js @@ -229,7 +229,7 @@ IO.prototype = {
return d.x;
});
var mean_y = d3.mean(papers, function (d) {
- return d.y;
+ return d.y*(-1);
});
area_x.push(mean_x);
| 1 |
diff --git a/assets/js/components/GoogleChartV2.js b/assets/js/components/GoogleChartV2.js @@ -73,7 +73,7 @@ export default function GoogleChartV2( props ) {
// Remove all event listeners after the component has unmounted.
return () => {
// eslint-disable-next-line no-unused-expressions
- googleRef.current?.visualization.events.removeAllListeners( chartWrapperRef.current.getChart() );
+ googleRef.current?.visualization.events.removeAllListeners( chartWrapperRef.current?.getChart() );
};
}, [] );
@@ -144,6 +144,11 @@ export default function GoogleChartV2( props ) {
loader={ loader }
height={ height }
getChartWrapper={ ( chartWrapper, google ) => {
+ // Remove all the event listeners on the old chart before we draw
+ // a new one.
+ // eslint-disable-next-line no-unused-expressions
+ googleRef.current?.visualization.events.removeAllListeners( chartWrapperRef.current?.getChart() );
+
chartWrapperRef.current = chartWrapper;
googleRef.current = google;
| 2 |
diff --git a/src/core/cff_parser.js b/src/core/cff_parser.js @@ -792,6 +792,12 @@ class CFFParser {
);
parentDict.privateDict = privateDict;
+ if (privateDict.getByName("ExpansionFactor") === 0) {
+ // Firefox doesn't render correctly such a font on Windows (see issue
+ // 15289), hence we just reset it to its default value.
+ privateDict.setByName("ExpansionFactor", 0.06);
+ }
+
// Parse the Subrs index also since it's relative to the private dict.
if (!privateDict.getByName("Subrs")) {
return;
| 12 |
diff --git a/generators/server/templates/src/main/java/package/security/jwt/TokenProvider.java.ejs b/generators/server/templates/src/main/java/package/security/jwt/TokenProvider.java.ejs @@ -100,8 +100,9 @@ public class TokenProvider {
}
public Authentication getAuthentication(String token) {
- Claims claims = Jwts.parser()
+ Claims claims = Jwts.parserBuilder()
.setSigningKey(key)
+ .build()
.parseClaimsJws(token)
.getBody();
@@ -117,7 +118,7 @@ public class TokenProvider {
public boolean validateToken(String authToken) {
try {
- Jwts.parser().setSigningKey(key).parseClaimsJws(authToken);
+ Jwts.parserBuilder().setSigningKey(key).build().parseClaimsJws(authToken);
return true;
} catch (JwtException | IllegalArgumentException e) {
log.info("Invalid JWT token.");
| 1 |
diff --git a/contractsSol5/KyberNetwork.sol b/contractsSol5/KyberNetwork.sol @@ -515,46 +515,40 @@ contract KyberNetwork is Withdrawable2, Utils4, IKyberNetwork, ReentrancyGuard {
//no need to handle fees if no fee paying reserves
if ((tData.numFeePayingReserves == 0) && (tData.platformFeeWei == 0)) return true;
- // create array of rebate wallets + fee percent per reserve
- // fees should add up to 100%.
- address[] memory eligibleWallets = new address[](tData.numFeePayingReserves);
- uint[] memory rebatePercentBps = new uint[](tData.numFeePayingReserves);
-
// Updates reserve eligibility and rebate percentages
- updateEligibilityAndRebates(eligibleWallets, rebatePercentBps, tData);
+ (address[] memory rebateWallets, uint[] memory rebatePercentBps) = calcualteRebateSplitPerWallet(tData);
uint sentFee = tData.networkFeeWei + tData.platformFeeWei;
// Send total fee amount to fee handler with reserve data.
require(
- feeHandler.handleFees.value(sentFee)(eligibleWallets, rebatePercentBps,
+ feeHandler.handleFees.value(sentFee)(rebateWallets, rebatePercentBps,
tData.input.platformWallet, tData.platformFeeWei),
"handle fee fail"
);
return true;
}
- function updateEligibilityAndRebates(
- address[] memory eligibleWallets,
- uint[] memory rebatePercentBps,
- TradeData memory tData
- ) internal view
+ function calcualteRebateSplitPerWallet(TradeData memory tData) internal view
+ returns (address[] memory rebateWallets, uint[] memory rebatePercentBps)
{
- if(eligibleWallets.length == 0) return;
+ rebateWallets = new address[](tData.numFeePayingReserves);
+ rebatePercentBps = new uint[](tData.numFeePayingReserves);
uint index;
- // Parse ethToToken list
- index = parseReserveList(
- eligibleWallets,
+
+ // ethToToken
+ index = populateRebateWalletList(
+ rebateWallets,
rebatePercentBps,
tData.ethToToken,
index,
tData.feePayingReservesBps
);
- // Parse tokenToEth list
- index = parseReserveList(
- eligibleWallets,
+ // tokenToEth
+ index = populateRebateWalletList(
+ rebateWallets,
rebatePercentBps,
tData.tokenToEth,
index,
@@ -562,8 +556,8 @@ contract KyberNetwork is Withdrawable2, Utils4, IKyberNetwork, ReentrancyGuard {
);
}
- function parseReserveList(
- address[] memory eligibleWallets,
+ function populateRebateWalletList(
+ address[] memory rebateWallets,
uint[] memory rebatePercentBps,
TradingReserves memory resList,
uint index,
@@ -573,7 +567,7 @@ contract KyberNetwork is Withdrawable2, Utils4, IKyberNetwork, ReentrancyGuard {
for(uint i = 0; i < resList.isFeePaying.length; i ++) {
if(resList.isFeePaying[i]) {
- eligibleWallets[_index] = reserveRebateWallet[address(resList.addresses[i])];
+ rebateWallets[_index] = reserveRebateWallet[address(resList.addresses[i])];
rebatePercentBps[_index] = resList.splitValuesBps[i] * BPS / feePayingReservesBps;
_index ++;
}
| 10 |
diff --git a/docs/source/docs/flexbox-align-items.blade.md b/docs/source/docs/flexbox-align-items.blade.md @@ -46,7 +46,7 @@ features:
</tr>
<tr>
<td class="p-2 border-t border-smoke-light font-mono text-xs text-purple-dark">.items-baseline</td>
- <td class="p-2 border-t border-smoke-light font-mono text-xs text-blue-dark">align-items: space-between;</td>
+ <td class="p-2 border-t border-smoke-light font-mono text-xs text-blue-dark">align-items: baseline;</td>
<td class="p-2 border-t border-smoke-light text-sm text-grey-darker">Align the baselines of each item.</td>
</tr>
</tbody>
| 1 |
diff --git a/packages/saasify-cli/lib/parse-project.js b/packages/saasify-cli/lib/parse-project.js @@ -83,7 +83,7 @@ module.exports.getReadme = async (config) => {
const readmeFiles = await globby('readme.md', {
cwd: config.root,
gitignore: true,
- nocase: true
+ caseSensitiveMatch: false
})
if (readmeFiles.length) {
| 1 |
diff --git a/src/scripts/interaction.js b/src/scripts/interaction.js @@ -713,7 +713,6 @@ function Interaction(parameters, player, previousState) {
var visuals = getVisuals();
$interaction = $('<div/>', {
- 'role': 'group',
'aria-label': player.l10n.interaction,
'tabindex': '-1',
'class': 'h5p-interaction h5p-poster ' + classes + (isGotoClickable && parameters.goto.visualize ? ' goto-clickable-visualize' : ''),
| 2 |
diff --git a/README.md b/README.md @@ -280,47 +280,57 @@ sql.on('error', err => {
## Connection Pools
+Using a single connection pool for your application/service is recommended.
+Instantiating a pool with a callback, or immediately calling `.connect`, is asynchronous to ensure a connection can be
+established before returning. From that point, you're able to acquire connections as normal:
+
```javascript
const sql = require('mssql')
-const pool1 = new sql.ConnectionPool(config, err => {
- // ... error checks
-
- // Query
-
- pool1.request() // or: new sql.Request(pool1)
- .query('select 1 as number', (err, result) => {
- // ... error checks
-
- console.dir(result)
- })
-
-})
+// async/await style:
+const pool1 = new sql.ConnectionPool(config).connect();
pool1.on('error', err => {
// ... error handler
})
+async function messageHandler() {
+ await pool1; // ensures that the pool has been created
+ try {
+ const request = pool1.request(); // or: new sql.Request(pool1)
+ const result = request.query('select 1 as number')
+ console.dir(result)
+ return result;
+ } catch (err) {
+ console.error('SQL error', err);
+ }
+}
+
+// promise style:
const pool2 = new sql.ConnectionPool(config, err => {
// ... error checks
+});
- // Stored Procedure
+pool2.on('error', err => {
+ // ... error handler
+})
- pool2.request() // or: new sql.Request(pool2)
+function runStoredProcedure() {
+ return pool2.then((pool) => {
+ pool.request() // or: new sql.Request(pool2)
.input('input_parameter', sql.Int, 10)
.output('output_parameter', sql.VarChar(50))
.execute('procedure_name', (err, result) => {
// ... error checks
-
console.dir(result)
})
-})
-
-pool2.on('error', err => {
- // ... error handler
-})
+ });
+}
```
+Awaiting or `.then`ing the pool creation is a safe way to ensure that the pool is always ready, without knowing where it
+is needed first. In practice, once the pool is created then there will be no delay for the next operation.
+
**ES6 Tagged template literals**
```javascript
| 7 |
diff --git a/docs/getting-started.md b/docs/getting-started.md @@ -117,7 +117,7 @@ If you want to learn more about blocks we suggest to read its dedicated article:
Technically, once you drop your HTML block inside the canvas each element of the content is transformed into a GrapesJS Component. A GrapesJS Component is an object containing information about how the element is rendered in the canvas (managed in the View) and how it might look its final code (created by the properties in the Model). Generally, all Model properties are reflected in the View. Therefore, if you add a new attribute to the model, it will be available in the export code (which we will learn more about later), and the element you see in the canvas will be updated with new attributes.
This isn't totally out of the ordinary, but the unique thing about Components that you can create a totally decoupled View. This means you can show the user whatever you desire regardless of what is in the Model. For example, by dragging a placeholder text you can fetch and show instead a dynamic content. If you want to learn more about Custom Components, you should check out [Component Manager Module](modules/Components.html).
-GrapesJS comes with a few [built-in Components](modules/Components.html#built-in-components) that enable different features once rendered in the canvas. For example, by double clicking on an image component you will see the default [Asset Manager](modules/Assets.html), which you can customize or integrate you own. By double clicking on the text component you're able to edit it via the built-in Rich Text Editor, which is also customization and [replaceable](guides/Replace-Rich-Text-Editor.html).
+GrapesJS comes with a few [built-in Components](modules/Components.html#built-in-component-types) that enable different features once rendered in the canvas. For example, by double clicking on an image component you will see the default [Asset Manager](modules/Assets.html), which you can customize or integrate you own. By double clicking on the text component you're able to edit it via the built-in Rich Text Editor, which is also customization and [replaceable](guides/Replace-Rich-Text-Editor.html).
As we have seen before you can create Blocks directly as Components
```js
| 1 |
diff --git a/site/rabbit.ent b/site/rabbit.ent @@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!ENTITY version-java-client "5.2.0">
+<!ENTITY version-java-client "5.3.0">
<!ENTITY version-dotnet-client "5.0.1">
<!ENTITY version-server "3.7.6">
<!ENTITY version-server-series "v3.7.x">
| 12 |
diff --git a/docs/faq.jade b/docs/faq.jade @@ -297,7 +297,7 @@ block content
**Q**. How can I change mongoose's default behavior of initializing an array
path to an empty array so that I can require real data on document creation?
- **A**. You can set the default of the array to a function that returns null.
+ **A**. You can set the default of the array to a function that returns `undefined`.
```javascript
const CollectionSchema = new Schema({
field1: {
@@ -307,6 +307,18 @@ block content
});
```
+ **Q**. How can I initialize an array path to `null`?
+
+ **A**. You can set the default of the array to a function that returns null.
+ ```javascript
+ const CollectionSchema = new Schema({
+ field1: {
+ type: [String],
+ default: () => { return null; }
+ }
+ });
+ ```
+
<hr id="aggregate-casting" />
**Q**. Why does my aggregate $match fail to return the document that my find query
| 1 |
diff --git a/js/gatecoin.js b/js/gatecoin.js @@ -463,14 +463,7 @@ module.exports = class gatecoin extends Exchange {
async cancelOrder (id, symbol = undefined, params = {}) {
await this.loadMarkets ();
const response = await this.privateDeleteTradeOrdersOrderID ({ 'OrderID': id });
- // At this point response.responseStatus.message has been verified
- // in handleErrors() to be == 'OK', so we assume the order has
- // indeed been cancelled.
- return {
- 'status': 'canceled',
- 'id': id,
- 'info': response,
- };
+ return response;
}
parseOrderStatus (status) {
| 13 |
diff --git a/structs/ScheduleManager.js b/structs/ScheduleManager.js @@ -53,7 +53,7 @@ class ScheduleManager {
run (refreshTime) { // Run schedules with respect to their refresh times
for (var feedSchedule of this.scheduleList) {
- if (feedSchedule.refreshTime === refreshTime) {
+ if (feedSchedule.refreshTime === refreshTime || !refreshTime) {
return feedSchedule.run().catch(err => log.cycle.error(`${this.bot.shard && this.bot.shard.count > 0 ? `SH ${this.bot.shard.id} ` : ''}Schedule ${this.name} failed to run cycle`, err))
}
}
| 11 |
diff --git a/tests/e2e/config/bootstrap.js b/tests/e2e/config/bootstrap.js @@ -64,7 +64,7 @@ function capturePageEventsForTearDown() {
* @link https://tools.google.com/dlpage/gaoptout
*/
function optOutOfEventTracking() {
- page.on( 'load', () => {
+ page.on( 'domcontentloaded', () => {
page.evaluate( () => {
window._gaUserPrefs = { ioo: () => true };
} );
| 12 |
diff --git a/www/src/components/layer-model/layer-content-sections.js b/www/src/components/layer-model/layer-content-sections.js @@ -281,7 +281,7 @@ const ViewLayerContent = ({ index }) => (
<div>
<p>
React powers components in Gatsby sites that are{` `}
- <Link to="/docs/glossary#rehydrate"> rehydrated</Link>, whatever you can
+ <Link to="/docs/glossary#hydration"> rehydrated</Link>, whatever you can
do in React you can do with Gatsby.
</p>
<p>
| 14 |
diff --git a/articles/connections/social/microsoft-account.md b/articles/connections/social/microsoft-account.md @@ -101,5 +101,5 @@ If you see the **It Works!** page, you have successfully configured your connect
<%= include('../_quickstart-links.md') %>
::: panel-warning Single log out
-Microsoft connections does not support redirecting back to the application when the user is redirected to the logout url. That means than when you redirect the user to the logout endpoint with the federated param `https://my_account.auth0.com/v2/logout?federated`, the user will be redirected to the MSN homepage instead of redirecting them back to your application.
+Microsoft connections does not support redirecting back to the application when the user is redirected to the logout url. That means than when you redirect the user to the logout endpoint with the federated param `https://${account.namespace}/v2/logout?federated`, the user will be redirected to the MSN homepage instead of redirecting them back to your application.
:::
| 0 |
diff --git a/articles/tutorials/building-multi-tenant-saas-applications-with-azure-active-directory.md b/articles/tutorials/building-multi-tenant-saas-applications-with-azure-active-directory.md @@ -66,8 +66,6 @@ The SIGN-ON URL is the url of your application that users will see when adding t
The APP ID URI is the unique identifier for your application (next to the Client ID) and must match a domain you registered under domains.
-
-
Once the application has been created, we'll need to enable it for multi-tenancy, generate a key, and configure the callback urls. You'll have 2 types of callback urls: the callback url for Auth0's login endpoint and the callback url for the consent flow.
When new customers sign up with their Azure AD directory the consent flow will redirect back to your application after approval/denial. In this example the page is available from different urls (such as http://localhost:55000/registration/complete which is why we need to add this page multiple times.
| 2 |
diff --git a/html/components/card.stories.js b/html/components/card.stories.js @@ -53,7 +53,8 @@ export const standout = () =>
class="
sprk-o-Stack__item
sprk-c-Card__content
- sprk-o-Stack sprk-o-Stack--medium
+ sprk-o-Stack
+ sprk-o-Stack--medium
"
>
Standout Card Content
@@ -138,7 +139,8 @@ export const teaser = () =>
class="
sprk-o-Stack__item
sprk-c-Card__content
- sprk-o-Stack sprk-o-Stack--large
+ sprk-o-Stack
+ sprk-o-Stack--large
"
>
<h3 class="sprk-b-TypeDisplayFive sprk-o-Stack__item">
@@ -153,6 +155,12 @@ export const teaser = () =>
prima tantas signiferumque at. Numquam.
</p>
+ <div class="
+ sprk-o-Stack__item
+ sprk-o-Stack
+ sprk-o-Stack--split@xxs
+ sprk-o-Stack--end-row"
+ >
<div class="sprk-o-Stack__item">
<a href="#nogo" class="sprk-c-Button sprk-c-Button--secondary">
Learn More
@@ -160,6 +168,7 @@ export const teaser = () =>
</div>
</div>
</div>
+ </div>
`;
teaser.story = {
@@ -204,6 +213,12 @@ export const teaserWithDifferentElementOrder = () =>
mea at, mei prima tantas signiferumque at. Numquam.
</p>
+ <div class="
+ sprk-o-Stack__item
+ sprk-o-Stack
+ sprk-o-Stack--split@xxs
+ sprk-o-Stack--end-row"
+ >
<div class="sprk-o-Stack__item">
<a href="#nogo" class="sprk-c-Button sprk-c-Button--secondary">
Learn More
@@ -211,6 +226,7 @@ export const teaserWithDifferentElementOrder = () =>
</div>
</div>
</div>
+ </div>
`;
teaserWithDifferentElementOrder.story = {
@@ -268,6 +284,12 @@ export const twoUpCards = () =>
tantas signiferumque at. Numquam.
</p>
+ <div class="
+ sprk-o-Stack__item
+ sprk-o-Stack
+ sprk-o-Stack--split@xs
+ sprk-o-Stack--end-row"
+ >
<a
href="#nogo"
class="
@@ -283,6 +305,7 @@ export const twoUpCards = () =>
</a>
</div>
</div>
+ </div>
<div
class="
@@ -318,7 +341,12 @@ export const twoUpCards = () =>
signiferumque at.
Numquam.
</p>
-
+ <div class="
+ sprk-o-Stack__item
+ sprk-o-Stack
+ sprk-o-Stack--split@xs
+ sprk-o-Stack--end-row"
+ >
<a
href="#nogo"
class="
@@ -335,6 +363,7 @@ export const twoUpCards = () =>
</div>
</div>
</div>
+ </div>
`;
twoUpCards.story = {
@@ -576,6 +605,12 @@ export const fourUpCards = () =>
amet, doctus invenirevix te. Facilisi perpetua.
</p>
+ <div class="
+ sprk-o-Stack__item
+ sprk-o-Stack
+ sprk-o-Stack--split@xxs
+ sprk-o-Stack--end-row"
+ >
<div class="sprk-o-Stack__item">
<a href="#nogo" class="sprk-c-Button sprk-c-Button--secondary">
Button
@@ -583,6 +618,7 @@ export const fourUpCards = () =>
</div>
</div>
</div>
+ </div>
<div
class="
@@ -609,6 +645,12 @@ export const fourUpCards = () =>
doctus invenirevix te. Facilisi perpetua.
</p>
+ <div class="
+ sprk-o-Stack__item
+ sprk-o-Stack
+ sprk-o-Stack--split@xxs
+ sprk-o-Stack--end-row"
+ >
<div class="sprk-o-Stack__item">
<a href="#nogo" class="sprk-c-Button sprk-c-Button--secondary">
Button
@@ -616,6 +658,7 @@ export const fourUpCards = () =>
</div>
</div>
</div>
+ </div>
<div
class="
@@ -643,6 +686,12 @@ export const fourUpCards = () =>
doctus invenirevix te. Facilisi perpetua.
</p>
+ <div class="
+ sprk-o-Stack__item
+ sprk-o-Stack
+ sprk-o-Stack--split@xxs
+ sprk-o-Stack--end-row"
+ >
<div class="sprk-o-Stack__item">
<a href="#nogo" class="sprk-c-Button sprk-c-Button--secondary">
Button
@@ -650,6 +699,7 @@ export const fourUpCards = () =>
</div>
</div>
</div>
+ </div>
<div
class="
@@ -677,6 +727,12 @@ export const fourUpCards = () =>
doctus invenirevix te. Facilisi perpetua.
</p>
+ <div class="
+ sprk-o-Stack__item
+ sprk-o-Stack
+ sprk-o-Stack--split@xxs
+ sprk-o-Stack--end-row"
+ >
<div class="sprk-o-Stack__item">
<a href="#nogo" class="sprk-c-Button sprk-c-Button--secondary">
Button
@@ -685,6 +741,7 @@ export const fourUpCards = () =>
</div>
</div>
</div>
+ </div>
`;
fourUpCards.story = {
| 3 |
diff --git a/articles/compliance/gdpr/features-aiding-compliance/index.md b/articles/compliance/gdpr/features-aiding-compliance/index.md @@ -9,7 +9,10 @@ In this article, you will find a list of GDPR regulations and how Auth0 can help
## Conditions for consent
-According to Article 7 of GDPR, you must ask users to consent on the processing of their personal data in a clear and easily accessible form. You must also show that the user has consented, and provide an easy way to withdraw consent at any time.
+According to Article 7 of GDPR, you must:
+- ask users to consent on the processing of their personal data in a clear and easily accessible form
+- be able to show that the user has consented, and
+- provide an easy way to withdraw consent at any time
You can use Auth0 to ask your users for consent upon signup (using either Lock or a custom form) and save this information at the user profile. You can later update this information using the Management API.
@@ -17,7 +20,10 @@ For details, see [Conditions for consent](/compliance/gdpr/features-aiding-compl
## Right to access, correct, and erase data
-According to Articles 15, 16, 17, and 19 of GDPR, users have the right to get a copy of their personal data you are processing, ask for rectifications if they are inaccurate, and ask you to delete their personal data.
+According to Articles 15, 16, 17, and 19 of GDPR, users have the right to:
+- get a copy of their personal data you are processing
+- ask for rectifications if they are inaccurate, and
+- ask you to delete their personal data
With Auth0, you can access, edit, and delete user information, either manually or using our API.
@@ -25,7 +31,10 @@ For details, see [Right to access, correct, and erase data](/compliance/gdpr/fea
## Data minimization
-According to Article 5 of GDPR, the personal data you collect must be limited to what is necessary for processing and must be kept only as long as needed. Appropriate security must be ensured during data processing, including protection against unauthorised or unlawful processing and against accidental loss, destruction, or damage.
+According to Article 5 of GDPR:
+- the personal data you collect must be limited to what is necessary for processing
+- must be kept only as long as needed, and
+- appropriate security must be ensured during data processing, including protection against unauthorised or unlawful processing and against accidental loss, destruction, or damage
There are several Auth0 features than can help you achieve these goals, like account linking, user profile encryption, and more.
@@ -41,7 +50,11 @@ For details, see [Data portability](/compliance/gdpr/features-aiding-compliance/
## Protect and secure user data
-According to Article 32 of GDPR, you must implement appropriate measures to ensure a level of security, including (but not limited to) data encryption, ongoing confidentiality, data integrity, and availability and resilience of processing systems and services.
+According to Article 32 of GDPR, you must implement appropriate measures to ensure a level of security, including (but not limited to):
+- data encryption
+- ongoing confidentiality
+- data integrity, and
+- availability and resilience of processing systems and services
There are several Auth0 features than can help you meet this requirement, like user profile encryption, brute-force protection, breached password detection, step-up authentication, and more.
| 14 |
diff --git a/src/screens/DateFilterScreen/DateRangePickerDay.js b/src/screens/DateFilterScreen/DateRangePickerDay.js @@ -38,7 +38,7 @@ type DayMarking = {
};
type DayProps = {
- state?: "disabled",
+ disabled: boolean,
marking: DayMarking,
date: CalendarDay,
onPress: Function,
@@ -81,19 +81,19 @@ const dotStyle = (marking: DayMarking) => [
export default class Day extends Component<DayProps> {
static defaultProps = {
- state: undefined
+ disabled: false
};
shouldComponentUpdate = (nextProps: DayProps): boolean => {
- const { state, marking, date } = this.props;
+ const { disabled, marking, date } = this.props;
const {
- state: nextState,
+ disabled: nextDisabled,
marking: nextMarking,
date: nextDate
} = nextProps;
return (
- state !== nextState ||
+ disabled !== nextDisabled ||
!equals(marking, nextMarking) ||
!equals(date, nextDate)
);
@@ -110,7 +110,7 @@ export default class Day extends Component<DayProps> {
render() {
const { marking, date } = this.props;
const dateNow = now();
- const beforeToday =
+ const disabled =
isBefore(date.dateString, dateNow) &&
!isSameDay(date.dateString, dateNow);
const label = toFormat(date.dateString, FORMAT_WEEKDAY_MONTH_DAY);
@@ -120,10 +120,10 @@ export default class Day extends Component<DayProps> {
<TouchableWithoutFeedback
onPress={this.onPress}
onLongPress={this.onLongPress}
- accessibilityTraits={beforeToday ? ["button", "disabled"] : traits}
+ accessibilityTraits={disabled ? ["button", "disabled"] : traits}
accessibilityLabel={label}
accessibilityComponentType="button"
- disabled={beforeToday}
+ disabled={disabled}
>
<View style={styles.container}>
{marking.selected && (
@@ -133,7 +133,7 @@ export default class Day extends Component<DayProps> {
</View>
)}
<View style={dayStyle(marking)}>
- <Text type="small" style={textStyle(marking, beforeToday)}>
+ <Text type="small" style={textStyle(marking, disabled)}>
{date.day}
</Text>
</View>
| 2 |
diff --git a/src/components/ProductDetailAddToCart/ProductDetailAddToCart.js b/src/components/ProductDetailAddToCart/ProductDetailAddToCart.js @@ -57,7 +57,7 @@ const styles = (theme) => ({
});
-@withStyles(styles, { withTheme: true })
+@withStyles(styles)
@inject("pdpStore")
@observer
export default class ProductDetailAddToCart extends Component {
| 2 |
diff --git a/config/redirects.js b/config/redirects.js @@ -2043,6 +2043,10 @@ module.exports = [
},
{ from: '/analytics/integrations/facebook-analytics', to: '/' },
{ from: '/analytics/integrations/google-analytics', to: '/' },
- { from: '/analytics/integrations', to: '/' }
+ { from: '/analytics/integrations', to: '/' },
+ {
+ from: '/applications/spa',
+ to: '/applications/guides/register-spa'
+ },
];
| 1 |
diff --git a/assets/js/modules/analytics-4/utils/validation.js b/assets/js/modules/analytics-4/utils/validation.js @@ -113,8 +113,6 @@ export function isValidGoogleTagID( googleTagID ) {
/**
* Checks whether the given googleTagAccountID appears to be valid.
*
- * @alias module:tagmanager/utils/validation.isValidAccountID
- *
* @since n.e.x.t
*
* @param {*} googleTagAccountID Google Tag ID to check.
@@ -127,8 +125,6 @@ export function isValidGoogleTagAccountID( googleTagAccountID ) {
/**
* Checks whether the given googleTagContainerID appears to be valid.
*
- * @alias module:tagmanager/utils/validation.isValidAccountID
- *
* @since n.e.x.t
*
* @param {*} googleTagContainerID Google Tag ID to check.
| 2 |
diff --git a/components/app/app.js b/components/app/app.js @@ -120,7 +120,7 @@ AppViewModel.prototype.showDialog = function(dialog) {
return dialog;
}));
}
-var gitSetUserConfig = function(bugTracking, sendUsageStatistics) {
+AppViewModel.prototype.gitSetUserConfig = function(bugTracking, sendUsageStatistics) {
var self = this;
this.server.getPromise('/userconfig')
.then(function(userConfig) {
@@ -131,10 +131,10 @@ var gitSetUserConfig = function(bugTracking, sendUsageStatistics) {
}).catch(function(err) { })
}
AppViewModel.prototype.enableBugtrackingAndStatistics = function() {
- gitSetUserConfig(true, true)
+ this.gitSetUserConfig(true, true);
}
AppViewModel.prototype.enableBugtracking = function() {
- gitSetUserConfig(true);
+ this.gitSetUserConfig(true);
}
AppViewModel.prototype.dismissBugtrackingNagscreen = function() {
localStorage.setItem('bugtrackingNagscreenDismissed', true);
| 1 |
diff --git a/cors-rules.js b/cors-rules.js @@ -2,13 +2,14 @@ const cors = require('cors')
const config = require('./config')
var allowed = ['https://app.lunie.io']
-if (config.env === 'development') {
- allowed.push('http://localhost:9080')
-}
var corsOptions = {
origin: function(origin, callback) {
- if (allowed.indexOf(origin) !== -1 || !origin) {
+ if (
+ config.env === 'development' ||
+ allowed.indexOf(origin) !== -1 ||
+ !origin
+ ) {
callback(null, true)
} else {
callback(new Error('Not allowed by CORS'))
| 11 |
diff --git a/config/sidebar.yml b/config/sidebar.yml @@ -1078,9 +1078,6 @@ articles:
- title: "Private SaaS Management Workshop"
url: "/services/private-saas-management"
- - title: "Jumpstart"
- url: "/services/jumpstart"
-
apis:
- title: "Overview"
| 2 |
diff --git a/lib/runtime/plots.coffee b/lib/runtime/plots.coffee @@ -39,25 +39,28 @@ module.exports =
plotSize: ->
@ensureVisible().then => @pane.size()
- ploturl: (url) ->
+ webview: (url) ->
v = views.render webview
class: 'blinkjl',
disablewebsecurity: true,
+ nodeintegration: true,
src: url,
style: 'width: 100%; height: 100%'
+ v.addEventListener('console-message', (e) => consoleLog(e))
+ v.addEventListener 'ipc-message', (e) =>
+ if e.channel.indexOf('JULIA_') > -1
+ client.import({msg: e.channel})[e.channel](e.args)
+ v
+
+ ploturl: (url) ->
+ v = @webview(url)
@ensureVisible()
@pane.show v
- v.addEventListener('console-message', (e) => consoleLog(e))
jlpane: (id, opts={}) ->
v = undefined
if opts.url
- v = views.render webview
- class: 'blinkjl',
- disablewebsecurity: true,
- src: opts.url,
- style: 'width: 100%; height: 100%'
- v.addEventListener('console-message', (e) => consoleLog(e))
+ v = @webview(opts.url)
pane = @ink.HTMLPane.fromId(id)
| 11 |
diff --git a/angular/projects/spark-angular/schematics/README.md b/angular/projects/spark-angular/schematics/README.md @@ -5,7 +5,7 @@ This is where we configure Angular CLI Schematics for Spark Design System.
## Utilize Schematics
```shell
-ng add @sparkdesignsystem/spark-design-system
+ng add @sparkdesignsystem/spark-angular
```
This single command will:
| 4 |
diff --git a/README.md b/README.md @@ -115,8 +115,9 @@ connection.execute(
## Using connection pools
-Connection pools provide automatic ways of managing multiple connections. A pool maintains a queue of *free* connections, allowing the use of multiple connections in parallel.
+Connection pools help reduce the time spent connecting to the MySQL server by reusing a previous connection, leaving them open instead of closing when you are done with them.
+This improves the latency of queries as you avoid all of the overhead that comes with establishing a new connection.
```js
// get the client
| 7 |
diff --git a/userscript.user.js b/userscript.user.js @@ -41029,7 +41029,7 @@ if (domain_nosub === "lystit.com" && domain.match(/cdn[a-z]?\.lystit\.com/)) {
if (popups.length === 0)
return;
- var style = popups[0].querySelector("img").style;
+ var style = popups[0].querySelector("img").parentElement.parentElement.style;
var deg = 0;
if (style.transform) {
var match = style.transform.match(/^rotate\(([0-9]+)deg\)$/);
| 7 |
diff --git a/src/utils/conversationAndEmailHandler.js b/src/utils/conversationAndEmailHandler.js @@ -97,7 +97,7 @@ const handleMilestoneConversationAndEmail = () => async context => {
ARCHIVED,
} = MilestoneStatus;
const { status, _id, prevStatus, message, mined } = result;
- logger.info('sendNotification', {
+ logger.info('handleMilestoneConversationAndEmail() called', {
milestoneId: _id,
eventTxHash,
status,
| 10 |
diff --git a/ui/app/components/send/send.utils.js b/ui/app/components/send/send.utils.js @@ -163,20 +163,20 @@ function getGasFeeErrorObject ({
}) {
let gasFeeError = null
- if (gasTotal && conversionRate) {
- const insufficientFunds = !isBalanceSufficient({
- amount: '0',
- amountConversionRate,
- balance,
- conversionRate,
- gasTotal,
- primaryCurrency,
- })
+ // if (gasTotal && conversionRate) {
+ // const insufficientFunds = !isBalanceSufficient({
+ // amount: '0',
+ // amountConversionRate,
+ // balance,
+ // conversionRate,
+ // gasTotal,
+ // primaryCurrency,
+ // })
- if (insufficientFunds) {
- gasFeeError = INSUFFICIENT_FUNDS_ERROR
- }
- }
+ // if (insufficientFunds) {
+ // gasFeeError = INSUFFICIENT_FUNDS_ERROR
+ // }
+ // }
return { gasFee: gasFeeError }
}
| 8 |
diff --git a/packages/spark-core/spark-core.js b/packages/spark-core/spark-core.js @@ -14,6 +14,8 @@ import { pagination } from './components/pagination';
// Polyfills
import NodeListForEach from './utilities/polyfills/NodeListForEach';
+NodeListForEach();
+
// Init
requiredSelect();
requiredTick();
@@ -27,4 +29,3 @@ datePicker();
modals();
pagination();
-NodeListForEach();
| 5 |
diff --git a/gulpfile.js b/gulpfile.js @@ -314,8 +314,6 @@ function formattingCheck(allItems) {
let data = item.data;
let pack = item.pack;
-
-
if(!data || !data.data || !data.type) {
continue; // Malformed data or journal entry - outside the scope of the formatting check
}
@@ -329,7 +327,6 @@ function formattingCheck(allItems) {
else if (data.type === "vehicle") {
formattingCheckVehicle(data, pack, item.file);
}
-
}
}
@@ -415,7 +412,6 @@ function formattingCheckEquipment(data, pack, file) {
addWarningForPack(`${file}: Improperly formatted armor type field "${armorType}".`, pack);
}
}
-
}
function formattingCheckVehicle(data, pack, file) {
| 2 |
diff --git a/index.js b/index.js @@ -36,17 +36,27 @@ const params = yargs
.usage('Usage: $0 <command> [options]')
.command('$0', 'Run BGPalerter (default)', function () {
- yargs.alias('c', 'config')
+ yargs
+ .alias('v', 'version')
+ .nargs('v', 0)
+ .describe('v', 'Show version number')
+
+ .alias('c', 'config')
.nargs('c', 1)
.describe('c', 'Config file to load')
- .alias('v', 'volume')
- .nargs('v', 1)
- .describe('c', 'A directory where configuration and data is persisted')
+ .alias('d', 'data-volume')
+ .nargs('d', 1)
+ .describe('d', 'A directory where configuration and data is persisted')
})
.command('generate', 'Generate prefixes to monitor', function () {
- yargs.alias('o', 'output')
+ yargs
+ .alias('v', 'version')
+ .nargs('v', 0)
+ .describe('v', 'Show version number')
+
+ .alias('o', 'output')
.nargs('o', 1)
.describe('o', 'Write to file')
@@ -134,5 +144,5 @@ switch(params._[0]) {
default: // Run monitor
const Worker = require("./src/worker").default;
- module.exports = new Worker(params.c, params.v);
+ module.exports = new Worker(params.c, params.d);
}
| 10 |
diff --git a/app/tasks/usage.php b/app/tasks/usage.php @@ -83,7 +83,7 @@ $logError = function (Throwable $error, string $action = 'syncUsageStats') use (
$version = App::getEnv('_APP_VERSION', 'UNKNOWN');
$log = new Log();
- $log->setNamespace("realtime");
+ $log->setNamespace("usage");
$log->setServer(\gethostname());
$log->setVersion($version);
$log->setType(Log::TYPE_ERROR);
| 12 |
diff --git a/README.md b/README.md @@ -30,52 +30,52 @@ GET https://api.spacexdata.com/v1/launches/latest
```json
{
- "flight_number": 44,
+ "flight_number": 45,
"launch_year": "2017",
- "launch_date_utc": "2017-07-05T23:35:00Z",
- "launch_date_local": "2017-07-05T19:35:00-04:00",
+ "launch_date_utc": "2017-08-14T16:31:00Z",
+ "launch_date_local": "2017-08-14T12:31:00-04:00",
"rocket": {
"rocket_id": "falcon9",
"rocket_name": "Falcon 9",
"rocket_type": "FT"
},
- "core_serial": "B1037",
- "cap_serial": null,
"telemetry": {
"flight_club": null
},
+ "core_serial": "B1039",
+ "cap_serial": "C113",
"launch_site": {
"site_id": "ksc_lc_39a",
"site_name": "KSC LC 39A"
},
"payloads": [
{
- "payload_id": "Intelsat 35e",
+ "payload_id": "SpaceX CRS-12",
"customers": [
- "Intelsat"
+ "NASA (CRS)"
],
- "payload_type": "Satelite",
- "payload_mass_kg": 6000.0,
- "payload_mass_lbs": 13227.0,
- "orbit": "GTO"
+ "payload_type": "Dragon 1.1",
+ "payload_mass_kg": 3310,
+ "payload_mass_lbs": 7298,
+ "orbit": "ISS"
}
],
"launch_success": true,
"reused": false,
- "land_success": false,
- "landing_type": null,
- "landing_vehicle": null,
+ "land_success": true,
+ "landing_type": "RTLS",
+ "landing_vehicle": "LZ-1",
"links": {
- "mission_patch": "http://i.imgur.com/8URp6ea.png",
- "reddit_campaign": "https://www.reddit.com/r/spacex/comments/6fw4yy/",
- "reddit_launch": "https://www.reddit.com/r/spacex/comments/6kt2re/",
+ "mission_patch": "http://spacexpatchlist.space/images/thumbs/spacex_f9_039_crs_12.png",
+ "reddit_campaign": "https://www.reddit.com/r/spacex/comments/6mrga2/crs12_launch_campaign_thread/",
+ "reddit_launch": "https://www.reddit.com/r/spacex/comments/6tfcio/welcome_to_the_rspacex_crs12_official_launch/",
"reddit_recovery": null,
- "reddit_media": "https://www.reddit.com/r/spacex/comments/6kt3fe/",
- "presskit": "http://www.spacex.com/sites/spacex/files/intelsat35epresskit.pdf",
- "article_link": "https://en.wikipedia.org/wiki/Intelsat_35e",
- "video_link": "https://www.youtube.com/watch?v=MIHVPCj25Z0"
+ "reddit_media": "https://www.reddit.com/r/spacex/comments/6th2nf/rspacex_crs12_media_thread_videos_images_gifs/",
+ "presskit": "http://www.spacex.com/sites/spacex/files/crs12presskit.pdf",
+ "article_link": null,
+ "video_link": "https://www.youtube.com/watch?v=vLxWsYx8dbo"
},
- "details": "Due to the constraints of sending a heavy satellite (~6,000 kg) to GTO, the rocket will fly in its expendable configuration and the first-stage booster will not be recovered."
+ "details": "Dragon is expected to carry 2,349 kg (5,179 lb) of pressurized mass and 961 kg (2,119 lb) unpressurized. The external payload manifested for this flight is the CREAM cosmic-ray detector. First flight of the Falcon 9 Block 4 upgrade. Last flight of a newly-built Dragon capsule; further missions will use refurbished spacecraft."
}
```
| 3 |
diff --git a/pages/11.searching/docs.md b/pages/11.searching/docs.md @@ -22,6 +22,11 @@ function matchCustom(params, data) {
return data;
}
+ // Do not display the item if there is no 'text' property
+ if (typeof data.text === 'undefined') {
+ return null;
+ }
+
// `params.term` should be the term that is used for searching
// `data.text` is the text that is displayed for the data object
if (data.text.indexOf(params.term) > -1) {
@@ -64,6 +69,11 @@ function matchStart(params, data) {
return data;
}
+ // Skip if there is no 'children' property
+ if (typeof data.children === 'undefined') {
+ return null;
+ }
+
// `data.children` contains the actual options that we are matching against
var filteredChildren = [];
$.each(data.children, function (idx, child) {
| 7 |
diff --git a/assets/js/modules/tagmanager/hooks/useGAPropertyIDEffect.test.js b/assets/js/modules/tagmanager/hooks/useGAPropertyIDEffect.test.js @@ -36,12 +36,12 @@ import useGAPropertyIDEffect from './useGAPropertyIDEffect';
describe( 'useGAPropertyIDEffect', () => {
let registry;
- describe( 'with empty tagmanager settings store', () => {
+ describe( 'with empty Tag Manager settings store', () => {
beforeEach( () => {
registry = createTestRegistry();
} );
- it( 'fetches settings from api before updating gaPropertyID', async () => {
+ it( 'fetches settings from API before updating gaPropertyID', async () => {
fetchMock.getOnce(
/^\/google-site-kit\/v1\/modules\/tagmanager\/data\/settings/,
{
| 10 |
diff --git a/test/integration/cloud/object_store.js b/test/integration/cloud/object_store.js var { CloudContext } = require('./utils');
var randUserId = require('../utils/hooks').randUserId;
-describe('Object Store CRUD behaviours', () => {
+describe('Collection CRUD behaviours', () => {
let ctx = new CloudContext();
let improvedCheeseBurgerData = {
name: 'The improved cheese burger',
| 10 |
diff --git a/src/createReducer.js b/src/createReducer.js @@ -44,7 +44,7 @@ import type { Action, Structure } from './types.js.flow'
const shouldDelete = ({ getIn }) => (state, path) => {
let initialValuesPath = null
- if (path.startsWith('values')) {
+ if (/^values/.test(path)) {
initialValuesPath = path.replace('values', 'initial')
}
| 14 |
diff --git a/src/rapidoc.js b/src/rapidoc.js @@ -667,15 +667,24 @@ export default class RapiDoc extends LitElement {
}
`;
}
-
/* eslint-enable indent */
- observeExpandedContent(tryCount = 0) {
+ // Cleanup
+ disconnectedCallback() {
+ super.connectedCallback();
+ if (this.intersectionObserver) {
+ this.intersectionObserver.disconnect();
+ }
+ }
+
+ observeExpandedContent() {
const containerEls = this.shadowRoot.querySelectorAll('end-points-expanded');
+ /*
if (containerEls.length === 0 && tryCount < 20) {
setTimeout(() => { this.observeExpandedContent(tryCount + 1); }, 300);
return;
}
+ */
containerEls.forEach((el) => {
const observeTargetEls = el.shadowRoot.querySelectorAll('.anchor');
observeTargetEls.forEach((targetEl) => {
@@ -693,12 +702,6 @@ export default class RapiDoc extends LitElement {
if (name === 'spec-url') {
if (oldVal !== newVal) {
this.loadSpec(newVal);
-
- // Delay observation to allow loading all the child custom-elements
- this.intersectionObserver.disconnect();
- window.setTimeout(() => {
- this.observeExpandedContent();
- }, 300);
}
}
super.attributeChangedCallback(name, oldVal, newVal);
@@ -788,7 +791,11 @@ export default class RapiDoc extends LitElement {
afterSpecParsedAndValidated(spec) {
this.resolvedSpec = spec;
- if (this.allowServerSelection === 'false') {
+ let isSelectedServerValid = false;
+ if (this.selectedServer) {
+ isSelectedServerValid = (this.selectedServer === this.serverUrl || this.resolvedSpec.servers.find((v) => (v.url === this.selectedServer)));
+ }
+ if (!isSelectedServerValid) {
if (this.serverUrl) {
this.selectedServer = this.serverUrl;
} else if (this.resolvedSpec && this.resolvedSpec.servers && this.resolvedSpec.servers.length > 0) {
@@ -798,6 +805,12 @@ export default class RapiDoc extends LitElement {
if (!this.apiListStyle) {
this.apiListStyle = 'group-by-tag';
}
+
+ // Put it at the end of event loop, to allow loading all the child elements (must for larger specs)
+ this.intersectionObserver.disconnect();
+ window.setTimeout(() => {
+ this.observeExpandedContent();
+ }, 100);
this.requestUpdate();
}
| 7 |
diff --git a/metaverse-components.js b/metaverse-components.js import wear from './metaverse_components/wear.js';
-import npc from './metaverse_components/npc.js';
+// import npc from './metaverse_components/npc.js';
import pet from './metaverse_components/pet.js';
import drop from './metaverse_components/drop.js';
-import mob from './metaverse_components/mob.js';
+// import mob from './metaverse_components/mob.js';
const componentTemplates = {
wear,
- npc,
+ // npc,
pet,
drop,
- mob,
+ // mob,
};
export {
componentTemplates,
| 2 |
diff --git a/docs/source/guides/core-concepts/cypress-in-a-nutshell.md b/docs/source/guides/core-concepts/cypress-in-a-nutshell.md @@ -396,7 +396,7 @@ it("changes the URL when 'awesome' is clicked", function() {
})
```
-Big difference! The Promise demonstration is not real code (so don't try it), but it shows the magnitude of what Cypress handles for you behind the scenes. Embrace the beautiful language of Cypress commands and let it do the heavy lifting for you!
+Big difference! The Promise demonstration is not real code (so don't try it), but it gives an idea the magnitude of what Cypress handles for you behind the scenes. In reality, Cypress does more than this, because Promises themselves aren't entirely suitable to the job as our assertions would fail instantly with no way of retrying. Embrace the beautiful language of Cypress commands and let it do the heavy lifting for you!
{% note success Core Concept %}
Cypress is built using Promises internally, but the developer testing with Cypress should not have need for their own Promises in tests the vast majority of the time.
| 0 |
diff --git a/src/encoded/tests/data/inserts/user.json b/src/encoded/tests/data/inserts/user.json "/labs/j-michael-cherry/"
],
"uuid": "56ad466b-8711-4b82-8f2c-8db3dc5862fd"
+ },
+ {
+ "email": "[email protected]",
+ "first_name": "Weiwei",
+ "groups": [
+ "admin"
+ ],
+ "job_title": "Data Wrangler",
+ "lab": "/labs/j-michael-cherry/",
+ "last_name": "Zhong",
+ "status": "current",
+ "submits_for": [
+ "/labs/j-michael-cherry/"
+ ],
+ "uuid": "97d2dfcd-0919-4a27-9797-a6ef25f470a2"
}
]
| 0 |
diff --git a/stories/module-analytics-settings.stories.js b/stories/module-analytics-settings.stories.js @@ -454,13 +454,6 @@ storiesOf( 'Analytics Module/Settings', module )
dispatch( MODULES_ANALYTICS ).receiveGetExistingTag(
existingTag.propertyID
);
- dispatch( MODULES_ANALYTICS ).receiveGetTagPermission(
- {
- accountID: existingTag.accountID,
- permission: true,
- },
- { propertyID: existingTag.propertyID }
- );
dispatch( MODULES_ANALYTICS_4 ).receiveGetProperties(
[
| 1 |
diff --git a/packages/idyll-compiler/src/grammar.ne b/packages/idyll-compiler/src/grammar.ne @@ -102,7 +102,7 @@ Paragraph -> (ParagraphItem __):* ParagraphItem {%
// children merge them to avoid issues with
// Equation and other components that
// consume their children programatically.
- children = children.reduce((acc, c) => {
+ children = children.reduce(function (acc, c) {
if (typeof c === 'string' && lastWasString) {
acc[acc.length - 1] += c;
lastWasString = true;
| 2 |
diff --git a/examples/extended-item.json b/examples/extended-item.json "gsd": 0.66,
"eo:cloud_cover": 1.2,
"proj:epsg": 32659,
+ "proj:shape": [5558, 9559],
+ "proj:transform": [0.5, 0.0, 712710.0, 0.0, -0.5, 151406.0, 0.0, 0.0, 1.0],
"sat:orbit_state": "ascending",
"sat:relative_orbit": 34523,
"view:sun_elevation": 54.9,
| 0 |
diff --git a/articles/rules/index.md b/articles/rules/index.md @@ -26,7 +26,9 @@ Among many possibilities, Rules can be used to:
* Enable counters or persist other information. (For information on storing user data, see: [Metadata in Rules](/rules/metadata-in-rules).)
* Enable __multifactor__ authentication, based on context (e.g. last login, IP address of the user, location, etc.).
-**NOTE:** You can find more examples of common Rules on Github at [auth0/rules](https://github.com/auth0/rules).
+<div class="alert alert-info">
+You can find more examples of common Rules on Github at <a href="https://github.com/auth0/rules">auth0/rules</a>.
+</div>
## Video: Using Rules
Watch this video learn all about rules in just a few minutes.
@@ -42,7 +44,9 @@ A Rule is a function with the following arguments:
* `context`: an object containing contextual information of the current authentication transaction, such as user's IP address, application, location. (A complete list of context properties is available here: [Context Argument Properties in Rules](/rules/context).)
* `callback`: a function to send back the potentially modified `user` and `context` objects back to Auth0 (or an error).
-**NOTE:** Because of the async nature of *node.js*, it is important to always call the `callback` function, or else the script will timeout.
+<div class="alert alert-info">
+Because of the async nature of Node.js, it is important to always call the <code>callback</code> function, or else the script will timeout.
+</div>
## Examples
@@ -60,7 +64,10 @@ function (user, context, callback) {
}
```
-> **NOTE:** You can add `console.log` lines for [debugging](#debugging) or use the **Real-time Webtask Logs** Extension.
+<div class="alert alert-info">
+ You can add <code>console.log</code> lines for <a href="#debugging">debugging</a> or use the <a href="/extensions/realtime-webtask-logs">Real-time Webtask Logs Extension</a>.
+</div>
+
### Add roles to a user
@@ -120,7 +127,9 @@ After the rule executes, the output that the application will receive is the fol
}
```
-> Properties added in a rule are __not persisted__ in the Auth0 user store. Persisting properties requires calling the Auth0 Management API.
+<div class="alert alert-info">
+Properties added in a rule are <strong>not persisted</strong> in the Auth0 user store. Persisting properties requires calling the Auth0 Management API.
+</div>
### Deny access based on a condition
@@ -138,9 +147,11 @@ function (user, context, callback) {
This will cause a redirect to your callback url with an `error` querystring parameter containing the message you set. (e.g.: `https://yourapp.com/callback?error=unauthorized&error_description=Only%20admins%20can%20use%20this`). Make sure to call the callback with an instance of `UnauthorizedError` (not `Error`).
-> Error reporting to the app depends on the protocol. OpenID Connect apps will receive the error in the querystring. SAML apps will receive the error in a `SAMLResponse`.
+<div class="alert alert-info">
+ Error reporting to the app depends on the protocol. OpenID Connect apps will receive the error in the querystring. SAML apps will receive the error in a <code>SAMLResponse</code>.
+</div>
-### Creating a new Rule using the Management API
+### Create a new Rule using the Management API
Rules can also be created by creating a POST request to `/api/v2/rules` using the [Management APIv2](/api/management/v2#!/Rules/post_rules).
@@ -181,9 +192,9 @@ Use this to create the POST request:
}
```
-::: panel-info
-You can use the `auth0-rules-testharness` [library](https://www.npmjs.com/package/auth0-rules-testharness) to deploy, execute, and test the output of Rules using a Webtask sandbox environment.
-:::
+<div class="alert alert-info">
+You can use the <a href="https://www.npmjs.com/package/auth0-custom-db-testharness">auth0-custom-db-testharness library</a> to deploy, execute, and test the output of Custom DB Scripts using a Webtask sandbox environment.
+</div>
## Debugging
@@ -212,7 +223,7 @@ You can add `console.log` lines in the rule's code for debugging. The [Rule Edit
This debugging method works for rules tried from the dashboard and those actually running during user authentication.
-## Caching expensive resources
+## Cache expensive resources
The code sandbox Rules run on allows storing _expensive_ resources that will survive individual execution.
| 14 |
diff --git a/pages/overview.js b/pages/overview.js @@ -2,8 +2,8 @@ import React, { Component, Fragment } from 'react'
import { graphql, compose } from 'react-apollo'
import gql from 'graphql-tag'
import { withRouter } from 'next/router'
-
-import { nest } from 'd3-collection'
+import { max } from 'd3-array'
+import { timeMonth } from 'd3-time'
import { swissTime } from '../lib/utils/format'
@@ -81,10 +81,12 @@ class FrontOverview extends Component {
})
return agg
}, []).reverse().filter((teaser, i, all) => {
- const node = teaser.nodes.find(node => node.data.urlMeta)
+ const publishDates = teaser.nodes
+ .map(node => node.data.urlMeta && new Date(node.data.urlMeta.publishDate))
+ .filter(Boolean)
- teaser.publishDate = node
- ? new Date(node.data.urlMeta.publishDate)
+ teaser.publishDate = publishDates.length
+ ? max(publishDates)
: i > 0 ? all[i - 1].publishDate : undefined
return teaser.publishDate &&
teaser.publishDate >= startDate &&
@@ -103,6 +105,27 @@ class FrontOverview extends Component {
const { highlight } = this.state
+ const teasersByMonth = teasers.reduce(
+ ([all, last], teaser) => {
+ const key = formatMonth(teaser.publishDate)
+ if (!last || key !== last.key) {
+ // ignore unexpected jumps
+ // - this happens when a previously published article was placed
+ // - or an articles publish date was later updated
+ // mostly happens for debates or meta articles
+ const prevKey = formatMonth(timeMonth.offset(teaser.publishDate, -1))
+ if (!last || prevKey === last.key) {
+ const newMonth = { key, values: [teaser] }
+ all.push(newMonth)
+ return [all, newMonth]
+ }
+ }
+ last.values.push(teaser)
+ return [all, last]
+ },
+ [[]]
+ )[0]
+
return (
<Frame meta={meta} dark>
<Interaction.H1 style={{ color: negativeColors.text, marginBottom: 5 }}>
@@ -122,10 +145,7 @@ class FrontOverview extends Component {
</P>
<Loader loading={data.loading} error={data.error} style={{ minHeight: `calc(90vh)` }} render={() => {
- return nest()
- .key(d => formatMonth(d.publishDate))
- .entries(teasers)
- .map(({ key: month, values }, i) => {
+ return teasersByMonth.map(({ key: month, values }, i) => {
const Text = texts[year] && texts[year][month]
return (
<div style={{ marginTop: 50 }} key={month} onClick={() => {
| 14 |
diff --git a/src/react/projects/spark-react/src/SprkInput/SprkTextInput/components/SprkTextareaCheck.js b/src/react/projects/spark-react/src/SprkInput/SprkTextInput/components/SprkTextareaCheck.js @@ -51,7 +51,7 @@ class SprkTextareaCheck extends Component {
'sprk-b-TextInput--has-svg-icon':
type !== 'textarea' && leadingIcon.length > 0,
'sprk-b-TextInput--has-text-icon': type !== 'textarea' && textIcon,
- 'sprk-b-TextInput--float-label': hasValue && type === 'hugeTextInput',
+ 'sprk-b-Input--has-floating-label': hasValue && type === 'hugeTextInput',
})}
type={type}
htmlFor={id}
| 3 |
diff --git a/lib/api.js b/lib/api.js @@ -206,8 +206,8 @@ setTimeout(function() {
}, 500);
// Compile .scss files to .css
-var sass = require('node-sass');
-app.use(sass.middleware({
+var sassMiddleware = require('node-sass-middleware');
+app.use(sassMiddleware({
src: path.join(__dirname, '../public/angular/sass'),
dest: path.join(__dirname, '../public/angular/css'),
force: true,
| 14 |
diff --git a/x/swingset/handler.go b/x/swingset/handler.go @@ -88,6 +88,10 @@ func handleMsgDeliverInbound(ctx sdk.Context, keeper Keeper, msg MsgDeliverInbou
}
storageHandler := NewStorageHandler(ctx, keeper)
+
+ // Allow the storageHandler to consume unlimited gas.
+ storageHandler.Context = storageHandler.Context.WithGasMeter(sdk.NewInfiniteGasMeter())
+
newPort := RegisterPortHandler(storageHandler)
action := &deliverInboundAction{
Type: "DELIVER_INBOUND",
| 4 |
diff --git a/modules/xerte/parent_templates/Nottingham/models_html5/interactiveText.html b/modules/xerte/parent_templates/Nottingham/models_html5/interactiveText.html //If the type is Find(Mark at End), add a button to let the user finish up
if (intType=="find2"){
- $("<div id='buttonHolder'><button disabled id = markAtEnd>Check</button></div>").insertBefore($("#feedback"));
+ $("<div id='btnHolder'><button disabled id='markAtEnd'>Check</button></div>").insertBefore($("#feedback"));
}
| 1 |
diff --git a/src/domain/navigation/index.js b/src/domain/navigation/index.js @@ -132,10 +132,12 @@ export function parseUrlPath(urlPath, currentNavPath, defaultSessionId) {
segments.push(roomsSegmentWithRoom(rooms, roomId, currentNavPath));
}
segments.push(new Segment("room", roomId));
- if (currentNavPath.get("details")?.value) {
- pushRightPanelSegment(segments, "details");
- } else if (currentNavPath.get("members")?.value) {
- pushRightPanelSegment(segments, "members");
+ // Add right-panel segments from previous path
+ const previousSegments = currentNavPath.segments;
+ const i = previousSegments.findIndex(s => s.type === "right-panel");
+ if (i !== -1) {
+ segments.push(previousSegments[i]);
+ segments.push(previousSegments[i + 1]);
}
} else if (type === "last-session") {
let sessionSegment = currentNavPath.get("session");
| 7 |
diff --git a/README.md b/README.md @@ -49,7 +49,7 @@ Moleculer is a fast, modern and powerful microservices framework for [Node.js](h
- built-in caching solution (Memory, MemoryLRU, Redis)
- pluggable loggers (Console, File, Pino, Bunyan, Winston, Debug, Datadog, Log4js)
- pluggable transporters (TCP, NATS, MQTT, Redis, NATS Streaming, Kafka, AMQP 0.9, AMQP 1.0)
-- pluggable serializers (JSON, Avro, MsgPack, Protocol Buffer, Thrift)
+- pluggable serializers (JSON, Avro, MsgPack, Protocol Buffer, Thrift, CBOR, Notepack)
- pluggable parameter validator
- multiple services on a node/server
- master-less architecture, all nodes are equal
| 3 |
diff --git a/assets/js/components/dashboard-sharing/DashboardSharingSettingsButton.stories.js b/assets/js/components/dashboard-sharing/DashboardSharingSettingsButton.stories.js */
import DashboardSharingSettingsButton from './DashboardSharingSettingsButton';
-const Template = ( args ) => <DashboardSharingSettingsButton { ...args } />;
+const Template = () => <DashboardSharingSettingsButton />;
export const DefaultDashboardSharingSettingsButton = Template.bind( {} );
DefaultDashboardSharingSettingsButton.storyName = 'Default';
| 2 |
diff --git a/articles/tutorials/generic-oauth2-connection-examples.md b/articles/tutorials/generic-oauth2-connection-examples.md @@ -204,20 +204,24 @@ After the call completes successfully, you will be able to login using these new
* [Create an application](https://www.tumblr.com/oauth/apps)
* Copy `OAuth Consumer Key` and `Secret Key` to config file below
-```
+```har
{
- "name": "tumblr",
- "strategy": "oauth1",
- "options": {
- "client_id": "YOUR-TUMBLR-CONSUMER-KEY",
- "client_secret": "YOUR-TUMBLR-SECRET-KEY",
- "requestTokenURL": "https://www.tumblr.com/oauth/request_token",
- "accessTokenURL": "https://www.tumblr.com/oauth/access_token",
- "userAuthorizationURL": "https://www.tumblr.com/oauth/authorize",
- "scripts": {
- "fetchUserProfile": "function (token, tokenSecret, ctx, cb) {var OAuth = new require('oauth').OAuth;var oauth = new OAuth(ctx.requestTokenURL,ctx.accessTokenURL,ctx.client_id,ctx.client_secret,'1.0',null,'HMAC-SHA1');oauth.get('https://api.tumblr.com/v2/user/info',token,tokenSecret,function(e, b, r) {if (e) return cb(e);if (r.statusCode !== 200) return cb(new Error('StatusCode: ' + r.statusCode));var user = JSON.parse(b).response.user; user.user_id = user.name; cb(null, user);});}"
- }
- }
+ "method": "POST",
+ "url": "https://YOURACCOUNT.auth0.com/api/v2/connections",
+ "httpVersion": "HTTP/1.1",
+ "cookies": [],
+ "headers": [{
+ "name": "Authorization",
+ "value": "Bearer ABCD"
+ }],
+ "queryString": [],
+ "postData": {
+ "mimeType": "application/json",
+ "text": "{ \"name\": \"tumblr\", \"strategy\": \"oauth1\", \"options\": { \"client_id\", \"YOUR-TUMBLR-CONSUMER-KEY\", \"client_secret\": \"YOUR-TUMBLR-SECRET-KEY\", \"requestTokenURL\": \"https://www.tumblr.com/oauth/request_token\", \"accessTokenURL\": \"https://www.tumblr.com/oauth/access_token\", \"userAuthorizationURL\": \"https://www.tumblr.com/oauth/authorize\", \"scripts\": { \"fetchUserProfile\": \"function (token, tokenSecret, ctx, cb) {var OAuth = new require('oauth').OAuth;var oauth = new OAuth(ctx.requestTokenURL,ctx.accessTokenURL,ctx.client_id,ctx.client_secret,'1.0',null,'HMAC-SHA1');oauth.get('https://api.tumblr.com/v2/user/info',token,tokenSecret,function(e, b, r) {if (e) return cb(e);if (r.statusCode !== 200) return cb(new Error('StatusCode: ' + r.statusCode));var user = JSON.parse(b).response.user; user.user_id = user.name; cb(null, user);});}"
+ },
+ "headersSize": -1,
+ "bodySize": -1,
+ "comment": ""
}
```
| 0 |
diff --git a/embed.html b/embed.html @@ -152,8 +152,8 @@ body {
<div class="panel-body">
</div>
</div>
- <a class="link edit-link" target="_blank" data-i18n="[title]wdqs-embed-button-edit-query-title"><small data-i18n="wdqs-embed-button-edit-query"></small></a>
- <a href="#" class="edit edit-link" data-toggle="popover"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a>
+ <a class="link edit-link" target="_blank" rel="noopener" data-i18n="[title]wdqs-embed-button-edit-query-title"><small data-i18n="wdqs-embed-button-edit-query"></small></a>
+ <a href="#" target="_blank" rel="noopener" class="edit edit-link" data-toggle="popover"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a>
<!-- JS files -->
<!-- build:js js/embed.vendor.min.js -->
@@ -232,8 +232,12 @@ body {
}, 1500 ) );
var $editor = $( '<div>' );
+ try {
qh.setQuery( query );
qh.draw( $editor );
+ } catch ( e ) {
+ return;
+ }
$('.edit').on('click',function(e){
e.preventDefault();
| 9 |
diff --git a/SuspiciousVotingHelper.user.js b/SuspiciousVotingHelper.user.js // @description Assists in building suspicious votes CM messages. Highlight same users across IPxref table.
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 1.0.2
+// @version 1.0.3
//
// @include https://*stackoverflow.com/*
// @include https://*serverfault.com/*
const template = $('.popup input[name=mod-template]').filter((i,el) => $(el).next().text().includes('suspicious voting'));
let addstr = `This user has a [suspicious history](https://${location.hostname}/admin/show-user-votes/${uid}) of cross-voting and/or targeted votes.` + newlines;
- let appstr = `*(there may also be other minor instances of targeted votes that are unknown to us, as we can only view targeted votes of greater than or equal to 5)*`;
+ let appstr = `*(there may also be other minor instances of targeted votes that are unknown to us, as we can only view votes between users if they are above a certain threshold)*`;
// If template is selected
let flags, votesFrom, votesTo;
// Load latest flagged posts and get mod flags that suggest suspicious voting
$.get(`https://${location.hostname}/users/flagged-posts/${uid}`).then(function(data) {
- flags = $('#mainbar .mod-flag', data).filter(function(i,el) {
- return
- /\b((up|down)vot(es?|ing)|sock|revenge|serial|suspicious)/.test(el.innerText) &&
- $(el).find('.flag-outcome').length == 0;
- }).each(function(i,el) {
- $(this).find('.mod-flag-indicator').remove();
- });
+ flags = $('#mainbar .mod-flag', data);
+
+ // Format flags
+ flags = flags.filter(function(i,el) {
+ return $(el).find('.flag-outcome').length == 0 &&
+ /\b((up|down)vot(es?|ing)|sock|revenge|serial|suspicious)/.test($(el).find('.revision-comment').text());
+ })
+ .each(function(i,el) {
+ $(el).find('a').each(function() { this.innerText = this.href; });
+ $(el).find('.relativetime').each(function() { this.innerText = '*' + this.title + '*'; });
+ $(el).find('.mod-flag-indicator').remove();
+ })
+ .get().map(v => v.innerText.replace(/\s*(\n|\r)\s*/g,' ').trim());
}),
// Load votes
@@ -144,10 +150,12 @@ it doesn't seem that this account is a sockpuppet due to different PII and are m
// Display flags from users
if(flags.length > 0) {
- evidence += 'Reported via custom flag:\n';
- flags.each(function(i,el) {
- evidence += '> ' + el.innerText.trim() + newlines;
+ let flagtext = `Reported via [custom flag](https://${location.hostname}/users/flagged-posts/${uid}):\n`;
+ flags.forEach(function(v) {
+ flagtext += newlines + '> ' + v;
});
+
+ appstr = flagtext + newlines + appstr;
}
// Insert to template
| 7 |
diff --git a/src/components/navigation/navigation.scss b/src/components/navigation/navigation.scss @each $navColorName, $navColorValue in $colors {
.swiper-button-prev,
.swiper-button-next {
- &.swiper-button-#{$navColorName} {
- --swiper-navigation-color: #{$navColorValue};
+ &.swiper-button-#{'' + $navColorName} {
+ --swiper-navigation-color: #{'' + $navColorValue};
}
}
}
| 1 |
diff --git a/src/system/timer.js b/src/system/timer.js @@ -14,14 +14,12 @@ class Timer {
/**
* Last game tick value.<br/>
* Use this value to scale velocities during frame drops due to slow
- * hardware or when setting an FPS limit. (See {@link timer.maxfps})
- * This feature is disabled by default. Enable me.timer.interpolation to
- * use it.
+ * hardware or when setting an FPS limit. (See {@link Timer#maxfps})
+ * This feature is disabled by default. Enable timer.interpolation to use it.
* @public
- * @see timer.interpolation
+ * @see interpolation
* @type {number}
* @name tick
- * @memberof timer
*/
this.tick = 1.0;
@@ -31,28 +29,23 @@ class Timer {
* @public
* @type {number}
* @name fps
- * @memberof timer
*/
this.fps = 0;
/**
* Set the maximum target display frame per second
* @public
- * @see timer.tick
+ * @see tick
* @type {number}
- * @name maxfps
* @default 60
- * @memberof timer
*/
this.maxfps = 60;
/**
* Enable/disable frame interpolation
- * @see timer.tick
+ * @see tick
* @type {boolean}
* @default false
- * @name interpolation
- * @memberof timer
*/
this.interpolation = false;
@@ -96,8 +89,6 @@ class Timer {
/**
* reset time (e.g. usefull in case of pause)
- * @name reset
- * @memberof timer
* @ignore
*/
reset() {
@@ -114,8 +105,6 @@ class Timer {
/**
* Calls a function once after a specified delay. See me.timer.setInterval to repeativly call a function.
- * @name setTimeout
- * @memberof timer
* @param {Function} fn the function you want to execute after delay milliseconds.
* @param {number} delay the number of milliseconds (thousandths of a second) that the function call should be delayed by.
* @param {boolean} [pauseable=true] respects the pause state of the engine.
@@ -142,8 +131,6 @@ class Timer {
/**
* Calls a function continously at the specified interval. See setTimeout to call function a single time.
- * @name setInterval
- * @memberof timer
* @param {Function} fn the function to execute
* @param {number} delay the number of milliseconds (thousandths of a second) on how often to execute the function
* @param {boolean} [pauseable=true] respects the pause state of the engine.
@@ -170,8 +157,6 @@ class Timer {
/**
* Clears the delay set by me.timer.setTimeout().
- * @name clearTimeout
- * @memberof timer
* @param {number} timeoutID ID of the timeout to be cleared
*/
clearTimeout(timeoutID) {
@@ -180,8 +165,6 @@ class Timer {
/**
* Clears the Interval set by me.timer.setInterval().
- * @name clearInterval
- * @memberof timer
* @param {number} intervalID ID of the interval to be cleared
*/
clearInterval(intervalID) {
@@ -191,8 +174,6 @@ class Timer {
/**
* Return the current timestamp in milliseconds <br>
* since the game has started or since linux epoch (based on browser support for High Resolution Timer)
- * @name getTime
- * @memberof timer
* @returns {number}
*/
getTime() {
@@ -201,8 +182,6 @@ class Timer {
/**
* Return elapsed time in milliseconds since the last update
- * @name getDelta
- * @memberof timer
* @returns {number}
*/
getDelta() {
@@ -211,9 +190,7 @@ class Timer {
/**
* compute the actual frame time and fps rate
- * @name computeFPS
* @ignore
- * @memberof timer
*/
countFPS() {
this.framecount++;
@@ -281,6 +258,8 @@ class Timer {
}
};
+const timer = new Timer();
+
/**
* the default global Timer instance
* @namespace timer
@@ -295,6 +274,4 @@ class Timer {
* // set a timer to call "myFunction" every 1000ms (respecting the pause state) and passing param1 and param2
* timer.setInterval(myFunction, 1000, true, param1, param2);
*/
-const timer = new Timer();
-
export default timer;
| 1 |
diff --git a/configs/bootstrap.json b/configs/bootstrap.json {
"url": "https://getbootstrap.com/docs/4.0/",
"extra_attributes": {
- "language": [
- "en"
- ],
- "version": [
- "4.0"
- ]
+ "language": ["en"],
+ "version": ["4.0"]
}
},
{
"url": "https://getbootstrap.com/docs/4.1/",
"extra_attributes": {
- "language": [
- "en"
- ],
- "version": [
- "4.1"
- ]
+ "language": ["en"],
+ "version": ["4.1"]
}
},
{
"url": "https://getbootstrap.com/docs/4.2/",
"extra_attributes": {
- "language": [
- "en"
- ],
- "version": [
- "4.2"
- ]
+ "language": ["en"],
+ "version": ["4.2"]
}
},
{
- "url": "https://v5.getbootstrap.com/",
+ "url": "https://getbootstrap.com/docs/5.0/",
"extra_attributes": {
- "language": [
- "en"
- ],
- "version": [
- "5.0"
- ]
+ "language": ["en"],
+ "version": ["5.0"]
},
"selectors_key": "v5"
},
"https://getbootstrap.com/docs/4.3/",
"https://getbootstrap.com/docs/4.4/",
+ "https://getbootstrap.com/docs/4.5/",
"https://getbootstrap.com/docs/"
],
- "sitemap_urls": [
- "https://getbootstrap.com/sitemap.xml",
- "https://v5.getbootstrap.com/sitemap.xml"
- ],
+ "sitemap_urls": ["https://getbootstrap.com/sitemap.xml"],
"stop_urls": [
"/examples/.+",
"getbootstrap.com/docs/3",
"text": "main p, main li, main td:last-child"
}
},
- "selectors_exclude": [
- ".bd-example"
- ],
+ "selectors_exclude": [".bd-example"],
"custom_settings": {
- "attributesForFaceting": [
- "version",
- "language"
- ]
+ "attributesForFaceting": ["version", "language"]
},
"nb_hits": 21240
}
| 6 |
diff --git a/packages/react-static-plugin-sass/src/node.api.js b/packages/react-static-plugin-sass/src/node.api.js @@ -75,6 +75,10 @@ export default ({ includePaths = [], ...rest }) => ({
use: loaders,
})
+ if (config.optimization.splitChunks.cacheGroups.styles) {
+ config.optimization.splitChunks.cacheGroups.styles.test = /\.(c|sc|sa)ss$/
+ }
+
return config
},
})
| 1 |
diff --git a/vis/js/templates/Paper.jsx b/vis/js/templates/Paper.jsx @@ -266,9 +266,7 @@ class Paper extends React.Component {
el.transition(this.props.animation.transition)
.attr("d", path)
- .on("end", () => {
- this.setState({ ...this.state, path: path });
- });
+ .on("end", () => this.setState({ ...this.state, path: path }));
}
animateDogEar() {
@@ -285,7 +283,7 @@ class Paper extends React.Component {
}
animatePaper() {
- const { x, y, width, height } = this.getCoordinatesAndDimensions();
+ let { x, y, width, height } = this.getCoordinatesAndDimensions();
const el = select(this.paperRef.current);
el.transition(this.props.animation.transition)
@@ -293,15 +291,21 @@ class Paper extends React.Component {
.attr("y", y)
.attr("width", width)
.attr("height", height)
- .on("end", () =>
+ .on("end", () => {
+ const { hovered, enlargeFactor } = this.props;
+ if (hovered) {
+ width *= enlargeFactor;
+ height *= enlargeFactor;
+ }
+
this.setState({
...this.state,
x,
y,
width,
height,
- })
- );
+ });
+ });
}
getCoordinatesAndDimensions(previous = false) {
| 1 |
diff --git a/Gruntfile.js b/Gruntfile.js 'use strict';
module.exports = function(grunt) {
+ let isTravisCi = (process.env.TRAVIS === 'true');
var jsConnectorFiles = ['connectors/v2/*.js'];
var jsCoreFiles = ['Gruntfile.js', 'core/**/*.js', 'options/options.js', 'popups/*.js'];
@@ -60,7 +61,8 @@ module.exports = function(grunt) {
eslint: {
target: [jsCoreFiles, jsConnectorFiles, jsTestFiles],
options: {
- configFile: '.eslintrc.js'
+ configFile: '.eslintrc.js',
+ fix: !isTravisCi
},
},
lintspaces: {
| 11 |
diff --git a/docs/api/Settings.md b/docs/api/Settings.md @@ -146,7 +146,7 @@ Return the value of a variable which is persisted when the plugin finishes to ru
The setting that was stored for the given key. `undefined` if there was nothing.
-## Set a plugin setting
+## Set a session variable
```js
Settings.setSessionVariable('myVar', 0.1)
| 1 |
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb @@ -39,7 +39,7 @@ class Admin::UsersController < Admin::AdminController
PASSWORD_DOES_NOT_MATCH_MESSAGE = 'Password does not match'
def profile
- return render(file: "public/static/profile/index.html", layout: false) if current_user.has_feature_flag?('static_frontend')
+ return render(file: "public/static/profile/index.html", layout: false) if current_user.has_feature_flag?('static_profile')
@avatar_valid_extensions = AVATAR_VALID_EXTENSIONS
| 14 |
diff --git a/articles/tokens/access-token.md b/articles/tokens/access-token.md @@ -21,6 +21,10 @@ The [Auth0 Management API v1](/api/management/v1) (which has been deprecated) us
Access tokens are issued via Auth0's OAuth 2.0 endpoints: [/authorize](/api/authentication#authorize-client) and [/oauth/token](/api/authentication#get-token). You can use any OAuth 2.0-compatible library to obtain access tokens. If you do not already have a preferred OAuth 2.0 library, Auth0 provides libraries for many languages and frameworks that work seamlessly with our endpoints.
+:::note
+See the [Authentication API Explorer](/api/authentication#get-token) for additional usage notes on obtaining access tokens.
+:::
+
* Calls to the Lock widget will return an `access_token` as shown in the [Lock documentation](/libraries/lock).
* [Examples using auth0.js](https://github.com/auth0/auth0.js).
* Check the [List of tutorials](/tutorials) to see how to make calls to libraries for other languages/SDKs.
| 0 |
diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -73,17 +73,6 @@ jobs:
yarn ganache > /dev/null &
cd source/indexer && yarn test
- index_tests:
- <<: *container_config
- steps:
- - attach_workspace:
- at: *working_directory
- - run:
- name: Run Tests
- command: |
- yarn ganache > /dev/null &
- cd source/index && yarn test
-
delegate_tests:
<<: *container_config
steps:
@@ -184,7 +173,7 @@ jobs:
command: |
cd source
### ADD FOLDERS HERE TO PROCESS ###
- for file in indexer index delegate delegate-factory swap types tokens wrapper
+ for file in indexer delegate delegate-factory swap types tokens wrapper
do
cd $file
NPM_NAME=$(node -p "require('./package.json').name")
@@ -216,10 +205,6 @@ workflows:
context: Development
requires:
- setup
- - index_tests:
- context: Development
- requires:
- - setup
- delegate_tests:
context: Development
requires:
@@ -249,7 +234,6 @@ workflows:
requires:
- swap_tests
- indexer_tests
- - index_tests
- delegate_tests
- delegate_factory_tests
- order_utils_tests
| 2 |
diff --git a/History.md b/History.md * Fixes giving `breakWith` option via a string.
-[4.2.0 / 2018-08-02](https://github.com/jakubpawlowicz/clean-css/compare/4.1...4.2.0)
+[4.2.0 / 2018-08-02](https://github.com/jakubpawlowicz/clean-css/compare/4.1...v4.2.0)
==================
* Adds `process` method for compatibility with optimize-css-assets-webpack-plugin.
| 1 |
diff --git a/publish/src/commands/deploy.js b/publish/src/commands/deploy.js @@ -537,7 +537,7 @@ const deploy = async ({
}
// setup exchange gasPriceLimit on Synthetix
- const gasPriceLimit = w3utils.toWei('35');
+ const gasPriceLimit = w3utils.toWei('35', 'gwei');
if (network === 'local') {
await runStep({
contract: 'Synthetix',
| 3 |
diff --git a/packages/@uppy/companion/README.md b/packages/@uppy/companion/README.md @@ -95,5 +95,36 @@ When you are all set install the dependencies and deploy your function:
npm install && sls deploy
```
+### Deploy to heroku
+
+Companion can also be deployed to [Heroku](https://www.heroku.com)
+```
+mkdir uppy-companion && cd uppy-companion
+
+git init
+
+echo 'export COMPANION_PORT=$PORT' > .profile
+echo 'node_modules' > .gitignore
+echo '{
+ "name": "uppy-companion",
+ "version": "1.0.0",
+ "scripts": {
+ "start": "companion"
+ },
+ "dependencies": {
+ "@uppy/companion": "^0.17.0"
+ }
+}' > package.json
+
+npm i
+
+git add . && git commit -am 'first commit'
+
+heroku create
+
+git push heroku master
+```
+Make sure you set the required [environment variables](https://uppy.io/docs/companion/#Configure-Standalone).
+
See [full documentation](https://uppy.io/docs/companion/)
| 0 |
diff --git a/edit.js b/edit.js @@ -932,13 +932,31 @@ const [
noInitialRun: true,
noExitRuntime: true,
onRuntimeInitialized() {
- console.log('geometry module', this);
threadPool = this._makeThreadPool(2);
moduleInstance = this;
- modulePromise.accept(this);
+ modulePromise.accept();
},
});
+ class Allocator {
+ constructor() {
+ this.offsets = [];
+ }
+ alloc(constructor, size) {
+ const offset = moduleInstance._malloc(size * constructor.BYTES_PER_ELEMENT);
+ const b = new constructor(moduleInstance.HEAP8.buffer, moduleInstance.HEAP8.byteOffset + offset, size);
+ b.offset = offset;
+ this.offsets.push(offset);
+ return b;
+ }
+ freeAll() {
+ for (let i = 0; i < this.offsets.length; i++) {
+ moduleInstance._doFree(this.offsets[i]);
+ }
+ this.offsets.length = 0;
+ }
+ }
+
const cbs = [];
const w = new Worker('geometry-worker.js');
w.onmessage = e => {
@@ -960,12 +978,6 @@ const [
}
});
});
- w.requestLoadBake = url => {
- return w.request({
- method: 'loadBake',
- url,
- });
- };
w.requestGeometry = name => {
return w.request({
method: 'requestGeometry',
@@ -996,35 +1008,54 @@ const [
});
};
+ let methodIndex = 0;
+ const METHODS = {
+ makeGeometrySet: methodIndex++,
+ loadBake: methodIndex++,
+ };
const cbIndex = new Map();
- w.requestRaw = async method => {
- const moduleInstance = await modulePromise;
- // console.log('malloc', this._malloc(8));
-
- const id = moduleInstance._pushRequest(threadPool, method);
- console.log('push request', threadPool, method, id);
+ w.requestRaw = async messageData => {
+ const id = moduleInstance._pushRequest(threadPool, messageData.offset);
const p = makePromise();
cbIndex.set(id, p.accept);
return await p;
+ };
+ w.requestMakeGeometrySet = async () => {
+ await modulePromise;
+ const allocator = new Allocator();
+ const messageData = allocator.alloc(Uint32Array, 3);
+ messageData[1] = METHODS.makeGeometrySet;
+ await w.requestRaw(messageData);
+ const geometrySet = messageData[2];
+ allocator.freeAll();
+ return geometrySet;
+ };
+ w.requestLoadBake = async (geometrySet, url) => {
+ await modulePromise;
- /* w.postMessage({
- method: 'init',
- wasmMemory,
- }); */
+ const res = await fetch(url);
+ const arrayBuffer = await res.arrayBuffer();
+
+ const allocator = new Allocator();
+ const messageData = allocator.alloc(Uint32Array, 5);
+ const data = allocator.alloc(Uint8Array, arrayBuffer.byteLength);
+ data.set(new Uint8Array(arrayBuffer));
+ messageData[1] = METHODS.loadBake;
+ messageData[2] = geometrySet;
+ messageData[3] = data.offset;
+ messageData[4] = data.length;
+ await w.requestRaw(messageData);
+ allocator.freeAll();
};
w.update = () => {
if (moduleInstance) {
for (;;) {
- const responseMessageOffset = moduleInstance._popResponse(threadPool);
- if (responseMessageOffset) {
- console.log('pop result', responseMessageOffset);
- const id = moduleInstance.HEAPU32[responseMessageOffset/Uint32Array.BYTES_PER_ELEMENT];
+ const id = moduleInstance._popResponse(threadPool);
+ if (id) {
console.log('pop id', id);
const cb = cbIndex.get(id);
if (cb) {
- const resultOffset = moduleInstance.HEAPU32[responseMessageOffset/Uint32Array.BYTES_PER_ELEMENT + 1];
- cb(resultOffset);
- moduleInstance._doFree(responseMessageOffset);
+ cb();
cbIndex.delete(id);
} else {
throw new Error('invalid callback id: ' + id);
@@ -1036,11 +1067,11 @@ const [
}
};
- w.requestRaw(1)
+ /* w.requestRaw(1)
.then(res => {
console.log('got geo result', res);
moduleInstance._doFree(res);
- });
+ }); */
return w;
})();
@@ -1140,7 +1171,11 @@ const [
texture,
] = await Promise.all([
(async () => {
- await geometryWorker.requestLoadBake('./meshes.bin');
+ const geometrySet = await geometryWorker.requestMakeGeometrySet();
+ console.log('geometry set', geometrySet);
+ await geometryWorker.requestLoadBake(geometrySet, './meshes.bin');
+ console.log('loaded bake');
+ return;
const geometries = await Promise.all([
'wood_wall',
| 0 |
diff --git a/src/js/services/correspondentListService.js b/src/js/services/correspondentListService.js @@ -235,7 +235,7 @@ angular.module('copayApp.services').factory('correspondentListService', function
}
function escapeQuotes(text){
- return text.replace(/(['\\])/g, "\\$1").replace(/"/, """);
+ return text.replace(/(['\\])/g, "\\$1").replace(/"/g, """);
}
function setCurrentCorrespondent(correspondent_device_address, onDone){
| 14 |
diff --git a/server/models/community.js b/server/models/community.js @@ -310,7 +310,6 @@ const editCommunity = ({
if (file || coverFile) {
if (file && !coverFile) {
- const { coverPhoto } = getRandomDefaultPhoto();
return uploadImage(
file,
'communities',
@@ -325,7 +324,6 @@ const editCommunity = ({
{
...community,
profilePhoto,
- coverPhoto,
},
{ returnChanges: 'always' }
)
@@ -346,7 +344,6 @@ const editCommunity = ({
}
);
} else if (!file && coverFile) {
- const { profilePhoto } = getRandomDefaultPhoto();
return uploadImage(
coverFile,
'communities',
@@ -361,7 +358,6 @@ const editCommunity = ({
{
...community,
coverPhoto,
- profilePhoto,
},
{ returnChanges: 'always' }
)
| 1 |
diff --git a/public/templates/sovereign/extra.css b/public/templates/sovereign/extra.css @@ -22,18 +22,9 @@ input:-webkit-autofill:active {
input:-webkit-autofill:focus,
input:-webkit-autofill:active {
transition: #442f58 5000s ease-in-out 0s;
- -webkit-text-fill-color: #5a0075 !important;
- -webkit-box-shadow: 0 0 0px 1000px #eaeaea inset;
- }
+ -webkit-text-fill-color: white !important;
+ -webkit-box-shadow: 0 0 0px 1000px #442f58 inset;
}
-
-.hero {
- position: -webkit-sticky;
-}
-
-.content-feed {
- z-index: -1;
- position: -webkit-sticky;
}
input[type="file"] {
@@ -47,15 +38,6 @@ input[type="file"] {
font-weight: 300;
}
-@media (max-width: 991px) {
- .split.split-left.split-post-landing {
- margin-top: 70px;
- }
-
- .split-post-landing {
- top:auto;
- }
-}
.login {
text-align: center;
@@ -158,10 +140,6 @@ html {
-webkit-overflow-scrolling: touch;
}
-.hero-cta-input {
- -webkit-appearance: none;
-}
-
@media (max-width: 991px) {
.content-feed {
overflow:hidden;
@@ -182,14 +160,6 @@ body, h4, h1, h2 {
position:unset;
}
-@media (max-width: 767px) {
- .card-title {
- text-decoration: underline;
- text-decoration-color: #eaeaea;
- margin-top: 5px;
- }
-}
-
.hero-secondary {
background: linear-gradient(0deg, #f2f2f8 95%, #ebe7ef);
padding: 60px 10px 80px 10px;
@@ -197,10 +167,14 @@ body, h4, h1, h2 {
box-shadow: 0px -20px 20px 20px white;
background-color: #f2f2f8;
color: white;
- margin-top: 0px;
+ margin-top: 30px;
text-align:center;
}
+.content.content-agora {
+ z-index: -1;
+}
+
.accounts-dialog .login-button {
margin: 15px 0px 0px;
padding: 12px 14px;
| 13 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.