Unverified Commit 39d5249b authored by reshmi-nair's avatar reshmi-nair Committed by GitHub
Browse files

Merging release-4.0.0 to master (#855)


* SB-23169 draft changes of assign role api

* SB-23169 modified existing assign roles api inorder to support old request changes

* SB-23169 removed test case

* Merging from 3.9.0 to master (#820) (#829)

merge 3.9 to master

* Issue #SB-23899 feat:added new sms provider (#783)

* Issue #SB-23899 feat:added new sms provider

* Issue #SB-23899 feat:nic sms provider impl

* Issue #SB-22988 feat:fixed jsonKey for associationType (#830)

* Issue #SB-22988 feat:fixed jsonKey for associationType

* SC-2209 Removing phoneverified and email verified flags and updating 'flags value' logic (#811)

* Merge release-3.9.0

* SB-24240 (#807)

* SB-24240 added for better logging

* Sb 24446 (#809)

* Issue #SB-24446 feat:reverted logs for sms issue

* SC-2209 Remove phoneverified and email verified flags and update 'flags value' logic

* SB-24240 added logs (#810)

Fix for SB-24240 form api caching issue

* Update Util.java

* Update UserUtil.java

* SC-2209 Adding testcase for coverage

* SC-2209 Adding testcase for coverage

* SC-2209 Adding testcase for coverage

* Update UserTypeActor.java

* Update UserRequestValidator.java

* Update UserRequestValidator.java

* Update UserManagementActor.java

* Fixing Testcases

Co-authored-by: default avatarHari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>
Co-authored-by: default avatarAMIT KUMAR <amit.kumar@tarento.com>

* SB-23169 roles save part in ES

* SB-23169 modified existing assign roles api in-order to support request changes (#824)

* SB-23169 modified existing assign roles api inorder to support old request changes

* SB-23169 roles save part in ES

* SB-23171 user-read api changes for roles attribute (#831)

* SB-23169 modified existing assign roles api inorder to support old request changes

* SC-2214 (#832)

Purge unnecessary attributes from user and organisation tables

* SC-2266 Remove 4 unused APIs from learners (#833)

* SC-2266 Remove 4 unused APIs from learner

* Testcase fixes

Co-authored-by: default avatarHari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>

* SB-24689 changed user-mapping for roles sub-entity (#836)


* SB-24689 updating mapping

* SB-24689 user-mapping final change for roles sub-entity

* Issue #SB-000 feat:changed sync api for user roles (#835)

* Issue #SB-000 feat:changed sync api for user roles

* Issue #SB-000 feat:changed sync api for user roles

* Issue #SB-000 feat:changed sync api for user roles

* Sb 24762 (#834)

* Issue #SB-24762 feat:fix for association type

* Issue #SB-24762 feat:removed association type from remove org code (#837)

* SB-23169 added changes wrto bulkupload update part

* Issue #SB-000 feat:user search api change to incorporate role changes (#839)

* Issue #SB-24861 feat:added try catch block for null roles (#841)

* Sb 24762 v2 (#842)

* Issue #SB-24861 feat:added try catch block for null roles

* Issue #SB-24762 feat:validate location code after generating it

* SB-23169 added test-case for code-coverage

* SB-23169 added test-case for code-coverage

* SB-24905 [Role assign API] Role updated via API and UI are not getting updated as expected (#840)

* SB-24905 [Role assign API] Role updated via API and UI are not getting updated as expected

* SB-24905 [Role assign API] Role updated via API and UI are not getting updated as expected

* SB-24905 Fixing testcases

* Adding requestedby

* Fixing update user roles

* SB-24905 Fixing testcases

* SB-24909 code changes for create-api for roles (#843)

* SB-24909 code changes for create-api for roles

* SB-24909 roles saved to user-table is removed (#848)

* SB-24909 roles saved to user-table is removed from create user api

* SB-22982 Tnc accept api change to support new role structure (#849)

* SB-22982 Tnc accept api change to support new role structure

* SB-22982 Tnc accept api change to support new role structure

* SB-22982 Testcase fix

* SB-24909 calling assign roles actor from bulkuserbackround actor (#850)

* SB-24909 assign roles pointed to wrong actor, rectified it

* SB-24909 adding new usermap while updating user (#851)

* SB-24909 adding new usermap while updating user

* Issue SB-24861 feat:fixed password issue (#852)

Co-authored-by: default avatarHarikumar Palemkota <harip@ilimi.in>
Co-authored-by: default avatarAMIT KUMAR <amit.kumar@tarento.com>
Co-authored-by: default avatarHari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>
Co-authored-by: default avatarMathew Jose Pallan <mathewjpallan@gmail.com>
parent dc0e2b86
release-5.1.0-student-login-endpoint dependabot/maven/controller/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/core/actor-core/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/core/cassandra-utils/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/core/notification-utils/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/core/notification-utils/org.apache.httpcomponents-httpclient-4.5.13 dependabot/maven/core/platform-common/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/core/platform-common/org.apache.kafka-kafka-clients-0.10.2.2 dependabot/maven/core/platform-common/org.jboss.resteasy-resteasy-client-3.14.0.Final dependabot/maven/core/sunbird-notification/com.fasterxml.jackson.core-jackson-databind-2.9.10.7 dependabot/maven/core/sunbird-notification/org.apache.httpcomponents-httpclient-4.5.13 dependabot/maven/junit-junit-4.13.1 helmchart master patch-1 patch-2 release-4.1.0 release-4.10.0 release-4.10.1 release-4.2.0 release-4.3.0 release-4.4.0 release-4.4.1 release-4.5.0 release-4.6.0 release-4.7.0 release-4.9.0 release-5.0.0 release-5.0.1 release-5.0.2 release-5.1.0 release-5.0.1_RC1 release-5.0.0_RC5 release-5.0.0_RC4 release-5.0.0_RC3 release-5.0.0_RC2 release-5.0.0_RC1 release-4.10.1_RC1 release-4.10.0_RC5 release-4.10.0_RC4 release-4.10.0_RC3 release-4.10.0_RC2 release-4.10.0_RC1 release-4.9.0_RC3 release-4.9.0_RC2 release-4.9.0_RC1 release-4.7.0_RC11 release-4.7.0_RC10 release-4.7.0_RC9 release-4.7.0_RC8 release-4.7.0_RC7 release-4.7.0_RC6 release-4.7.0_RC5 release-4.7.0_RC4 release-4.7.0_RC3 release-4.7.0_RC2 release-4.7.0_RC1 release-4.6.0_RC9 release-4.6.0_RC8 release-4.6.0_RC7 release-4.6.0_RC6 release-4.6.0_RC5 release-4.6.0_RC4 release-4.6.0_RC3 release-4.6.0_RC2 release-4.6.0_RC1 release-4.5.0_RC14 release-4.5.0_RC13 release-4.5.0_RC12 release-4.5.0_RC11 release-4.5.0_RC10 release-4.5.0_RC9 release-4.5.0_RC8 release-4.5.0_RC7 release-4.5.0_RC6 release-4.5.0_RC5 release-4.5.0_RC4 release-4.5.0_RC3 release-4.5.0_RC2 release-4.5.0_RC1 release-4.4.1_RC1 release-4.4.0_RC15 release-4.4.0_RC14 release-4.4.0_RC13 release-4.4.0_RC12 release-4.4.0_RC11 release-4.4.0_RC10 release-4.4.0_RC9 release-4.4.0_RC8 release-4.4.0_RC7 release-4.4.0_RC6 release-4.4.0_RC5 release-4.4.0_RC4 release-4.4.0_RC3 release-4.4.0_RC2 release-4.4.0_RC1 release-4.3.0_RC16 release-4.3.0_RC15 release-4.3.0_RC14 release-4.3.0_RC13 release-4.3.0_RC12 release-4.3.0_RC11 release-4.3.0_RC10 release-4.3.0_RC9 release-4.3.0_RC8 release-4.3.0_RC7 release-4.3.0_RC6 release-4.3.0_RC5 release-4.3.0_RC4 release-4.3.0_RC3 release-4.3.0_RC2 release-4.3.0_RC1 release-4.2.0_RC13 release-4.2.0_RC12 release-4.2.0_RC11 release-4.2.0_RC10 release-4.2.0_RC9 release-4.2.0_RC8 release-4.2.0_RC7 release-4.2.0_RC6 release-4.2.0_RC5 release-4.2.0_RC4 release-4.2.0_RC3 release-4.2.0_RC2 release-4.2.0_RC1 release-4.1.0_RC16 release-4.1.0_RC15 release-4.1.0_RC14 release-4.1.0_RC13 release-4.1.0_RC12 release-4.1.0_RC11 release-4.1.0_RC10 release-4.1.0_RC9 release-4.1.0_RC8 release-4.1.0_RC7 release-4.1.0_RC6 release-4.1.0_RC5 release-4.1.0_RC4 release-4.1.0_RC3 release-4.1.0_RC2 release-4.1.0_RC1
No related merge requests found
Showing with 489 additions and 178 deletions
+489 -178
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment