Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
knowledge-platform
Commits
aa6b6809
Unverified
Commit
aa6b6809
authored
3 years ago
by
Anil Gupta
Committed by
GitHub
3 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #780 from krgauraw/sl-4.6.0_temp
Merge Branch sl-4.6.0 to sl-4.7.0
parents
afa533d4
44e8aafa
s-debug
AmiableAnil-patch-1
Gcloud_copy
Gcloud_fix
Remove_unwantedCode_Gcloud_fix
bulk-upload-comptenecy-mapping
bulk-upload-excelsheet
bulk-upload-test_excel
bulk_upload
csp-migration
dependabot/maven/platform-core/platform-telemetry/ch.qos.logback-logback-core-1.2.9
dependabot/maven/search-api/search-core/org.apache.httpcomponents-httpclient-4.5.13
knowlg-friday
knowlg-oneclick
local-setup-kube
master
patch-1
patch-2
patch-3
poc_bulk_upload
qs-schema
rahul_bulk_upload_postgres
release-4.10.0
release-4.10.1
release-4.7.0
release-4.7.0-debug
release-4.8.0
release-4.8.0-debug
release-4.9.0
release-4.9.1
release-5.0.0
release-5.0.1
release-5.1.0
release-5.1.0-content
release-5.2.0
release-5.3.0
release-5.2.0_RC2
release-5.2.0_RC1
release-5.1.0_RC1
release-5.0.0_RC2
release-5.0.0_RC1
release-4.10.0_RC2
release-4.10.0_RC1
release-4.9.1_RC1
release-4.9.0_RC8
release-4.9.0_RC7
release-4.9.0_RC6
release-4.9.0_RC5
release-4.9.0_RC4
release-4.9.0_RC3
release-4.9.0_RC2
release-4.9.0_RC1
release-4.8.0_RC5
release-4.8.0_RC4
release-4.8.0_RC3
release-4.8.0_RC2
release-4.8.0_RC1
release-4.7.0_RC6
release-4.7.0_RC5
release-4.7.0_RC4
release-4.7.0_RC3
No related merge requests found
Changes
17
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
assessment-api/assessment-actors/src/main/scala/org/sunbird/actors/QuestionSetActor.scala
+5
-5
.../src/main/scala/org/sunbird/actors/QuestionSetActor.scala
assessment-api/assessment-actors/src/main/scala/org/sunbird/managers/AssessmentManager.scala
+13
-12
...c/main/scala/org/sunbird/managers/AssessmentManager.scala
assessment-api/qs-hierarchy-manager/src/main/scala/org/sunbird/managers/HierarchyManager.scala
+149
-33
...rc/main/scala/org/sunbird/managers/HierarchyManager.scala
assessment-api/qs-hierarchy-manager/src/main/scala/org/sunbird/managers/UpdateHierarchyManager.scala
+52
-3
...n/scala/org/sunbird/managers/UpdateHierarchyManager.scala
assessment-api/qs-hierarchy-manager/src/main/scala/org/sunbird/utils/HierarchyConstants.scala
+6
-0
...src/main/scala/org/sunbird/utils/HierarchyConstants.scala
ontology-engine/graph-core_2.11/src/main/scala/org/sunbird/graph/OntologyEngineContext.scala
+1
-1
.../main/scala/org/sunbird/graph/OntologyEngineContext.scala
ontology-engine/graph-engine_2.11/src/main/scala/org/sunbird/graph/schema/DefinitionNode.scala
+2
-1
.../main/scala/org/sunbird/graph/schema/DefinitionNode.scala
schemas/question/1.0/schema.json
+20
-0
schemas/question/1.0/schema.json
schemas/questionset/1.0/schema.json
+54
-0
schemas/questionset/1.0/schema.json
scripts/definition-scripts/Date.sh
+32
-0
scripts/definition-scripts/Date.sh
scripts/definition-scripts/Multiselect_Multiple_Choice_Question.sh
+32
-0
...efinition-scripts/Multiselect_Multiple_Choice_Question.sh
scripts/definition-scripts/Observation.sh
+54
-0
scripts/definition-scripts/Observation.sh
scripts/definition-scripts/Observation_With_Rubrics.sh
+54
-0
scripts/definition-scripts/Observation_With_Rubrics.sh
scripts/definition-scripts/Slider.sh
+32
-0
scripts/definition-scripts/Slider.sh
scripts/definition-scripts/Survey.sh
+54
-0
scripts/definition-scripts/Survey.sh
scripts/definition-scripts/Text.sh
+32
-0
scripts/definition-scripts/Text.sh
scripts/definition-scripts/master_category_create
+77
-0
scripts/definition-scripts/master_category_create
with
669 additions
and
55 deletions
+669
-55
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets