conflict_resolution
stringlengths
27
16k
<<<<<<< import * as zowe from "@zowe/cli"; import { Session } from "@zowe/imperative"; ======= import * as zowe from "@brightside/core"; import { Session, IProfileLoaded } from "@brightside/imperative"; // tslint:disable-next-line: no-duplicate-imports import { IJob, IJobFile } from "@brightside/core"; >>>>>>> impor...
<<<<<<< Object.defineProperty(profileLoader.Profiles, "getInstance", { value: jest.fn(() => { return { allProfiles: [{name: "firstName"}, {name: "secondName"}], defaultProfile: {name: "firstName"}, getDefaultProfile: mockLoa...
<<<<<<< import { IZoweTree } from "../api/IZoweTree"; import { IZoweTreeNode, IZoweUSSTreeNode } from "../api/IZoweTreeNode"; ======= import { ZoweExplorerApiRegister } from "../api/ZoweExplorerApiRegister"; >>>>>>> import { IZoweTree } from "../api/IZoweTree"; import { IZoweUSSTreeNode } from "../api/IZoweTreeNode"...
<<<<<<< const withProgress = jest.fn(); const downloadDataset = jest.fn(); const downloadUSSFile = jest.fn(); ======= const mockInitialize = jest.fn(); const mockInitializeUSS = jest.fn(); const ussPattern = jest.fn(); const mockPattern = jest.fn(); >>>>>>> const withProgress = jest.f...
<<<<<<< node.label = `${favPrefix}${afterDataSetName}`; if (isFavourite) { const profile = favPrefix.substring(1, favPrefix.indexOf("]")); datasetProvider.renameNode(profile, beforeDataSetName, afterDataSetName); } else { const temp = ...
<<<<<<< ======= import { Logger, ISession, Session } from "@brightside/imperative"; import * as child_process from "child_process"; >>>>>>> <<<<<<< import * as loader from "../../src/ProfileLoader"; ======= import { ZosmfSession } from "@brightside/core"; >>>>>>> import * as loader from "../../src/ProfileLoader"...
<<<<<<< if (node) { node.setEtag(uploadResponse.apiResponse.etag); } ======= node.setEtag(uploadResponse.apiResponse.etag); setFileSaved(true); >>>>>>> if (node) { node.setEtag(uploadResponse.apiResponse.etag); } ...
<<<<<<< import { getInstallPath } from '../../util/api'; import { UserCanceled } from '../../util/CustomErrors'; ======= import { ProcessCanceled, UserCanceled } from '../../util/CustomErrors'; >>>>>>> import { getInstallPath } from '../../util/api'; import { ProcessCanceled, UserCanceled } from '../../util/CustomEr...
<<<<<<< import { ZosmfSession, IJob, DeleteJobs } from "@brightside/core"; ======= import { ZosmfSession, IJob } from "@brightside/core"; >>>>>>> import { ZosmfSession, IJob, DeleteJobs } from "@brightside/core"; <<<<<<< super(ZosJobsProvider.persistenceSchema, new Job(localize("Favorites", ...
<<<<<<< }); /************************************************************************************************************* * Testing openItemFromPath *************************************************************************************************************/ describe("openItemFromPath tests", () => { const se...
<<<<<<< // Could be a favorite or regular entry always deal with the regular entry const oldLabel = originalNode.label; const parentPath = originalNode.fullPath.substr(0, originalNode.fullPath.indexOf(oldLabel)); // Check if an old favorite exists for this node const oldFavorite:...
<<<<<<< import getVortexPath from './getVortexPath'; import { log } from './log'; ======= import getVortexPath from './getVortexPath'; >>>>>>> import getVortexPath from './getVortexPath'; import { log } from './log'; <<<<<<< import I18next from 'i18next'; import * as FSBackend from 'i18next-node-fs-backend'; import...
<<<<<<< public delete(){ return { name: "profile1", profile: {}, type: "zosmf" }; } ======= public get configurations() { return [{ type: "zosmf", schema: { type: "object", title: "test profile", description: "test pro...
<<<<<<< export const setLoginId = safeCreateAction('SET_LOGIN_ID', id => id); export const setLoginError = safeCreateAction('SET_LOGIN_ERROR', error => error); ======= /* * associate with nxm urls */ export const setLoginId = safeCreateAction('SET_LOGIN_ID', id => id); /** * store last time we checked for update...
<<<<<<< import { Logger, TextUtils, IProfileLoaded, ImperativeConfig, Session, CredentialManagerFactory, ImperativeError, DefaultCredentialManager } from "@zowe/imperative"; ======= import { Logger, TextUtils, IProfileLoaded, ImperativeConfig, Session, CredentialManagerFactory, ImperativeError, DefaultCredent...
<<<<<<< function createGlobalMocks() { const globalMocks = { qpPlaceholder: "Choose \"Create new...\" to define a new profile or select an existing profile to Add to the Data Set Explorer" }; ======= async function createGlobalMocks() { >>>>>>> async function createGlobalMocks() { const globalMo...
<<<<<<< ======= it("Testing that that openPS credentials prompt is executed successfully", async () => { showQuickPick.mockReset(); showInputBox.mockReset(); showTextDocument.mockReset(); openTextDocument.mockReset(); const sessionwocred = new brtimperative.Session({ ...
<<<<<<< ======= describe("deleteUSSNode", () => { it("should delete node if user verified", async () => { showQuickPick.mockResolvedValueOnce("Yes"); await ussNodeActions.deleteUSSNode(ussNode, testUSSTree, ""); expect(testUSSTree.refresh).toHaveBeenCalled(); })...
<<<<<<< constructor(events: NodeJS.EventEmitter, store: Redux.Store<any>, manager: DownloadManager) { this.mStore = store; ======= constructor(api: IExtensionApi, manager: DownloadManager, protocolHandlers: IProtocolHandlers) { this.mApi = api; const events = api.events; >>>>>>> const...
<<<<<<< PendingRequestsComponent, ======= AddressBookComponent, >>>>>>> PendingRequestsComponent, AddressBookComponent,
<<<<<<< [limit]="state.options.limit" ======= [scrollHeight]="state.scrollHeight" >>>>>>> [scrollHeight]="state.scrollHeight" [limit]="state.options.limit"
<<<<<<< import { ElementRef, EventEmitter, Renderer2, OnInit, OnDestroy } from '@angular/core'; ======= import { ElementRef, EventEmitter, NgZone, OnInit, OnDestroy } from '@angular/core'; >>>>>>> import { ElementRef, EventEmitter, Renderer2, NgZone, OnInit, OnDestroy } from '@angular/core'; <<<<<<< constructor...
<<<<<<< // Enums import { ColumnMode } from 'enums/ColumnMode'; import { SortType } from 'enums/SortType'; import { SortDirection } from 'enums/SortDirection'; import { SelectionType } from 'enums/SelectionType'; // Models ======= // Model/Enums import { ColumnMode } from './enums/ColumnMode'; import { SortType } fr...
<<<<<<< Component, Input, ElementRef, Output, EventEmitter, Renderer2, ======= Component, Input, ElementRef, Output, EventEmitter, NgZone, >>>>>>> Component, Input, ElementRef, Output, EventEmitter, Renderer2, NgZone, <<<<<<< constructor(element: ElementRef, private renderer: Renderer2) { ======= constr...
<<<<<<< import { RetriableReadableStreamOptions } from "../../src/utils/RetriableReadableStream"; import { createRandomLocalFile, getBSU, getUniqueName } from "../utils"; import { readStreamToLocalFile } from "../../src/utils/utils.common"; ======= import { downloadBlobToBuffer, uploadFileToBlockBlob, uploadStr...
<<<<<<< ======= import runElevated from './elevated'; import { globalT } from './i18n'; >>>>>>> import { globalT } from './i18n';
<<<<<<< import { BlockBlobClient } from "../src/BlockBlobClient"; import { getBSU, getUniqueName } from "./utils/index"; ======= import { Aborter } from "../src/Aborter"; import { BlockBlobURL } from "../src/BlockBlobURL"; import { ContainerURL } from "../src/ContainerURL"; import { getBSU } from "./utils/index"; >>...
<<<<<<< import Promise from 'bluebird'; import NexusT from 'nexus-api'; ======= import * as Promise from 'bluebird'; import NexusT from '@nexusmods/nexus-api'; >>>>>>> import NexusT from '@nexusmods/nexus-api'; import Promise from 'bluebird';
<<<<<<< import { RestError, ShareClient } from "../src"; import { newPipeline, Pipeline } from "../src/Pipeline"; import { getBSU, getUniqueName } from "./utils"; ======= import { RestError, StorageURL } from "../src"; import { Aborter } from "../src/Aborter"; import { ShareURL } from "../src/ShareURL"; import { Pip...
<<<<<<< generateUuid, isValidUuid, encodeUri, RestError, RequestOptionsBase, RequestPolicy, ServiceCallback, promiseToCallback, promiseToServiceCallback, isStream, dispatchRequest, RedirectFilter, applyMixins, isNode, stringifyXML, prepareXMLRootList ======= generateUuid, isValidUuid, encodeUri, RestError, Requ...
<<<<<<< import { FileClient } from "../src/FileClient"; import { getBSU, getUniqueName } from "./utils/index"; ======= import { Aborter } from "../src/Aborter"; import { FileURL } from "../src/FileURL"; import { ShareURL } from "../src/ShareURL"; import { getBSU } from "./utils/index"; >>>>>>> import { FileClient } ...
<<<<<<< findOne(conditions:{}, fields?: {}, options?: {}, cb?: (err: Error, docs?: any)=>void): any; find(conditions:{}, fields?: {}, options?: {}, cb?: (err: Error, docs?: any[])=>void): any; ======= findById(id:string, fields?:string):any; find(conditions:{}, fields?: {}, options?: {}, cb?: (err: Error, doc...
<<<<<<< //styleUrls: ['./switch.scss'] ======= styleUrls: ['./switch.scss'], providers: [ {provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => JigsawSwitch), multi: true}, ] >>>>>>> //styleUrls: ['./switch.scss'], providers: [ {provide: NG_VALUE_ACCESSOR, useExisting: fo...
<<<<<<< this._fromArray(this._bakData.filter(item => (<any[]>filter.field).find(field => { const value:string = item[field] === undefined || item[field] === null ? '' : item[field].toString(); return value.includes(filter.key) }))); ======= this.filt...
<<<<<<< TableSelectRowDemoModule, TableCheckboxColumnObjectCellDemoModule, TableCalendarDemoModule, BigRowDemoModule, BigColumnDemoModule, TableResizeDemoModule ======= TableSelectRowDemoModule, TableCheckboxColumnObjectCellDemoModule, TableCalendarDemoModule, BigRowDemoModule >>>>>>> ...
<<<<<<< singleTimeComboValue = [{label: TimeService.getFormatDate(this.date, TimeGr.date), closable: false}]; ======= singleTimeComboValue = new ArrayCollection([{label: TimeService.getFormateDate(this.date, TimeGr.date), closable: false}]); >>>>>>> singleTimeComboValue = new ArrayCollection([{label: Tim...
<<<<<<< ======= export class ScrollEvent { // 滚动发生的方向, y 或者x direction: string; // 距左部的距离 draggerLeft: number; // 距顶部的距离 draggerTop: number; // 距左侧的百分比 leftPercentage: number; // 内容距离 left: number; // 距顶部的百分比 topPercentage: number; // 内容距离 top: number; ...
<<<<<<< ======= public static toArray(tableData: any): any[] { if (!TableData.isTableData(tableData)) { return []; } return new TableData(tableData.data, tableData.field, tableData.header).toArray(); } } >>>>>>> public static toArray(tableData: any): any[] { ...
<<<<<<< * 事件派发器 ======= * 销毁系统 * */ class DestroySystem extends BaseSystem<BaseComponent> { private readonly _bufferedComponents; private readonly _bufferedGameObjects; /** * @inheritDoc */ update(): void; /** * 将实体缓存到销毁系统,以便在系...
<<<<<<< import { ExplorerOptions, RequestType, ExplorerValues, GraphApiCall, GraphRequestHeader, Message, SampleQuery, MessageBarContent } from "./base"; ======= import * as moment from "moment"; import { ExplorerOptions, RequestType, ExplorerValues, GraphApiCall, GraphRequestHeader, Message, SampleQuery, MessageBar...
<<<<<<< const loginResponse = await login(); if (loginResponse) { ======= const loginSuccess = await login(); if (loginSuccess) { >>>>>>> const loginSuccess = await login(); if (loginSuccess) { <<<<<<< AppComponent.explorerValues.authentication.status = 'authenticated'; ...
<<<<<<< it("should ignore generics", async () => { const output = await Compiler.compile(join(fixtures, "ignore-generics.ts"), {ignoreGenerics: true, ignoreIndexSignature: false}); const expected = await readFile(join(fixtures, "ignore-generics-ti.ts"), {encoding: "utf8"}); assert.deepEqual(output,...
<<<<<<< import { BN } from 'ethereumjs-util' import { Block } from '@ethereumjs/block' ======= import { BN, toBuffer } from 'ethereumjs-util' >>>>>>> import { BN } from 'ethereumjs-util' import { Block } from '@ethereumjs/block' <<<<<<< const txContext = new TxContext(tx.gasPrice.toArrayLike(Buffer), caller) co...
<<<<<<< const connection = new ChromeConnection(getChromeTargetWebSocketURL, opts.targetFilter); this._debugAdapter = opts.adapter || new ChromeDebugAdapter( connection, new LineNumberTransformer(targetLinesStartAt1), new SourceMapTransformer()...
<<<<<<< ======= import {formatConsoleMessage, formatExceptionDetails} from './consoleHelper'; >>>>>>>
<<<<<<< // As of 0.1.0, the included .d.ts is not in the right format to use the import syntax here // https://github.com/florinn/typemoq/issues/4 // const typemoq: ITypeMoqStatic = require('typemoq'); import { Mock, MockBehavior, It, IMock, Times } from 'typemoq'; ======= import { Mock, MockBehavior, It } from 'typ...
<<<<<<< import {LineNumberTransformer} from '../transformers/lineNumberTransformer'; import {PathTransformer} from '../transformers/pathTransformer'; import {SourceMapTransformer} from '../transformers/sourceMapTransformer'; import {spawn, ChildProcess} from 'child_process'; ======= >>>>>>> import {LineNumberTransf...
<<<<<<< export interface UIInitialReporters<BigNumberType> { [initialReporter: string]: InitialReportersRow<BigNumberType>; ======= export interface UIInitialReporters { [initialReporter: string]: InitialReportersRow; } export interface ForkMigrationTotalsRow extends Payout { universe: Address; repTotal: num...
<<<<<<< export function toError(input: any, options?: IErrorOptions): IError { let ten = i18next.getFixedT('en'); ======= export function toError(input: any, title?: string, options?: IErrorOptions): IError { let ten = getFixedT('en'); >>>>>>> export function toError(input: any, title?: string, options?: IErrorO...
<<<<<<< import { BlockDetail, BlocksRow, MarketsContractAddressRow, ReportingState, Address, FeeWindowState, MarketIdUniverseFeeWindow } from "../types"; ======= import { BlockDetail, BlocksRow, ErrorCallback, MarketsContractAddressRow, ReportingState, Address, FeeWindowState, TransactionHashesRow } from "../types"; ...
<<<<<<< import { updateMarketState } from "./database"; ======= import { augurEmitter } from "../../events"; >>>>>>> import { updateMarketState } from "./database"; import { augurEmitter } from "../../events"; <<<<<<< updateMarketState( db, log.market, trx, log.blockNumber, augur.constants.REPORTING_STATE.DESIGNA...
<<<<<<< table.string("tradeGroupId", 66); ======= table.boolean("orphaned").defaultTo(0); table.string("tradeGroupId", 42); >>>>>>> table.boolean("orphaned").defaultTo(0); table.string("tradeGroupId", 66);
<<<<<<< MarketCreated: makeLogListener(augur, "Augur", "MarketCreated"), TokensTransferred: makeLogListener(augur, "Augur", "TokensTransferred"), OrderCanceled: makeLogListener(augur, "Augur", "OrderCanceled"), OrderCreated: makeLogListener(augur, "Augur", "OrderCreated"), OrderFilled: mak...
<<<<<<< import * as Knex from "knex"; import { FormattedLog } from "../types"; import { logProcessors } from "./log-processors"; ======= import { Database } from "sqlite3"; import { makeLogListener } from "./make-log-listener"; import { onNewBlock } from "./on-new-block"; >>>>>>> import * as Knex from "knex"; import...
<<<<<<< export async function processTradingProceedsClaimedLog(db: Knex, augur: Augur, log: FormattedEventLog) { const tradingProceedsToInsert = formatBigNumberAsFixed({ marketId: log.market, shareToken: log.shareToken, account: log.sender, numShares: log.numShares, numPayoutTokens: log.numPayoutT...
<<<<<<< const query = db.select("marketId").from("markets").where({ marketCreator: creator }).where({ universe }); queryModifier(db, query, "volume", "desc", sortBy, isSortDescending, limit, offset, (err: Error|null, rows?: Array<MarketsContractAddressRow>): void => { ======= let query = db.select("marketId").f...
<<<<<<< address: Address; blockNumber: Int256; transactionIndex: Int256; transactionHash: Bytes32; blockHash: Bytes32; [inputName: string]: any; ======= address: Address, blockNumber: number, transactionIndex: Int256, transactionHash: Bytes32, blockHash: Bytes32, [inputName: string]: any >>>>...
<<<<<<< console.log("Waiting for first block..."); getNetworkID(db, augur, (err: Error|null, networkID: string|null) => { if (err) { augur.events.stopListeners(); return callback(err); } augur.rpc.eth.getBlockByNumber(["latest", false], (block: any): void => { db.max("b...
<<<<<<< await checkForOrphanedOrders(db, augur, orderData); await updateOutcomeValueFromOrders(db, marketId, outcome, log.transactionHash); const otherOutcomes = Array.from(Array(numOutcomes).keys()); otherOutcomes.splice(outcome, 1); const outcomes = orderTypeLabel === "buy" ? otherOutcomes : [out...
<<<<<<< .catch(err => api.showErrorNotification('Failed to deploy mods', err, { allowReport: (err.code !== 'EPERM') && (err.allowReport !== false), })) ======= .catch(err => { if ((err.code === undefined) && (err.errno !== undefined)) { // unresolved windows error code ...
<<<<<<< const marketsRow: MarketsRow<BigNumber>|undefined = await db.first("minPrice", "maxPrice", "numTicks", "numOutcomes").from("markets").where({ marketId }); if (!marketsRow) throw new Error("market min price, max price, category, and/or num ticks not found"); const minPrice = marketsRow.minPrice!; ...
<<<<<<< "staked_tokens.isInvalid", "staked_tokens.payout0", "staked_tokens.payout1", "staked_tokens.payout2", "staked_tokens.payout3", "staked_tokens.payout4", "staked_tokens.payout5", "staked_tokens.payout6", "staked_tokens.payout7", ]).from("reports").join("markets", "markets.mar...
<<<<<<< import { formatBigNumberAsFixed } from "../../../utils/format-big-number-as-fixed"; import { fixedPointToDecimal, onChainSharesToHumanReadableShares, numTicksToTickSize } from "../../../utils/convert-fixed-point-to-decimal"; import { BN_WEI_PER_ETHER } from "../../../constants"; ======= import { convertFixedP...
<<<<<<< export function startAugurListeners(db: Knex, augur: Augur): void { augur.events.startListeners({ ======= export function startAugurListeners(db: Knex, augur: Augur, callback: (err: Error|null) => void): void { augur.events.startBlockListeners({ onAdded: (block: Block): void => processBlock(db, augur,...
<<<<<<< export async function processMintLog(db: Knex, augur: Augur, log: FormattedEventLog) { const value = new BigNumber(log.amount || log.value); const token = log.token || log.address; await db.insert({ transactionHash: log.transactionHash, logIndex: log.logIndex, sender: null, recipient: log....
<<<<<<< import { getProfitLoss } from "./getters/get-profit-loss"; ======= import { getWinningBalance } from "./getters/get-winning-balance"; >>>>>>> import { getProfitLoss } from "./getters/get-profit-loss"; import { getWinningBalance } from "./getters/get-winning-balance";
<<<<<<< private _serializer: Serializer<T> = this._getSerializer(); ======= private _afterNextPatchBroadcasts: Array<[any, BroadcastOptions]> = []; // when a new user connects, it receives the '_previousState', which holds // the last binary snapshot other users already have, therefore the patches // that ...
<<<<<<< initPeriodicPageCheck(); ======= Lib.FocusVisible.init(); KeyboardShortcutListener.init(); RequestIntercepter.startInterceptingFetch(); StatusReport.initRegularStatusReport(); >>>>>>> initPeriodicPageCheck(); Lib.FocusVisible.init(); KeyboardSho...
<<<<<<< }, await presence.getSetting('lang')), browsingStamp = Math.floor(Date.now() / 1000); let strings = getStrings(), oldLang: string = null; ======= }, await presence.getSetting("lang") ), browsingStamp = Math.floor(Date.now() / 1000); let strings: Promise<LangStrings> = ge...
<<<<<<< import Promise from 'bluebird'; import NexusT, { IFeedbackResponse } from 'nexus-api'; ======= import * as Promise from 'bluebird'; import NexusT, { IFeedbackResponse } from '@nexusmods/nexus-api'; >>>>>>> import Promise from 'bluebird'; import NexusT, { IFeedbackResponse } from '@nexusmods/nexus-api';
<<<<<<< import Network, { DiscoveryRequest } from './Network' import NetworkPeer, { encodePeerId } from './NetworkPeer' import { Swarm, JoinOptions } from './SwarmInterface' import { PeerMsg } from './PeerMsg' ======= import Network, { Swarm } from './Network' import { PeerId } from './NetworkPeer' >>>>>>> import Ne...
<<<<<<< ======= export type ClockUpdate = [RepoId, DocId, Clock.Clock] >>>>>>> <<<<<<< update(repoId: RepoId, documentId: DocId, clock: Clock.Clock): ClockDescriptor { ======= update(repoId: RepoId, documentId: DocId, clock: Clock.Clock): ClockUpdate { >>>>>>> update(repoId: RepoId, documentId: DocId, clo...
<<<<<<< code += (cell.text + "\n"); ======= let cellText = this._magicsRewriter.rewrite(cell.value.text); code += (cellText + "\n"); >>>>>>> code += (cell.text + "\n"); let cellText = this._magicsRewriter.rewrite(cell.text); code += (cellText + ...
<<<<<<< doSaveActivation(api, mod.type, dataPath, stagingPath, newActivation, activator.id)); ======= doSaveActivation(api, mod.type, dataPath, newActivation, activator.id)) .catch(err => { api.showErrorNotification('Failed to deploy mod', err, { message: modId, }); ...
<<<<<<< import {setInstanceId, setWarnedAdmin} from '../actions/app'; ======= import {setApplicationVersion, setInstanceId} from '../actions/app'; >>>>>>> import {setApplicationVersion, setInstanceId, setWarnedAdmin} from '../actions/app'; <<<<<<< .then(() => this.warnAdmin()) ======= .then(() => ...
<<<<<<< public lookupChanged() { this.signaler.signal('lookup-changed'); } ======= public expandableChanged() { this.signaler.signal('expandable-changed'); } >>>>>>> public expandableChanged() { this.signaler.signal('expandable-changed'); } public lookupChanged() { this.signaler.signal...
<<<<<<< export const DATA_EXIT_CONTAINER = 'data-exit-container' export const DATA_IS_GESTURE_CONTROLLED = 'data-is-gesture-controlled' ======= export const DATA_EXIT_CONTAINER = 'data-exit-container' export const DATA_IS_APPEARING = 'data-is-appearing' >>>>>>> export const DATA_EXIT_CONTAINER = 'data-exit-container...
<<<<<<< isGestureControlled?: boolean ======= onComplete?: (flipIds: FlippedIds) => void >>>>>>> isGestureControlled?: boolean onComplete?: (flipIds: FlippedIds) => void
<<<<<<< Welcome, ServerSettings ======= RoomList, Welcome >>>>>>> Welcome, RoomList, ServerSettings
<<<<<<< import { AnnotationObject } from '../../objects/annotation-object'; ======= import {CanvasEditorDirective} from "../../directives/canvas-editor/canvas-editor"; import { DomSanitizer } from "@angular/platform-browser"; >>>>>>> import { AnnotationObject } from '../../objects/annotation-object'; import {CanvasE...
<<<<<<< import { HotkeysService, Hotkey } from 'angular2-hotkeys'; import { HotkeyObject } from '../../objects/hotkey-object'; ======= import { DomSanitizer } from "@angular/platform-browser"; import { AnnotationsProvider, Line, Box, Polygon } from "../../providers/annotations/annotations"; >>>>>>> import { HotkeysS...
<<<<<<< .get<AlertsResponse>('/notifications/alerts') .then((resp) => ======= .get('/notifications/alerts') .then((resp) => { >>>>>>> .get<AlertsResponse>('/notifications/alerts') .then((resp) => {
<<<<<<< return date.getFullYear() + '-' + date.getMonth().toString().padStart(2, '0') + '-' + date.getDay().toString().padStart(2, '0') + ' ' + date.getHours().toString().padStart(2, '0') + ':' + date.getMinutes().toString().padStart(2, '0'); }; Vue.filter('formatDateTime', formatDateTime); ======= ...
<<<<<<< InitialConfiguration = 'initial-configuration', ======= AddServiceClientAccessRight= 'add-service-client-access-right', >>>>>>> InitialConfiguration = 'initial-configuration', AddServiceClientAccessRight= 'add-service-client-access-right',
<<<<<<< addClientModule, ======= notificationsModule, >>>>>>> addClientModule, notificationsModule,
<<<<<<< ======= function createSortName(client: Client): string { // Create a sort id for client in form "ACMEGOV:1234 MANAGEMENT" if (client.member_name) { return ( client.member_name + client.member_class + client.member_code + ' ' + client.subsystem_code ); } return (...
<<<<<<< setArray( array?: ArrayBufferView ): void; setUsage( usage: Usage ): BufferAttribute; ======= setDynamic( dynamic: boolean ): BufferAttribute; >>>>>>> setUsage( usage: Usage ): BufferAttribute;
<<<<<<< register( callback: ( parser: GLTFParser ) => GLTFLoaderPlugin ): GLTFLoader; unregister( callback: ( parser: GLTFParser ) => GLTFLoaderPlugin ): GLTFLoader; ======= setKTX2Loader( ktx2Loader: KTX2Loader ): GLTFLoader; setMeshoptDecoder( meshoptDecoder: /* MeshoptDecoder */ any ): GLTFLoader; >>>>>>> ...
<<<<<<< import fsPath from 'path'; import fs from "fs"; ======= import fs from 'fs'; >>>>>>> import fsPath from 'path'; import fs from 'fs'; <<<<<<< await scp(ssh, local, remote, dotfiles, concurrency, verbose, recursive); ======= await scp(ssh, local, remote, concurrency, verbose, recursive, rmRemote); ...
<<<<<<< export enum TermsAndPrivacyUrlConstant { TERMSANDCONDITIONSURL = 'https://bitwiser.io/terms-and-conditions', PRIVACYURL = 'https://bitwiser.io/terms-and-conditions' } export enum FirebaseAnalyticsEventConstants { USER_LOGIN = 'user_login', COMPLETED_GAME = 'completed_game', START_NEW_GAME...
<<<<<<< export enum GameConstant { SINGLE = 'Single', OPPONENT = 'Opponent', RANDOM = 'Random', FRIEND = 'Friend', COMPUTER = 'Computer', NORMAL = 'Normal', OFFLINE = 'Offline' } export enum FirebaseAnalyticsKeyConstants { USER_ID = 'userId', GAME_ID = 'gameId', PLAYER_MODE = '...
<<<<<<< public userActions: UserActions, public cd: ChangeDetectorRef) { this.categoriesObs = store.select(appState.coreState).pipe(select(s => s.categories)); ======= public userActions: UserActions) { this.categoriesObs = store.select(appState.coreState).pipe(select(s => s.categories), take(1));...
<<<<<<< blogData = []; imageUrl = ''; ======= disableRematchBtn = false; PlayerMode = PlayerMode; >>>>>>> blogData = []; imageUrl = ''; disableRematchBtn = false; PlayerMode = PlayerMode;
<<<<<<< import { UserService, GameService, Utils } from '../../services'; import { switchMap, map, distinct, mergeMap, filter, take } from 'rxjs/operators'; import { empty, of, Observable } from 'rxjs'; ======= import { UserService, GameService } from '../../services'; import { switchMap, map, distinct, mergeMap, fil...
<<<<<<< ======= import admin from '../db/firebase.client'; >>>>>>> <<<<<<< private static blogFireStoreClient = admin.firestore(); ======= private static blogFireStoreClient = admin.firestore(); >>>>>>> private static blogFireStoreClient = admin.firestore(); <<<<<<< const batch = this.blog...
<<<<<<< import { isPlatformBrowser } from '@angular/common'; ======= import { User, UserStatusConstants, CollectionConstants, TriggerConstants } from 'shared-library/shared/model'; import { AngularFireDatabase } from '@angular/fire/database'; >>>>>>> import { isPlatformBrowser } from '@angular/common'; import { Use...
<<<<<<< this.subscription.push(this.store.select(appState.coreState).pipe(take(1)).subscribe(s => this.user = s.user)); ======= this.subs.push(this.store.select(appState.coreState).pipe(take(1)).subscribe(s => { this.user = s.user; this.cd.markForCheck(); })); >>>>>>> this.subscription....
<<<<<<< import { Component, OnInit, OnDestroy, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core'; ======= import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormArray, FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { MatSnackBar } from '@angular/mat...
<<<<<<< export * from './game.reducer'; export * from './bulk-upload.reducer'; ======= export * from './game.reducer'; export interface CoreState { user: User; authInitialized: boolean; categories: Category[]; tags: string[]; questionsSearchResults: SearchResults; unpublishedQuestions: Question[]; user...
<<<<<<< import { FriendInviteComponent } from './friend-invite/friend-invite.component'; import { GameInviteComponent } from './game-invite/game-invite.component'; ======= import { InviteMailFriendsComponent } from './invite-mail-friends/invite-mail-friends.component'; >>>>>>> import { FriendInviteComponent } from '...