hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
8782 commits 4 branches 0 tags 44 MiB
Commit graph

8782 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
HJ
55ecb5239a Merge branch 'admin-dashboard-fixes' into 'develop' 
Fixes and minor improvements for admin dashboard

See merge request pleroma/pleroma-fe!1863

(cherry picked from commit d21e3d5de2)

f354cef0 fix no feedback and no dropdown close for actions in frontends tab,
c99390e8 make notices appear above admin dash modal
b6a4b620 add better indication that stuff is happening
ce109c38 add favicon setting and add compact layout for AttachmentSetting
bf49aeb7 changelog
d9ea160a account for if there's no primary frontend setup
75eea5f2 Merge remote-tracking branch 'origin/develop' into admin-dashboard-fixes
a190ef2c fix crash added in this MR
1037a3bb remove the WIP tip since pleroma!3862 is in stable
b707a14b make sure generated meta goes below FE-provided favicon so that BE's one
 2023-11-27 13:26:19 +00:00
HJ
d21e3d5de2 Merge branch 'admin-dashboard-fixes' into 'develop' 
Fixes and minor improvements for admin dashboard

See merge request pleroma/pleroma-fe!1863
 2023-11-27 13:26:01 +00:00
Henry Jameson
42f55f5139 Merge branch 'admin-dashboard-fixes' into shigusegubu-vue3 2023-11-22 22:07:57 +02:00
Henry Jameson
85bfb31845 Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-11-22 22:07:38 +02:00
Henry Jameson
51f1f05b2d use last favicon instead of first for consistency with browsers 2023-11-22 22:06:56 +02:00
Henry Jameson
b707a14b10 make sure generated meta goes below FE-provided favicon so that BE's one 
get prioritized
 2023-11-22 22:05:16 +02:00
Henry Jameson
f058a28f3b Merge branch 'admin-dashboard-fixes' into shigusegubu-vue3 2023-11-22 22:02:14 +02:00
Henry Jameson
0255e6e8b7 Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-11-22 21:57:17 +02:00
Henry Jameson
c25170d7d9 fix tests and make utils consistent in where they pull configuration from 2023-11-22 21:56:48 +02:00
Henry Jameson
a5f09b7263 don't communicate with serviceworker if there's no support for it 2023-11-22 21:38:54 +02:00
Henry Jameson
1732a0800c Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-11-22 13:18:38 +02:00
Henry Jameson
33564d8ccc handle no sw registration gracefully 2023-11-22 13:17:55 +02:00
Henry Jameson
5cbe1791c1 Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-11-21 15:30:04 +02:00
Henry Jameson
92685e37b6 fix infinity case 2023-11-21 15:29:49 +02:00
Henry Jameson
db2c330b48 Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-11-21 15:27:03 +02:00
Henry Jameson
e36548579f fix notifications not catching up with "read" status as intended 2023-11-21 15:26:31 +02:00
Henry Jameson
df14c66341 debug 2023-11-20 13:34:06 +02:00
Henry Jameson
f3273465a6 Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-11-20 00:22:01 +02:00
Henry Jameson
37e3a23f2a fix badge 2023-11-20 00:20:05 +02:00
Henry Jameson
3af070a961 fix badge 2023-11-20 00:19:51 +02:00
Henry Jameson
ea274e2364 Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-11-20 00:17:23 +02:00
Henry Jameson
1931e7c3ba temp console log for mobile debug 2023-11-20 00:17:09 +02:00