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
sunbird-lms-service
Commits
63cb95bc
Unverified
Commit
63cb95bc
authored
2 years ago
by
AMIT KUMAR
Committed by
GitHub
2 years ago
Browse files
Options
Download
Patches
Plain Diff
Issue #SB-30586 feat:merge release4.10 to master (#1093)
parent
03edca26
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
core/es-utils/src/main/java/org/sunbird/common/ElasticSearchHelper.java
+8
-8
...src/main/java/org/sunbird/common/ElasticSearchHelper.java
core/es-utils/src/main/java/org/sunbird/common/ElasticSearchRestHighImpl.java
+8
-7
...in/java/org/sunbird/common/ElasticSearchRestHighImpl.java
core/es-utils/src/main/java/org/sunbird/dto/SearchDTO.java
+11
-0
core/es-utils/src/main/java/org/sunbird/dto/SearchDTO.java
core/es-utils/src/main/resources/mappings/org-mapping.json
+1
-1
core/es-utils/src/main/resources/mappings/org-mapping.json
core/platform-common/src/main/java/org/sunbird/keys/JsonKey.java
+2
-0
...atform-common/src/main/java/org/sunbird/keys/JsonKey.java
core/platform-common/src/main/resources/externalresource.properties
+3
-1
...orm-common/src/main/resources/externalresource.properties
service/src/main/java/org/sunbird/actor/bulkupload/OrgBulkUploadBackgroundJobActor.java
+13
-9
...ird/actor/bulkupload/OrgBulkUploadBackgroundJobActor.java
service/src/main/java/org/sunbird/actor/bulkupload/UserBulkUploadBackgroundJobActor.java
+8
-6
...rd/actor/bulkupload/UserBulkUploadBackgroundJobActor.java
service/src/main/java/org/sunbird/actor/notes/NotesManagementActor.java
+81
-114
...in/java/org/sunbird/actor/notes/NotesManagementActor.java
service/src/main/java/org/sunbird/actor/organisation/OrganisationManagementActor.java
+7
-4
...nbird/actor/organisation/OrganisationManagementActor.java
service/src/main/java/org/sunbird/actor/user/IdentifierFreeUpActor.java
+7
-0
...in/java/org/sunbird/actor/user/IdentifierFreeUpActor.java
service/src/main/java/org/sunbird/actor/user/UserUpdateActor.java
+31
-10
...src/main/java/org/sunbird/actor/user/UserUpdateActor.java
service/src/main/java/org/sunbird/service/user/ResetPasswordService.java
+3
-2
...n/java/org/sunbird/service/user/ResetPasswordService.java
service/src/main/java/org/sunbird/service/user/impl/UserOrgServiceImpl.java
+12
-12
...ava/org/sunbird/service/user/impl/UserOrgServiceImpl.java
service/src/test/java/org/sunbird/actor/user/IdentifierFreeUpActorTest.java
+31
-0
...ava/org/sunbird/actor/user/IdentifierFreeUpActorTest.java
service/src/test/java/org/sunbird/actor/user/UserUpdateActorTest.java
+26
-16
...test/java/org/sunbird/actor/user/UserUpdateActorTest.java
with
252 additions
and
190 deletions
+252
-190
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
