zod-backend

ammar/zod-backend

Fork 0

mirror of https://github.com/HamzaSha1/zod-backend.git synced 2026-10-25 19:57:57 +00:00

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

67a5f670f8 Merge pull request #234 from KiwiTechLLC/sprint5 dilipshrivastwa-kiwi 2023-08-21 16:03:09 +05:30
82189d3953 signup jain 2023-08-21 16:00:39 +05:30
65ecd9a125 Merge branch 'dev' of github.com:KiwiTechLLC/ZODBank-Backend into sprint5 jain 2023-08-21 15:59:47 +05:30
a7bce32993 signup jain 2023-08-21 15:59:20 +05:30
4495d8999c Merge pull request #233 from KiwiTechLLC/sprint5 dilipshrivastwa-kiwi 2023-08-21 15:15:31 +05:30
61e94c9469 Merge branch 'dev' into sprint5 Ankitajain-kiwi 2023-08-21 15:13:35 +05:30
1c3d4731c1 swagger fixes jain 2023-08-21 15:11:43 +05:30
46853011be Merge pull request #232 from KiwiTechLLC/ZBKADM-72-minor-changes dilipshrivastwa-kiwi 2023-08-21 15:04:44 +05:30
2216411fd2 Merge branch 'dev' into ZBKADM-72-minor-changes ZBKADM-72-minor-changes abutalib-kiwi 2023-08-21 14:31:11 +05:30
606c1fa6e6 minor changes in excel import api method abutalib-kiwi 2023-08-21 14:28:06 +05:30
1040d763ad Merge pull request #231 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-21 12:58:09 +05:30
092cbfad3e Merge branch 'qa' into dev Ankitajain-kiwi 2023-08-21 12:57:57 +05:30
249a469d89 Merge pull request #230 from KiwiTechLLC/sprint5 dilipshrivastwa-kiwi 2023-08-21 12:54:46 +05:30
d202774df1 resolve bugs jain 2023-08-21 12:39:05 +05:30
1adf0c2f70 resolve bugs jain 2023-08-21 12:24:01 +05:30
b193166914 Merge pull request #229 from KiwiTechLLC/sprint5 Ankitajain-kiwi 2023-08-20 14:14:45 +05:30
48b455e38a login issue jain 2023-08-20 14:12:17 +05:30
6d54a718b9 Merge pull request #226 from KiwiTechLLC/ZBKBCK-346 dilipshrivastwa-kiwi 2023-08-18 20:26:02 +05:30
454f66b3a0 conflict has been resolved ZBKBCK-346 Ruman Siddiqui 2023-08-18 19:50:14 +05:30
5045f5acda Merge pull request #228 from KiwiTechLLC/ZBKADM-72-minor-changes dilipshrivastwa-kiwi 2023-08-18 19:01:34 +05:30
e84180a6c2 Merge branch 'dev' into ZBKADM-72-minor-changes abutalib-kiwi 2023-08-18 18:46:47 +05:30
21e006ae2a added description for api, changes in upload image and file to alibaba method abutalib-kiwi 2023-08-18 18:34:48 +05:30
92e5104e3f expiry date of otp jain 2023-08-18 18:37:01 +05:30
dfb73a7d36 Merge pull request #227 from KiwiTechLLC/sprint5 Ankitajain-kiwi 2023-08-18 18:32:21 +05:30
3921f76f22 remove print statement jain 2023-08-18 18:31:27 +05:30
cdf1a7b74e add comma jain 2023-08-18 18:29:46 +05:30
b4026a4f11 middleware jain 2023-08-18 18:12:14 +05:30
71a3e36bf3 [ZBKBCK-346] change password and forgot password api has been optimised Ruman Siddiqui 2023-08-18 16:57:42 +05:30
4bc91abebf Merge pull request #225 from KiwiTechLLC/sprint5 dilipshrivastwa-kiwi 2023-08-18 16:40:35 +05:30
5b236dfc81 remove threading from login api jain 2023-08-18 16:37:42 +05:30
150bb9250d Merge pull request #222 from KiwiTechLLC/sprint5 dilipshrivastwa-kiwi 2023-08-18 16:31:35 +05:30
51d3b77ff7 password validation, deactivated user's middleware jain 2023-08-18 15:45:57 +05:30
92c67dd455 Merge pull request #224 from KiwiTechLLC/ZBKADM-72-minor-changes dilipshrivastwa-kiwi 2023-08-18 15:07:46 +05:30
9a5447bca2 article bug fixed, changed image name in get image url abutalib-kiwi 2023-08-18 14:50:25 +05:30
392086760f Merge pull request #223 from KiwiTechLLC/ZBKADM-72 dilipshrivastwa-kiwi 2023-08-18 13:47:36 +05:30
ceaf584332 csv/excel method changed, uploading to alibaba cloud and providing link to frontend ZBKADM-72 abutalib-kiwi 2023-08-18 11:41:24 +05:30
ef4c459229 handle deleted user scenario in complete task api jain 2023-08-18 11:45:21 +05:30
dd2890bca6 handle delete scenerio in approve task and junior jain 2023-08-18 11:04:05 +05:30
b46109e487 FAQ list and creation jain 2023-08-17 16:06:58 +05:30
3f6c9a2d99 FAQ list and creation jain 2023-08-17 15:48:26 +05:30
f74302df04 Merge branch 'dev' of github.com:KiwiTechLLC/ZODBank-Backend into sprint5 jain 2023-08-17 14:22:33 +05:30
9bdd324c4e Merge pull request #221 from KiwiTechLLC/email-verification-issue dilipshrivastwa-kiwi 2023-08-17 13:28:55 +05:30
04ed9c668c remove print statement for expiry date email-verification-issue jain 2023-08-17 13:24:20 +05:30
e1d092d663 Merge pull request #220 from KiwiTechLLC/ZBKADM-72 dilipshrivastwa-kiwi 2023-08-17 13:10:11 +05:30
4e8243c17e added required packages in reuirements fil abutalib-kiwi 2023-08-17 13:06:46 +05:30
13ba311822 Merge pull request #218 from KiwiTechLLC/ZBKADM-72 dilipshrivastwa-kiwi 2023-08-17 12:45:38 +05:30
043c8c2f63 csv excel export api abutalib-kiwi 2023-08-16 17:15:12 +05:30
a5f239b9d9 Merge pull request #219 from KiwiTechLLC/email-verification-issue dilipshrivastwa-kiwi 2023-08-17 12:29:31 +05:30
36427b50c1 print statement for expiry date jain 2023-08-17 12:24:33 +05:30
728d19da99 FAQ model jain 2023-08-17 12:21:13 +05:30
5da07002e0 Merge pull request #217 from KiwiTechLLC/ZBKBCK-47 dilipshrivastwa-kiwi 2023-08-16 16:48:53 +05:30
f04b4aeaad Merge pull request #216 from KiwiTechLLC/stage-hotFix dilipshrivastwa-kiwi 2023-08-16 16:43:16 +05:30
c7c55f2a04 user notification issue stage-hotFix jain 2023-08-16 16:41:08 +05:30
3017b0ece0 changes in notification method abutalib-kiwi 2023-08-16 16:40:34 +05:30
e73113fcca Merge branch 'dev' into ZBKBCK-47 abutalib-kiwi 2023-08-16 16:39:36 +05:30
ed1b5dd453 Merge pull request #215 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-16 16:34:54 +05:30
c278670c39 Merge pull request #214 from KiwiTechLLC/sprint5 dilipshrivastwa-kiwi 2023-08-16 16:28:58 +05:30
60af098e1e email verfication and user notification bug jain 2023-08-16 16:16:05 +05:30
bcf308b6eb Merge pull request #213 from KiwiTechLLC/qa Ankitajain-kiwi 2023-08-16 11:39:02 +05:30
74328f37b2 Merge pull request #212 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-16 11:38:39 +05:30
d29a60558f Merge pull request #211 from KiwiTechLLC/sprint5 Ankitajain-kiwi 2023-08-16 11:38:12 +05:30
451c3bdae7 user type jain 2023-08-16 11:37:21 +05:30
54748a6704 Merge pull request #210 from KiwiTechLLC/qa Ankitajain-kiwi 2023-08-14 18:24:10 +05:30
d8f4467d98 Merge pull request #209 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-14 18:23:41 +05:30
7c809776b6 guardian code status jain 2023-08-14 18:22:50 +05:30
74e704570a Merge pull request #208 from KiwiTechLLC/qa Ankitajain-kiwi 2023-08-14 17:34:25 +05:30
a9cc05c675 Merge pull request #207 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-14 17:33:56 +05:30
e46d649fdc notification modification added more payload abutalib-kiwi 2023-08-14 16:03:36 +05:30
adb827f5a0 Merge pull request #206 from KiwiTechLLC/sprint4 dilipshrivastwa-kiwi 2023-08-14 15:26:27 +05:30
a02dfd4e31 login api with user type sprint4 jain 2023-08-14 15:23:41 +05:30
d3b0be953e login api with user type login_api_reduced_queries jain 2023-08-14 15:16:16 +05:30
11b9f00285 Merge branch 'login_api_reduced_queries' of github.com:KiwiTechLLC/ZODBank-Backend into login_api_reduced_queries jain 2023-08-14 15:01:43 +05:30
4bc16c56bd csv/xls report abutalib-kiwi 2023-08-14 13:57:29 +05:30
08dc9f8538 Merge pull request #205 from KiwiTechLLC/sprint4 dilipshrivastwa-kiwi 2023-08-14 12:20:48 +05:30
6373d1e02c sonar fixes jain 2023-08-14 12:13:14 +05:30
136d0b732a Merge pull request #204 from KiwiTechLLC/qa Ankitajain-kiwi 2023-08-14 11:46:35 +05:30
83d7d119be Merge pull request #203 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-14 11:46:04 +05:30
a1d959299a Merge pull request #202 from KiwiTechLLC/sprint4 Ankitajain-kiwi 2023-08-14 11:45:37 +05:30
070637bf1d is complete key jain 2023-08-14 11:43:59 +05:30
b974cc2010 Merge pull request #201 from KiwiTechLLC/qa Ankitajain-kiwi 2023-08-11 17:08:10 +05:30
19a6475097 Merge pull request #200 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-11 16:55:51 +05:30
fd9a4902ae Merge pull request #199 from KiwiTechLLC/sprint4 Ankitajain-kiwi 2023-08-11 16:55:21 +05:30
082f93ff9d guardian code chnages jain 2023-08-11 16:54:27 +05:30
25eaee31a4 Merge pull request #198 from KiwiTechLLC/ZBKADM-71 dilipshrivastwa-kiwi 2023-08-11 16:02:13 +05:30
d5c30f2029 added pagination in leaderboard admin ZBKADM-71 abutalib-kiwi 2023-08-11 15:54:54 +05:30
cae28e0b54 Merge pull request #197 from KiwiTechLLC/sprint4 Ankitajain-kiwi 2023-08-11 15:41:35 +05:30
54200dba52 is complete article key jain 2023-08-11 15:39:25 +05:30
846a9d42d4 Merge pull request #196 from KiwiTechLLC/ZBKADM-72-sonar-issues dilipshrivastwa-kiwi 2023-08-11 14:44:25 +05:30
69c19cf097 sonar issues ZBKADM-72-sonar-issues abutalib-kiwi 2023-08-11 14:40:49 +05:30
18cb885410 Merge pull request #193 from KiwiTechLLC/ZBKADM-71 dilipshrivastwa-kiwi 2023-08-11 14:13:05 +05:30
4ca60af5da Merge pull request #195 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-11 13:50:53 +05:30
4d7209df19 Merge pull request #194 from KiwiTechLLC/sprint4 Ankitajain-kiwi 2023-08-11 13:40:48 +05:30
94c76b7f2e remove deleted user from leaderboard jain 2023-08-11 13:39:25 +05:30
af8ea39200 leaderboard ranking abutalib-kiwi 2023-08-11 13:35:12 +05:30
6e9304b2cc Merge pull request #192 from KiwiTechLLC/sprint4 Ankitajain-kiwi 2023-08-11 13:04:54 +05:30
5eab8f4907 is complete article key jain 2023-08-11 13:04:05 +05:30
807526acfa Merge pull request #191 from KiwiTechLLC/dev Ankitajain-kiwi 2023-08-11 12:24:28 +05:30
f750487b88 Merge pull request #190 from KiwiTechLLC/sprint4 dilipshrivastwa-kiwi 2023-08-11 12:21:47 +05:30
8b0032f6d2 junior point table jain 2023-08-11 12:18:35 +05:30
bb65f81200 add correct and attempt answer jain 2023-08-11 11:48:02 +05:30

... 5 6 7 8 9 ...