koalasat 575709b7a3 Merge branch 'ui-update' ...

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

2024-10-19 00:06:54 +02:00

..

src

Merge branch 'ui-update'

2024-10-19 00:06:54 +02:00

static

Merge branch 'ui-update'

2024-10-19 00:06:54 +02:00

templates/frontend

fix paths

2024-09-18 12:51:21 +02:00

__init__.py

…

.eslintrc.json

…

.prettierignore

…

.prettierrc

…

admin.py

…

apps.py

…

babel.config.json

…

Dockerfile

…

entrypoint.sh

…

package-lock.json

Merge pull request #1495 from RoboSats/use-nostr-in-book-page

2024-10-18 20:31:40 +00:00

package.json

Merge pull request #1495 from RoboSats/use-nostr-in-book-page

2024-10-18 20:31:40 +00:00

tests.py

…

tsconfig.json

…

urls.py

…

views.py

…

webpack.config.ts

fix paths

2024-09-18 12:51:21 +02:00

yarn.lock

Nostr test

2024-10-18 12:40:01 +02:00