Commit Graph

454 Commits

Author SHA1 Message Date
454f66b3a0 conflict has been resolved 2023-08-18 19:50:14 +05:30
5045f5acda Merge pull request #228 from KiwiTechLLC/ZBKADM-72-minor-changes
added description for api, changes in upload image and file to alibab…
2023-08-18 19:01:34 +05:30
21e006ae2a added description for api, changes in upload image and file to alibaba method 2023-08-18 18:37:58 +05:30
dfb73a7d36 Merge pull request #227 from KiwiTechLLC/sprint5
Sprint5
2023-08-18 18:32:21 +05:30
3921f76f22 remove print statement 2023-08-18 18:31:27 +05:30
cdf1a7b74e add comma 2023-08-18 18:29:46 +05:30
b4026a4f11 middleware 2023-08-18 18:12:14 +05:30
71a3e36bf3 [ZBKBCK-346] change password and forgot password api has been optimised 2023-08-18 16:57:42 +05:30
4bc91abebf Merge pull request #225 from KiwiTechLLC/sprint5
remove threading from login api
2023-08-18 16:40:35 +05:30
5b236dfc81 remove threading from login api 2023-08-18 16:37:42 +05:30
150bb9250d Merge pull request #222 from KiwiTechLLC/sprint5
Sprint5
2023-08-18 16:31:35 +05:30
51d3b77ff7 password validation, deactivated user's middleware 2023-08-18 15:45:57 +05:30
92c67dd455 Merge pull request #224 from KiwiTechLLC/ZBKADM-72-minor-changes
article bug fixed, changed image name in get image url
2023-08-18 15:07:46 +05:30
9a5447bca2 article bug fixed, changed image name in get image url 2023-08-18 14:52:38 +05:30
392086760f Merge pull request #223 from KiwiTechLLC/ZBKADM-72
csv/excel method changed, uploading to alibaba cloud and providing li…
2023-08-18 13:47:36 +05:30
ceaf584332 csv/excel method changed, uploading to alibaba cloud and providing link to frontend 2023-08-18 11:46:40 +05:30
ef4c459229 handle deleted user scenario in complete task api 2023-08-18 11:45:21 +05:30
dd2890bca6 handle delete scenerio in approve task and junior 2023-08-18 11:04:05 +05:30
b46109e487 FAQ list and creation 2023-08-17 16:06:58 +05:30
3f6c9a2d99 FAQ list and creation 2023-08-17 15:48:26 +05:30
f74302df04 Merge branch 'dev' of github.com:KiwiTechLLC/ZODBank-Backend into sprint5 2023-08-17 14:22:33 +05:30
9bdd324c4e Merge pull request #221 from KiwiTechLLC/email-verification-issue
remove print statement for expiry date
2023-08-17 13:28:55 +05:30
04ed9c668c remove print statement for expiry date 2023-08-17 13:24:20 +05:30
e1d092d663 Merge pull request #220 from KiwiTechLLC/ZBKADM-72
added required packages in reuirements fil
2023-08-17 13:10:11 +05:30
4e8243c17e added required packages in reuirements fil 2023-08-17 13:07:59 +05:30
13ba311822 Merge pull request #218 from KiwiTechLLC/ZBKADM-72
csv/excel export api
2023-08-17 12:45:38 +05:30
043c8c2f63 csv excel export api 2023-08-17 12:30:39 +05:30
a5f239b9d9 Merge pull request #219 from KiwiTechLLC/email-verification-issue
print statement for expiry date
2023-08-17 12:29:31 +05:30
36427b50c1 print statement for expiry date 2023-08-17 12:24:33 +05:30
728d19da99 FAQ model 2023-08-17 12:21:13 +05:30
5da07002e0 Merge pull request #217 from KiwiTechLLC/ZBKBCK-47
notification modification added more payload
2023-08-16 16:48:53 +05:30
3017b0ece0 changes in notification method 2023-08-16 16:40:34 +05:30
e73113fcca Merge branch 'dev' into ZBKBCK-47 2023-08-16 16:39:36 +05:30
c278670c39 Merge pull request #214 from KiwiTechLLC/sprint5
email verification and user notification bug
2023-08-16 16:28:58 +05:30
60af098e1e email verfication and user notification bug 2023-08-16 16:16:05 +05:30
d29a60558f Merge pull request #211 from KiwiTechLLC/sprint5
user type
2023-08-16 11:38:12 +05:30
451c3bdae7 user type 2023-08-16 11:37:21 +05:30
7c809776b6 guardian code status 2023-08-14 18:22:50 +05:30
e46d649fdc notification modification added more payload 2023-08-14 16:03:36 +05:30
adb827f5a0 Merge pull request #206 from KiwiTechLLC/sprint4
Sprint4
2023-08-14 15:26:27 +05:30
a02dfd4e31 login api with user type 2023-08-14 15:23:41 +05:30
d3b0be953e login api with user type 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 2023-08-14 15:01:43 +05:30
4bc16c56bd csv/xls report 2023-08-14 13:57:29 +05:30
08dc9f8538 Merge pull request #205 from KiwiTechLLC/sprint4
sonar fixes
2023-08-14 12:20:48 +05:30
6373d1e02c sonar fixes 2023-08-14 12:13:14 +05:30
a1d959299a Merge pull request #202 from KiwiTechLLC/sprint4
is complete key
2023-08-14 11:45:37 +05:30
070637bf1d is complete key 2023-08-14 11:43:59 +05:30
fd9a4902ae Merge pull request #199 from KiwiTechLLC/sprint4
guardian code chnages
2023-08-11 16:55:21 +05:30
082f93ff9d guardian code chnages 2023-08-11 16:54:27 +05:30