Commit graph

1414 commits

Author SHA1 Message Date
floatingghost 64fdde52f6 timeline panel nav (#131)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: AkkomaGang/pleroma-fe#131
2022-08-17 08:41:36 +00:00
eris ca0b730605 Redo desktop nav, add options for site name and favicon (#83)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: AkkomaGang/pleroma-fe#83
Co-authored-by: eris <femmediscord@gmail.com>
Co-committed-by: eris <femmediscord@gmail.com>
2022-08-14 23:24:59 +00:00
Weblate edf36d28ca Translated using Weblate (English)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Currently translated at 99.5% (851 of 855 strings)

Co-authored-by: Weblate Admin <hannah.ward9001@gmail.com>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/en/
Translation: Pleroma fe/pleroma-fe
2022-08-11 10:10:38 +00:00
Weblate f969dd6ad2 Translated using Weblate (Dutch)
Currently translated at 100.0% (855 of 855 strings)

Translated using Weblate (Dutch)

Currently translated at 100.0% (853 of 853 strings)

Translated using Weblate (Dutch)

Currently translated at 100.0% (852 of 852 strings)

Translated using Weblate (Dutch)

Currently translated at 100.0% (852 of 852 strings)

Co-authored-by: Fristi <fristi@subcon.town>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/nl/
Translation: Pleroma fe/pleroma-fe
2022-08-11 09:04:25 +00:00
Weblate 468fe27565 Translated using Weblate (Japanese (ja_PEDANTIC))
Currently translated at 82.9% (709 of 855 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: Weblate Admin <hannah.ward9001@gmail.com>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/ja_PEDANTIC/
Translation: Pleroma fe/pleroma-fe
2022-08-11 09:04:25 +00:00
Weblate 251a1b13a3 Translated using Weblate (Catalan)
Currently translated at 100.0% (855 of 855 strings)

Translated using Weblate (Catalan)

Currently translated at 100.0% (855 of 855 strings)

Translated using Weblate (Catalan)

Currently translated at 96.9% (827 of 853 strings)

Translated using Weblate (Catalan)

Currently translated at 97.0% (827 of 852 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: sola <spla@mastodont.cat>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/ca/
Translation: Pleroma fe/pleroma-fe
2022-08-11 09:04:25 +00:00
floatingghost 4d27064db3 Show bubble instances in about panel (#123)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: AkkomaGang/pleroma-fe#123
2022-08-09 02:16:23 +00:00
eris d4f8934e8a New option: Pause MFM animations until status hover (#120)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: AkkomaGang/pleroma-fe#120
Co-authored-by: eris <femmediscord@gmail.com>
Co-committed-by: eris <femmediscord@gmail.com>
2022-08-08 15:47:06 +00:00
Weblate e47d3a6d13 Translated using Weblate (Dutch)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Currently translated at 98.2% (837 of 852 strings)

Translated using Weblate (Dutch)

Currently translated at 98.1% (836 of 852 strings)

Translated using Weblate (English)

Currently translated at 99.6% (849 of 852 strings)

Co-authored-by: Fristi <fristi@subcon.town>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: Weblate Admin <hannah.ward9001@gmail.com>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/en/
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/nl/
Translation: Pleroma fe/pleroma-fe
2022-08-06 22:40:35 +00:00
Weblate eab93c1ff6 Translated using Weblate (Dutch)
Currently translated at 98.0% (835 of 852 strings)

Translated using Weblate (Dutch)

Currently translated at 98.0% (835 of 852 strings)

Translated using Weblate (Spanish)

Currently translated at 84.3% (719 of 852 strings)

Translated using Weblate (Dutch)

Currently translated at 97.7% (833 of 852 strings)

Translated using Weblate (Spanish)

Currently translated at 83.8% (714 of 852 strings)

Translated using Weblate (English)

Currently translated at 99.6% (849 of 852 strings)

Translated using Weblate (English)

Currently translated at 99.6% (849 of 852 strings)

Translated using Weblate (English)

Currently translated at 99.6% (849 of 852 strings)

Co-authored-by: Fristi <fristi@subcon.town>
Co-authored-by: Hannah Winter <konhat@hotmail.es>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: Weblate Admin <hannah.ward9001@gmail.com>
Co-authored-by: aetios <dijkvanrichard+akkomatranslate@gmail.com>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/en/
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/es/
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/nl/
Translation: Pleroma fe/pleroma-fe
2022-08-06 22:32:30 +00:00
Weblate 0e1286c454 Translated using Weblate (Catalan)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful
Currently translated at 99.8% (851 of 852 strings)

Co-authored-by: sola <spla@mastodont.cat>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/ca/
Translation: Pleroma fe/pleroma-fe
2022-08-05 11:20:05 +00:00
floatingghost 2e92aaaaa3 Prune i18n files (#110)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: AkkomaGang/pleroma-fe#110
2022-08-04 08:40:01 +00:00
FloatingGhost dfcc91c8c6 Merge remote-tracking branch 'origin/translations' into develop
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2022-08-04 09:10:02 +01:00
floatingghost 2712e47bc1 Merge pull request 'Add scope locale for local only posts in status' (#106) from eris/pleroma-fe:add-local-locale into develop
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: AkkomaGang/pleroma-fe#106
2022-08-04 07:54:24 +00:00
Weblate d8708f020e Translated using Weblate (Japanese (ja_PEDANTIC))
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Currently translated at 84.9% (723 of 851 strings)

Translated using Weblate (Dutch)

Currently translated at 99.4% (846 of 851 strings)

Translated using Weblate (French)

Currently translated at 100.0% (851 of 851 strings)

Translated using Weblate (Catalan)

Currently translated at 100.0% (851 of 851 strings)

Translated using Weblate (English)

Currently translated at 100.0% (851 of 851 strings)

Co-authored-by: Fristi <fristi@subcon.town>
Co-authored-by: Thomate <thomas@burdick.fr>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: Weblate Admin <hannah.ward9001@gmail.com>
Co-authored-by: sola <spla@mastodont.cat>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/ca/
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/en/
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/fr/
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/ja_PEDANTIC/
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/nl/
Translation: Pleroma fe/pleroma-fe
2022-08-03 20:57:46 +00:00
eris e43799e3b5 Add scope locale for local only posts
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
2022-08-03 07:23:38 +00:00
Weblate 3a16e7401e Translated using Weblate (Dutch)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Currently translated at 99.4% (846 of 851 strings)

Translated using Weblate (French)

Currently translated at 100.0% (851 of 851 strings)

Translated using Weblate (Catalan)

Currently translated at 100.0% (851 of 851 strings)

Translated using Weblate (English)

Currently translated at 100.0% (851 of 851 strings)

Co-authored-by: Fristi <fristi@subcon.town>
Co-authored-by: Thomate <thomas@burdick.fr>
Co-authored-by: sola <spla@mastodont.cat>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/ca/
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/en/
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/fr/
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/nl/
Translation: Pleroma fe/pleroma-fe
2022-08-03 07:20:10 +00:00
Weblate 8d53d4f0a9 Translated using Weblate (Dutch)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Currently translated at 88.6% (754 of 851 strings)

Translated using Weblate (French)

Currently translated at 97.1% (827 of 851 strings)

Translated using Weblate (Dutch)

Currently translated at 86.8% (739 of 851 strings)

Translated using Weblate (French)

Currently translated at 95.6% (814 of 851 strings)

Translated using Weblate (Dutch)

Currently translated at 86.1% (732 of 850 strings)

Translated using Weblate (French)

Currently translated at 94.8% (806 of 850 strings)

Translated using Weblate (Catalan)

Currently translated at 100.0% (850 of 850 strings)

Translated using Weblate (English)

Currently translated at 100.0% (850 of 850 strings)

Co-authored-by: Fristi <fristi@subcon.town>
Co-authored-by: Thomate <thomas@burdick.fr>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: eris <femmediscord@gmail.com>
Co-authored-by: sola <spla@mastodont.cat>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/ca/
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/en/
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/fr/
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/nl/
Translation: Pleroma fe/pleroma-fe
2022-08-01 11:11:26 +00:00
sfr 7c675f1ded Add toggle to hide posts mentioning blocked users (#78)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: AkkomaGang/pleroma-fe#78
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
2022-07-31 21:47:25 +00:00
Weblate 53acda2cc7 Translated using Weblate (Catalan)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Currently translated at 100.0% (850 of 850 strings)

Translated using Weblate (English)

Currently translated at 100.0% (850 of 850 strings)

Co-authored-by: Weblate Admin <hannah.ward9001@gmail.com>
Co-authored-by: sola <spla@mastodont.cat>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/ca/
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/en/
Translation: Pleroma fe/pleroma-fe
2022-07-29 09:20:02 +00:00
sola eef99fd86b Translated using Weblate (Catalan)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Currently translated at 100.0% (850 of 850 strings)

Translation: Pleroma fe/pleroma-fe
Translate-URL: http://translate.akkoma.dev/projects/akkoma-fe/pleroma-fe/ca/
2022-07-27 21:25:15 +00:00
floatingghost 2258174a00 weblate sync (#66)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: AkkomaGang/pleroma-fe#66
2022-07-27 10:13:42 +00:00
thomate 93feda84dc More French translations (#65)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: AkkomaGang/pleroma-fe#65
Co-authored-by: thomate <thomas@burdick.fr>
Co-committed-by: thomate <thomas@burdick.fr>
2022-07-27 10:00:25 +00:00
floatingghost d85d9c26b1 Merge pull request 'Merge disabled boost and quote buttons on private posts' (#63) from sfr/pleroma-fe:hide-quote-button into develop
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: AkkomaGang/pleroma-fe#63
2022-07-26 13:22:09 +00:00
Sol Fisher Romanoff 55a840ba9d
Merge disabled boost and quote buttons on private posts
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
2022-07-25 21:44:38 +03:00
Sol Fisher Romanoff 0fdaca8cb2
i18n: add quote tooltip
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
2022-07-25 21:39:55 +03:00
floatingghost a2541bb4e0 Add quotes (#59)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: AkkomaGang/pleroma-fe#59
2022-07-25 16:25:41 +00:00
thomate 04bb4112c0 Added some missing French translations, and fixed an adjacent bit of style that didn’t match the rest (#58)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: AkkomaGang/pleroma-fe#58
Co-authored-by: thomate <thomas@burdick.fr>
Co-committed-by: thomate <thomas@burdick.fr>
2022-07-25 11:36:34 +00:00
FloatingGhost 18fc3a0ad5 add bubble timeline
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful
2022-07-22 15:36:45 +01:00
FloatingGhost 4714d683d3 fix up some JP localisations
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful
2022-07-20 14:35:45 +01:00
FloatingGhost a32cd0a98c fix time formats
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2022-07-19 11:01:24 +01:00
floatingghost fab72940c4 announcements (#42)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: AkkomaGang/pleroma-fe#42
2022-07-18 13:08:50 +00:00
FloatingGhost 617cd7d1f8 refactor list search
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful
2022-07-05 14:28:23 +01:00
sfr 677e5325fa implement Move activities (#26)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: AkkomaGang/pleroma-fe#26
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
2022-07-04 16:38:58 +00:00
floatingghost 6e641a99a2 Show warning if a post has a subject line but is not marked as sensitive (#24)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: AkkomaGang/pleroma-fe#24
2022-06-28 13:53:12 +00:00
sfr 716320de35 Respect subject lines in notifications (#23)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: AkkomaGang/pleroma-fe#23
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
2022-06-27 16:15:24 +00:00
Sol Fisher Romanoff 9923ff587b
Add private note field to user profile
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
2022-06-22 19:14:06 +03:00
Sol Fisher Romanoff cf33b3295f
Add ability to edit and delete lists 2022-06-19 00:04:51 +03:00
Sol Fisher Romanoff bacb6c8fb3
Add list creation functionality 2022-06-19 00:04:51 +03:00
Sol Fisher Romanoff d2c82a04d9
Add buttons to menus 2022-06-19 00:04:51 +03:00
Sol Fisher Romanoff 6e8c7460a2
Add lists listing page 2022-06-19 00:04:51 +03:00
FloatingGhost 9f764a4217 Merge branch 'mfm' into develop 2022-06-14 16:35:18 +01:00
FloatingGhost ed42c476fb allow MFM authoring 2022-06-14 15:57:02 +01:00
Sol Fisher Romanoff c768641f09
i18n: change local posting notice 2022-06-14 11:55:29 +03:00
FloatingGhost f6cf509a04 Merge remote-tracking branch 'upstream/develop' into develop 2022-06-08 18:09:16 +01: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
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 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
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
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
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
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
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
Alexander Tumin fe0ed7e8f0 Mute bot posts 2022-02-28 23:14:45 +03:00
Henry Jameson e3d602fdcc revert changes related to streaming/firehose setting, reword it so it's
not confused with websocket streaming
2022-02-28 17:45:07 +02:00
Henry Jameson 9623b0e140 better phrasing 2022-02-24 14:41:55 +02:00
Henry Jameson 9c1814d122 expert settings toggle + server-side settings 2022-02-22 23:31:40 +02:00
Tusooa Zhu c7690aecd0
Add English translation for media modal counter 2022-02-21 10:34:20 -05:00
HJ 58d0f9678b Merge branch 'fix-mentions-new-bugs' into 'develop'
Fix newfound bugs with rich mentions + user suggestions

See merge request pleroma/pleroma-fe!1430
2022-02-20 15:11:52 +00:00
HJ ddee8bb686 Merge branch 'proper-attachments' into 'develop'
Attachment improvements

See merge request pleroma/pleroma-fe!1399
2022-02-20 15:11:33 +00:00
Henry Jameson ea6114f63c better phrasing? 2022-02-03 22:36:13 +02:00
Henry Jameson bfb3a4364b options to disable (You)s and highlighting of yourself 2022-02-03 22:34:57 +02:00
Tusooa Zhu 7cc0d0763c
Add English translation for mention link prefs 2022-01-29 16:57:59 -05:00
Henry Jameson 94c37e8adf Merge remote-tracking branch 'origin/develop' into proper-attachments
* origin/develop:
  undo accidental change when merging
  Apply 1 suggestion(s) to 1 file(s)
  Rearranged settings, moved more stuff to filtering where apllicable. Changed how filering works.
2022-01-24 21:29:19 +02:00
Henry Jameson c551e3e697 Merge remote-tracking branch 'origin/develop' into proper-attachments
* origin/develop: (81 commits)
  Improve the user card for deactivated users
  Update CHANGELOG.md
  Update CHANGELOG.md
  Allow canceling a follow request
  Simple policy reasons for instance specific policies
  entity_normalizer: Escape name when parsing user
  Translated using Weblate (Spanish)
  Translated using Weblate (Catalan)
  Translated using Weblate (Korean)
  Translated using Weblate (Japanese (ja_PEDANTIC))
  Translated using Weblate (Indonesian)
  Translated using Weblate (Esperanto)
  Translated using Weblate (Vietnamese)
  Translated using Weblate (Italian)
  Translated using Weblate (Vietnamese)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Italian)
  Translated using Weblate (Vietnamese)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Chinese (Simplified))
  ...
2022-01-24 19:28:38 +02:00
Henry Jameson 2f8aae371b Merge remote-tracking branch 'origin/settings-and-filtering' into settings-and-filtering
* origin/settings-and-filtering:
  Apply 1 suggestion(s) to 1 file(s)
2022-01-24 19:13:29 +02:00
Henry Jameson 9ea0f10abb Merge remote-tracking branch 'origin/develop' into settings-and-filtering
* origin/develop: (169 commits)
  Improve the user card for deactivated users
  Update CHANGELOG.md
  Update CHANGELOG.md
  Allow canceling a follow request
  Simple policy reasons for instance specific policies
  entity_normalizer: Escape name when parsing user
  Translated using Weblate (Spanish)
  Translated using Weblate (Catalan)
  Translated using Weblate (Korean)
  Translated using Weblate (Japanese (ja_PEDANTIC))
  Translated using Weblate (Indonesian)
  Translated using Weblate (Esperanto)
  Translated using Weblate (Vietnamese)
  Translated using Weblate (Italian)
  Translated using Weblate (Vietnamese)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Italian)
  Translated using Weblate (Vietnamese)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Chinese (Simplified))
  ...
2022-01-24 19:12:17 +02:00
HJ 182fcca5da Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'
Translations update from Weblate

See merge request pleroma/pleroma-fe!1413
2022-01-19 13:10:16 +00:00
HJ 6509542dbd Merge branch 'fixes_for_deactivated_profile' into 'develop'
Improve the user card for deactivated users

See merge request pleroma/pleroma-fe!1417
2022-01-19 13:09:49 +00:00
Ilja 2ac78219ee Improve the user card for deactivated users 2022-01-19 13:09:48 +00:00
HJ af2a408b78 Apply 1 suggestion(s) to 1 file(s) 2022-01-09 17:59:50 +00:00
sadposter dfb376cbd4 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into develop 2021-12-30 21:09:22 +00:00
sadposter 1e39dac5ea i18n 2021-12-30 21:09:16 +00:00
Ilja 4587f37dd7 Allow canceling a follow request
When a follow request is sent, but not (yet) accepted, the behaviour is now to cancel the request instead of re sending.

The reason is double
* You couldn't cancel a follow request if you change your mind and the request wasn't answered yet
* Instances don't always correctly process a new follow request when the following is already happening. If something went wrong (e;g. the target server thinks you're following, but your instance thinks you're not yet), it's better to first sent an unfollow. This is the behaviour that Mastodon and most probably most other clients have. Therefore this flow is more tested and expected by other instances.
2021-12-12 18:09:21 +01:00
sadposter f150d0a105 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into develop 2021-12-05 14:50:43 +00:00
HJ a20f1794d0 Merge branch 'simplePolicy_reasons_for_instance_specific_policies' into 'develop'
Simple policy reasons for instance specific policies

See merge request pleroma/pleroma-fe!1263
2021-12-03 18:14:32 +00:00