priyankahadpad
|
4b0f264d53
|
Merge pull request #74 from WDI-Ideas/Development
minor bug fix
|
2024-07-29 15:20:45 +05:30 |
|
cj201199
|
02405fc097
|
minor bug fix
|
2024-07-29 15:20:19 +05:30 |
|
Kishan Bhuta
|
b0040e84b8
|
Merge pull request #73 from WDI-Ideas/k25july
added always allow
|
2024-07-29 15:09:35 +05:30 |
|
kishan06
|
190c72de1c
|
added always allow
|
2024-07-29 15:09:11 +05:30 |
|
Kishan Bhuta
|
00b2e87126
|
Merge pull request #72 from WDI-Ideas/k25july
edit profile bug fix
|
2024-07-29 12:01:33 +05:30 |
|
kishan06
|
50102b9e7b
|
edit profile bug fix
|
2024-07-29 12:00:47 +05:30 |
|
Shubham Shetty
|
166cf2e257
|
Merge pull request #71 from WDI-Ideas/contollerprofile
profile controller issue resolved
|
2024-07-26 20:47:23 +05:30 |
|
Shubhamshirva
|
d5c4896fc4
|
profile controller issue resolved
|
2024-07-26 20:46:39 +05:30 |
|
priyankahadpad
|
39f4e6a6a3
|
Merge pull request #70 from WDI-Ideas/Development
changes done in getProfiledata for both account type.
|
2024-07-26 20:08:50 +05:30 |
|
cj201199
|
d05c4fe467
|
conflict resoved
|
2024-07-26 20:08:36 +05:30 |
|
Shubham Shetty
|
174455ced9
|
Merge pull request #69 from WDI-Ideas/businessconfi
conflicts fixed at business edit page for bussines
|
2024-07-26 20:00:52 +05:30 |
|
cj201199
|
57135da8ec
|
changes done in getProfiledata for both account type.
|
2024-07-26 20:00:52 +05:30 |
|
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 |
|
|
|
2af4cd04f2
|
Merge pull request 'Development' (#20) from Development into main
Reviewed-on: #20
|
2024-07-18 14:51:31 +00:00 |
|
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 |
|
|
|
b66101418b
|
Merge pull request 'change password done and some changes in timeline page' (#19) from changepassprofile into main
Reviewed-on: #19
|
2024-07-18 06:50:22 +00:00 |
|
