Commit graph

14905 commits

Author SHA1 Message Date
5796d81d98 Merge branch 'stable' into develop
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2022-08-12 16:06:30 +01:00
7544939c83 Merge pull request 'stable tag' (#159) from stable-tag into develop
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
ci/woodpecker/pr/woodpecker Pipeline is pending
Reviewed-on: #159
2022-08-12 15:04:05 +00:00
5192e21e53 bump version to 3.1.0
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
ci/woodpecker/pr/woodpecker Pipeline is pending
2022-08-12 16:00:40 +01:00
19ccdc8762 mix format
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
ci/woodpecker/pr/woodpecker Pipeline is pending
2022-08-11 19:21:50 +01:00
967c325b0d fix tests 2022-08-11 19:21:43 +01:00
d3b9cfb03f use :discard instead of cancel 2022-08-11 19:17:50 +01:00
ceeeefc707 we don't need to purge emoji.txt now
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2022-08-11 19:06:49 +01:00
366889f97c remove default emoji file
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
2022-08-11 19:05:41 +01:00
74dbea4cf8 add masto-fe docs
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2022-08-11 17:43:34 +01:00
Weblate
8bca9a7dbe Update translation files
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-static-pages/
Translation: Pleroma fe/Akkoma Backend (Static pages)
2022-08-11 09:29:28 +00:00
Weblate
fcb5e4a48d Translated using Weblate (Dutch)
Currently translated at 100.0% (83 of 83 strings)

Added translation using Weblate (Dutch)

Co-authored-by: Fristi <fristi@subcon.town>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-static-pages/nl/
Translation: Pleroma fe/Akkoma Backend (Static pages)
2022-08-11 09:29:28 +00:00
Weblate
b1e2f3f646 Update translation files
Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-static-pages/
Translation: Pleroma fe/Akkoma Backend (Static pages)
2022-08-11 09:29:28 +00:00
Weblate
2f074a6966 Translated using Weblate (Catalan)
Currently translated at 2.9% (30 of 1002 strings)

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: sola <spla@mastodont.cat>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-config-descriptions/ca/
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-static-pages/
Translation: Pleroma fe/Akkoma Backend (Config Descriptions)
Translation: Pleroma fe/Akkoma Backend (Static pages)
2022-08-11 09:29:28 +00:00
Weblate
fd35a66312 Update translation files
Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-static-pages/
Translation: Pleroma fe/Akkoma Backend (Static pages)
2022-08-11 09:29:28 +00:00
Weblate
5022ecd766 Update translation files
Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-static-pages/
Translation: Pleroma fe/Akkoma Backend (Static pages)
2022-08-11 09:29:28 +00:00
d16eff1c0f describe color keys
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
fixes #126
2022-08-11 10:28:59 +01:00
55179d4214 set soapbox-fe v2 by default
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
fixes #157
2022-08-11 10:25:03 +01:00
e5a2548521 remove warning that breaks update
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2022-08-09 12:57:39 +01:00
1245141779 treat rejections in MRF as a reject in federator (#155)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #155
2022-08-08 15:47:57 +00:00
5d23df84c9 Mix format
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
2022-08-07 20:49:56 +01:00
b3e4d81362 StatusView: implement pleroma.context field
This field replaces the now deprecated conversation_id field, and now
exposes the ActivityPub object `context` directly via the MastoAPI
instead of relying on StatusNet-era data concepts.
2022-08-07 20:48:08 +01:00
b9bb093600 StatusView: clear MSB on calculated conversation_id
This field seems to be a left-over from the StatusNet era.
If your application uses `pleroma.conversation_id`: this field is
deprecated.

It is currently stubbed instead by doing a CRC32 of the context, and
clearing the MSB to avoid overflow exceptions with signed integers on
the different clients using this field (Java/Kotlin code, mostly; see
Husky and probably other mobile clients.)

This should be removed in a future version of Pleroma. Pleroma-FE
currently depends on this field, as well.
2022-08-07 20:47:59 +01:00
62e179f446 make conversation-id deterministic (#154)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #154
2022-08-06 20:59:15 +00:00
21ec1edbb6 Merge pull request 'allow quote-inline span class' (#152) from allow-quote-inline into develop
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #152
2022-08-05 19:37:35 +00:00
e8806fdc42 allow quote-inline span class
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
ci/woodpecker/pr/woodpecker Pipeline is pending
2022-08-05 20:35:00 +01:00
ec162b496b /notice signing checks on redirect (#150)
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #150
2022-08-05 19:31:32 +00:00
3b973d0627 Merge pull request 'Update 'docs/docs/installation/migrating_to_akkoma.md'' (#151) from ShariVegas/akkoma:sharivegas-docpatch-migration into develop
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #151
2022-08-05 16:40:12 +00:00
273e51cb4a Update 'docs/docs/installation/migrating_to_akkoma.md'
Some checks are pending
ci/woodpecker/pr/woodpecker Pipeline is pending
I ran into an issue after migrating, admin-fe wouldn't function properly. Ran the above command for my build, and got that functionality back.
2022-08-05 16:30:33 +00:00
0ec3a11895 don't persist undo of follows (#149)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #149
2022-08-05 13:28:56 +00:00
2781faaa7b Merge pull request 'Fix postgres install and setup for fedora guide' (#147) from norm/akkoma:fedora-install into develop
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #147
2022-08-05 11:43:14 +00:00
a82fb2acc1 Merge pull request 'Update default paths' (#141) from norm/akkoma:update-default-paths into develop
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #141
2022-08-05 11:42:14 +00:00
499d8a1056 Merge branch 'develop' into fedora-install 2022-08-05 05:03:00 +00:00
6b85b36e3a Fix postgres install and setup for fedora guide
Some checks are pending
ci/woodpecker/pr/woodpecker Pipeline is pending
Fedora requires some additional setup to work with Pleroma compared to Ubuntu/Debian.
2022-08-05 05:02:42 +00:00
5fe2c61029 Merge pull request 'Transmogrifier: fix reply context fixing' (#145) from misskey-thread-breakiness into develop
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #145
2022-08-04 12:07:15 +00:00
c1e15ff6f8 Transmogrifier: fix reply context fixing
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
ci/woodpecker/pr/woodpecker Pipeline is pending
Incoming Pleroma replies to a Misskey thread were rejected due to a
broken context fix, which caused them to not be visible until a
non-Pleroma user interacted with the replies.

This fix properly sets the post-fix object context to its parent Create
activity as well, if it was changed.
2022-08-04 12:57:48 +01:00
9df732c42b Merge branch 'translations' into develop
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
2022-08-03 22:05:23 +01:00
80f444fb52 Merge pull request 'docs/installation: Update required Elixir version to 1.12' (#144) from norm/akkoma:norm-patch-1 into develop
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #144
2022-08-03 12:02:41 +00:00
b5d06a3db8 docs/installation: Update required Elixir version to 1.12
Some checks are pending
ci/woodpecker/pr/woodpecker Pipeline is pending
Some dependencies will refuse to work on Elixir 1.10 (and presumably 1.9). One dependency states 1.13 as a requirement but will still work on 1.12 just fine.
2022-08-03 12:01:13 +00:00
456c97fda9 Merge pull request 'remove unneeded function' (#143) from compile-fix into develop
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #143
2022-08-03 11:12:05 +00:00
842ab82ef0 Merge pull request 'Allow users to create backups without providing email address' (#140) from norm/akkoma:backup-without-email into develop
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #140
2022-08-03 11:11:53 +00:00
sfr
6e9126a794 add code of conduct (#129)
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #129
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
2022-08-03 10:55:11 +00:00
2c40d565fa Fix config path lookup (#139)
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #139
Co-authored-by: Norm <normandy@biribiri.dev>
Co-committed-by: Norm <normandy@biribiri.dev>
2022-08-03 10:52:21 +00:00
359510eebc remove unneeded function
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
ci/woodpecker/pr/woodpecker Pipeline is pending
2022-08-03 11:50:48 +01:00
8bfd01b9c7
Update default paths
Some checks are pending
ci/woodpecker/pr/woodpecker Pipeline is pending
2022-08-03 01:05:53 -04:00
Tusooa Zhu
f08241c8ab
Allow users to create backups without providing email address
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
Ref: backup-without-email
2022-08-02 22:16:54 -04:00
c9600dbbbf local-only-fixed (#138)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #138
2022-08-02 14:46:46 +00:00
ca000f8301 Merge mrf_simple-reject with quarantine (#137)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #137
2022-08-02 14:19:24 +00:00
e26388a01c Support reaching user@sub.domain.tld at user@domain.tld (#134)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #134
Co-authored-by: Joel Beckmeyer <joel@beckmeyer.us>
Co-committed-by: Joel Beckmeyer <joel@beckmeyer.us>
2022-08-02 13:54:22 +00:00
c3eea8dc7d expose bubble instances via nodeinfo (#136)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #136
2022-08-02 09:11:22 +00:00
Weblate
8b14b65e39 Merge branch 'origin/develop' into Weblate.
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
2022-08-01 12:48:29 +00:00