conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
operationRes = await client.sendOperationRequest(httpRequest, {
httpMethod: "GET"
});
let response = operationRes.response;
let statusCode = response.status;
=======
operationRes = await client.sendRequest(httpRequest);
let statusCode = operationRes.status;
>>>>>>>... |
<<<<<<<
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"complexBody",
"defaultProgram"
],
targetPath: [
"defaultProgram"
]
}
... |
<<<<<<<
import { TokenProcessor } from "./TokenProcessor";
=======
import { StringDict } from "./MsalTypes";
>>>>>>>
import { TokenProcessor } from "./TokenProcessor";
import { StringDict } from "./MsalTypes";
<<<<<<<
this.decodedIdToken = TokenProcessor.extractIdToken(rawIdToken);
if (this.decodedIdTok... |
<<<<<<<
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"bodyParameter",
"productDictionaryOfArray"
],
targetPath: [
"productDictionaryOfArray"
... |
<<<<<<<
operationRes = await client.sendOperationRequest(httpRequest, {
httpMethod: "POST"
});
let response = operationRes.response;
let statusCode = response.status;
=======
operationRes = await client.sendRequest(httpRequest);
let statusCode = operationRes.status;
>>>>>>... |
<<<<<<<
operationRes = await client.sendOperationRequest(httpRequest, {
httpMethod: "GET"
});
let response = operationRes.response;
let statusCode = response.status;
=======
operationRes = await client.sendRequest(httpRequest);
let statusCode = operationRes.status;
>>>>>>>... |
<<<<<<<
operationRes = await client.sendOperationRequest(httpRequest, {
httpMethod: "GET"
});
let response = operationRes.response;
let statusCode = response.status;
=======
operationRes = await client.sendRequest(httpRequest);
let statusCode = operationRes.status;
>>>>>>>... |
<<<<<<<
operationRes = await client.sendOperationRequest(httpRequest, {
httpMethod: "GET"
});
let response = operationRes.response;
let statusCode = response.status;
=======
operationRes = await client.sendRequest(httpRequest);
let statusCode = operationRes.status;
>>>>>>>... |
<<<<<<<
operationRes = await client.sendOperationRequest(httpRequest, {
httpMethod: "GET"
});
let response = operationRes.response;
let statusCode = response.status;
=======
operationRes = await client.sendRequest(httpRequest);
let statusCode = operationRes.status;
>>>>>>>... |
<<<<<<<
it('navigates user to login and prompt parameter is passed in request', (done) => {
=======
it('navigates user to login and prompt=select_account parameter is passed as extraQueryParameter', (done) => {
msal.handleRedirectCallbacks(successCallback, errCallback);
>>>>>>>
it('navigates user... |
<<<<<<<
operationRes = await client.sendOperationRequest(httpRequest, {
httpMethod: "GET"
});
let response = operationRes.response;
let statusCode = response.status;
=======
operationRes = await client.sendRequest(httpRequest);
let statusCode = operationRes.status;
>>>>>>>... |
<<<<<<<
contentType: "application/json; charset=utf-8",
parameterTransformations: [
{
sourcePath: [
"bodyParameter",
"value"
],
targetPath: [
"value"
]
}
]
=====... |
<<<<<<<
operationRes = await client.sendOperationRequest(httpRequest, {
httpMethod: "HEAD"
});
let response = operationRes.response;
let statusCode = response.status;
=======
operationRes = await client.sendRequest(httpRequest);
let statusCode = operationRes.status;
>>>>>>... |
<<<<<<<
operationRes = await client.sendOperationRequest(httpRequest, {
httpMethod: "GET"
});
let response = operationRes.response;
let statusCode = response.status;
=======
operationRes = await client.sendRequest(httpRequest);
let statusCode = operationRes.status;
>>>>>>>... |
<<<<<<<
operationRes = await client.sendOperationRequest(httpRequest, {
httpMethod: "HEAD"
});
let response = operationRes.response;
let statusCode = response.status;
=======
operationRes = await client.sendRequest(httpRequest);
let statusCode = operationRes.status;
>>>>>>... |
<<<<<<<
operationRes = await client.sendOperationRequest(httpRequest, {
httpMethod: "GET"
});
let response = operationRes.response;
let statusCode = response.status;
=======
operationRes = await client.sendRequest(httpRequest);
let statusCode = operationRes.status;
>>>>>>>... |
<<<<<<<
operationRes = await client.sendOperationRequest(httpRequest, {
httpMethod: "GET"
});
let response = operationRes.response;
let statusCode = response.status;
=======
operationRes = await client.sendRequest(httpRequest);
let statusCode = operationRes.status;
>>>>>>>... |
<<<<<<<
import { ITenantDiscoveryResponse, OpenIdConfiguration } from './ITenantDiscoveryResponse';
import TelemetryManager from '../telemetry/TelemetryManager';
import { XhrClient, XhrResponse } from '../XHRClient';
import HttpEvent from '../telemetry/HttpEvent';
=======
import { ITenantDiscoveryResponse, OpenIdConf... |
<<<<<<<
operationRes = await client.sendOperationRequest(httpRequest, {
httpMethod: "PUT"
});
let response = operationRes.response;
let statusCode = response.status;
=======
operationRes = await client.sendRequest(httpRequest);
let statusCode = operationRes.status;
>>>>>>>... |
<<<<<<<
operationRes = await client.sendOperationRequest(httpRequest, {
httpMethod: "GET"
});
let response = operationRes.response;
let statusCode = response.status;
=======
operationRes = await client.sendRequest(httpRequest);
let statusCode = operationRes.status;
>>>>>>>... |
<<<<<<<
const TEST_NONCE = "123523";
const IDTOKEN_OBJECT = "00000000-0000-0000-66f3-3332eca7ea81";
const TEST_UNIQUE_ID = IDTOKEN_OBJECT;
=======
const TEST_NONCE = "test_nonce";
const TEST_UNIQUE_ID = "248289761001";
// Test Client Info Params
const TEST_UID = "123-test-uid";
const... |
<<<<<<<
operationRes = await client.sendOperationRequest(httpRequest, {
httpMethod: "GET"
});
let response = operationRes.response;
let statusCode = response.status;
=======
operationRes = await client.sendRequest(httpRequest);
let statusCode = operationRes.status;
>>>>>>>... |
<<<<<<<
operationRes = await client.sendOperationRequest(httpRequest, {
httpMethod: "GET"
});
let response = operationRes.response;
let statusCode = response.status;
=======
operationRes = await client.sendRequest(httpRequest);
let statusCode = operationRes.status;
>>>>>>>... |
<<<<<<<
operationRes = await client.sendOperationRequest(httpRequest, {
httpMethod: "GET"
});
let response = operationRes.response;
let statusCode = response.status;
=======
operationRes = await client.sendRequest(httpRequest);
let statusCode = operationRes.status;
>>>>>>>... |
<<<<<<<
operationRes = await client.sendOperationRequest(httpRequest, {
httpMethod: "HEAD"
});
let response = operationRes.response;
let statusCode = response.status;
=======
operationRes = await client.sendRequest(httpRequest);
let statusCode = operationRes.status;
>>>>>>... |
<<<<<<<
operationRes = await client.sendOperationRequest(httpRequest, {
httpMethod: "GET"
});
let response = operationRes.response;
let statusCode = response.status;
=======
operationRes = await client.sendRequest(httpRequest);
let statusCode = operationRes.status;
>>>>>>>... |
<<<<<<<
operationRes = await client.sendOperationRequest(httpRequest, {
httpMethod: "POST"
});
let response = operationRes.response;
let statusCode = response.status;
=======
operationRes = await client.sendRequest(httpRequest);
let statusCode = operationRes.status;
>>>>>>... |
<<<<<<<
// Initialize default authority instance
this.authority = AuthorityFactory.createInstance(this.clientConfig.auth.authority || Constants.DEFAULT_AUTHORITY, this.networkClient);
=======
B2cAuthority.setKnownAuthorities(this.config.authOptions.knownAuthorities);
>>>>>>>
// Initia... |
<<<<<<<
=======
import { FetchClient } from "../network/FetchClient";
>>>>>>>
<<<<<<<
networkClient: null,
=======
networkClient: BrowserUtils.getBrowserNetworkClient(),
>>>>>>>
networkClient: BrowserUtils.getBrowserNetworkClient(), |
<<<<<<<
import { ConnectionProfileComponent } from './connectionprofile/connectionprofile.component.ts';
=======
import { WelcomeComponent } from './welcome';
>>>>>>>
import { ConnectionProfileComponent } from './connectionprofile/connectionprofile.component.ts';
import { WelcomeComponent } from './welcome';
<<<<<<... |
<<<<<<<
import { ConfirmComponent } from '../confirm/confirm.component';
=======
import { TransactionRegistry } from 'composer-client';
>>>>>>>
import { ConfirmComponent } from '../confirm/confirm.component';
import { TransactionRegistry } from 'composer-client'; |
<<<<<<<
import {ResponsiveImageUploadDialog} from '../components/responsive-image-upload-dialog/responsive-image-upload-dialog.component';
=======
import {UploadFormComponent} from '../components/upload-form/upload-form.component';
import {FilesizePipe} from '../pipes/filesize/filesize.pipe';
import {UploadFormDialog... |
<<<<<<<
import {SettingsComponent} from './settings/settings.component';
=======
import {StartComponent} from './start/start.component';
>>>>>>>
import {StartComponent} from './start/start.component';
import {SettingsComponent} from './settings/settings.component';
<<<<<<<
path: 'dashboard',
component: Dash... |
<<<<<<<
transform: function (doc: IUnitModel, ret: any) {
ret._id = doc._id.toString();
=======
transform: function (doc: any, ret: any) {
ret._id = ret._id.toString();
ret._course = ret._course.toString();
>>>>>>>
transform: function (doc: IUnitModel, ret: any) {
re... |
<<<<<<<
return new Authority(authorityUrl, validateAuthority);
=======
if (authorityMetadata) {
// todo: log statements
this.parseAuthorityMetadata(authorityUrl, authorityMetadata);
}
const type = AuthorityFactory.detectAuthorityFromUrl(authorityUrl);
... |
<<<<<<<
constructor(public dialogRef: MatDialogRef<AccessKeyDialog>) {}
=======
constructor(public dialogRef: MdDialogRef<AccessKeyDialog>) {
}
>>>>>>>
constructor(public dialogRef: MatDialogRef<AccessKeyDialog>) {
} |
<<<<<<<
import {SnackBarService} from './shared/services/snack-bar.service';
=======
import {NotfoundComponent} from './shared/components/notfound/notfound.component';
>>>>>>>
import {NotfoundComponent} from './shared/components/notfound/notfound.component';
import {SnackBarService} from './shared/services/snack-bar... |
<<<<<<<
WriteMailDialog,
=======
FilepickerDialog,
>>>>>>>
FilepickerDialog,
WriteMailDialog,
<<<<<<<
WriteMailDialog,
=======
FilepickerDialog,
>>>>>>>
FilepickerDialog,
WriteMailDialog,
<<<<<<<
UploadDialog,
WriteMailDialog,
=======
UploadDialog,
FilepickerDia... |
<<<<<<<
import {UserDataService, WhitelistUserService} from '../../../shared/services/data.service';
import {ICourse} from '../../../../../../../shared/models/ICourse';
import {IWhitelistUser} from '../../../../../../../shared/models/IWhitelistUser';
=======
import {CourseService} from '../../../shared/services/data.... |
<<<<<<<
option?: RequiredRuntimeOptions;
canvas?: HTMLCanvasElement;
webgl?: WebGLRenderingContext;
=======
isEditor?: boolean;
isPlaying?: boolean;
systems?: any[];
>>>>>>>
option?: RequiredRuntimeOptions;
canvas?: HTMLCanvasElement;
webgl?... |
<<<<<<<
import {IWhitelistUser} from '../../shared/models/IWhitelistUser';
=======
import {ITaskUnit} from '../../shared/models/units/ITaskUnit';
import {ITaskUnitModel} from '../src/models/units/TaskUnit';
>>>>>>>
import {IWhitelistUser} from '../../shared/models/IWhitelistUser';
import {ITaskUnit} from '../../shar... |
<<<<<<<
import {IStudentConfig} from '../../../../../../shared/models/IStudentConfig';
=======
import {IDownload} from '../../../../../../shared/models/IDownload';
>>>>>>>
import {IDownload} from '../../../../../../shared/models/IDownload';
import {IStudentConfig} from '../../../../../../shared/models/IStudentConfig... |
<<<<<<<
import {SaveFileService} from '../../shared/services/save-file.service';
import {ICourse} from '../../../../../../shared/models/ICourse';
=======
import {TitleService} from '../../shared/services/title.service';
>>>>>>>
import {TitleService} from '../../shared/services/title.service';
import {SaveFileService... |
<<<<<<<
import {RouterOutlet} from '@angular/router';
import {CourseDetailModule} from './course-detail/course-detail.module';
=======
>>>>>>>
import {RouterOutlet} from '@angular/router';
import {CourseDetailModule} from './course-detail/course-detail.module'; |
<<<<<<<
import {UserDataService} from '../../shared/services/data.service';
import {User} from '../../models/user';
import {UserService} from '../../shared/services/user.service';
import {ActivatedRoute, Router} from '@angular/router';
import {ShowProgressService} from '../../shared/services/show-progress.service';
==... |
<<<<<<<
import {GravatarDirective} from './shared/directives/gravatar.directive';
import {CodeKataProgressService, ProgressService} from './shared/services/data/progress.service';
=======
import {TeachersComponent} from './course/course-edit/teachers/teachers.component';
import {CourseUserListComponent} from './cours... |
<<<<<<<
import {MatSnackBar} from '@angular/material';
import {TranslateService} from '@ngx-translate/core';
=======
import {SnackBarService} from '../../services/snack-bar.service';
>>>>>>>
import {MatSnackBar} from '@angular/material';
import {TranslateService} from '@ngx-translate/core';
import {SnackBarService} ... |
<<<<<<<
import {MessagingModule} from './messaging/messaging.module';
import { PrivacyComponent } from './privacy/privacy.component';
=======
import {PrivacyModule} from './privacy/privacy.module';
>>>>>>>
import {MessagingModule} from './messaging/messaging.module';
import {PrivacyModule} from './privacy/privacy.mo... |
<<<<<<<
import { ActivationComponent } from './user/activation/activation.component';
=======
import { UserRolesComponent } from './admin/user-roles/user-roles.component';
import { UserEditComponent } from './user/user-edit/user-edit.component';
>>>>>>>
import { UserRolesComponent } from './admin/user-roles/user-rol... |
<<<<<<<
import {LectureModule} from '../../lecture/lecture.module';
import {UnitFormModule} from '../../unit/unit-form/unit-form.module';
import { CourseMediamanagerComponent } from './course-mediamanager/course-mediamanager.component';
import { CourseMediamanagerDetailDialog } from './course-mediamanager/course-mediam... |
<<<<<<<
import { ShowCommentsDirective } from './directives/show-comments.directive';
=======
import {ResponsiveImageComponent} from './components/responsive-image/responsive-image.component';
>>>>>>>
import { ShowCommentsDirective } from './directives/show-comments.directive';
import {ResponsiveImageComponent} fr... |
<<<<<<<
import construct = Reflect.construct;
=======
import {ILecture} from '../../../../../../shared/models/ILecture';
import {IUnit} from '../../../../../../shared/models/units/IUnit';
import {IUser} from '../../../../../../shared/models/IUser';
import {ICourse} from '../../../../../../shared/models/ICourse';
>>>... |
<<<<<<<
import {MarkdownEditorComponent} from './components/markdown-editor/markdown-editor.component';
import {AceEditorModule} from 'ng2-ace-editor';
=======
import {UploadFormComponent} from './components/upload-form/upload-form.component';
import {FileUploadModule} from 'ng2-file-upload';
import {FilesizePipe} fr... |
<<<<<<<
import {UploadFormComponent} from '../components/upload-form/upload-form.component';
import {FilesizePipe} from '../pipes/filesize/filesize.pipe';
import {UploadFormDialog} from '../components/upload-form-dialog/upload-form-dialog.component';
=======
import {TranslateModule} from '@ngx-translate/core';
import... |
<<<<<<<
import {FreeTextUnitFormComponent} from './course/course-edit/unit/unit-edit/free-text-unit-form/free-text-unit-form.component';
import {FreeTextUnitComponent} from './course/course-edit/unit/free-text-unit/free-text-unit.component';
import {MarkdownService} from './shared/services/markdown.service';
=======
... |
<<<<<<<
TaskService,
StudentConfigService,
=======
>>>>>>>
TaskService,
<<<<<<<
import {studentConfigSchema} from '../../../../api/src/models/StudentConfig';
=======
import {DataSharingService} from './shared/services/data-sharing.service';
>>>>>>> |
<<<<<<<
import {BadgeComponent} from './components/badge/badge.component';
import {MatFabMenuComponent} from './components/mat-fab-menu/mat-fab-menu.component';
=======
import { BadgeComponent } from './components/badge/badge.component';
import {ExpandableDivComponent} from './components/expandable-div/expandable-div... |
<<<<<<<
import {UserSettingsComponent} from './user-settings/user-settings.component';
import {MatHeaderCell, MatTableModule} from '@angular/material';
=======
import {UserReportComponent} from './user-report/user-report.component';
import {NgxChartsModule} from '@swimlane/ngx-charts';
>>>>>>>
import {UserSettingsCo... |
<<<<<<<
TaskService,
StudentConfigService,
=======
>>>>>>>
TaskService,
<<<<<<<
import {studentConfigSchema} from '../../../../api/src/models/StudentConfig';
=======
import {DataSharingService} from './shared/services/data-sharing.service';
>>>>>>> |
<<<<<<<
import {MaterialModule, MatDatepickerModule} from '@angular/material';
=======
>>>>>>>
import {MatDatepickerModule} from '@angular/material';
<<<<<<<
MaterialModule,
MatDatepickerModule,
=======
>>>>>>>
MatDatepickerModule, |
<<<<<<<
import {Lecture} from '../../src/models/Lecture';
=======
>>>>>>>
import {Lecture} from '../../src/models/Lecture';
<<<<<<<
=======
import {IUser} from '../../../shared/models/IUser';
>>>>>>>
<<<<<<<
const should = chai.should();
const expect = chai.expect;
=======
>>>>>>>
const should = chai.should(... |
<<<<<<<
import {TeachersComponent} from './course/course-edit/teachers/teachers.component';
import {GravatarDirective} from './shared/directives/gravatar.directive';
import { CourseUserListComponent } from './course/course-edit/course-user-list/course-user-list.component';
=======
import {GravatarDirective} from './... |
<<<<<<<
import {FilesizePipe} from './pipes/filesize/filesize.pipe';
import {JwtPipe} from './pipes/jwt/jwt.pipe';
import {UploadFormDialog} from './components/upload-form-dialog/upload-form-dialog.component';
=======
>>>>>>>
import {JwtPipe} from './pipes/jwt/jwt.pipe';
<<<<<<<
UploadFormComponent,
Filesiz... |
<<<<<<<
import { CookieBannerComponent } from './cookie-banner/cookie-banner.component';
=======
import { PrivacyComponent } from './privacy/privacy.component';
>>>>>>>
import { CookieBannerComponent } from './cookie-banner/cookie-banner.component';
import { PrivacyComponent } from './privacy/privacy.component';
<<... |
<<<<<<<
import {HttpClientModule} from '@angular/common/http';
=======
import {HttpModule} from '@angular/http';
import {TranslateLoader, TranslateModule} from '@ngx-translate/core';
>>>>>>>
import {HttpClientModule} from '@angular/common/http';
import {TranslateLoader, TranslateModule} from '@ngx-translate/core'; |
<<<<<<<
import { CourseService, LectureService } from './shared/data.service';
=======
import { CourseService, UserDataService } from './shared/data.service';
>>>>>>>
import { CourseService, UserDataService, LectureService } from './shared/data.service';
<<<<<<<
LectureComponent,
LectureNewComponent,
Le... |
<<<<<<<
// Cascade delete
taskUnitSchema.pre('remove', function(next: () => void) {
Task.find({'_id': {$in: this.tasks}}).exec()
.then((tasks) => Promise.all(tasks.map(task => task.remove())))
.then(next)
.catch(next);
});
taskUnitSchema.methods.exportJSON = async function() {
const obj = this.toObject... |
<<<<<<<
import {ICourse} from '../../../../../shared/models/ICourse';
=======
import {MessageService} from '../shared/services/message.service';
>>>>>>>
import {MessageService} from '../shared/services/message.service';
import {ICourse} from '../../../../../shared/models/ICourse'; |
<<<<<<<
import {IChatRoom} from '../../../../../shared/models/IChatRoom';
=======
import {IFile} from '../../../../../shared/models/mediaManager/IFile';
import {IPicture} from '../../../../../shared/models/mediaManager/IPicture';
>>>>>>>
import {IChatRoom} from '../../../../../shared/models/IChatRoom';
import {IFile... |
<<<<<<<
import {WhitelistDialog} from '../../course/course-edit/general-tab/whitelist-dialog/whitelist-dialog.component';
import {ICourse} from '../../../../../../shared/models/ICourse';
=======
import {ResponsiveImageUploadDialog} from '../components/responsive-image-upload-dialog/responsive-image-upload-dialog.comp... |
<<<<<<<
import {InfoDialog} from '../components/info-dialog/info-dialog.component';
=======
import {FilepickerDialog} from '../components/filepicker-dialog/filepicker-dialog.component';
>>>>>>>
import {InfoDialog} from '../components/info-dialog/info-dialog.component';
import {FilepickerDialog} from '../components/f... |
<<<<<<<
import {Dependency} from '../../about/licenses/dependency.model';
=======
import {ITask} from '../../../../../../shared/models/task/ITask';
import {ITaskUnit} from '../../../../../../shared/models/units/ITaskUnit';
>>>>>>>
import {Dependency} from '../../about/licenses/dependency.model';
import {ITask} from ... |
<<<<<<<
import {IStudentConfig} from '../../../../../../shared/models/IStudentConfig';
=======
import {IDownload} from '../../../../../../shared/models/IDownload';
>>>>>>>
import {IDownload} from '../../../../../../shared/models/IDownload';
import {IStudentConfig} from '../../../../../../shared/models/IStudentConfig... |
<<<<<<<
import {WriteMailDialog} from '../components/write-mail-dialog/write-mail-dialog.component';
=======
import {FilepickerDialog} from '../components/filepicker-dialog/filepicker-dialog.component';
>>>>>>>
import {FilepickerDialog} from '../components/filepicker-dialog/filepicker-dialog.component';
import {Writ... |
<<<<<<<
public snackBar: MatSnackBar,
public dialogService: DialogService) {}
=======
public snackBar: MdSnackBar,
public dialogService: DialogService) {
}
>>>>>>>
public snackBar: MatSnackBar,
public dialogService: DialogSer... |
<<<<<<<
import {ActivationResendComponent} from './auth/activation-resend/activation-resend.component';
=======
import {NotfoundComponent} from './shared/components/notfound/notfound.component';
>>>>>>>
import {ActivationResendComponent} from './auth/activation-resend/activation-resend.component';
import {NotfoundCo... |
<<<<<<<
import {UploadFormComponent} from "../../../shared/components/upload-form/upload-form.component";
import {IFileUnit} from "../../../../../../../shared/models/units/IFileUnit";
import {PickMediaDialog} from "../../../shared/components/pick-media-dialog/pick-media-dialog.component";
=======
import {FileIconServ... |
<<<<<<<
chatRooms: chatRooms.map(extractSingleMongoId),
freeTextStyle
=======
chatRooms: chatRooms.map(extractMongoId),
freeTextStyle,
userCanEditCourse
>>>>>>>
chatRooms: chatRooms.map(extractSingleMongoId),
freeTextStyle,
userCanEditCourse |
<<<<<<<
FileUploadModule
=======
HttpClientModule,
>>>>>>>
HttpClientModule,
FileUploadModule |
<<<<<<<
import {FileComponent} from './file/file.component';
import {ImprintComponent} from './imprint/imprint.component';
=======
import {LegalnoticeComponent} from './privacy/legalnotice/legalnotice.component';
import {PrivacyComponent} from './privacy/privacynotice/privacy.component';
>>>>>>>
import {FileComponen... |
<<<<<<<
import {IUser} from '../../../shared/models/IUser';
import chaiHttp = require('chai-http');
=======
>>>>>>>
import {FixtureUtils} from '../../fixtures/FixtureUtils';
import {IUser} from '../../../shared/models/IUser';
import chaiHttp = require('chai-http');
<<<<<<<
it('should return the user admin@test.... |
<<<<<<<
import { UserSettingsComponent } from './user/user-settings/user-settings.component';
=======
import {DataSharingService} from './shared/services/data-sharing.service';
>>>>>>>
import {DataSharingService} from './shared/services/data-sharing.service';
<<<<<<<
NotificationSettingsService,
=======
D... |
<<<<<<<
import {BadgeComponent} from './components/badge/badge.component';
import {MatFabMenuComponent} from './components/mat-fab-menu/mat-fab-menu.component';
=======
import {BadgeComponent} from './components/badge/badge.component';
import {PasswordInputComponent} from './components/password-input/password-input.c... |
<<<<<<<
import {CourseService, UserDataService} from '../../../shared/services/data.service';
import {ShowProgressService} from '../../../shared/services/show-progress.service';
import {User} from '../../../models/user';
=======
import {CourseService, UserDataService} from '../../../shared/data.service';
import {Show... |
<<<<<<<
import {AdminMarkdownEditComponent} from './components/admin-markdown-edit/admin-markdown-edit.component';
import {ImprintAndInfoService} from './services/imprint-and-info.service';
=======
import {NotfoundComponent} from './components/notfound/notfound.component';
>>>>>>>
import {AdminMarkdownEditComponent}... |
<<<<<<<
import {ChangePasswordDialogComponent} from './components/change-password-dialog/change-password-dialog.component';
=======
import {MarkdownEditorComponent} from './components/markdown-editor/markdown-editor.component';
import {AceEditorModule} from 'ng2-ace-editor';
>>>>>>>
import {ChangePasswordDialogCompo... |
<<<<<<<
import { CourseService, UserDataService } from './shared/data.service';
=======
import { CourseService, UserDataService, LectureService } from './shared/data.service';
>>>>>>>
import { CourseService, UserDataService, LectureService } from './shared/data.service';
<<<<<<<
import {MembersComponent} from './co... |
<<<<<<<
import {isNullOrUndefined} from 'util';
=======
import {SortUtil} from '../../../shared/utils/SortUtil';
import {User} from '../../../models/User';
import {ActivatedRoute} from '@angular/router';
>>>>>>>
import {isNullOrUndefined} from 'util';
import {SortUtil} from '../../../shared/utils/SortUtil';
import {... |
<<<<<<<
import {PickMediaDialog} from './components/pick-media-dialog/pick-media-dialog.component';
=======
import {TranslateModule} from '@ngx-translate/core';
>>>>>>>
import {PickMediaDialog} from './components/pick-media-dialog/pick-media-dialog.component';
import {TranslateModule} from '@ngx-translate/core';
<<... |
<<<<<<<
import {UserDataService} from '../../shared/services/data.service';
import {User} from '../../models/user';
=======
import {UserDataService} from '../../shared/data.service';
>>>>>>>
import {UserDataService} from '../../shared/services/data.service';
<<<<<<<
import {DialogService} from '../../shared/service... |
<<<<<<<
import { Constants, PersistentCacheKeys, StringUtils, AuthorizationCodeRequest, ICrypto, CacheSchemaType, AccountEntity, AppMetadataEntity, CacheManager, CredentialEntity, ThrottlingEntity, ServerTelemetryEntity, ProtocolUtils} from "@azure/msal-common";
=======
import { Constants, PersistentCacheKeys, String... |
<<<<<<<
import * as moment from 'jalali-moment';
import {Moment} from 'jalali-moment';
=======
import * as momentNs from 'moment';
import {Moment} from 'moment';
>>>>>>>
import * as momentNs from 'jalali-moment';
import {Moment} from 'jalali-moment';
<<<<<<<
locale: 'fa'
};
private gregorianExtensionConfig:... |
<<<<<<<
=======
let config: ClientConfiguration;
beforeEach(() => {
config = ClientTestUtils.createTestClientConfiguration();
});
>>>>>>> |
<<<<<<<
import * as moment from 'jalali-moment';
import {Moment, unitOfTime} from 'jalali-moment';
=======
import {Moment} from 'moment';
import * as moment from 'moment';
>>>>>>>
import * as moment from 'jalali-moment';
import {Moment, unitOfTime} from 'jalali-moment';
<<<<<<<
import {IDate} from '../common/models... |
<<<<<<<
import {Moment, MomentInput} from 'jalali-moment';
import * as moment from 'jalali-moment';
=======
import * as moment from 'moment';
import {Moment} from 'moment';
>>>>>>>
import {Moment} from 'jalali-moment';
import * as moment from 'jalali-moment';
<<<<<<<
import {ITimeSelectConfig} from './time-select-c... |
<<<<<<<
getConfig(config: IDayCalendarConfig): IDayCalendarConfig {
if (!config || (config.calendarSystem !== ECalendarSystem.gregorian)) {
this.DEFAULT_CONFIG = {...this.GREGORIAN_DEFAULT_CONFIG, ...this.JALALI_CONFIG_EXTENTION};
} else {
this.DEFAULT_CONFIG = this.GREGORIAN_DEFAULT_CONFIG;
}... |
<<<<<<<
import * as moment from 'jalali-moment';
import {Moment, unitOfTime} from 'jalali-moment';
=======
import {Moment, unitOfTime} from 'moment';
>>>>>>>
import {Moment, unitOfTime} from 'jalali-moment';
<<<<<<<
.convertFromMomentArray(this.componentConfig.format, selected, ECalendarValue.StringArr, this.... |
<<<<<<<
import {Moment} from 'jalali-moment';
import {ECalendarSystem} from '../common/types/calendar-type-enum';
=======
import {Moment} from 'moment';
import {ECalendarValue} from '../common/types/calendar-value-enum';
>>>>>>>
import {Moment} from 'jalali-moment';
import {ECalendarSystem} from '../common/types/cal... |
<<<<<<<
import * as moment from 'jalali-moment';
import {Moment,unitOfTime} from 'jalali-moment';
import {DatePickerService} from './date-picker.service';
import {IDatePickerConfig} from './date-picker-config.model';
=======
>>>>>>> |
<<<<<<<
import * as moment from 'jalali-moment';
=======
import * as momentNs from 'moment';
>>>>>>>
import * as momentNs from 'jalali-moment'; |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.