Merge branch 'master' into 'rules-service' (428fe5ab) · Commits · wax / wax-prosemirror

Commit 428fe5ab authored 3 years ago by

Christos

Merge branch 'master' into 'rules-service'

# Conflicts:
#   wax-prosemirror-core/src/WaxView.js

parents 813932c8 00dee082

No related branches found

No related tags found

1 merge request!388config rules

Hide whitespace changes

Inline Side-by-side

Showing

editors/demo/src/NCBI/NCBI.js 60 additions, 7 deletions

editors/demo/src/NCBI/NCBI.js
editors/demo/src/NCBI/config/configEnter.js 60 additions, 0 deletions

editors/demo/src/NCBI/config/configEnter.js
editors/demo/src/NCBI/config/index.js 1 addition, 0 deletions

editors/demo/src/NCBI/config/index.js
editors/demo/src/NCBI/layout/EnterLayout.js 90 additions, 0 deletions

editors/demo/src/NCBI/layout/EnterLayout.js
editors/demo/src/NCBI/layout/index.js 1 addition, 0 deletions

editors/demo/src/NCBI/layout/index.js
wax-prosemirror-core/src/WaxView.js 3 additions, 9 deletions

wax-prosemirror-core/src/WaxView.js
wax-prosemirror-services/src/EssayService/components/EditorComponent.js 1 addition, 1 deletion

...r-services/src/EssayService/components/EditorComponent.js
wax-prosemirror-services/src/EssayService/components/EssayAnswerComponent.js 1 addition, 1 deletion

...vices/src/EssayService/components/EssayAnswerComponent.js
wax-prosemirror-services/src/EssayService/components/EssayQuestionComponent.js 1 addition, 1 deletion

...ces/src/EssayService/components/EssayQuestionComponent.js
wax-prosemirror-services/src/FillTheGapQuestionService/components/ContainerEditor.js 0 additions, 1 deletion

...c/FillTheGapQuestionService/components/ContainerEditor.js
wax-prosemirror-services/src/FillTheGapQuestionService/components/EditorComponent.js 1 addition, 1 deletion

...c/FillTheGapQuestionService/components/EditorComponent.js
wax-prosemirror-services/src/FillTheGapQuestionService/components/FillTheGapContainerComponent.js 1 addition, 1 deletion

...uestionService/components/FillTheGapContainerComponent.js
wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js 52 additions, 0 deletions

.../MatchingService/components/MatchingContainerComponent.js
wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/AnswerComponent.js 1 addition, 1 deletion

...ingleCorrectQuestionService/components/AnswerComponent.js
wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/AnswerComponent.js 1 addition, 1 deletion

...ce/TrueFalseQuestionService/components/AnswerComponent.js
wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/TrueFalseSwitch.js 1 addition, 1 deletion

...ce/TrueFalseQuestionService/components/TrueFalseSwitch.js
wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/AnswerComponent.js 1 addition, 1 deletion

...ingleCorrectQuestionService/components/AnswerComponent.js
wax-prosemirror-services/src/MultipleChoiceQuestionService/components/AnswerComponent.js 1 addition, 1 deletion

...ltipleChoiceQuestionService/components/AnswerComponent.js
wax-prosemirror-services/src/MultipleChoiceQuestionService/components/EditorComponent.js 0 additions, 1 deletion

...ltipleChoiceQuestionService/components/EditorComponent.js
wax-prosemirror-services/src/MultipleChoiceQuestionService/components/QuestionEditorComponent.js 0 additions, 1 deletion

...oiceQuestionService/components/QuestionEditorComponent.js

with 277 additions and 29 deletions

Please register or to comment