Commit Graph

167 Commits

Author SHA1 Message Date
kishan06
089af9df2c pulled channges 2024-07-26 15:29:22 +05:30
kishan06
725d2cb01d app icon updated 2024-07-26 13:44:09 +05:30
priyankahadpad
79105e3813 Merge pull request #64 from WDI-Ideas/Development
some changes in profile tab
2024-07-25 15:43:41 +05:30
cj201199
eeafd92625 conflict resolved 2024-07-25 15:43:28 +05:30
cj201199
435cdf0909 some changes in profile tab 2024-07-25 15:41:58 +05:30
Shubham Shetty
dcabb4966e Merge pull request #63 from WDI-Ideas/sprint2profile
some bugs resolved in guest view and profile view
2024-07-25 15:41:30 +05:30
Shubhamshirva
c5b6a2e536 some bugs resolved in guest view and profile view 2024-07-25 15:40:33 +05:30
Shubham Shetty
a67bcf9100 Merge pull request #62 from WDI-Ideas/sprint2profile
conlficts resolvesd for guest user
2024-07-23 20:26:10 +05:30
Shubhamshirva
fc0a71d3c1 conlficts resolvesd for guest user 2024-07-23 20:25:32 +05:30
Shubham Shetty
40ac2bef76 Merge pull request #61 from WDI-Ideas/sprint2profile
sprint 2 tasks completed
2024-07-23 19:45:09 +05:30
Shubhamshirva
e9521c9315 conflicts resolved 2024-07-23 19:44:27 +05:30
Shubhamshirva
417d3e6a63 sprint 2 tasks completed 2024-07-23 19:19:39 +05:30
priyankahadpad
562eec187e Merge pull request #60 from WDI-Ideas/Development
some changes in guestprofile
2024-07-23 19:08:12 +05:30
cj201199
78c6999f94 some changes in guestprofile 2024-07-23 19:07:41 +05:30
priyankahadpad
b9d038b167 Merge pull request #59 from WDI-Ideas/Development
Guest View api integration done.
2024-07-22 20:33:31 +05:30
cj201199
f46732290b Conflict resolved 2024-07-22 20:32:39 +05:30
cj201199
abf668e14c Guest View api integration done. 2024-07-22 20:29:15 +05:30
Shubham Shetty
43f4e2ddfc Merge pull request #58 from WDI-Ideas/profileapi
conflicts resolved
2024-07-22 11:33:58 +05:30
Shubhamshirva
157ce0b4a9 conflicts resolved 2024-07-22 11:33:10 +05:30
Shubham Shetty
4cebac15f6 Merge pull request #57 from WDI-Ideas/profileapi
api integratrd for block,timeline,delete ,logout delete timeline ,sun…
2024-07-22 11:21:02 +05:30
Shubham Shetty
03e2d5c817 Merge branch 'main' into profileapi 2024-07-22 11:20:52 +05:30
Shubhamshirva
d3618b1535 api integratrd for block,timeline,delete ,logout delete timeline ,sungroups,edit timeline half done 2024-07-22 11:14:34 +05:30
priyankahadpad
07f9168053 Merge pull request #56 from WDI-Ideas/Development
guest user individual api intrgration done.
2024-07-19 20:33:28 +05:30
cj201199
4a72a9c718 guest user individual api intrgration done. 2024-07-19 20:32:48 +05:30
priyankahadpad
1bc84a0a98 Merge pull request #55 from WDI-Ideas/Development
Ui of guest user done
2024-07-18 20:16:15 +05:30
cj201199
d40658c6d3 Ui of guest user done 2024-07-18 20:15:38 +05:30
Shubham Shetty
459021c40f Merge pull request #54 from WDI-Ideas/changepassprofile
change password done and some changes in timeline page
2024-07-18 12:19:37 +05:30
Shubhamshirva
c2ba93738d change password done and some changes in timeline page 2024-07-18 12:18:15 +05:30
priyankahadpad
2a2c0586f4 Merge pull request #53 from WDI-Ideas/Development
profile block and profile individual and business get post api done
2024-07-17 20:08:27 +05:30
priyankahadpad
4d9ae79067 Merge branch 'main' into Development 2024-07-17 20:08:20 +05:30
cj201199
985b00b1c7 profile block and profile individual and business get post api done 2024-07-17 20:06:40 +05:30
Shubham Shetty
e969cbc458 Merge pull request #52 from WDI-Ideas/Sprint2
api integration for faq,privacy,terms,contact,bug report,followers,fo…
2024-07-17 17:21:09 +05:30
Shubham Shetty
b11e16340c Merge branch 'main' into Sprint2 2024-07-17 17:21:01 +05:30
Shubhamshirva
2fa64b61ca api integration for faq,privacy,terms,contact,bug report,followers,following,block,follower,remove integrated 2024-07-17 17:20:01 +05:30
priyankahadpad
04544aa0eb Merge pull request #51 from WDI-Ideas/Development
bug fixing
2024-07-15 19:28:07 +05:30
cj201199
c45ee2e088 bug fixing 2024-07-15 19:27:16 +05:30
Kishan Bhuta
47c735da45 Merge pull request #50 from WDI-Ideas/hotfixes
Hotfixes
2024-07-15 12:04:39 +05:30
kishan06
1af9882526 sprint 1 complete 2024-07-13 23:28:27 +05:30
kishan06
9365b858f9 conflicts resolved 2024-07-13 11:30:18 +05:30
kishan06
dd878393c6 apple ad facebook integrated 2024-07-13 11:28:58 +05:30
priyankahadpad
a31e34e790 Merge pull request #49 from WDI-Ideas/Development
bug solving
2024-07-12 20:16:35 +05:30
cj201199
2bfe5c8ef8 conflict resolved 2024-07-12 20:16:18 +05:30
cj201199
7c9b97b41f bug solving 2024-07-12 20:13:56 +05:30
Shubham Shetty
fb304ca5d8 Merge pull request #48 from WDI-Ideas/getuserlogic
conflicts for tell us page resolved
2024-07-12 19:33:39 +05:30
Shubhamshirva
df11515d6b conflicts for tell us page resolved 2024-07-12 19:33:07 +05:30
kishan06
ccc2a73929 oauth in progress 2024-07-12 19:17:39 +05:30
kishan06
a9ae9ac028 oauth in progress 2024-07-12 19:16:47 +05:30
Shubham Shetty
54da408ce1 Merge pull request #47 from WDI-Ideas/getuserlogic
logic for user journey created and store user credentials
2024-07-12 19:15:35 +05:30
Shubhamshirva
3e8b1ee1de conflict fixed 2024-07-12 19:14:53 +05:30
Shubhamshirva
0fc8831d23 logic for user journey created and store user credentials 2024-07-12 19:12:43 +05:30