fediport/pixelfed
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2591 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2021-01-28 23:09:19 -07:00 committed by GitHub
commit 5d85a7977b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/js/timeline.js vendored
View file

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View file

@ -30,5 +30,5 @@
"/js/status.js": "/js/status.js?id=5fc1e46961585fd79519",
"/js/story-compose.js": "/js/story-compose.js?id=b31904f8fd5b397f8c54",
"/js/theme-monokai.js": "/js/theme-monokai.js?id=85f0af57479412548223",
"/js/timeline.js": "/js/timeline.js?id=9696ba2673a38b912fc3"
"/js/timeline.js": "/js/timeline.js?id=b2b0ceaa6d9408a33446"
}

2
resources/assets/js/components/Timeline.vue
View file

@ -171,7 +171,7 @@
</div>
<div v-if="config.features.label.covid.enabled && status.label && status.label.covid == true" class="card-body border-bottom py-2 cursor-pointer pr-2" @click="labelRedirect()">
<div v-if="config.features.label.covid.enabled && status.label && status.label.covid == true" class="card-body border-top border-bottom py-2 cursor-pointer pr-2" @click="labelRedirect()">
<p class="font-weight-bold d-flex justify-content-between align-items-center mb-0">
<span>
<i class="fas fa-info-circle mr-2"></i>

1
routes/web.php
View file

@ -101,6 +101,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
Route::group(['prefix' => 'api'], function () {
Route::get('search', 'SearchController@searchAPI');
Route::get('nodeinfo/2.0.json', 'FederationController@nodeinfo');
Route::post('status/view', 'StatusController@storeView');
Route::group(['prefix' => 'compose'], function() {
Route::group(['prefix' => 'v0'], function() {