Commit graph

8,604 commits

Author SHA1 Message Date
Henry Jameson
f946ac961d Merge remote-tracking branch 'origin/admin-emoji-settings' into shigusegubu-vue3 2024-01-18 15:32:25 +02:00
Ekaterina Vaartis
a2133f5283 Rearrange stuff in accordance with comments on the MR, mostly
Also, add support for a custom message to the modified indicator
2024-01-18 16:24:55 +03:00
Henry Jameson
c834a2ff3d Merge remote-tracking branch 'origin/admin-emoji-settings' into shigusegubu-vue3 2024-01-18 14:44:48 +02:00
Ekaterina Vaartis
46dab3bcb1 Rearrange stuff in accordance with comments on the MR, mostly
Also, add support for a custom message to the modified indicator
2024-01-17 22:41:39 +03:00
Henry Jameson
088f2de294 Merge remote-tracking branch 'origin/admin-emoji-settings' into shigusegubu-vue3 2024-01-08 17:48:58 +02:00
Henry Jameson
0dc170cfb8 Merge branch 'admin-emoji-settings' into shigusegubu-vue3 2024-01-08 17:48:42 +02:00
Ekaterina Vaartis
872dffe51b Implement pack pagination, more localization fixes 2024-01-07 16:41:17 +03:00
Ekaterina Vaartis
4eeb3e5f78 Update localization 2024-01-07 14:58:41 +03:00
Ekaterina Vaartis
c218f32f6b Add a changelog entry 2024-01-07 14:50:17 +03:00
Ekaterina Vaartis
f8e1d5e3e0 Remote pack download, localization 2024-01-07 14:28:34 +03:00
Ekaterina Vaartis
4451cccb3c Error handling, uploading/deleting new emojis, sorting 2024-01-07 12:26:40 +03:00
Ekaterina Vaartis
091532d577 Editing emojis in popover, pack creation/deletion
Also fixed some API calls since they weren't working apparently
2024-01-07 02:45:49 +03:00
Ekaterina Vaartis
bfdad56b0d Make the frontend config work somewhat even without DB config 2023-12-21 00:48:14 +03:00
Ekaterina Vaartis
f9c85c0c49 Initial incomplete admin emoji settings implementation 2023-12-21 00:18:02 +03:00
HJ
6391a6a4ea Merge branch 'video-poster' into 'develop'
Fix video posters for Safari

See merge request pleroma/pleroma-fe!1879
2023-12-17 15:09:08 +00:00
Mark Felder
5bd8a78a7a Fix video posters on Safari 2023-12-17 00:51:56 -05:00
HJ
2b41c1cfe8 Merge branch 'notifications-thru-sw' into 'develop'
Notifications improvements.

See merge request pleroma/pleroma-fe!1873
2023-12-13 22:20:59 +00:00
Henry Jameson
55ed65331f changelog 2023-12-14 00:16:25 +02:00
Henry Jameson
ff10834f1a cleanup stray console logs 2023-12-14 00:14:06 +02:00
Henry Jameson
e155609fa0 Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-12-13 23:55:41 +02:00
Henry Jameson
5ad8f2cd5c clarify some bit 2023-12-13 23:55:18 +02:00
Henry Jameson
5ee8fc0aea add setting to always show push notifications 2023-12-13 23:54:12 +02:00
Henry Jameson
b59b6c132d undo all that crap 2023-12-13 22:35:19 +02:00
Henry Jameson
a3733eae60 fuck youuuuuuuuuuuuuuuu 2023-12-13 22:23:56 +02:00
Henry Jameson
e0eaf961c4 test SHIT 2023-12-13 22:18:28 +02:00
Henry Jameson
a2daac6dd2 test shit 2023-12-13 22:14:00 +02:00
Henry Jameson
38daf98559 Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-12-13 22:04:53 +02:00
Henry Jameson
99d04bed2b attempt at fixing the extra notification again 2023-12-13 22:04:00 +02:00
Henry Jameson
d779da7f3e Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-12-13 21:22:43 +02:00
Henry Jameson
b394392d0d fix incorrect path for follow request notifications settings 2023-12-13 21:07:23 +02:00
Henry Jameson
febc2aa569 lint 2023-12-13 20:56:27 +02:00
Henry Jameson
0fd1b26fb6 don't include extra notifications 2023-12-13 20:38:39 +02:00
Henry Jameson
4e8bb80dbd fix incorrect title + add counter 2023-12-13 20:37:40 +02:00
Henry Jameson
bcdf336242 try to fix the "website updated in background" notification 2023-12-13 18:36:16 +02:00
HJ
a98e241a81 Merge branch 'allow-apng' into 'develop'
file_type.service: allow apng images to be rendered

See merge request pleroma/pleroma-fe!1877
2023-12-11 12:44:28 +00:00
Yonle
5eed197c3e changelog.d: add add-apng.add for commit fb4d43ce
Signed-off-by: Yonle <yonle@lecturify.net>
2023-12-11 19:08:49 +07:00
HJ
4a7b49181a Merge branch 'renovate/vuelidate-core-2.x' into 'develop'
Update dependency @vuelidate/core to v2.0.3

See merge request pleroma/pleroma-fe!1857
2023-12-11 11:50:40 +00:00
Yonle
fb4d43ced2 file_type.service: allow apng images to be rendered
Signed-off-by: Yonle <yonle@lecturify.net>
2023-12-04 21:52:28 +07:00
HJ
02fff5ddd5 Merge branch 'neetzsche/accommodate-scrobble-urls' into 'develop'
Accommodate scrobble URLs when present

See merge request pleroma/pleroma-fe!1872
2023-11-30 17:51:32 +00:00
HJ
ce46b97c59 Remove <img> for favicon 2023-11-30 17:47:32 +00:00
NEETzsche
730351dcd1 Accommodate scrobble URLs when present 2023-11-30 09:00:47 -07:00
HJ
358f92adff Merge branch 'weblate' into 'develop'
Translations update from Pleroma Weblate

See merge request pleroma/pleroma-fe!1870
2023-11-27 23:17:09 +00:00
Kian-ting Tan
846f9204f2 Translated using Weblate (Chinese (Min Nan) (nan_TW))
Currently translated at 100.0% (1072 of 1072 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nan_TW/
2023-11-27 14:23:45 +00:00
tusooa
7b9e3b5c24 Translated using Weblate (Chinese (Simplified))
Currently translated at 99.8% (1069 of 1071 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
2023-11-27 14:23:45 +00:00
HJ
e84e814c20 Merge branch 'post-mergeback-fixes' into 'develop'
remove duplicate changelog entries

See merge request pleroma/pleroma-fe!1876
2023-11-27 14:23:39 +00:00
Henry Jameson
d580433988 remove duplicate changelog entries 2023-11-27 16:22:45 +02:00
HJ
9cbcd5b5e3 Merge branch 'master' into 'develop'
mergeback master into develop

See merge request pleroma/pleroma-fe!1875
2023-11-27 14:20:48 +00:00
HJ
83acbf953a Merge branch 'release/2.6.x' into 'master'
merge 2.6.x to master since 2.6.1 release

See merge request pleroma/pleroma-fe!1874
2023-11-27 13:48:43 +00:00
Henry Jameson
6c78b59c99 version bunp 2023-11-27 15:38:16 +02:00
Henry Jameson
2cddc138e5 2.6.1 changelog 2023-11-27 15:37:48 +02:00