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
b1252861
Unverified
Commit
b1252861
authored
4 years ago
by
Mahesh Kumar Gangula
Committed by
GitHub
4 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #359 from project-sunbird/merge-release-3.1.0
Merge R 3.1.0 to R 3.2.0
parents
e12e56df
f0a83f6d
No related merge requests found
Changes
33
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
content-api/content-actors/src/main/scala/org/sunbird/content/actors/ContentActor.scala
+1
-0
.../main/scala/org/sunbird/content/actors/ContentActor.scala
content-api/content-actors/src/main/scala/org/sunbird/content/upload/mgr/UploadManager.scala
+3
-1
.../scala/org/sunbird/content/upload/mgr/UploadManager.scala
content-api/content-actors/src/main/scala/org/sunbird/content/util/CopyManager.scala
+3
-2
...src/main/scala/org/sunbird/content/util/CopyManager.scala
content-api/content-service/app/controllers/v3/ContentController.scala
+5
-2
...ontent-service/app/controllers/v3/ContentController.scala
content-api/content-service/conf/routes
+1
-1
content-api/content-service/conf/routes
content-api/content-service/test/controllers/v3/ContentSpec.scala
+15
-2
...api/content-service/test/controllers/v3/ContentSpec.scala
platform-modules/mimetype-manager/pom.xml
+4
-0
platform-modules/mimetype-manager/pom.xml
platform-modules/mimetype-manager/src/main/scala/org/sunbird/mimetype/factory/MimeTypeManagerFactory.scala
+6
-2
...org/sunbird/mimetype/factory/MimeTypeManagerFactory.scala
platform-modules/mimetype-manager/src/main/scala/org/sunbird/mimetype/mgr/BaseMimeTypeManager.scala
+4
-3
.../scala/org/sunbird/mimetype/mgr/BaseMimeTypeManager.scala
platform-modules/mimetype-manager/src/main/scala/org/sunbird/mimetype/mgr/MimeTypeManager.scala
+5
-2
...main/scala/org/sunbird/mimetype/mgr/MimeTypeManager.scala
platform-modules/mimetype-manager/src/main/scala/org/sunbird/mimetype/mgr/impl/ApkMimeTypeMgrImpl.scala
+3
-2
...la/org/sunbird/mimetype/mgr/impl/ApkMimeTypeMgrImpl.scala
platform-modules/mimetype-manager/src/main/scala/org/sunbird/mimetype/mgr/impl/AssetMimeTypeMgrImpl.scala
+6
-4
.../org/sunbird/mimetype/mgr/impl/AssetMimeTypeMgrImpl.scala
platform-modules/mimetype-manager/src/main/scala/org/sunbird/mimetype/mgr/impl/CollectionMimeTypeMgrImpl.scala
+3
-2
...sunbird/mimetype/mgr/impl/CollectionMimeTypeMgrImpl.scala
platform-modules/mimetype-manager/src/main/scala/org/sunbird/mimetype/mgr/impl/DefaultMimeTypeMgrImpl.scala
+9
-6
...rg/sunbird/mimetype/mgr/impl/DefaultMimeTypeMgrImpl.scala
platform-modules/mimetype-manager/src/main/scala/org/sunbird/mimetype/mgr/impl/DocumentMimeTypeMgrImpl.scala
+3
-2
...g/sunbird/mimetype/mgr/impl/DocumentMimeTypeMgrImpl.scala
platform-modules/mimetype-manager/src/main/scala/org/sunbird/mimetype/mgr/impl/EcmlMimeTypeMgrImpl.scala
+4
-3
...a/org/sunbird/mimetype/mgr/impl/EcmlMimeTypeMgrImpl.scala
platform-modules/mimetype-manager/src/main/scala/org/sunbird/mimetype/mgr/impl/H5PMimeTypeMgrImpl.scala
+21
-10
...la/org/sunbird/mimetype/mgr/impl/H5PMimeTypeMgrImpl.scala
platform-modules/mimetype-manager/src/main/scala/org/sunbird/mimetype/mgr/impl/HtmlMimeTypeMgrImpl.scala
+4
-3
...a/org/sunbird/mimetype/mgr/impl/HtmlMimeTypeMgrImpl.scala
platform-modules/mimetype-manager/src/main/scala/org/sunbird/mimetype/mgr/impl/PluginMimeTypeMgrImpl.scala
+4
-3
...org/sunbird/mimetype/mgr/impl/PluginMimeTypeMgrImpl.scala
platform-modules/mimetype-manager/src/main/scala/org/sunbird/mimetype/mgr/impl/YouTubeMimeTypeMgrImpl.scala
+3
-2
...rg/sunbird/mimetype/mgr/impl/YouTubeMimeTypeMgrImpl.scala
with
107 additions
and
52 deletions
+107
-52
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
