mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-11-10 01:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into profile-boosts

Browse source
This commit is contained in:
Victor Dyotte 2024-09-24 15:51:41 -04:00 • committed by GitHub
commit 90b773ae2a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
82 changed files with 2313 additions and 954 deletions
Download patch file Download diff file Expand all files Collapse all files

4
web/source/settings/views/admin/instance/settings.tsx
View file

@ -143,7 +143,7 @@ function InstanceSettingsForm({ data: instance }: InstanceSettingsFormProps) {
<TextArea
field={form.shortDesc}
label={`Short description (markdown accepted, max ${shortDescLimit} characters)`}
placeholder="A small testing instance for the GoToSocial alpha software."
placeholder="A small testing instance for GoToSocial."
autoCapitalize="sentences"
rows={6}
/>
@ -151,7 +151,7 @@ function InstanceSettingsForm({ data: instance }: InstanceSettingsFormProps) {
<TextArea
field={form.description}
label={`Full description (markdown accepted, max ${descLimit} characters)`}
placeholder="A small testing instance for the GoToSocial alpha software. Just trying it out, my main instance is https://example.com"
placeholder="A small testing instance for GoToSocial. Just trying it out, my main instance is https://example.com"
autoCapitalize="sentences"
rows={6}
/>

14
web/source/settings/views/user/router.tsx
View file

@ -52,10 +52,10 @@ export default function UserRouter() {
<Route path="/emailpassword" component={EmailPassword} />
<Route path="/migration" component={UserMigration} />
<Route path="/export-import" component={ExportImport} />
<InteractionRequestsRouter />
<Route><Redirect to="/profile" /></Route>
</Switch>
</ErrorBoundary>
<InteractionRequestsRouter />
</Router>
</BaseUrlContext.Provider>
);
@ -73,13 +73,11 @@ function InteractionRequestsRouter() {
return (
<BaseUrlContext.Provider value={absBase}>
<Router base={thisBase}>
<ErrorBoundary>
<Switch>
<Route path="/search" component={InteractionRequests} />
<Route path="/:reqId" component={InteractionRequestDetail} />
<Route><Redirect to="/search"/></Route>
</Switch>
</ErrorBoundary>
<Switch>
<Route path="/search" component={InteractionRequests} />
<Route path="/:reqId" component={InteractionRequestDetail} />
<Route><Redirect to="/search"/></Route>
</Switch>
</Router>
</BaseUrlContext.Provider>
);