319 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Abu Talib	3801e6e027	Merge pull request #142 from KiwiTechLLC/dev ... Dev	2023-08-03 14:59:49 +05:30
Ankitajain-kiwi	b2d172eae5	Merge pull request #141 from KiwiTechLLC/sprint4 ... migration file	2023-08-02 16:58:24 +05:30
jain	404825dc85	migration file	2023-08-02 16:57:40 +05:30
Ankitajain-kiwi	6e6f0a55d0	Merge pull request #140 from KiwiTechLLC/sprint4 ... changes in remove guardian code api	2023-08-02 16:26:56 +05:30
jain	75d0b12008	changes in remove guardian code api	2023-08-02 16:26:20 +05:30
Ankitajain-kiwi	2a4011ca5d	Merge pull request #139 from KiwiTechLLC/sprint4 ... sprint4 reassign task after expired	2023-08-02 15:21:38 +05:30
jain	ebb468166e	sprint4 reassign task after expired	2023-08-02 15:20:43 +05:30
Ankitajain-kiwi	e89fc513cb	Merge pull request #138 from KiwiTechLLC/dev ... Dev	2023-08-02 14:25:06 +05:30
Ankitajain-kiwi	06176912ee	Merge pull request #137 from KiwiTechLLC/sprint4 ... change junior task list api response	2023-08-02 14:24:38 +05:30
jain	ed8fc156ac	change junior task list api response	2023-08-02 14:23:36 +05:30
Ankitajain-kiwi	e1af1c200d	Merge pull request #136 from KiwiTechLLC/dev ... Dev	2023-08-02 11:33:29 +05:30
dilipshrivastwa-kiwi	bff97f59b2	Merge pull request #135 from KiwiTechLLC/ZBKADM-67 ... changes in article update api and get image url method	2023-08-02 11:19:21 +05:30
abutalib-kiwi	af121f5a53	changes in article update api and get image url method	2023-08-02 11:16:12 +05:30
Ankitajain-kiwi	4c3aa03e13	Merge pull request #134 from KiwiTechLLC/sprint4 ... api response time	2023-08-02 11:00:42 +05:30
jain	f3a8b52617	api response time	2023-08-02 11:00:02 +05:30
dilipshrivastwa-kiwi	0c3a77cd11	Merge pull request #133 from KiwiTechLLC/ZBKADM-67 ... change in update api, added method to upload and get image url	2023-08-01 20:19:09 +05:30
abutalib-kiwi	d3564efbb9	change in update api, added method to upload and get image url	2023-08-01 20:15:01 +05:30
dilipshrivastwa-kiwi	329df77790	Merge pull request #132 from KiwiTechLLC/ZBKADM-67 ... article list api changes, changed related name for survey_options to …	2023-08-01 13:16:37 +05:30
abutalib-kiwi	ee92c98f34	article list api changes, changed related name for survey_options to options	2023-08-01 13:14:22 +05:30
Abu Talib	b238379a22	Merge pull request #130 from KiwiTechLLC/dev ... Dev	2023-07-28 19:49:56 +05:30
dilipshrivastwa-kiwi	fbce04b97e	Merge pull request #129 from KiwiTechLLC/ZBKADM-67 ... fixed add junior api	2023-07-28 19:30:39 +05:30
abutalib-kiwi	afaed69eec	fixed add junior api	2023-07-28 19:19:59 +05:30
dilipshrivastwa-kiwi	3c0eaf676e	Merge pull request #128 from KiwiTechLLC/ZBKADM-67 ... fixed add junior api	2023-07-28 19:00:41 +05:30
abutalib-kiwi	6ffaa66a4d	fixed add junior api	2023-07-28 18:57:11 +05:30
dilipshrivastwa-kiwi	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
abutalib-kiwi	d68f24543d	changes in approve junior and add juinior api, added search in junior list api	2023-07-28 17:32:02 +05:30
dilipshrivastwa-kiwi	3534561697	Merge pull request #126 from KiwiTechLLC/ZBKADM-67 ... some changes in artcle api	2023-07-28 16:50:26 +05:30
abutalib-kiwi	de774111c0	some changes in artcle api	2023-07-28 16:08:40 +05:30
Abu Talib	c081bc621d	Merge pull request #124 from KiwiTechLLC/dev ... merging dev into qa	2023-07-27 22:04:51 +05:30
dilipshrivastwa-kiwi	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
abutalib-kiwi	151a177e76	some changes in admin password reset related api	2023-07-27 19:29:12 +05:30
dilipshrivastwa-kiwi	73a62186a7	Merge pull request #122 from KiwiTechLLC/ZBKADM-67 ... added request status in expired task cronjob	2023-07-27 15:32:17 +05:30
abutalib-kiwi	83c66ab3b6	added request status in expired task cronjob	2023-07-27 15:31:25 +05:30
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
Abu Talib	d2c8b18e3f	Merge pull request #120 from KiwiTechLLC/dev ... merging dev itno qa	2023-07-27 11:37:25 +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
Ankitajain-kiwi	bdc0ba4fd5	Merge pull request #117 from KiwiTechLLC/dev ... Dev	2023-07-26 16:58:38 +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	3af2584d6a	Merge pull request #115 from KiwiTechLLC/dev ... Dev	2023-07-26 11:09:40 +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
Abu Talib	62cf2b14bf	Merge pull request #113 from KiwiTechLLC/dev ... merging dev into qa	2023-07-26 11:01:45 +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