Compare commits
No commits in common. "main" and "v3.12.0-1" have entirely different histories.
4 changed files with 3 additions and 94 deletions
|
@ -1,74 +0,0 @@
|
||||||
diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
|
|
||||||
index b38876b8..f15eb849 100644
|
|
||||||
--- a/src/components/extra_buttons/extra_buttons.js
|
|
||||||
+++ b/src/components/extra_buttons/extra_buttons.js
|
|
||||||
@@ -95,6 +95,11 @@ const ExtraButtons = {
|
|
||||||
.then(() => this.$emit('onSuccess'))
|
|
||||||
.catch(err => this.$emit('onError', err.error.error))
|
|
||||||
},
|
|
||||||
+ copyLinkRemote () {
|
|
||||||
+ navigator.clipboard.writeText(this.status.external_url)
|
|
||||||
+ .then(() => this.$emit('onSuccess'))
|
|
||||||
+ .catch(err => this.$emit('onError', err.error.error))
|
|
||||||
+ },
|
|
||||||
bookmarkStatus () {
|
|
||||||
this.$store.dispatch('bookmark', { id: this.status.id })
|
|
||||||
.then(() => this.$emit('onSuccess'))
|
|
||||||
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
|
|
||||||
index 9da2ad8c..d7925830 100644
|
|
||||||
--- a/src/components/extra_buttons/extra_buttons.vue
|
|
||||||
+++ b/src/components/extra_buttons/extra_buttons.vue
|
|
||||||
@@ -139,6 +139,17 @@
|
|
||||||
icon="external-link-alt"
|
|
||||||
/><span>{{ $t("status.external_source") }}</span>
|
|
||||||
</a>
|
|
||||||
+ <button
|
|
||||||
+ v-if="!status.is_local"
|
|
||||||
+ class="button-default dropdown-item dropdown-item-icon"
|
|
||||||
+ @click.prevent="copyLinkRemote"
|
|
||||||
+ @click="close"
|
|
||||||
+ >
|
|
||||||
+ <FAIcon
|
|
||||||
+ fixed-width
|
|
||||||
+ icon="share-alt"
|
|
||||||
+ /><span>{{ $t("status.copy_remote_url") }}</span>
|
|
||||||
+ </button>
|
|
||||||
<button
|
|
||||||
class="button-default dropdown-item dropdown-item-icon"
|
|
||||||
@click.prevent="reportStatus"
|
|
||||||
diff --git a/src/components/media_modal/media_modal.vue b/src/components/media_modal/media_modal.vue
|
|
||||||
index 802a60b3..e88ffad9 100644
|
|
||||||
--- a/src/components/media_modal/media_modal.vue
|
|
||||||
+++ b/src/components/media_modal/media_modal.vue
|
|
||||||
@@ -94,6 +94,11 @@
|
|
||||||
>
|
|
||||||
{{ description }}
|
|
||||||
</span>
|
|
||||||
+ <span
|
|
||||||
+ class="link-to-media"
|
|
||||||
+ >
|
|
||||||
+ <a :href="currentMedia.url">{{ $t('media_modal.link_to_media') }}</a>
|
|
||||||
+ </span>
|
|
||||||
<span
|
|
||||||
class="counter"
|
|
||||||
>
|
|
||||||
diff --git a/src/i18n/en.json b/src/i18n/en.json
|
|
||||||
index 53c2ad43..91887d5e 100644
|
|
||||||
--- a/src/i18n/en.json
|
|
||||||
+++ b/src/i18n/en.json
|
|
||||||
@@ -268,6 +268,7 @@
|
|
||||||
"media_modal": {
|
|
||||||
"counter": "{current} / {total}",
|
|
||||||
"hide": "Close media viewer",
|
|
||||||
+ "link_to_media": "Link to Media",
|
|
||||||
"next": "Next",
|
|
||||||
"previous": "Previous"
|
|
||||||
},
|
|
||||||
@@ -962,6 +963,7 @@
|
|
||||||
"bookmark": "Bookmark",
|
|
||||||
"collapse_attachments": "Collapse attachments",
|
|
||||||
"copy_link": "Copy link to post",
|
|
||||||
+ "copy_remote_url": "Copy remote URL",
|
|
||||||
"delete": "Delete post",
|
|
||||||
"delete_confirm": "Do you really want to delete this post?",
|
|
||||||
"delete_confirm_accept_button": "Yes, delete it",
|
|
|
@ -1,15 +0,0 @@
|
||||||
diff --git a/src/components/still-image/still-image.vue b/src/components/still-image/still-image.vue
|
|
||||||
index 074a8eef..15a15633 100644
|
|
||||||
--- a/src/components/still-image/still-image.vue
|
|
||||||
+++ b/src/components/still-image/still-image.vue
|
|
||||||
@@ -63,6 +63,10 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+ &.emoji img, &.reaction-emoji img {
|
|
||||||
+ width: auto;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
.image-type-label {
|
|
||||||
position: absolute;
|
|
||||||
top: 0.25em;
|
|
6
flake.lock
generated
6
flake.lock
generated
|
@ -2,11 +2,11 @@
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1714314149,
|
"lastModified": 1712388808,
|
||||||
"narHash": "sha256-yNAevSKF4krRWacmLUsLK7D7PlfuY3zF0lYnGYNi9vQ=",
|
"narHash": "sha256-9ogU4c3vUmuMDoRlbQCeq3OKx0XJmgHcLZ4XywJNYWI=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "cf8cc1201be8bc71b7cbbbdaf349b22f4f99c7ae",
|
"rev": "fe4295b9ecd88764c1abf6179e03b1a828ca0e9a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -74,8 +74,6 @@
|
||||||
./akkoma-fe/0001-confirm-favorite.patch
|
./akkoma-fe/0001-confirm-favorite.patch
|
||||||
./akkoma-fe/0002-move-notifications.patch
|
./akkoma-fe/0002-move-notifications.patch
|
||||||
./akkoma-fe/0003-en_3pp.patch
|
./akkoma-fe/0003-en_3pp.patch
|
||||||
./akkoma-fe/0004-more-copy-buttons.patch
|
|
||||||
./akkoma-fe/0005-fix-emoji-widths.patch
|
|
||||||
];
|
];
|
||||||
patchFlags = "-p1 -F5";
|
patchFlags = "-p1 -F5";
|
||||||
});
|
});
|
||||||
|
|
Loading…
Add table
Reference in a new issue