Merge branch 'master' into feature/state_variables
# Conflicts: # projects/editor/src/app/app.module.ts # projects/editor/src/app/services/dialog.service.ts # projects/editor/src/app/services/unit.service.ts
No related branches found
No related tags found
Showing
- docs/unit_definition_changelog.txt 3 additions, 0 deletionsdocs/unit_definition_changelog.txt
- projects/common/components/reference-list.component.ts 50 additions, 0 deletionsprojects/common/components/reference-list.component.ts
- projects/common/models/elements/element.ts 1 addition, 1 deletionprojects/common/models/elements/element.ts
- projects/common/models/elements/text/text.ts 11 additions, 0 deletionsprojects/common/models/elements/text/text.ts
- projects/common/services/message.service.ts 37 additions, 2 deletionsprojects/common/services/message.service.ts
- projects/common/shared.module.ts 12 additions, 5 deletionsprojects/common/shared.module.ts
- projects/editor/src/app/app.module.ts 4 additions, 1 deletionprojects/editor/src/app/app.module.ts
- projects/editor/src/app/components/canvas/section-menu.component.ts 26 additions, 10 deletions...ditor/src/app/components/canvas/section-menu.component.ts
- projects/editor/src/app/components/dialogs/confirmation-dialog.component.ts 5 additions, 4 deletions...c/app/components/dialogs/confirmation-dialog.component.ts
- projects/editor/src/app/components/dialogs/delete-reference-dialog.component.ts 31 additions, 0 deletions...p/components/dialogs/delete-reference-dialog.component.ts
- projects/editor/src/app/components/unit-view/unit-view.component.css 4 additions, 0 deletions...itor/src/app/components/unit-view/unit-view.component.css
- projects/editor/src/app/components/unit-view/unit-view.component.ts 40 additions, 2 deletions...ditor/src/app/components/unit-view/unit-view.component.ts
- projects/editor/src/app/services/dialog.service.ts 10 additions, 0 deletionsprojects/editor/src/app/services/dialog.service.ts
- projects/editor/src/app/services/reference-manager.spec.ts 181 additions, 0 deletionsprojects/editor/src/app/services/reference-manager.spec.ts
- projects/editor/src/app/services/reference-manager.ts 147 additions, 4 deletionsprojects/editor/src/app/services/reference-manager.ts
- projects/editor/src/app/services/unit.service.ts 108 additions, 39 deletionsprojects/editor/src/app/services/unit.service.ts
- test-data/unit-definitions/reference-testing/2elements-ref.json 1 addition, 0 deletions...ata/unit-definitions/reference-testing/2elements-ref.json
- test-data/unit-definitions/reference-testing/cloze.json 1 addition, 0 deletionstest-data/unit-definitions/reference-testing/cloze.json
- test-data/unit-definitions/reference-testing/cloze2.json 1 addition, 0 deletionstest-data/unit-definitions/reference-testing/cloze2.json
- test-data/unit-definitions/reference-testing/element-ref.json 1 addition, 0 deletions...-data/unit-definitions/reference-testing/element-ref.json
Loading
Please register or sign in to comment