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
1d444ba9
Commit
1d444ba9
authored
3 years ago
by
amitpriyadarshi
Browse files
Options
Download
Plain Diff
Merge branch 'release-3.9.0' into release-4.0.0
parents
8a204f81
5bbfc797
Changes
20
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
content-api/hierarchy-manager/src/main/scala/org/sunbird/managers/HierarchyManager.scala
+5
-5
...rc/main/scala/org/sunbird/managers/HierarchyManager.scala
definition-scripts/Goals.sh
+52
-0
definition-scripts/Goals.sh
definition-scripts/Playlist.sh
+52
-0
definition-scripts/Playlist.sh
definition-scripts/master_category_create
+20
-0
definition-scripts/master_category_create
ontology-engine/graph-engine_2.11/src/main/scala/org/sunbird/graph/schema/CategoryDefinitionValidator.scala
+8
-6
...rg/sunbird/graph/schema/CategoryDefinitionValidator.scala
ontology-engine/graph-engine_2.11/src/main/scala/org/sunbird/graph/schema/DefinitionDTO.scala
+1
-1
...c/main/scala/org/sunbird/graph/schema/DefinitionDTO.scala
ontology-engine/graph-engine_2.11/src/main/scala/org/sunbird/graph/schema/DefinitionFactory.scala
+3
-2
...in/scala/org/sunbird/graph/schema/DefinitionFactory.scala
ontology-engine/graph-engine_2.11/src/main/scala/org/sunbird/graph/schema/DefinitionNode.scala
+35
-26
.../main/scala/org/sunbird/graph/schema/DefinitionNode.scala
ontology-engine/graph-engine_2.11/src/main/scala/org/sunbird/graph/schema/IDefinition.scala
+2
-2
...src/main/scala/org/sunbird/graph/schema/IDefinition.scala
ontology-engine/graph-engine_2.11/src/main/scala/org/sunbird/graph/schema/ObjectCategoryDefinition.scala
+3
-0
...a/org/sunbird/graph/schema/ObjectCategoryDefinition.scala
ontology-engine/graph-engine_2.11/src/main/scala/org/sunbird/graph/schema/validator/BaseDefinitionNode.scala
+2
-2
...g/sunbird/graph/schema/validator/BaseDefinitionNode.scala
ontology-engine/graph-engine_2.11/src/main/scala/org/sunbird/graph/utils/NodeUtil.scala
+4
-4
....11/src/main/scala/org/sunbird/graph/utils/NodeUtil.scala
platform-core/platform-telemetry/src/main/java/org/sunbird/telemetry/util/TelemetryAccessEventUtil.java
+2
-2
.../org/sunbird/telemetry/util/TelemetryAccessEventUtil.java
platform-modules/mimetype-manager/pom.xml
+1
-1
platform-modules/mimetype-manager/pom.xml
platform-modules/mimetype-manager/src/main/scala/org/sunbird/cloudstore/StorageService.scala
+11
-1
...rc/main/scala/org/sunbird/cloudstore/StorageService.scala
platform-modules/mimetype-manager/src/main/scala/org/sunbird/mimetype/ecml/processor/XmlParser.scala
+1
-1
...scala/org/sunbird/mimetype/ecml/processor/XmlParser.scala
platform-modules/mimetype-manager/src/main/scala/org/sunbird/mimetype/mgr/impl/H5PMimeTypeMgrImpl.scala
+1
-1
...la/org/sunbird/mimetype/mgr/impl/H5PMimeTypeMgrImpl.scala
schemas/asset/1.0/schema.json
+2
-1
schemas/asset/1.0/schema.json
schemas/collection/1.0/schema.json
+43
-0
schemas/collection/1.0/schema.json
schemas/content/1.0/schema.json
+45
-1
schemas/content/1.0/schema.json
with
293 additions
and
56 deletions
+293
-56
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