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

• af25dc4e82 Merge pull request #331 from KiwiTechLLC/ZBKBCK-52 dilipshrivastwa-kiwi 2023-09-13 14:05:55 +05:30
• eaf67b682f modified get article card current page method abutalib-kiwi 2023-09-13 14:03:13 +05:30
• 71bbef84aa Merge pull request #330 from KiwiTechLLC/ZBKBCK-52 dilipshrivastwa-kiwi 2023-09-13 13:40:10 +05:30
• 085607128b modified get article card current page method abutalib-kiwi 2023-09-13 13:36:25 +05:30
• fbdef7c0c4 Merge branch 'dev' of https://github.com/KiwiTechLLC/ZODBank-Backend into dev abutalib-kiwi 2023-09-13 13:34:14 +05:30
• 535e2e7f56 Merge pull request #329 from KiwiTechLLC/ZBKADM-73-test-cases dilipshrivastwa-kiwi 2023-09-13 12:15:37 +05:30
• 08f54f28a4 added a test case, updated coverage file ZBKADM-73-test-cases abutalib-kiwi 2023-09-12 23:08:17 +05:30
• de710c8a7b Merge pull request #328 from KiwiTechLLC/ZBKADM-73-test-cases dilipshrivastwa-kiwi 2023-09-12 15:18:55 +05:30
• af06dddbeb updated coverage file abutalib-kiwi 2023-09-12 15:03:12 +05:30
• 0a9dde2038 Merge branch 'dev' of https://github.com/KiwiTechLLC/ZODBank-Backend into dev abutalib-kiwi 2023-09-12 14:58:35 +05:30
• f11959d6bc Merge pull request #327 from KiwiTechLLC/ZBKADM-73-test-cases dilipshrivastwa-kiwi 2023-09-12 14:54:26 +05:30
• 7aee372606 test cases for admin user management, analytics and notification abutalib-kiwi 2023-09-12 14:51:28 +05:30
• 1dec5ace3f test cases for admin user management, analytics and notification abutalib-kiwi 2023-09-12 14:42:44 +05:30
• 2444b6f55e test cases for admin user management, analytics and notification abutalib-kiwi 2023-09-12 14:40:50 +05:30
• 0a5252d448 Merge pull request #326 from KiwiTechLLC/qa Abu Talib 2023-09-12 11:34:23 +05:30
• 52a40c085f Merge pull request #325 from KiwiTechLLC/dev Abu Talib 2023-09-11 17:54:18 +05:30
• 3ecbc1d303 Merge pull request #324 from KiwiTechLLC/ZBKBCK-52 dilipshrivastwa-kiwi 2023-09-11 17:37:42 +05:30
• ca0041caa6 make special password method modified abutalib-kiwi 2023-09-11 17:01:03 +05:30
• c800853e9b make special password method modified abutalib-kiwi 2023-09-11 16:45:07 +05:30
• 373c1b70ab make special password method modified abutalib-kiwi 2023-09-11 16:40:07 +05:30
• 3a84b1ea75 Merge pull request #323 from KiwiTechLLC/ZBKADM-73-test-cases dilipshrivastwa-kiwi 2023-09-11 14:45:25 +05:30
• bf1004696a added test cases for auth abutalib-kiwi 2023-09-11 14:39:01 +05:30
• b60892f0e6 Merge pull request #322 from KiwiTechLLC/qa Abu Talib 2023-09-11 13:52:52 +05:30
• d937c1bb92 Merge branch 'dev' into ZBKADM-73-test-cases abutalib-kiwi 2023-09-11 13:00:04 +05:30
• 78fe41ae44 Merge pull request #321 from KiwiTechLLC/dev Abu Talib 2023-09-11 12:43:14 +05:30
• 0a877b410e Merge pull request #320 from KiwiTechLLC/ZBKBCK-52 dilipshrivastwa-kiwi 2023-09-11 12:22:31 +05:30
• 9d4e7b05e4 modified add junior api for exsiting junior. abutalib-kiwi 2023-09-11 12:08:22 +05:30
• b20e1cf516 Merge pull request #319 from KiwiTechLLC/ZBKBCK-52 dilipshrivastwa-kiwi 2023-09-09 16:52:03 +05:30
• 6b0ea91742 api to check whether given user exist or not abutalib-kiwi 2023-09-08 20:55:32 +05:30
• 859d26d073 test cases for web admin auth abutalib-kiwi 2023-09-08 19:07:06 +05:30
• 1d44c642df Merge pull request #318 from KiwiTechLLC/dev Abu Talib 2023-09-08 17:56:57 +05:30
• 154b9de32b Merge pull request #317 from KiwiTechLLC/ZBKBCK-52 Abu Talib 2023-09-08 16:56:18 +05:30
• 4a554272a0 check answer api fixed abutalib-kiwi 2023-09-08 16:41:59 +05:30
• 8533a27cb7 Merge pull request #316 from KiwiTechLLC/ZBKBCK-52 dilipshrivastwa-kiwi 2023-09-08 16:54:31 +05:30
• 7db6502a89 check answer api fixed abutalib-kiwi 2023-09-08 16:41:59 +05:30
• a8e9a09d3f Merge pull request #315 from KiwiTechLLC/ZBKBCK-52 dilipshrivastwa-kiwi 2023-09-08 16:17:20 +05:30
• 1e97d7bd6b modified task description field, modified check answer api and create task api abutalib-kiwi 2023-09-08 16:14:29 +05:30
• b084b255dc Merge pull request #314 from KiwiTechLLC/ZBKADM-73-test-cases dilipshrivastwa-kiwi 2023-09-08 11:08:18 +05:30
• 441842df74 test cases for web admin article abutalib-kiwi 2023-09-07 19:24:37 +05:30
• 9cb7260597 Merge pull request #313 from KiwiTechLLC/qa Abu Talib 2023-09-07 16:06:07 +05:30
• 53c5b7079e Merge pull request #312 from KiwiTechLLC/dev Abu Talib 2023-09-07 15:29:44 +05:30
• 78fb5f5650 Merge pull request #311 from KiwiTechLLC/ZBKBCK-50 dilipshrivastwa-kiwi 2023-09-07 15:13:33 +05:30
• f3478c972e modification in create task api ZBKBCK-50 abutalib-kiwi 2023-09-07 15:10:18 +05:30
• f63d9ddea0 Merge pull request #310 from KiwiTechLLC/ZBKBCK-50 dilipshrivastwa-kiwi 2023-09-07 13:51:57 +05:30
• bc18c67527 modified article publish and un-publish api, sonar issues, modification in create task api abutalib-kiwi 2023-09-07 13:49:06 +05:30
• 3ef9053290 Merge pull request #309 from KiwiTechLLC/dev Abu Talib 2023-09-06 18:10:45 +05:30
• 0471a3d588 Merge pull request #308 from KiwiTechLLC/ZBKBCK-50 dilipshrivastwa-kiwi 2023-09-06 17:41:49 +05:30
• ffb99f5099 modified some success messages. abutalib-kiwi 2023-09-06 15:26:10 +05:30
• 5d5f6b2f45 Merge pull request #307 from KiwiTechLLC/qa Abu Talib 2023-09-06 12:40:44 +05:30
• fdfe6e7dad Merge pull request #306 from KiwiTechLLC/dev Abu Talib 2023-09-06 12:33:22 +05:30
• 8183edf319 Merge pull request #305 from KiwiTechLLC/ZBKBCK-51 dilipshrivastwa-kiwi 2023-09-05 19:36:09 +05:30
• 8f214d11a7 modified create task api, added badge count in notification list ZBKBCK-51 abutalib-kiwi 2023-09-05 19:29:57 +05:30
• b5a89df59a Merge pull request #304 from KiwiTechLLC/ZBKBCK-50 dilipshrivastwa-kiwi 2023-09-05 14:02:16 +05:30
• 5524eeed64 modified pagination in task list and junior task list api abutalib-kiwi 2023-09-05 13:54:58 +05:30
• aeaa7d7ab8 Merge pull request #303 from KiwiTechLLC/sprint6-bugs dilipshrivastwa-kiwi 2023-09-05 13:14:01 +05:30
• 69be3bb2ac Merge pull request #302 from KiwiTechLLC/ZBKBCK-50 dilipshrivastwa-kiwi 2023-09-04 18:55:12 +05:30
• be9f600bcc modified cord allowed origin values, added yml file for qa stage and prod abutalib-kiwi 2023-09-04 16:45:29 +05:30
• 65d0932893 sonar issues sprint6-bugs jain 2023-09-04 16:52:50 +05:30
• 9b14eedb18 handle scenerio for task after disassociate jain 2023-09-04 16:49:18 +05:30
• 6c96ea0820 Merge pull request #301 from KiwiTechLLC/ZBKBCK-49 dilipshrivastwa-kiwi 2023-09-04 16:08:22 +05:30
• a211baa10a added cors Allow specific origins setting, unpublish article api, pagination in notification list ZBKBCK-49 abutalib-kiwi 2023-09-04 15:46:36 +05:30
• a93dc83bd1 Merge pull request #300 from KiwiTechLLC/sprint6-bugs dilipshrivastwa-kiwi 2023-09-04 15:27:42 +05:30
• 116fb00358 optimized task status code jain 2023-09-04 15:22:15 +05:30
• 20fa6e43da changes in task list API and add special character in password for added junior jain 2023-09-04 15:02:47 +05:30
• 2cffc4e128 Merge pull request #299 from KiwiTechLLC/ZBKBCK-49 dilipshrivastwa-kiwi 2023-09-04 13:16:15 +05:30
• ec585d35f3 added and modifid pagination abutalib-kiwi 2023-09-04 13:11:25 +05:30
• d62efa2139 added and modifid pagination abutalib-kiwi 2023-09-04 13:09:54 +05:30
• 7b75a3233c add current page and total page in task list API jain 2023-09-04 12:52:04 +05:30
• e1ef289c69 Merge pull request #298 from KiwiTechLLC/sprint6-bugs dilipshrivastwa-kiwi 2023-09-01 17:05:50 +05:30
• 4f79a690c1 unrestrict logout and refresh token api while login in multiple device jain 2023-09-01 16:25:05 +05:30
• 0af2a35206 task assign to multiple junior jain 2023-09-01 12:14:15 +05:30
• 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