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

• 04db40e100 Merge pull request #189 from KiwiTechLLC/sprint4 dilipshrivastwa-kiwi 2023-08-10 21:24:15 +05:30
• 1e162255d7 create article jain 2023-08-10 20:17:24 +05:30
• f4149379c2 Merge pull request #188 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-10 19:21:12 +05:30
• a479f3cb62 Merge pull request #187 from KiwiTechLLC/sprint4 dilipshrivastwa-kiwi 2023-08-10 19:06:32 +05:30
• fbd6f9ece5 task points jain 2023-08-10 19:05:33 +05:30
• 11c84208b7 task points jain 2023-08-10 19:00:37 +05:30
• 4f02cef0f9 Optimised login api Ruman Siddiqui 2023-08-10 18:43:03 +05:30
• b8f1acaed8 Merge pull request #185 from KiwiTechLLC/dev Abu Talib 2023-08-10 18:37:06 +05:30
• 80dffb7942 Merge pull request #184 from KiwiTechLLC/ZBKADM-71 dilipshrivastwa-kiwi 2023-08-10 18:21:10 +05:30
• 0a8c2cf56d image name fix, remove '|' character abutalib-kiwi 2023-08-10 18:17:49 +05:30
• 9e5dd5e3d5 Merge pull request #183 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-10 17:04:06 +05:30
• 03fb4f4176 Merge pull request #182 from KiwiTechLLC/sprint4 dilipshrivastwa-kiwi 2023-08-10 15:51:09 +05:30
• 22afe7e555 current page update in article api jain 2023-08-10 15:43:31 +05:30
• 69723b362f current page update in article api jain 2023-08-10 15:30:46 +05:30
• 9e612c7171 Merge pull request #181 from KiwiTechLLC/sprint4 Ankitajain-kiwi 2023-08-10 12:20:34 +05:30
• 7a9be0326a junior points jain 2023-08-10 12:19:08 +05:30
• aaa1c55227 Merge pull request #180 from KiwiTechLLC/sprint4 Ankitajain-kiwi 2023-08-10 12:07:49 +05:30
• 656f0da89a guardian code jain 2023-08-10 12:06:52 +05:30
• b961044e4d Merge pull request #179 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-10 11:57:29 +05:30
• 28e71e132c Merge pull request #178 from KiwiTechLLC/sprint4 Ankitajain-kiwi 2023-08-10 11:56:53 +05:30
• b30643299f junior points jain 2023-08-10 11:56:19 +05:30
• b6b70af13f remove guardian code request jain 2023-08-10 11:02:32 +05:30
• 22dd7fc10b remove guardian code request jain 2023-08-10 10:55:33 +05:30
• 2498394127 Merge pull request #177 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-09 19:22:42 +05:30
• 924bc20193 Merge pull request #176 from KiwiTechLLC/sprint4 Ankitajain-kiwi 2023-08-09 19:21:50 +05:30
• af7582b9e2 points jain 2023-08-09 19:20:56 +05:30
• 856d27d803 Merge pull request #175 from KiwiTechLLC/sprint4 Ankitajain-kiwi 2023-08-09 18:54:12 +05:30
• 19f56280e4 points remove from serializer jain 2023-08-09 18:53:18 +05:30
• 2fc65d462d Merge pull request #174 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-09 18:11:40 +05:30
• d3800dbc85 Merge pull request #173 from KiwiTechLLC/sprint4 Ankitajain-kiwi 2023-08-09 18:10:18 +05:30
• 9373dc4697 Merge pull request #172 from KiwiTechLLC/ZBKADM-71 dilipshrivastwa-kiwi 2023-08-09 17:20:53 +05:30
• 32eaa6c3f2 guardian code update jain 2023-08-09 17:18:07 +05:30
• 11ff8fc700 conflict resolved abutalib-kiwi 2023-08-09 17:03:42 +05:30
• 9c75cb1615 analytics section api, users counts, new signup count, task report abutalib-kiwi 2023-08-09 16:57:19 +05:30
• 3f8b0e2eb7 Merge pull request #171 from KiwiTechLLC/sprint4 dilipshrivastwa-kiwi 2023-08-09 16:44:27 +05:30
• 69ce6857e8 financial learning section api jain 2023-08-09 16:36:33 +05:30
• cdf656fdad Merge pull request #170 from KiwiTechLLC/dev Abu Talib 2023-08-09 14:51:13 +05:30
• 3efa31efe4 Merge pull request #169 from KiwiTechLLC/sprint4 Ankitajain-kiwi 2023-08-09 14:39:01 +05:30
• 275b09d2ea Merge branch 'sprint4' of github.com:KiwiTechLLC/ZODBank-Backend into sprint4 jain 2023-08-09 14:38:09 +05:30
• 3cb0e3ed8b guardian code add in junior list api jain 2023-08-09 14:37:38 +05:30
• 823c5ea4c4 Merge pull request #168 from KiwiTechLLC/ZBKADM-69 dilipshrivastwa-kiwi 2023-08-09 14:21:58 +05:30
• c9ee482512 otp, verify otp and login bug resolved ZBKADM-69 abutalib-kiwi 2023-08-09 14:14:13 +05:30
• 08750813ce Merge pull request #167 from KiwiTechLLC/sprint4 dilipshrivastwa-kiwi 2023-08-09 13:54:08 +05:30
• 75f4f66285 Merge branch 'dev' into sprint4 Ankitajain-kiwi 2023-08-09 13:49:39 +05:30
• 881bda739b article card api, check answer api jain 2023-08-09 13:48:02 +05:30
• d86f082e58 article card api, check answer api jain 2023-08-09 13:37:06 +05:30
• 8eaf8751c2 Merge pull request #165 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-08 17:14:36 +05:30
• b12c5071fe Merge pull request #164 from KiwiTechLLC/sprint4 Ankitajain-kiwi 2023-08-08 16:37:08 +05:30
• f75201b3dd changes in add junior api jain 2023-08-08 16:36:03 +05:30
• 6867920754 Merge pull request #163 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-08 16:07:14 +05:30
• 45ea7013f8 Merge pull request #162 from KiwiTechLLC/sprint4 Ankitajain-kiwi 2023-08-08 16:06:52 +05:30
• 7d428f5eb5 junior list api jain 2023-08-08 16:05:56 +05:30
• 22ba4288d9 Merge pull request #161 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-08 15:04:50 +05:30
• 9ff64e64ef Merge pull request #160 from KiwiTechLLC/sprint4 Ankitajain-kiwi 2023-08-08 15:04:03 +05:30
• 4b23394569 top junior api jain 2023-08-08 15:03:24 +05:30
• 81893c8841 Merge pull request #159 from KiwiTechLLC/ZBKADM-69 dilipshrivastwa-kiwi 2023-08-08 14:38:43 +05:30
• 10a1ea9b76 change in admin login abutalib-kiwi 2023-08-08 14:29:57 +05:30
• 7ab16cb3de Merge pull request #158 from KiwiTechLLC/dev Abu Talib 2023-08-08 14:24:44 +05:30
• 7fca493d0d Merge pull request #157 from KiwiTechLLC/sprint4 dilipshrivastwa-kiwi 2023-08-08 14:02:27 +05:30
• 85e4ae8761 junior position changes and decrease api response time jain 2023-08-08 13:54:04 +05:30
• 6ebd5ae410 Merge pull request #156 from KiwiTechLLC/sprint4 dilipshrivastwa-kiwi 2023-08-08 12:35:43 +05:30
• f57b111555 guardian list api changes jain 2023-08-08 11:48:53 +05:30
• 6596414675 guardian list api changes jain 2023-08-08 11:46:27 +05:30
• ed7fd3c15d Merge pull request #155 from KiwiTechLLC/ZBKADM-69 dilipshrivastwa-kiwi 2023-08-07 20:48:37 +05:30
• 8cf7148114 Merge pull request #154 from KiwiTechLLC/ZBKADM-69 dilipshrivastwa-kiwi 2023-08-07 19:19:00 +05:30
• b98443479f Merge pull request #153 from KiwiTechLLC/sprint4 Ankitajain-kiwi 2023-08-07 19:12:55 +05:30
• f917244265 junior article points table jain 2023-08-07 19:12:14 +05:30
• 07d150309b Merge pull request #146 from KiwiTechLLC/dev Abu Talib 2023-08-04 15:04:55 +05:30
• 3801e6e027 Merge pull request #142 from KiwiTechLLC/dev Abu Talib 2023-08-03 14:59:49 +05:30
• f3e2ab9a34 notification list modified and mark as read method changed abutalib-kiwi 2023-08-02 20:45:46 +05:30
• 685f627707 change method to get real time abutalib-kiwi 2023-08-02 19:16:29 +05:30
• ceb5bc13c3 Merge pull request #152 from KiwiTechLLC/ZBKADM-69 dilipshrivastwa-kiwi 2023-08-07 18:22:20 +05:30
• ae0fc4fe8d article list api jain 2023-08-07 17:06:31 +05:30
• 0a1b9c7e70 Merge pull request #151 from KiwiTechLLC/ZBKADM-69 dilipshrivastwa-kiwi 2023-08-07 15:14:46 +05:30
• 0426974539 Merge pull request #150 from KiwiTechLLC/sprint4 dilipshrivastwa-kiwi 2023-08-07 13:44:20 +05:30
• b0e26f41b9 Merge branch 'dev' into sprint4 Ankitajain-kiwi 2023-08-07 13:43:49 +05:30
• c20249730a guardian list api jain 2023-08-07 13:42:47 +05:30
• b3b499e661 guardian list api jain 2023-08-07 13:41:33 +05:30
• f377e283fd guardian list api jain 2023-08-07 13:25:01 +05:30
• 648a2ec4d5 Merge pull request #149 from KiwiTechLLC/ZBKADM-69 dilipshrivastwa-kiwi 2023-08-07 12:13:51 +05:30
• 88221ec77a notifications API jain 2023-08-07 11:28:34 +05:30
• e853346910 notifications API jain 2023-08-07 11:26:23 +05:30
• a088764b7b Merge pull request #148 from KiwiTechLLC/ZBKADM-69 dilipshrivastwa-kiwi 2023-08-07 11:04:20 +05:30
• dd0f2b027a task list api modified abutalib-kiwi 2023-08-03 18:17:01 +05:30
• f2cf1488e9 changes in edit api, included first name, last name and username abutalib-kiwi 2023-08-07 15:05:41 +05:30
• 83ec922584 admin login api modified abutalib-kiwi 2023-08-07 12:00:58 +05:30
• 4a2f36cde8 edit user validations, active-inactive api abutalib-kiwi 2023-08-07 10:55:34 +05:30
• 401ee1ddf8 Merge pull request #147 from KiwiTechLLC/ZBKADM-69 dilipshrivastwa-kiwi 2023-08-04 16:46:05 +05:30
• baacb1a18f user edit api abutalib-kiwi 2023-08-04 16:28:58 +05:30
• 5f1c645e3a user list api abutalib-kiwi 2023-08-04 16:27:46 +05:30
• 79648637aa Merge pull request #145 from KiwiTechLLC/ZBKADM-69 dilipshrivastwa-kiwi 2023-08-04 13:21:47 +05:30
• 756bea0471 user detail view api, searching user list, count abutalib-kiwi 2023-08-04 13:15:32 +05:30
• 465632f519 Merge pull request #144 from KiwiTechLLC/ZBKADM-69 dilipshrivastwa-kiwi 2023-08-03 18:38:53 +05:30
• b9e2d9bc8a user detail api, changed image upload method abutalib-kiwi 2023-08-03 18:35:19 +05:30
• d82c8cd4ae Merge pull request #143 from KiwiTechLLC/ZBKADM-69 dilipshrivastwa-kiwi 2023-08-03 18:24:56 +05:30
• 3806d1f3a6 user detail api, changed image upload method abutalib-kiwi 2023-08-03 18:12:44 +05:30
• b2d172eae5 Merge pull request #141 from KiwiTechLLC/sprint4 Ankitajain-kiwi 2023-08-02 16:58:24 +05:30
• 404825dc85 migration file jain 2023-08-02 16:57:40 +05:30
• 6e6f0a55d0 Merge pull request #140 from KiwiTechLLC/sprint4 Ankitajain-kiwi 2023-08-02 16:26:56 +05:30
• 75d0b12008 changes in remove guardian code api jain 2023-08-02 16:26:20 +05:30