Dakshesh42
|
26e997447c
|
conflict resolved
|
2024-08-01 13:45:01 +05:30 |
|
Dakshesh42
|
2dcae88e7e
|
changes all glassmorphism with glassUi
|
2024-08-01 13:35:58 +05:30 |
|
Kishan Bhuta
|
1f33ab55bc
|
Merge pull request #86 from WDI-Ideas/k25july
code cleaning
|
2024-07-31 16:08:52 +05:30 |
|
kishan06
|
9bd0f3affc
|
code cleaning
|
2024-07-31 16:08:23 +05:30 |
|
Kishan Bhuta
|
84239f52ba
|
Merge pull request #85 from WDI-Ideas/k25july
K25july
|
2024-07-30 18:01:35 +05:30 |
|
kishan06
|
d9d04996b5
|
conflic fixed
|
2024-07-30 18:00:54 +05:30 |
|
priyankahadpad
|
76c29fafcd
|
Merge pull request #84 from WDI-Ideas/Development
Development
|
2024-07-30 13:57:20 +05:30 |
|
kishan06
|
55f2b4673a
|
minor change
|
2024-07-30 13:57:12 +05:30 |
|
cj201199
|
e62c3dc8c1
|
null check bug fixed
|
2024-07-30 13:56:49 +05:30 |
|
cj201199
|
15a991687d
|
minor changes done
|
2024-07-29 20:32:34 +05:30 |
|
priyankahadpad
|
b470d63819
|
Merge pull request #83 from WDI-Ideas/Development
minor changes done
|
2024-07-29 20:16:47 +05:30 |
|
cj201199
|
5d16e5b8b8
|
minor changes done
|
2024-07-29 20:16:05 +05:30 |
|
Shubham Shetty
|
3c4c2fce6c
|
Merge pull request #82 from WDI-Ideas/pro29
bugs resolved
|
2024-07-29 20:12:07 +05:30 |
|
Shubhamshirva
|
a58f91ba99
|
bugs resolved
|
2024-07-29 20:11:26 +05:30 |
|
Shubham Shetty
|
e0759e5df7
|
Merge pull request #81 from WDI-Ideas/newchanges29
some fixes in edit page
|
2024-07-29 19:09:25 +05:30 |
|
Shubhamshirva
|
6ecc937d09
|
conflicts resolved
|
2024-07-29 19:08:34 +05:30 |
|
Shubhamshirva
|
728d8676f7
|
some fixes in edit page
|
2024-07-29 19:07:00 +05:30 |
|
Kishan Bhuta
|
8714ffeb6d
|
Merge pull request #80 from WDI-Ideas/k25july
login and minor bug fix
|
2024-07-29 19:05:07 +05:30 |
|
kishan06
|
5b92d23bcb
|
conflict fixes
|
2024-07-29 19:04:42 +05:30 |
|
kishan06
|
97e3928963
|
login and minor bug fix
|
2024-07-29 19:02:59 +05:30 |
|
priyankahadpad
|
f45aeebfd8
|
Merge pull request #79 from WDI-Ideas/Development
bug fixing done
|
2024-07-29 18:58:53 +05:30 |
|
cj201199
|
875fa240fb
|
bug fixing done
|
2024-07-29 18:58:17 +05:30 |
|
Kishan Bhuta
|
9eaf857dcf
|
Merge pull request #78 from WDI-Ideas/k25july
interest bug fix
|
2024-07-29 17:22:54 +05:30 |
|
kishan06
|
092e8b77ed
|
interest bug fix
|
2024-07-29 17:22:31 +05:30 |
|
priyankahadpad
|
0e21f2d37a
|
Merge pull request #77 from WDI-Ideas/Development
minor bug fix
|
2024-07-29 16:52:54 +05:30 |
|
cj201199
|
295b74b6e2
|
minor bug fix
|
2024-07-29 16:52:25 +05:30 |
|
Shubham Shetty
|
4ee967cfd6
|
Merge pull request #76 from WDI-Ideas/newchanges29
conflicts resolved in page routes
|
2024-07-29 15:49:21 +05:30 |
|
Shubhamshirva
|
0b7d366d60
|
conflicts resolved in page routes
|
2024-07-29 15:48:37 +05:30 |
|
Shubham Shetty
|
a93cb7214f
|
Merge pull request #75 from WDI-Ideas/confi29july
bugs reslved for tell us page and all user login
|
2024-07-29 15:28:06 +05:30 |
|
Shubhamshirva
|
143912fa1a
|
bugs reslved for tell us page and all user login
|
2024-07-29 15:27:28 +05:30 |
|
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 |
|