conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
RenderVditorDOM(text: string): string[];
VditorDOMMarkdown(html: string): string[];
// SpinVditorDOM(html: string): string[];
=======
RenderEChartsJSON(text: string):string[];
>>>>>>>
RenderEChartsJSON(text: string):string[];
RenderVditorDOM(text: string): string[];
VditorD... |
<<<<<<<
import {
Mark,
MarkConfigMixins,
PRIMITIVE_MARKS,
VL_ONLY_MARK_CONFIG_PROPERTIES,
VL_ONLY_MARK_SPECIFIC_CONFIG_PROPERTY_INDEX,
} from './mark';
=======
>>>>>>> |
<<<<<<<
import {MarkConfig, markConfig} from './config.marks.schema';
=======
import {MarksConfig, marksConfig} from './config.marks.schema';
import {SceneConfig, sceneConfig} from './config.scene.schema';
>>>>>>>
import {MarkConfig, markConfig} from './config.marks.schema';
import {SceneConfig, sceneConfig} from '.... |
<<<<<<<
type: function(timeUnit, name) {
if (name === Enctype.COLOR) {
=======
export function type(timeUnit, name) {
if (name === COLOR) {
>>>>>>>
export function type(timeUnit, name) {
if (name === Enctype.COLOR) { |
<<<<<<<
// PROPERTIES
export var properties = {
axis: function(encoding, name, spec) {
if (name === Enctype.ROW || name === Enctype.COL) {
=======
namespace properties {
export function axis(encoding, name, spec) {
if (name === ROW || name === COL) {
>>>>>>>
namespace properties {
export function axis... |
<<<<<<<
import {SelectionParameter} from '../selection';
import {
BaseSpec,
DataMixins,
DeprecatedFrameMixins,
FrameMixins,
GenericCompositionLayout,
ResolveMixins
} from './base';
=======
import {SelectionDef} from '../selection';
import {Field} from './../channeldef';
import {BaseSpec, DataMixins, Frame... |
<<<<<<<
import {ImputeNode} from './impute';
import {IdentifierNode} from './indentifier';
=======
import {IdentifierNode} from './identifier';
>>>>>>>
import {IdentifierNode} from './identifier';
import {ImputeNode} from './impute'; |
<<<<<<<
/* tslint:disable:no-unused-variable */
// These imports exist so the TS compiler can name publicly exported members in
// The automatically created .d.ts correctly
import {Formula} from '../transform';
import {OneOfFilter, EqualFilter, RangeFilter} from '../filter';
/* tslint:enable:no-unused-variable */
impo... |
<<<<<<<
v4 = {
=======
v11 = {
>>>>>>>
v4 = {
<<<<<<<
v5 = {
=======
v12 = {
>>>>>>>
v5 = {
<<<<<<<
v6 = {
=======
v13 = {
>>>>>>>
v6 = {
<<<<<<<
v7 = {
=======
v14 = {
>>>>>>>
v7 = {
<<<<<<<
v8 = {
"kind": "ScalarField",
"alias": null,
"name": "id",
"args": null,
"storageKey": null
},
v9 = {
... |
<<<<<<<
const isActive = await this.activeWorkflowRunner.isActive(id);
if (isActive) {
=======
await this.externalHooks.run('workflow.update', [newWorkflowData]);
if (this.activeWorkflowRunner.isActive(id)) {
>>>>>>>
await this.externalHooks.run('workflow.update', [newWorkflowData]);
co... |
<<<<<<<
v12 = [
=======
v15 = [
>>>>>>>
v13 = [
<<<<<<<
{
"kind": "ScalarField",
"alias": null,
"name": "is_closed",
"args": null,
"storageKey": null
},
=======
(v11/*: any*/),
>>>>>>>
... |
<<<<<<<
"name": "description",
=======
"name": "name",
>>>>>>>
"name": "name",
<<<<<<<
"name": "city",
=======
"name": "description",
>>>>>>>
"name": "description",
<<<<<<<
"name": "id",
=======
"name": "city",
>>>>>>>
"name": "city",
<<<<<<<
"name": "end_at",
=======
"name": "exhibi... |
<<<<<<<
v27 = [
{
"kind": "ScalarField",
"alias": null,
"name": "cents",
"args": null,
"storageKey": null
},
(v24/*: any*/)
],
v28 = {
=======
v26 = {
"kind": "ScalarField",
"alias": null,
"name": "cents",
"args": null,
"storageKey": null
},
v27 = {
>>>>>>>
v27 = {
"kind": "Scal... |
<<<<<<<
// Load the credentials overwrites if any exist
const credentialsOverwrites = CredentialsOverwrites();
await credentialsOverwrites.init();
=======
// Load all external hooks
const externalHooks = ExternalHooks();
await externalHooks.init();
>>>>>>>
// Load the credentials overwrites if any ex... |
<<<<<<<
"name": "description",
=======
"name": "name",
>>>>>>>
"name": "name",
<<<<<<<
"name": "city",
=======
"name": "description",
>>>>>>>
"name": "description",
<<<<<<<
"name": "id",
=======
"name": "city",
>>>>>>>
"name": "city",
<<<<<<<
"name": "end_at",
=======
"name": "exhibi... |
<<<<<<<
...ArtworkHistory_artwork
=======
...ArtworkHeader_artwork
>>>>>>>
...ArtworkHeader_artwork
...ArtworkHistory_artwork
<<<<<<<
fragment ArtworkHistory_artwork on Artwork {
provenance
exhibition_history
literature
}
=======
fragment ArtworkHeader_artwork on Artwork {
...ArtworkActions_artwo... |
<<<<<<<
import { CommercialInformation_artwork$ref } from "./CommercialInformation_artwork.graphql";
=======
import { ArtworkHistory_artwork$ref } from "./ArtworkHistory_artwork.graphql";
>>>>>>>
import { ArtworkHistory_artwork$ref } from "./ArtworkHistory_artwork.graphql";
import { CommercialInformation_artwork$ref... |
<<<<<<<
import { Location_show$ref } from "./Location_show.graphql";
=======
import { ShowHeader_show$ref } from "./ShowHeader_show.graphql";
>>>>>>>
import { Location_show$ref } from "./Location_show.graphql";
import { ShowHeader_show$ref } from "./ShowHeader_show.graphql";
<<<<<<<
readonly name: string | null... |
<<<<<<<
"name": "_id",
=======
"name": "__id",
>>>>>>>
"name": "name",
<<<<<<<
"name": "name",
"args": null,
"storageKey": null
},
v3 = {
"kind": "ScalarField",
"alias": null,
"name": "__id",
=======
"name": "id",
>>>>>>>
"name": "__id",
"args": null,
"storageKey": null
},
v3 = {
"kin... |
<<<<<<<
import {
OptionsWithUri,
} from 'request';
import {
IBinaryKeyData,
IDataObject,
INodeExecutionData,
} from 'n8n-workflow';
=======
import { OptionsWithUri } from 'request';
import { IDataObject, IPollFunctions } from 'n8n-workflow';
>>>>>>>
import {
OptionsWithUri,
} from 'request';
import {
IBinary... |
<<<<<<<
artworksConnection(aggregations: [MERCHANDISABLE_ARTISTS], size: 9, sort: "-decayed_merch") {
merchandisableArtists {
=======
artworksConnection(aggregations: [MERCHANDISABLE_ARTISTS], size: 0, sort: "-decayed_merch") {
merchandisableArtists(size: 9) {
slug
>>>>>>>
artworksConnection(aggr... |
<<<<<<<
v9 = {
"kind": "ScalarField",
"alias": null,
"name": "_id",
"args": null,
"storageKey": null
},
=======
>>>>>>>
<<<<<<<
"id": "58163ca76698b92ff2cfe8e81bc9554b",
=======
"id": "19bdd4e36db0b9fbe147040f057687a1",
>>>>>>>
"id": "9c18685021bdbffd5bbfd149e94c348a",
<<<<<<<
... |
<<<<<<<
readonly slug: string | null;
=======
readonly sponsoredContent: ({
readonly introText: string | null;
readonly artGuideUrl: string | null;
}) | null;
>>>>>>>
readonly slug: string | null;
readonly sponsoredContent: ({
readonly intro... |
<<<<<<<
readonly screenWidth: number;
=======
readonly excludeArtworkIds?: ReadonlyArray<string> | null;
>>>>>>>
readonly excludeArtworkIds?: ReadonlyArray<string> | null;
readonly screenWidth: number;
<<<<<<<
$screenWidth: Int!
=======
$excludeArtworkIds: [String!]
>>>>>>>
$excludeArtworkI... |
<<<<<<<
v10 = {
"kind": "ScalarField",
"alias": null,
"name": "_id",
"args": null,
"storageKey": null
},
=======
>>>>>>>
<<<<<<<
"id": "5e83cc35ca7a008f6ee6531f3cbd3184",
=======
"id": "92e059b0a296a9a21b0bb6bb190fcc87",
>>>>>>>
"id": "9653e7abd47a758b329453caa2239a12",
<<<<<<<
... |
<<<<<<<
v11 = {
=======
v11 = [
v4
],
v12 = {
"kind": "InlineFragment",
"type": "ExternalPartner",
"selections": v11
},
v13 = {
>>>>>>>
v11 = {
<<<<<<<
v14 = [
v3,
=======
v16 = [
v4,
>>>>>>>
v14 = [
v4,
<<<<<<<
"id": "a9b7e86173fa66a3b06e74af143ac1ab",
=======
"id": "d22b49acbafc82cc25fb7a4... |
<<<<<<<
"name": "name",
=======
"name": "id",
>>>>>>>
"name": "name",
<<<<<<<
"name": "address",
"args": null,
"storageKey": null
},
v7 = {
"kind": "ScalarField",
"alias": null,
"name": "address_2",
"args": null,
"storageKey": null
},
v8 = {
"kind": "ScalarField",
"alias": null,
"name": ... |
<<<<<<<
(v4/*: any*/),
(v5/*: any*/),
(v18/*: any*/),
(v19/*: any*/),
(v20/*: any*/),
{
"kind": "ScalarField",
"alias": null,
"name": "is_inquireable",
"args": null,
"storageKey": null
},
... |
<<<<<<<
import { ConcreteFragment } from "relay-runtime";
import { FollowArtistButton_artist$ref } from "./FollowArtistButton_artist.graphql";
=======
import { ReaderFragment } from "relay-runtime";
>>>>>>>
import { ReaderFragment } from "relay-runtime";
import { FollowArtistButton_artist$ref } from "./FollowArtistB... |
<<<<<<<
"name": "formattedStartDateTime",
=======
"name": "isAuction",
>>>>>>>
"name": "isAuction",
<<<<<<<
"name": "isLiveOpen",
=======
"name": "isLiveOpen",
"args": null,
"storageKey": null
},
v13 = {
"kind": "ScalarField",
"alias": null,
"name": "formattedStartDateTime",
>>>>>>>
"name":... |
<<<<<<<
v8 = [
=======
v5 = [
>>>>>>>
v7 = {
"kind": "ScalarField",
"alias": null,
"name": "is_followed",
"args": null,
"storageKey": null
},
v8 = {
"kind": "ScalarField",
"alias": null,
"name": "_id",
"args": null,
"storageKey": null
},
v9 = [
<<<<<<<
v9 = {
=======
v6 = {
>>>>>>>
v10 = {
<... |
<<<<<<<
v27 = [
{
"kind": "ScalarField",
"alias": null,
"name": "cents",
"args": null,
"storageKey": null
},
(v24/*: any*/)
],
v28 = {
=======
v26 = {
"kind": "ScalarField",
"alias": null,
"name": "cents",
"args": null,
"storageKey": null
},
v27 = {
>>>>>>>
v27 = {
"kind": "Scal... |
<<<<<<<
v13 = [
v11
],
=======
v13 = [
v3
],
>>>>>>>
v13 = [
v11
],
<<<<<<<
"kind": "InlineFragment",
"type": "Partner",
"selections": v13
},
v15 = {
"kind": "InlineFragment",
"type": "ExternalPartner",
"selections": v13
},
v16 = {
=======
"kind": "InlineFragment",
"type": "ExternalPartner",... |
<<<<<<<
"id": "c6e2f0fde0845574f2a0cf64e01166a3",
=======
"id": "b68718283d6288359bbbfd442a4d078c",
>>>>>>>
"id": "cc9b91e8a668770dba92719ac854b3da",
<<<<<<<
v3,
v1,
{
"kind": "LinkedField",
"alias": null,
... |
<<<<<<<
v5 = {
=======
v12 = {
>>>>>>>
v5 = {
<<<<<<<
v6 = {
=======
v13 = {
>>>>>>>
v6 = {
<<<<<<<
v7 = {
=======
v14 = {
>>>>>>>
v7 = {
<<<<<<<
v8 = {
=======
v15 = {
>>>>>>>
v8 = {
<<<<<<<
v9 = {
"kind": "ScalarField",
"alias": null,
"name": "id",
"args": null,
"storageKey": null
},
v10 = {... |
<<<<<<<
readonly fairs: ReadonlyArray<({
readonly id: string;
readonly name: string | null;
readonly counts: ({
readonly partners: any | null;
}) | null;
readonly location: ({
readonly coordinates: ({
... |
<<<<<<<
"kind": "ScalarField",
"alias": null,
"name": "internalID",
"args": null,
"storageKey": null
},
v8 = {
"kind": "ScalarField",
"alias": null,
"name": "gravityID",
"args": null,
"storageKey": null
},
v9 = {
=======
"kind": "ScalarField",
"alias": null,
"name": "id",
"args": null,
"... |
<<<<<<<
summary(ns, metric) {
let res = 0;
let postfix = null;
if (ns.pods) {
res = ns.pods.reduce((prevValue, pod) => {
if (pod.metrics[metric] && pod.metrics[metric] !== 'N-A') {
const match = pod.metrics[metric].match(/([a-zA-Z]+)$/)
... |
<<<<<<<
namespaceClick(event, namespace) {
if (event.ctrlKey) {
if(namespace.open) {
event.preventDefault();
}
store.delete('namespaceStore');
let namespaceStore = [];
this.namespaceMap.map(ns => {
ns.open = namespa... |
<<<<<<<
import { AnimeOwl } from './AnimeOwl/main';
=======
import { BSTO } from './BSTO/main';
import { Pantsubase } from './Pantsubase/main';
import { Fastani } from './Fastani/main';
>>>>>>>
import { BSTO } from './BSTO/main';
import { Pantsubase } from './Pantsubase/main';
import { Fastani } from './Fastani/main... |
<<<<<<<
import {Kissanime} from "./Kissanime/main";
import {Kissmanga} from "./Kissmanga/main";
import {nineAnime} from "./nineAnime/main";
import {Crunchyroll} from "./Crunchyroll/main";
import {Mangadex} from "./Mangadex/main";
import {Gogoanime} from "./Gogoanime/main";
import {Anime4you} from "./Anime4you/main";
im... |
<<<<<<<
import {PrimeVideo} from "./PrimeVideo/main";
import {MangaKatana} from "./MangaKatana/main";
=======
import {manga4life} from "./manga4life/main";
>>>>>>>
import {PrimeVideo} from "./PrimeVideo/main";
import {MangaKatana} from "./MangaKatana/main";
import {manga4life} from "./manga4life/main";
<<<<<<<
... |
<<<<<<<
import { Komga } from './Komga/main';
=======
import { An1me } from './An1me/main';
import { MangaJar } from './MangaJar/main';
import { AnimeDao } from './AnimeDao/main';
import { Otakustv } from './Otakustv/main';
>>>>>>>
import { An1me } from './An1me/main';
import { MangaJar } from './MangaJar/main';
imp... |
<<<<<<<
import { AnimeUnity } from './AnimeUnity/main';
=======
import { AnimeSimple } from './AnimeSimple/main';
>>>>>>>
import { AnimeSimple } from './AnimeSimple/main';
import { AnimeUnity } from './AnimeUnity/main';
<<<<<<<
AnimeUnity,
=======
AnimeSimple,
>>>>>>>
AnimeSimple,
AnimeUnity, |
<<<<<<<
import {AnimeFever} from "./AnimeFever/main";
=======
import {serimanga} from "./serimanga/main";
>>>>>>>
import {AnimeFever} from "./AnimeFever/main";
import {serimanga} from "./serimanga/main";
<<<<<<<
AnimeFever,
=======
serimanga,
>>>>>>>
AnimeFever,
serimanga, |
<<<<<<<
import { Fumetsu } from './Fumetsu/main';
=======
import { Toonily } from './Toonily/main';
>>>>>>>
import { Toonily } from './Toonily/main';
import { Fumetsu } from './Fumetsu/main';
<<<<<<<
Fumetsu,
=======
Toonily,
>>>>>>>
Toonily,
Fumetsu, |
<<<<<<<
import { NonstopScans } from './NonstopScans/main';
=======
import { Toonily } from './Toonily/main';
import { Fumetsu } from './Fumetsu/main';
>>>>>>>
import { Toonily } from './Toonily/main';
import { Fumetsu } from './Fumetsu/main';
import { NonstopScans } from './NonstopScans/main';
<<<<<<<
NonstopSca... |
<<<<<<<
import {craftingActions} from './sources/crafting-actions';
import {actions} from './sources/actions';
=======
import {Language} from './language';
>>>>>>>
import {craftingActions} from './sources/crafting-actions';
import {actions} from './sources/actions';
import {Language} from './language';
<<<<<<<
... |
<<<<<<<
@ViewChild('inputElement', { static: false }) inputElement: ElementRef;
=======
amountInInventory$: Observable<{ containerName: string, amount: number, hq: boolean, isRetainer: boolean }[]> = this.item$.pipe(
switchMap(item => {
return this.inventoryService.getUserInventory().pipe(
map(i... |
<<<<<<<
import {AngularFirestoreModule} from 'angularfire2/firestore';
import {FeaturesModule} from './pages/features/features.module';
=======
import {BetaDisclaimerModule} from './modules/beta-disclaimer/beta-disclaimer.module';
>>>>>>>
import {BetaDisclaimerModule} from './modules/beta-disclaimer/beta-disclaimer.... |
<<<<<<<
@Inject(PLATFORM_ID) private platform: Object, @Inject(REQUEST) @Optional() private request: any) {
=======
private message: NzMessageService, @Inject(PLATFORM_ID) private platform: Object) {
>>>>>>>
private message: NzMessageService, @Inject(PLATFORM_ID) private pla... |
<<<<<<<
import {GRID_SIZE, LEFT_MOUSE_BUTTON} from "../Constants";
=======
import {ROTATION_CIRCLE_R1,
ROTATION_CIRCLE_R2,
SHIFT_KEY,
LEFT_MOUSE_BUTTON,
SPACEBAR_KEY} from "../Constants";
import {CopyGroup} from "../ComponentUtils";
>>>>>>>
import {GRID_SIZE,
ROTATION_CIRCLE_... |
<<<<<<<
private splitWireTool : SplitWireTool;
=======
private actionHelper : ActionHelper;
private actionManager : ActionManager;
>>>>>>>
private splitWireTool : SplitWireTool;
private actionHelper : ActionHelper;
private actionManager : ActionManager;
<<<<<<<
... |
<<<<<<<
public startRotation(objs: Array<IOObject>, midpoint: Vector, mousePos: Vector): void {
this.midpoint = midpoint;
this.rotating = true;
this.startAngle = mousePos.sub(midpoint).angle();
this.action = new RotateAction(objs, midpoint);
=======
public activate(currentTool:... |
<<<<<<<
SHIFT_KEY, DELETE_KEY,
BACKSPACE_KEY, ESC_KEY, A_KEY} from "../Constants";
import {Vector,V} from "../math/Vector";
import {Transform} from "../math/Transform";
import {TransformContains} from "../math/MathUtils";
import {SeparatedComponentCollection,
GatherGroup} from "../ComponentUtil... |
<<<<<<<
let dragStart = V(0,0);
child.onclick = () => {
place(CreateComponentFromXML(xmlId, not), false);
}
child.ondragstart = (event) => {
dragStart = V(event.offsetX, event.offsetY);
}
... |
<<<<<<<
public isLocked(): boolean {
return this.locked;
}
=======
public getSelectionPopup(): SelectionPopupController {
return this.selectionPopup;
}
>>>>>>>
public isLocked(): boolean {
return this.locked;
}
public getSelectionPopup(): SelectionPopupControlle... |
<<<<<<<
},
CanvasToScreen: function(p: Vector): Vector {
return view.getCamera().getScreenPos(p);
},
ScreenToCanvas: function(p: Vector): Vector {
return view.getCamera().getWorldPos(p);
=======
},
GetActionManager: function(): ActionManager {
... |
<<<<<<<
import {ICRenderer} from "./other/ICRenderer";
import {Transform} from "../../math/Transform";
=======
import {FlipFlopRenderer} from "./flipflops/FlipFlopRenderer";
>>>>>>>
import {ICRenderer} from "./other/ICRenderer";
import {FlipFlopRenderer} from "./flipflops/FlipFlopRenderer";
import {Transform} from... |
<<<<<<<
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate(picker);
=======
datetime.generate();
>>>>>>>
var picker = new Picker(mockApp(), null, mockConfig());
datetime.generate();
<<<<<<<
var picker = new Picker(mockApp(), null, mockConfig());
datet... |
<<<<<<<
'<input [placeholder]="i.placeholder" [(ngModel)]="i.value" [type]="i.type" [attr.id]="i.id" class="alert-input">' +
=======
'<input [placeholder]="i.placeholder" [(ngModel)]="i.value" [type]="i.type" [min]="i.min" [max]="i.max" class="alert-input">' +
>>>>>>>
'<inpu... |
<<<<<<<
import select from './select';
import evaluate from "./evaluate"
import refresh from "./refresh";
import * as replWindow from "./repl-window";
import { format } from 'url';
import * as greetings from "./greet";
=======
import select from './repl/middleware/select';
import * as util from './utilities';
import ... |
<<<<<<<
* 'tabbarPlacement': 'bottom',
* platforms: {
=======
* tabbarPlacement: 'bottom',
* platform: {
>>>>>>>
* tabbarPlacement: 'bottom',
* platforms: { |
<<<<<<<
present(navOptions: NavOptions = {}) {
return this._app.present(this, navOptions, PORTAL_LOADING);
=======
present(navOptions: NavOptions = {}): Promise<any> {
return this._app.present(this, navOptions, AppPortal.LOADING);
>>>>>>>
present(navOptions: NavOptions = {}): Promise<any> {
return ... |
<<<<<<<
await resultsOutput.openResultsDoc();
resultsOutput.appendToResultsDoc(`; Evaluation of file ${fileName} failed: ${e}`);
=======
await resultsOutput.appendToResultsDoc(`; Evaluation of file ${fileName} failed: ${e}`);
>>>>>>>
resultsOutput.appendToResultsDoc(`;... |
<<<<<<<
import {Directive, Component, ElementRef, Renderer, Host, EventEmitter, Input, Output, ChangeDetectionStrategy, ViewEncapsulation} from 'angular2/core';
import {NgClass} from 'angular2/common';
=======
import {Directive, Component, ElementRef, Host, EventEmitter, Input, Output, ChangeDetectionStrategy, ViewEn... |
<<<<<<<
import { nClient, cljSession, cljsSession } from "../connector";
=======
import { nClient } from "../connector";
>>>>>>>
import { nClient } from "../connector";
<<<<<<<
import { isReplWindowOpen } from "../repl-window";
import { JackInTerminal, JackInTerminalOptions } from "./jack-in-terminal";
=======
im... |
<<<<<<<
'<div class="item-content" id="{{labelId}}">' +
'<content></content>' +
=======
'<div class="item-content">' +
'<ng-content></ng-content>' +
>>>>>>>
'<div class="item-content" id="{{labelId}}">' +
'<ng-content></ng-content>' + |
<<<<<<<
* ``` javascript
* // iOS
* activator: 'highlight',
* actionSheetEnter: 'action-sheet-slide-in',
* actionSheetLeave: 'action-sheet-slide-out',
* actionSheetCancelIcon: '',
* actionSheetDestructiveIcon: '',
* backButtonText: 'Back',
* backButtonIcon: 'ion-ios-arrow-back',
* iconMode: 'ios',
* menuType... |
<<<<<<<
import { EnsureHttpsPipe } from './pipes/ensure-https.pipe';
import { UserFollowsComponent } from './components/stream/user-follows/user-follows.component';
import { AccountComponent } from './components/common/account/account.component';
=======
import { TutorialEnhancedComponent } from './components/tutoria... |
<<<<<<<
import { Injectable, Inject } from '@angular/core';
import { Subject } from 'rxjs';
=======
import { Injectable, Inject, Optional, Injector } from '@angular/core';
import { RedirectService } from './redirect.service';
import { Location } from '@angular/common';
>>>>>>>
import { Injectable, Inject } from '@an... |
<<<<<<<
import { MetaService } from '../../common/services/meta.service';
=======
import { PagesService } from '../../common/services/pages.service';
>>>>>>>
import { MetaService } from '../../common/services/meta.service';
import { PagesService } from '../../common/services/pages.service'; |
<<<<<<<
import { ShadowboxHeaderTabsComponent } from './components/shadowbox-header-tabs/shadowbox-header-tabs.component';
import { TimespanFilterComponent } from './components/timespan-filter/timespan-filter.component';
import { EmailConfirmationComponent } from './components/email-confirmation/email-confirmation.comp... |
<<<<<<<
import { ConfigsService } from '../../common/services/configs.service';
=======
import { OnboardingV2Service } from '../onboarding-v2/service/onboarding.service';
>>>>>>>
import { ConfigsService } from '../../common/services/configs.service';
import { OnboardingV2Service } from '../onboarding-v2/service/onbo... |
<<<<<<<
import { isPlatformBrowser } from '@angular/common';
import { ConfigsService } from '../../services/configs.service';
=======
import { NavigationEnd, Router } from '@angular/router';
import { Location } from '@angular/common';
import { filter } from 'rxjs/operators';
>>>>>>>
import { isPlatformBrowser } from... |
<<<<<<<
import { ConfigsService } from '../../services/configs.service';
=======
import { V2TopbarService } from './v2-topbar.service';
import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
import { Location } from '@angular/common';
>>>>>>>
import { ConfigsService } from '../../services/configs.s... |
<<<<<<<
import { SidebarWidgetComponent } from './components/sidebar-widget/sidebar-widget.component';
=======
import { SidebarNavigationSubnavDirective } from './layout/sidebar/subnav.directive';
>>>>>>>
import { SidebarWidgetComponent } from './components/sidebar-widget/sidebar-widget.component';
import { SidebarN... |
<<<<<<<
constructor(
private router: Router,
public scroll: ScrollService,
private cookieService: CookieService
) {
// console.log('modal service constructed');
this.initOnScroll();
=======
static _(router: Router, scroll: ScrollService) {
return new SignupModalService(router, scroll);
... |
<<<<<<<
import { V3TopbarComponent } from './layout/v3-topbar/v3-topbar.component';
import { SidebarNavigationService } from './layout/sidebar/navigation.service';
import { TopbarService } from './layout/topbar.service';
=======
import { RedirectService } from './services/redirect.service';
>>>>>>>
import { Redirect... |
<<<<<<<
import { AdminPledgesComponent } from './controllers/admin/pledges/pledges.component';
=======
import { AdminWithdrawals } from './controllers/admin/withdrawals/withdrawals.component';
>>>>>>>
import { AdminPledgesComponent } from './controllers/admin/pledges/pledges.component';
import { AdminWithdrawals } f... |
<<<<<<<
import { TopbarWrapperComponent } from './page/topbar.component';
import { PageComponent } from './page/page.component';
=======
import { AppRoutingModule } from './app-routing.module';
import { Pages } from './controllers/pages/pages';
>>>>>>>
import { TopbarWrapperComponent } from './page/topbar.component'... |
<<<<<<<
import { NestedMenuComponent } from './layout/nested-menu/nested-menu.component';
=======
import { StackableModalComponent } from './components/stackable-modal/stackable-modal.component';
>>>>>>>
import { NestedMenuComponent } from './layout/nested-menu/nested-menu.component';
import { StackableModalComponen... |
<<<<<<<
import { Component, ChangeDetectionStrategy, ChangeDetectorRef, EventEmitter, ElementRef, Input } from '@angular/core';
=======
import { Component, EventEmitter, ElementRef, Input, ViewChild } from '@angular/core';
>>>>>>>
import { Component, ChangeDetectionStrategy, ChangeDetectorRef, EventEmitter, ElementR... |
<<<<<<<
import {
ChangeDetectorRef,
Component,
NgZone,
PLATFORM_ID,
Inject,
} from '@angular/core';
import { isPlatformBrowser } from '@angular/common';
=======
import { ChangeDetectorRef, Component, HostBinding } from '@angular/core';
>>>>>>>
import {
ChangeDetectorRef,
Component,
PLATFORM_ID,
In... |
<<<<<<<
this.configs = await this.client.get('api/v1/minds/config');
this.isReady$.next(true);
=======
this.configs = await this.client.get(
`api/v1/minds/config${this.queryString}`
);
>>>>>>>
this.configs = await this.client.get(
`api/v1/minds/config${this.queryString}`... |
<<<<<<<
import { ConfigsService } from './services/configs.service';
import { CookieService } from './services/cookie.service';
import { MetaService } from './services/meta.service';
import { Title, Meta } from '@angular/platform-browser';
import { MediaProxyService } from './services/media-proxy.service';
=======
im... |
<<<<<<<
import {
Component,
EventEmitter,
Output,
ViewChild,
Inject,
PLATFORM_ID,
} from '@angular/core';
=======
import {
Component,
EventEmitter,
OnInit,
Output,
ViewChild,
} from '@angular/core';
>>>>>>>
import {
Component,
EventEmitter,
Output,
Inject,
PLATFORM_ID,
OnInit,
} fro... |
<<<<<<<
{ provide: FeaturesService, useValue: MockService(FeaturesService) },
=======
{ provide: FormToastService, useValue: MockService(FormToastService) },
>>>>>>>
{ provide: FeaturesService, useValue: MockService(FeaturesService) },
{ provide: FormToastService, useValue: MockServic... |
<<<<<<<
import { FeaturesService } from "../../services/features.service";
=======
import { PosterComponent } from '../newsfeed/poster/poster.component';
import { Observable } from 'rxjs';
import { DialogService } from '../../common/services/confirm-leave-dialog.service'
>>>>>>>
import { FeaturesService } from "../... |
<<<<<<<
import { CanDeactivateGuardService } from './can-deactivate-guard';
=======
import { OverlayModalService } from './ux/overlay-modal';
>>>>>>>
import { CanDeactivateGuardService } from './can-deactivate-guard';
import { OverlayModalService } from './ux/overlay-modal';
<<<<<<<
{
provide: CanDeactivate... |
<<<<<<<
import { ChangeDetectionStrategy, Component } from '@angular/core';
import { ConfigsService } from '../../services/configs.service';
=======
import {
ChangeDetectionStrategy,
ChangeDetectorRef,
Component,
HostListener,
OnInit,
} from '@angular/core';
>>>>>>>
import {
ChangeDetectionStrategy,
Co... |
<<<<<<<
const useFanControl = this.getFanControlStatus();
=======
// Decide on a fan control approach
// Per default fans are controlled individually depending on temp sensor and their chosen logic
wmiAPI.getModuleInfo(moduleInfo);
// Use 'same speed' approach for uniwill devic... |
<<<<<<<
import { TuxedoWMIAPI as wmiAPI, TuxedoWMIAPI, ObjWrapper } from '../../native-lib/TuxedoWMIAPI';
import { FanControlLogic } from './FanControlLogic';
=======
import { TuxedoWMIAPI as wmiAPI, IFanInfo, TuxedoWMIAPI } from '../../native-lib/TuxedoWMIAPI';
import { FanControlLogic, FAN_LOGIC } from './FanContro... |
<<<<<<<
import extraScopePlugin from 'stylis-plugin-extra-scope';
import { Upgrade } from '../Upgrades';
=======
import { Context, Plugin } from '@emotion/stylis';
import Upgrade from '../Upgrades';
>>>>>>>
import { Context, Plugin } from '@emotion/stylis';
import { Upgrade } from '../Upgrades'; |
<<<<<<<
displayDiagnostics: configOptions.get('displayDiagnostics') as boolean,
=======
hideReplUi: configOptions.get('hideReplUi') as boolean,
>>>>>>>
displayDiagnostics: configOptions.get('displayDiagnostics') as boolean,
hideReplUi: configOptions.get('hideReplUi') as boolean, |
<<<<<<<
import { AuthService } from '../../auth.service';
import { MaterializeAction } from 'angular2-materialize';
=======
import { ImageDisplayService } from '../../_services/image-display.service';
>>>>>>>
import { AuthService } from '../../auth.service';
import { MaterializeAction } from 'angular2-materialize';
... |
<<<<<<<
import { Organization } from '../common/organization';
=======
import { Organization } from './organization';
>>>>>>>
import { Organization } from './organization';
<<<<<<<
getUserOrganization(id: number): Observable<Organization> {
return this.http.get(
`${organizationUrl}/user/${id}`
... |
<<<<<<<
context.subscriptions.push(vscode.commands.registerCommand('calva.evaluateTopLevelFormAsComment', EvaluateMiddleWare.evaluateTopLevelFormAsComment));
=======
context.subscriptions.push(vscode.commands.registerCommand('calva.togglePrettyPrint', EvaluateMiddleWare.togglePrettyPrint));
>>>>>>>
conte... |
<<<<<<<
import { Component, DoCheck } from '@angular/core';
import { Router } from '@angular/router';
import { AuthService } from './auth.service';
import { OrganizationService } from './organization/common/organization.service';
import { Organization } from './organization/common/organization';
@Component({
// module... |
<<<<<<<
import {Component, OnInit} from '@angular/core';
import {Router, ActivatedRoute} from '@angular/router';
=======
import { Component, OnInit, OnDestroy } from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router';
>>>>>>>
import {Component, OnInit, OnDestroy} from '@angular/core';
import {... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.