Commit Graph

7817 Commits

Author SHA1 Message Date
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 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 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 33564d8ccc handle no sw registration gracefully 2023-11-22 13:17:55 +02:00
Henry Jameson 92685e37b6 fix infinity case 2023-11-21 15:29:49 +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 37e3a23f2a fix badge 2023-11-20 00:20:05 +02:00
Henry Jameson 1931e7c3ba temp console log for mobile debug 2023-11-20 00:17:09 +02:00
Henry Jameson 38b6f0a013 fix notification dot in favicon and mobile nav, minor refactor 2023-11-20 00:14:56 +02:00
Henry Jameson cdc0959135 fix tests 2023-11-19 17:27:51 +02:00
Henry Jameson c0e2ba37c8 changelog, small fix 2023-11-19 17:02:46 +02:00
Henry Jameson 072a06fc89 reports visibility setting + actual filtering for desktop notifs 2023-11-19 16:40:30 +02:00
Henry Jameson d178a56924 improve visual for the description bit 2023-11-19 16:14:24 +02:00
Henry Jameson fd3ad106be rearrange notification visibility page a bit. 2023-11-19 16:12:43 +02:00
Henry Jameson e3ee3eacca added some settings for notifications 2023-11-19 15:24:34 +02:00
Henry Jameson 2f90c629b8 fix messages from sw not really being acted upon on mainland 2023-11-19 13:57:47 +02:00
Henry Jameson a564fc1a1f consistentcy and bugfix 2023-11-19 13:54:26 +02:00
Henry Jameson 1037a3bb72 remove the WIP tip since pleroma!3862 is in stable 2023-11-19 10:06:06 +02:00
Henry Jameson a190ef2c56 fix crash added in this MR 2023-11-19 10:02:42 +02:00
Henry Jameson 75eea5f2b2 Merge remote-tracking branch 'origin/develop' into admin-dashboard-fixes 2023-11-19 09:58:29 +02:00
Henry Jameson c216340001 use dispatch instead of commmit, fix bad copypasta 2023-11-16 22:08:51 +02:00
Henry Jameson af27e2ca7b fix typo 2023-11-16 21:55:01 +02:00
Henry Jameson 388a7ac175 remove a test 2023-11-16 21:28:02 +02:00
Henry Jameson f3a859ff9e remove deletion (sic) stuff since we do the .deleted stuff nowadays 2023-11-16 21:24:33 +02:00
Henry Jameson ce17ebd3d0 use URL for original favicon instead of canvas 2023-11-16 20:45:07 +02:00
Henry Jameson a17defc5ab handle desktop notifications clicks 2023-11-16 20:41:41 +02:00
Henry Jameson 6ed2cb8f43 continue refactor 2023-11-16 20:09:16 +02:00
Henry Jameson aad3225d25 refactored notifications into their own module separate from statuses (WIP) 2023-11-16 19:26:18 +02:00
Henry Jameson fffa7a4f4a fix sw thing 2023-11-13 17:40:55 +02:00
Henry Jameson e508ca6a1f fix 2023-11-13 17:32:14 +02:00
Henry Jameson d9ea160a67 account for if there's no primary frontend setup 2023-11-13 17:31:12 +02:00
Henry Jameson ec2937ec1f add options for marking single notification as read 2023-11-13 17:29:25 +02:00
Henry Jameson c059f4a7ee Merge remote-tracking branch 'origin/develop' into notifications-thru-sw 2023-11-13 17:26:53 +02:00
HJ 84e2fa1a5e Merge branch 'tusooa/react-more-actions-fix' into 'develop'
Accessibility for react & extra buttons

See merge request pleroma/pleroma-fe!1869

(cherry picked from commit 18c0cf1845)

0026b35f Add alt text for react and extra-buttons popup
82063f34 Add aria-controls to extra-buttons trigger
5ff14837 Add changelog
2023-11-12 23:06:26 +00:00
HJ 18c0cf1845 Merge branch 'tusooa/react-more-actions-fix' into 'develop'
Accessibility for react & extra buttons

See merge request pleroma/pleroma-fe!1869
2023-11-12 23:06:14 +00:00
tusooa 5ff14837a7
Add changelog 2023-11-12 16:47:59 -05:00
Henry Jameson bf49aeb756 changelog 2023-11-12 22:18:54 +02:00