Commit Graph

760 Commits

Author SHA1 Message Date
f04016fb45 Merge pull request #361 from KiwiTechLLC/dev
Dev into qa
2023-10-27 14:45:46 +05:30
057c58b709 Merge pull request #360 from KiwiTechLLC/ZBKBCK-55
added status for login and sign up from google and apple
2023-10-27 12:23:25 +05:30
b1d8949b08 added status for login and sign up from google and apple 2023-10-27 12:05:47 +05:30
ced3db76c1 Merge pull request #358 from KiwiTechLLC/dev
Dev
2023-10-06 18:19:55 +05:30
801bc45bc5 Merge pull request #357 from KiwiTechLLC/ZBKBCK-54
to user type added
2023-10-06 18:12:47 +05:30
d1927b24ee to user type added 2023-10-06 18:10:56 +05:30
62e5e4c062 Merge pull request #355 from KiwiTechLLC/dev
Dev into qa
2023-10-06 17:57:33 +05:30
012d93f70f Merge pull request #354 from KiwiTechLLC/ZBKBCK-54
added to user type as per required changes, handled apple signup for existing users
2023-10-06 17:55:01 +05:30
a1f9f93654 added to user type as per required changes, handled apple signup for existing users 2023-10-06 17:29:41 +05:30
ac372e62af Merge pull request #352 from KiwiTechLLC/dev
Dev into qa
2023-10-05 17:46:56 +05:30
652fe9e680 Merge pull request #351 from KiwiTechLLC/ZBKBCK-54
fixed user notificatio setting issue
2023-10-05 17:43:19 +05:30
13665f4c9a fixed user notificatio setting issue 2023-10-05 17:38:57 +05:30
810752793b Merge pull request #349 from KiwiTechLLC/dev
Dev into qa
2023-10-05 14:56:04 +05:30
bf5453c7b7 Merge pull request #348 from KiwiTechLLC/ZBKBCK-54
fixed login into another device issue
2023-10-05 13:24:56 +05:30
6e3166967e fixed login into another device issue 2023-10-05 13:07:42 +05:30
49b264e918 Merge pull request #346 from KiwiTechLLC/dev
Dev into qa
2023-10-03 19:12:52 +05:30
47a00f313a Merge pull request #345 from KiwiTechLLC/ZBKBCK-54
added mail for user activation, handled fcm token for deleted user
2023-10-03 18:57:55 +05:30
ad4d782e72 added mail for user activation, handled fcm token for deleted user 2023-10-03 18:54:47 +05:30
742ee0ee67 Merge pull request #343 from KiwiTechLLC/dev
Dev into qa
2023-09-29 18:27:22 +05:30
8050e70cf7 Merge pull request #342 from KiwiTechLLC/ZBKBCK-54
handled deactivated users for social login
2023-09-29 16:11:08 +05:30
18a53e1c48 handled deactivated users for social login 2023-09-29 16:09:22 +05:30
f1333491e0 Merge pull request #341 from KiwiTechLLC/ZBKBCK-54
notification mark as read api modified for clear all, list sorting set to updated at field, added same field
2023-09-29 15:09:47 +05:30
bd7eddb275 notification mark as read api modified for clear all, list sorting set to updated at field, added same field 2023-09-29 14:58:06 +05:30
4c34c2496b Merge pull request #340 from KiwiTechLLC/ZBKBCK-54
notification create modified to update or create
2023-09-28 19:35:16 +05:30
e121c92fb4 notification create modified to update or create 2023-09-28 19:09:57 +05:30
18143e0219 modified send push method 2023-09-27 19:31:09 +05:30
251a912948 revert access token time to 3 hrs 2023-09-27 12:36:28 +05:30
f7bb83cebb added notification type in serializer 2023-09-26 19:11:04 +05:30
994e9a270e Merge pull request #339 from KiwiTechLLC/ZBKBCK-54
added notification type in push data
2023-09-26 17:27:10 +05:30
32c35f8649 added notification type in push data 2023-09-26 17:24:40 +05:30
ea02d7f5bb token expire time 1 min for testing 2023-09-25 11:45:50 +05:30
648628d3ea Merge branch 'dev' of https://github.com/KiwiTechLLC/ZODBank-Backend into dev 2023-09-25 11:44:57 +05:30
6ba3d7d8db token expire time 1 min for testing 2023-09-25 11:44:04 +05:30
db119b2273 Merge pull request #337 from KiwiTechLLC/dev
Dev
2023-09-23 17:14:00 +05:30
651405ddef Merge pull request #336 from KiwiTechLLC/ZBKBCK-52
feedback changes and added mark all read
2023-09-22 23:29:38 +05:30
3afd7fecf3 feedback changes and added mark all read 2023-09-22 19:55:10 +05:30
c484669a2d Merge pull request #335 from KiwiTechLLC/ZBKBCK-52
fixed guardian reject issue, updated ids in notification method, remo…
2023-09-13 18:18:07 +05:30
d1a4b86b09 fixed guardian reject issue, updated ids in notification method, remove unnecessary condition from analytics and user management 2023-09-13 18:15:07 +05:30
53f522ae41 Merge pull request #333 from KiwiTechLLC/dev
Dev
2023-09-13 16:09:10 +05:30
a3c2b68a0d Merge pull request #332 from KiwiTechLLC/ZBKBCK-52
fixed article reward points notification for 0 points earned
2023-09-13 14:50:24 +05:30
e157e98a17 fixed article reward points notification for 0 points earned 2023-09-13 14:45:47 +05:30
a653518cfd fixed article reward points notification for 0 points earned 2023-09-13 14:38:18 +05:30
af25dc4e82 Merge pull request #331 from KiwiTechLLC/ZBKBCK-52
modified get article card current page method
2023-09-13 14:05:55 +05:30
eaf67b682f modified get article card current page method 2023-09-13 14:03:13 +05:30
71bbef84aa Merge pull request #330 from KiwiTechLLC/ZBKBCK-52
modified get article card current page method
2023-09-13 13:40:10 +05:30
085607128b modified get article card current page method 2023-09-13 13:36:25 +05:30
fbdef7c0c4 Merge branch 'dev' of https://github.com/KiwiTechLLC/ZODBank-Backend into dev 2023-09-13 13:34:14 +05:30
535e2e7f56 Merge pull request #329 from KiwiTechLLC/ZBKADM-73-test-cases
added a test case, updated coverage file
2023-09-13 12:15:37 +05:30
08f54f28a4 added a test case, updated coverage file 2023-09-12 23:08:17 +05:30
de710c8a7b Merge pull request #328 from KiwiTechLLC/ZBKADM-73-test-cases
updated coverage file
2023-09-12 15:18:55 +05:30