aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'post-mergeback-fixes' into 'develop'HJ2023-11-27
|\ | | | | | | | | remove duplicate changelog entries See merge request pleroma/pleroma-fe!1876
| * remove duplicate changelog entriesHenry Jameson2023-11-27
|/
* Merge branch 'master' into 'develop'HJ2023-11-27
|\ | | | | | | | | mergeback master into develop See merge request pleroma/pleroma-fe!1875
| * Merge branch 'release/2.6.x' into 'master'HJ2023-11-27
| |\ | | | | | | | | | | | | merge 2.6.x to master since 2.6.1 release See merge request pleroma/pleroma-fe!1874
| | * version bunpHenry Jameson2023-11-27
| | |
| | * 2.6.1 changelogHenry Jameson2023-11-27
| | |
| | * Merge branch 'admin-dashboard-fixes' into 'develop'HJ2023-11-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes and minor improvements for admin dashboard See merge request pleroma/pleroma-fe!1863 (cherry picked from commit d21e3d5de28afc1725e256370326f5c119d7a736) 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
| | * Merge branch 'tusooa/react-more-actions-fix' into 'develop'HJ2023-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accessibility for react & extra buttons See merge request pleroma/pleroma-fe!1869 (cherry picked from commit 18c0cf1845a95db2d0e894d2455cdd4dc545aaf7) 0026b35f Add alt text for react and extra-buttons popup 82063f34 Add aria-controls to extra-buttons trigger 5ff14837 Add changelog
| | * Merge branch 'cherry-pick-faef2767' into 'release/2.6.x'HJ2023-11-12
| | |\ | | | | | | | | | | | | | | | | Fix admin dashboard crashing for 2.6.1 See merge request pleroma/pleroma-fe!1868
| | | * Merge branch 'tusooa/fix-admin-crash-when-no-primary-fe-set' into 'develop'HJ2023-11-12
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | fix admin crash when no primary fe set See merge request pleroma/pleroma-fe!1867 (cherry picked from commit faef2767cd7ba5961445e9c38e8ebf52d3610259) 661d5b6d Fix frontend admin tab crashing when no primary frontend is set b2c5520d Add changelog for frontend tab crash fix
* | | Merge branch 'admin-dashboard-fixes' into 'develop'HJ2023-11-27
|\ \ \ | | | | | | | | | | | | | | | | Fixes and minor improvements for admin dashboard See merge request pleroma/pleroma-fe!1863
| * | | make sure generated meta goes below FE-provided favicon so that BE's oneHenry Jameson2023-11-22
| | | | | | | | | | | | | | | | get prioritized
| * | | remove the WIP tip since pleroma!3862 is in stableHenry Jameson2023-11-19
| | | |
| * | | fix crash added in this MRHenry Jameson2023-11-19
| | | |
| * | | Merge remote-tracking branch 'origin/develop' into admin-dashboard-fixesHenry Jameson2023-11-19
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch 'tusooa/react-more-actions-fix' into 'develop'HJ2023-11-12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Accessibility for react & extra buttons See merge request pleroma/pleroma-fe!1869
| * | | | Add changelogtusooa2023-11-12
| | | | |
| * | | | Add aria-controls to extra-buttons triggertusooa2023-11-12
| | | | |
| * | | | Add alt text for react and extra-buttons popuptusooa2023-11-12
| | | | |
* | | | | Merge branch 'tusooa/fix-admin-crash-when-no-primary-fe-set' into 'develop'HJ2023-11-12
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | fix admin crash when no primary fe set See merge request pleroma/pleroma-fe!1867
| * | | | Add changelog for frontend tab crash fixtusooa2023-11-11
| | | | |
| * | | | Fix frontend admin tab crashing when no primary frontend is settusooa2023-11-11
|/ / / /
* | | | Merge branch 'weblate' into 'develop'tusooa2023-11-12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Translations update from Pleroma Weblate See merge request pleroma/pleroma-fe!1866
| * | | | Translated using Weblate (Ukrainian)Dmytro Poltavchenko2023-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 90.0% (964 of 1070 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
| * | | | Translated using Weblate (Esperanto)Tirifto2023-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 91.9% (974 of 1059 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
| * | | | Translated using Weblate (Chinese (Min Nan) (nan_TW))Kian-ting Tan2023-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (1059 of 1059 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nan_TW/
| * | | | Translated using Weblate (Chinese (Min Nan) (nan_TW))Kian-ting Tan2023-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 79.8% (846 of 1059 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nan_TW/
| * | | | Translated using Weblate (Chinese (Min Nan) (nan_TW))Kian-ting Tan2023-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 77.6% (822 of 1059 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nan_TW/
| * | | | Translated using Weblate (Chinese (Min Nan) (nan_TW))Kian-ting Tan2023-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 76.2% (808 of 1059 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nan_TW/
| * | | | Translated using Weblate (Chinese (Min Nan) (nan_TW))Kian-ting Tan2023-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 74.2% (786 of 1059 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nan_TW/
| * | | | Translated using Weblate (Chinese (Min Nan) (nan_TW))Kian-ting Tan2023-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 73.2% (776 of 1059 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nan_TW/
| * | | | Translated using Weblate (Chinese (Min Nan) (nan_TW))Kian-ting Tan2023-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 72.3% (763 of 1054 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nan_TW/
| * | | | Translated using Weblate (Chinese (Min Nan) (nan_TW))Kian-ting Tan2023-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 70.4% (743 of 1054 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nan_TW/
| * | | | Translated using Weblate (Chinese (Min Nan) (nan_TW))Kian-ting Tan2023-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 69.5% (733 of 1054 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nan_TW/
| * | | | Translated using Weblate (Chinese (Min Nan) (nan_TW))Kian-ting Tan2023-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 67.9% (716 of 1054 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nan_TW/
| * | | | Translated using Weblate (Chinese (Min Nan) (nan_TW))Kian-ting Tan2023-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 65.1% (687 of 1054 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nan_TW/
| * | | | Translated using Weblate (Esperanto)Tirifto2023-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 92.1% (971 of 1054 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
| * | | | Translated using Weblate (Chinese (Min Nan) (nan_TW))Kian-ting Tan2023-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 64.0% (675 of 1054 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nan_TW/
| * | | | Translated using Weblate (Chinese (Min Nan) (nan_TW))Kian-ting Tan2023-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 63.0% (665 of 1054 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nan_TW/
| * | | | Translated using Weblate (Chinese (Min Nan) (nan_TW))Kian-ting Tan2023-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 61.0% (643 of 1054 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nan_TW/
| * | | | Translated using Weblate (Korean)Xnuk Shuman2023-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 99.9% (1053 of 1054 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
| * | | | Translated using Weblate (Chinese (Min Nan) (nan_TW))Kian-ting Tan2023-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 60.0% (633 of 1054 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nan_TW/
| * | | | Translated using Weblate (Korean)Xnuk Shuman2023-11-10
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 99.9% (1053 of 1054 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
* | | | Merge branch 'neetzsche/display-latest-scrobble' into 'develop'HJ2023-11-10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Display the latest scrobble under a user's name See merge request pleroma/pleroma-fe!1865
| * | | | fix layoutHenry Jameson2023-11-10
| | | | |
| * | | | Display the latest scrobble under a user's nameNEETzsche2023-11-10
|/ / / /
| * | | account for if there's no primary frontend setupHenry Jameson2023-11-13
| | | |
| * | | changelogHenry Jameson2023-11-12
| | | |
| * | | add favicon setting and add compact layout for AttachmentSettingHenry Jameson2023-11-01
| | | |
| * | | add better indication that stuff is happeningHenry Jameson2023-11-01
| | | |