1
0
Fork 0
forked from mirror/pixelfed

Merge pull request #4515 from pixelfed/staging

Staging
This commit is contained in:
daniel 2023-07-01 22:39:29 -06:00 committed by GitHub
commit 1809cb217c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 20 additions and 6 deletions

View file

@ -23,6 +23,8 @@
- Update ImportService, filter deleted posts from getImportedPosts endpoint ([10dd348c](https://github.com/pixelfed/pixelfed/commit/10dd348c)) - Update ImportService, filter deleted posts from getImportedPosts endpoint ([10dd348c](https://github.com/pixelfed/pixelfed/commit/10dd348c))
- Update FixStatusCount, improve command and support remote count resync ([04f4f8ba](https://github.com/pixelfed/pixelfed/commit/04f4f8ba)) - Update FixStatusCount, improve command and support remote count resync ([04f4f8ba](https://github.com/pixelfed/pixelfed/commit/04f4f8ba))
- Update StatusRemoteUpdatePipeline, fix missing mime and size attributes that cause empty media previews on our mobile app ([ea54413e](https://github.com/pixelfed/pixelfed/commit/ea54413e)) - Update StatusRemoteUpdatePipeline, fix missing mime and size attributes that cause empty media previews on our mobile app ([ea54413e](https://github.com/pixelfed/pixelfed/commit/ea54413e))
- Update ComposeModal.vue, fix scroll issue and dont hide scrollbar ([2d959fb3](https://github.com/pixelfed/pixelfed/commit/2d959fb3))
- Update AccountImport, add select first 100 posts button ([625a76a5](https://github.com/pixelfed/pixelfed/commit/625a76a5))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.8 (2023-05-29)](https://github.com/pixelfed/pixelfed/compare/v0.11.7...v0.11.8) ## [v0.11.8 (2023-05-29)](https://github.com/pixelfed/pixelfed/compare/v0.11.7...v0.11.8)

Binary file not shown.

BIN
public/js/compose.js vendored

Binary file not shown.

BIN
public/js/manifest.js vendored

Binary file not shown.

Binary file not shown.

View file

@ -105,6 +105,9 @@
<p class="small text-muted mb-0">Tap on posts to include them in your import.</p> <p class="small text-muted mb-0">Tap on posts to include them in your import.</p>
</div> </div>
<p v-else class="lead mb-0"><span class="font-weight-bold">{{ selectedPostsCounter }}</span> posts selected for import</p> <p v-else class="lead mb-0"><span class="font-weight-bold">{{ selectedPostsCounter }}</span> posts selected for import</p>
<button v-if="selectedMedia.length" class="btn btn-outline-danger font-weight-bold rounded-pill btn-sm my-1" @click="handleClearAll()">Clear all selected</button>
<button v-else class="btn btn-outline-primary font-weight-bold rounded-pill" @click="handleSelectAll()">Select first 100 posts</button>
</div> </div>
</section> </section>
<section class="row mb-n5 media-selector" style="max-height: 600px;overflow-y: auto;"> <section class="row mb-n5 media-selector" style="max-height: 600px;overflow-y: auto;">
@ -590,6 +593,19 @@
window.location.href = '/site/contact' window.location.href = '/site/contact'
} }
}); });
},
handleSelectAll() {
let medias = this.postMeta.slice(0, 100);
for (var i = medias.length - 1; i >= 0; i--) {
let m = medias[i];
this.toggleSelectedPost(m);
}
},
handleClearAll() {
this.selectedMedia = []
this.selectedPostsCounter = 0;
} }
} }
} }

View file

@ -193,7 +193,7 @@
class="list-group-item cursor-pointer" class="list-group-item cursor-pointer"
:class="{ :class="{
'text-primary': licenseId === item.id, 'text-primary': licenseId === item.id,
'font-weight-bold': licenseId === item.id 'font-weight-bold': licenseId === item.id
}" }"
@click="toggleLicense(item)"> @click="toggleLicense(item)">
{{item.name}} {{item.name}}
@ -1884,13 +1884,9 @@ export default {
<style lang="scss"> <style lang="scss">
.compose-modal-component { .compose-modal-component {
.media-drawer-filters { .media-drawer-filters {
overflow-x: scroll; overflow-x: auto;
flex-wrap:unset; flex-wrap:unset;
} }
.media-drawer-filters::-webkit-scrollbar {
width: 0px;
background: transparent;
}
.media-drawer-filters .nav-link { .media-drawer-filters .nav-link {
min-width:100px; min-width:100px;
padding-top: 1rem; padding-top: 1rem;