#22: fix merge issues
Showing
- src/app/core/services/private-catalogs.service.ts 153 additions, 3 deletionssrc/app/core/services/private-catalogs.service.ts
- src/app/features/model-details/model-details.component.html 5 additions, 33 deletionssrc/app/features/model-details/model-details.component.html
- src/app/features/model-details/model-details.component.ts 5 additions, 9 deletionssrc/app/features/model-details/model-details.component.ts
- src/app/shared/components/delete-user-dialog-confirmation-action/delete-user-dialog-confirmation-action.component.html 2 additions, 3 deletions...ion/delete-user-dialog-confirmation-action.component.html
- src/app/shared/components/delete-user-dialog-confirmation-action/delete-user-dialog-confirmation-action.component.ts 22 additions, 18 deletions...ction/delete-user-dialog-confirmation-action.component.ts
- src/app/shared/components/manage-publisher-authors-page/manage-publisher-authors-page.component.html 195 additions, 0 deletions...authors-page/manage-publisher-authors-page.component.html
- src/app/shared/components/manage-publisher-authors-page/manage-publisher-authors-page.component.scss 42 additions, 0 deletions...authors-page/manage-publisher-authors-page.component.scss
- src/app/shared/components/manage-publisher-authors-page/manage-publisher-authors-page.component.ts 325 additions, 4 deletions...r-authors-page/manage-publisher-authors-page.component.ts
- src/app/shared/components/model-management/model-management.component.html 183 additions, 89 deletions...mponents/model-management/model-management.component.html
- src/app/shared/components/model-management/model-management.component.scss 18 additions, 0 deletions...mponents/model-management/model-management.component.scss
- src/app/shared/components/model-management/model-management.component.ts 100 additions, 15 deletions...components/model-management/model-management.component.ts
- src/app/shared/components/rate-model-details/rate-model-details.component.scss 0 additions, 1 deletion...ents/rate-model-details/rate-model-details.component.scss
- src/app/shared/components/share-with-team-page/share-with-team-page.component.html 1 addition, 30 deletions.../share-with-team-page/share-with-team-page.component.html
- src/app/shared/components/share-with-team-page/share-with-team-page.component.ts 12 additions, 2 deletions...ts/share-with-team-page/share-with-team-page.component.ts
- src/app/shared/components/version-dropdown/version-dropdown.component.html 27 additions, 0 deletions...mponents/version-dropdown/version-dropdown.component.html
Loading
Please register or sign in to comment