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
UPHRH-lms-service
Commits
2a7c5e5d
Unverified
Commit
2a7c5e5d
authored
2 years ago
by
Reshmi V Nair
Committed by
GitHub
2 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #522 from BharathwajShankar/merge_pr_master
Merge pr master
parents
ce0a33d1
efc29da4
master
bootcamp
helmchart
release-5.2.0
release-5.2.1
release-5.3.0
release-5.3.1
release-5.4.0
release-5.3.1_RC1
release-5.3.0_RC1
release-5.2.0_RC2
release-5.2.0_RC1
No related merge requests found
Changes
14
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
course-mw/course-actors-common/src/main/java/org/sunbird/learner/constants/CourseJsonKey.java
+0
-2
...ain/java/org/sunbird/learner/constants/CourseJsonKey.java
course-mw/course-actors/src/main/java/org/sunbird/learner/actors/coursebatch/CourseBatchManagementActor.java
+2
-1
...earner/actors/coursebatch/CourseBatchManagementActor.java
course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/models/util/GeoLocationJsonKey.java
+0
-1
...va/org/sunbird/common/models/util/GeoLocationJsonKey.java
course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/models/util/JsonKey.java
+16
-80
...src/main/java/org/sunbird/common/models/util/JsonKey.java
course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/models/util/LearnerServiceUrls.java
+0
-52
...va/org/sunbird/common/models/util/LearnerServiceUrls.java
course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/request/BaseRequestValidator.java
+8
-4
...java/org/sunbird/common/request/BaseRequestValidator.java
course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/resources/application.conf
+3
-0
...form-core/common-util/src/main/resources/application.conf
course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/resources/externalresource.properties
+2
-83
...ommon-util/src/main/resources/externalresource.properties
service/app/modules/OnRequestHandler.java
+11
-2
service/app/modules/OnRequestHandler.java
service/conf/application.conf
+2
-0
service/conf/application.conf
service/test/controllers/LearnerControllerTest.java
+10
-6
service/test/controllers/LearnerControllerTest.java
service/test/controllers/cache/CacheControllerTest.java
+5
-0
service/test/controllers/cache/CacheControllerTest.java
service/test/controllers/courseenrollment/CourseEnrollmentControllerTest.java
+42
-32
...lers/courseenrollment/CourseEnrollmentControllerTest.java
service/test/controllers/courseenrollment/CourseEnrollmentControllerTest2.java
+22
-16
...ers/courseenrollment/CourseEnrollmentControllerTest2.java
with
123 additions
and
279 deletions
+123
-279
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
