Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Feat/fragments user card users grid #21

Merged
merged 143 commits into from
Jun 10, 2024

Conversation

ssagg
Copy link
Contributor

@ssagg ssagg commented May 30, 2024

Added User Card and User Grid

ssagg added 20 commits June 7, 2024 07:26
# Conflicts:
#	.pnp.cjs
#	app/entrypoints/renderer/locales/ru.json
#	ui/button/src/button.component.tsx
#	ui/checkbox/src/checkbox.component.tsx
#	ui/checkbox/src/container/container.component.tsx
#	ui/dropdown/src/dropdown.component.tsx
#	ui/icons/src/DashboardSquareIcon.tsx
#	ui/icons/src/index.ts
#	ui/input/package.json
#	ui/input/src/input.component.tsx
#	ui/input/src/input.interfaces.ts
#	ui/layout/src/index.ts
#	ui/logo/src/logo.component.tsx
#	ui/scroll/src/scroll.component.tsx
#	ui/sidebar/src/expander/expander.element.tsx
#	ui/sidebar/src/pinner/pinner.element.tsx
#	ui/sidebar/src/sidebar.component.tsx
#	ui/sidebar/src/switch/switch.component.tsx
#	ui/tag/src/tag.component.tsx
#	ui/theme/src/theme.provider.tsx
#	ui/theme/src/theme/colors.ts
#	ui/theme/src/theme/spaces.ts
#	yarn.lock
@ssagg ssagg requested a review from Nelfimov June 7, 2024 18:53
@ssagg
Copy link
Contributor Author

ssagg commented Jun 7, 2024

@Nelfimov что-то закопался. но вроде пофиксил

Nelfimov
Nelfimov previously approved these changes Jun 10, 2024
@ssagg ssagg dismissed Nelfimov’s stale review June 10, 2024 07:43

The merge-base changed after approval.

@Nelfimov Nelfimov self-requested a review June 10, 2024 07:47
Nelfimov
Nelfimov previously approved these changes Jun 10, 2024
@ssagg ssagg dismissed Nelfimov’s stale review June 10, 2024 07:49

The merge-base changed after approval.

@Nelfimov Nelfimov merged commit fcb94f8 into master Jun 10, 2024
3 checks passed
@Nelfimov Nelfimov deleted the feat/fragments-user_card-users_grid branch February 17, 2025 07:48
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants