mint/pleroma
1
0
Fork 0
Code Releases Activity
15,159 Commits 1 Branch 0 Tags
ryona-dev
Commit Graph

1491 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
tusooa 248f914e6e Merge branch 'list-installed-frontends' into 'develop' 
List installed frontend refs in admin API

See merge request pleroma/pleroma!3862
 2023-04-27 02:56:19 +00: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 aec5649c6a Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2023-04-02 17:54:55 +03:00
AkiraFukushima e5f36f9f8d Update contact information for Whalebird and Fedistar 2023-04-02 01:07:07 +09:00
AkiraFukushima 17f1b8d133 Remove Roma from docs 
Because this app is no longer maintained
 2023-04-02 01:03:15 +09:00
AkiraFukushima 81e1d6d9d0 Add Fedistar as a desktop client in docs 2023-04-02 01:02:22 +09:00
Ekaterina Vaartis d3b27d45a9 List installed frontend refs in admin API 2023-03-29 23:23:06 +03:00
KiwiFarms 5b29e152a9 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2023-03-16 18:05:26 +03:00
Haelwenn (lanodan) Monnier 8e072baed0 docs: Be more explicit about the level of compatibility of OTP releases 2023-03-05 08:55:18 +01: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 d5d4c7c11d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges 2022-12-19 18:48:26 -07:00
lain 7aa17cd651 Merge branch 'doc_readme_nixos' into 'develop' 
add nixos to supported distros

See merge request pleroma/pleroma!3600
 2022-12-20 01:13:03 +00: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
jrabbit 8afad1e46e reccomend tagged releases over pulling stable 2022-12-06 17:24:04 +00: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 93830b718b Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2022-11-19 16:20:53 +03:00
Mark Felder c7a0df8006 Remove Quack from docs and cheatsheet 2022-11-18 10:09:52 -05: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 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
tusooa e3e68b9377 Update config cheatsheet 2022-11-12 12:55:02 -05: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
Haelwenn (lanodan) Monnier 648e012022 ObjectAgePolicy: Make strip_followers behavior for followers-only explicit 2022-11-07 14:58:47 +01:00
tusooa f2e4b425e1 Document some caveats of webfinger domain setting 2022-11-03 21:13:00 +00:00
Alexander Strizhakov a57c025594 docs update 2022-11-03 09:48:59 -04:00
Alexander Strizhakov 30ded8876a docs & changelog 2022-11-03 09:48:57 -04: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 b374dbdc0a Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2022-09-05 22:09:33 +03: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
KiwiFarms 32593579a8 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2022-09-03 15:14:01 +03:00
Haelwenn e40c221c31 Merge branch 'from/upstream-develop/tusooa/edits' into 'develop' 
Editing

Closes #1429, #2859, and #2288

See merge request pleroma/pleroma!3678
 2022-09-03 02:16:42 +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 37bdff320a Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2022-08-12 13:32:32 +03:00
Haelwenn 93f12c0d0d Merge branch 'from/upstream-develop/tusooa/sync-settings' into 'develop' 
Synchronized settings for apps (frontends)

See merge request pleroma/pleroma!3698
 2022-08-12 01:34:36 +00:00
KiwiFarms b799870098 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2022-08-08 08:43:34 +03:00
tusooa c80096522c Merge branch 'develop' into 'from/develop/tusooa/emit-move' 
# Conflicts:
#   CHANGELOG.md
#   test/pleroma/user_test.exs
 2022-07-31 21:32:49 +00:00
Hélène 1a67a20364 Apply ilja's suggestion(s) to 1 file(s) 2022-07-18 05:40:24 +00:00
Hélène f9fc3a153d Apply ilja's suggestion(s) to 1 file(s) 2022-07-18 05:40:10 +00:00
Hélène ce0a6737e7 Apply ilja's suggestion(s) to 1 file(s) 2022-07-18 05:40:02 +00:00
Hélène 97e8c8a10a Apply ilja's suggestion(s) to 1 file(s) 2022-07-18 05:39:26 +00:00
Hélène d24d74b1a7 Apply ilja's suggestion(s) to 1 file(s) 2022-07-18 05:39:21 +00:00
Hélène db789acf1e Apply ilja's suggestion(s) to 1 file(s) 2022-07-18 05:39:11 +00:00
Hélène d622fe8d48 Apply ilja's suggestion(s) to 1 file(s) 2022-07-18 05:39:03 +00:00
Hélène 02b4b4da47 Apply ilja's suggestion(s) to 1 file(s) 2022-07-18 05:38:45 +00:00
Hélène 02947bafeb Apply ilja's suggestion(s) to 1 file(s) 2022-07-18 05:38:30 +00:00
Hélène ad730c2135 Apply ilja's suggestion(s) to 1 file(s) 2022-07-18 05:38:23 +00:00
Hélène 2baf3084a1 Apply ilja's suggestion(s) to 1 file(s) 2022-07-18 05:38:01 +00:00
Hélène 92da9c4a47 Apply ilja's suggestion(s) to 1 file(s) 2022-07-18 05:37:41 +00:00
Hélène 275c60208b Apply ilja's suggestion(s) to 1 file(s) 2022-07-18 05:37:27 +00:00