Commit Graph
650 Commits
Author SHA1 Message Date
Ankitajain-kiwi 95b294f168 Merge pull request #294 from KiwiTechLLC/qa
Qa
2023-08-29 20:01:23 +05:30
Ankitajain-kiwi 674493e1ad Merge pull request #293 from KiwiTechLLC/dev
Dev
2023-08-29 20:00:01 +05:30
Ankitajain-kiwi f7624bc1e7 Merge pull request #292 from KiwiTechLLC/sprint6-bugs
answer api
2023-08-29 19:47:55 +05:30
jain dc12b35842 answer api 2023-08-29 19:38:14 +05:30
Abu Talib a80f9db557 Merge pull request #291 from KiwiTechLLC/sprint6-bugs
otp expiry
2023-08-29 19:05:18 +05:30
jain 3ad29e677d article page 2023-08-29 18:56:51 +05:30
jain 8b0a5d9a8e otp expiry 2023-08-29 18:33:47 +05:30
Ankitajain-kiwi 16d823f97d Merge pull request #290 from KiwiTechLLC/sprint6-bugs
elif for guardian code
2023-08-29 17:51:42 +05:30
jain d4008d6cc2 elif for guardian code 2023-08-29 17:50:58 +05:30
Ankitajain-kiwi 8ecb96829f Merge pull request #289 from KiwiTechLLC/qa
Qa
2023-08-29 12:44:12 +05:30
Ankitajain-kiwi 7cf3481ec6 Merge branch 'stage' into qa 2023-08-29 12:40:43 +05:30
Ankitajain-kiwi de4b230cd1 Merge pull request #288 from KiwiTechLLC/dev
Dev
2023-08-29 12:11:06 +05:30
dilipshrivastwa-kiwi 3dae22a870 Merge pull request #287 from KiwiTechLLC/sprint6-bugs
Sprint6 bugs
2023-08-29 11:56:58 +05:30
jain a8d291474a search junior task 2023-08-29 11:52:47 +05:30
jain e6482167ae Merge branch 'sprint6-bugs' of github.com:KiwiTechLLC/ZODBank-Backend into sprint6-bugs 2023-08-29 11:51:11 +05:30
jain 9a932d31b5 Merge branch 'dev' of github.com:KiwiTechLLC/ZODBank-Backend into sprint6-bugs 2023-08-29 11:50:44 +05:30
jain e2c84eb83d search junior task 2023-08-29 11:49:59 +05:30
Ankitajain-kiwi 5bfc3966b3 Merge branch 'dev' into sprint6-bugs 2023-08-29 10:43:34 +05:30
jain 37d191eef8 add message for blank search 2023-08-29 10:41:44 +05:30
Abu Talib ad53e0086c Merge pull request #286 from KiwiTechLLC/dev
Dev
2023-08-28 20:35:49 +05:30
Abu Talib e9ee8ec8b2 Merge pull request #285 from KiwiTechLLC/sprint6-bugs
condition in add junior
2023-08-28 20:14:43 +05:30
jain cc5ecc0647 Merge branch 'dev' of github.com:KiwiTechLLC/ZODBank-Backend into sprint6-bugs 2023-08-28 20:10:36 +05:30
jain 63dfd731fc condition in add junior 2023-08-28 20:09:39 +05:30
dilipshrivastwa-kiwi e9d4d7091e Merge pull request #284 from KiwiTechLLC/ZBKBCK-48
added notification for existing junior add, modified leaderboard meth…
2023-08-28 19:51:20 +05:30
abutalib-kiwi 219bae792e added notification for existing junior add, modified leaderboard method at every places 2023-08-28 19:39:39 +05:30
dilipshrivastwa-kiwi df3cab99a5 Merge pull request #283 from KiwiTechLLC/sprint6-bugs
remove guardian request and resend otp
2023-08-28 18:58:23 +05:30
jain d2242d4c64 remove guardian request and resend otp 2023-08-28 18:39:29 +05:30
dilipshrivastwa-kiwi b7d5916f8e Merge pull request #282 from KiwiTechLLC/ZBKBCK-48
fixed add junior multiple device notification issue, changed send mul…
2023-08-28 15:56:43 +05:30
abutalib-kiwi 5e17edcf3f fixed add junior multiple device notification issue, changed send multiple user notification method, modified add fcm token method 2023-08-28 15:42:30 +05:30
Ankitajain-kiwi b6fe943bfc Merge pull request #281 from KiwiTechLLC/sprint6-bugs
add non in delete API
2023-08-28 13:46:28 +05:30
jain 8e529b292d add non in delete API 2023-08-28 13:38:35 +05:30
Ankitajain-kiwi acd3592b2d Merge pull request #280 from KiwiTechLLC/dev
Dev
2023-08-28 12:55:32 +05:30
Ankitajain-kiwi 61ca2e7d2d Merge pull request #279 from KiwiTechLLC/sprint6-bugs
change message
2023-08-28 12:53:24 +05:30
jain 966f94eb1e change message 2023-08-28 12:41:29 +05:30
dilipshrivastwa-kiwi f424c99478 Merge pull request #278 from KiwiTechLLC/sprint6-bugs
guardian_status update
2023-08-28 12:13:10 +05:30
jain 34359360e0 guardian_status update 2023-08-28 12:10:13 +05:30
abutalib-kiwi c2c9210a9a some changes 2023-08-28 11:54:38 +05:30
abutalib-kiwi e3feab22a2 some changes 2023-08-28 11:51:12 +05:30
dilipshrivastwa-kiwi 685a822e52 Merge pull request #277 from KiwiTechLLC/sprint6-bugs
Sprint6 bugs
2023-08-28 10:48:48 +05:30
jain e57344e54f Merge branch 'dev' of github.com:KiwiTechLLC/ZODBank-Backend into sprint6-bugs 2023-08-28 10:38:14 +05:30
jain 235fc9baac guardian code status in junior list API 2023-08-28 10:37:52 +05:30
dilipshrivastwa-kiwi 3dc8268b07 Merge pull request #276 from KiwiTechLLC/ZBKBCK-48
fixed approve junior notification issue
2023-08-26 23:00:39 +05:30
abutalib-kiwi 8be8d56036 fixed approve junior notification issue 2023-08-26 21:36:01 +05:30
dilipshrivastwa-kiwi c79a891c89 Merge pull request #275 from KiwiTechLLC/sprint6-bugs
Sprint6 bugs
2023-08-26 18:24:09 +05:30
jain eb4e09964d changes of guardian code status in necessary API 2023-08-26 17:48:13 +05:30
jain cf9376663c list of guardian code status 2023-08-26 17:09:10 +05:30
Abu Talib 58b569225a Merge pull request #274 from KiwiTechLLC/dev
Dev
2023-08-25 21:00:25 +05:30
dilipshrivastwa-kiwi 9891060ee3 Merge pull request #273 from KiwiTechLLC/ZBKBCK-48
added notification for getting points after reading article
2023-08-25 20:10:46 +05:30
abutalib-kiwi 5b2ab2275e added notification for getting points after reading article 2023-08-25 19:45:24 +05:30
Ankitajain-kiwi 91471f69bd Merge pull request #272 from KiwiTechLLC/dev
Dev
2023-08-25 18:33:50 +05:30