Commit Graph
278 Commits
Author SHA1 Message Date
dilipshrivastwa-kiwi 94e53e1dcd Merge pull request #121 from KiwiTechLLC/ZBKADM-67
added task to send otp on email
2023-07-27 13:12:36 +05:30
abutalib-kiwi 68b77ef766 added task to send otp on email 2023-07-27 12:59:41 +05:30
dilipshrivastwa-kiwi a2000459d3 Merge pull request #119 from KiwiTechLLC/ZBKADM-67
some changes in forgot password api
2023-07-27 11:06:09 +05:30
abutalib-kiwi c079f3ceca some changes in forgot password api 2023-07-27 10:59:10 +05:30
dilipshrivastwa-kiwi 671cdfc27b Merge pull request #118 from KiwiTechLLC/ZBKADM-67
change password api
2023-07-26 17:51:32 +05:30
abutalib-kiwi a83e27b12a Merge branch 'dev' into ZBKADM-67 2023-07-26 17:45:22 +05:30
abutalib-kiwi 87aa1af02b change password api 2023-07-26 17:16:36 +05:30
dilipshrivastwa-kiwi 5f3026f08f Merge pull request #116 from KiwiTechLLC/sprint3
jira-28 notification
2023-07-26 16:51:46 +05:30
jain a323ad7df7 jira-28 notification 2023-07-26 16:42:26 +05:30
jain 2b6e943d8c jira-28 notification 2023-07-26 16:38:36 +05:30
Ankitajain-kiwi bca0d8d49b Merge pull request #114 from KiwiTechLLC/sprint3
requirement .txt file add
2023-07-26 11:08:02 +05:30
jain b860d937f5 requirement .txt file add 2023-07-26 11:06:58 +05:30
dilipshrivastwa-kiwi 11b10bf751 Merge pull request #112 from KiwiTechLLC/ZBKADM-67
added api for forgot password, verify otp and resend otp for admin
2023-07-25 19:57:49 +05:30
abutalib-kiwi d0ef4391cc conflict resolved 2023-07-25 19:51:27 +05:30
dilipshrivastwa-kiwi 5a1b419863 Merge pull request #111 from KiwiTechLLC/sprint3
jira-290 cron job for expired task
2023-07-25 19:49:24 +05:30
abutalib-kiwi 7bf0e62604 added api for forgot password, verify otp and resend otp for admin 2023-07-25 19:43:14 +05:30
jain 80843502a6 jira-290 cron job for expired task 2023-07-25 19:13:25 +05:30
dilipshrivastwa-kiwi 3b31d08996 Merge pull request #109 from KiwiTechLLC/sprint3
Sprint3
2023-07-25 17:34:44 +05:30
jain 3cdd685ea8 sonar issues 2023-07-25 17:21:18 +05:30
jain c4152c0773 Merge branch 'sprint3' of github.com:KiwiTechLLC/ZODBank-Backend into sprint3 2023-07-25 17:15:35 +05:30
jain 8a454c3f97 sonar issues 2023-07-25 17:15:16 +05:30
Ankitajain-kiwi 71405780f8 Merge branch 'dev' into sprint3 2023-07-25 17:07:58 +05:30
jain a8558b5e6e sonar issues 2023-07-25 17:06:26 +05:30
jain 7c4f9b2506 jira-291 start task api 2023-07-25 16:54:48 +05:30
dilipshrivastwa-kiwi cc3490b059 Merge pull request #108 from KiwiTechLLC/ZBKADM-67
article card folder name change
2023-07-25 15:52:22 +05:30
abutalib-kiwi 32476149bc article card folder name change 2023-07-25 15:50:43 +05:30
Ankitajain-kiwi c57224ad0e Merge pull request #107 from KiwiTechLLC/sprint3
jira-28 invite guardian
2023-07-25 15:29:36 +05:30
jain c8a8e1149b jira-28 invite guardian 2023-07-25 15:27:29 +05:30
dilipshrivastwa-kiwi 7c69dfd49f Merge pull request #106 from KiwiTechLLC/ZBKADM-67
modified yml file, default article card image upload api,
2023-07-25 14:46:56 +05:30
abutalib-kiwi 6dcf045131 Merge branch 'dev' into ZBKADM-67 2023-07-25 14:22:37 +05:30
abutalib-kiwi 6e84814117 modified yml file, default article card image upload api, 2023-07-25 14:09:51 +05:30
dilipshrivastwa-kiwi c587ba322e Merge pull request #105 from KiwiTechLLC/sprint3
start task api
2023-07-25 13:29:32 +05:30
jain 2db0e47e3b resolve conflict 2023-07-25 13:21:20 +05:30
jain 52cdd4b0ba resolve conflict 2023-07-25 13:19:53 +05:30
jain 6be0682913 junior guardian relation table 2023-07-25 13:17:27 +05:30
Ankitajain-kiwi bfeeb5e41f Merge branch 'dev' into sprint3 2023-07-25 12:56:48 +05:30
jain bb56fc7a33 try and except in api 2023-07-25 12:53:56 +05:30
jain e6d45f3bf2 start task api 2023-07-25 12:02:59 +05:30
dilipshrivastwa-kiwi 49b648e86b Merge pull request #103 from KiwiTechLLC/sprint3
Sprint3
2023-07-25 11:33:08 +05:30
jain 79e85fa968 jira-27 invite guardian api 2023-07-25 11:17:57 +05:30
jain 096961976d sonar issues 2023-07-24 15:28:54 +05:30
dilipshrivastwa-kiwi 4d104bab1c Merge pull request #101 from KiwiTechLLC/sprint3
bugs and push notification for create task
2023-07-24 15:19:40 +05:30
jain ed28117a7f bugs and push notification for create task 2023-07-24 15:10:59 +05:30
Ankitajain-kiwi 0a7c081f63 Merge branch 'qa' into dev 2023-07-24 11:03:59 +05:30
jain a2b4f3b758 update position of the junior 2023-07-24 11:00:22 +05:30
jain d86f7d3436 guardian code 2023-07-21 18:38:16 +05:30
jain a5a309cf5b comment top junior call api 2023-07-21 18:33:18 +05:30
jain 0a5eaa233f add qa top -junior url 2023-07-21 17:33:21 +05:30
jain b32d4def2d add qa top -junior url 2023-07-21 16:25:21 +05:30
Ankitajain-kiwi 410282036e Merge pull request #99 from KiwiTechLLC/sprint3
add dev url for top junior api
2023-07-21 16:23:07 +05:30