Skip to content

UI update merge #1534

New issue

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

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

Already on GitHub? Sign in to your account

Merged
merged 199 commits into from
Oct 18, 2024
Merged

UI update merge #1534

merged 199 commits into from
Oct 18, 2024

Conversation

KoalaSat
Copy link
Member

What does this PR do?

Merge from https://github.com/RoboSats/robosats/tree/ui-update

Checklist before merging

  • Install pre-commit and initialize it: pip install pre-commit, then pre-commit install. Pre-commit installs git hooks that automatically check the codebase. If pre-commit fails when you commit your changes, please fix the problems it points out.

Conflicts:
	frontend/src/basic/BookPage/index.tsx
	frontend/src/basic/Main.tsx
	frontend/src/basic/NavBar/NavBar.tsx
	frontend/src/basic/RobotPage/Onboarding.tsx
	frontend/src/basic/RobotPage/RobotProfile.tsx
	frontend/src/basic/RobotPage/Welcome.tsx
	frontend/src/basic/RobotPage/index.tsx
	frontend/src/basic/SettingsPage/index.tsx
	frontend/src/components/FederationTable/index.tsx
	frontend/src/components/SettingsForm/index.tsx
@KoalaSat KoalaSat changed the base branch from main to ui-update October 18, 2024 23:20
@KoalaSat KoalaSat marked this pull request as ready for review October 18, 2024 23:20
@KoalaSat KoalaSat merged commit adc34fd into ui-update Oct 18, 2024
@KoalaSat KoalaSat deleted the ui-update-merge branch October 18, 2024 23:20
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.

9 participants