conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
import { TREE_SEP } from '@sqltools/util/constants';
import { parse as queryParse } from '@sqltools/util/query';
=======
import LegacyQueries from './legacy/queries';
import { TREE_SEP } from '@sqltools/core/constants';
>>>>>>>
import { TREE_SEP } from '@sqltools/util/constants';
import { parse as queryParse... |
<<<<<<<
children: React.ReactElement[] | React.ReactElement
HeaderComponent?: React.JSXElementConstructor<TabBarProps<T>>
TabBarComponent?: React.JSXElementConstructor<TabBarProps<T>>
=======
children: React.ReactElement[]
HeaderComponent?: (props: TabBarProps<T>) => React.ReactElement
TabBarComponent?: (... |
<<<<<<<
<<<<<<< HEAD
export { default as Popover } from "./Popover";
export { default as TextField } from "./TextField";
=======
=======
export { default as RelativeTime } from "./RelativeTime";
export { default as UIContext, UIContextProps } from "./UIContext";
>>>>>>>
export { default as Popover } from "./Popover"... |
<<<<<<<
import { CapsuleExt } from '../../capsule';
=======
import { Extension } from '../../harmony';
import { CapsuleExt } from '../capsule';
>>>>>>>
import { CapsuleExt } from '../capsule'; |
<<<<<<<
export default async function provideSnap(config: SnapConfig, [paper, workspace, scope]: SnapDeps) {
const snap = new Snap(workspace, scope);
paper.register(new SnapCommand(snap));
return snap;
=======
export default async function provideSnap(config: SnapConfig, [paper, workspace, scope]: SnapDeps, har... |
<<<<<<<
export default async function provideWorkspace(
config: WorkspaceCoreConfig,
[workspaceConfig, scope, component, capsule]: WorkspaceDeps
) {
=======
export default async function provideWorkspace(config: WorkspaceConfig, [scope, component, network]: WorkspaceDeps) {
>>>>>>>
export default async function ... |
<<<<<<<
import { WorkspaceConfigExt } from '../workspace-config';
=======
import { ReporterExt } from '../reporter';
>>>>>>>
import { WorkspaceConfigExt } from '../workspace-config';
import { ReporterExt } from '../reporter';
<<<<<<<
dependencies: [WorkspaceConfigExt, ScopeExt, ComponentFactoryExt, IsolatorExt],
... |
<<<<<<<
export { Bundler, BundlerComponentResult } from './bundler';
export type { BundlerMain } from './bundler.main.runtime';
export { BundlerAspect } from './bundler.aspect';
=======
export { Bundler, BundlerComponentResult } from './bundler';
export { ComponentDir } from './get-entry';
export { ComponentServer } ... |
<<<<<<<
import { BIT_WORKSPACE_TMP_DIRNAME, COMPILER_ENV_TYPE, TESTER_ENV_TYPE } from '../../src/constants';
import { statusWorkspaceIsCleanMsg } from '../../src/cli/commands/public-cmds/status-cmd';
=======
import InvalidConfigDir from '../../src/consumer/bit-map/exceptions/invalid-config-dir';
import { COMPONENT_DI... |
<<<<<<<
runTask(taskName: string) {
return this.runCmd(`bit run ${taskName}`);
}
create(name: string) {
return this.runCmd(`bit create ${name}`);
}
=======
moveComponent(id: string, to: string) {
return this.runCmd(`bit move ${id} ${path.normalize(to)} --component`);
}
>>>>>>>
runTask(taskN... |
<<<<<<<
export { default as TrapFocus } from "./TrapFocus";
export { default as ClickOutside } from "./ClickOutside";
=======
export { default as TrapFocus } from "./TrapFocus";
export { default as Popup } from "./Popup";
>>>>>>>
export { default as TrapFocus } from "./TrapFocus";
export { default as ClickOutside } ... |
<<<<<<<
import { Capsule } from '../../capsule';
import { Build } from '../build';
=======
import { Capsule } from '../capsule';
import { BitCli } from '../cli';
>>>>>>>
import { BitCli } from '../cli';
import { Build } from '../build'; |
<<<<<<<
=======
appAuthHTML: resolveSrc("core/client/auth/index.html"),
appAuthLocalesTemplate: resolveSrc("core/client/auth/locales.ts"),
appAuthIndex: resolveSrc("core/client/auth/index.tsx"),
>>>>>>>
appAuthHTML: resolveSrc("core/client/auth/index.html"),
appAuthLocalesTemplate: resolveSrc("core/clien... |
<<<<<<<
import { Harmony, ExtensionManifest } from '@teambit/harmony';
import { difference, groupBy } from 'ramda';
import { compact } from 'ramda-adjunct';
=======
import { Harmony, ExtensionManifest } from '@teambit/harmony';
import { difference, groupBy } from 'ramda';
>>>>>>>
import { Harmony, ExtensionManifest ... |
<<<<<<<
=======
export { Environments, Descriptor } from './environments.extension';
>>>>>>>
export { Environments, Descriptor } from './environments.extension';
<<<<<<<
export { EnvService } from './services';
export { EnvRuntime } from './runtime/env-runtime';
export type { EnvsMain } from './environments.main.ru... |
<<<<<<<
import Run from './commands/public-cmds/run-cmd';
import Capsule from './commands/public-cmds/capsule-cmd';
=======
import { CapsuleCreate, CapsuleList, CapsuleDescribe } from './commands/public-cmds/capsule-cmd';
>>>>>>>
import Run from './commands/public-cmds/run-cmd';
import Capsule from './commands/publi... |
<<<<<<<
group: 'component',
title: 'add, modify and control components',
=======
title: 'Develop components',
>>>>>>>
group: 'component',
title: 'Develop components',
<<<<<<<
group: 'collaborate',
title: 'collaborate and share components',
=======
title: 'Collaborate on components'... |
<<<<<<<
import { Component, Inject, OnDestroy, ViewEncapsulation } from '@angular/core';
import { Router } from '@angular/router';
import { ShareService } from '../../shared/services/share.service';
import { PatientService } from '../../shared/services/patient.service';
import { MenuController } from '@ionic/angular';
... |
<<<<<<<
ACTION_ITEM_TYPE,
retrieveManyUserActionPresence,
} from "talk-server/models/action";
import {
=======
Comment,
>>>>>>>
ACTION_ITEM_TYPE,
retrieveManyUserActionPresence,
} from "talk-server/models/action";
import {
Comment, |
<<<<<<<
import { BaseModelStub } from '../models/base.model';
import { ErrorService } from './error.service';
import { BackendResource } from '../decorators/backend-resource.decorator';
import { Subject } from 'rxjs/Subject';
=======
import { BaseModelStub } from '../models';
import { BackendResource } from '../decor... |
<<<<<<<
actionCounts: asset => decodeActionCounts(asset.action_counts),
=======
commentCounts: asset => asset.comment_counts,
>>>>>>>
actionCounts: asset => decodeActionCounts(asset.action_counts),
commentCounts: asset => asset.comment_counts, |
<<<<<<<
import { AffinityGroup } from '../../shared/models/affinity-group.model';
=======
import { Color } from '../../shared/models/color.model';
>>>>>>>
import { AffinityGroup } from '../../shared/models/affinity-group.model';
import { Color } from '../../shared/models/color.model'; |
<<<<<<<
public updateDiskOffering(offering: DiskOffering): void {
this.showRootDiskResize = offering.isCustomized;
this.selectedDiskOffering = offering;
}
=======
public ngOnInit(): void {
this.resetVmCreateData();
}
// todo
>>>>>>>
public ngOnInit(): void {
this.resetVmCreateData();
... |
<<<<<<<
import { DialogService } from '../../dialog/dialog-module/dialog.service';
import { SgRulesComponent } from '../../security-group/sg-rules/sg-rules.component';
=======
import { Observable } from 'rxjs/Observable';
import { SgRulesComponent } from '../../security-group/sg-rules/sg-rules.component';
>>>>>>>
i... |
<<<<<<<
=======
import { Observable } from 'rxjs/Observable';
>>>>>>> |
<<<<<<<
import { TranslateService } from 'ng2-translate';
=======
import { MdlDialogService } from 'angular2-mdl';
import { TranslateService } from '@ngx-translate/core';
>>>>>>>
import { TranslateService } from '@ngx-translate/core'; |
<<<<<<<
import { MdlDialogService } from 'angular2-mdl';
=======
import { MdlDialogService } from 'angular2-mdl';
import { TranslateService } from 'ng2-translate';
>>>>>>>
import { MdlDialogService } from 'angular2-mdl';
import { TranslateService } from 'ng2-translate';
<<<<<<<
import { SSHKeyPairService } from '..... |
<<<<<<<
import { ServiceOfferingDialogComponent } from './service-offering-dialog.component';
import { ServiceOfferingSelectorComponent } from './service-offering-selector.component';
import { SharedModule } from '../shared/shared.module';
=======
import { ServiceOfferingDialogComponent } from './service-offering-dia... |
<<<<<<<
import { TranslateService } from 'ng2-translate';
=======
import { MdlDialogService } from 'angular2-mdl';
import { TranslateService } from '@ngx-translate/core';
>>>>>>>
import { TranslateService } from '@ngx-translate/core'; |
<<<<<<<
import { MdlDialogService } from 'angular2-mdl';
import { ServiceOfferingDialogComponent } from '../../service-offering/service-offering-dialog.component';
=======
import { SecurityGroup } from '../../security-group/sg.model';
import { SgRulesComponent } from '../../security-group/sg-rules/sg-rules.component... |
<<<<<<<
import { Iso, IsoService, Template } from '../shared';
=======
import { Iso, IsoService, TemplateService } from '../shared';
>>>>>>>
import {
Iso,
IsoService,
Template,
TemplateService,
} from '../shared';
import { OsFamily } from '../../shared/models/os-type.model';
<<<<<<<
export class TemplateLi... |
<<<<<<<
import Assets from "./assets";
import Auth from "./auth";
=======
>>>>>>>
import Auth from "./auth";
<<<<<<<
Auth: Auth(ctx),
Assets: Assets(ctx),
=======
Stories: Stories(ctx),
>>>>>>>
Auth: Auth(ctx),
Stories: Stories(ctx), |
<<<<<<<
=======
// todo
public show(): void {
this.templateService.getDefault().subscribe(() => {
this.serviceOfferingFilterService.getAvailable(this.selectedZone)
.subscribe(() => {
this.resourceUsageService.getResourceUsage().subscribe(result => {
if (result.available.pri... |
<<<<<<<
public instanceGroups: Array<string>;
=======
public affinityGroupNames: Array<string>;
public affinityGroupTypes: Array<{ type: string }>;
public instanceGroups: Array<InstanceGroup>;
>>>>>>>
public affinityGroupNames: Array<string>;
public affinityGroupTypes: Array<{ type: string }>;
public i... |
<<<<<<<
=======
createdAt: "2018-07-06T18:24:00.000Z",
replies: { edges: [], pageInfo: { endCursor: null, hasNextPage: false } },
replyCount: 0,
editing: {
edited: false,
editableUntil: "2018-07-06T18:24:30.000Z",
},
>>>>>>>
<<<<<<<
=======
createdAt: "2018-07-06T18:20:00.000Z"... |
<<<<<<<
import { PasswordDialogComponent } from './vm/password-dialog';
import { VmCreateComponent } from './vm/vm-create.component';
import { VmCreationTemplateComponent } from './vm/vm-creation-template/vm-creation-template.component';
import { VmCreationTemplateDialogComponent } from './vm/vm-creation-template/vm-cr... |
<<<<<<<
import { EventsModule } from './events/events.module';
=======
import { SpareDriveModule } from './spare-drive/spare-drive.module';
>>>>>>>
import { EventsModule } from './events/events.module';
import { SpareDriveModule } from './spare-drive/spare-drive.module'; |
<<<<<<<
=======
// tslint:disable-next-line
import { SpareDriveAttachmentDetailComponent } from './vm-sidebar/storage-detail/spare-drive-attachment/spare-drive-attachment-detail/spare-drive-attachment-detail.component';
// tslint:disable-next-line
import { SpareDriveAttachmentDialogComponent } from './vm-sidebar/stor... |
<<<<<<<
const regex = /^org\.apache\.cloudstack\.api\.command\.user\.vm\.(\w*)Cmd$/;
=======
const regex = /^org\.apache\.cloudstack\.api\.command\.user\.vm\.(\w*)VMCmd$/;
if (!this.cmd) {
this.cmd = '';
}
>>>>>>>
const regex = /^org\.apache\.cloudstack\.api\.command\.user\.vm\.(\w*)Cmd$/;
... |
<<<<<<<
import { ApiInfoComponent } from './api-info/api-info.component';
=======
import { InactivityTimeoutComponent } from './inactivity-timeout/inactivity-timeout.component';
>>>>>>>
import { ApiInfoComponent } from './api-info/api-info.component';
import { InactivityTimeoutComponent } from './inactivity-timeout/... |
<<<<<<<
private vmService: VmService
) {}
=======
) { }
public hideDetail(): void {
this.isDetailOpen = !this.isDetailOpen;
}
>>>>>>>
private vmService: VmService
) {}
public hideDetail(): void {
this.isDetailOpen = !this.isDetailOpen;
} |
<<<<<<<
public create(data: VolumeCreationData): Observable<Volume> {
return this.sendCommand('create', data)
.switchMap(job => this.asyncJobService.register(job.jobid, this.entity, this.entityModel))
.map(job => job.jobResult);
}
=======
public detach(id: string): Observable<null> {
retur... |
<<<<<<<
import { TagsModule } from '../tags/tags.module';
import { VmTagsComponent } from './vm-sidebar/tags/vm-tags.component';
=======
import { AffinityGroupSelectorComponent } from './vm-sidebar/affinity-group-selector/affinity-group-selector.component';
>>>>>>>
import { TagsModule } from '../tags/tags.module';
i... |
<<<<<<<
import { Component, Input, OnChanges, OnInit } from '@angular/core';
import {
AffinityGroupSelectorComponent
} from 'app/vm/vm-sidebar/affinity-group-selector/affinity-group-selector.component';
=======
import { Component, Input, OnChanges, OnDestroy, OnInit } from '@angular/core';
>>>>>>>
import { Compone... |
<<<<<<<
=======
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
>>>>>>>
<<<<<<<
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import {
... |
<<<<<<<
export * from './base-backend.service';
export * from './service-locator';
export * from './root-disk-size.service';
=======
export * from './base-backend.service';
export * from './affinity-group.service';
>>>>>>>
export * from './base-backend.service';
export * from './service-locator';
export * from './ro... |
<<<<<<<
import { Http, URLSearchParams } from '@angular/http';
import { Observable } from 'rxjs';
=======
import { Observable, Subject } from 'rxjs';
>>>>>>>
import { Http, URLSearchParams } from '@angular/http';
import { Observable, Subject } from 'rxjs';
<<<<<<<
=======
public vmUpdateObservable: Subject<Virt... |
<<<<<<<
export * from './resource-limit.service';
export * from './resource-usage.service';
export * from './disk-storage.service';
=======
export * from './resource-limit.service';
export * from './root-disk-size.service';
>>>>>>>
export * from './resource-limit.service';
export * from './resource-limit.service';
e... |
<<<<<<<
import { ReloadComponent } from './components/reload/reload.component';
=======
import {
CharacterCountTextfieldComponent
} from './components/character-count-textfield/character-count-textfield.component';
>>>>>>>
import { ReloadComponent } from './components/reload/reload.component';
import {
Character... |
<<<<<<<
clickClose() {
element(by.css('.backdrop.ng-star-inserted')).click();
}
findDiskSize(diskname) {
return element(
by.xpath(
`//span[text()="${diskname}"]/ancestor::mat-card//div[@class="entity-card-data-line"][1]`,
),
).getText();
}
=======
>>>>>>>
findDiskSize(disk... |
<<<<<<<
import { VmCreateComponent } from "./vm-create.component";
=======
import {
JobsNotificationService,
INotificationStatus
} from '../shared/services/jobs-notification.service';
>>>>>>>
import { VmCreateComponent } from "./vm-create.component";
import {
JobsNotificationService,
INotificationStatus
} fr... |
<<<<<<<
public create(volumeId: string, name?: string): Observable<AsyncJob> {
=======
public createSnapshot(volumeId: string, name?: string): Observable<AsyncJob> {
this.invalidateCache();
>>>>>>>
public create(volumeId: string, name?: string): Observable<AsyncJob> {
this.invalidateCache(); |
<<<<<<<
public removeRule(type: NetworkRuleType, data): Observable<null> {
=======
public removeRule(type: NetworkRuleType, data) {
this.invalidateCache();
>>>>>>>
public removeRule(type: NetworkRuleType, data): Observable<null> {
this.invalidateCache(); |
<<<<<<<
protected handleCommandError(error): Observable<any> {
return Observable.throw(ErrorService.parseError(this.getResponse(error)));
}
=======
protected formatGetListResponse(response: any): Array<M> {
let entity = this.entity.toLowerCase();
if (entity === 'asyncjob') { // only if list?
... |
<<<<<<<
=======
AlertService,
ConfigService,
>>>>>>>
<<<<<<<
=======
ConfigService,
>>>>>>> |
<<<<<<<
@Output() public onDelete = new EventEmitter();
=======
@Output() public onVolumeAttached = new EventEmitter<VolumeAttachmentData>();
>>>>>>>
@Output() public onVolumeAttached = new EventEmitter<VolumeAttachmentData>();
@Output() public onDelete = new EventEmitter(); |
<<<<<<<
import { MdlTextAreaAutoresizeDirective } from './directives/mdl-textarea-autoresize.directive';
=======
import { RouterUtilsService } from './services/router-utils.service';
import { SnapshotService } from './services/snapshot.service';
import { StorageService } from './services/storage.service';
import { Ta... |
<<<<<<<
import { Color } from '../models/color.model';
=======
import { Subject } from 'rxjs/Subject';
import { StorageService } from './storage.service';
import { Color } from '../models';
>>>>>>>
import { Color } from '../models';
<<<<<<<
import { Subject, Observable } from 'rxjs';
import { UserService } from '.... |
<<<<<<<
import { Component, Inject, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
=======
import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
>>>>>>>
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router ... |
<<<<<<<
export * from './vm.module';
export * from './vm.model';
export * from './vm.service';
=======
export * from './shared/vm.service';
export * from './shared/vm.model';
>>>>>>>
export * from './vm.module';
export * from './shared/vm.model';
export * from './shared/vm.service'; |
<<<<<<<
.subscribe(securityGroup => {
params['securityGroupIds'] = securityGroup.id;
this._deploy(params, id);
});
=======
.subscribe(
securityGroup => {
params['securitygroupids'] = securityGroup.id;
this._deploy(params, notificationId);
},
() => ... |
<<<<<<<
name: 'tenant-profile.tenant-profiles',
type: 'link',
path: '/tenantProfiles',
icon: 'mdi:alpha-t-box',
isMdiIcon: true
},
{
=======
id: guid(),
>>>>>>>
id: guid(),
name: 'tenant-profile.tenant-profiles',
type: 'link',
... |
<<<<<<<
import { StyleService } from './shared/services/style.service';
=======
import { StorageService } from './shared/services/storage.service';
import { ZoneService } from './shared/services/zone.service';
>>>>>>>
import { StyleService } from './shared/services/style.service';
import { ZoneService } from './shar... |
<<<<<<<
=======
AsyncJobService,
StorageService,
>>>>>>>
AsyncJobService,
StorageService,
<<<<<<<
AuthGuard,
=======
AsyncJobService,
>>>>>>>
AuthGuard,
AsyncJobService,
<<<<<<<
VmService,
VolumeService,
OsTypeService,
{provide: 'IStorageService', useClass: StorageService... |
<<<<<<<
import { SecurityGroupService, GROUP_POSTFIX } from '../../shared/services/security-group.service';
import { Observable } from 'rxjs/Rx';
=======
import { SecurityGroupService } from '../../shared/services/security-group.service';
import { UtilsService } from '../../shared/services/utils.service';
>>>>>>>
im... |
<<<<<<<
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
=======
import { MdTooltipModule } from '@angular/material';
>>>>>>>
import { CommonModule } from '@angu... |
<<<<<<<
=======
import { TranslateModule } from '@ngx-translate/core';
import { MdlModule } from 'angular2-mdl';
>>>>>>>
import { TranslateModule } from '@ngx-translate/core';
import { MdlModule } from 'angular2-mdl';
<<<<<<<
import { SnapshotModalComponent } from './vm-sidebar/storage-detail/volume/snapshot/snapsh... |
<<<<<<<
import { MdlDialogService } from 'angular2-mdl';
import { VolumeCreationComponent } from '../volume-creation/volume-creation.component';
import { NotificationService } from '../../shared/services/notification.service';
import { JobsNotificationService, INotificationStatus } from '../../shared/services/jobs-noti... |
<<<<<<<
export const ResourceTypes = {
USER: 'User'
};
=======
export const DeletionMark = {
TAG: 'status',
VALUE: 'removed'
};
>>>>>>>
export const ResourceTypes = {
USER: 'User'
};
export const DeletionMark = {
TAG: 'status',
VALUE: 'removed'
}; |
<<<<<<<
export * from './base.model';
export * from './affinity-group.model';
=======
export * from './base.model';
export * from './template.model';
>>>>>>>
export * from './base.model';
export * from './affinity-group.model';
export * from './template.model'; |
<<<<<<<
=======
import { MdlDefaultTableModel } from 'angular2-mdl';
import { Observable } from 'rxjs/Observable';
>>>>>>>
import { MdlDefaultTableModel } from 'angular2-mdl';
import { Observable } from 'rxjs/Observable';
<<<<<<<
import { FilterService } from '../shared';
import moment = require('moment');
import ... |
<<<<<<<
import { Observable } from 'rxjs/Observable';
=======
import { VolumeAttachmentData, VolumeService } from '../shared/services/volume.service';
import { DialogService, JobsNotificationService } from '../shared/services';
>>>>>>>
import { Observable } from 'rxjs/Observable';
import { VolumeAttachmentData, Volu... |
<<<<<<<
export * from './base-backend.service';
export * from './service-locator';
export * from './root-disk-size.service';
export * from './affinity-group.service';
=======
export * from './base-backend.service';
export * from './template.service';
>>>>>>>
export * from './base-backend.service';
export * from './s... |
<<<<<<<
import { Http, RequestOptions, XHRBackend } from '@angular/http';
=======
import { CustomSimpleDialogComponent } from './services/dialog/custom-dialog.component';
import { FancySelectComponent } from './components/fancy-select/fancy-select.component';
>>>>>>>
import { Http, RequestOptions, XHRBackend } from ... |
<<<<<<<
describe('encodeStringToBase64', () => {
it('should return valid encoded string', () => {
const data = 'some data';
const expected = btoa(data);
expect(Utils.encodeStringToBase64(data)).toEqual(expected);
});
it('should return null for no data', () => {
expect(Utils.encod... |
<<<<<<<
import {App} from "./app";
=======
import {Http, Headers, URLSearchParams} from "@angular/http";
import "rxjs/Rx";
import {ISubscription} from "rxjs/Subscription";
>>>>>>>
import {App} from "./app";
import {Http, Headers, URLSearchParams} from "@angular/http";
import "rxjs/Rx";
import {ISubscription} from "r... |
<<<<<<<
import {RoutingService} from "./routing.service";
import {LoginService} from "./login.service";
=======
>>>>>>>
import {LoginService} from "./login.service";
<<<<<<<
constructor(private routingService: RoutingService, private renderer: Renderer, private translate: TranslateService, private loginService:... |
<<<<<<<
editablePolygon: boolean;
initCallback?: () => any;
=======
>>>>>>>
editablePolygon: boolean; |
<<<<<<<
import { Road } from './roads'
=======
import { Weather } from '../src/weather'
>>>>>>>
import { Road } from './roads'
import { Weather } from '../src/weather' |
<<<<<<<
import { uploadProtoAction, UPLOAD_PROTO, SET_MESSAGE, setMessageAction } from '../actions'
=======
import { uploadProtoAction, UPLOAD_PROTO, UPLOAD_PROTO_SUCCESSFUL, SEND_PROTO } from '../actions'
>>>>>>>
import { uploadProtoAction, UPLOAD_PROTO, SET_MESSAGE, UPLOAD_PROTO_SUCCESSFUL, SEND_PROTO } from '../a... |
<<<<<<<
QPlainTextEdit,
QTabWidget,
QGridLayout
=======
QPlainTextEdit,
QScrollArea,
QPixmap,
CursorShape,
WindowState,
QTextOptionWrapMode,
QApplication,
QClipboardMode,
QCheckBoxEvents
>>>>>>>
QPlainTextEdit,
QTabWidget,
QGridLayout,
QScrollArea,
QPixmap,
CursorShape,
WindowSt... |
<<<<<<<
import {Browser, Internals, TCompMetadata} from 'remotion';
import {openBrowser} from '.';
=======
import puppeteer from 'puppeteer';
import {TCompMetadata} from 'remotion';
import {serveStatic} from './serve-static';
>>>>>>>
import {Browser, Internals, TCompMetadata} from 'remotion';
import {openBrowser} fr... |
<<<<<<<
import { ActivatedRoute, Router } from '@angular/router';
=======
import * as moment from 'moment-timezone';
>>>>>>>
import * as moment from 'moment-timezone';
import { ActivatedRoute, Router } from '@angular/router';
<<<<<<<
selectedTabQueryParams: string;
=======
invoices: Invoice[];
>>>>>>>
sele... |
<<<<<<<
StarMailSuccess, UndoDeleteMail, UndoDeleteMailSuccess
=======
StarMailSuccess, UploadAttachment, UploadAttachmentProgress, UploadAttachmentSuccess
>>>>>>>
StarMailSuccess, UploadAttachment, UploadAttachmentProgress, UploadAttachmentSuccess,
UndoDeleteMail, UndoDeleteMailSuccess
<<<<<<<
GetMailbox... |
<<<<<<<
ReadMailSuccess, SetFolders,
StarMailSuccess, UploadAttachment, UploadAttachmentProgress, UploadAttachmentSuccess
=======
ReadMailSuccess,
StarMailSuccess, UploadAttachment, UploadAttachmentProgress, UploadAttachmentSuccess,
UndoDeleteMail, UndoDeleteMailSuccess
>>>>>>>
ReadMailSuccess, SetFolder... |
<<<<<<<
import {
AfterViewInit,
ChangeDetectorRef,
Component,
ElementRef,
Inject,
OnDestroy,
OnInit,
ViewChild
} from '@angular/core';
import { NgbDropdownConfig } from '@ng-bootstrap/ng-bootstrap';
import { AppState, AuthState, MailBoxesState, MailState, PlanType, UserState } from '../../store/datatype... |
<<<<<<<
import { Component, OnInit, ViewChild } from '@angular/core';
import { NgbModal, NgbDropdownConfig, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
import { AppState, MailBoxesState, Settings, UserState, MailState } from '../../store/datatypes';
=======
import { Component, ComponentFactoryResolver, Component... |
<<<<<<<
UNDO_DELETE_MAIL = '[Mail] UNDO DELETE DRAFT MAIL',
UNDO_DELETE_MAIL_SUCCESS = '[Mail] UNDO DELETE DRAFT MAIL SUCCESS',
=======
UPLOAD_ATTACHMENT = '[Attachment] UPLOAD_ATTACHMENT',
UPLOAD_ATTACHMENT_PROGRESS = '[Attachment] UPLOAD_ATTACHMENT_PROGRESS',
UPLOAD_ATTACHMENT_SUCCESS = '[Attachment] UPLO... |
<<<<<<<
moveMail(ids: string, folder: string, withChildren: boolean = true, fromTrash: boolean = false): Observable<any[]> {
return this.http.patch<any>(`${apiUrl}emails/messages/?id__in=${ids}`, { folder: folder, with_children: withChildren, from_trash: fromTrash });
=======
moveMail(ids: string, folder: str... |
<<<<<<<
this.store.dispatch(new GetMails({ limit: this.LIMIT, offset: this.OFFSET, folder: this.mailFolder, read: false }));
=======
this.store.dispatch(new GetMails({ limit: 1000, offset: 0, folder: this.mailFolder, read: false, seconds: 30 }));
>>>>>>>
this.store.dispatch(new GetMails({ limit: th... |
<<<<<<<
import { Component, ComponentFactoryResolver, ComponentRef, OnInit, ViewChild, ViewContainerRef } from '@angular/core';
import { NgbDropdownConfig, NgbModal } from '@ng-bootstrap/ng-bootstrap';
=======
import { Component, OnInit } from '@angular/core';
import { NgbModal, NgbDropdownConfig } from '@ng-bootstra... |
<<<<<<<
import Invocation from "./Invocation";
import Application from './Application';
=======
import Job from "./Job";
>>>>>>>
import Job from "./Job";
import Application from './Application';
<<<<<<<
clear: (invocation: Invocation, args: string[]): void => {
setTimeout(() => invocation.terminal.clear... |
<<<<<<<
indexNumber = 1;
=======
exampleConfig = { slidesPerView: 3 };
>>>>>>>
indexNumber = 1;
exampleConfig = { slidesPerView: 3 }; |
<<<<<<<
@Input()
set index(index: number) {
this.setIndex(index);
}
=======
@Input()
set config(val: SwiperOptions) {
this.updateSwiper(val);
const { params } = getParams(val);
Object.assign(this, params);
}
>>>>>>>
@Input()
set index(index: number) {
this.setIndex(index);
}
... |
<<<<<<<
import { Directive, Input, TemplateRef } from '@angular/core';
=======
import { Directive, Input, Optional, TemplateRef } from '@angular/core';
import { coerceBooleanProperty } from './utils/utils';
>>>>>>>
import { Directive, Input, TemplateRef } from '@angular/core';
import { coerceBooleanProperty } from '... |
<<<<<<<
this.zone.runOutsideAngular(() => {
new Swiper(this.elementRef.nativeElement, swiperParams);
});
=======
swiperParams.observer = true;
new Swiper(this.elementRef.nativeElement, swiperParams);
>>>>>>>
swiperParams.observer = true;
this.zone.runOutsideAngular(() => {
new Sw... |
<<<<<<<
/**
* Static method to invoke a cordova command. Used to invoke the 'platform' or 'plugin' command
*
* @param {string} The name of the cordova command to be invoked
* @param {string} The version of the cordova CLI to use
* @param {ICordovaCommandParameters} The cordova command ... |
<<<<<<<
list.args = argList;
var maxKeyLength: number = 0;
if (list.args) {
list.args.forEach(nvp => {
if (nvp.name.length > maxKeyLength) {
maxKeyLength = nvp.name.length;
}
});
}
if (list.options) {
... |
<<<<<<<
import platformModule = require ("./platform");
import pluginModule = require ("./plugin");
=======
import kitHelper = require ("./utils/kitHelper");
>>>>>>>
import kitHelper = require ("./utils/kitHelper");
import platformModule = require ("./platform");
import pluginModule = require ("./plugin");
<<<<<<<
... |
<<<<<<<
res.status(err.code || 400).send({ status: self.resources.getStringForLanguage(req, "InvalidBuildRequest"), errors: err.toString() });
=======
res.status(err.code || 400).send({ status: self.resources.getStringForLanguage(req, "invalidBuildRequest"), errors: err });
>>>>>>>
... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.