Merge branches 'datalog-research-input' and 'updated-datalog-research-input'...
Merge branches 'datalog-research-input' and 'updated-datalog-research-input' of https://gitlab.alpha.grandlyon.com/refonte-data/admin-gui into datalog-research-input # Conflicts: # src/app/app.module.ts # src/app/app.routing.module.ts # src/app/components/index.ts # src/app/components/menu/menu.component.html # src/app/services/app-config.service.ts # src/assets/config/config.json
No related branches found
No related tags found
Showing
- .gitignore 2 additions, 5 deletions.gitignore
- config/config-dev.json 7 additions, 1 deletionconfig/config-dev.json
- config/config-rec.json 7 additions, 1 deletionconfig/config-rec.json
- package-lock.json 64 additions, 20 deletionspackage-lock.json
- package.json 2 additions, 1 deletionpackage.json
- src/app/app.component.ts 0 additions, 1 deletionsrc/app/app.component.ts
- src/app/app.module.ts 7 additions, 1 deletionsrc/app/app.module.ts
- src/app/app.routing.module.ts 66 additions, 1 deletionsrc/app/app.routing.module.ts
- src/app/components/changelog/detail/changelog-detail.component.html 61 additions, 0 deletions...mponents/changelog/detail/changelog-detail.component.html
- src/app/components/changelog/detail/changelog-detail.component.scss 11 additions, 0 deletions...mponents/changelog/detail/changelog-detail.component.scss
- src/app/components/changelog/detail/changelog-detail.component.ts 31 additions, 0 deletions...components/changelog/detail/changelog-detail.component.ts
- src/app/components/changelog/edit/changelog-form.component.html 124 additions, 0 deletions...p/components/changelog/edit/changelog-form.component.html
- src/app/components/changelog/edit/changelog-form.component.scss 43 additions, 0 deletions...p/components/changelog/edit/changelog-form.component.scss
- src/app/components/changelog/edit/changelog-form.component.ts 145 additions, 0 deletions...app/components/changelog/edit/changelog-form.component.ts
- src/app/components/changelog/list/changelog.component.html 90 additions, 0 deletionssrc/app/components/changelog/list/changelog.component.html
- src/app/components/changelog/list/changelog.component.scss 0 additions, 0 deletionssrc/app/components/changelog/list/changelog.component.scss
- src/app/components/changelog/list/changelog.component.ts 133 additions, 0 deletionssrc/app/components/changelog/list/changelog.component.ts
- src/app/components/confirmation-modal/confirmation-modal.component.html 13 additions, 0 deletions...ents/confirmation-modal/confirmation-modal.component.html
- src/app/components/confirmation-modal/confirmation-modal.component.scss 8 additions, 0 deletions...ents/confirmation-modal/confirmation-modal.component.scss
- src/app/components/confirmation-modal/confirmation-modal.component.ts 38 additions, 0 deletions...onents/confirmation-modal/confirmation-modal.component.ts
Loading
Please register or sign in to comment