Merge branch 'develop' into stable

2023-02-15 22:13:30 +00:00 · 2023-02-11 11:19:42 +00:00 · 2023-02-11 10:59:04 +00:00 · 2023-02-11 10:57:01 +00:00 · 2023-02-11 10:49:01 +00:00 · 2023-02-11 10:43:22 +00:00
2 changed files with 6 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -142,6 +142,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## 2022.08
 ### Removed
 - Non-finch HTTP adapters. `:tesla, :adapter` is now highly recommended to be set to the default.
 ## 2022.08
 ### Added
 - extended runtime module support, see config cheatsheet
 - quote posting; quotes are limited to public posts
--- a/docs/docs/administration/updating.md
+++ b/docs/docs/administration/updating.md
@ -26,7 +26,7 @@ su -s "$SHELL" akkoma
 # Run database migrations
 ./bin/pleroma_ctl migrate
-# Update frontend(s). See Frontend Configuration doc for more information.
+# Update Pleroma-FE frontend to latest stable. For other Frontends see Frontend Configration doc for more information.
 ./bin/pleroma_ctl frontend install pleroma-fe --ref stable
 # Start akkoma
Author	SHA1	Message	Date
FloatingGhost	36cb19dbf2	Merge branch 'develop' into stable	2023-02-15 22:13:30 +00:00
FloatingGhost	71d08991ea	Merge branch 'develop' into stable	2023-02-11 11:19:42 +00:00
FloatingGhost	d756607112	Merge branch 'develop' into stable	2023-02-11 10:59:04 +00:00
FloatingGhost	367bc9c818	Merge branch 'develop' into stable	2023-02-11 10:57:01 +00:00
FloatingGhost	81caf77223	Merge branch 'develop' into stable	2023-02-11 10:49:01 +00:00
FloatingGhost	551f92dd50	Merge branch 'develop' into stable	2023-02-11 10:43:22 +00:00
floatingghost	d9508474b6	Merge pull request 'clean-up docs to avoid version-mismatches in BE and FE in new installs (for stable)' (#378 ) from stefan230/akkoma:stable into stable Reviewed-on: AkkomaGang/akkoma#378	2022-12-19 10:59:34 +00:00
Stefan	f676007b18	clean-up docs to avoid mismatches in BE and FE. Clearly state that stable-versions are installed	2022-12-16 17:23:31 +01:00
FloatingGhost	63f2d1cbef	Merge branch 'develop' into stable	2022-12-10 14:50:35 +00:00
FloatingGhost	f91b896731	Merge branch 'develop' into stable	2022-11-12 15:34:19 +00:00
FloatingGhost	af90a4e51b	Merge branch 'develop' into stable	2022-10-14 12:49:46 +01:00
FloatingGhost	5e7be063c7	Merge branch 'develop' into stable	2022-10-08 12:12:52 +01:00
FloatingGhost	a1317bf541	use on-release tag	2022-09-20 13:36:28 +01:00
FloatingGhost	a0dd670e68	ensure we use the same OTP for all releases	2022-09-20 13:34:50 +01:00
floatingghost	11d29d27b8	Ensure migrations succeed (#216 ) Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: AkkomaGang/akkoma#216	2022-09-16 12:53:45 +01:00
FloatingGhost	44da806a77	Merge branch 'develop' into stable	2022-09-10 17:13:49 +01:00
floatingghost	d7c805b0bb	Merge pull request '2022.09 stable' (#208 ) from develop into stable Reviewed-on: AkkomaGang/akkoma#208	2022-09-10 16:06:18 +00:00
floatingghost	c52982e9c5	add finch outbound proxy support (#158 ) Reviewed-on: AkkomaGang/akkoma#158	2022-08-24 16:03:17 +01:00
floatingghost	2e433e106f	generate-keys-at-registration-time (#181 ) Reviewed-on: AkkomaGang/akkoma#181	2022-08-24 15:39:30 +01:00
floatingghost	bfbe4e8dce	Merge pull request 'stable release' (#160 ) from develop into stable Reviewed-on: AkkomaGang/akkoma#160	2022-08-12 15:25:01 +00:00