1
0
Commit Graph

1207 Commits

Author SHA1 Message Date
KiwiFarms 4293128496 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2023-04-28 22:56:30 +03:00
duponin 0231a09310 Remove SSH/BBS feature from core
And link to sshocial, the replacement client for this removed feature
2023-04-23 10:47:07 +02:00
KiwiFarms da1cb1d3c4 Somewhat smarter rate limiting 2023-04-16 17:46:36 +03:00
KiwiFarms 59c86300ae One policy to rule them all 2023-04-16 15:15:04 +03:00
KiwiFarms 12261a05e8 Reverting my own custom reacts backport in preparation for upstream merge 2023-03-16 18:05:20 +03:00
KiwiFarms d22434707d Merge remote-tracking branch 'upstream/develop' into ryona-dev 2023-03-02 12:35:37 +03:00
KiwiFarms 09389e32ed Add list of domains excluded from signed fetch shenanigans 2023-01-31 01:55:27 +03:00
KiwiFarms 0cb998f5f9 Do not hardcode path to the user used for signed fetches spoofing 2023-01-31 01:36:25 +03:00
tusooa bc7ec43179 Allow customizing instance languages 2023-01-26 20:17:13 -05:00
Alexander Tumin ee926f5f29 fix formatting 2022-12-29 00:44:56 +03:00
KiwiFarms fe4bf82668 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2022-12-29 00:42:06 +03:00
KiwiFarms 97a15ad500 Revert "Revert "Merge branch 'from/upstream-develop/tusooa/no-strip-report' into 'develop'""
This reverts commit 3dce20d5c2.
2022-12-29 00:36:31 +03:00
Sean King 60df2d8a97 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges 2022-12-18 22:03:48 -07:00
Lain Soykaf 63d00f8123 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-deps 2022-12-15 17:19:36 -05:00
KiwiFarms 3dce20d5c2 Revert "Merge branch 'from/upstream-develop/tusooa/no-strip-report' into 'develop'"
This reverts commit 1b0e47b79b, reversing
changes made to 7c8618dc9a.
2022-12-04 13:04:45 +03:00
KiwiFarms 446f07aa80 Make funny out-of-bounds images configurable 2022-11-26 22:17:11 +03:00
KiwiFarms 86632957aa Merge branch 'eientei' of https://gitlab.eientei.org/eientei/pleroma into ryona-dev 2022-11-19 16:20:42 +03:00
KiwiFarms 6189875d67 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2022-11-15 18:12:56 +03:00
tusooa f38cb4ccac Merge branch 'from/upstream-develop/tusooa/no-strip-report' into 'develop'
Lint

See merge request pleroma/pleroma!3778
2022-11-12 19:48:26 +00:00
tusooa 14871fecd4 Lint 2022-11-12 14:16:52 -05:00
tusooa 1b0e47b79b Merge branch 'from/upstream-develop/tusooa/no-strip-report' into 'develop'
Give admin the choice to not strip reported statuses

Closes #2887

See merge request pleroma/pleroma!3773
2022-11-12 17:55:50 +00:00
Haelwenn c2cfe0c690 Clarify config description 2022-11-12 17:44:31 +00:00
Haelwenn 7c8618dc9a Merge branch 'no-ducks' into 'develop'
Remove Quack logging backend

See merge request pleroma/pleroma!3776
2022-11-12 05:40:07 +00:00
Mark Felder 6b87b3f2ea Remove Quack logging backend 2022-11-11 12:36:29 -05:00
lain e7c40c2509 fix envvar 2022-11-11 15:40:32 +00:00
Iván Raskovsky 36519bdbee allow custom db port 2022-11-11 12:22:21 -03:00
marcin mikołajczak eb70676931 Update links to Soapbox
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-11 12:13:30 +01:00
tusooa 6f047cc308 Do not strip reported statuses when configured not to 2022-11-09 22:36:57 -05:00
Mark Felder 7c64f705f6 Update to Phoenix 1.6 and chase dependencies
Also bump minimum Elixir to 1.11
2022-11-03 16:13:07 +00:00
Alexander Strizhakov 4121bca895 expanding WebFinger 2022-11-03 09:48:24 -04:00
sn0w 44a45fd23e Allow reacting with emojis containing a number 2022-10-23 03:17:34 +03:00
FloatingGhost 3d1ede6900 fix emoji tests 2022-10-23 03:15:17 +03:00
KiwiFarms 30d537422b Merge branch 'quote-post' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2022-10-23 00:21:22 +03:00
KiwiFarms c13ce51ed9 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2022-10-10 05:47:51 +03:00
Tusooa Zhu 467b6cad6f Reduce incoming and outgoing federation queue sizes to 5 2022-09-17 16:34:33 -04:00
KiwiFarms 7620f8aba7 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2022-09-06 20:27:37 +03:00
KiwiFarms b374dbdc0a Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2022-09-05 22:09:33 +03:00
marcin mikołajczak c6bc523914 Clarify birthday_min_age config description
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-05 20:25:01 +02:00
tusooa f7c2073103 Merge branch 'bump/min-elixir-1.10' into 'develop'
Bump minimum Elixir version to 1.10

See merge request pleroma/pleroma!3741
2022-09-05 15:19:34 +00:00
tusooa 20347898e2 Merge branch 'fix/federation-context-issues' into 'develop'
Fix reply context fixing (Pleroma replies to Misskey threads) and removal of context objects

See merge request pleroma/pleroma!3717
2022-09-04 18:43:36 +00:00
Haelwenn (lanodan) Monnier 21ab7369ca Bump minimum Elixir version to 1.10
With the release of Elixir 1.14, Elixir 1.9 is now end-of-life.

Elixir 1.10 Release Notes:
https://github.com/elixir-lang/elixir/releases/tag/v1.10.0
2022-09-02 22:53:54 +02:00
KiwiFarms 72c97aaadc Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2022-08-30 15:50:51 +03:00
Sean King d67d191344 Fix fedi-fe build URL 2022-08-24 23:39:02 -06:00
KiwiFarms d7fca9df32 Signed fetches spoofing 2022-08-21 21:04:01 +03:00
Sean King cc0f32c253 Add glitch-lily as an installable frontend 2022-08-19 22:54:56 -06:00
Hélène 88c1c76d3e Migrations: delete contexts with BaseMigrator
Due to the lengthiness of this task, the migration has been adapted into
a BaseMigrator migration, running in the background instead.
2022-08-15 01:47:09 +02:00
KiwiFarms b799870098 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2022-08-08 08:43:34 +03:00
Ilja b53cf7d4b3 Change default moderator privileges to better match what we previously had
Moderators were able to delete statusses via pleroma-fe. For that reason I now gave them :messages_delete by default.

They are also able to recieve reports through the notifications. For that reason I now gave them :reports_manage_reports by default.

They were also able to see deactivated accounts through pleroma-fe. However
* they were unable to tell if the account is deactivated or not (which was a bug and fixed by thes privileges MR this commit is part of)
* they were not able to actually change the activation state.
Because of this, I decided to *not* give them the privilege :users_manage_activation_state as this would give significantly more
privileges, while not giving it will actually improve the current experience as it works around the existing bug of not showing activation state.
2022-08-07 07:22:33 +02:00
Alexander Tumin 73727b65a7 Akkoma migration 2022-08-06 17:40:48 +03:00
marcin mikołajczak 5153eba3a8 Add authorized_fetch_mode to description.exs
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-25 19:53:51 +02:00