Commit Graph

Select branches

Hide Pull Requests

26june_sprint1

GoogleLogin

ZBKADM-67

ZBKADM-69

ZBKADM-71

ZBKADM-72

ZBKADM-72-minor-changes

ZBKADM-72-sonar-issues

ZBKADM-73-test-cases

ZBKBCK-001

ZBKBCK-346

ZBKBCK-47

ZBKBCK-48

ZBKBCK-49

ZBKBCK-50

ZBKBCK-51

ZBKBCK-52

ZBKBCK-54

ZBKBCK-55

ZBKBCK-56

ZDBBCK-001

ZOD-204-view-spending-from-child-login

ZOD-309-child-transaction-history-parent-→-child-transfers

ZOD-333-junior-incorrect-relationship-label-displayed-as-child-instead-of-daughter-or-son-in-child-confirmation-details-after-the-scan-the-qr-code

ZOD-339-child-profile-gender-update-is-not-reflected-after-editing

ZOD-341-junior-a-child-can-edit-their-email-to-an-existing-email-causing-multiple-child-accounts-to-share-the-same-login

ZOD-344-after-a-child-completes-registration-using-the-qr-code-the-same-qr-code-remains-valid-and-allows-the-child-to-register-again-instead-of-expiring

ZOD-349-weekly-spending-data-not-displaying-in-the-child-profile-parent-view

demo-dev1

dev

dks_sprint1

email-verification-issue

feat/create-juniors

feat/forget-password

feat/junior-theme

feat/mobile-notification

feat/money-requests

feat/neoleap-integration

feat/parent-topups-and-child-transfers

feat/tasks

feat/upload-files-to-oci-bucket

feat/user-registration

feature/kyc-onboarding-metadata

fix/customer-gender-missing-in-get-profile

fix/junior-profile-picture-refresh-on-update

fix/verfy-email

login_api_reduced_queries

login_code

main

money-request-to-use-the-parint-account

mvp-1

mvp-with-client

prod

qa

server_demo

sprint2

sprint3

sprint4

sprint5

sprint6-bugs

stage

stage-hotFix

waiting-list

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#7

#8

#9

Mono Color

• 94ad7a6867 Merge pull request #297 from KiwiTechLLC/qa Ankitajain-kiwi 2023-08-29 21:38:31 +05:30
• dd0a0cd2fa Merge pull request #296 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-29 21:37:12 +05:30
• a262b03292 Merge pull request #295 from KiwiTechLLC/sprint6-bugs gauravmishra-kiwi 2023-08-29 21:32:11 +05:30
• d24f075110 answer api jain 2023-08-29 21:28:36 +05:30
• 95b294f168 Merge pull request #294 from KiwiTechLLC/qa Ankitajain-kiwi 2023-08-29 20:01:23 +05:30
• 674493e1ad Merge pull request #293 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-29 20:00:01 +05:30
• f7624bc1e7 Merge pull request #292 from KiwiTechLLC/sprint6-bugs Ankitajain-kiwi 2023-08-29 19:47:55 +05:30
• dc12b35842 answer api jain 2023-08-29 19:38:14 +05:30
• a80f9db557 Merge pull request #291 from KiwiTechLLC/sprint6-bugs Abu Talib 2023-08-29 19:05:18 +05:30
• 3ad29e677d article page jain 2023-08-29 18:56:51 +05:30
• 8b0a5d9a8e otp expiry jain 2023-08-29 18:33:47 +05:30
• 16d823f97d Merge pull request #290 from KiwiTechLLC/sprint6-bugs Ankitajain-kiwi 2023-08-29 17:51:42 +05:30
• d4008d6cc2 elif for guardian code jain 2023-08-29 17:50:58 +05:30
• 8ecb96829f Merge pull request #289 from KiwiTechLLC/qa Ankitajain-kiwi 2023-08-29 12:44:12 +05:30
• 7cf3481ec6 Merge branch 'stage' into qa Ankitajain-kiwi 2023-08-29 12:40:43 +05:30
• de4b230cd1 Merge pull request #288 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-29 12:11:06 +05:30
• 3dae22a870 Merge pull request #287 from KiwiTechLLC/sprint6-bugs dilipshrivastwa-kiwi 2023-08-29 11:56:58 +05:30
• a8d291474a search junior task jain 2023-08-29 11:52:47 +05:30
• e6482167ae Merge branch 'sprint6-bugs' of github.com:KiwiTechLLC/ZODBank-Backend into sprint6-bugs jain 2023-08-29 11:51:11 +05:30
• 9a932d31b5 Merge branch 'dev' of github.com:KiwiTechLLC/ZODBank-Backend into sprint6-bugs jain 2023-08-29 11:50:44 +05:30
• e2c84eb83d search junior task jain 2023-08-29 11:49:59 +05:30
• 5bfc3966b3 Merge branch 'dev' into sprint6-bugs Ankitajain-kiwi 2023-08-29 10:43:34 +05:30
• 37d191eef8 add message for blank search jain 2023-08-29 10:41:44 +05:30
• ad53e0086c Merge pull request #286 from KiwiTechLLC/dev Abu Talib 2023-08-28 20:35:49 +05:30
• e9ee8ec8b2 Merge pull request #285 from KiwiTechLLC/sprint6-bugs Abu Talib 2023-08-28 20:14:43 +05:30
• cc5ecc0647 Merge branch 'dev' of github.com:KiwiTechLLC/ZODBank-Backend into sprint6-bugs jain 2023-08-28 20:10:36 +05:30
• 63dfd731fc condition in add junior jain 2023-08-28 20:09:39 +05:30
• e9d4d7091e Merge pull request #284 from KiwiTechLLC/ZBKBCK-48 dilipshrivastwa-kiwi 2023-08-28 19:51:20 +05:30
• 219bae792e added notification for existing junior add, modified leaderboard method at every places ZBKBCK-48 abutalib-kiwi 2023-08-28 19:39:39 +05:30
• df3cab99a5 Merge pull request #283 from KiwiTechLLC/sprint6-bugs dilipshrivastwa-kiwi 2023-08-28 18:58:23 +05:30
• d2242d4c64 remove guardian request and resend otp jain 2023-08-28 18:39:29 +05:30
• b7d5916f8e Merge pull request #282 from KiwiTechLLC/ZBKBCK-48 dilipshrivastwa-kiwi 2023-08-28 15:56:43 +05:30
• 5e17edcf3f fixed add junior multiple device notification issue, changed send multiple user notification method, modified add fcm token method abutalib-kiwi 2023-08-28 15:36:24 +05:30
• b6fe943bfc Merge pull request #281 from KiwiTechLLC/sprint6-bugs Ankitajain-kiwi 2023-08-28 13:46:28 +05:30
• 8e529b292d add non in delete API jain 2023-08-28 13:38:35 +05:30
• acd3592b2d Merge pull request #280 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-28 12:55:32 +05:30
• 61ca2e7d2d Merge pull request #279 from KiwiTechLLC/sprint6-bugs Ankitajain-kiwi 2023-08-28 12:53:24 +05:30
• 966f94eb1e change message jain 2023-08-28 12:41:29 +05:30
• f424c99478 Merge pull request #278 from KiwiTechLLC/sprint6-bugs dilipshrivastwa-kiwi 2023-08-28 12:13:10 +05:30
• 34359360e0 guardian_status update jain 2023-08-28 12:10:13 +05:30
• c2c9210a9a some changes abutalib-kiwi 2023-08-28 11:54:38 +05:30
• e3feab22a2 some changes abutalib-kiwi 2023-08-28 11:51:12 +05:30
• 685a822e52 Merge pull request #277 from KiwiTechLLC/sprint6-bugs dilipshrivastwa-kiwi 2023-08-28 10:48:48 +05:30
• e57344e54f Merge branch 'dev' of github.com:KiwiTechLLC/ZODBank-Backend into sprint6-bugs jain 2023-08-28 10:38:14 +05:30
• 235fc9baac guardian code status in junior list API jain 2023-08-28 10:37:52 +05:30
• 3dc8268b07 Merge pull request #276 from KiwiTechLLC/ZBKBCK-48 dilipshrivastwa-kiwi 2023-08-26 23:00:39 +05:30
• 8be8d56036 fixed approve junior notification issue abutalib-kiwi 2023-08-26 21:36:01 +05:30
• c79a891c89 Merge pull request #275 from KiwiTechLLC/sprint6-bugs dilipshrivastwa-kiwi 2023-08-26 18:24:09 +05:30
• eb4e09964d changes of guardian code status in necessary API jain 2023-08-26 17:48:13 +05:30
• cf9376663c list of guardian code status jain 2023-08-26 17:09:10 +05:30
• 58b569225a Merge pull request #274 from KiwiTechLLC/dev Abu Talib 2023-08-25 21:00:25 +05:30
• 9891060ee3 Merge pull request #273 from KiwiTechLLC/ZBKBCK-48 dilipshrivastwa-kiwi 2023-08-25 20:10:46 +05:30
• 5b2ab2275e added notification for getting points after reading article abutalib-kiwi 2023-08-25 19:08:15 +05:30
• 91471f69bd Merge pull request #272 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-25 18:33:50 +05:30
• 9b6a84c7d1 Merge pull request #270 from KiwiTechLLC/sprint5 dilipshrivastwa-kiwi 2023-08-25 18:02:13 +05:30
• e9d4fbe373 Merge pull request #271 from KiwiTechLLC/ZBKBCK-48 dilipshrivastwa-kiwi 2023-08-25 17:12:27 +05:30
• 21b92f8c74 added notification when admin adds a new article abutalib-kiwi 2023-08-25 16:59:10 +05:30
• c46b2ef52c sonar fixes sprint5 jain 2023-08-25 16:59:17 +05:30
• c47f6222d9 requested task not expired jain 2023-08-25 16:36:58 +05:30
• 1333c64d4f Merge pull request #269 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-25 12:58:52 +05:30
• b82902081f Merge pull request #268 from KiwiTechLLC/sprint5 Ankitajain-kiwi 2023-08-25 12:58:09 +05:30
• e9315beab9 remove code jain 2023-08-25 12:57:15 +05:30
• 56631ac633 Merge pull request #267 from KiwiTechLLC/dev Abu Talib 2023-08-25 12:53:12 +05:30
• 3a938720dd Merge pull request #266 from KiwiTechLLC/ZBKBCK-48 dilipshrivastwa-kiwi 2023-08-25 12:30:01 +05:30
• 464899f7d3 added notification for top leaderboard junior, added related celery task, created method to send notification to multiple users abutalib-kiwi 2023-08-25 12:26:38 +05:30
• 8a436bb79f Merge pull request #265 from KiwiTechLLC/ZBKBCK-48 dilipshrivastwa-kiwi 2023-08-24 20:08:07 +05:30
• 2e0ceb8c92 modified top-list api, junior-list api and junior-points api, nodified rank method, added mail for deactivating user from admin abutalib-kiwi 2023-08-24 19:34:59 +05:30
• 10efc952b7 Merge pull request #264 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-24 19:19:05 +05:30
• 1a2fd2d3a8 Merge pull request #263 from KiwiTechLLC/sprint5 Ankitajain-kiwi 2023-08-24 18:59:38 +05:30
• a65eb2f77d assessment answer jain 2023-08-24 18:58:31 +05:30
• 3d06139c4f Merge pull request #262 from KiwiTechLLC/sprint5 Ankitajain-kiwi 2023-08-24 18:27:17 +05:30
• f5a03e2fdf assement id jain 2023-08-24 18:26:15 +05:30
• 226ddfa7e6 Merge pull request #261 from KiwiTechLLC/sprint5 dilipshrivastwa-kiwi 2023-08-24 18:05:32 +05:30
• 1028822908 article-list optimization jain 2023-08-24 18:00:14 +05:30
• 342f27fc62 Merge pull request #260 from KiwiTechLLC/sprint5 dilipshrivastwa-kiwi 2023-08-24 16:15:30 +05:30
• e9aa2dfda9 limit for 3 guardian code and article list API optimization jain 2023-08-24 16:08:20 +05:30
• 924eaab24b Merge pull request #259 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-24 14:59:40 +05:30
• 624e7a4edb Merge pull request #258 from KiwiTechLLC/ZBKBCK-47 dilipshrivastwa-kiwi 2023-08-24 14:56:52 +05:30
• 3072bd5cdb added optional name as user ZBKBCK-47 abutalib-kiwi 2023-08-24 14:53:43 +05:30
• 930b58cf05 added optional name as user abutalib-kiwi 2023-08-24 14:51:24 +05:30
• 339c49577e Merge pull request #257 from KiwiTechLLC/sprint5 dilipshrivastwa-kiwi 2023-08-24 14:10:17 +05:30
• 09f006eb13 Merge pull request #256 from KiwiTechLLC/ZBKBCK-47 dilipshrivastwa-kiwi 2023-08-24 13:41:50 +05:30
• cd3b385756 added optional user as name abutalib-kiwi 2023-08-24 13:33:34 +05:30
• ab1a2be679 remove junior by guardian jain 2023-08-24 13:32:08 +05:30
• 11605540d7 remove guardian code request jain 2023-08-24 13:18:23 +05:30
• 8cd4864748 add three guardian at a time jain 2023-08-24 13:13:25 +05:30
• ad0b5bfc75 Merge pull request #255 from KiwiTechLLC/ZBKBCK-47 dilipshrivastwa-kiwi 2023-08-24 12:29:25 +05:30
• f541608656 changed notification method, added celery task to notify expiring task abutalib-kiwi 2023-08-24 12:10:18 +05:30
• b1b7c42438 Merge branch 'dev' of github.com:KiwiTechLLC/ZODBank-Backend into sprint5 jain 2023-08-24 11:27:13 +05:30
• 8f9450b743 set guardian code is None jain 2023-08-24 11:10:20 +05:30
• bb3441e4ed remove guardian code in both case jain 2023-08-23 19:23:31 +05:30
• 5b9f7b1828 Merge pull request #254 from KiwiTechLLC/sprint5 Ankitajain-kiwi 2023-08-23 17:47:12 +05:30
• 89dda61bff google login with user type and is published article only display jain 2023-08-23 17:46:20 +05:30
• 31f071a463 Merge pull request #253 from KiwiTechLLC/sprint5 dilipshrivastwa-kiwi 2023-08-23 17:26:17 +05:30
• 20644a6293 google login with user type and is published article only display jain 2023-08-23 17:15:54 +05:30
• a8b01d4c3a Merge pull request #252 from KiwiTechLLC/ZBKBCK-47 dilipshrivastwa-kiwi 2023-08-23 13:01:58 +05:30
• c41dee333c Merge pull request #251 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-23 12:57:22 +05:30
• 56e1484b87 mark ad read api modified abutalib-kiwi 2023-08-23 12:54:39 +05:30
• 557a7d7a5c Merge pull request #250 from KiwiTechLLC/sprint5 dilipshrivastwa-kiwi 2023-08-23 12:38:21 +05:30
• 4e0c6a91f4 response 308 in force update jain 2023-08-23 12:29:53 +05:30