mirror/pixelfed
1
0
Fork 1
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-03-10 06:03:17 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1817 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2019-11-12 20:47:28 -07:00 • committed by GitHub
commit 8ee61ea3ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -43,6 +43,7 @@
- Updated Laravel framework from v5.8 to v6.x ([3aff6de33](https://github.com/pixelfed/pixelfed/commit/3aff6de33)) - Updated Laravel framework from v5.8 to v6.x ([3aff6de33](https://github.com/pixelfed/pixelfed/commit/3aff6de33))
- Updated FollowerController to fix bug affecting private profiles ([a429d961](https://github.com/pixelfed/pixelfed/commit/a429d961)) - Updated FollowerController to fix bug affecting private profiles ([a429d961](https://github.com/pixelfed/pixelfed/commit/a429d961))
- Updated StatusTransformer, added ```local``` attribute ([484bb509](https://github.com/pixelfed/pixelfed/commit/484bb509)) - Updated StatusTransformer, added ```local``` attribute ([484bb509](https://github.com/pixelfed/pixelfed/commit/484bb509))
- Updated PostComponent, fix bug affecting MomentUI and non authenticated users ([7b3fe215](https://github.com/pixelfed/pixelfed/commit/7b3fe215))
## Deprecated ## Deprecated

2
public/js/status.js vendored
View file

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View file

@ -21,7 +21,7 @@
"/js/profile.js": "/js/profile.js?id=97bec372a25ffd2e909e", "/js/profile.js": "/js/profile.js?id=97bec372a25ffd2e909e",
"/js/quill.js": "/js/quill.js?id=37962cd45a252d2f13c9", "/js/quill.js": "/js/quill.js?id=37962cd45a252d2f13c9",
"/js/search.js": "/js/search.js?id=f312959df65e86a307a3", "/js/search.js": "/js/search.js?id=f312959df65e86a307a3",
"/js/status.js": "/js/status.js?id=dd20c64c2a1d7f3c6bce", "/js/status.js": "/js/status.js?id=6fe82a7ab606a7b8740d",
"/js/theme-monokai.js": "/js/theme-monokai.js?id=700e5dc735365e184e41", "/js/theme-monokai.js": "/js/theme-monokai.js?id=700e5dc735365e184e41",
"/js/timeline.js": "/js/timeline.js?id=e45ea0de04ac33768c74" "/js/timeline.js": "/js/timeline.js?id=e45ea0de04ac33768c74"
} }

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

@ -342,7 +342,7 @@
</div> </div>
<div class="col-12 col-md-4 pt-4 pl-md-3"> <div class="col-12 col-md-4 pt-4 pl-md-3">
<p class="lead font-weight-bold">Comments</p> <p class="lead font-weight-bold">Comments</p>
<div v-if="user" class="moment-comments"> <div v-if="user && user.length" class="moment-comments">
<div class="form-group"> <div class="form-group">
<textarea class="form-control" rows="3" placeholder="Add a comment ..." v-model="replyText"></textarea> <textarea class="form-control" rows="3" placeholder="Add a comment ..." v-model="replyText"></textarea>
<p style="padding-top:4px;"> <p style="padding-top:4px;">

4
resources/views/site/help/sharing-media.blade.php
View file

@ -30,10 +30,6 @@
<li>Click on the <span class="font-weight-bold">Create Post</span> button.</li> <li>Click on the <span class="font-weight-bold">Create Post</span> button.</li>
</ol> </ol>
</div> </div>
<div class="py-3">
To create a post using a mobile app:
<p class="mb-0 pl-4 font-weight-bold text-muted">We do not support any mobile apps yet.</p>
</div>
</div> </div>
</p> </p>
<p> <p>