Merge branch 'development' of...
Merge branch 'development' of https://gitlab.alpha.grandlyon.com/refonte-data/admin-gui into new-updated-datalog # Conflicts: # config/config-dev.json # config/config-rec.json # src/app/app.routing.module.ts # src/app/components/menu/menu.component.html
No related branches found
No related tags found
Showing
- config/config-dev.json 3 additions, 0 deletionsconfig/config-dev.json
- config/config-rec.json 4 additions, 1 deletionconfig/config-rec.json
- src/app/app.routing.module.ts 36 additions, 6 deletionssrc/app/app.routing.module.ts
- src/app/components/changelog/detail/changelog-detail.component.html 2 additions, 2 deletions...mponents/changelog/detail/changelog-detail.component.html
- src/app/components/changelog/list/changelog.component.ts 21 additions, 10 deletionssrc/app/components/changelog/list/changelog.component.ts
- src/app/components/credits/list/credits.component.ts 21 additions, 12 deletionssrc/app/components/credits/list/credits.component.ts
- src/app/components/formats/list/formats.component.html 2 additions, 2 deletionssrc/app/components/formats/list/formats.component.html
- src/app/components/formats/list/formats.component.ts 23 additions, 11 deletionssrc/app/components/formats/list/formats.component.ts
- src/app/components/index.ts 9 additions, 0 deletionssrc/app/components/index.ts
- src/app/components/menu/menu.component.html 7 additions, 0 deletionssrc/app/components/menu/menu.component.html
- src/app/components/organizations/edit/organization-form.component.ts 0 additions, 1 deletion...ponents/organizations/edit/organization-form.component.ts
- src/app/components/organizations/list/organizations.component.ts 21 additions, 12 deletions.../components/organizations/list/organizations.component.ts
- src/app/components/resources/list/resources.component.ts 23 additions, 11 deletionssrc/app/components/resources/list/resources.component.ts
- src/app/components/reuses/detail/reuse-detail.component.html 67 additions, 0 deletionssrc/app/components/reuses/detail/reuse-detail.component.html
- src/app/components/reuses/detail/reuse-detail.component.scss 21 additions, 0 deletionssrc/app/components/reuses/detail/reuse-detail.component.scss
- src/app/components/reuses/detail/reuse-detail.component.ts 34 additions, 0 deletionssrc/app/components/reuses/detail/reuse-detail.component.ts
- src/app/components/reuses/edit/reuse-form.component.html 126 additions, 0 deletionssrc/app/components/reuses/edit/reuse-form.component.html
- src/app/components/reuses/edit/reuse-form.component.scss 43 additions, 0 deletionssrc/app/components/reuses/edit/reuse-form.component.scss
- src/app/components/reuses/edit/reuse-form.component.ts 231 additions, 0 deletionssrc/app/components/reuses/edit/reuse-form.component.ts
- src/app/components/reuses/list/reuses.component.html 112 additions, 0 deletionssrc/app/components/reuses/list/reuses.component.html
Loading
Please register or sign in to comment