Commit 81837c33 authored 3 years ago by Tifenn Guillas

Merge with develop

parents d2ffc3c9 17ab8934

No related branches found

No related tags found

2 merge requests!29Develop,!4Resolve "Add tests for instance documentation module"

Hide whitespace changes

Inline Side-by-side

Showing

client/src/app/admin/admin-routing.module.ts 13 additions, 7 deletions

client/src/app/admin/admin-routing.module.ts
client/src/app/admin/admin.component.ts 15 additions, 3 deletions

client/src/app/admin/admin.component.ts
client/src/app/admin/components/criteria-family/criteria-family-form.component.html 4 additions, 0 deletions

...nents/criteria-family/criteria-family-form.component.html
client/src/app/admin/components/criteria-family/criteria-family-form.component.ts 2 additions, 1 deletion

...ponents/criteria-family/criteria-family-form.component.ts
client/src/app/admin/components/dataset-family/dataset-family-form.component.html 4 additions, 0 deletions

...ponents/dataset-family/dataset-family-form.component.html
client/src/app/admin/components/dataset-family/dataset-family-form.component.ts 2 additions, 1 deletion

...omponents/dataset-family/dataset-family-form.component.ts
client/src/app/admin/components/instance/design-form-group.component.html 16 additions, 0 deletions

...dmin/components/instance/design-form-group.component.html
client/src/app/admin/components/instance/design-form-group.component.ts 19 additions, 0 deletions

.../admin/components/instance/design-form-group.component.ts
client/src/app/admin/components/instance/index.ts 2 additions, 0 deletions

client/src/app/admin/components/instance/index.ts
client/src/app/admin/components/instance/instance-form.component.html 1 addition, 0 deletions

...pp/admin/components/instance/instance-form.component.html
client/src/app/admin/components/instance/instance-form.component.ts 5 additions, 0 deletions

.../app/admin/components/instance/instance-form.component.ts
client/src/app/admin/components/output-family/output-family-form.component.html 4 additions, 0 deletions

...omponents/output-family/output-family-form.component.html
client/src/app/admin/components/output-family/output-family-form.component.ts 2 additions, 1 deletion

.../components/output-family/output-family-form.component.ts
client/src/app/admin/containers/attribute/attribute-list.component.ts 4 additions, 10 deletions

...pp/admin/containers/attribute/attribute-list.component.ts
client/src/app/admin/containers/database/database-list.component.ts 2 additions, 8 deletions

.../app/admin/containers/database/database-list.component.ts
client/src/app/admin/containers/database/edit-database.component.ts 2 additions, 6 deletions

.../app/admin/containers/database/edit-database.component.ts
client/src/app/admin/containers/dataset/dataset-list.component.html 27 additions, 0 deletions

.../app/admin/containers/dataset/dataset-list.component.html
client/src/app/admin/containers/dataset/dataset-list.component.ts 59 additions, 0 deletions

...rc/app/admin/containers/dataset/dataset-list.component.ts
client/src/app/admin/containers/dataset/edit-dataset.component.ts 0 additions, 5 deletions

...rc/app/admin/containers/dataset/edit-dataset.component.ts
client/src/app/admin/containers/dataset/new-dataset.component.ts 0 additions, 4 deletions

...src/app/admin/containers/dataset/new-dataset.component.ts

with 183 additions and 46 deletions

Please register or to comment