Skip to content

Dev#1

Merged
LINESKL merged 31 commits into
mainfrom
dev
May 29, 2026
Merged

Dev#1
LINESKL merged 31 commits into
mainfrom
dev

Conversation

@LINESKL

@LINESKL LINESKL commented May 29, 2026

Copy link
Copy Markdown
Contributor

No description provided.

rxritet and others added 30 commits May 26, 2026 18:11
# Conflicts:
#	apps/backend/src/modules/checkins/checkins.service.ts
#	apps/backend/src/modules/communities/communities.service.ts
#	apps/backend/src/modules/events/events.service.ts
#	apps/backend/test/app.e2e-spec.ts
#	apps/frontend/src/app/(public)/privacy/page.tsx
#	apps/frontend/src/app/(public)/terms/page.tsx
#	apps/frontend/src/app/layout.tsx
#	apps/frontend/src/features/auth/ui/auth-screens.tsx
#	apps/frontend/src/features/check-in/ui/check-in-screen.tsx
#	apps/frontend/src/features/communities/api/communities.api.ts
#	apps/frontend/src/features/communities/ui/communities-screen.tsx
#	apps/frontend/src/features/communities/ui/community-detail-screen.tsx
#	apps/frontend/src/features/create-event/ui/create-event-screen.tsx
#	apps/frontend/src/features/event-chat/ui/event-chat-screen.tsx
#	apps/frontend/src/features/event-detail/ui/event-detail-screen.tsx
#	apps/frontend/src/features/events/api/events.api.ts
#	apps/frontend/src/features/events/model/mappers.ts
#	apps/frontend/src/features/feed/ui/home-feed-screen.tsx
#	apps/frontend/src/features/join-requests/ui/join-requests-screen.tsx
#	apps/frontend/src/features/map/ui/map-screen.tsx
#	apps/frontend/src/features/notifications/ui/notifications-screen.tsx
#	apps/frontend/src/features/onboarding/ui/onboarding-screen.tsx
#	apps/frontend/src/features/organizer/ui/organizer-screen.tsx
#	apps/frontend/src/features/profile/ui/profile-screen.tsx
#	apps/frontend/src/features/quick-match/ui/quick-match-screen.tsx
#	apps/frontend/src/features/reviews/ui/reviews-screen.tsx
#	apps/frontend/src/features/settings/ui/settings-screen.tsx
#	apps/frontend/src/features/verification/ui/verification-screen.tsx
#	apps/frontend/src/shared/lib/query/keys.ts
#	apps/frontend/src/shared/mocks/spotwave.ts
#	apps/frontend/src/shared/types/domain.ts
#	apps/frontend/src/shared/ui/button/button.tsx
#	apps/frontend/src/shared/ui/states/states.tsx
#	apps/frontend/src/widgets/app-shell/index.tsx
#	apps/frontend/src/widgets/public-shell/index.tsx
#	packages/database/prisma/schema/community.prisma
#	packages/database/prisma/schema/event.prisma
#	packages/database/prisma/seed.ts
@LINESKL
LINESKL merged commit 263db61 into main May 29, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants