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
fde33892
Unverified
Commit
fde33892
authored
3 years ago
by
AMIT KUMAR
Committed by
GitHub
3 years ago
Browse files
Options
Download
Patches
Plain Diff
SB-28331 : Merge Release 4.6.0 to Master (#1031)
Merge Release 4.6.0 to Master
parent
2fe3b794
Changes
30
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
controller/app/controllers/usermanagement/validator/UserRoleRequestValidator.java
+35
-0
...rs/usermanagement/validator/UserRoleRequestValidator.java
controller/test/controllers/usermanagement/UserRoleControllerTest.java
+105
-0
...st/controllers/usermanagement/UserRoleControllerTest.java
controller/test/controllers/usermanagement/validator/UserRoleRequestValidatorTest.java
+66
-0
...sermanagement/validator/UserRoleRequestValidatorTest.java
core/es-utils/pom.xml
+1
-1
core/es-utils/pom.xml
core/platform-common/pom.xml
+4
-0
core/platform-common/pom.xml
core/platform-common/src/main/java/org/sunbird/keys/JsonKey.java
+8
-5
...atform-common/src/main/java/org/sunbird/keys/JsonKey.java
core/platform-common/src/main/resources/externalresource.properties
+2
-1
...orm-common/src/main/resources/externalresource.properties
service/pom.xml
+10
-0
service/pom.xml
service/src/main/java/org/sunbird/actor/organisation/OrganisationManagementActor.java
+4
-2
...nbird/actor/organisation/OrganisationManagementActor.java
service/src/main/java/org/sunbird/actor/user/ManagedUserActor.java
+1
-2
...rc/main/java/org/sunbird/actor/user/ManagedUserActor.java
service/src/main/java/org/sunbird/actor/user/SSUUserCreateActor.java
+1
-2
.../main/java/org/sunbird/actor/user/SSUUserCreateActor.java
service/src/main/java/org/sunbird/actor/user/UserSelfDeclarationManagementActor.java
+4
-0
...unbird/actor/user/UserSelfDeclarationManagementActor.java
service/src/main/java/org/sunbird/actor/user/UserTnCActor.java
+4
-6
...ce/src/main/java/org/sunbird/actor/user/UserTnCActor.java
service/src/main/java/org/sunbird/client/NotificationServiceClient.java
+5
-5
...in/java/org/sunbird/client/NotificationServiceClient.java
service/src/main/java/org/sunbird/service/organisation/OrgService.java
+1
-3
...ain/java/org/sunbird/service/organisation/OrgService.java
service/src/main/java/org/sunbird/service/organisation/impl/OrgServiceImpl.java
+31
-72
...org/sunbird/service/organisation/impl/OrgServiceImpl.java
service/src/main/java/org/sunbird/service/user/UserProfileReadService.java
+2
-2
...java/org/sunbird/service/user/UserProfileReadService.java
service/src/main/java/org/sunbird/service/user/UserRoleService.java
+2
-0
...c/main/java/org/sunbird/service/user/UserRoleService.java
service/src/main/java/org/sunbird/service/user/UserTncService.java
+17
-55
...rc/main/java/org/sunbird/service/user/UserTncService.java
service/src/main/java/org/sunbird/service/user/impl/UserRoleServiceImpl.java
+6
-0
...va/org/sunbird/service/user/impl/UserRoleServiceImpl.java
with
309 additions
and
156 deletions
+309
-156
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
