code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/browser/lib/util/http.ts b/browser/lib/util/http.ts @@ -68,7 +68,7 @@ const Http: typeof IHttp = class {
const hosts = getHosts(rest);
/* if there is only one host do it */
- if(hosts.length == 1) {
+ if(hosts.length === 1) {
Http.doUri(method, rest, uriFromHost(hosts[0]), headers, body, params, callback);
return;
}
| 4 |
diff --git a/lib/file.js b/lib/file.js @@ -211,6 +211,7 @@ File.prototype.transformTasks = function (config, modify) {
File.prototype.extractTasks = function(config) {
this.tasks = [];
if (this.isMarkDownFile()) this.parseFrontMatter()
+ if (this.frontMatter.imdone_ignore) return this
if (this.isCodeFile()) {
this.extractTasksInCodeFile(config);
} else {
| 8 |
diff --git a/app/pages/project/classify.cjsx b/app/pages/project/classify.cjsx @@ -157,7 +157,7 @@ module.exports = React.createClass
subjects: [subject.id]
if @state.validUserGroup
- classification.update({ 'metadata.user_group': @props.location.query.group })
+ classification.update({ 'metadata.selected_user_group_id': @props.location.query.group })
# If the user hasn't interacted with a classification resource before,
# we won't know how to resolve its links, so attach these manually.
| 10 |
diff --git a/app/addons/components/components/codeeditor.js b/app/addons/components/components/codeeditor.js @@ -13,6 +13,7 @@ import React from "react";
import ReactDOM from "react-dom";
import FauxtonAPI from "../../../core/api";
import ace from "brace";
+import "brace/ext/searchbox";
import {StringEditModal} from './stringeditmodal';
require('brace/mode/javascript');
| 0 |
diff --git a/token-metadata/0x9D24364b97270961b2948734aFe8d58832Efd43a/metadata.json b/token-metadata/0x9D24364b97270961b2948734aFe8d58832Efd43a/metadata.json "symbol": "FAM",
"address": "0x9D24364b97270961b2948734aFe8d58832Efd43a",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/plugins/standard_fonts_metrics.js b/plugins/standard_fonts_metrics.js @@ -359,7 +359,8 @@ somewhere around "pdfEscape" call.
API.events.push([
"addFont",
- function(font) {
+ function(data) {
+ var font = data.font;
var metrics,
unicode_section,
encoding = "Unicode",
| 1 |
diff --git a/src/consumer/__tests__/runner.spec.js b/src/consumer/__tests__/runner.spec.js @@ -349,18 +349,18 @@ describe('Consumer > Runner', () => {
})
it('should ignore request errors from BufferedAsyncIterator on stopped consumer', async () => {
- const rejectedRequest = new Promise((resolve, reject) => {
+ const rejectedRequest = () =>
+ new Promise((resolve, reject) => {
setTimeout(() => reject(new Error('Failed or manually rejected request')), 10)
})
- consumerGroup.fetch.mockImplementationOnce(
- () =>
- new Promise(resolve =>
+ consumerGroup.fetch.mockImplementationOnce(() => {
+ return new Promise(resolve =>
setTimeout(() => {
- resolve(BufferedAsyncIterator([rejectedRequest, Promise.resolve([])]))
+ resolve(BufferedAsyncIterator([rejectedRequest(), Promise.resolve([])]))
}, 10)
)
- )
+ })
runner.scheduleFetch = jest.fn()
await runner.start()
| 7 |
diff --git a/app/api/ApplicationApi.js b/app/api/ApplicationApi.js import WalletUnlockActions from "actions/WalletUnlockActions";
-import notify from "actions/NotificationActions";
import WalletDb from "stores/WalletDb";
import {
Aes,
@@ -10,6 +9,7 @@ import {
ChainStore
} from "bitsharesjs";
import counterpart from "counterpart";
+import {Notification} from "bitshares-ui-style-guide";
const ApplicationApi = {
create_account(
@@ -147,12 +147,10 @@ const ApplicationApi = {
);
if (!memo_from_privkey) {
- notify.addNotification({
+ Notification.error({
message: counterpart.translate(
"account.errors.memo_missing"
- ),
- level: "error",
- autoDismiss: 10
+ )
});
throw new Error(
"Missing private memo key for sender: " +
| 14 |
diff --git a/dual-contouring.js b/dual-contouring.js @@ -564,9 +564,7 @@ function _parsePQI(addr) {
};
}
-globalThis.addEventListener('result', e => {
- // console.log('got result', e.data, import.meta);
- const {id, result} = e.data;
+globalThis.handleResult = (id, result) => {
const p = cbs.get(id);
if (p) {
cbs.delete(id);
@@ -574,6 +572,6 @@ globalThis.addEventListener('result', e => {
} else {
console.warn('failed to find promise for id', e.data);
}
-});
+};
export default w;
\ No newline at end of file
| 0 |
diff --git a/packages/app/src/server/service/page.ts b/packages/app/src/server/service/page.ts @@ -317,6 +317,7 @@ class PageService {
}
async renamePage(page, newPagePath, user, options) {
+ const Page = mongoose.model('Page') as unknown as PageModel;
/*
* Common Operation
*/
@@ -330,6 +331,10 @@ class PageService {
return this.renamePageV4(page, newPagePath, user, options);
}
+ if (await Page.exists({ path: newPagePath })) {
+ throw Error(`Page already exists at ${newPagePath}`);
+ }
+
/*
* Resumable Operation
*/
@@ -1399,7 +1404,7 @@ class PageService {
ShareLink.deleteMany({ relatedPage: { $in: pageIds } }),
Revision.deleteMany({ pageId: { $in: pageIds } }),
Page.deleteMany({ $or: [{ path: { $in: pagePaths } }, { _id: { $in: pageIds } }] }),
- PageRedirect.deleteMany({ $or: [{ toPath: { $in: pagePaths } }] }),
+ PageRedirect.deleteMany({ $or: [{ fromPath: { $in: pagePaths }, toPath: { $in: pagePaths } }] }),
attachmentService.removeAllAttachments(attachments),
]);
}
@@ -1569,7 +1574,7 @@ class PageService {
.pipe(createBatchStream(BULK_REINDEX_SIZE))
.pipe(writeStream);
- await streamToPromise(readStream);
+ await streamToPromise(writeStream);
return nDeletedNonEmptyPages;
}
| 7 |
diff --git a/docs/installation.rst b/docs/installation.rst Installation
============
-Requirements: geth (1.6.5 or higher recommended, 1.6.0 or lower for whisper support), node (6.9.1 or higher is recommended) and npm
+Requirements: geth (1.6.5 or higher recommended), node (6.9.1 or higher is recommended) and npm
serpent (develop) if using contracts with Serpent, testrpc (3.0 or higher)
if using the simulator or the test functionality. Further: depending on
the dapp stack you choose: `IPFS <https://ipfs.io/>`__
| 2 |
diff --git a/app/test_map.html b/app/test_map.html {
"type": "osm-tiles",
"options":
- { "maxPos": 1000000000
+ {
+ "maxPos": 3095693983
}
}
],
| 3 |
diff --git a/assets/js/modules/tagmanager/datastore/accounts.test.js b/assets/js/modules/tagmanager/datastore/accounts.test.js * Internal dependencies
*/
import API from 'googlesitekit-api';
+import { STORE_NAME as CORE_SITE } from '../../../googlesitekit/datastore/site/constants';
import { STORE_NAME } from './constants';
import {
createTestRegistry,
@@ -51,6 +52,10 @@ describe( 'modules/tagmanager accounts', () => {
// Preload default settings to prevent the resolver from making unexpected requests
// as this is covered in settings store tests.
registry.dispatch( STORE_NAME ).receiveGetSettings( defaultSettings );
+ // Prevent fetches for existing tags.
+ registry.dispatch( STORE_NAME ).receiveGetExistingTag( null );
+ // Prevent error loading site info.
+ registry.dispatch( CORE_SITE ).receiveSiteInfo( {} );
} );
afterAll( () => {
| 1 |
diff --git a/templates/index.html b/templates/index.html <div class="col-md-2 col-xs-12">
<div class="row">
<div class="col-md-12 col-xs-6">
- <a class="box box-info" href="/" role="button">
+ {% if selected_program %}
+ <a class="box box-info" href="/indicators/home/{{selected_program.id}}/0/0/" role="button">
<p class="box-info-label">Indicators</p>
<p class="box-info-number">{{ get_indicators | length }}</p>
</a>
+ {% else %}
+ <a class="box box-info" href="/indicators/home/0/0/0/" role="button">
+ <p class="box-info-label">Indicators</p>
+ <p class="box-info-number">{{ get_indicators | length }}</p>
+ </a>
+ {% endif %}
</div>
<div class="col-md-12 col-xs-6">
| 3 |
diff --git a/components/Frame/Footer.js b/components/Frame/Footer.js @@ -178,18 +178,14 @@ class Footer extends Component {
<a>{t('footer/crew')}</a>
</Link>
<br />
- <Link route='jobs'>
- <a>{t('footer/jobs')}</a>
- </Link>
- <br />
- <Link route='researchBudget'>
- <a>{t('footer/researchBudget')}</a>
- </Link>
- <br />
<Link route='events'>
<a>{t('footer/events')}</a>
</Link>
<br />
+ <Link route='jobs'>
+ <a>{t('footer/jobs')}</a>
+ </Link>
+ <br />
<Link route='media'>
<a>{t('footer/media')}</a>
</Link>
@@ -205,6 +201,10 @@ class Footer extends Component {
<a href='https://project-r.construction/' rel='noopener' target='_blank'>
{t('footer/about/projecR')}
</a>
+ <br />
+ <Link route='researchBudget'>
+ <a>{t('footer/researchBudget')}</a>
+ </Link>
</div>
<div {...styles.column}>
<div {...styles.title}>{t('footer/legal/title')}</div>
| 7 |
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md -<!-- hey there, thanks for reporting an issue or feature request. If you found unexpected behaviour or problems using leaflet-geoman, please provide a demo via JSfiddle that reproduces the problem. You can use this as a starting point: https://jsfiddle.net/3e6r4L25/ . This saves me a lot of time to find the issue and I can help you / fix it much faster :-) - THANKS -->
+<!-- hey there, thanks for reporting an issue or feature request. If you found unexpected behaviour or problems using leaflet-geoman, please provide a demo via JSfiddle that reproduces the problem. You can use this as a starting point: https://jsfiddle.net/o1dwu2vg/ . This saves me a lot of time to find the issue and I can help you / fix it much faster :-) - THANKS -->
| 1 |
diff --git a/app/assets/stylesheets/editor-3/_custom-list.scss b/app/assets/stylesheets/editor-3/_custom-list.scss }
.CustomList-item.is-highlighted,
.CustomList-item:hover {
- background: rgba($cHighlight, 0.16);
+ background: rgba($cBlue, 0.08);
cursor: pointer;
}
.CustomList-item.is-disabled {
| 4 |
diff --git a/assets/js/modules/analytics/common/account-select.test.js b/assets/js/modules/analytics/common/account-select.test.js @@ -123,6 +123,5 @@ describe( 'AccountSelect', () => {
expect( newPropertyID ).not.toBeFalsy();
expect( newWebPropertyID ).not.toBeFalsy();
expect( newProfileID ).not.toBeFalsy();
- // expect( apiFetchMock ).not.toHaveBeenCalled();
} );
} );
| 2 |
diff --git a/test/model.test.js b/test/model.test.js @@ -5189,7 +5189,7 @@ describe('Model', function() {
it('watch() before connecting (gh-5964)', async function() {
const db = start();
- const MyModel = db.model('Test', new Schema({ name: String }));
+ const MyModel = db.model('Test5964', new Schema({ name: String }));
// Synchronous, before connection happens
const changeStream = MyModel.watch();
| 10 |
diff --git a/src/widgets/time-series/time-series-header.tpl b/src/widgets/time-series/time-series-header.tpl <div class="CDB-Widget-contentSpaced CDB-Widget-contentFull">
<div class="CDB-Widget-contentSpaced--start">
- <h3 class="CDB-Text CDB-Size-large u-ellipsis" title=""></h3>
<% if (showSelection) { %>
- <div>
- <p class="CDB-Text CDB-Size-large u-iBlock">Selected from</p>
- <p class="CDB-Text CDB-Size-large u-secondaryTextColor u-iBlock"><%- start %></p>
- <p class="CDB-Text CDB-Size-large u-iBlock">to</p>
- <p class="CDB-Text CDB-Size-large u-secondaryTextColor u-iBlock"><%- end %></p>
- </div>
+ <p class="CDB-Text">
+ Selected from
+ <span class="u-secondaryTextColor"><%- start %></span>
+ to
+ <span class="u-secondaryTextColor"><%- end %></span>
+ </p>
<% } %>
</div>
<div class="CDB-Widget-contentSpaced--end">
| 1 |
diff --git a/app/background-process/web-apis/dat-archive.js b/app/background-process/web-apis/dat-archive.js @@ -163,7 +163,7 @@ export default {
if (settings.networked === false) {
await assertArchiveOfflineable(archive)
}
- await archivesDb.setUserSettings(0, archive.key, {networked: settings.networked})
+ await archivesDb.setUserSettings(0, archive.key, {networked: settings.networked, expiresAt: 0})
}
},
| 12 |
diff --git a/articles/tokens/preview/refresh-token.md b/articles/tokens/preview/refresh-token.md @@ -209,11 +209,9 @@ To revoke the user's access to an authorized application, and hence invalidate t
## Rules
-Rules will run for the [Refresh Token Exchange](#use-a-refresh-token). There is a key difference in the behavior of rules in this flow:
+Rules will run for the [Refresh Token Exchange](#use-a-refresh-token). To execute special logic, you can look at the `context.protocol` property in your rule. If the value is `oauth2-refresh-token`, then this is the indication that the rule is running during the [Refresh Token Exchange](#use-a-refresh-token).
-- If you try to do a [redirect](/rules/redirect) with `context.redirect`, the authentication flow will return an error.
-
-If you wish to execute special logic unique to the [Refresh Token Exchange](#use-a-refresh-token), you can look at the `context.protocol` property in your rule. If the value is `oauth2-refresh-token`, then this is the indication that the rule is running during the Refresh Token exchange.
+<div class="alert alert-warning">If you try to do a <a href="/rules/redirect">redirect</a> with <code>context.redirect</code>, the authentication flow will return an error.</div>
## SDK Support
| 14 |
diff --git a/styles/override-editor.scss b/styles/override-editor.scss @@ -745,7 +745,10 @@ body {
.es-simple-v-single-select {
display: flex;
flex-direction: column;
- gap: 0.25rem;
+ gap: 1px;
+ border-radius: 0.25rem;
+
+ box-shadow: 0 0 0 1px hsl(0 0% 92%);
.components-button {
justify-content: flex-start !important;
@@ -754,13 +757,24 @@ body {
height: 1.5rem;
width: 1.5rem;
}
+
+ border-radius: 0 !important;
+
+ &:first-child {
+ border-top-left-radius: 0.25rem !important;
+ border-top-right-radius: 0.25rem !important;
+ }
+
+ &:last-child {
+ border-bottom-left-radius: 0.25rem !important;
+ border-bottom-right-radius: 0.25rem !important;
+ }
}
.components-button:not(.is-pressed) {
- border: 1px solid #F2F2F2;
-
&:hover {
border-color: var(--wp-admin-theme-color, #111111);
+ background-color: hsl(0 0% 98%) !important;
}
}
}
| 7 |
diff --git a/src/main/scala/core/interceptor/InterceptorService.scala b/src/main/scala/core/interceptor/InterceptorService.scala @@ -25,12 +25,12 @@ class InterceptorService @Inject() extends MethodInterceptor with Logger {
injector.getInstance(clazz).asInstanceOf[Interceptor[AnyRef, AnyRef]].handle(args(argIndex)),
Inf
) match {
- case Left(error) =>
- log.debug(s"Handled with error: $error")
- return error
- case Right(value) =>
- log.debug(s"Handled with value: $value")
- value.foreach(args(argIndex) = _)
+ case Left(result) =>
+ log.debug(s"Handled with result: $result")
+ return result
+ case Right(arg) =>
+ log.debug(s"Handled with arg: $arg")
+ arg.foreach(args(argIndex) = _)
}
}
log.debug(s"Proceed to the next interceptor in the chain")
| 10 |
diff --git a/public/js/grocy.js b/public/js/grocy.js @@ -896,7 +896,7 @@ $('.dropdown-item').has('.form-check input[type=checkbox]').on('click', function
$('.table').on('column-sizing.dt', function(e, settings)
{
var dtScrollWidth = $('.dataTables_scroll').width();
- var tableWidth = $('.table').width();
+ var tableWidth = $('.table').width() + 100; // Some extra padding, otherwise the scrollbar maybe only appears after a column is already completely out of the viewport
if (dtScrollWidth < tableWidth)
{
| 7 |
diff --git a/types/index.d.ts b/types/index.d.ts @@ -2048,6 +2048,11 @@ export declare namespace Knex {
primary(columnNames: readonly string[], options?: Readonly<{constraintName?: string, deferrable?: deferrableType}>): TableBuilder;
/** @deprecated */
primary(columnNames: readonly string[], constraintName?: string): TableBuilder;
+ index(
+ columnNames: string | readonly (string | Raw)[],
+ indexName?: string,
+ indexType?: string
+ ): TableBuilder;
index(
columnNames: string | readonly (string | Raw)[],
indexName?: string,
@@ -2134,6 +2139,7 @@ export declare namespace Knex {
indexName?: string,
options?: Readonly<{indexType?: string, predicate?: QueryBuilder}>
): ColumnBuilder;
+ index(indexName?: string, indexType?: string): ColumnBuilder;
}
interface SqlLiteColumnBuilder extends ColumnBuilder {
| 11 |
diff --git a/Node/intelligence-LUIS/README.md b/Node/intelligence-LUIS/README.md @@ -15,25 +15,26 @@ The minimum prerequisites to run this sample are:
* **[Recommended]** Visual Studio Code for IntelliSense and debugging, download it from [here](https://code.visualstudio.com/) for free.
#### LUIS Application
-If you want to test this sample, you have to import the pre-build [LuisBot.json](LuisBot.json) file to your LUIS account.
The first step to using LUIS is to create or import an application. Go to the home page, www.luis.ai, and log in. After creating your LUIS account you'll be able to Import an Existing Application where can you can select a local copy of the LuisBot.json file an import it.
-Once you imported the application you'll need to "train" the model ([Training](https://www.microsoft.com/cognitive-services/en-us/LUIS-api/documentation/Train-Test)) before you can "Publish" the model in an HTTP endpoint. For more information, take a look at [Publishing a Model](https://www.microsoft.com/cognitive-services/en-us/LUIS-api/documentation/PublishApp).
+If you want to test this sample, you have to import the pre-build [LuisBot.json](LuisBot.json) file to your LUIS account.
+
+Once you imported the application you'll need to "train" the model ([Training](https://docs.microsoft.com/en-us/azure/cognitive-services/luis/train-test)) before you can "Publish" the model in an HTTP endpoint. For more information, take a look at [Publishing a Model](https://docs.microsoft.com/en-us/azure/cognitive-services/luis/publishapp).
Finally, edit the [.env](.env#L6) file and update the `LUIS_MODEL_URL` variable with your's Model URL.
#### Where to find the Model URL
-In the LUIS application's dashboard, click the "Publish App" button in the right side bar, select an Endpoint Key and then click the "Publish" button. After a couple of moments, you will see a url that makes your models available as a web service.
+In the LUIS application's dashboard, click the "Publish App" button in the left side bar, select an Endpoint Key and then click the "Publish" button. After a couple of moments, you will see a url that makes your models available as a web service.
### Code Highlights
-One of the key problems in human-computer interactions is the ability of the computer to understand what a person wants, and to find the pieces of information that are relevant to their intent. In the LUIS application, you will bundle together the intents and entities that are important to your task. Read more about [Planning an Application](https://www.microsoft.com/cognitive-services/en-us/LUIS-api/documentation/Plan-your-app) in the LUIS Help
+One of the key problems in human-computer interactions is the ability of the computer to understand what a person wants, and to find the pieces of information that are relevant to their intent. In the LUIS application, you will bundle together the intents and entities that are important to your task. Read more about [Planning an Application](https://docs.microsoft.com/en-us/azure/cognitive-services/LUIS/plan-your-app) in the LUIS Help
#### Intent Recognizers
@@ -216,8 +217,8 @@ You will see the following in the Bot Framework Emulator when opening and runnin
To get more information about how to get started in Bot Builder for Node and LUIS please review the following resources:
* [Bot Builder for Node.js Reference](https://docs.microsoft.com/en-us/bot-framework/nodejs/)
* [Understanding Natural Language](https://docs.botframework.com/en-us/node/builder/guides/understanding-natural-language/)
-* [LUIS Help Docs](https://www.luis.ai/home/help)
-* [Cognitive Services Documentation](https://www.microsoft.com/cognitive-services/en-us/luis-api/documentation/home)
+* [LUIS Help Docs](https://www.luis.ai/help#luis-help)
+* [Cognitive Services Documentation](https://docs.microsoft.com/en-us/azure/cognitive-services/luis/home)
* [IntentDialog](https://docs.botframework.com/en-us/node/builder/chat/IntentDialog/)
* [EntityRecognizer](https://docs.botframework.com/en-us/node/builder/chat-reference/classes/_botbuilder_d_.entityrecognizer.html)
* [Alarm Bot in Node](https://github.com/Microsoft/BotBuilder/tree/master/Node/examples/basics-naturalLanguage)
| 3 |
diff --git a/app-object.js b/app-object.js @@ -55,8 +55,8 @@ scene.add(dolly);
const orthographicCamera = new THREE.OrthographicCamera(-1, 1, 1, -1, 0.1, 100);
scene.add(orthographicCamera);
-addDefaultLights(scene, true);
-addDefaultLights(avatarScene, false);
+// addDefaultLights(scene, true);
+// addDefaultLights(avatarScene, false);
const renderer2 = new CSS3DRenderer();
renderer2.setSize(window.innerWidth, window.innerHeight);
| 2 |
diff --git a/app-template/bitcoincom/GoogleService-Info.plist b/app-template/bitcoincom/GoogleService-Info.plist <plist version="1.0">
<dict>
<key>AD_UNIT_ID_FOR_BANNER_TEST</key>
- <string>ca-app-pub-432300239540/2934735716</string>
+ <string>ca-app-pub-3940256099942544/2934735716</string>
<key>AD_UNIT_ID_FOR_INTERSTITIAL_TEST</key>
- <string>ca-app-pub-432300239540/4411468910</string>
+ <string>ca-app-pub-3940256099942544/4411468910</string>
<key>CLIENT_ID</key>
- <string>432300239540-aeh6b8eebnkgq0e3tv0g0a0t1qhkhhcc.apps.googleusercontent.com</string>
+ <string>432300239540-qfr4lk43b0134fgijqp7mk138lifjnki.apps.googleusercontent.com</string>
<key>REVERSED_CLIENT_ID</key>
- <string>com.googleusercontent.apps.432300239540-aeh6b8eebnkgq0e3tv0g0a0t1qhkhhcc</string>
+ <string>com.googleusercontent.apps.432300239540-qfr4lk43b0134fgijqp7mk138lifjnki</string>
<key>API_KEY</key>
- <string>AIzaSyADYCe-0VVCzndVH1nXMdV2JLD_cM8TmJo</string>
+ <string>AIzaSyBPtKuydKLbVkuNkpuKzsGwKJXW9Y340Pg</string>
<key>GCM_SENDER_ID</key>
<string>432300239540</string>
<key>PLIST_VERSION</key>
<key>STORAGE_BUCKET</key>
<string>bitcoin-com-wallet.appspot.com</string>
<key>IS_ADS_ENABLED</key>
- <true/>
+ <true></true>
<key>IS_ANALYTICS_ENABLED</key>
- <false/>
+ <false></false>
<key>IS_APPINVITE_ENABLED</key>
- <true/>
+ <false></false>
<key>IS_GCM_ENABLED</key>
- <true/>
+ <true></true>
<key>IS_SIGNIN_ENABLED</key>
- <true/>
+ <true></true>
<key>GOOGLE_APP_ID</key>
- <string>1:149194066736:ios:6de8942b48fea047</string>
+ <string>1:432300239540:ios:e23224cd1aed3778</string>
<key>DATABASE_URL</key>
- <string>https://bitcoin-com-wallet.firebaseio.com/</string>
+ <string>https://bitcoin-com-wallet.firebaseio.com</string>
</dict>
</plist>
| 3 |
diff --git a/_events/GlobalCommunityBioSummit/GlobalCommunityBioSummit.md b/_events/GlobalCommunityBioSummit/GlobalCommunityBioSummit.md @@ -21,11 +21,13 @@ _geoloc:
---
## About
-The Community Biotechnology Initiative at the MIT Media Lab is organizing a Global Summit on Community Biotechnology this fall from Friday September 22 to Sunday September 24. Our goal is to provide a space for the global community of bio-hackers and members of independent and community laboratories to convene, plan, build fellowship, and continue the evolution of our movement. Our programming topics will include: diversity and inclusion, sharing and learning, bio security, enabling technologies, bio art and design, and more.
+The Community Biotechnology Initiative at the MIT Media Lab is organizes the Global Community Bio Summit. Our goal is to provide a space for the global community of bio-hackers and members of independent and community laboratories to convene, plan, build fellowship, and continue the evolution of our movement. Our programming topics will include: diversity and inclusion, sharing and learning, bio security, enabling technologies, bio art and design, and more.
-We are asking all interested participants to apply! While all are welcome, space is limited, so we are prioritizing active practitioners in the community with an emphasis on diversity across geographic, cultural, ethnic, gender, and creative backgrounds. We will add accepted participants to the Directory on a rolling basis with the goal of accepting everyone interested in joining.
+The first event was held in 2017.
-We are also organizing additional programming for those traveling from far on Thursday September 21 and Monday September 25.
+## Events
+September 22-24, 2017
+October 26 -28, 2018
---
Text taken from initiative
| 0 |
diff --git a/translations/en-us.yaml b/translations/en-us.yaml @@ -2450,7 +2450,7 @@ catalogSettings:
rancher: "{appName} Certified Library"
pl: Certified Library
detail:
- rancher: Templates required for core Rancher features such as Kubernetes orchestration support. Maintained and supported by Rancher Labs.
+ rancher: Templates required for core features such as Kubernetes orchestration support. Maintained and supported by Rancher Labs.
pl: Officially maintained templates required for core features such as Kubernetes.
community:
header:
@@ -3413,7 +3413,7 @@ clusterNew:
detail: Customize advanced cluster options
authorizedEndpoint:
title: Authorized Endpoint
- detail: "Enabling the authorized cluster endpoint allows direct communication with the cluster, bypassing the Rancher API proxy. Authorized endpoints can be retrieved by generating a kubeconfig for the cluster."
+ detail: "Enabling the authorized cluster endpoint allows direct communication with the cluster, bypassing the API proxy. Authorized endpoints can be retrieved by generating a kubeconfig for the cluster."
label: Authorized Cluster Endpoint
custom:
label: From existing nodes
@@ -6605,9 +6605,9 @@ nodeDriver:
role:
label: Service Role
noneSelected: "Rancher created role"
- help: "You may choose to not select a Service Role and Rancher will create one for you."
+ help: "You may choose to not select a Service Role and one will be created for you."
radio:
- default: "Standard: Rancher generated service role"
+ default: "Standard: Service role is automatically created"
custom: "Custom: Choose from your existing service roles"
next: "Next: Select VPC & Subnet"
loading: "Loading VPCs from Amazon..."
@@ -6620,7 +6620,7 @@ nodeDriver:
loadingRancherDefault: "Loading Instance options..."
noneSelected: "Rancher created VPC and Subnet"
radio:
- default: "Standard: Rancher generated VPC and Subnet"
+ default: "Standard: VPC and Subnet are automatically created"
custom: "Custom: Choose from your existing VPC and Subnets"
subnet:
title: Subnet
@@ -6642,7 +6642,7 @@ nodeDriver:
loading: Loading Instance options...
ami:
label: Custom AMI Override
- help: "You may override the default AMI that Rancher selects based on your region"
+ help: "You may override the default AMI based on your region"
max:
label: Maximum ASG Size
min:
| 2 |
diff --git a/src/govuk/i18n.unit.test.mjs b/src/govuk/i18n.unit.test.mjs @@ -165,27 +165,76 @@ describe('I18n', () => {
})
describe('.getPluralSuffix', () => {
- it('returns the preferred plural form for the locale if a translation exists', () => {
+ let consoleWarn
+
+ beforeEach(() => {
+ // Silence warnings in test output, and allow us to 'expect' them
+ consoleWarn = jest.spyOn(global.console, 'warn')
+ .mockImplementation(() => { /* noop */ })
+ })
+
+ afterEach(() => {
+ jest.restoreAllMocks()
+ })
+
+ it('uses `Intl.PluralRules` when available', () => {
+ const IntlPluralRulesSelect = jest.spyOn(global.Intl.PluralRules.prototype, 'select')
+ .mockImplementation(() => 'one')
+
const i18n = new I18n({
'test.one': 'test',
'test.other': 'test'
}, {
locale: 'en'
})
+
expect(i18n.getPluralSuffix('test', 1)).toBe('one')
+ expect(IntlPluralRulesSelect).toBeCalledWith(1)
+ })
+
+ it('falls back to internal fallback rules', () => {
+ const i18n = new I18n({
+ 'test.one': 'test',
+ 'test.other': 'test'
+ }, {
+ locale: 'en'
+ })
+
+ jest.spyOn(i18n, 'hasIntlPluralRulesSupport')
+ .mockImplementation(() => false)
+
+ const selectPluralFormUsingFallbackRules = jest.spyOn(i18n, 'selectPluralFormUsingFallbackRules')
+
+ i18n.getPluralSuffix('test', 1)
+ expect(selectPluralFormUsingFallbackRules).toBeCalledWith(1)
})
- it('falls back to `other` if a translation for the plural form does not exist', () => {
+ it('returns the preferred plural form for the locale if a translation exists', () => {
const i18n = new I18n({
+ 'test.one': 'test',
'test.other': 'test'
}, {
locale: 'en'
})
- expect(i18n.getPluralSuffix('test', 1)).toBe('other')
+ expect(i18n.getPluralSuffix('test', 1)).toBe('one')
+ })
+
+ it.each([
+ { form: 'one', count: 1 },
+ { form: 'two', count: 2 },
+ { form: 'few', count: 3 },
+ { form: 'many', count: 6 }
+ ])('`$form` falls back to `other` if preferred form `$form` is missing', ({ count }) => {
+ const i18n = new I18n({
+ 'test.other': 'test'
+ }, {
+ locale: 'cy'
+ })
+
+ expect(i18n.getPluralSuffix('test', count)).toBe('other')
})
it('logs a console warning when falling back to `other`', () => {
- const consoleWarn = jest.spyOn(global.console, 'warn')
const i18n = new I18n({
'test.other': 'test'
}, {
@@ -199,15 +248,35 @@ describe('I18n', () => {
)
})
+ it('throws an error if trying to use `other` but `other` is not provided', () => {
+ const i18n = new I18n({}, {
+ locale: 'en'
+ })
+
+ expect(() => { i18n.getPluralSuffix('test', 2) })
+ .toThrowError('i18n: Plural form ".other" is required for "en" locale')
+ })
+
it('throws an error if a plural form is not provided and neither is `other`', () => {
const i18n = new I18n({
'test.one': 'test'
}, {
locale: 'en'
})
+
expect(() => { i18n.getPluralSuffix('test', 2) })
.toThrowError('i18n: Plural form ".other" is required for "en" locale')
})
+
+ it('returns `other` for non-numbers', () => {
+ const i18n = new I18n({
+ 'test.other': 'test'
+ }, {
+ locale: 'en'
+ })
+
+ expect(i18n.getPluralSuffix('test', 'nonsense')).toBe('other')
+ })
})
describe('.getPluralRulesForLocale', () => {
| 7 |
diff --git a/source/Overture/foundation/Binding.js b/source/Overture/foundation/Binding.js only changes starting from the final static object will be observed.
A static portion is signified by using a `*` as a divider instead of a `.`.
- The section before the '*' is taken to be static. If no '*' is present, the
+ The section before the `*` is taken to be static. If no `*` is present, the
entire path is taken to be dynamic. For example, if the path is
`static.path*dynamic.path`, at initialisation time, the `path`
property of the `static` property of the root object will be found. After
| 1 |
diff --git a/src/node/sockets/node-clients/service/discovery/fallbacks/fallback_nodes_list.js b/src/node/sockets/node-clients/service/discovery/fallbacks/fallback_nodes_list.js @@ -24,7 +24,7 @@ export default {
{"addr": ["https://node6.petreus.ro:443"]}, // Thanks to Dani Petreus
{"addr": ["https://node7.petreus.ro:443"]}, // Thanks to Dani Petreus
{"addr": ["https://node8.petreus.ro:443"]}, // Thanks to Dani Petreus
- // {"addr": ["https://node9.petreus.ro:443"]}, // Thanks to Dani Petreus
+ {"addr": ["https://node9.petreus.ro:443"]}, // Thanks to Dani Petreus
{"addr": ["https://node10.petreus.ro:443"]}, // Thanks to Dani Petreus
{"addr": ["https://webdollarpool.win:80/"]}, // Thanks to @vladimirpetre
@@ -58,7 +58,7 @@ export default {
//--------------WebDollar FallBack Nodes-------------------
//---------------------------------------------------------
- // {"addr": ["https://webdchucknorris.vpnromania.ro:80"]}, // Thanks to @cbusuioceanu
+ {"addr": ["https://webdchucknorris.vpnromania.ro:80"]}, // Thanks to @cbusuioceanu
{"addr": ["https://webdchucknorris.vpnromania.ro:8080"]}, // Thanks to @cbusuioceanu
{"addr": ["https://webdollar.csland.ro:8440"]}, // Thanks to @mariotheodor
| 13 |
diff --git a/karma.conf.js b/karma.conf.js @@ -29,6 +29,11 @@ module.exports = function (config) {
base: 'SauceLabs',
browserName: 'internet explorer',
version: 'latest'
+ },
+ sl_edge_latest: {
+ base: 'SauceLabs',
+ browserName: 'MicrosoftEdge',
+ version: 'latest'
}
};
| 0 |
diff --git a/src/traces/barpolar/attributes.js b/src/traces/barpolar/attributes.js 'use strict';
+var extendFlat = require('../../lib/extend').extendFlat;
var scatterPolarAttrs = require('../scatterpolar/attributes');
var barAttrs = require('../bar/attributes');
@@ -28,11 +29,34 @@ module.exports = {
// description: 'Sets the orientation of the bars.'
// },
- base: barAttrs.base,
- offset: barAttrs.offset,
- width: barAttrs.width,
+ base: extendFlat({}, barAttrs.base, {
+ description: [
+ 'Sets where the bar base is drawn (in radial axis units).',
+ 'In *stack* barmode,',
+ 'traces that set *base* will be excluded',
+ 'and drawn in *overlay* mode instead.'
+ ].join(' ')
+ }),
+ offset: extendFlat({}, barAttrs.offset, {
+ description: [
+ 'Shifts the angular position where the bar is drawn',
+ '(in *thetatunit* units).'
+ ].join(' ')
+ }),
+ width: extendFlat({}, barAttrs.width, {
+ description: [
+ 'Sets the bar angular width (in *thetaunit* units).'
+ ].join(' ')
+ }),
- text: barAttrs.text,
+ text: extendFlat({}, barAttrs.text, {
+ description: [
+ 'Sets hover text elements associated with each bar.',
+ 'If a single string, the same string appears over all bars.',
+ 'If an array of string, the items are mapped in order to the',
+ 'this trace\'s coordinates.'
+ ].join(' ')
+ }),
// hovertext: barAttrs.hovertext,
// textposition: {},
| 7 |
diff --git a/token-metadata/0xe25b0BBA01Dc5630312B6A21927E578061A13f55/metadata.json b/token-metadata/0xe25b0BBA01Dc5630312B6A21927E578061A13f55/metadata.json "symbol": "SHIP",
"address": "0xe25b0BBA01Dc5630312B6A21927E578061A13f55",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/app/containers/wallet/WalletAddPage.js b/app/containers/wallet/WalletAddPage.js @@ -92,8 +92,8 @@ export default class WalletAddPage extends Component<Props> {
<WalletCreateDialogContainer
actions={actions}
stores={stores}
+ onClose={this.onClose}
classicTheme={profile.isClassicTheme}
- onClose={() => actions.dialogs.open.trigger({ dialog: WalletCreateListDialog })}
/>
);
} else if (uiDialogs.isOpen(WalletCreateListDialog)) {
@@ -142,8 +142,8 @@ export default class WalletAddPage extends Component<Props> {
<WalletTrezorConnectDialogContainer
actions={actions}
stores={stores}
+ onClose={this.onClose}
classicTheme={profile.isClassicTheme}
- onClose={() => actions.dialogs.open.trigger({ dialog: WalletConnectHardwareDialog })}
/>
);
} else if (uiDialogs.isOpen(WalletLedgerConnectDialogContainer)) {
@@ -151,8 +151,8 @@ export default class WalletAddPage extends Component<Props> {
<WalletLedgerConnectDialogContainer
actions={actions}
stores={stores}
+ onClose={this.onClose}
classicTheme={profile.isClassicTheme}
- onClose={() => actions.dialogs.open.trigger({ dialog: WalletConnectHardwareDialog })}
/>
);
} else {
| 13 |
diff --git a/test/perf/src/test/test.js b/test/perf/src/test/test.js @@ -113,9 +113,17 @@ const systemToken = secured() ? oauth.cache(authServer,
describe('abacus-perf-test', () => {
before((done) => {
if (objectStorageToken)
- objectStorageToken.start();
+ objectStorageToken.start((err) => {
+ if (err)
+ console.log('Could not fetch object storage token due to, %o', err);
+ });
+
if (systemToken)
- systemToken.start();
+ systemToken.start((err) => {
+ if (err)
+ console.log('Could not fetch system token due to, %o', err);
+ });
+
if (/.*localhost.*/.test(collector))
// Delete test dbs on the configured db server
dbclient.drop(process.env.DB, /^abacus-/, done);
@@ -387,7 +395,7 @@ describe('abacus-perf-test', () => {
expect(val.statusCode).to.equal(200);
// Compare the usage report we got with the expected report
- console.log('Processed %d usage docs for org%d',
+ debug('Processed %d usage docs for org%d',
processed(val), o + 1);
try {
// Can't check the dynamic time in resource_instances
| 7 |
diff --git a/packages/app/src/styles/theme/island.scss b/packages/app/src/styles/theme/island.scss @@ -31,7 +31,7 @@ html[dark] {
// $color-list-hover: ;
$bgcolor-list-hover: $color-themelight;
$color-list-active: $color-global;
- $bgcolor-list-active: lighten($bgcolor-list-hover, 5%);
+ $bgcolor-list-active: $primary;
// Table colors
// $color-table: #; // optional
@@ -131,7 +131,7 @@ html[dark] {
$color-list-hover,
$bgcolor-list-hover,
$color-list-active,
- $bgcolor-list-active,
+ lighten($bgcolor-list-hover, 5%),
$gray-400
);
}
| 7 |
diff --git a/apps/locale/locale.html b/apps/locale/locale.html distance: n => (n < 1000) ? Math.round(n) + locale.distance[0] : Math.round(n/1000) + locale.distance[1],
speed: s => Math.round(s) +locale.speed,
temp: t => Math.round(t) + locale.temperature,
- translate: s => locale.trans[s]||locale.trans[s.toLowerCase()]||s,
+ translate: s => {s=""+s;return locale.trans[s]||locale.trans[s.toLowerCase()]||s},
date: (d,short) => (short) ? \`${dateS}\`: \`${dateN}\`,
time: (d,short) => (short) ? \`${timeS}\`: \`${timeN}\`,
};`;
| 11 |
diff --git a/app/controllers/carto/api/users_controller.rb b/app/controllers/carto/api/users_controller.rb @@ -93,15 +93,23 @@ module Carto
user.set_fields(attributes, fields_to_be_updated) if fields_to_be_updated.present?
raise Sequel::ValidationFailed.new('Validation failed') unless user.errors.try(:empty?) && user.valid?
+
+ ActiveRecord::Base.transaction do
+ unless attributes[:mfa].nil?
+ service = Carto::UserMultifactorAuthUpdateService.new(user_id: user.id)
+ service.update(enabled: attributes[:mfa])
+ end
+
user.update_in_central
user.save(raise_on_failure: true)
end
+ end
render_jsonp(Carto::Api::UserPresenter.new(user, current_viewer: current_viewer).to_poro)
rescue CartoDB::CentralCommunicationFailure => e
CartoDB::Logger.error(exception: e, user: user, params: params)
render_jsonp({ errors: "There was a problem while updating your data. Please, try again." }, 422)
- rescue Sequel::ValidationFailed
+ rescue Sequel::ValidationFailed, ActiveRecord::RecordInvalid
render_jsonp({ message: "Error updating your account details", errors: user.errors }, 400)
rescue Carto::PasswordConfirmationError
render_jsonp({ message: "Error updating your account details", errors: user.errors }, 403)
| 3 |
diff --git a/src/tiledimage.js b/src/tiledimage.js @@ -420,10 +420,12 @@ $.extend($.TiledImage.prototype, $.EventSource.prototype, /** @lends OpenSeadrag
},
/**
- * @returns {OpenSeadragon.Point} The dimensions of the image as it would be currently rendered in the viewport
+ * @returns {OpenSeadragon.Point} The TiledImage's content size, in window coordinates.
*/
- getRelativeSize: function() {
- return this.getContentSize().times(this.viewport.getZoom());
+ getSizeInWindowCoordinates: function() {
+ var topLeft = this.viewport.imageToWindowCoordinates(new $.Point(0, 0));
+ var bottomRight = this.viewport.imageToWindowCoordinates(this.getContentSize());
+ return new $.Point(bottomRight.x - topLeft.x, bottomRight.y - topLeft.y);
},
// private
| 10 |
diff --git a/src/readers/csv/csv.js b/src/readers/csv/csv.js @@ -149,7 +149,7 @@ const CSVReader = Reader.extend({
_guessDelimiter(text) {
const stringsToCheck = 2;
- const rows = this._getRows(text, stringsToCheck);
+ const rows = this._getRows(text, stringsToCheck).map((row) => row.replace(/".*?"/g, ''));
if (rows.length !== stringsToCheck) {
throw this.error(this.ERRORS.NOT_ENOUGH_ROWS_IN_FILE);
| 8 |
diff --git a/src/charts/Line.js b/src/charts/Line.js @@ -338,16 +338,19 @@ class Line {
seriesNumber: realIndex,
i
})
- } else if (w.config.stroke.fill) {
+ } else {
+ if (w.config.stroke.fill.type === 'solid') {
+ lineFill = w.globals.stroke.colors[realIndex]
+ } else {
const prevFill = w.config.fill
w.config.fill = w.config.stroke.fill
+
lineFill = fill.fillPath({
seriesNumber: realIndex,
i
})
w.config.fill = prevFill
- } else {
- lineFill = w.globals.stroke.colors[realIndex]
+ }
}
for (let p = 0; p < paths.linePaths.length; p++) {
| 1 |
diff --git a/voice-endpoint-voicer.js b/voice-endpoint-voicer.js @@ -54,7 +54,9 @@ class VoiceEndpointVoicer {
if (!this.running) {
this.running = true;
+ if (!this.player.avatar.isAudioEnabled()) {
this.player.avatar.setAudioEnabled(true);
+ }
(async () => {
const audioBuffer = await (text.isPreloadMessage ? text.waitForLoad() : this.loadAudioBuffer(text));
| 0 |
diff --git a/packages/react-router/docs/api/Redirect.md b/packages/react-router/docs/api/Redirect.md @@ -64,3 +64,11 @@ This can only be used to match a location when rendering a `<Redirect>` inside o
<Route path='/users/profile/:id' component={Profile}/>
</Switch>
```
+
+## exact: bool
+
+Match `from` exactly; equivalent to [Route.exact](./Route.md#exact-bool).
+
+## strict: bool
+
+Match `from` strictly; equivalent to [Route.strict](./Route.md#strict-bool).
| 0 |
diff --git a/sounds.js b/sounds.js @@ -22,6 +22,7 @@ const loadPromise = (async () => {
soundFiles.narutoRun = soundFileSpecs.filter(f => /^narutoRun\//.test(f.name));
soundFiles.chomp = soundFileSpecs.filter(f => /^food\/chomp/.test(f.name));
soundFiles.gulp = soundFileSpecs.filter(f => /^food\/gulp/.test(f.name));
+ soundFiles.enemyDeath = soundFileSpecs.filter(f => /enemyDeath/.test(f.name));
soundFileAudioBuffer = _soundFileAudioBuffer;
// console.log('loaded audio', soundFileSpecs, soundFileAudioBuffer);
| 0 |
diff --git a/cmd_workflow.go b/cmd_workflow.go @@ -136,9 +136,7 @@ func (ps *pipelineStage) Run(ctx context.Context, logger *zerolog.Logger) error
opErr := opEntry.op.Invoke(ctx, goLogger)
if opErr != nil {
mapKey := fmt.Sprintf("%sErr%d", opEntry.opName, opIndex)
- mapErr.Store(mapKey, fmt.Sprintf("Operation (%s) error: %s",
- opEntry.opName,
- opErr))
+ mapErr.Store(mapKey, opErr)
}
}(eachIndex, eachEntry, logger)
}
@@ -147,9 +145,9 @@ func (ps *pipelineStage) Run(ctx context.Context, logger *zerolog.Logger) error
// Were there any errors?
errorText := []string{}
mapErr.Range(func(key interface{}, value interface{}) bool {
- keyName := key
- valueErr := value
- errorText = append(errorText, fmt.Sprintf("%s:%#v", keyName, valueErr))
+ errorText = append(errorText, fmt.Sprintf("%s:%v",
+ key,
+ value))
return true
})
if len(errorText) != 0 {
| 7 |
diff --git a/token-metadata/0x7C5A0CE9267ED19B22F8cae653F198e3E8daf098/metadata.json b/token-metadata/0x7C5A0CE9267ED19B22F8cae653F198e3E8daf098/metadata.json "symbol": "SAN",
"address": "0x7C5A0CE9267ED19B22F8cae653F198e3E8daf098",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/ide.js b/src/ide.js @@ -593,7 +593,19 @@ D.IDE = function IDE(opts = {}) {
setTimeout(() => { inp.focus(); }, 1);
},
TaskDialog(x) {
- if (D.dlg_bw) {
+ if (D.el && D.win) {
+ const { bwId } = D.ide.focusedWin;
+ const bw = bwId ? D.el.BrowserWindow.fromId(bwId) : D.elw;
+ const r = D.el.dialog.showMessageBox(bw, {
+ message: `${x.text}\n${x.subtext}`,
+ title: x.title || '',
+ buttons: x.options.concat(x.buttonText) || [''],
+ type: 'question',
+ });
+ const index = r < x.options.length ? r : 100 + (r - x.options.length);
+ D.send('ReplyOptionsDialog', { index, token: x.token });
+ return;
+ } else if (D.dlg_bw) {
D.ipc.server.emit(D.dlg_bw.socket, 'show', x);
const bw = D.el.BrowserWindow.fromId(D.dlg_bw.id);
bw.show();
| 4 |
diff --git a/ModUserQuicklinksEverywhere.user.js b/ModUserQuicklinksEverywhere.user.js // @match https://*.stackexchange.com/*
// @exclude https://stackoverflow.com/c/*
// @author @samliew
-// @version 1.2.1
+// @version 1.2.2
// ==/UserScript==
(function() {
if(location.pathname.indexOf('/users/message/') === 0 || location.pathname.indexOf('/admin/cm-message/') === 0) {
return $('.msg-moderator:first a[href^="/users/"]').last().attr('href').match(/\d+/)[0];
}
- if(/\/(users?|-user-|)\//.test(location.href)) {
+ if(/\/(users?|-user-)\//.test(location.href)) {
return location.href.match(/\d+/);
}
return null;
| 2 |
diff --git a/src/components/LMap.vue b/src/components/LMap.vue @@ -145,8 +145,8 @@ export default {
data() {
return {
ready: false,
- lastSetCenter: null,
- lastSetBounds: null,
+ lastSetCenter: this.center ? latLng(this.center) : null,
+ lastSetBounds: this.bounds ? latLngBounds(this.bounds) : null,
lastSetZoom: null,
layerControl: undefined,
layersToAdd: [],
| 12 |
diff --git a/tests/js/setup-globals.js b/tests/js/setup-globals.js @@ -25,32 +25,6 @@ global._googlesitekitLegacyData = {
connectURL:
'http://example.com/wp-admin/index.php?action=googlesitekit_connect&nonce=abc123',
},
- modules: {
- 'search-console': {
- slug: 'search-console',
- name: 'Search Console',
- },
- 'pagespeed-insights': {
- slug: 'pagespeed-insights',
- name: 'PageSpeed Insights',
- },
- analytics: {
- slug: 'analytics',
- name: 'Analytics',
- },
- adsense: {
- slug: 'adsense',
- name: 'AdSense',
- },
- optimize: {
- slug: 'optimize',
- name: 'Optimize',
- },
- tagmanager: {
- slug: 'tagmanager',
- name: 'Tag Manager',
- },
- },
setup: {},
};
| 2 |
diff --git a/LICENSE b/LICENSE The MIT License (MIT)
-Copyright (c) 2015-2018 Oli Folkerd
+Copyright (c) 2015-2019 Oli Folkerd
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
| 3 |
diff --git a/src/pages/signin/SignInPageLayout/SignInPageContent.js b/src/pages/signin/SignInPageLayout/SignInPageContent.js import React from 'react';
-import {View} from 'react-native';
+import {KeyboardAvoidingView, ScrollView, View} from 'react-native';
import PropTypes from 'prop-types';
import {withSafeAreaInsets} from 'react-native-safe-area-context';
import styles from '../../../styles/styles';
@@ -11,6 +11,7 @@ import withLocalize, {withLocalizePropTypes} from '../../../components/withLocal
import SignInPageForm from '../../../components/SignInPageForm';
import compose from '../../../libs/compose';
import withWindowDimensions, {windowDimensionsPropTypes} from '../../../components/withWindowDimensions';
+import scrollViewContentContainerStyles from './signInPageStyles';
const propTypes = {
/** The children to show inside the layout */
@@ -37,6 +38,13 @@ const SignInPageContent = props => (
!props.isMediumScreenWidth && !props.isSmallScreenWidth && styles.signInPageWideLeftContainer,
]}
>
+ <ScrollView
+ style={[styles.h100]}
+ contentContainerStyle={[scrollViewContentContainerStyles]}
+ keyboardShouldPersistTaps="handled"
+ howsVerticalScrollIndicator={false}
+ >
+
{/* This empty view creates margin on the top of the sign in form which will shrink and grow depending on if the keyboard is open or not */}
<View style={[styles.flexGrow1, styles.signInPageContentTopSpacer]} />
@@ -72,6 +80,8 @@ const SignInPageContent = props => (
<View style={[styles.mb5, styles.alignSelfCenter, styles.ph5]}>
<TermsAndLicenses />
</View>
+
+ </ScrollView>
</View>
);
| 11 |
diff --git a/src/server/service/bolt.js b/src/server/service/bolt.js @@ -117,11 +117,10 @@ class BoltService {
}
async searchResults(command, inputSlack) {
- console.log(inputSlack);
- const growiCommand = inputSlack[0];
const keyword = inputSlack[1];
-
- if (growiCommand == null) {
+ // remove leading 'search'.
+ const replacedCommandText = command.text.replace(inputSlack[0], '');
+ if (keyword == null) {
return this.client.chat.postEphemeral({
channel: command.channel_id,
user: command.user_id,
@@ -133,7 +132,7 @@ class BoltService {
const { searchService } = this.crowi;
const option = { limit: 10 };
- const results = await searchService.searchKeyword(keyword, null, {}, option);
+ const results = await searchService.searchKeyword(replacedCommandText, null, {}, option);
// no search results
if (results.data.length === 0) {
| 14 |
diff --git a/src/components/Nav.js b/src/components/Nav.js @@ -34,6 +34,11 @@ const Item = Box.extend.attrs({ mx: [2, 3] })`
text-decoration: none;
font-weight: bold;
text-align: center;
+ max-width: 10em;
+
+ ${mx[1]} {
+ max-width: none;
+ }
`
const Nav = ({ mode = 'default', color = colors.white, ...props }) => (
| 7 |
diff --git a/test/functional/specs/Privacy/C14414.js b/test/functional/specs/Privacy/C14414.js import createFixture from "../../helpers/createFixture";
-import SequentialHook from "../../helpers/requestHooks/sequentialHook";
import {
compose,
orgMainConfigMain,
consentPending,
debugEnabled
} from "../../helpers/constants/configParts";
-import createConsoleLogger from "../../helpers/consoleLogger";
import { CONSENT_IN, CONSENT_OUT } from "../../helpers/constants/consent";
import createAlloyProxy from "../../helpers/createAlloyProxy";
+import createNetworkLogger from "../../helpers/networkLogger";
const config = compose(
orgMainConfigMain,
@@ -16,11 +15,11 @@ const config = compose(
debugEnabled
);
-const setConsentHook = new SequentialHook(/v1\/privacy\/set-consent\?/);
+const networkLogger = createNetworkLogger();
createFixture({
title: "C14414: Requests are queued while consent changes are pending",
- requestHooks: [setConsentHook]
+ requestHooks: [networkLogger.edgeEndpointLogs]
});
test.meta({
@@ -29,19 +28,17 @@ test.meta({
TEST_RUN: "Regression"
});
-test("Test C14414: Requests are queued while consent changes are pending", async t => {
+test.only("Test C14414: Requests are queued while consent changes are pending", async t => {
const alloy = createAlloyProxy();
await alloy.configure(config);
const setConsentResponse1 = await alloy.setConsentAsync(CONSENT_IN);
const setConsentResponse2 = await alloy.setConsentAsync(CONSENT_OUT);
- const logger = await createConsoleLogger();
await alloy.sendEvent();
- await logger.warn.expectMessageMatching(/user declined consent/);
- await t
- .expect(setConsentHook.haveRequestsBeenSequential())
- .ok("Set-consent requests were not sequential");
// make sure there are no errors returned from the setConsent requests
await setConsentResponse1.result;
await setConsentResponse2.result;
+
+ // make sure the event was not sent
+ await t.expect(networkLogger.edgeEndpointLogs.requests.length).eql(0);
});
| 2 |
diff --git a/app/components/Account/AccountAssetUpdate.jsx b/app/components/Account/AccountAssetUpdate.jsx @@ -23,19 +23,19 @@ import AssetWhitelist from "./AssetWhitelist";
import AssetFeedProducers from "./AssetFeedProducers";
import ZfApi from "react-foundation-apps/src/utils/foundation-api";
import {withRouter} from "react-router-dom";
-import notify from "actions/NotificationActions";
-import {Modal, Button} from "bitshares-ui-style-guide";
+import {Modal, Button, Notification} from "bitshares-ui-style-guide";
let GRAPHENE_MAX_SHARE_SUPPLY = new big(
assetConstants.GRAPHENE_MAX_SHARE_SUPPLY
);
-const disabledBackingAssetChangeCallback = () =>
- notify.error(
- counterpart.translate(
+const disabledBackingAssetChangeCallback = () => {
+ Notification.error({
+ message: counterpart.translate(
"account.user_issued_assets.invalid_backing_asset_change"
)
- );
+ });
+};
class AccountAssetUpdate extends React.Component {
static propTypes = {
@@ -734,11 +734,11 @@ class AccountAssetUpdate extends React.Component {
)[key];
if (this._getCurrentSupply() > 0 && disabled) {
- notify.error(
- counterpart.translate(
+ Notification.error({
+ message: counterpart.translate(
"account.user_issued_assets.invalid_permissions_change"
)
- );
+ });
return;
}
| 14 |
diff --git a/token-metadata/0x6a4FFAafa8DD400676Df8076AD6c724867b0e2e8/metadata.json b/token-metadata/0x6a4FFAafa8DD400676Df8076AD6c724867b0e2e8/metadata.json "symbol": "BDAI",
"address": "0x6a4FFAafa8DD400676Df8076AD6c724867b0e2e8",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/consts/const_global.js b/src/consts/const_global.js @@ -8,7 +8,7 @@ const BigInteger = require('big-integer');
let consts = {
- DEBUG: true,
+ DEBUG: false,
OPEN_SERVER: true,
};
@@ -532,7 +532,7 @@ if ( consts.DEBUG === true ) {
FallBackNodesList.nodes = [{
"addr": ["http://testnet2.hoste.ro:8001"],
- //"addr": ["http://86.126.138.61:2024"],
+ "addr": ["http://86.126.138.61:2024"],
}];
| 13 |
diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -25,7 +25,7 @@ jobs:
command: npm run cicoverage
- run:
name: browser
- command: if [ "${CIRCLE_BRANCH}" != "master" ]; then npm run browser; fi;
+ command: if [ "${CIRCLE_BRANCH}" != "master" ]; then npm run browser || true; fi;
- run:
name: pre-danger
command: git config user.email "[email protected]" && git config user.name "Decrapifier" && git config push.default upstream && git branch -u origin/$CIRCLE_BRANCH
| 8 |
diff --git a/lib/util.js b/lib/util.js @@ -503,6 +503,9 @@ function sanitizeShellString(str) {
result = result.replace(/\$/g, "");
result = result.replace(/#/g, "");
result = result.replace(/\\/g, "");
+ result = result.replace(/\t/g, "");
+ result = result.replace(/\n/g, "");
+ result = result.replace(/\"/g, "");
return result
}
| 7 |
diff --git a/src/wtsdk/src/flightplanning/FlightPlanManager.ts b/src/wtsdk/src/flightplanning/FlightPlanManager.ts @@ -1048,10 +1048,15 @@ export class FlightPlanManager {
}
/**
- * Gets the approach from the current flight plan.
+ * Gets the approach procedure from the current flight plan destination airport procedure information.
*/
- public getApproach() {
- return this._flightPlans[this._currentFlightPlanIndex].approach;
+ public getApproach(): any {
+ const currentFlightPlan = this._flightPlans[this._currentFlightPlanIndex];
+ if (currentFlightPlan.hasDestination && currentFlightPlan.procedureDetails.approachIndex !== -1) {
+ return (currentFlightPlan.destinationAirfield.infos as AirportInfo).approaches[currentFlightPlan.procedureDetails.approachIndex];
+ }
+
+ return undefined;
}
/**
| 1 |
diff --git a/userscript.user.js b/userscript.user.js @@ -3261,7 +3261,9 @@ var $$IMU_EXPORT$$;
// https://t1.daumcdn.net/news/201903/06/newsen/20190306201751195iqvu.jpg -- 641x1000
// other:
// http://photo.newsen.com/photo/2006/05/15/200605151650091006_1.jpg
- src = src.replace(/_ts\.[^/._]*$/, ".jpg").replace("/mphoto/", "/news_photo/");
+ newsrc = src.replace(/_ts\.[^/._]*$/, ".jpg").replace("/mphoto/", "/news_photo/");
+ if (newsrc !== src)
+ return newsrc;
if (src.indexOf("/main_photo/") >= 0) {
// http://cdn.newsen.com/newsen/main_photo/index_a2_201801030825321910_1.jpg
@@ -3269,12 +3271,16 @@ var $$IMU_EXPORT$$;
// http://cdn.newsen.com/newsen/main_photo/mobile/favphoto_201807131531391510_1.jpg
// http://cdn.newsen.com/newsen/news_photo/2018/07/13/201807131531391510_1.jpg
// http://photo.newsen.com/news_photo/2018/07/13/201807131531391510_1.jpg
- src = src.replace(/\/main_photo\/+(?:mobile\/+)?[^/]*_([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([^/]*)$/, "/news_photo/$1/$2/$3/$1$2$3$4");
+ newsrc = src.replace(/\/main_photo\/+(?:mobile\/+)?[^/]*_([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([^/]*)$/, "/news_photo/$1/$2/$3/$1$2$3$4");
+ if (newsrc !== src)
+ return newsrc;
}
// http://cdn.newsen.com/newsen/resize/235x-/2019/05/18/201905182149162610_1.jpg
// http://cdn.newsen.com/newsen/news_photo/2019/05/18/201905182149162610_1.jpg
- src = src.replace(/\/resize\/+[-0-9]+x[-0-9]+\/+/, "/news_photo/");
+ newsrc = src.replace(/\/resize\/+[-0-9]+x[-0-9]+\/+/, "/news_photo/");
+ if (newsrc !== src)
+ return newsrc;
var extra = {};
match = src.match(/cdn\.newsen\.com\/+newsen\/+news_photo\/+[0-9]{4}\/+(?:[0-9]{2}\/+){2}([0-9]{10,})_[0-9]+\.[^/.]*(?:[?#].*)?$/);
@@ -3290,6 +3296,9 @@ var $$IMU_EXPORT$$;
headers: {
Referer: "http://www.newsen.com/"
},
+ referer_ok: {
+ same_domain_nosub: true
+ },
extra: extra
};
@@ -16772,6 +16781,7 @@ var $$IMU_EXPORT$$;
// https://farm8.staticflickr.com/7002/6432649813_4fe18483a6.jpg
// https://farm8.staticflickr.com/7002/6432649813_21c9e80f43_o.jpg
// https://live.staticflickr.com/65535/48913730532_83284fa99d_3k.jpg
+ // https://live.staticflickr.com/65535/48913730532_c31a823c53_o.jpg
function get_flickr_cookies(cb) {
if (cookie_cache.has("flickr")) {
@@ -36229,6 +36239,9 @@ var $$IMU_EXPORT$$;
// other:
// https://www.upinews.kr/news/data/20190701/p1065589773349704_340_h3.png -- 6158x1944
domain_nowww === "upinews.kr" ||
+ // http://www.thedrive.co.kr/news/data/20191016/p1065587293279646_750_thum.jpg
+ // http://www.thedrive.co.kr/news/data/20191016/p1065587293279646_750.jpg
+ domain_nowww === "thedrive.co.kr" ||
// http://www.newswiz.kr/news/data/20190606/p1065589870763517_698_h.jpg -- 314x393
// http://www.newswiz.kr/news/data/20190606/p1065589870763517_698_thum.jpg -- 699x874
// http://www.newswiz.kr/news/data/20190606/p1065589870763517_698.jpg -- 745x931
| 7 |
diff --git a/lib/model/Model.js b/lib/model/Model.js @@ -620,14 +620,6 @@ class Model {
return this.knex().table(this.tableName);
}
- static uniqueTag() {
- if (this.name) {
- return `${this.tableName}_${this.name}`;
- } else {
- return this.tableName;
- }
- }
-
static bindKnex(knex) {
const ModelClass = this;
// These are defined here to prevent a ridiculous optimization bailout
@@ -636,13 +628,13 @@ class Model {
if (!knex.$$objection) {
defineNonEnumerableProperty(knex, '$$objection', {
- boundModels: Object.create(null)
+ boundModels: new Map()
});
}
// Check if this model class has already been bound to the given knex.
- if (knex.$$objection.boundModels[ModelClass.uniqueTag()]) {
- return knex.$$objection.boundModels[ModelClass.uniqueTag()];
+ if (knex.$$objection.boundModels.has(ModelClass)) {
+ return knex.$$objection.boundModels.get(ModelClass);
}
// Create a new subclass of this class.
@@ -657,7 +649,7 @@ class Model {
}
BoundModelClass.knex(knex);
- knex.$$objection.boundModels[ModelClass.uniqueTag()] = BoundModelClass;
+ knex.$$objection.boundModels.set(ModelClass, BoundModelClass);
relations = ModelClass.getRelationArray();
boundRelations = Object.create(null);
| 14 |
diff --git a/README.md b/README.md @@ -1072,6 +1072,14 @@ Set of shader functions used for interacting with the packed BVH in a shader and
- A separate bounds tree is generated for each [geometry group](https://threejs.org/docs/#api/en/objects/Group), which could result in less than optimal raycast performance on geometry with lots of groups.
- Due to errors related to floating point precision it is recommended that geometry be centered using `BufferGeometry.center()` before creating the BVH if the geometry is sufficiently large or off center so bounds tightly contain the geometry as much as possible.
+# Running Examples Locally
+
+To run the examples locally:
+- Run `npm start`
+- Then visit `localhost:9080/example/dev-bundle/<demo-name>.html`
+
+Where `<demo-name>` is the name of the HTML file from `example` folder.
+
# Used and Supported by
| 0 |
diff --git a/demos/generator/typed.html b/demos/generator/typed.html </style>
</head>
<body>
- <p>
+<!--
<form onsubmit="Typed.onClickConvert(event)">
<input class="ocamlCode" type="text" value="let x = true && false || false in x"></input>
<input type="submit" value="Convert to block"></input>
</form>
- </p>
+-->
<div id="blocklyDiv" style="height: 700px; width: 700px;"></div>
| 2 |
diff --git a/src/components/Personalization/index.js b/src/components/Personalization/index.js @@ -16,7 +16,7 @@ import { hideContainers, showContainers, hideElements } from "./flicker";
const PAGE_HANDLE = "personalization:page";
const SESSION_ID_COOKIE = "SID";
-const SESSION_ID_TTL = 31 * 60 * 1000;
+const SESSION_ID_TTL_IN_DAYS = 31 * 60 * 1000;
const EVENT_COMMAND = "event";
const isElementExists = event => event.moduleType === "elementExists";
@@ -24,7 +24,7 @@ const isElementExists = event => event.moduleType === "elementExists";
const getOrCreateSessionId = cookie => {
let cookieValue = cookie.get(SESSION_ID_COOKIE);
const now = Date.now();
- const expires = now + SESSION_ID_TTL;
+ const expires = now + SESSION_ID_TTL_IN_DAYS;
if (!cookieValue || now > cookieValue.expires) {
cookieValue = { value: uuid(), expires };
| 10 |
diff --git a/src/og/scene/Planet.js b/src/og/scene/Planet.js @@ -1561,8 +1561,6 @@ class Planet extends RenderNode {
dist = this.getDistanceFromPixelEllipsoid(px) || 0;
}
- print2d("l0", `${d.toFixed(2)}, ${dist.toFixed(2)}`, 100, 100);
-
this._currentDistanceFromPixel = dist;
return this._currentDistanceFromPixel;
| 2 |
diff --git a/README.rst b/README.rst @@ -16,7 +16,7 @@ It is currently released as:
- `userscript.user.js <https://github.com/qsniyg/maxurl/blob/master/userscript.user.js>`__ is also the base for everything listed below
- It also serves as a node module (used by the reddit bot), and can be embedded in a website
-- Browser extension: `Firefox Quantum <https://addons.mozilla.org/firefox/addon/image-max-url/>`__ | `Opera <https://addons.opera.com/en/extensions/details/image-max-url/>`__ (other browsers supporting WebExtensions can sideload the extension through this git repository)
+- Browser extension: `Firefox Quantum <https://addons.mozilla.org/firefox/addon/image-max-url/>`__ | `Opera Beta/Developer <https://addons.opera.com/en/extensions/details/image-max-url/>`__ (other browsers supporting WebExtensions can sideload the extension through this git repository)
- Since addons have more privileges than userscripts, it has a bit of extra functionality over the userscript
- Source code is in `manifest.json <https://github.com/qsniyg/maxurl/blob/master/manifest.json>`__ and the `extension <https://github.com/qsniyg/maxurl/tree/master/extension>`__ folder
@@ -43,14 +43,26 @@ Sideloading the extension
*************************
The extension is currently unavailable to other browsers' addon stores (such as Chrome and Microsoft Edge),
-but you can sideload this repository if you wish to use the extension instead of the userscript.
+but you can sideload this repository if you wish to use the extension version instead of the userscript.
-- Download the repository however you wish (I'd recommend cloning it through git as it allows easier updating)
+- Repository:
+ - Download the repository however you wish (I'd recommend cloning it through git as it allows easier updating)
+ - Chromium:
- Go to chrome://extensions, make sure "Developer mode" is enabled, click "Load unpacked [extension]", and navigate to the maxurl repository
+ - Firefox:
+ - Go to about:debugging->This Firefox, select "Load temporary Add-on...", and navigate to "manifest.json" within the maxurl repository
+ - Note that the addon will be deleted once Firefox is closed. There's unfortunately nothing I can do about this.
+
+- CRX (Chromium-based browsers):
+
+ - Download the CRX build from https://github.com/qsniyg/maxurl/blob/master/build/ImageMaxURL_crx3.crx
+ - Go to chrome://extensions, make sure "Developer mode" is enabled, then drag&drop the downloaded CRX file onto the page.
+
+- XPI (Firefox-based browsers):
-You'll probably want to keep "Check for updates" enabled (it's enabled by default) as sideloaded extensions aren't automatically updated.
-Any new updates will be displayed at the top of the options page.
+ - Download the XPI build from https://github.com/qsniyg/maxurl/blob/master/build/ImageMaxURL_signed.xpi
+ - Go to about:addons, click on the gear icon, then select "Install Add-on from From File...", and navigate to the downloaded XPI file.
************
Contributing
| 7 |
diff --git a/packages/node_modules/@node-red/editor-api/lib/auth/index.js b/packages/node_modules/@node-red/editor-api/lib/auth/index.js @@ -41,7 +41,7 @@ function init(_settings,storage) {
if (settings.adminAuth) {
var mergedAdminAuth = Object.assign({}, settings.adminAuth, settings.adminAuth.module);
Users.init(mergedAdminAuth);
- Tokens.init(mergedAdminAuth,runtime.storage);
+ Tokens.init(mergedAdminAuth,storage);
}
}
| 1 |
diff --git a/modules/xerte/parent_templates/Nottingham/models_html5/opinion.html b/modules/xerte/parent_templates/Nottingham/models_html5/opinion.html }
var width = $("#mainPanel").width(),
- height = $("#mainPanel").height() - $("#qNo").height() - $("#feedback").height() - $("#buttonHolder").height(),
+ height = $("#pageContents").innerHeight() - $("#qNo").outerHeight(true) - $("#feedback").outerHeight(true) - $("#buttonHolder").outerHeight(true),
textSize;
-
+ let paddingHeightMainPanel = $("#mainPanel").outerHeight(true) - $("#mainPanel").innerHeight() + parseFloat($("#mainPanel").css('padding-top')) + parseFloat($("#mainPanel").css('padding-bottom'));
+ let paddingWidthMainPanel = $("#mainPanel").outerWidth(true) - $("#mainPanel").innerWidth() + parseFloat($("#mainPanel").css('padding-left')) + parseFloat($("#mainPanel").css('padding-right'));
+ width -= paddingWidthMainPanel;
+ height -= paddingHeightMainPanel;
+ height *= 0.98; // Build in some extra space
if(width > height) {
- $("#canvas-container")
- .width(height*0.90)
- .height(height*0.90);
- textSize = (height - width) / 10;
+ textSize = (width - height) / 10;
}
else {
- $("#canvas-container")
- .width(width)
- .height(width);
textSize = (height - width) / 10;
+ height = width;
}
if (textSize > 20) {
textSize = 20;
else if (textSize < 12) {
textSize = 12;
}
-
$pageContents.data('textSize', textSize);
+ debugger;
+ $("#canvas-container")
+ .css('width', width)
+ .css('height', height);
+
};
this.loadAudio = function(currentQuestion, soundFile)
let startHeight;
let startWidth;
+ let panelStartWidth;
let startPadding;
let canvasStartHeight;
let canvasStartWidth;
$("#mainPanel").prepend(
`<div id="print-title" style="font-size: 30px"><h1>${x_currentPageXML.getAttribute("name")}</h1></div>`
);
+ $("#mainPanel .panel").addClass("panel-print");
+ $("#mainPanel .panel").removeClass("panel");
startHeight = $("#mainPanel")[0].style.height;
- startWidth = $("#mainPanel")[0].style.width;
+ startWidth = $("#pageContents")[0].style.width;
+ panelStartWidth = $("#mainPanel")[0].style.width;
startPadding = $("#mainPanel")[0].style.padding;
canvasStartHeight = $("#canvas-container")[0].style.height;
canvasStartWidth = $("#canvas-container")[0].style.width;
$("#mainPanel #buttonHolder").hide();
- $("#mainPanel").css("width", "794px");
- $("#mainPanel").css("height", "500px");
- $("#mainPanel").css("padding", "79.4px");
+ $("#pageContents").css("width", "794px");
+ //$("#mainPanel").css("width", "764px");
+ $("#mainPanel").css("max-height", "794px");
+ $("#canvas-container canvas").css("min-width", "540px");
+ $("#canvas-container canvas").css("min-height", "270px");
+ $("#canvas-container canvas").css("max-width", "764px");
+ $("#canvas-container canvas").css("max-height", "764px");
+ //$("#mainPanel").css("padding", "79.4px");
+ /*
$("#canvas-container").css("width", "794px");
- $("#canvas-container").css("height", "450px");
+ $("#canvas-container").css("height", "750px");
+ */
+ opinion.sizeChanged();
$("p").css("font-size", "16px");
$("h3").css("font-size", "18px");
-
- await new Promise(resolve => setTimeout(resolve, 1000));
+ setTimeout(function(){
let opt = {
filename: `xerte-opinion${x_currentPageXML.getAttribute("name")}.pdf`,
html2canvas: { scale: 2 },
jsPDF: {unit: 'in', format: 'a4', orientation: 'portrait'}
};
html2pdf().set(opt).from($("#mainPanel")[0]).toPdf().get('pdf').then(function (pdf) {
- $("#mainPanel").css("width", "");
- $("#mainPanel").css("height", "");
- $("#mainPanel").css("padding", "");
+ $("#mainPanel .panel-print").addClass("panel");
+ $("#mainPanel .panel").removeClass("panel-print");
+ $("#pageContents").css("width", startWidth);
+ //$("#mainPanel").css("width", panelStartWidth);
+ $("#mainPanel").css("height", startHeight);
+ $("#mainPanel").css("padding", startPadding);
+ $("#canvas-container canvas").css("min-width", "");
+ $("#canvas-container canvas").css("min-height", "");
+ $("#canvas-container canvas").css("max-width", "");
+ $("#canvas-container canvas").css("max-height", "");
+ $("#mainPanel").css("max-height", "");
+
+ /*
$("#canvas-container").css("width", canvasStartWidth);
$("#canvas-container").css("height", canvasStartHeight);
+ */
$("#print-title").remove();
$("#print-overlay").remove();
$("#buttonHolder").show();
$("p").css("font-size", "");
$("h3").css("font-size", "");
+ opinion.sizeChanged();
}).save();
+ }, 4000)
});
$("#printBtn").hide();
this.startQuestions();
| 7 |
diff --git a/lib/email.js b/lib/email.js @@ -163,8 +163,8 @@ Email.prototype.promise_leave_request_revoke_emails = function(args){
leave = args.leave,
send_mail = self.get_send_email();
- const template_name_to_supervisor = 'leave_request_revoke_to_supervisor';
- const template_name_to_requestor = 'leave_request_revoke_to_requestor';
+ let template_name_to_supervisor = 'leave_request_revoke_to_supervisor';
+ let template_name_to_requestor = 'leave_request_revoke_to_requestor';
if ( leave.get('user').is_auto_approve() ) {
template_name_to_supervisor = 'leave_request_revoke_to_supervisor_autoapprove';
| 1 |
diff --git a/frontend/imports/startup/client/network.js b/frontend/imports/startup/client/network.js @@ -87,7 +87,7 @@ function checkIfOrderMatchingEnabled(marketType) {
Dapple['maker-otc'].objects.otc.LogMatchingEnabled({}, { fromBlock: 'latest' }, (err, status) => {
if (!err) {
- Session.set('isMatchingEnabled', status.args['']);
+ Session.set('isMatchingEnabled', status.args.isEnabled);
}
});
}
@@ -115,7 +115,7 @@ function checkIfBuyEnabled(marketType) {
Dapple['maker-otc'].objects.otc.LogBuyEnabled({}, { fromBlock: 'latest' }, (err, status) => {
if (!err) {
- Session.set('isBuyEnabled', status.args['']);
+ Session.set('isBuyEnabled', status.args.isEnabled);
}
});
}
| 9 |
diff --git a/civictechprojects/static/css/partials/_MainHeader.scss b/civictechprojects/static/css/partials/_MainHeader.scss color: $color-orange;
}
.navbar {
- font-size: 18px;
padding: 0.25rem; //override entire navbar padding values, set our own later
}
.navbar-brand {
.dropdown-toggle.nav-link::after {
content: '\25BC';
padding-left: 5px;
- font-weight: bold;
- font-size: 16px;
+ font-size:12px;
+ vertical-align: text-top;
}
}
| 13 |
diff --git a/js/webcomponents/bisweb_filetreepanel.js b/js/webcomponents/bisweb_filetreepanel.js @@ -571,7 +571,8 @@ class FileTreePanel extends HTMLElement {
enabledButtons.Viewer1 = false;
enabledButtons.Viewer2 = false;
}
- } if (tree.get_node(data.node.parent).original.text !== 'func') {
+ } if (data.node.parent === '#' || tree.get_node(data.node.parent).original.text !== 'func') {
+ //'#' is the parent of the top level node in the tree
enabledButtons.RenameTask = false;
}
@@ -1367,6 +1368,9 @@ class FileTreePanel extends HTMLElement {
Import and export study deal with a special kind of metadata file marked with '.study'. 'Export study' will create one of these files from a file tree that has already been loaded and 'Import study' will load one of these study files into the panel. Any information added to the study will be conserved in the .study file.
<br><br>
'Import task file' and 'Clear tasks' and 'Plot task charts' deal with loading timing charts for studies, see <a href="https://bioimagesuiteweb.github.io/bisweb-manual">the manual</a> for more details.
+ <br><br>
+ <b>Important Note</b>Certain operations with the file tree panel will modify files on disk, e.g. the 'Rename task' option in the right-click menu will change the name of the image file's supporting files and will change the name in dicom_job_info.json.
+ To ensure these files save properly, make sure the relevant files are not open on your machine, i.e. are not open in a file editor or other such software.
`);
}
| 1 |
diff --git a/web/console.html b/web/console.html border-right: 1px solid #1E252D;
border-left: 1px solid #1E252D;
}
+
.console-content::-webkit-scrollbar-thumb {
background-color: #565C62;
}
+
.console-content::-webkit-scrollbar-corner {
background: #1E252D;
}
</div>
<button type="button" id="clearConsole" class="btn btn-outline-light btn-sm mb-2">Clear Console</button>
<button type="button" id="toggleAutoScroll" class="btn btn-outline-light btn-sm mb-2">Disable
- Scroll</button>
- <a href="/fxserver/downloadLog" target="_blank" class="btn btn-outline-light btn-sm mb-2">Download Log</a>
+ Scroll
+ </button>
+ <a href="/fxserver/downloadLog" target="_blank" class="btn btn-outline-light btn-sm mb-2">Download
+ Log</a>
</div>
</form>
</div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.2.0/socket.io.js"></script>
<script>
//Socket
- $(function () {
+ (function () {
let prefix = '';
var socket = io({path: prefix + '/socket.io', transports: ['polling'], upgrade: false});
var ansi_up = new AnsiUp;
ansi_up.escape_for_html = false;
+ var input = document.getElementById("cmdInput");
+ var consoleElement = document.getElementById("console");
+ var consoleForm = document.getElementById("frmConsole");
+
//Events
// socket.on('changeBodyColor', (msg) => {
// document.body.style.backgroundColor = msg;
window.location = '/auth?logout';
});
socket.on('consoleData', function (msg) {
- $('#console').append(ansi_up.ansi_to_html(msg));
- if (autoScroll) $("#console").scrollTop($("#console")[0].scrollHeight);
+ consoleElement.innerHTML += ansi_up.ansi_to_html(msg);
+ if (autoScroll) consoleElement.scrollTop = consoleElement.scrollHeight
});
//Form
- $("#frmConsole").submit(function (e) {
+ consoleForm.addEventListener("submit", function (e) {
e.preventDefault();
- let cmd = $('#cmdInput').val();
+ let cmd = input.value;
+ commandCache.unshift(cmd);
socket.emit('consoleCommand', cmd);
- $('#cmdInput').val('');
+ input.value = "";
+ });
+
+ //Up / Down history
+ var commandCache = [];
+ var currentIndex;
+ input.addEventListener("keydown", function (event) {
+ var changed = false;
+
+ if (event.key === "ArrowUp") {
+ // up
+ changed = true;
+ if (typeof currentIndex === 'undefined' && commandCache.length > 0) {
+ currentIndex = 0;
+ } else if ((currentIndex + 1) < commandCache.length) {
+ currentIndex += 1;
+ }
+ } else if (event.key === "ArrowDown") {
+ // down
+ changed = true;
+ if (currentIndex > 0) {
+ currentIndex -= 1;
+
+ } else if (currentIndex === 0) {
+ currentIndex = undefined;
+ }
+ }
+
+ if (changed) input.value = commandCache[currentIndex] || "";
});
//Status
// let status = (socket.connected) ? 'online' : 'offline';
// $("#favicon").attr("href", "img/favicon_" + status + ".png");
// }, 1000);
- });
//Buttons
- let autoScroll = true;
- $('#toggleAutoScroll').click(function () {
+ var autoScroll = true;
+ var autoScrollToggle = document.getElementById("toggleAutoScroll");
+
+ autoScrollToggle.addEventListener("click", function () {
autoScroll = !autoScroll;
if (autoScroll) {
- $('#toggleAutoScroll').text('Disable Scroll');
+ autoScrollToggle.innerText = 'Disable Scroll';
} else {
- $('#toggleAutoScroll').text('Enable Scroll');
+ autoScrollToggle.innerText = 'Enable Scroll';
}
});
- $('#clearConsole').click(function () {
- $('#console').html('');
+ document.getElementById("clearConsole")
+ .addEventListener("click", function () {
+ consoleElement.innerHTML = "";
});
+ })();
+
</script>
\ No newline at end of file
| 0 |
diff --git a/dangerfile.js b/dangerfile.js @@ -80,6 +80,10 @@ schedule(
created: 'fail',
// Warn on modified untyped files
modified: 'warn',
- blacklist: ['flow-typed/**/*.js', 'public/**/*.js'],
+ blacklist: [
+ 'flow-typed/**/*.js',
+ 'public/**/*.js',
+ 'iris/migrations/**/*.js',
+ ],
})
);
| 8 |
diff --git a/views/login.blade.php b/views/login.blade.php <div class="custom-control custom-checkbox">
<input type="checkbox"
class="form-check-input custom-control-input"
- id="stay_logged_in">
+ id="stay_logged_in"
+ name="stay_logged_in">
<label class="form-check-label custom-control-label"
for="stay_logged_in">
{{ $__t('Stay logged in permanently') }}
| 0 |
diff --git a/src/core/lib/FileSignatures.mjs b/src/core/lib/FileSignatures.mjs @@ -609,7 +609,7 @@ export const FILE_SIGNATURES = {
47: 0x6d,
48: 0x6c
},
- extractor: null
+ extractor: extractZIP
},
{
name: "EPUB e-book",
| 0 |
diff --git a/assets/js/modules/analytics/datastore/profiles.test.js b/assets/js/modules/analytics/datastore/profiles.test.js @@ -155,6 +155,7 @@ describe( 'modules/analytics profiles', () => {
describe( 'selectors', () => {
describe( 'getProfiles', () => {
it( 'uses a resolver to make a network request', async () => {
+ registry.dispatch( STORE_NAME ).setSettings( {} );
fetch
.doMockOnceIf(
/^\/google-site-kit\/v1\/modules\/analytics\/data\/profiles/
| 12 |
diff --git a/lib/console_web/controllers/v1/device_controller.ex b/lib/console_web/controllers/v1/device_controller.ex @@ -5,6 +5,9 @@ defmodule ConsoleWeb.V1.DeviceController do
alias Console.Labels
alias Console.Devices
alias Console.Devices.Device
+ alias Console.Repo
+ alias Console.AlertEvents
+ alias Console.Alerts
action_fallback(ConsoleWeb.FallbackController)
plug CORSPlug, origin: "*"
@@ -64,13 +67,27 @@ defmodule ConsoleWeb.V1.DeviceController do
def delete(conn, %{ "id" => id }) do
current_organization = conn.assigns.current_organization
- case Devices.get_device(current_organization, id) do
+ case Devices.get_device(current_organization, id) |> Repo.preload([:labels]) do
nil ->
{:error, :not_found, "Device not found"}
%Device{} = device ->
+ # grab info for notifications before device(s) deletion
+ deleted_device = %{ device_id: id, labels: Enum.map(device.labels, fn l -> l.id end), device_name: device.name }
+
with {:ok, _} <- Devices.delete_device(device) do
broadcast_router_update_devices(device)
+ { _, time } = Timex.format(Timex.now, "%H:%M:%S UTC", :strftime)
+ details = %{
+ device_name: deleted_device.device_name,
+ deleted_by: "v1 API",
+ time: time
+ }
+
+ AlertEvents.delete_unsent_alert_events_for_device(deleted_device.device_id)
+ AlertEvents.notify_alert_event(deleted_device.device_id, "device", "device_deleted", details, deleted_device.labels)
+ Alerts.delete_alert_nodes(deleted_device.device_id, "device")
+
conn
|> send_resp(:ok, "Device deleted")
end
| 9 |
diff --git a/lib/creator/yeoman/utils/entry.js b/lib/creator/yeoman/utils/entry.js @@ -41,7 +41,7 @@ module.exports = (self, answer) => {
return forEachPromise(entryIdentifiers, (entryProp) => self.prompt([
InputValidate(
`${entryProp}`,
- `What is the location of '${entryProp}'? [example: './${entryProp}']`,
+ `What is the location of '${entryProp}'? [example: './app']`,
validate
)
])).then(propAns => {
| 4 |
diff --git a/common/components/constants/LinkConstants.js b/common/components/constants/LinkConstants.js @@ -12,7 +12,7 @@ export type LinkSourceDisplayConfig = {|
+iconClass: string,
|};
-const httpsWwwPrefix = "^http:s?\/\/w*\.?";
+const httpsWwwPrefix = "^https?://w*.?";
export const LinkDisplayConfigurationByUrl: $ReadOnlyArray<LinkSourceDisplayConfig> = [
{
| 7 |
diff --git a/public/js/grocy.js b/public/js/grocy.js @@ -677,7 +677,23 @@ $(document).on("click", ".easy-link-copy-textbox", function()
$("textarea.wysiwyg-editor").summernote({
minHeight: "300px",
- lang: __t("summernote_locale")
+ lang: __t("summernote_locale"),
+ callbacks: {
+ onImageLinkInsert: function(url)
+ {
+ // Summernote workaround: Make images responsive
+ // By adding the "img-fluid" class to the img tag
+ $img = $('<img>').attr({ src: url, class: "img-fluid" })
+ $(this).summernote("insertNode", $img[0]);
+ }
+ }
+});
+
+// Summernote workaround: Make embeds responsive
+// By wrapping any embeded video in a container with class "embed-responsive"
+$(".note-video-clip").each(function()
+{
+ $(this).parent().html('<div class="embed-responsive embed-responsive-16by9">' + $(this).wrap("<p/>").parent().html() + "</div>");
});
function LoadImagesLazy()
| 0 |
diff --git a/ui/app/css/itcss/components/modal.scss b/ui/app/css/itcss/components/modal.scss @media screen and (max-width: 679px) {
font-size: 10px;
+ padding: 0px 10px;
+ margin-bottom: 5px;
+ line-height: 15px;
+ }
+
+ @media screen and (min-width: 680px) {
+ font-size: 14px;
+ padding: 0px 4px;
+ margin-bottom: 2px;
}
@media screen and (min-width: 1281px) {
font-size: 20px;
+ padding: 0px 0px;
}
-
}
div.modal-content-footer {
| 7 |
diff --git a/src/libs/HttpUtils.js b/src/libs/HttpUtils.js @@ -22,6 +22,8 @@ Onyx.connect({
// We use the AbortController API to terminate pending request in `cancelPendingRequests`
let cancellationController = new AbortController();
+const platform = getOperatingSystem();
+
/**
* Send an HTTP request, and attempt to resolve the json response.
* If there is a network error, we'll set the application offline.
@@ -100,7 +102,6 @@ function xhr(command, data, type = CONST.NETWORK.METHOD.POST, shouldUseSecure =
let apiRoot = shouldUseSecure ? CONFIG.EXPENSIFY.SECURE_EXPENSIFY_URL : CONFIG.EXPENSIFY.URL_API_ROOT;
// If we are in native mobile apps, we dont have access to up-to-date Config so we need to only rely on the toggle switch
- const platform = getOperatingSystem();
const nativeStagingSwitcher = (platform === CONST.OS.ANDROID || platform === CONST.OS.IOS) && shouldUseStagingServer;
const webStagingSwitcher = CONFIG.IS_IN_STAGING && shouldUseStagingServer;
if (nativeStagingSwitcher || webStagingSwitcher) {
| 5 |
diff --git a/bin/oref0-bash-common-functions.sh b/bin/oref0-bash-common-functions.sh @@ -200,7 +200,7 @@ script_is_sourced () {
# something other than yes or no, ask the question again.
prompt_yn () {
while true; do
- if [[ "$2" == "y" ]]; then
+ if [[ "$2" =~ ^[Yy]$ ]]; then
read -p "$1 [Y]/n " -r
else
read -p "$1 y/[N] " -r
| 11 |
diff --git a/src/pages/using-spark/components/icon.mdx b/src/pages/using-spark/components/icon.mdx @@ -28,7 +28,7 @@ give feedback.
### Guidelines
-- Icons should only be sized to 16px, 32px, 64px, or 128px.
+- Icons should only be sized to 16px, 24px, or 32px.
- Icons should not be used in place of artwork or illustrations.
<SprkDivider
| 3 |
diff --git a/layouts/partials/fragments/faq.html b/layouts/partials/fragments/faq.html {{- if not (in .Name "/index.md") -}}
{{- $item := .Params }}
{{- $card_header_id := printf "%s" (strings.TrimSuffix ".md" (replace .Name (printf "%s/" $.Name) "")) }}
- {{- $collapse_id := printf "%s-collapse" (strings.TrimSuffix ".md" (replace .Name (printf "%s/" $.Name) "")) }}
+ {{- $collapse_id := printf "%s%s" $.Name (printf "%s-collapse" (strings.TrimSuffix ".md" (replace .Name (printf "%s/" $.Name) ""))) }}
<div class="card">
<div id="{{ $card_header_id }}" class="card-header" data-toggle="collapse" data-target="#{{ $collapse_id }}"
aria-expanded="false" aria-controls="{{ $collapse_id }}">
| 1 |
diff --git a/js/default.js b/js/default.js @@ -3,11 +3,6 @@ window.ipc = electron.ipcRenderer
window.remote = electron.remote
window.Dexie = require('dexie')
-// disable dragdrop, since it currently doesn't work
-window.addEventListener('drop', function (e) {
- e.preventDefault()
-})
-
// add a class to the body for fullscreen status
ipc.on('enter-full-screen', function () {
| 2 |
diff --git a/src/cluster/index.js b/src/cluster/index.js @@ -10,13 +10,13 @@ const {
KafkaJSGroupCoordinatorNotFound,
} = require('../errors')
-const { keys, assign } = Object
+const { keys } = Object
const EARLIEST_OFFSET = -2
const LATEST_OFFSET = -1
-const mergeTopics = (obj, { topic, partitions }) =>
- assign(obj, {
+const mergeTopics = (obj, { topic, partitions }) => ({
+ ...obj,
[topic]: [...(obj[topic] || []), ...partitions],
})
@@ -44,7 +44,7 @@ module.exports = class Cluster {
}) {
this.rootLogger = rootLogger
this.logger = rootLogger.namespace('Cluster')
- this.retrier = createRetry(assign({}, retry))
+ this.retrier = createRetry({ ...retry })
this.connectionBuilder = connectionBuilder({
logger: rootLogger,
brokers,
@@ -187,7 +187,7 @@ module.exports = class Cluster {
const { leader } = metadata
const current = result[leader] || []
- return assign(result, { [leader]: [...current, partitionId] })
+ return { ...result, [leader]: [...current, partitionId] }
}, {})
}
@@ -299,7 +299,7 @@ module.exports = class Cluster {
const addDefaultOffset = topic => partition => {
const { fromBeginning } = topicConfigurations[topic]
- return Object.assign({}, partition, { timestamp: this.defaultOffset({ fromBeginning }) })
+ return { partition, timestamp: this.defaultOffset({ fromBeginning }) }
}
// Index all topics and partitions per leader (nodeId)
| 14 |
diff --git a/OurUmbraco.Site/Views/Partials/Community/Home.cshtml b/OurUmbraco.Site/Views/Partials/Community/Home.cshtml @@ -154,8 +154,11 @@ else
<a href="https://github.com/umbraco/UmbracoDocs" target="_blank" rel="noreferrer noopener" title="UmbracoDocs">UmbracoDocs</a>,
<a href="https://github.com/umbraco/OurUmbraco" target="_blank" rel="noreferrer noopener" title="OurUmbraco">OurUmbraco</a>,
<a href="https://github.com/umbraco/Umbraco.Deploy.Contrib" target="_blank"`rel="noreferrer noopener" title="Umbraco.Deploy.Contrib">Umbraco.Deploy.Contrib</a>,
- <a href="https://github.com/umbraco/Umbraco.Courier.Contrib" target="_blank" rel="noreferrer noopener" title="Umbraco.Courier.Contrib">Umbraco.Courier.Contrib</a> and
- <a href="https://github.com/umbraco/Umbraco.Deploy.ValueConnectors" target="_blank" rel="noreferrer noopener" title="Umbraco.Deploy.ValueConnectors">Umbraco.Deploy.ValueConnectors</a> repos
+ <a href="https://github.com/umbraco/Umbraco.Courier.Contrib" target="_blank" rel="noreferrer noopener" title="Umbraco.Courier.Contrib">Umbraco.Courier.Contrib</a>,
+ <a href="https://github.com/umbraco/Umbraco.Deploy.ValueConnectors" target="_blank" rel="noreferrer noopener" title="Umbraco.Deploy.ValueConnectors">Umbraco.Deploy.ValueConnectors</a>,
+ <a href="https://github.com/umbraco/rfcs" target="_blank rel="noreferrer noopener" title="RFCs">RFCs</a>,
+ <a href="https://github.com/umbraco/The-Starter-Kit" target="_blank rel="noreferrer noopener" title="The-Starter-Kit">The Starter Kit</a> and
+ <a href="https://github.com/umbraco/organizer-guide" target="_blank rel="noreferrer noopener" title="organizer-guide">organizer-guide</a> repos
</small>
</p>
</div>
| 3 |
diff --git a/app/models/carto/api_key.rb b/app/models/carto/api_key.rb @@ -66,14 +66,14 @@ class Carto::ApiKey < ActiveRecord::Base
end
def setup_db_role
- user_db_connection.run(
+ db_run(
"create role \"#{db_role}\" NOSUPERUSER NOCREATEDB NOINHERIT LOGIN ENCRYPTED PASSWORD '#{db_password}'"
)
end
def drop_db_role
revoke_privileges(*affected_schemas(api_key_grants))
- user_db_connection.run("drop role \"#{db_role}\"")
+ db_run("drop role \"#{db_role}\"")
end
def update_role_permissions
@@ -82,7 +82,7 @@ class Carto::ApiKey < ActiveRecord::Base
api_key_grants.table_permissions.each do |tp|
unless tp.permissions.empty?
- user_db_connection.run(
+ db_run(
"grant #{tp.permissions.join(', ')} on table \"#{tp.schema}\".\"#{tp.name}\" to \"#{db_role}\""
)
end
@@ -121,7 +121,14 @@ class Carto::ApiKey < ActiveRecord::Base
redis_client.del(key)
end
- def user_db_connection
+ def db_run(query)
+ db_connection.run(query)
+ rescue Sequel::DatabaseError => e
+ Rollbar.warn('Error running SQL command', e)
+ raise Carto::UnprocesableEntityError.new(/PG::Error: ERROR: (.+)/ =~ e.message && $1 || 'Unexpected error')
+ end
+
+ def db_connection
@user_db_connection ||= ::User[user.id].in_database(as: :superuser)
end
@@ -139,33 +146,25 @@ class Carto::ApiKey < ActiveRecord::Base
schemas = read_schemas + write_schemas
schemas << 'cartodb' if write_schemas.present?
schemas.uniq.each do |schema|
- user_db_connection.run(
- "revoke all privileges on all tables in schema \"#{schema}\" from \"#{db_role}\""
- )
- user_db_connection.run(
- "revoke usage on schema \"#{schema}\" from \"#{db_role}\""
- )
- user_db_connection.run(
- "revoke execute on all functions in schema \"#{schema}\" from \"#{db_role}\""
- )
- user_db_connection.run(
- "revoke usage, select on all sequences in schema \"#{schema}\" from \"#{db_role}\""
- )
+ db_run("revoke all privileges on all tables in schema \"#{schema}\" from \"#{db_role}\"")
+ db_run("revoke usage on schema \"#{schema}\" from \"#{db_role}\"")
+ db_run("revoke execute on all functions in schema \"#{schema}\" from \"#{db_role}\"")
+ db_run("revoke usage, select on all sequences in schema \"#{schema}\" from \"#{db_role}\"")
end
- user_db_connection.run("revoke usage on schema \"cartodb\" from \"#{db_role}\"")
- user_db_connection.run("revoke execute on all functions in schema \"cartodb\" from \"#{db_role}\"")
+ db_run("revoke usage on schema \"cartodb\" from \"#{db_role}\"")
+ db_run("revoke execute on all functions in schema \"cartodb\" from \"#{db_role}\"")
end
def grant_usage_for_cartodb
- user_db_connection.run("grant usage on schema \"cartodb\" to \"#{db_role}\"")
- user_db_connection.run("grant execute on all functions in schema \"cartodb\" to \"#{db_role}\"")
+ db_run("grant usage on schema \"cartodb\" to \"#{db_role}\"")
+ db_run("grant execute on all functions in schema \"cartodb\" to \"#{db_role}\"")
end
def grant_aux_write_privileges_for_schema(s)
- user_db_connection.run("grant usage on schema \"#{s}\" to \"#{db_role}\"")
- user_db_connection.run("grant execute on all functions in schema \"#{s}\" to \"#{db_role}\"")
- user_db_connection.run("grant usage, select on all sequences in schema \"#{s}\" TO \"#{db_role}\"")
- user_db_connection.run("grant select on \"#{s}\".\"raster_columns\" TO \"#{db_role}\"")
- user_db_connection.run("grant select on \"#{s}\".\"raster_overviews\" TO \"#{db_role}\"")
+ db_run("grant usage on schema \"#{s}\" to \"#{db_role}\"")
+ db_run("grant execute on all functions in schema \"#{s}\" to \"#{db_role}\"")
+ db_run("grant usage, select on all sequences in schema \"#{s}\" TO \"#{db_role}\"")
+ db_run("grant select on \"#{s}\".\"raster_columns\" TO \"#{db_role}\"")
+ db_run("grant select on \"#{s}\".\"raster_overviews\" TO \"#{db_role}\"")
end
end
| 9 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,15 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master
where X.Y.Z is the semver of most recent plotly.js release.
+## [1.35.2] -- 2018-03-09
+
+### Fixed
+- Ping `mapbox-gl` to `0.44.1` so that users on fresh
+ `npm install` do not get the wrong mapbox-gl version message [#2467]
+- Fix swapping between `scatter` and `scatter3d` traces and other
+ potential problems caused by incorrect axis constraints resetting [#2465]
+
+
## [1.35.1] -- 2018-03-08
### Fixed
| 3 |
diff --git a/vis/js/mediator.js b/vis/js/mediator.js @@ -228,6 +228,7 @@ MyMediator.prototype = {
mediator.manager.call('headstart', 'dynamicSizing', [data.length]);
mediator.manager.call('canvas', 'setupCanvas', []);
+ mediator.manager.call('canvas', 'initInfoModal');
if (config.scale_toolbar) {
mediator.manager.registerModule(scale, 'scale');
mediator.manager.call('scale', 'drawScaleTypes', []);
| 1 |
diff --git a/spec/solve.spec.js b/spec/solve.spec.js @@ -123,6 +123,19 @@ describe('Solve', function () {
given: 'solve(tan(b*x)=a, x)',
expected: 'atan(a)/b' // overly simplified solution
},
+ // combined trig functions
+ {
+ given: 'solve(sin(cos(x^2))=a^2-b, x)',
+ expected: '[sqrt(acos(asin(a^2-b))), -sqrt(acos(asin(a^2-b)))]' // overly simplified solution
+ },
+ {
+ given: 'solve(cos(sin(a*x-b))=c, x)',
+ expected: '[(asin(acos(c))+b)/a]' // unmatched domain and range between asin and acos
+ },
+ {
+ given: 'solve(tan(sin(cos(x^2)))=c, x)',
+ expected: '[sqrt(acos(asin(atan(c))), -sqrt(acos(asin(atan(c)))]' // simplified solution
+ },
{
given: 'solve(a*x^3+b*x+c, x)',
expected: '[(-1/3)*(27*a^2*c+sqrt(108*a^3*b^3+729*a^4*c^2))^(1/3)*2^(-1/3)*a^(-1)'+
| 0 |
diff --git a/gears/carto_gears_api/spec/carto_gears_api/users_service_spec.rb b/gears/carto_gears_api/spec/carto_gears_api/users_service_spec.rb @@ -5,26 +5,23 @@ describe CartoGearsApi::Users::UsersService do
describe '#logged_user' do
module CartoDB; end
- let(:id) { 'b51e56fb-f3c9-463f-b950-d9be188551e5' }
- let(:username) { 'wadus_username' }
- let(:email) { '[email protected]' }
-
let(:service) { CartoGearsApi::Users::UsersService.new }
# This test is 100% bound to implementation. It's mostly a PoC for unit testing
# within Gears and should not be used as an example.
it 'returns the logged user based on subdomain and warden' do
- user = double
- user.stub(:id).and_return(id)
- user.stub(:username).and_return(username)
- user.stub(:email).and_return(email)
- user.stub(:organization).and_return(nil)
- user.stub(:feature_flags).and_return([])
+ user = CartoGearsApi::Users::User.with(
+ id: 'b51e56fb-f3c9-463f-b950-d9be188551e5',
+ username: 'wadus_username',
+ email: '[email protected]',
+ organization: nil,
+ feature_flags: [],
+ can_change_email: true)
warden = double
warden.should_receive(:user).once.and_return(user)
request = double
request.should_receive(:env).once.and_return('warden' => warden)
- CartoDB.should_receive(:extract_subdomain).with(request).and_return(username)
+ CartoDB.should_receive(:extract_subdomain).with(request).and_return(user.username)
logged_user = service.logged_user(request)
logged_user.email.should eq user.email
| 14 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.