Commit Graph

545 Commits

Author SHA1 Message Date
4b8e7189c1 Merge pull request #127 from KiwiTechLLC/ZBKADM-67
changes in approve junior and add juinior api, added search in junior…
2023-07-28 18:11:54 +05:30
d68f24543d changes in approve junior and add juinior api, added search in junior list api 2023-07-28 17:32:02 +05:30
3534561697 Merge pull request #126 from KiwiTechLLC/ZBKADM-67
some changes in artcle api
2023-07-28 16:50:26 +05:30
de774111c0 some changes in artcle api 2023-07-28 16:08:40 +05:30
c081bc621d Merge pull request #124 from KiwiTechLLC/dev
merging dev into qa
2023-07-27 22:04:51 +05:30
bab50e4492 Merge pull request #123 from KiwiTechLLC/ZBKADM-67
some changes in admin password reset related api
2023-07-27 19:36:01 +05:30
151a177e76 some changes in admin password reset related api 2023-07-27 19:29:12 +05:30
73a62186a7 Merge pull request #122 from KiwiTechLLC/ZBKADM-67
added request status in expired task cronjob
2023-07-27 15:32:17 +05:30
83c66ab3b6 added request status in expired task cronjob 2023-07-27 15:31:25 +05:30
94e53e1dcd Merge pull request #121 from KiwiTechLLC/ZBKADM-67
added task to send otp on email
2023-07-27 13:12:36 +05:30
68b77ef766 added task to send otp on email 2023-07-27 12:59:41 +05:30
d2c8b18e3f Merge pull request #120 from KiwiTechLLC/dev
merging dev itno qa
2023-07-27 11:37:25 +05:30
a2000459d3 Merge pull request #119 from KiwiTechLLC/ZBKADM-67
some changes in forgot password api
2023-07-27 11:06:09 +05:30
c079f3ceca some changes in forgot password api 2023-07-27 10:59:10 +05:30
671cdfc27b Merge pull request #118 from KiwiTechLLC/ZBKADM-67
change password api
2023-07-26 17:51:32 +05:30
a83e27b12a Merge branch 'dev' into ZBKADM-67 2023-07-26 17:45:22 +05:30
87aa1af02b change password api 2023-07-26 17:16:36 +05:30
bdc0ba4fd5 Merge pull request #117 from KiwiTechLLC/dev
Dev
2023-07-26 16:58:38 +05:30
5f3026f08f Merge pull request #116 from KiwiTechLLC/sprint3
jira-28 notification
2023-07-26 16:51:46 +05:30
a323ad7df7 jira-28 notification 2023-07-26 16:42:26 +05:30
2b6e943d8c jira-28 notification 2023-07-26 16:38:36 +05:30
3af2584d6a Merge pull request #115 from KiwiTechLLC/dev
Dev
2023-07-26 11:09:40 +05:30
bca0d8d49b Merge pull request #114 from KiwiTechLLC/sprint3
requirement .txt file add
2023-07-26 11:08:02 +05:30
b860d937f5 requirement .txt file add 2023-07-26 11:06:58 +05:30
62cf2b14bf Merge pull request #113 from KiwiTechLLC/dev
merging dev into qa
2023-07-26 11:01:45 +05:30
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
d0ef4391cc conflict resolved 2023-07-25 19:51:27 +05:30
5a1b419863 Merge pull request #111 from KiwiTechLLC/sprint3
jira-290 cron job for expired task
2023-07-25 19:49:24 +05:30
7bf0e62604 added api for forgot password, verify otp and resend otp for admin 2023-07-25 19:43:14 +05:30
80843502a6 jira-290 cron job for expired task 2023-07-25 19:13:25 +05:30
cbd3d139a5 Merge pull request #110 from KiwiTechLLC/dev
Dev
2023-07-25 17:36:49 +05:30
3b31d08996 Merge pull request #109 from KiwiTechLLC/sprint3
Sprint3
2023-07-25 17:34:44 +05:30
3cdd685ea8 sonar issues 2023-07-25 17:21:18 +05:30
c4152c0773 Merge branch 'sprint3' of github.com:KiwiTechLLC/ZODBank-Backend into sprint3 2023-07-25 17:15:35 +05:30
8a454c3f97 sonar issues 2023-07-25 17:15:16 +05:30
71405780f8 Merge branch 'dev' into sprint3 2023-07-25 17:07:58 +05:30
a8558b5e6e sonar issues 2023-07-25 17:06:26 +05:30
7c4f9b2506 jira-291 start task api 2023-07-25 16:54:48 +05:30
cc3490b059 Merge pull request #108 from KiwiTechLLC/ZBKADM-67
article card folder name change
2023-07-25 15:52:22 +05:30
32476149bc article card folder name change 2023-07-25 15:50:43 +05:30
c57224ad0e Merge pull request #107 from KiwiTechLLC/sprint3
jira-28 invite guardian
2023-07-25 15:29:36 +05:30
c8a8e1149b jira-28 invite guardian 2023-07-25 15:27:29 +05:30
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
6dcf045131 Merge branch 'dev' into ZBKADM-67 2023-07-25 14:22:37 +05:30
6e84814117 modified yml file, default article card image upload api, 2023-07-25 14:09:51 +05:30
c587ba322e Merge pull request #105 from KiwiTechLLC/sprint3
start task api
2023-07-25 13:29:32 +05:30
2db0e47e3b resolve conflict 2023-07-25 13:21:20 +05:30
52cdd4b0ba resolve conflict 2023-07-25 13:19:53 +05:30
6be0682913 junior guardian relation table 2023-07-25 13:17:27 +05:30
bfeeb5e41f Merge branch 'dev' into sprint3 2023-07-25 12:56:48 +05:30