Shubhamshirva
|
59a5ca924b
|
conflicts fixed at business edit page for bussines
|
2024-07-26 20:00:21 +05:30 |
|
Shubham Shetty
|
67df2a802d
|
Merge pull request #68 from WDI-Ideas/confi26july
conflicts resolved in profile page
|
2024-07-26 19:24:59 +05:30 |
|
Shubhamshirva
|
640be1823e
|
conflicts resolved in profile page
|
2024-07-26 19:24:23 +05:30 |
|
Shubham Shetty
|
5271dfe1cb
|
Merge pull request #67 from WDI-Ideas/profilecon
conflicts solved for guest user business for follow and following and…
|
2024-07-26 16:44:41 +05:30 |
|
Shubhamshirva
|
9e86590e72
|
conflicts resolved
|
2024-07-26 16:43:59 +05:30 |
|
Shubhamshirva
|
3f0514801e
|
conflicts solved for guest user business for follow and following and some conflicts resolved
|
2024-07-26 16:38:37 +05:30 |
|
Kishan Bhuta
|
8365ca11bc
|
Merge pull request #66 from WDI-Ideas/k25july
K25july
|
2024-07-26 15:36:42 +05:30 |
|
kishan06
|
4abc8103a2
|
pulled changes 2
|
2024-07-26 15:35:44 +05:30 |
|
kishan06
|
089af9df2c
|
pulled channges
|
2024-07-26 15:29:22 +05:30 |
|
priyankahadpad
|
8d99c7ea2b
|
Merge pull request #65 from WDI-Ideas/Development
some ui changes
|
2024-07-26 15:28:54 +05:30 |
|
cj201199
|
634b1a3bc4
|
some ui changes
|
2024-07-26 15:27:50 +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 |
|