Skip to content
Snippets Groups Projects
Select Git revision
  • master
  • bugfix/ipad_audios
  • audio-test
  • e2e/options
  • templates2
  • e2e/droplist
  • aspect_unit_converter
  • spell_correct_readonly
  • regal
  • editor_fixes
  • cloze-formula-fix
  • refactor/text-area-math
  • temp
  • alias
  • unit-nav-button
  • feature/mark_with_click
  • release/editor_2.4.10+player_2.4.13
  • release/player_2.4.12
  • duplicate_elements
  • math-editor
  • editor/2.9.0+player/2.9.0
  • editor/2.9.0-beta2+player/2.9.0-beta2
  • editor/2.9.0-beta+player/2.9.0-beta
  • editor/2.8.0+player/2.8.0
  • editor/2.8.0-beta2+player/2.8.0-beta2
  • editor/2.8.0-beta+player/2.8.0-beta
  • editor/2.7.4+player/2.7.4
  • editor/2.7.3+player/2.7.3
  • editor/2.7.2+player/2.7.2
  • editor/2.7.1+player/2.7.1
  • editor/2.7.0+player/2.7.0
  • editor/2.6.4+player/2.6.4
  • editor/2.6.3+player/2.6.3
  • editor/2.6.2+player/2.6.2
  • editor/2.6.1+player/2.6.1
  • editor/2.6.0+player/2.6.0
  • editor/2.6.0-beta11+player/2.6.0-beta11
  • editor/2.6.0-beta10+player/2.6.0-beta10
  • editor/2.6.0-beta9+player/2.6.0-beta9
  • editor/2.7.0-beta+player/2.7.0-beta
40 results
Blame Permalink
  • jojohoch's avatar
    a58d9073
    Merge branch 'master' into feature/schemer · a58d9073
    jojohoch authored 
    # 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
    a58d9073
    History
    Merge branch 'master' into feature/schemer
    jojohoch authored 
    # 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
Code owners
Assign users and groups as approvers for specific file changes. Learn more.

Impressum | Datenschutzerklärung