Skip to content
GitLab
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
8e2be12a
Commit
8e2be12a
authored
3 years ago
by
Kumar Gauraw
Browse files
Options
Download
Plain Diff
Merge branch 'release-4.7.0' into sl-4.7.0
parents
a8cace17
4a9ee368
Changes
15
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
content-api/content-actors/src/test/scala/org/sunbird/content/actors/TestContentActor.scala
+1
-1
...t/scala/org/sunbird/content/actors/TestContentActor.scala
content-api/content-service/app/controllers/v4/AssetController.scala
+1
-1
.../content-service/app/controllers/v4/AssetController.scala
content-api/content-service/app/controllers/v4/CollectionController.scala
+2
-2
...ent-service/app/controllers/v4/CollectionController.scala
content-api/content-service/app/controllers/v4/ContentController.scala
+4
-4
...ontent-service/app/controllers/v4/ContentController.scala
content-api/hierarchy-manager/src/main/scala/org/sunbird/managers/HierarchyManager.scala
+178
-88
...rc/main/scala/org/sunbird/managers/HierarchyManager.scala
content-api/hierarchy-manager/src/main/scala/org/sunbird/managers/UpdateHierarchyManager.scala
+23
-6
...n/scala/org/sunbird/managers/UpdateHierarchyManager.scala
content-api/hierarchy-manager/src/main/scala/org/sunbird/utils/HierarchyConstants.scala
+2
-0
...src/main/scala/org/sunbird/utils/HierarchyConstants.scala
content-api/hierarchy-manager/src/test/scala/org/sunbird/managers/TestHierarchy.scala
+37
-9
...r/src/test/scala/org/sunbird/managers/TestHierarchy.scala
content-api/hierarchy-manager/src/test/scala/org/sunbird/managers/TestUpdateHierarchy.scala
+4
-2
...test/scala/org/sunbird/managers/TestUpdateHierarchy.scala
ontology-engine/graph-core_2.11/src/test/scala/org/sunbird/graph/BaseSpec.scala
+1
-1
...core_2.11/src/test/scala/org/sunbird/graph/BaseSpec.scala
ontology-engine/graph-engine_2.11/src/test/scala/org/sunbird/graph/BaseSpec.scala
+1
-1
...gine_2.11/src/test/scala/org/sunbird/graph/BaseSpec.scala
schemas/collection/1.0/config.json
+3
-0
schemas/collection/1.0/config.json
schemas/relationalmetadata/1.0/config.json
+12
-0
schemas/relationalmetadata/1.0/config.json
schemas/relationalmetadata/1.0/schema.json
+31
-0
schemas/relationalmetadata/1.0/schema.json
search-api/search-core/src/main/java/org/sunbird/search/client/ElasticSearchUtil.java
+36
-28
...ain/java/org/sunbird/search/client/ElasticSearchUtil.java
with
336 additions
and
143 deletions
+336
-143
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
