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
3d78403a
Commit
3d78403a
authored
4 years ago
by
Pradyumna Nagendra
Browse files
Options
Download
Plain Diff
Merge branch 'release-3.4.0' into release-3.5.0
parents
e09bb243
679311a5
No related merge requests found
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
content-api/content-actors/src/main/scala/org/sunbird/channel/managers/ChannelManager.scala
+24
-7
...n/scala/org/sunbird/channel/managers/ChannelManager.scala
content-api/content-actors/src/main/scala/org/sunbird/content/actors/AssetActor.scala
+28
-0
...rc/main/scala/org/sunbird/content/actors/AssetActor.scala
content-api/content-actors/src/main/scala/org/sunbird/content/util/AssetConstants.scala
+19
-0
.../main/scala/org/sunbird/content/util/AssetConstants.scala
content-api/content-actors/src/main/scala/org/sunbird/content/util/AssetCopyManager.scala
+89
-0
...ain/scala/org/sunbird/content/util/AssetCopyManager.scala
content-api/content-actors/src/test/scala/org/sunbird/content/actors/TestAssetActor.scala
+100
-0
...est/scala/org/sunbird/content/actors/TestAssetActor.scala
content-api/content-actors/src/test/scala/org/sunbird/content/util/TestAssetManager.scala
+113
-0
...est/scala/org/sunbird/content/util/TestAssetManager.scala
content-api/content-service/app/controllers/v4/AssetController.scala
+11
-1
.../content-service/app/controllers/v4/AssetController.scala
content-api/content-service/app/modules/ContentModule.scala
+2
-1
content-api/content-service/app/modules/ContentModule.scala
content-api/content-service/app/utils/ActorNames.scala
+1
-0
content-api/content-service/app/utils/ActorNames.scala
content-api/content-service/app/utils/ApiId.scala
+1
-0
content-api/content-service/app/utils/ApiId.scala
content-api/content-service/conf/application.conf
+21
-3
content-api/content-service/conf/application.conf
content-api/content-service/conf/routes
+1
-0
content-api/content-service/conf/routes
content-api/content-service/test/controllers/v4/AssetSpec.scala
+9
-0
...t-api/content-service/test/controllers/v4/AssetSpec.scala
content-api/content-service/test/modules/TestModule.scala
+1
-0
content-api/content-service/test/modules/TestModule.scala
definition-scripts/Explanation_collection.sh
+30
-0
definition-scripts/Explanation_collection.sh
definition-scripts/master_category_create
+118
-9
definition-scripts/master_category_create
schemas/asset/1.0/config.json
+1
-1
schemas/asset/1.0/config.json
with
569 additions
and
22 deletions
+569
-22
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
