Commit Graph

149 Commits

Author SHA1 Message Date
priyankahadpad
c03cfe1dbc Merge pull request #98 from WDI-Ideas/Development
onboard flow api done.
2024-08-02 19:53:39 +05:30
Dakshesh42
2863f827a6 onboard flow api done. 2024-08-02 19:52:50 +05:30
jayesh
044f216900 conflict fixed 2024-08-02 18:48:58 +05:30
jayesh
1a03b61b6f feed and latest fixed 2024-08-02 18:43:12 +05:30
Shubhamshirva
2a7c866639 pin for sidebar and unpin done 2024-08-02 17:30:58 +05:30
kishan06
18886dc6c0 conflict fixed for comment tree 2024-08-01 18:50:04 +05:30
kishan06
0ce1719179 comment tree added 2024-08-01 17:57:15 +05:30
Shubhamshirva
857721abf9 conflicts resolved in post method for community 2024-08-01 17:55:42 +05:30
Shubhamshirva
a5e52eae4f Merge branch 'main' of https://github.com/WDI-Ideas/Regroup_flutter into Communitypost 2024-08-01 17:53:30 +05:30
Shubhamshirva
01cb284b43 community post completed for individual and business 2024-08-01 17:52:40 +05:30
priyankahadpad
dad5d8d9cf Merge pull request #93 from WDI-Ideas/Development
minor changes
2024-08-01 16:00:54 +05:30
Dakshesh42
93e07b3cc0 minor changes 2024-08-01 15:59:47 +05:30
jayesh
dd47ae3508 deleted duplicate community 2024-08-01 15:57:30 +05:30
priyankahadpad
2b9755c4b9 Merge branch 'main' into Development 2024-08-01 15:22:43 +05:30
Dakshesh42
716c2c219b ui changes of onboard done 2024-08-01 15:21:47 +05:30
jayesh
e77c766fa0 revert changes of community latest post api 2024-08-01 15:19:34 +05:30
jayesh
1fd6475a9d merge this branch i have taken pull 2024-08-01 13:57:46 +05:30
diptimhabadi351
8f045d0d22 Merge pull request #88 from WDI-Ideas/dipti
changes
2024-08-01 13:49:18 +05:30
jayesh
5a08469415 Conflict resolve 2024-08-01 13:47:08 +05:30
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
jayesh
00c9683f10 changes 2024-08-01 13:33:57 +05:30
kishan06
9bd0f3affc code cleaning 2024-07-31 16:08:23 +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
Shubhamshirva
a58f91ba99 bugs resolved 2024-07-29 20:11:26 +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
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
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
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
cj201199
02405fc097 minor bug fix 2024-07-29 15:20:19 +05:30
kishan06
50102b9e7b edit profile bug fix 2024-07-29 12:00:47 +05:30
Shubhamshirva
d5c4896fc4 profile controller issue resolved 2024-07-26 20:46:39 +05:30
cj201199
d05c4fe467 conflict resoved 2024-07-26 20:08:36 +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
Shubhamshirva
640be1823e conflicts resolved in profile page 2024-07-26 19:24:23 +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
cj201199
634b1a3bc4 some ui changes 2024-07-26 15:27:50 +05:30