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

chore/remove-email-dob-from-signup

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/allowance-scheduling-cron-queue

feature/help-support-faq-lookup

feature/kyc-onboarding

feature/kyc-onboarding-metadata

feature/notification-system-fcm-registration

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

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

fix/spending-history-junior-id-query

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

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

Mono Color

• 2a4011ca5d Merge pull request #139 from KiwiTechLLC/sprint4 Ankitajain-kiwi 2023-08-02 15:21:38 +05:30
• ebb468166e sprint4 reassign task after expired jain 2023-08-02 15:20:43 +05:30
• e89fc513cb Merge pull request #138 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-02 14:25:06 +05:30
• 06176912ee Merge pull request #137 from KiwiTechLLC/sprint4 Ankitajain-kiwi 2023-08-02 14:24:38 +05:30
• ed8fc156ac change junior task list api response jain 2023-08-02 14:23:36 +05:30
• e1af1c200d Merge pull request #136 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-02 11:33:29 +05:30
• bff97f59b2 Merge pull request #135 from KiwiTechLLC/ZBKADM-67 dilipshrivastwa-kiwi 2023-08-02 11:19:21 +05:30
• af121f5a53 changes in article update api and get image url method ZBKADM-67 abutalib-kiwi 2023-08-02 11:16:12 +05:30
• 4c3aa03e13 Merge pull request #134 from KiwiTechLLC/sprint4 Ankitajain-kiwi 2023-08-02 11:00:42 +05:30
• f3a8b52617 api response time jain 2023-08-02 11:00:02 +05:30
• 0c3a77cd11 Merge pull request #133 from KiwiTechLLC/ZBKADM-67 dilipshrivastwa-kiwi 2023-08-01 20:19:09 +05:30
• d3564efbb9 change in update api, added method to upload and get image url abutalib-kiwi 2023-08-01 20:13:35 +05:30
• 329df77790 Merge pull request #132 from KiwiTechLLC/ZBKADM-67 dilipshrivastwa-kiwi 2023-08-01 13:16:37 +05:30
• ee92c98f34 article list api changes, changed related name for survey_options to options abutalib-kiwi 2023-08-01 13:12:37 +05:30
• 4fddc7b3e2 Merge pull request #131 from KiwiTechLLC/qa Abu Talib 2023-07-28 20:19:40 +05:30
• b238379a22 Merge pull request #130 from KiwiTechLLC/dev Abu Talib 2023-07-28 19:49:56 +05:30
• fbce04b97e Merge pull request #129 from KiwiTechLLC/ZBKADM-67 dilipshrivastwa-kiwi 2023-07-28 19:30:39 +05:30
• afaed69eec fixed add junior api abutalib-kiwi 2023-07-28 19:19:59 +05:30
• 3c0eaf676e Merge pull request #128 from KiwiTechLLC/ZBKADM-67 dilipshrivastwa-kiwi 2023-07-28 19:00:41 +05:30
• 6ffaa66a4d fixed add junior api abutalib-kiwi 2023-07-28 18:57:11 +05:30
• 4b8e7189c1 Merge pull request #127 from KiwiTechLLC/ZBKADM-67 dilipshrivastwa-kiwi 2023-07-28 18:11:54 +05:30
• d68f24543d changes in approve junior and add juinior api, added search in junior list api abutalib-kiwi 2023-07-28 17:29:15 +05:30
• 3534561697 Merge pull request #126 from KiwiTechLLC/ZBKADM-67 dilipshrivastwa-kiwi 2023-07-28 16:50:26 +05:30
• de774111c0 some changes in artcle api abutalib-kiwi 2023-07-28 16:08:40 +05:30
• ed18758cc5 Merge pull request #125 from KiwiTechLLC/qa Abu Talib 2023-07-28 11:13:10 +05:30
• c081bc621d Merge pull request #124 from KiwiTechLLC/dev Abu Talib 2023-07-27 22:04:51 +05:30
• bab50e4492 Merge pull request #123 from KiwiTechLLC/ZBKADM-67 dilipshrivastwa-kiwi 2023-07-27 19:36:01 +05:30
• 151a177e76 some changes in admin password reset related api abutalib-kiwi 2023-07-27 19:29:12 +05:30
• 73a62186a7 Merge pull request #122 from KiwiTechLLC/ZBKADM-67 dilipshrivastwa-kiwi 2023-07-27 15:32:17 +05:30
• 83c66ab3b6 added request status in expired task cronjob abutalib-kiwi 2023-07-27 15:26:59 +05:30
• 94e53e1dcd Merge pull request #121 from KiwiTechLLC/ZBKADM-67 dilipshrivastwa-kiwi 2023-07-27 13:12:36 +05:30
• 68b77ef766 added task to send otp on email abutalib-kiwi 2023-07-27 12:56:50 +05:30
• d2c8b18e3f Merge pull request #120 from KiwiTechLLC/dev Abu Talib 2023-07-27 11:37:25 +05:30
• a2000459d3 Merge pull request #119 from KiwiTechLLC/ZBKADM-67 dilipshrivastwa-kiwi 2023-07-27 11:06:09 +05:30
• c079f3ceca some changes in forgot password api abutalib-kiwi 2023-07-27 10:59:10 +05:30
• 671cdfc27b Merge pull request #118 from KiwiTechLLC/ZBKADM-67 dilipshrivastwa-kiwi 2023-07-26 17:51:32 +05:30
• a83e27b12a Merge branch 'dev' into ZBKADM-67 abutalib-kiwi 2023-07-26 17:22:23 +05:30
• 87aa1af02b change password api abutalib-kiwi 2023-07-26 17:04:35 +05:30
• bdc0ba4fd5 Merge pull request #117 from KiwiTechLLC/dev Ankitajain-kiwi 2023-07-26 16:58:38 +05:30
• 5f3026f08f Merge pull request #116 from KiwiTechLLC/sprint3 dilipshrivastwa-kiwi 2023-07-26 16:51:46 +05:30
• a323ad7df7 jira-28 notification sprint3 jain 2023-07-26 16:42:26 +05:30
• 2b6e943d8c jira-28 notification jain 2023-07-26 16:38:36 +05:30
• 3af2584d6a Merge pull request #115 from KiwiTechLLC/dev Ankitajain-kiwi 2023-07-26 11:09:40 +05:30
• bca0d8d49b Merge pull request #114 from KiwiTechLLC/sprint3 Ankitajain-kiwi 2023-07-26 11:08:02 +05:30
• b860d937f5 requirement .txt file add jain 2023-07-26 11:06:58 +05:30
• 62cf2b14bf Merge pull request #113 from KiwiTechLLC/dev Abu Talib 2023-07-26 11:01:45 +05:30
• 11b10bf751 Merge pull request #112 from KiwiTechLLC/ZBKADM-67 dilipshrivastwa-kiwi 2023-07-25 19:57:49 +05:30
• d0ef4391cc conflict resolved abutalib-kiwi 2023-07-25 19:45:53 +05:30
• 5a1b419863 Merge pull request #111 from KiwiTechLLC/sprint3 dilipshrivastwa-kiwi 2023-07-25 19:49:24 +05:30
• 7bf0e62604 added api for forgot password, verify otp and resend otp for admin abutalib-kiwi 2023-07-25 19:39:01 +05:30
• 80843502a6 jira-290 cron job for expired task jain 2023-07-25 19:13:25 +05:30
• cbd3d139a5 Merge pull request #110 from KiwiTechLLC/dev Ankitajain-kiwi 2023-07-25 17:36:49 +05:30
• 3b31d08996 Merge pull request #109 from KiwiTechLLC/sprint3 dilipshrivastwa-kiwi 2023-07-25 17:34:44 +05:30
• 3cdd685ea8 sonar issues jain 2023-07-25 17:21:18 +05:30
• c4152c0773 Merge branch 'sprint3' of github.com:KiwiTechLLC/ZODBank-Backend into sprint3 jain 2023-07-25 17:15:35 +05:30
• 8a454c3f97 sonar issues jain 2023-07-25 17:15:16 +05:30
• 71405780f8 Merge branch 'dev' into sprint3 Ankitajain-kiwi 2023-07-25 17:07:58 +05:30
• a8558b5e6e sonar issues jain 2023-07-25 17:06:26 +05:30
• 7c4f9b2506 jira-291 start task api jain 2023-07-25 16:54:48 +05:30
• cc3490b059 Merge pull request #108 from KiwiTechLLC/ZBKADM-67 dilipshrivastwa-kiwi 2023-07-25 15:52:22 +05:30
• 32476149bc article card folder name change abutalib-kiwi 2023-07-25 15:33:22 +05:30
• c57224ad0e Merge pull request #107 from KiwiTechLLC/sprint3 Ankitajain-kiwi 2023-07-25 15:29:36 +05:30
• c8a8e1149b jira-28 invite guardian jain 2023-07-25 15:27:29 +05:30
• 7c69dfd49f Merge pull request #106 from KiwiTechLLC/ZBKADM-67 dilipshrivastwa-kiwi 2023-07-25 14:46:56 +05:30
• 6dcf045131 Merge branch 'dev' into ZBKADM-67 abutalib-kiwi 2023-07-25 14:17:48 +05:30
• 6e84814117 modified yml file, default article card image upload api, abutalib-kiwi 2023-07-25 14:09:51 +05:30
• c587ba322e Merge pull request #105 from KiwiTechLLC/sprint3 dilipshrivastwa-kiwi 2023-07-25 13:29:32 +05:30
• 2db0e47e3b resolve conflict jain 2023-07-25 13:21:20 +05:30
• 52cdd4b0ba resolve conflict jain 2023-07-25 13:19:53 +05:30
• 6be0682913 junior guardian relation table jain 2023-07-25 13:17:27 +05:30
• bfeeb5e41f Merge branch 'dev' into sprint3 Ankitajain-kiwi 2023-07-25 12:56:48 +05:30
• bb56fc7a33 try and except in api jain 2023-07-25 12:53:56 +05:30
• e6d45f3bf2 start task api jain 2023-07-25 12:02:59 +05:30
• 7cb792c6cf Merge pull request #104 from KiwiTechLLC/dev Ankitajain-kiwi 2023-07-25 11:52:36 +05:30
• 49b648e86b Merge pull request #103 from KiwiTechLLC/sprint3 dilipshrivastwa-kiwi 2023-07-25 11:33:08 +05:30
• 79e85fa968 jira-27 invite guardian api jain 2023-07-25 11:17:57 +05:30
• 5ea28bbd75 Merge pull request #102 from KiwiTechLLC/dev Ankitajain-kiwi 2023-07-24 15:56:54 +05:30
• 096961976d sonar issues jain 2023-07-24 15:28:54 +05:30
• 4d104bab1c Merge pull request #101 from KiwiTechLLC/sprint3 dilipshrivastwa-kiwi 2023-07-24 15:19:40 +05:30
• ed28117a7f bugs and push notification for create task jain 2023-07-24 15:10:59 +05:30
• 180104ece8 Merge pull request #100 from KiwiTechLLC/dev Ankitajain-kiwi 2023-07-24 11:04:08 +05:30
• 0a7c081f63 Merge branch 'qa' into dev Ankitajain-kiwi 2023-07-24 11:03:59 +05:30
• a2b4f3b758 update position of the junior jain 2023-07-24 11:00:22 +05:30
• d86f7d3436 guardian code jain 2023-07-21 18:38:16 +05:30
• a5a309cf5b comment top junior call api jain 2023-07-21 18:33:18 +05:30
• 0a5eaa233f add qa top -junior url jain 2023-07-21 17:33:21 +05:30
• b32d4def2d add qa top -junior url jain 2023-07-21 16:25:21 +05:30
• 410282036e Merge pull request #99 from KiwiTechLLC/sprint3 Ankitajain-kiwi 2023-07-21 16:23:07 +05:30
• 2a225ea79d add dev url for top junior api jain 2023-07-21 16:19:30 +05:30
• 65e012dd60 Merge pull request #98 from KiwiTechLLC/sprint3 Ankitajain-kiwi 2023-07-21 14:49:52 +05:30
• 8013767d71 add print in junior list jain 2023-07-21 14:49:38 +05:30
• fdd0b88b11 add print in junior list jain 2023-07-21 14:48:18 +05:30
• bb1351c309 Merge pull request #96 from KiwiTechLLC/ZBKBCK-001 dilipshrivastwa-kiwi 2023-07-21 12:32:32 +05:30
• c15bd2339a Merge pull request #97 from KiwiTechLLC/dev Ankitajain-kiwi 2023-07-21 12:07:26 +05:30
• 5ee01af825 article api changes ZBKBCK-001 abutalib-kiwi 2023-07-21 11:35:58 +05:30
• b8382e225c Merge pull request #95 from KiwiTechLLC/ZBKBCK-001 dilipshrivastwa-kiwi 2023-07-20 18:25:23 +05:30
• 532b56c687 added article point abutalib-kiwi 2023-07-20 18:01:53 +05:30
• 6fe29f0070 Merge pull request #94 from KiwiTechLLC/sprint3 dilipshrivastwa-kiwi 2023-07-20 17:13:31 +05:30
• 96d71d951e real time changes jain 2023-07-20 17:09:49 +05:30
• effad5cddc Merge pull request #93 from KiwiTechLLC/dev Ankitajain-kiwi 2023-07-20 13:25:53 +05:30