conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
<app-navbar>
=======
<nav class="navbar navbar-fixed-top">
>>>>>>>
<app-navbar>
<<<<<<<
</app-navbar>
=======
<div class="btn-group btn-group-sm navbar-btn nav-toolbar">
<button class="btn btn-default"
[class.active]="(playerSearch$ | async).queryParams.preset === ... |
<<<<<<<
declare var IQKeyboardManager;
=======
import { AuthenticationProvider } from 'shared-library/core/auth';
>>>>>>>
declare var IQKeyboardManager;
import { AuthenticationProvider } from 'shared-library/core/auth'; |
<<<<<<<
// const userSubject = new Subject<User>();
=======
>>>>>>>
// const userSubject = new Subject<User>(); |
<<<<<<<
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... |
<<<<<<<
res.render('index', { req }, (err, html) => {
if (isProductionEnv) {
html += `\n<script async src="https://www.googletagmanager.com/gtag/js?id=UA-122807814-1"></script>
<script>
(function (i, s, o, g, r, a, m) {
i['GoogleAnalyticsObject'] = r;
i[r] = i[r] || func... |
<<<<<<<
export * from './render-box/render-box.component';
export * from './change-password/change-password.component';
export * from './animation-box/animation-box.component';
export * from './update-category-tag/update-category-tag.component'
=======
export * from './render-box/render-box.component';
export * from ... |
<<<<<<<
import { CurrentQuestion } from './current-question';
=======
import { Countries } from './counties';
>>>>>>>
import { CurrentQuestion } from './current-question';
import { Countries } from './counties';
<<<<<<<
bulkUploads: BulkUploads,
currentQuestion: CurrentQuestion
=======
bulkUploads: ... |
<<<<<<<
export function KeyToChar(key: Key): string {
=======
/**
* isNumber: Check if value is a number, including
* the number 0.
*/
export function isNumber(val) {
console.log('testing val', val);
var res = parseInt(val, 10);
return isNaN ? null : res;
}
export function KeyToChar(key: Enums.Key): ... |
<<<<<<<
import { MatDialog } from '@angular/material';
import { CheckOrSetPinDialogComponent } from 'app/dialogs/check-or-set-pin-dialog/check-or-set-pin-dialog.component';
=======
import { isoLangs } from './locales_list';
import { MatSnackBar } from '@angular/material/snack-bar';
import {DomSanitizer} from '@angula... |
<<<<<<<
MatDialogModule,
MatRippleModule,
MatMenuModule} from '@angular/material';
=======
MatDialogModule,
MatSlideToggleModule,
MatMenuModule} from '@angular/material';
>>>>>>>
MatDialogModule,
MatRippleModule,
MatSlideToggleModule,
MatMenuModule} from '@angular/material';
<<<<<<<
import { Sub... |
<<<<<<<
const mapContentToIndex = (
obj: Partial<{ data: { slug: string }; content: string }>
) => {
=======
const client = algoliasearch(
process.env.ALGOLIA_APP_ID,
process.env.ALGOLIA_ADMIN_KEY
)
fetchDocs().then(docs => {
client
.initIndex('Tina-Docs-Next')
.saveObjects(docs.map(mapContentToIndex... |
<<<<<<<
import { isUndefined } from 'util';
import { Rule } from '../../../../../domain/data-preparation/dataset';
=======
import { isNullOrUndefined, isUndefined } from 'util';
>>>>>>>
import { isNullOrUndefined, isUndefined } from 'util';
import { Rule } from '../../../../../domain/data-preparation/dataset';
<<<<... |
<<<<<<<
import { EditRuleFlattenComponent } from './dataflow/dataflow-detail/component/edit-dataflow-rule/edit-rule/edit-rule-flatten.component';
import { EditRuleSetformatComponent } from './dataflow/dataflow-detail/component/edit-dataflow-rule/edit-rule/edit-rule-setformat.component';
import { EditRuleUnnestComponent... |
<<<<<<<
=======
import {normalize, join} from 'path';
import * as chalk from 'chalk';
>>>>>>>
import {normalize, join} from 'path';
import * as chalk from 'chalk';
<<<<<<<
export const SERVER_DEST = `dist/server`;
export const ASSETS_DEST = `${APP_DEST}/assets`;
export const BUNDLES_DEST ... |
<<<<<<<
import {ROUTER_PROVIDERS, APP_BASE_HREF, LocationStrategy, HashLocationStrategy} from 'angular2/router';
import {HTTP_PROVIDERS} from 'angular2/http';
import {Authentication} from './services/Authentication';
=======
import {ROUTER_PROVIDERS, LocationStrategy, HashLocationStrategy} from 'angular2/router';
>>... |
<<<<<<<
await search.search(page, req.query.sort);
var maillist = "";
search.members.forEach(function(element) {
if (maillist != "" && element.link != undefined) {
maillist = maillist + ", "
}
maillist += element.link && element.link.corporateUsername || ""
});
=======
await search.sear... |
<<<<<<<
const extractRecipient = (recipient: any): Address | NamespaceId => {
if (typeof recipient === 'string') {
// If bit 0 of byte 0 is not set (like in 0x90), then it is a regular address.
// Else (e.g. 0x91) it represents a namespace id which starts at byte 1.
const bit0 = convert.hexT... |
<<<<<<<
import vauth = require("./vorlon.authentication");
=======
import httpConfig = require("../config/vorlon.httpconfig");
>>>>>>>
import vauth = require("./vorlon.authentication");
import httpConfig = require("../config/vorlon.httpconfig"); |
<<<<<<<
this._cssFeaturesListTable = <HTMLTableElement>document.getElementById("cssFeaturesList");
this._htmlFeaturesListTable = <HTMLTableElement>document.getElementById("htmlFeaturesList");
this._miscFeaturesListTable = <HTMLTableElement>document.getElementById("miscFea... |
<<<<<<<
parsed.files.push('typings.d.ts');
parsed.files.push('main.web.ts');
=======
parsed.files.push('main.ts');
>>>>>>>
parsed.files.push('main.web.ts'); |
<<<<<<<
'typings/main.d.ts',
join(APP_SRC, '**/*.ts'),
'!' + join(APP_SRC, '**/*.e2e.ts'),
'!' + join(APP_SRC, 'main.ts')
];
=======
join(APP_SRC, '**/*.ts'),
'!' + join(APP_SRC, `${BOOTSTRAP_MODULE}.ts`)
];
>>>>>>>
'typings/main.d.ts',
... |
<<<<<<<
=======
import { enableProdMode } from '@angular/core';
// The browser platform with a compiler
>>>>>>>
import { enableProdMode } from '@angular/core';
// The browser platform with a compiler |
<<<<<<<
positionSuggestionContainer = (scNode: any): void => {
const cmEditor = (this.app.workspace.activeLeaf.view as any).sourceMode.cmEditor as Editor;
// find the open bracket to the left of or at the cursor
const cursorPosition = cmEditor.getCursor();
var currentToken = cmEditor.getTokenAt(cmEd... |
<<<<<<<
private suggestionContainerObserver: MutationObserver;
=======
// helper gets for any casts (for undocumented API stuff)
private get rootSplitAny(): any { return this.app.workspace.rootSplit; }
>>>>>>>
private suggestionContainerObserver: MutationObserver;
// helper gets for any casts (for undocu... |
<<<<<<<
currentFWVersion: undefined,
=======
currentBetaOSVersion: undefined,
axis_inversion: {
x: !!Session.getBool(BooleanSetting.x_axis_inverted),
y: !!Session.getBool(BooleanSetting.y_axis_inverted),
z: !!Session.getBool(BooleanSetting.z_axis_inverted),
},
encoder_visibility: {
raw_encod... |
<<<<<<<
import { SearchAddon, ISearchOptions } from './xtermSearchAddon'
import 'xterm/lib/xterm.css'
=======
>>>>>>>
import { SearchAddon, ISearchOptions } from './xtermSearchAddon'
<<<<<<<
private search = new SearchAddon()
=======
private fitAddon = new FitAddon()
private opened = false
>>>>>>>
... |
<<<<<<<
import { CodeGenerator } from '../../core/code-generator';
=======
import { logger } from '../../core';
import { CodeGenerator } from '../../core/code-generator';
>>>>>>>
import { logger } from '../../core';
import { CodeGenerator } from '../../core/code-generator';
<<<<<<<
try {
await new CodeGen... |
<<<<<<<
import componentsReducer from './components'
=======
import mutationsReducer from './mutations'
>>>>>>>
import componentsReducer from './components'
import mutationsReducer from './mutations'
<<<<<<<
components: componentsReducer,
=======
mutations: mutationsReducer,
>>>>>>>
components: componentsR... |
<<<<<<<
import { isString } from '@nestjs/common/utils/shared.utils';
=======
import { transformSchema } from 'apollo-graphql';
>>>>>>>
import { transformSchema } from 'apollo-graphql';
import { isString } from '@nestjs/common/utils/shared.utils';
<<<<<<<
import {
GraphQLAbstractType,
GraphQLResolveInfo,
Grap... |
<<<<<<<
let downloadsInitiated = 0;
=======
let extension = ZosFilesUtils.DEFAULT_FILE_EXTENSION;
if (options.extension != null) {
extension = options.extension;
}
>>>>>>>
let downloadsInitiated = 0;
let extension = ZosFilesUt... |
<<<<<<<
import { SignupComponent } from './signup/signup.component';
=======
import { BreadcrumbComponent } from './breadcrumb/breadcrumb.component';
>>>>>>>
import { SignupComponent } from './signup/signup.component';
import { BreadcrumbComponent } from './breadcrumb/breadcrumb.component';
<<<<<<<
UserManageme... |
<<<<<<<
!options.enumName && delete options.enumName;
return createPropertyDecorator(DECORATORS.API_MODEL_PROPERTIES, options);
}
export function ApiPropertyOptional(
options: ApiPropertyOptions = {}
): PropertyDecorator {
return ApiProperty({
...options,
required: false
});
}
export function ApiRe... |
<<<<<<<
export const Kbd = {
baseStyle,
}
=======
const kbd = {
baseStyle,
}
export default kbd
>>>>>>>
export default {
baseStyle,
} |
<<<<<<<
export const SkipLink = {
baseStyle,
}
=======
const skipLink = {
baseStyle,
}
export default skipLink
>>>>>>>
export default {
baseStyle,
} |
<<<<<<<
export const Popover = {
parts,
baseStyle,
}
=======
const popover = {
parts,
baseStyle,
}
export default popover
>>>>>>>
export default {
parts,
baseStyle,
} |
<<<<<<<
export const Menu = {
parts,
baseStyle,
}
=======
const menu = {
parts,
baseStyle,
}
export default menu
>>>>>>>
export default {
parts,
baseStyle,
} |
<<<<<<<
import { Input } from "./input"
=======
import input from "./input"
type Dict = Record<string, any>
>>>>>>>
import Input from "./input"
type Dict = Record<string, any>
<<<<<<<
...Input.baseStyle?.field,
=======
...input.baseStyle.field,
>>>>>>>
...Input.baseStyle.field, |
<<<<<<<
export const Skeleton = {
baseStyle,
}
=======
const skeleton = {
baseStyle,
}
export default skeleton
>>>>>>>
export default {
baseStyle,
} |
<<<<<<<
import { generateStripe, getColor, mode } from "@chakra-ui/theme-tools"
=======
import { generateStripe, getColor, mode } from "@chakra-ui/theme-tools"
type Dict = Record<string, any>
>>>>>>>
import { generateStripe, getColor, mode } from "@chakra-ui/theme-tools"
type Dict = Record<string, any>
<<<<<<<
}
e... |
<<<<<<<
import * as fs from 'fs';
import { cwd } from 'process';
// Only for types; take care never to use ts_types in expressions, only in type annotations
import * as ts_types from 'typescript';
import { logOnce } from './logger';
import { CodeSourceMapPair, TsJestConfig } from './jest-types';
import { getTypescriptC... |
<<<<<<<
xhr = new window.XMLHttpRequest();
=======
params.onerror(0);
>>>>>>>
xhr = new window.XMLHttpRequest();
<<<<<<<
params.onerror("No XMLHTTPRequest object could be created");
}
return null;
}
====... |
<<<<<<<
// Create each of the native engine API devices to be used
var mathDeviceParameters = {};
var mathDevice = TurbulenzEngine.createMathDevice(mathDeviceParameters);
if (!TurbulenzEngine.canvas)
{
var graphicsDeviceParameters = { };
var graphicsDevice = TurbulenzEngine.createGr... |
<<<<<<<
xhr = new window.XMLHttpRequest();
=======
params.onerror(0);
>>>>>>>
xhr = new window.XMLHttpRequest();
<<<<<<<
params.onerror("No XMLHTTPRequest object could be created");
}
return null;
}
====... |
<<<<<<<
it("should be able to create a sequential data set (PS) with responseTimeout", async () => {
dsOptions.dsntype = "PDS";
dsOptions.responseTimeout = 5;
const response = await Create.dataSet(dummySession, CreateDataSetTypeEnum.DATA_SET_SEQUENTIAL, dataSetName, dsOptio... |
<<<<<<<
=======
};
// Constructor function
TZWebGLTexture.create = function webGLTextureCreateFn(gd, params)
{
var tex = new TZWebGLTexture();
tex.gd = gd;
tex.mipmaps = params.mipmaps;
tex.dynamic = params.dynamic;
tex.renderable = params.renderable;
tex.numDataLevels = 0;
tex.id = ++gd.... |
<<<<<<<
interface Physics2DCallbackFn
{
(thisShape: Physics2DShape, otherShape: Physics2DShape): void;
}
=======
// BREAK, WAKE, SLEEP callbacks on Constraints/RigidBody
interface Physics2DObjectCallbackFn {
(): void;
}
// BEGIN, END, etc between two Shapes
interface Physics2DShapeCallbackFn {
(arbiter: P... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
self.config = {...self.config || {}, ...fs.readJsonSync(configFilePath)};// _.extend(self.config || {}, );
=======
self.config = {...self.config || {}, ... fs.readJsonSync(configFilePath)};
>>>>>>>
self.config = {...self.config || {}, ... fs.readJsonSync(configF... |
<<<<<<<
},
/**
* Message indicating that the data set has been renamed successfully.
* @type {IMessageDefinition}
*/
dataSetRenamedSuccessfully: {
message: "Data set renamed successfully."
}
=======
},
/**
* Message indicating that the data set was recalled succes... |
<<<<<<<
import EspritGauge from './Esprit'
=======
import FeatherGauge from './FeatherGauge'
import OGCDDowntime from './OCDDowntime'
>>>>>>>
import EspritGauge from './Esprit'
import FeatherGauge from './FeatherGauge'
import OGCDDowntime from './OCDDowntime'
<<<<<<<
EspritGauge,
=======
FeatherGauge,
OGCDDown... |
<<<<<<<
import FeatherGauge from './FeatherGauge'
=======
import OGCDDowntime from './OCDDowntime'
>>>>>>>
import FeatherGauge from './FeatherGauge'
import OGCDDowntime from './OCDDowntime'
<<<<<<<
FeatherGauge,
=======
OGCDDowntime,
>>>>>>>
FeatherGauge,
OGCDDowntime, |
<<<<<<<
import { TestProperties } from "../../../../../../../__tests__/__src__/properties/TestProperties";
import { ITestSystemSchema } from "../../../../../../../__tests__/__src__/properties/ITestSystemSchema";
import { Get, ZosFilesConstants } from "../../../../../index";
=======
import { ITestPropertiesSchema } fr... |
<<<<<<<
'ngDropdowns', 'ngLodash', 'angularCharts', 'ngClipboard', 'uuid4', 'angularFileUpload', 'ui.gravatar']);
=======
'ngDropdowns', 'ngLodash', 'angularCharts', 'uuid4', 'angularFileUpload']);
>>>>>>>
'ngDropdowns', 'ngLodash', 'angularCharts', 'uuid4', 'angularFileUpload', 'ui.gravatar']);
<<<<<<<
initM... |
<<<<<<<
const textContainer = options.selection.append("g").classed("text-container", true);
if (this._addTitleElement) {
textContainer.append("title").text(text);
}
const normalizedText = StringMethods.combineWhitespace(text);
const textArea = textContainer.append("g").classed("text-area", ... |
<<<<<<<
import { checkersGameDef } from './checkers';
=======
import { reversiGameDef } from './reversi';
import { cornerusGameDef } from './cornerus';
>>>>>>>
import { checkersGameDef } from './checkers';
import { reversiGameDef } from './reversi';
import { cornerusGameDef } from './cornerus';
<<<<<<<
checkers: ... |
<<<<<<<
mancala: mancalaGameDef,
=======
zooparade: zooParadeGameDef,
>>>>>>>
mancala: mancalaGameDef,
zooparade: zooParadeGameDef,
<<<<<<<
GAMES_MAP.mancala,
=======
GAMES_MAP.zooparade,
>>>>>>>
GAMES_MAP.mancala,
GAMES_MAP.zooparade, |
<<<<<<<
import { rotaGameDef } from './rota';
=======
import { secretcodesGameDef } from './secretcodes';
import { hangmanGameDef } from './hangman';
>>>>>>>
import { rotaGameDef } from './rota';
import { secretcodesGameDef } from './secretcodes';
import { hangmanGameDef } from './hangman';
<<<<<<<
rota: rotaGame... |
<<<<<<<
import { Ctx } from 'boardgame.io';
=======
import { ActivePlayers, IGameArgs, IGameCtx } from 'boardgame.io/core';
>>>>>>>
import { ActivePlayers, IGameArgs, IGameCtx } from 'boardgame.io/core';
import { Ctx } from 'boardgame.io';
<<<<<<<
const onBegin = {
phases: {
[Phases.lobby]: (G: IG, ctx: Ctx) ... |
<<<<<<<
import { HMigrateDefinition } from "./hMigrate/HMigrate.definintion";
=======
import { CopyDefinition } from "./copy/Copy.definition";
>>>>>>>
import { HMigrateDefinition } from "./hMigrate/HMigrate.definintion";
import { CopyDefinition } from "./copy/Copy.definition"; |
<<<<<<<
import {DtInputModule} from '@dynatrace/angular-components/input';
=======
import { ChartUI } from './chart/chart-ui';
>>>>>>>
import {DtInputModule} from '@dynatrace/angular-components/input';
import { ChartUI } from './chart/chart-ui'; |
<<<<<<<
import {ButtonGroupUi} from "../button-group/button-group-ui";
=======
import { ExpandableSectionUi } from '../expandable-section/expandable-section-ui';
import {ExpandablePanelUi} from '../expandable-panel/expandable-panel-ui';
>>>>>>>
import {ButtonGroupUi} from "../button-group/button-group-ui";
import { ... |
<<<<<<<
DtIconModule,
=======
// DtIconModule,
DtRadioModule,
>>>>>>>
DtIconModule,
DtRadioModule,
<<<<<<<
DtIconModule.forRoot({svgIconLocation: '/lib/assets/icons/{{name}}.svg'}),
=======
DtRadioModule,
// TODO @thomaspink: Add again if universal supports XHR.
// Issue: ***REMOVED***/*... |
<<<<<<<
import { DocsAlertModule } from './components/alert/docs-alert.module';
=======
import { DocsIconModule } from './components/icon/docs-icon.module';
>>>>>>>
import { DocsAlertModule } from './components/alert/docs-alert.module';
import { DocsIconModule } from './components/icon/docs-icon.module'; |
<<<<<<<
export * from './progress-circle/index';
export * from './switch/index';
=======
export * from './progress-circle/index';
export * from './breadcrumbs/index';
>>>>>>>
export * from './progress-circle/index';
export * from './switch/index';
export * from './breadcrumbs/index'; |
<<<<<<<
import { ZosFilesAttributes, TransferMode } from "../../utils/ZosFilesAttributes";
import { Utilities, Tag } from "../utilities";
=======
import { Readable } from "stream";
>>>>>>>
import { ZosFilesAttributes, TransferMode } from "../../utils/ZosFilesAttributes";
import { Utilities, Tag } from "../utilities"... |
<<<<<<<
{name: 'Expandable panel', route: '/expandable-panel'},
{name: 'Expandable section', route: '/expandable-section'},
=======
{name: 'Input', route: '/input'},
>>>>>>>
{name: 'Expandable panel', route: '/expandable-panel'},
{name: 'Expandable section', route: '/expandable-section'},
{na... |
<<<<<<<
import { DocsKeyValueListModule } from './components/key-value-list/docs-key-value-list.module';
=======
import { FormsModule } from '@angular/forms';
import {DtThemingModule} from '@dynatrace/angular-components';
>>>>>>>
import { DocsKeyValueListModule } from './components/key-value-list/docs-key-value-list... |
<<<<<<<
import { ProgressBarUI } from './progress-bar/progress-bar-ui';
=======
import { ChartUI } from './chart/chart-ui';
>>>>>>>
import { ChartUI } from './chart/chart-ui';
import { ProgressBarUI } from './progress-bar/progress-bar-ui';
<<<<<<<
DtProgressBarModule,
=======
DtChartModule,
>>>>>>>
D... |
<<<<<<<
import { DocsShowMoreModule } from './components/show-more/docs-show-more.module';
=======
import { FormsModule } from '@angular/forms';
import {DtThemingModule} from '@dynatrace/angular-components';
>>>>>>>
import { DocsShowMoreModule } from './components/show-more/docs-show-more.module';
import { FormsModu... |
<<<<<<<
DtIconModule,
DtShowMoreModule,
=======
>>>>>>>
DtShowMoreModule, |
<<<<<<<
DtIconModule,
=======
DtRadioModule,
>>>>>>>
DtIconModule,
DtRadioModule,
<<<<<<<
import { HttpClientModule } from '@angular/common/http';
=======
import { RadioUI } from './radio/radio.ui';
>>>>>>>
import { RadioUI } from './radio/radio.ui';
import { HttpClientModule } from '@angular/common/http... |
<<<<<<<
{name: 'Alert', route: '/alert-component'},
{name: 'Breadcrumbs', route: '/breadcrumbs'},
{name: 'Button', route: '/button'},
{name: 'Button Group', route: '/button-group'},
{name: 'Card', route: '/card'},
{name: 'Chart', route: '/chart'},
{name: 'Checkbox', route: '/checkbox'},
... |
<<<<<<<
{name: 'Alert', route: '/alert-component'},
{name: 'Breadcrumbs', route: '/breadcrumbs'},
{name: 'Button', route: '/button'},
{name: 'Button Group', route: '/button-group'},
{name: 'Card', route: '/card'},
{name: 'Chart', route: '/chart'},
{name: 'Checkbox', route: '/checkbox'},
... |
<<<<<<<
{name: 'ButtonGroup', route: '/button-group'},
=======
{name: 'Expandable panel', route: '/expandable-panel'},
{name: 'Expandable section', route: '/expandable-section'},
>>>>>>>
{name: 'ButtonGroup', route: '/button-group'},
{name: 'Expandable panel', route: '/expandable-panel'},
{na... |
<<<<<<<
import { DocsKeyValueListComponent } from './components/key-value-list/docs-key-value-list.component';
=======
import { DocsPaginationComponent } from './components/pagination/docs-pagination.component';
import { DocsRadioComponent } from './components/radio/docs-radio.component';
import { DocsShowMoreCompone... |
<<<<<<<
import * as languageclient from 'vscode-languageclient';
=======
import { createTelemetryReporter, callWithTelemetryAndErrorHandling, IActionContext, AzureUserInput, registerUIExtensionVariables } from 'vscode-azureextensionui';
import * as languageclient from 'vscode-languageclient/node';
>>>>>>>
import * a... |
<<<<<<<
export { Header } from './header'
export { CardWrapper } from './cardWrapper'
=======
export { JolocomButton } from './jolocomButton'
>>>>>>>
export { CardWrapper } from './cardWrapper'
export { JolocomButton } from './jolocomButton' |
<<<<<<<
import { BackendMiddleware } from 'src/backendMiddleware'
=======
import { NavigationActions } from 'react-navigation'
import { KeyChain } from 'src/lib/keychain'
// TODO MOVE
type Dispatch = (action: AnyAction) => void;
>>>>>>>
import { BackendMiddleware } from 'src/backendMiddleware'
import { NavigationAc... |
<<<<<<<
} from '../../lib/util'
=======
} from 'src/lib/util'
import { cancelReceiving } from '../sso'
>>>>>>>
} from 'src/lib/util' |
<<<<<<<
import { loading } from 'src/reducers/account/loading'
import { appState } from 'src/reducers/account/appState'
=======
>>>>>>>
import { loading } from 'src/reducers/account/loading'
import { appState } from 'src/reducers/account/appState'
<<<<<<<
export interface AppState {
isLocalAuthSet: boolean
is... |
<<<<<<<
},
/**
* Message indicating that the data set was recalled successfully.
* @type {IMessageDefinition}
*/
datasetRecalledSuccessfully: {
message: "Data set recalled successfully.",
},
};
=======
},
/**
* Message indicating that the data set has been renamed... |
<<<<<<<
import { Entropy, RegistrationProgress } from 'src/ui/registration/'
import { JolocomTheme } from 'src/styles/jolocom-theme'
import { Exception } from 'src/ui/generic/'
=======
import { SeedPhrase, RegistrationProgress, Entropy } from 'src/ui/registration/'
import { Exception /*BottomNavBar*/ } from 'src/ui/g... |
<<<<<<<
import { NotificationScheduler } from './ui/notifications/containers/devNotificationScheduler'
import { NotificationFilter } from './lib/notifications'
=======
import { BottomBar } from './ui/navigation/container/bottomBar'
>>>>>>>
import { BottomBar } from './ui/navigation/container/bottomBar'
import { Not... |
<<<<<<<
import { PaymentRequest } from 'jolocom-lib/js/interactionTokens/paymentRequest'
import {
InteractionTransportType,
EstablishChannelType,
EstablishChannelRequest,
} from '@jolocom/sdk/js/src/lib/interactionManager/types'
=======
import {
InteractionTransportType,
EstablishChannelType,
EstablishCha... |
<<<<<<<
import { AuthenticationFlowState } from './types'
=======
import { isAuthenticationRequest } from './guards'
>>>>>>>
import { AuthenticationFlowState } from './types'
import { isAuthenticationRequest } from './guards' |
<<<<<<<
import { ThunkAction } from '../../store'
import { entropyToMnemonic } from 'bip39'
=======
import { accountActions } from '..'
const humanTimeout = () => new Promise(resolve => setTimeout(resolve, 1000))
>>>>>>>
import { ThunkAction } from '../../store'
import { entropyToMnemonic } from 'bip39'
const huma... |
<<<<<<<
import {routeList} from '../routeList'
export enum ErrorCode {
Unknown = 'Unknown',
// actions/account/index
WalletInitFailed = 'WalletInit',
SaveClaimFailed = 'SaveClaim',
SaveExternalCredentialFailed = 'SaveExtCred',
// actions/sso/authenticationRequest
AuthenticationRequestFailed = 'AuthRequ... |
<<<<<<<
const deviceAuth = {
ENTER_YOUR_PIN: 'Enter your PIN',
FORGOT_YOUR_PIN: 'Forgot your PIN?',
I_WILL_USE_PIN_INSTEAD: 'Use PIN instead',
SKIP: 'Skip',
YOUR_PIN_WAS_SET_UP: 'Your PIN was set up',
SETTINGS: 'Settings',
CANCEL: 'Cancel',
RESET: 'Reset',
CHANGE_PIN: 'Change PIN',
CURRENT_PASSCODE:... |
<<<<<<<
import { Platform, Image } from 'react-native'
import { createElement } from 'react'
import {
createStackNavigator,
createBottomTabNavigator,
NavigationScreenOptions,
NavigationRoute,
NavigationScreenProp
} from 'react-navigation'
import { Claims, Interactions, Records, ClaimDetails } from 'src/ui/ho... |
<<<<<<<
import { Flow } from './flow'
import { Interaction } from './interaction'
import { CredentialOfferFlowState } from './types'
=======
import { isCredentialOfferRequest, isCredentialOfferResponse, isCredentialReceive } from './guards'
type ValidationErrorMap = {
invalidIssuer?: boolean
invalidSubject?: boo... |
<<<<<<<
export const compileAndTransform = (dir: string, file: string): {} => {
=======
type TransformOptions = {
prepack: boolean;
};
const compileAndTransform = (
dir: string,
file: string,
options?: TransformOptions
): {} => {
>>>>>>>
type TransformOptions = {
prepack: boolean;
};
const compileAndTran... |
<<<<<<<
}
=======
CacheEntity,
} from '.'
export { SettingEntity } from './settingEntity'
export { CredentialEntity } from './credentialEntity'
export { MasterKeyEntity } from './masterKeyEntity'
export { PersonaEntity } from './personaEntity'
export { SignatureEntity } from './signatureEntity'
export { Verifiable... |
<<<<<<<
// import { routeList } from 'src/routeList'
// import { DecoratedClaims, CategorizedClaims } from 'src/reducers/account'
// import { categoryForType } from 'src/actions/account/categories'
// import { claimsMetadata } from 'jolocom-lib'
// import { SignedCredential } from 'jolocom-lib/js/credentials/signedCred... |
<<<<<<<
workspace.findFiles('**/.crane/tree', '').then(projectFile => {
if (projectFile.length > 0) {
console.log('Project File Found Loading File...');
this.langClient.sendRequest({ method: "buildFromProject" });
} else {
this.processFiles... |
<<<<<<<
context.subscriptions.push(duplicateLineCommand);
context.subscriptions.push(downloadPHPLibraries);
=======
>>>>>>>
context.subscriptions.push(downloadPHPLibraries); |
<<<<<<<
import { Namespaces } from "./util/Namespaces";
=======
import { Namespaces } from "./util/namespaces";
import { Debug } from "./util/Debug";
>>>>>>>
import { Namespaces } from "./util/Namespaces";
import { Debug } from "./util/Debug"; |
<<<<<<<
import { TreeBuilder, FileNode, FileSymbolCache, SymbolType, AccessModifierNode, ClassNode } from "./hvy/treeBuilder";
=======
import { TreeBuilder, FileNode, ClassNode } from "./hvy/treeBuilder";
import { Debug } from './util/Debug';
>>>>>>>
import { TreeBuilder, FileNode, FileSymbolCache, SymbolType, Acces... |
<<<<<<<
=======
"use strict";
var underscore = require('../vendor/_.js');
>>>>>>>
<<<<<<<
var found = <attributes.Signature> this.get_attribute("Signature");
var sig = (found != null) ? found.sig : null;
=======
var found = underscore.find(this.attrs, (a:attributes.Attribute) => a.name === "Signature... |
<<<<<<<
export * from "./utils/append-custom-params";
export * from "./utils/ArcGISRequestError";
export * from "./utils/ArcGISAuthError";
export * from "./utils/check-for-errors";
export * from "./utils/clean-url";
=======
>>>>>>>
export * from "./utils/append-custom-params";
export * from "./utils/ArcGISRequestEr... |
<<<<<<<
default as StandaloneSearchBox
} from "./components/places/StandaloneSearchBox"
export { default as Autocomplete } from "./components/places/Autocomplete"
export { useGoogleMap } from './map-context'
=======
default as StandaloneSearchBox,
StandaloneSearchBoxProps
} from "./components/places/Standalone... |
<<<<<<<
import { Builder, By, WebDriver, Origin, Capabilities, WebElement } from 'selenium-webdriver';
import { Config, BrowserConfig, StoryInput, CreeveyStoryParams, noop, isDefined } from '../../types';
=======
import { Builder, By, WebDriver, Origin, Capabilities } from 'selenium-webdriver';
import { Config, Brows... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.