Commit Graph

74 Commits

Author SHA1 Message Date
20644a6293 google login with user type and is published article only display 2023-08-23 17:15:54 +05:30
930c10b578 swagger update 2023-08-22 11:28:52 +05:30
2216411fd2 Merge branch 'dev' into ZBKADM-72-minor-changes 2023-08-21 14:33:36 +05:30
606c1fa6e6 minor changes in excel import api method 2023-08-21 14:28:06 +05:30
21e006ae2a added description for api, changes in upload image and file to alibaba method 2023-08-18 18:37:58 +05:30
150bb9250d Merge pull request #222 from KiwiTechLLC/sprint5
Sprint5
2023-08-18 16:31:35 +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
dd2890bca6 handle delete scenerio in approve task and junior 2023-08-18 11:04:05 +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
4bc16c56bd csv/xls report 2023-08-14 13:57:29 +05:30
6373d1e02c sonar fixes 2023-08-14 12:13:14 +05:30
070637bf1d is complete key 2023-08-14 11:43:59 +05:30
25eaee31a4 Merge pull request #198 from KiwiTechLLC/ZBKADM-71
added pagination in leaderboard admin
2023-08-11 16:02:13 +05:30
d5c30f2029 added pagination in leaderboard admin 2023-08-11 15:56:22 +05:30
cae28e0b54 Merge pull request #197 from KiwiTechLLC/sprint4
is complete article key
2023-08-11 15:41:35 +05:30
54200dba52 is complete article key 2023-08-11 15:39:25 +05:30
69c19cf097 sonar issues 2023-08-11 14:40:49 +05:30
18cb885410 Merge pull request #193 from KiwiTechLLC/ZBKADM-71
leaderboard ranking
2023-08-11 14:13:05 +05:30
af8ea39200 leaderboard ranking 2023-08-11 13:37:44 +05:30
6e9304b2cc Merge pull request #192 from KiwiTechLLC/sprint4
is complete article key
2023-08-11 13:04:54 +05:30
5eab8f4907 is complete article key 2023-08-11 13:04:05 +05:30
f750487b88 Merge pull request #190 from KiwiTechLLC/sprint4
add correct and attempt answer
2023-08-11 12:21:47 +05:30
bb65f81200 add correct and attempt answer 2023-08-11 11:48:02 +05:30
80dffb7942 Merge pull request #184 from KiwiTechLLC/ZBKADM-71
image name fix, remove '|' character
2023-08-10 18:21:10 +05:30
0a8c2cf56d image name fix, remove '|' character 2023-08-10 18:17:49 +05:30
03fb4f4176 Merge pull request #182 from KiwiTechLLC/sprint4
current page update in article api
2023-08-10 15:51:09 +05:30
69723b362f current page update in article api 2023-08-10 15:30:46 +05:30
924bc20193 Merge pull request #176 from KiwiTechLLC/sprint4
points
2023-08-09 19:21:50 +05:30
af7582b9e2 points 2023-08-09 19:20:56 +05:30
856d27d803 Merge pull request #175 from KiwiTechLLC/sprint4
points remove from serializer
2023-08-09 18:54:12 +05:30
19f56280e4 points remove from serializer 2023-08-09 18:53:18 +05:30
11ff8fc700 conflict resolved 2023-08-09 17:03:42 +05:30
9c75cb1615 analytics section api, users counts, new signup count, task report 2023-08-09 16:57:19 +05:30
823c5ea4c4 Merge pull request #168 from KiwiTechLLC/ZBKADM-69
otp, verify otp and login bug resolved
2023-08-09 14:21:58 +05:30
c9ee482512 otp, verify otp and login bug resolved 2023-08-09 14:16:20 +05:30
d86f082e58 article card api, check answer api 2023-08-09 13:37:06 +05:30
85e4ae8761 junior position changes and decrease api response time 2023-08-08 13:54:04 +05:30
f57b111555 guardian list api changes 2023-08-08 11:48:53 +05:30
6596414675 guardian list api changes 2023-08-08 11:46:27 +05:30
ae0fc4fe8d article list api 2023-08-07 17:06:31 +05:30
f2cf1488e9 changes in edit api, included first name, last name and username 2023-08-07 15:12:54 +05:30
83ec922584 admin login api modified 2023-08-07 12:10:36 +05:30
4a2f36cde8 edit user validations, active-inactive api 2023-08-07 11:01:37 +05:30
baacb1a18f user edit api 2023-08-04 16:37:46 +05:30
5f1c645e3a user list api 2023-08-04 16:27:46 +05:30