conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
export interface RemoteCallGetRelationshipTypeParams {
qualifiedrelationshipTypeName:string;
format:string;
}
export interface RemoteCallGetRelationshipTypeResult extends RemoteCallResultBase {
iconUrl:string;
relationshiptType:RelationshipType;
}
=======
... |
<<<<<<<
///<reference path='HelpTextContainer.ts' />
///<reference path='FormOccurrenceDraggableLabel.ts' />
///<reference path='FormItemSetOccurrence.ts' />
///<reference path='FormItemSetOccurrences.ts' />
///<reference path='FormItemSetOccurrenceView.ts' />
///<reference path='FormItemSetView.ts' />
///<reference ... |
<<<<<<<
return wemQ.all([defaultPromise, commonPromise, customPromise]).then(() => {
// update active widget's height
this.activeWidget.slideIn();
=======
updateWidgetsHeights() {
this.widgetViews.forEach((widgetView: WidgetView) => {
thi... |
<<<<<<<
this.toolbar.appendChild(ContentPublishMenuManager.getPublishMenuButton());
=======
this.toolbar.appendChild(nonMobileDetailsPanelsManager.getToggleButton());
this.toolbar.appendChild(contentPublishMenuManager.getPublishMenuButton());
>>>>>>>
this.toolbar.appen... |
<<<<<<<
var onFocusHandler = (e) => {
this.resetInputHeight();
textAreaWrapper.addClass(focusedEditorCls);
};
=======
tinymce.init({
selector: 'textarea.' + id.replace(/\./g, '_'),
document_base_url: baseUrl + '/common... |
<<<<<<<
this.actionButton.setEnabled(false);
return this.loadDescendantIds().then(() => {
this.loadDescendants(0, 20).
then((descendants: ContentSummaryAndCompareStatus[]) => {
this.setDependantItems(descendants);
if (!this.isAnyOnlin... |
<<<<<<<
node.setChildren(this.dataToTreeNodes(dataList, node));
this.initData(this.root.getCurrentRoot().treeToList(), idPropertyName);
=======
node.setChildren(this.dataToTreeNodes(dataList, node, expandAll));
... |
<<<<<<<
// TODO: add more subscriptions
=======
public subscribeVisibleTimeRangeChange(handler: TimeRangeChangeEventHandler): void {
this._timeRangeChanged.subscribe(handler);
}
public unsubscribeVisibleTimeRangeChange(handler: TimeRangeChangeEventHandler): void {
this._timeRangeChanged.unsubscribe(handler);... |
<<<<<<<
postLoad: () => void;
=======
value: string;
>>>>>>>
postLoad: () => void;
value: string; |
<<<<<<<
import {IssueList} from './IssueList';
=======
import {IssueSummary} from './IssueSummary';
import {IssueList, IssueListItem} from './IssueList';
>>>>>>>
import {IssueList, IssueListItem} from './IssueList';
<<<<<<<
=======
private loadMask: LoadMask;
private issueDetailsDialog: IssueDetailsDialo... |
<<<<<<<
textAreaEl.onRendered(() => {
tinymce.init({
selector: 'textarea.' + clazz,
document_base_url: baseUrl + '/common/lib/tinymce/',
skin_url: baseUrl + '/common/lib/tinymce/skins/lightgray',
theme_url: 'mode... |
<<<<<<<
///<reference path='ResolvePublishContentResultJson.ts' />
=======
///<reference path='ResolvedPublishContentJson.ts' />
///<reference path='ResolvedPublishRequestedContentJson.ts' />
///<reference path='ResolvePublishDependenciesResultJson.ts' />
///<reference path='ResolvePublishRequestedContentsResultJson.... |
<<<<<<<
fetch(node: TreeNode<NODE>): Q.Promise<NODE> {
var deferred = Q.defer<NODE>();
=======
fetch(data: NODE): wemQ.Promise<NODE> {
var deferred = wemQ.defer<NODE>();
>>>>>>>
fetch(node: TreeNode<NODE>): wemQ.Promise<NODE> {
var deferred = wemQ.defer<NOD... |
<<<<<<<
this.appendChildToContentPanel(this.dockedPanel);
this.appendChildToContentPanel(this.createNewIssueButton());
=======
this.createNewIssueButton();
this.appendChildToContentPanel(this.dockedPanel = this.createDockedPanel());
//this.appendChildToConte... |
<<<<<<<
import User = api.security.User;
=======
import Action = api.ui.Action;
>>>>>>>
import Action = api.ui.Action;
import User = api.security.User; |
<<<<<<<
=======
import { RangeImpl } from './range-impl';
import { Series } from './series';
>>>>>>>
import { RangeImpl } from './range-impl'; |
<<<<<<<
* Wrap a function inside another to allow you to make adjustments to the parameters, or do other processing
* either before the internal function is called or with its results.
*/
wrap<T>(fn: (...args: any[]) => any, wrapper: (...args: any[]) => T): (...args: any[]) => T;
... |
<<<<<<<
mapObjIndexed<T, TResult>(fn: (value: T, key: string, obj?: { [index: Prop]: T }) =>
TResult, obj: { [index: Prop]: T }): { [index: Prop]: TResult };
mapObjIndexed<T, TResult>(fn: (value: T, key: string, obj?: any) => TResult, obj: any): {[index: Prop]: TResult};
mapObjIndex... |
<<<<<<<
import { BigNumber } from "../../utils/bignumber";
=======
import { BigNumber } from "../../utils/bignumber";
>>>>>>>
import { BigNumber } from "../../utils/bignumber";
<<<<<<<
import { CollateralizedSimpleInterestLoanOrder } from "../adapters/collateralized_simple_interest_loan_adapter";
=======
>>... |
<<<<<<<
export interface OwnerOfScenario extends Scenario {
shouldTransferTo?: string;
}
=======
export interface TransferFromScenario extends Scenario {
from: string;
to: string;
tokenID: BigNumber;
data?: string;
options?: TxData;
}
>>>>>>>
exp... |
<<<<<<<
=======
// External
import * as Web3 from "web3";
import { BigNumber } from "utils/bignumber";
// Types
>>>>>>>
// Types |
<<<<<<<
=======
import * as moment from "moment";
>>>>>>>
import * as moment from "moment";
<<<<<<<
export interface DebtOrderParams {
principal: TokenAmount;
collateral: TokenAmount;
interestRate: InterestRate;
term: Term;
debtorAddress: string;
}
=======
import { BLOCK_TIME_ESTIMATE_SECOND... |
<<<<<<<
window.setTimeout(() => {
if (!this.hasEventListener(IOErrorEvent.IO_ERROR)) {
$warn(1011, url);
=======
let self = this;
window.setTimeout(function (): void {
if (!self.hasEventListener(IOErrorEvent.IO_ERROR)) {
... |
<<<<<<<
=======
//Check path, determine its type and get all the possible steps using getFileSteps()
function getAllPathSteps(stepsPath): Step[] {
let f = fs.lstatSync(stepsPath);
if (f.isFile()) {
return getFileSteps(stepsPath);
} else if (f.isDirectory()) {
let res = [];
fs.readd... |
<<<<<<<
import { parseShops, Shop } from '@server/world/config/shops';
=======
import Quadtree from 'quadtree-lib';
import { timer } from 'rxjs';
import { Mob } from '@server/world/mob/mob';
export interface QuadtreeKey {
x: number;
y: number;
mob: Mob;
}
>>>>>>>
import { parseShops, Shop } from '@serve... |
<<<<<<<
public clone(): Position {
return new Position(this.x, this.y, this.level);
}
public withinInteractionDistance(landscapeObject: LandscapeObject): boolean {
const definition = gameCache.landscapeObjectDefinitions.get(landscapeObject.objectId);
const occupantX = landscapeObjec... |
<<<<<<<
interface MenuContents {
levelName: string;
opened: boolean;
arrows: string[];
subLevel: any[];
}
=======
import { Result } from 'axe-core';
export interface MenuContents {
levelName: string,
opened: boolean,
nested: boolean,
arrows: string[],
subLevel: any[],
}
>>>>>>>
import { Result }... |
<<<<<<<
koShowPropertyGrid = ko.observable(true);
koShowCategoriesInPropertyGrid = ko.observable(false);
koShowToolbox = ko.observable(true);
=======
koShowPropertyGrid = ko.observable<ContainerLocation>(true);
koShowToolbox = ko.observable<ContainerLocation>(true);
>>>>>>>
koShowPropertyGrid = ko.observ... |
<<<<<<<
import { FilterListService } from './filter-list-service/index';
import { CacheCustomService } from '../../services/index';
import { instance, mock, when, anything } from 'ts-mockito/lib/ts-mockito';
import { DebugElement } from '@angular/core/core';
=======
import { data } from './filter-list-service/filter-... |
<<<<<<<
=======
import { ProductList } from '../../services/products/products.mock';
>>>>>>>
<<<<<<<
import { environment } from '../../../environments/environment';
import { JwtService, GlobalState, CacheCustomService } from '../../services';
=======
import { environment } from '../../../environments/environment... |
<<<<<<<
import { MiniCartComponent } from './mini-cart/mini-cart.component';
import { SearchBoxComponent } from './search-box/search-box.component';
import { CompareDetailsComponent } from './product-compare/compare-details.component';
import { WishListComponent } from './wish-list/wish-list.component';
=======
impor... |
<<<<<<<
import { SharedModule } from 'app/modules/shared.module';
=======
import { userData } from '../../services/account-login/account-login.mock';
import { SharedModule } from '../../modules/shared.module';
>>>>>>>
import { SharedModule } from '../../modules/shared.module';
<<<<<<<
let fixture: ComponentFixt... |
<<<<<<<
=======
import { InstanceService } from '../../services/instance.service';
import { environment } from '../../../environments/environment';
import { ProductListMockService } from './products.service.mock';
import { ProductListApiService } from './products.service.api';
>>>>>>> |
<<<<<<<
=======
import { TestBed, inject } from '@angular/core/testing';
import { environment } from '../../../environments/environment';
>>>>>>>
<<<<<<<
import { ApiService } from '../';
import { mock, instance, when, anything } from 'ts-mockito';
import { Observable } from 'rxjs/Rx';
=======
import { InstanceSe... |
<<<<<<<
self.onOkClick = function() {self.apply(); if(!self.koHasError()) jQuery(self.modalNameTarget).modal("hide");; };
self.onResetClick = function () { self.reset(); };
self.koAfterRender = function(el, con) { return self.afterRender(el, con); };
=======
self.onOkClick = function()... |
<<<<<<<
// import { CategoriesService } from '../../services/categories/categories.service';
=======
import { CategoryPageComponent } from '../../pages/category-page/category-page.component';
import { FamilyPageComponent } from '../../pages/family-page/family-page.component';
import { CategoriesService } from '../../... |
<<<<<<<
import { AuthGuard } from '../services/auth-guard.service'
import { LocalizeRouterModule } from '../services/routes-parser-locale-currency/localize-router.module';
=======
import { AuthGuard } from '../services/auth-guard.service';
import { BreadcrumbService } from '../components/breadcrumb/breadcrumb.service... |
<<<<<<<
import { CompareDetailsComponent } from './shared/components/header/product-compare/compare-details.component';
=======
>>>>>>> |
<<<<<<<
=======
import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
import { CarouselModule } from 'ngx-bootstrap/carousel';
import { CollapseModule } from 'ngx-bootstrap/collapse';
import { ModalModule } from 'ngx-bootstrap/modal';
import { PopoverModule } from 'ngx-bootstrap/popover';
import { translateFacto... |
<<<<<<<
]
=======
{ provide: Router, useFactory: () => instance(mock(Router)) },
],
declarations: [LanguageSwitchComponent]
>>>>>>>
],
declarations: [LanguageSwitchComponent] |
<<<<<<<
import { ComponentFixture } from '@angular/core/testing';
import { Router } from '@angular/router';
=======
>>>>>>>
import { ComponentFixture } from '@angular/core/testing'; |
<<<<<<<
import { Component, OnInit } from '@angular/core';
import { environment } from '../../../environments/environment';
import { Category } from '../../services/categories/categories.model';
import { CategoriesService } from '../../services/categories/categories.service';
import { GlobalState } from '../../services... |
<<<<<<<
trigger: 'hover',
placement: 'top',
content: 'Set streaming mode.',
=======
trigger: 'click hover',
placement: 'right',
content: 'Shows an interactive stream of results, useful when your data is changing quickly.',
>>>>>>>
trigger: 'hover',
placement: 'top',
content: 'Shows an inte... |
<<<<<<<
const TestSchema = new Schema<ITest>({
foo: { type: String, required: true },
=======
const TestSchema = new Schema({
foo: { type: String, required: true }
>>>>>>>
const TestSchema = new Schema<ITest>({
foo: { type: String, required: true };
<<<<<<<
const TestSchema = new Schema<ITes... |
<<<<<<<
create<DocContents = T | DocumentDefinition<T>>(docs: CreateDoc<DocContents>[], options?: SaveOptions): Promise<T[]>;
create<DocContents = T | DocumentDefinition<T>>(doc: CreateDoc<DocContents>): Promise<T>;
create<DocContents = T | DocumentDefinition<T>>(...docs: CreateDoc<DocContents>[]): Promise<... |
<<<<<<<
import * as assert from "assert";
import { Constants } from "../../common";
import { IHeaders } from "../../queryExecutionContext/IHeaders";
import { SessionContainer } from "../../session/sessionContainer";
import { SessionContext } from "../../session/SessionContext";
=======
import assert from "assert";
... |
<<<<<<<
=======
import {Config} from '../../../node_modules/protractor';
import {IAuthenticationService} from '../../contracts/authentication/IAuthenticationService';
import {AuthenticationStateEvent, NotificationType} from '../../contracts/index';
>>>>>>>
<<<<<<<
public config: typeof environment = environment;
... |
<<<<<<<
private _parseDeepLinkingUrl(url: string): string {
const customProtocolPrefix: string = 'bpmn-studio://';
const urlFragment: string = url.substring(customProtocolPrefix.length);
return urlFragment;
}
=======
>>>>>>>
private _parseDeepLinkingUrl(url: string): string {
const customProto... |
<<<<<<<
import environment from './environment';
import {oidcConfig} from './open-id-connect-configuration';
=======
>>>>>>> |
<<<<<<<
<<<<<<< Updated upstream
import {AuthenticationStateEvent, IPagination, IProcessEngineService} from '../../contracts/index';
=======
import {AuthenticationStateEvent} from '../../contracts/index';
>>>>>>>
import {Router} from 'aurelia-router';
import {AuthenticationStateEvent} from '../../contracts/index';
... |
<<<<<<<
public deleteProcessDef(processId: string): Promise<void> {
const url: string = `${environment.processengine.routes.processes}/${processId}`;
return this.http
.fetch(url, {
method: 'delete',
})
.then((response: Response) => {
return response.json();
}).then((res... |
<<<<<<<
import {AuthenticationStateEvent, IDynamicUiService, IPagination, IProcessEngineService, NotificationType} from '../../contracts/index';
=======
import {Router} from 'aurelia-router';
import * as toastr from 'toastr';
import {AuthenticationStateEvent, IDynamicUiService, IPagination, IProcessEngineService} fro... |
<<<<<<<
diagramChange: 'diagram:change',
=======
processSolutionPanel: {
toggleProcessSolutionExplorer: 'processSolutionPanel:processsolutionexplorer:toggle',
},
>>>>>>>
diagramChange: 'diagram:change',
processSolutionPanel: {
toggleProcessSolutionExplorer: 'processSolutionPanel:proce... |
<<<<<<<
bpmnio: {
toggleXMLView: 'processdefdetail:xmlview:toggle',
},
diagramChange: 'diagram:change',
=======
processSolutionPanel: {
toggleProcessSolutionExplorer: 'processSolutionPanel:processsolutionexplorer:toggle',
},
>>>>>>>
bpmnio: {
toggleXMLView: 'processdefdetail... |
<<<<<<<
import {BindingEngine, inject} from 'aurelia-framework';
=======
import {inject} from 'aurelia-framework';
import {Router} from 'aurelia-router';
>>>>>>>
import {BindingEngine, inject} from 'aurelia-framework';
import {Router} from 'aurelia-router';
<<<<<<<
@inject(EventAggregator, 'ConsumerClient', Binding... |
<<<<<<<
const result = await shelljs.exec(`mongorestore --uri ${MONGO_URL} --db erxes ./src/initialData/permission`, {
=======
const result = await shelljs.exec(`mongorestore --uri "${MONGO_URL}" --db erxes ./src/permissionData`, {
>>>>>>>
const result = await shelljs.exec(`mongorestore --uri "${MONGO_URL}" --... |
<<<<<<<
const result = await shelljs.exec(`mongorestore --uri ${MONGO_URL} --db erxes ./src/initialData/common`, {
silent: true,
});
=======
const result = await shelljs.exec(`mongorestore --uri "${MONGO_URL}" --db erxes ./src/initialData`, { silent: true });
>>>>>>>
const result = await shelljs.exec(`mo... |
<<<<<<<
private _outputChannel: vs.OutputChannel;
=======
>>>>>>>
private _outputChannel: vs.OutputChannel;
<<<<<<<
traceNode(editor: vs.TextEditor, edit: vs.TextEditorEdit) {
if (!this._checkLanguageSupport(editor.document, "Trace TypeScript Syntax Node")) {
return... |
<<<<<<<
export enum FixAllScope {
Document = "Document",
Project = "Project",
Solution = "Solution"
}
export interface GetFixAllRequest extends FileBasedRequest {
Scope: FixAllScope;
FixAllFilter?: FixAllItem[];
}
export interface RunFixAllRequest extends FileBasedRequest {
Scope: FixAllScope;... |
<<<<<<<
scheduler = new rx.HistoricalScheduler(0, (x, y) => {
return x > y ? 1 : -1;
});
observer = new WarningMessageObserver(vscode, () => false, scheduler);
warningMessage = undefined;
=======
assertionObservable = new Subject<string>();
scheduler = new T... |
<<<<<<<
import { FixAllProvider } from '../features/fixAllProvider';
=======
import { LanguageMiddlewareFeature } from './LanguageMiddlewareFeature';
>>>>>>>
import { FixAllProvider } from '../features/fixAllProvider';
import { LanguageMiddlewareFeature } from './LanguageMiddlewareFeature';
<<<<<<<
localDis... |
<<<<<<<
public async discoverTests(fileName: string, testFrameworkName: string, noBuild: boolean): Promise<protocol.V2.TestInfo[]> {
let targetFrameworkVersion = await this._recordRunAndGetFrameworkVersion(fileName, testFrameworkName);
let runSettings = vscode.workspace.getConfiguration('omn... |
<<<<<<<
// test('action - list', (t) => {
// const L = new MuRDAList(new MuRDARegister(new MuFloat64()));
// const store = L.createStore([]);
// const dispatchers = L.action(store);
// let action;
// t.deepEqual(dispatchers.pop(), { type: 'remove', data: [] }, 'pop when empty');
// t.deepEqual(... |
<<<<<<<
public readonly emptyStore:MuRDARegisterStore<this>;
constructor (stateSchema:StateSchema) {
=======
public constrain:(value:StateSchema['identity']) => StateSchema['identity'];
constructor (
stateSchema:StateSchema,
constrain?:(value:StateSchema['identity']) => StateSchema['... |
<<<<<<<
}
export const DefaultRPCSchema = {
client: {
call: new MuStruct({
id: new MuString(),
methodName: new MuString(),
arg: new MuArray(new MuInt8()), //FIXME: arg type should be same as the schema in examples
}),
response: new MuStruct({
... |
<<<<<<<
=======
static dir(message: string, params: any[],
moduleName: string, moduleColor: string, level: Level) {
let color = 'gray';
if (level === Level.INFO) color = 'deepskyblue';
if (level === Level.ERROR) color = 'red';
if (level === Level.WARN) color = 'orange';
... |
<<<<<<<
=======
public mute() {
this.isMuted = true;
}
>>>>>>>
public mute() {
this.isMuted = true;
} |
<<<<<<<
export abstract class DxComponent implements OnChanges, AfterViewInit {
=======
declare let $: any;
const startupEvents = ['onInitialized', 'onContentReady'];
export class DxComponent implements OnChanges, AfterViewInit {
>>>>>>>
const startupEvents = ['onInitialized', 'onContentReady'];
export abstract c... |
<<<<<<<
this.serialNumber = this.utilService.generateRandomSerial();
const coinToMint = this.mintCoinForm.controls['A'].value;
if (!coinToMint) return;
if (coinToMint > this.coinCount) {
return this.toastr.error('You do not have enough ERC-20 tokens');
}
this.isRequesting = true;
... |
<<<<<<<
let isTranscludedContent = widget['IsTranscludedContent'],
className = inflector.camelize(widgetName),
=======
let isTranscludedContent = widget.IsTranscludedContent,
isExtension = widget.IsExtensionComponent || false,
>>>>>>>
let isTransclu... |
<<<<<<<
static compileFile(file: File, from: Language, to: Language, options = ""): Promise<any> {
return new Promise((resolve, reject) => {
Service.compile(file.getData(), from, to, options).then((result) => {
let markers = Service.getMarkers(result.tasks[0].console);
if (markers.length) {
... |
<<<<<<<
const htmlDesktopTemplateCode = readTemplate(config.output.templates.desktop);
const articleListHomeTemplate = readTemplate(config.output.templates.articleListHomeTemplate);
=======
>>>>>>>
const articleListHomeTemplate = readTemplate(config.output.templates.articleListHomeTemplate);
<<<<<<<
... |
<<<<<<<
export abstract class DxComponentBase implements OnChanges {
=======
export abstract class DxComponent implements AfterViewInit {
>>>>>>>
export abstract class DxComponentBase {
<<<<<<<
ngOnChanges(changes: { [key: string]: SimpleChange }) {
Object.keys(changes).forEach(propertyName => {
... |
<<<<<<<
if (!JSON.parse(body).error) {
const redirects = {};
let redirectsCount = 0;
const { pages } = JSON.parse(body).query;
pages[Object.keys(pages)[0]].redirects.map((entry) => {
const title = entry.title.replace(/ /g, mw.spaceDelimiter);
redi... |
<<<<<<<
newNoteFromSelectionReplacementTemplate: string;
=======
lowercaseNewNoteFilenames: boolean;
>>>>>>>
newNoteFromSelectionReplacementTemplate: string;
lowercaseNewNoteFilenames: boolean;
<<<<<<<
newNoteFromSelectionReplacementTemplate: '[[${wikiLink}]]',
=======
lowercaseNewNoteFilenames: t... |
<<<<<<<
triggerSuggestOnReplacement: boolean;
=======
allowPipedWikiLinks: boolean;
pipedWikiLinksSyntax: PipedWikilinksSyntax;
pipedWikiLinksSeparator: string;
>>>>>>>
triggerSuggestOnReplacement: boolean;
allowPipedWikiLinks: boolean;
pipedWikiLinksSyntax: PipedWikilinksSyntax;
pipedWikiLinksSepara... |
<<<<<<<
import express from "express";
import path from "path";
import queryString from "querystring";
=======
// import { Request, Response, NextFunction } from "express";
import express from 'express';
const app: Express.Application = express();
>>>>>>>
import express from "express";
import path from "path";
imp... |
<<<<<<<
const build_handler = () => {
indexer.build_index().then((_) => saveIndex());
};
const instantiate_handler = () => {
moduleInstantiator.instantiateModule();
};
=======
context.subscriptions.push(languages.registerDocumentRangeFormattingEditProvider(selector, formatProvider... |
<<<<<<<
needsReview
reviewedByUserId
=======
descriptionTruncationCount
>>>>>>>
needsReview
reviewedByUserId
descriptionTruncationCount |
<<<<<<<
var requestOptions: any = {
=======
const { value: mozillaHubsAPIKey } = mozillaHubsAPIKeyResult
const { value: mozillaHubsUserId } = mozillaHubsUserIdResult
var requestOptions = {
>>>>>>>
const { value: mozillaHubsAPIKey } = mozillaHubsAPIKeyResult
const { value: mozillaHubsUserId } = mozillaHub... |
<<<<<<<
import { wrapVulcanAsyncScript } from './utils'
import { Vulcan, getSetting } from '../vulcan-lib';
import { Posts } from '../../lib/collections/posts'
import Users from '../../lib/collections/users/collection'
import { makeLowKarmaSelector, LOW_KARMA_THRESHOLD } from '../migrations/2020-05-13-noIndexLowKarma';... |
<<<<<<<
petrovPressedButtonDate
=======
sortDrafts
reenableDraftJs
>>>>>>>
petrovPressedButtonDate
sortDrafts
reenableDraftJs |
<<<<<<<
export interface IdMap {[key: string]: string;}
=======
wrapDynamicImportPlugin(acorn);
export interface IdMap { [key: string]: string; }
>>>>>>>
export interface IdMap { [key: string]: string; }
<<<<<<<
return parse(module.code, assign({
=======
return acorn.parse(module.code, Object.assign({
>>>>>... |
<<<<<<<
Posts.addView("shortformDiscussionThreadsList", (terms: PostsViewTerms) => {
=======
Posts.addView("2019reviewRecentDiscussionThreadsList", terms => {
return {
selector: {
...recentDiscussionFilter,
nominationCount2019: { $gt: 0 }
},
options: {
sort: {lastCommentedAt:-1},
... |
<<<<<<<
// Whether to point RSS links to the linked URL (“link”) or back to the post page (“page”)
const outsideLinksPointToSetting = new DatabasePublicSetting<string>('forum.outsideLinksPointTo', 'link')
Posts.getShareableLink = function (post) {
return outsideLinksPointToSetting.get() === 'link' ? Posts.getLink(p... |
<<<<<<<
update: (selector?: string|MongoSelector<T>, modifier?: MongoModifier<T>, options?: MongoUpdateOptions<T>) => Promise<number>
remove: any
insert: any
aggregate: any
=======
update: (selector?: string|MongoSelector<T>, modifier?: MongoModifier<T>, options?: MongoUpdateOptions<T>) => number
remove: ... |
<<<<<<<
export interface MutationOptions<T extends DbObject> {
newCheck?: (user: DbUser|null, document: T|null) => Promise<boolean>|boolean,
createCheck?: (user: DbUser|null, document: T|null) => Promise<boolean>|boolean,
editCheck?: (user: DbUser|null, document: T|null) => Promise<boolean>|boolean,
updateCheck... |
<<<<<<<
import Users from '../../lib/collections/users/collection';
import { editableCollections, editableCollectionsFields } from '../../lib/editor/make_editable';
=======
import { accessFilterSingle } from '../../lib/utils/schemaUtils';
>>>>>>>
import { editableCollections, editableCollectionsFields } from '../../... |
<<<<<<<
readonly group: PostsBase_group|null,
readonly bestAnswer: CommentsList|null,
=======
readonly group: PostsBase_group,
>>>>>>>
readonly group: PostsBase_group|null,
<<<<<<<
interface PostsList extends PostsBase, PostsAuthors { // fragment on Posts
readonly contents: PostsList_contents|null,
read... |
<<<<<<<
=======
import urlObject from 'url';
import getSlug from 'speakingurl';
import { getSetting, registerSetting } from './settings';
>>>>>>>
<<<<<<<
Utils.getSiteUrl = function () {
let url = siteUrlSetting.get();
=======
Utils.getSiteUrl = function (): string {
let url = getSetting('siteUrl', Meteor.abs... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.