Merge branch 'master' into feature/schemer
# Conflicts: # projects/common/models/elements/input-elements/checkbox.ts # projects/common/models/elements/input-elements/drop-list.ts # projects/common/models/elements/input-elements/dropdown.ts # projects/common/models/elements/input-elements/radio-button-group.ts # projects/common/models/elements/input-elements/slider.ts # projects/common/models/elements/text/text.ts # projects/editor/src/app/services/unit.service.ts
No related branches found
No related tags found
Showing
- docs/release-notes-editor.txt 66 additions, 0 deletionsdocs/release-notes-editor.txt
- docs/release-notes-player.txt 19 additions, 0 deletionsdocs/release-notes-player.txt
- package-lock.json 778 additions, 369 deletionspackage-lock.json
- package.json 17 additions, 17 deletionspackage.json
- projects/common/components/compound-elements/cloze/cloze-child-elements/drop-list-simple.component.ts 11 additions, 5 deletions.../cloze/cloze-child-elements/drop-list-simple.component.ts
- projects/common/components/compound-elements/cloze/cloze-child-elements/text-field-simple.component.ts 3 additions, 3 deletions...cloze/cloze-child-elements/text-field-simple.component.ts
- projects/common/components/compound-elements/cloze/cloze.component.ts 4 additions, 12 deletions...mon/components/compound-elements/cloze/cloze.component.ts
- projects/common/components/input-elements/drop-list.component.ts 2 additions, 2 deletions...s/common/components/input-elements/drop-list.component.ts
- projects/common/components/input-elements/spell-correct.component.ts 3 additions, 3 deletions...mmon/components/input-elements/spell-correct.component.ts
- projects/common/components/input-elements/text-area.component.ts 3 additions, 3 deletions...s/common/components/input-elements/text-area.component.ts
- projects/common/components/input-elements/text-field.component.ts 3 additions, 3 deletions.../common/components/input-elements/text-field.component.ts
- projects/common/models/elements/button/button.ts 9 additions, 5 deletionsprojects/common/models/elements/button/button.ts
- projects/common/models/elements/compound-elements/cloze/cloze-child-elements/drop-list-simple.ts 6 additions, 3 deletions...d-elements/cloze/cloze-child-elements/drop-list-simple.ts
- projects/common/models/elements/compound-elements/cloze/cloze-child-elements/text-field-simple.ts 19 additions, 9 deletions...-elements/cloze/cloze-child-elements/text-field-simple.ts
- projects/common/models/elements/compound-elements/cloze/cloze-child-elements/toggle-button.ts 6 additions, 3 deletions...ound-elements/cloze/cloze-child-elements/toggle-button.ts
- projects/common/models/elements/compound-elements/cloze/cloze.ts 77 additions, 12 deletions...s/common/models/elements/compound-elements/cloze/cloze.ts
- projects/common/models/elements/compound-elements/cloze/tiptap-editor-extensions/drop-list.ts 4 additions, 2 deletions...ound-elements/cloze/tiptap-editor-extensions/drop-list.ts
- projects/common/models/elements/compound-elements/cloze/tiptap-editor-extensions/text-field.ts 4 additions, 1 deletion...und-elements/cloze/tiptap-editor-extensions/text-field.ts
- projects/common/models/elements/compound-elements/cloze/tiptap-editor-extensions/toggle-button.ts 2 additions, 2 deletions...-elements/cloze/tiptap-editor-extensions/toggle-button.ts
- projects/common/models/elements/compound-elements/likert/likert-row.ts 23 additions, 4 deletions...on/models/elements/compound-elements/likert/likert-row.ts
Loading
Please register or sign in to comment