UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-09 16:24:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5257 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2024-08-08 00:08:40 -06:00 committed by GitHub
commit 38d7b04d41
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -13,6 +13,7 @@
- Update AdminUser, fix entity casting ([cb5620d4](https://github.com/pixelfed/pixelfed/commit/cb5620d4)) - Update AdminUser, fix entity casting ([cb5620d4](https://github.com/pixelfed/pixelfed/commit/cb5620d4))
- Update instance config, update network cache feed max_hours_old falloff to 90 days instead of 6 hours to allow for less active instances to have more results ([c042d135](https://github.com/pixelfed/pixelfed/commit/c042d135)) - Update instance config, update network cache feed max_hours_old falloff to 90 days instead of 6 hours to allow for less active instances to have more results ([c042d135](https://github.com/pixelfed/pixelfed/commit/c042d135))
- Update ApiV1Dot1Controller, add new single media status create endpoint ([b03f5cec](https://github.com/pixelfed/pixelfed/commit/b03f5cec)) - Update ApiV1Dot1Controller, add new single media status create endpoint ([b03f5cec](https://github.com/pixelfed/pixelfed/commit/b03f5cec))
- Update AdminSettings component, add link to Custom CSS settings ([958daac4](https://github.com/pixelfed/pixelfed/commit/958daac4))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))

BIN
public/css/spa.css vendored
View file

Binary file not shown.

BIN
public/js/admin.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

7
resources/assets/components/admin/AdminSettings.vue
View file

@ -168,9 +168,7 @@
The instance name used in titles, metadata and apis. The instance name used in titles, metadata and apis.
</p> </p>
</div> </div>
</div>
<div class="col-12 col-md-8">
<div class="card shadow-none border card-body"> <div class="card shadow-none border card-body">
<div class="form-group mb-1"> <div class="form-group mb-1">
<label for="form-summary" class="font-weight-bold">Short Description</label> <label for="form-summary" class="font-weight-bold">Short Description</label>
@ -199,6 +197,11 @@
</p> </p>
</div> </div>
</div> </div>
<div class="col-12 col-md-4">
<p>
<a class="btn btn-dark btn-block" href="/i/admin/settings/custom-css">Edit Custom CSS</a>
</p>
</div>
</div> </div>
</div> </div>