Commit Graph
254 Commits
Author SHA1 Message Date
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
jain 2a225ea79d add dev url for top junior api 2023-07-21 16:19:30 +05:30
Ankitajain-kiwi 65e012dd60 Merge pull request #98 from KiwiTechLLC/sprint3
add print in junior list
2023-07-21 14:49:52 +05:30
jain 8013767d71 add print in junior list 2023-07-21 14:49:38 +05:30
jain fdd0b88b11 add print in junior list 2023-07-21 14:48:18 +05:30
dilipshrivastwa-kiwi bb1351c309 Merge pull request #96 from KiwiTechLLC/ZBKBCK-001
article api changes
2023-07-21 12:32:32 +05:30
Ankitajain-kiwi c15bd2339a Merge pull request #97 from KiwiTechLLC/dev
Dev
2023-07-21 12:07:26 +05:30
abutalib-kiwi 5ee01af825 article api changes 2023-07-21 11:35:58 +05:30
dilipshrivastwa-kiwi b8382e225c Merge pull request #95 from KiwiTechLLC/ZBKBCK-001
added article point
2023-07-20 18:25:23 +05:30
abutalib-kiwi 532b56c687 added article point 2023-07-20 18:01:53 +05:30
dilipshrivastwa-kiwi 6fe29f0070 Merge pull request #94 from KiwiTechLLC/sprint3
real time changes
2023-07-20 17:13:31 +05:30
jain 96d71d951e real time changes 2023-07-20 17:09:49 +05:30
Ankitajain-kiwi effad5cddc Merge pull request #93 from KiwiTechLLC/dev
Dev
2023-07-20 13:25:53 +05:30
Ankitajain-kiwi 8c0da25814 Merge branch 'qa' into dev 2023-07-20 13:25:42 +05:30
Ankitajain-kiwi b032300ab7 Merge pull request #92 from KiwiTechLLC/sprint3
admin login
2023-07-20 12:45:39 +05:30
jain 4b09ff41cb admin login 2023-07-20 12:44:48 +05:30
dilipshrivastwa-kiwi 8762c00dba Merge pull request #90 from KiwiTechLLC/ZDBBCK-001
sign up issue resolved
2023-07-20 12:31:36 +05:30
abutalib-kiwi 4410712b11 sign up issue resolved 2023-07-20 12:29:41 +05:30
Ankitajain-kiwi e2f737c5b4 Merge pull request #91 from KiwiTechLLC/sprint3
Sprint3
2023-07-20 12:29:02 +05:30
jain 0f5dfc2e9a google login chnages 2023-07-20 12:27:22 +05:30
jain b488b08f3f google login chnages 2023-07-20 12:25:41 +05:30
dilipshrivastwa-kiwi 7102c44055 Merge pull request #89 from KiwiTechLLC/sprint3
Sprint3
2023-07-19 18:05:07 +05:30
dilipshrivastwa-kiwi 8e2d9c44b9 Merge pull request #88 from KiwiTechLLC/ZDBBCK-001
celery settings
2023-07-19 17:59:15 +05:30
Ankitajain-kiwi fa96364901 Merge branch 'dev' into sprint3 2023-07-19 17:51:58 +05:30
jain 49abf12ce8 jira-34 referral code validation API 2023-07-19 17:50:10 +05:30