Commit Graph

1401 Commits

Author SHA1 Message Date
Your New SJW Waifu 5ff6847db2 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-06-21 11:55:57 -05:00
HJ 56501e95c4 Merge branch 'from/develop/tusooa/migration-ui' into 'develop'
Add ui for account migration

See merge request pleroma/pleroma-fe!1414
2022-06-19 20:35:58 +00:00
HJ 0e65253360 Merge branch 'improve_delete_user_confirmation_message' into 'develop'
Explain better what delete does in moderation menu

See merge request pleroma/pleroma-fe!1453
2022-06-19 20:32:27 +00:00
HJ 5ad7dc7835 Merge branch 'from/develop/tusooa/backup-ui' into 'develop'
Add ui for backup

See merge request pleroma/pleroma-fe!1520
2022-06-19 20:31:19 +00:00
HJ b4006bf4f0 Merge branch 'translation-sk' into 'develop'
add SK (Slovak) translation

See merge request pleroma/pleroma-fe!1517
2022-06-19 20:29:25 +00:00
k2s c1ee78756c add SK (Slovak) translation 2022-06-19 20:29:24 +00:00
Tusooa Zhu 772ddade21
Add English translations for correctly i18nized time units 2022-06-07 20:22:25 -04:00
Your New SJW Waifu 93515aa533 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-06-01 09:55:18 -05:00
HJ 0aa334515b Merge branch 'threecolumn' into 'develop'
Layout refactoring + Three column mode

See merge request pleroma/pleroma-fe!1503
2022-05-31 17:46:59 +00:00
Your New SJW Waifu 8e0ca4b8a9 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-05-27 09:45:11 -05:00
HJ 9725443e60 Revert "Merge branch 'revert-a88abc7e' into 'develop'"
This reverts merge request !1526
2022-05-22 16:40:59 +00:00
HJ 069cf3fa87 Revert "Merge branch 'from/develop/tusooa/lang-opts' into 'develop'"
This reverts merge request !1494
2022-05-22 16:38:09 +00:00
HJ a88abc7ee3 Merge branch 'from/develop/tusooa/lang-opts' into 'develop'
Add language options

See merge request pleroma/pleroma-fe!1494
2022-05-22 16:35:51 +00:00
Tusooa Zhu 6e0ceda968
Add English translation for filtering end-of-poll notifications
Ref: poll-notif
2022-05-20 16:45:34 -04:00
Tusooa Zhu a4b6a97b1b
Add English translations for poll-end notifications
Ref: poll-notif
2022-05-20 16:45:33 -04:00
Tusooa Zhu 22af78c7f4
Add English translations for backup UI 2022-05-09 00:42:24 -04:00
Tusooa Zhu 5831534800
Add English translation for list aliases error 2022-04-29 21:27:03 -04:00
Tusooa Zhu f661099b60
Add Engilsh translation for migration
Ref: migrate-ui
2022-04-29 21:27:03 -04:00
Tusooa Zhu 093c85d006
Add English translation for language options 2022-04-29 20:34:32 -04:00
Henry Jameson 28556f7c27 localization updates 2022-04-12 22:01:04 +03:00
Your New SJW Waifu f7a28f3982 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-04-06 10:54:22 -05:00
Henry Jameson 853f5145be fix tegulu 2022-04-06 18:43:47 +03:00
Henry Jameson b213d25711 heck 2022-04-06 15:48:07 +03:00
Henry Jameson bd77f3a1a6 fix i18n for good?? 2022-04-06 15:45:44 +03:00
Your New SJW Waifu fda5246eec Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-03-31 21:36:26 -05:00
HJ f71f101fce Merge branch 'vue3-again' into 'develop'
Migration to Vue 3 (again)

See merge request pleroma/pleroma-fe!1385
2022-03-31 17:45:29 +00:00
Ilja c34fdd46da Merge remote-tracking branch 'pleroma/develop' into improve_delete_user_confirmation_message 2022-03-26 12:07:57 +01:00
Ilja 2dd75ca76c Change translation key 2022-03-26 12:05:25 +01:00
Tusooa Zhu c5551e834b
Fix English translation of Shoutbox in features panel 2022-03-24 19:28:15 -04:00
Henry Jameson d524e98348 fix capitalization (and localization of tooltips for scope icon) 2022-03-22 20:42:29 +02:00
Your New SJW Waifu a660cd3b10 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-03-18 01:35:05 -05:00
Henry Jameson d815f984fb fix i18n errors related to @ symbol 2022-03-17 08:53:45 +02:00
Henry Jameson a97db1efd6 Merge remote-tracking branch 'origin/develop' into expert-settings-and-serverside
* origin/develop: (83 commits)
  Make media modal buttons larger
  Add English translation for hide tooltip
  Add hide button to media modal
  Lint
  Prevent hiding media viewer if swiped over SwipeClick
  Fix webkit image blurs
  Fix video in media modal not displaying properly
  Add changelog for https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1403
  Remove image box-shadow in media modal
  Clean up debug code for image pinch zoom
  Bump @kazvmoe-infra/pinch-zoom-element to 1.2.0 on npm
  Bump pinch-zoom-element version
  Clean up
  Check whether we swiped only for mouse pointer
  Scale swipe threshold with viewport width
  Update pinch-zoom-element
  Allow pinch-zoom to fill the whole screen
  Use native click for hiding overlay
  Reset position on swipe end even if we cannot navigate
  Make lint happy
  ...
2022-03-14 09:31:24 +02:00
HJ e34d71fc1f Merge branch 'from/develop/tusooa/tree-threading' into 'develop'
Add the option to display threads as trees

See merge request pleroma/pleroma-fe!1407
2022-03-13 17:31:46 +00:00
Tusooa Zhu b67a557a8c
Add English translation for hide tooltip 2022-03-13 12:02:03 -04:00
Henry Jameson f16f35a4d4 Merge remote-tracking branch 'origin/develop' into expert-settings-and-serverside
* origin/develop:
  Update dependency v-click-outside to v2.1.5
  Update dependency shelljs to v0.8.5
  Update dependency portal-vue to v2.1.7
  Update dependency lodash to v4.17.21
  Update dependency karma-spec-reporter to v0.0.33
  Update dependency karma-webpack to v4.0.2
  Update dependency karma-sourcemap-loader to v0.3.8
  Update dependency eslint-plugin-vue to v5.2.3
  Update dependency chromedriver to v87.0.7
  Update dependency @chenfengyuan/vue-qrcode to v1.0.2
  Pin dependencies
  Pin dependencies
  Do not mute bot posts in notifications
  Lint
  Add renovate.json
  Add bot indication to user icon on statuses
  Mute bot posts
  fix placeholder attachments opening new tab
2022-03-13 16:34:05 +02:00
Henry Jameson 726fdbea15 remove "experimental" label from streaming api 2022-03-13 10:51:13 +02:00
Ilja 08a4c33c67 Explain better what delete does in moderation menu 2022-03-12 19:43:12 +01:00
Tusooa Zhu 0e323ef248
Add English translations for fading ancestor option 2022-03-07 19:19:32 -05:00
Tusooa Zhu fa20ea76b1
Update English translation for tree view settings 2022-03-07 19:19:32 -05:00
Tusooa Zhu ba858a894c
Add English translations for other replies count 2022-03-07 19:19:31 -05:00
Tusooa Zhu 9b27ac9aaf
Add English translation for position of other replies button pref 2022-03-07 19:19:31 -05:00
Tusooa Zhu c4bd004cbc
Add English translation for show all conversation button improvement 2022-03-07 19:19:31 -05:00
Tusooa Zhu d78c8e8ea4
Add English translation for Misskey-style tree view 2022-03-07 19:19:30 -05:00
Tusooa Zhu f851bc92c9
Add English translations for max depth in thread 2022-03-07 19:19:30 -05:00
Tusooa Zhu 05b2351e08
Add English translation for simple tree 2022-03-07 19:19:29 -05:00
Tusooa Zhu 8c0deb905e
Add English translation for diving 2022-03-07 19:19:29 -05:00
Tusooa Zhu 31c4300456
Add English translations for diving 2022-03-07 19:19:29 -05:00
Tusooa Zhu cd0f6a4f78
Add English translations for message threading 2022-03-07 19:19:29 -05:00
Alexander Tumin 2b7f12613e Add bot indication to user icon on statuses 2022-03-01 01:00:38 +03:00