Commit Graph

62 Commits

Author SHA1 Message Date
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
cj201199
78c6999f94 some changes in guestprofile 2024-07-23 19:07:41 +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
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
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
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
cj201199
c45ee2e088 bug fixing 2024-07-15 19:27:16 +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
cj201199
7c9b97b41f bug solving 2024-07-12 20:13:56 +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
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
kishan06
88441af32b access-token change 2024-07-12 12:46:49 +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
cj201199
289c368a5a Business User api , nointernet added to main 2024-07-11 20:01:38 +05:30
cj201199
f8246d33ed login, forgot pass api integration 2024-07-10 15:02:09 +05:30
cj201199
7c47c2ce24 validation on login and signup 2024-07-09 13:10:40 +05:30
Kishan Bhuta
9a1178fde0 Merge branch 'main' into hotfixes 2024-07-05 15:25:43 +05:30
kishan06
0933f2a8b5 signup button dropdown fixes 2024-07-05 15:20:18 +05:30
cj201199
babc4418fc new glassUi package added 2024-07-05 14:49:57 +05:30
cj201199
438ab33cea added new glass package 2024-07-04 16:26:06 +05:30
cj201199
8a5ab90f26 Calendar changes done 2024-07-03 20:15:25 +05:30
cj201199
25f3fb0611 changed background with image. 2024-07-01 19:58:39 +05:30
kishan06
6abe30934a removed backdropfilter 2024-07-01 12:14:30 +05:30
cj201199
2c8f8ee901 calender changes done. 2024-06-28 19:11:00 +05:30
cj201199
fbb3f2ee23 group tab and explore design done 2024-06-25 20:14:03 +05:30
cj201199
0b4479c3f5 done with profile tab. added group tab 2024-06-19 19:53:48 +05:30
cj201199
55ab81365a Profile tab almost done. 2024-06-14 20:18:57 +05:30
cj201199
cef965ca8c Calender tab completed added profile tab 2024-06-10 15:51:44 +05:30
priyankahadpad
2327b9a100 Merge branch 'main' into priyanka 2024-06-10 12:48:11 +05:30
cj201199
ee6b305a04 Calender tab added. 2024-06-10 12:43:54 +05:30
Shubham Shetty
3930e48e50 Merge branch 'main' into chatpage 2024-06-07 15:34:21 +05:30
Shubhamshirva
a377c01f85 chat pages completed and also resolved some issues 2024-06-07 15:33:21 +05:30
cj201199
2a492595fe community tab done. 2024-06-05 11:52:59 +05:30
cj201199
4a9a7f5ccd Conflict resolved 2024-06-04 13:04:54 +05:30
cj201199
2de41454e3 Community Setting pages edit community, manage members and tags done 2024-06-04 13:02:13 +05:30
Shubham Shetty
45e49bc17c Merge branch 'main' into onboardingpages 2024-06-03 16:08:48 +05:30
Shubhamshirva
e94b499a6a completed screens for onboarding,login and signup page onboarding flow completed 2024-06-03 16:07:19 +05:30
cj201199
ba46a7bafe conflict resolved 2024-05-31 17:28:56 +05:30