Merge branch 'master' into feature/schemer
# Conflicts: # projects/common/models/elements/compound-elements/cloze/cloze-child-elements/drop-list-simple.ts # projects/common/models/elements/compound-elements/cloze/cloze-child-elements/text-field-simple.ts # projects/common/models/elements/compound-elements/cloze/cloze-child-elements/toggle-button.ts # projects/common/models/elements/compound-elements/likert/likert-row.ts # projects/common/models/elements/element.ts # 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-complex.ts # projects/common/models/elements/input-elements/radio-button-group.ts # projects/common/models/elements/input-elements/slider.ts # projects/common/models/elements/input-elements/spell-correct.ts # projects/common/models/elements/input-elements/text-area.ts # projects/common/models/elements/input-elements/text-field.ts # projects/common/models/elements/text/text.ts # projects/common/models/section.ts # projects/editor/src/app/services/verona-api.service.ts
No related branches found
No related tags found
Showing
- package-lock.json 850 additions, 865 deletionspackage-lock.json
- package.json 31 additions, 23 deletionspackage.json
- projects/common/assets/common-styles.css 11 additions, 0 deletionsprojects/common/assets/common-styles.css
- projects/common/components/button/button.component.ts 1 addition, 0 deletionsprojects/common/components/button/button.component.ts
- projects/common/components/compound-elements/cloze/cloze-child-elements/drop-list-simple.component.ts 1 addition, 0 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, 1 deletion...cloze/cloze-child-elements/text-field-simple.component.ts
- projects/common/components/compound-elements/cloze/cloze-child-elements/toggle-button.component.ts 8 additions, 5 deletions...nts/cloze/cloze-child-elements/toggle-button.component.ts
- projects/common/components/compound-elements/cloze/cloze.component.ts 0 additions, 3 deletions...mon/components/compound-elements/cloze/cloze.component.ts
- projects/common/components/compound-elements/likert/likert-radio-button-group.component.ts 6 additions, 6 deletions...nd-elements/likert/likert-radio-button-group.component.ts
- projects/common/components/compound-elements/likert/likert.component.ts 28 additions, 11 deletions...n/components/compound-elements/likert/likert.component.ts
- projects/common/components/frame/frame.component.ts 6 additions, 3 deletionsprojects/common/components/frame/frame.component.ts
- projects/common/components/input-elements/checkbox.component.ts 2 additions, 2 deletions...ts/common/components/input-elements/checkbox.component.ts
- projects/common/components/input-elements/drop-list.component.ts 10 additions, 10 deletions...s/common/components/input-elements/drop-list.component.ts
- projects/common/components/input-elements/radio-button-group.component.ts 3 additions, 3 deletions...components/input-elements/radio-button-group.component.ts
- projects/common/components/input-elements/radio-group-images.component.ts 31 additions, 55 deletions...components/input-elements/radio-group-images.component.ts
- projects/common/components/input-elements/slider.component.ts 4 additions, 16 deletions...ects/common/components/input-elements/slider.component.ts
- projects/common/components/input-elements/text-area.component.ts 1 addition, 1 deletion...s/common/components/input-elements/text-area.component.ts
- projects/common/components/media-elements/media-player-control-bar/media-player-control-bar.component.ts 18 additions, 5 deletions...-player-control-bar/media-player-control-bar.component.ts
- projects/common/directives/media-player-element-component.directive.ts 1 addition, 1 deletion...on/directives/media-player-element-component.directive.ts
- projects/common/models/elements/button/button.ts 4 additions, 2 deletionsprojects/common/models/elements/button/button.ts
Loading
Please register or sign in to comment