136 Commits

Author SHA1 Message Date
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
priyankahadpad
43a58f0d20 Merge pull request #46 from WDI-Ideas/Development
some ui changes
2024-07-12 15:12:46 +05:30
cj201199
4d0e030cce some ui changes 2024-07-12 15:11:59 +05:30
Kishan Bhuta
6fbe45f2c0 Merge pull request #45 from WDI-Ideas/hotfixes
access-token change
2024-07-12 12:47:20 +05:30
kishan06
88441af32b access-token change 2024-07-12 12:46:49 +05:30
Kishan Bhuta
96b9ec224b Merge pull request #44 from WDI-Ideas/hotfixes
Hotfixes
2024-07-12 11:33:23 +05:30
kishan06
5708d1e6e7 conflicts fixed 2024-07-12 11:31:28 +05:30
kishan06
4d16f572cb connected firebase,added google sign in 2024-07-12 11:26:57 +05:30
priyankahadpad
7565b44143 Merge pull request #43 from WDI-Ideas/Development
Business User api , nointernet added to main
2024-07-11 20:04:45 +05:30
cj201199
aca96431b7 conflict resolved 2024-07-11 20:04:30 +05:30
cj201199
289c368a5a Business User api , nointernet added to main 2024-07-11 20:01:38 +05:30
Shubham Shetty
06f53f58e0 Merge pull request #42 from WDI-Ideas/verifygoogle
vreated scrren for verify googlr and verify apple page
2024-07-11 19:18:58 +05:30
Shubhamshirva
9ee76bca98 vreated scrren for verify googlr and verify apple page 2024-07-11 19:18:16 +05:30
Shubham Shetty
7ed2830e3b Merge pull request #41 from WDI-Ideas/conflicts11july
conflicts in verify user page resolved
2024-07-11 17:31:32 +05:30
Shubhamshirva
54283a2a4c conflicts in verify user page resolved 2024-07-11 17:30:50 +05:30
Shubham Shetty
d56f25864e Merge pull request #40 from WDI-Ideas/signuponboard
signup onboarding pages done including business and individual
2024-07-11 17:19:31 +05:30
Shubham Shetty
47641d5f7b Merge branch 'main' into signuponboard 2024-07-11 17:19:23 +05:30
Shubhamshirva
b0642c3ea5 signup onboarding pages done including business and individual 2024-07-11 17:15:41 +05:30
priyankahadpad
3614bbb43d Merge pull request #39 from WDI-Ideas/Development
login, forgot pass api integration
2024-07-10 15:03:16 +05:30
cj201199
f8246d33ed login, forgot pass api integration 2024-07-10 15:02:09 +05:30
priyankahadpad
f9fca85bf5 Merge pull request #38 from WDI-Ideas/Development
login api integration
2024-07-09 14:48:35 +05:30
cj201199
5cb32f1152 conflict resolved 2024-07-09 14:48:21 +05:30
cj201199
bb3eec2081 login api integration 2024-07-09 14:46:28 +05:30
Shubham Shetty
c108aa7ddd Merge pull request #37 from WDI-Ideas/postapimethod
Postapimethod
2024-07-09 14:44:55 +05:30
Shubhamshirva
b547f96ec6 post api method created 2024-07-09 14:41:15 +05:30
Shubhamshirva
636f79fb60 Merge branch 'main' of https://github.com/WDI-Ideas/Regroup_flutter 2024-07-09 13:25:23 +05:30
priyankahadpad
7a33e1f2c0 Merge pull request #36 from WDI-Ideas/Development
validation on login and signup
2024-07-09 13:11:14 +05:30
cj201199
7c47c2ce24 validation on login and signup 2024-07-09 13:10:40 +05:30
Shubhamshirva
e6e84a058c Merge branch 'main' of https://github.com/WDI-Ideas/Regroup_flutter 2024-07-09 13:00:46 +05:30
priyankahadpad
1198c9b694 Merge pull request #35 from WDI-Ideas/Development
changes in community tab
2024-07-08 13:49:12 +05:30
cj201199
86b93fef5f changes in community tab 2024-07-08 13:48:26 +05:30
Kishan Bhuta
6fbd5ece0d Merge pull request #34 from WDI-Ideas/hotfixes
minor change
2024-07-08 12:22:20 +05:30