1589 commits

Author	SHA1	Message	Date
Norm	b188ac3f21	docs: Remove quarantine section ... Quarantining was deprecated back in 2022.08. Also added that SimplePolicy's `reject` also prevents outbound federation to servers listed there.	2022-11-29 18:31:24 +00:00
floatingghost	98a21debf9	normalise markup by default (#316) ... why was this _not_ default? honestly i'm surprised pleroma hasn't exploded yet Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: #316	2022-11-26 21:06:20 +00:00
@r3g_5z@plem.sapphic.site	565ead8397	minor-changes (#313) ... Only real change here is making MRF rejects log as debug instead of info (#234) I don't know if it's the best way to do it, but it seems it's just MRF using this and almost always this is intended. The rest are just minor docs changes and syncing the restricted nicknames stuff. I compiled and ran my changes with Docker and they all work. Co-authored-by: r3g_5z <june@terezi.dev> Reviewed-on: #313 Co-authored-by: @r3g_5z@plem.sapphic.site <june@girlboss.ceo> Co-committed-by: @r3g_5z@plem.sapphic.site <june@girlboss.ceo>	2022-11-26 19:27:58 +00:00
FloatingGhost	ec1d903f2e	Note that openbsd needs erlang-wx	2022-11-25 15:24:39 +00:00
floatingghost	2fe1484ed3	http timeout config (#307) ... Ref https://meta.akkoma.dev/t/increase-timeout-on-libretranslate-request-how/156/2 Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: #307	2022-11-24 12:27:16 +00:00
FloatingGhost	cc75b313f3	Add favicon, frontend docs	2022-11-20 21:44:32 +00:00
@r3g_5z@plem.sapphic.site	0e4c201f8d	HTTP header improvements (#294) ... - Drop Expect-CT Expect-CT has been redundant since 2018 when Certificate Transparency became mandated and required for all CAs and browsers. This header is only implemented in Chrome and is now deprecated. HTTP header analysers do not check this anymore as this is enforced by default. See https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Expect-CT - Raise HSTS to 2 years and explicitly preload The longer age for HSTS, the better. Header analysers prefer 2 years over 1 year now as free TLS is very common using Let's Encrypt. For HSTS to be fully effective, you need to submit your root domain (domain.tld) to https://hstspreload.org. However, a requirement for this is the "preload" directive in Strict-Transport-Security. If you do not have "preload", it will reject your domain. - Drop X-Download-Options This is an IE8-era header when Adobe products used to use the IE engine for making outbound web requests to embed webpages in things like Adobe Acrobat (PDFs). Modern apps are using Microsoft Edge WebView2 or Chromium Embedded Framework. No modern browser checks or header analyser check for this. - Set base-uri to 'none' This is to specify the domain for relative links (`<base>` HTML tag). pleroma-fe does not use this and it's an incredibly niche tag. I use all of these myself on my instance by rewriting the headers with zero problems. No breakage observed. I have not compiled my Elixr changes, but I don't see why they'd break. Co-authored-by: r3g_5z <june@terezi.dev> Reviewed-on: #294 Co-authored-by: @r3g_5z@plem.sapphic.site <june@terezi.dev> Co-committed-by: @r3g_5z@plem.sapphic.site <june@terezi.dev>	2022-11-20 21:20:06 +00:00
r3g_5z	f90552f62e	Drop XSS auditor ... It's deprecated, removed in some, by all modern browsers and is known to create XSS vulnerabilities in itself. Signed-off-by: r3g_5z <june@terezi.dev>	2022-11-19 20:40:20 -05:00
FloatingGhost	fb5f846e8c	Add languages to cheatsheet	2022-11-18 11:22:30 +00:00
Norm	14c1a4220b	docs: Update list of clients (#284) ... In addition to making the page refer to Akkoma instead of Pleroma, I've also removed clients that were not updated in a year or more and updated links to websites and the contact links of authors. Also removed language that suggested these clients are in any way "officially supported". Co-authored-by: Francis Dinh <normandy@biribiri.dev> Reviewed-on: #284 Co-authored-by: Norm <normandy@biribiri.dev> Co-committed-by: Norm <normandy@biribiri.dev>	2022-11-18 11:19:37 +00:00
floatingghost	9deae8c533	Merge pull request 'docs: Update links to list of akkoma instances' (#278) from norm/akkoma:update-akkoma-list-urls into develop ... Reviewed-on: #278	2022-11-16 10:16:27 +00:00
FloatingGhost	d4ca1217d3	Be very specific about the double-quotes in strings	2022-11-16 10:13:41 +00:00
Francis Dinh	7a833aff90	docs: Update links to list of akkoma instances ... The old links were for Pleroma instances and one of them isn't even active anymore.	2022-11-15 07:51:19 -05:00
FloatingGhost	893bfde66f	Remove references to soykaf ... Fixes #271	2022-11-14 00:01:31 +00:00
FloatingGhost	634463ff64	fix requirements	2022-11-11 16:07:07 +00:00
FloatingGhost	dcc36df8cf	add manual deploy for docs	2022-11-10 10:55:57 +00:00
FloatingGhost	539c6d6666	update requirements.txt	2022-11-10 03:40:36 +00:00
FloatingGhost	66eb844bd2	Update documentation builder	2022-11-10 03:38:10 +00:00
FloatingGhost	53fbe26c80	reference "stable" in all URLs	2022-11-09 13:22:44 +00:00
FloatingGhost	e0032e4799	Add rollbacks for associated_object_id	2022-11-07 00:08:20 +00:00
FloatingGhost	16a31872fe	document local_bubble	2022-10-21 10:23:07 +01:00
FloatingGhost	5231d436d1	Add docker migration guide	2022-10-18 16:16:55 +01:00
FloatingGhost	deba1d25f5	add DB restart to docker file	2022-10-17 16:29:36 +01:00
floatingghost	66f913355a	Docker builds (#231) ... Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: #231	2022-10-16 19:25:54 +00:00
FloatingGhost	47a793f33e	include requirement to enable HTTP tunnel in tor	2022-09-20 14:40:32 +01:00
floatingghost	5827f7781f	Add installation note about flavour, support special cases (#222) ... Fixes #210 Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: #222	2022-09-20 11:04:26 +00:00
floatingghost	b2aa82cee5	Fix false error in meilisearch index (#221) ... the schema changed https://docs.meilisearch.com/reference/api/documents.html#add-or-update-documents this wasn't breaking anything, it would just report errors that were actually successes Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: #221	2022-09-20 10:36:21 +00:00
Norm	00f840fd44	Update styles.json path in frontend config doc (#212) ... Co-authored-by: Francis Dinh <normandy@biribiri.dev> Reviewed-on: #212 Co-authored-by: Norm <normandy@biribiri.dev> Co-committed-by: Norm <normandy@biribiri.dev>	2022-09-14 10:20:07 +00:00
floatingghost	b8190f19dc	2022.09 stable release chores (#206) ... Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: #206	2022-09-10 14:44:17 +00:00
floatingghost	2641dcdd15	Post editing (#202) ... Rebased from #103 Co-authored-by: Tusooa Zhu <tusooa@kazv.moe> Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: #202	2022-09-06 19:24:02 +00:00
FloatingGhost	25111bb407	include frontend installation document on all install guides	2022-08-30 10:56:33 +01:00
floatingghost	df39cab9c1	Automatic status translation (#187) ... Fixes #115 Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: #187	2022-08-29 19:42:22 +00:00
FloatingGhost	85137f591f	Add ability to obfuscate domains in MRF transparency	2022-08-27 11:57:57 +01:00
floatingghost	11ec9daa5b	API compatibility with fedibird, frontend config (#163) ... Reviewed-on: #163	2022-08-17 00:22:59 +00:00
floatingghost	37a1001b97	add finch outbound proxy support (#158) ... Reviewed-on: #158	2022-08-14 23:13:49 +00:00
FloatingGhost	74dbea4cf8	add masto-fe docs	2022-08-11 17:43:34 +01:00
ShariVegas	273e51cb4a	Update 'docs/docs/installation/migrating_to_akkoma.md' ... 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
Norm	499d8a1056	Merge branch 'develop' into fedora-install	2022-08-05 05:03:00 +00:00
Norm	6b85b36e3a	Fix postgres install and setup for fedora guide ... Fedora requires some additional setup to work with Pleroma compared to Ubuntu/Debian.	2022-08-05 05:02:42 +00:00
Norm	b5d06a3db8	docs/installation: Update required Elixir version to 1.12 ... 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
floatingghost	ca000f8301	Merge mrf_simple-reject with quarantine (#137) ... Reviewed-on: #137	2022-08-02 14:19:24 +00:00
Joel Beckmeyer	e26388a01c	Support reaching user@sub.domain.tld at user@domain.tld (#134) ... 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
floatingghost	2c8f57db98	rename-flavours (#123) ... Reviewed-on: #123	2022-07-28 10:36:51 +00:00
Fristi	7380dc0256	Added installation guides for redhat linux distributions, includes OTP build guide for fedora. (#122) ... Reviewed-on: #122 Co-authored-by: Fristi <fristi@noreply.akkoma> Co-committed-by: Fristi <fristi@noreply.akkoma>	2022-07-28 10:19:32 +00:00
floatingghost	645f0390bc	Prepare for ubuntu22 murdering openssl (#120) ... Reviewed-on: #120	2022-07-27 21:48:13 +00:00
floatingghost	90c4785b89	remove public post quarantine exception (#114) ... Reviewed-on: #114	2022-07-26 11:09:13 +00:00
floatingghost	1419eee5df	Quote posting (#113) ... Reviewed-on: #113	2022-07-25 16:30:06 +00:00
floatingghost	c4e9c4bc95	extend custom runtime system (#108) ... Reviewed-on: #108	2022-07-24 16:42:43 +00:00
FloatingGhost	0f132b802d	purge chat and shout endpoints	2022-07-21 11:29:28 +01:00
floatingghost	729f45ccd2	purge ldap authenticator (#92) ... Reviewed-on: #92	2022-07-20 12:49:13 +00:00
FloatingGhost	a2b384d572	document scrobbling purge	2022-07-19 17:22:02 +01:00
Sol Fisher Romanoff	f95f35a1ab	doc: update repo link from docs to akkoma	2022-07-19 12:36:09 +03:00
floatingghost	54ed8760ff	Merge branch 'from/upstream-develop/tusooa/server-announcements' into 'develop' (#85) ... Reviewed-on: #85	2022-07-18 13:08:36 +00:00
floatingghost	d2a185c013	Documentation updates for stable release (#73) ... Reviewed-on: #73	2022-07-15 12:27:16 +00:00
floatingghost	bcdbbad037	Merge pull request 'remove the docs for stuff i didn't do' (#72) from remove-weird-frontend into develop ... Reviewed-on: #72	2022-07-14 11:11:37 +00:00
FloatingGhost	d0366705d8	remove the docs for stuff i didn't do	2022-07-14 12:11:00 +01:00
floatingghost	a59fe8ba2d	Add support for musl11 build (#71) ... Reviewed-on: #71	2022-07-14 10:59:21 +00:00
floatingghost	37ae047e16	Add swaggerUI options (#66) ... Reviewed-on: #66	2022-07-13 15:09:35 +00:00
floatingghost	5ad256f170	[#58] pre-link MFM content (#59) ... Reviewed-on: #59	2022-07-10 17:06:25 +00:00
floatingghost	82fa766ed7	Remove precompiled javascript (#55) ... Reviewed-on: #55	2022-07-08 13:03:18 +00:00
norm	fef48af31e	Update Alpine install guide (#49) ... Reviewed-on: #49 Co-authored-by: norm <normandy@biribiri.dev> Co-committed-by: norm <normandy@biribiri.dev>	2022-07-07 18:17:31 +00:00
floatingghost	bc6bfe383f	Add configurable theme color (#53) ... Reviewed-on: #53	2022-07-06 20:00:43 +00:00
floatingghost	a9c82b62f2	Fixes for elasticsearch 8 (#52) ... Reviewed-on: #52	2022-07-06 18:57:00 +00:00
norm	c0e6f30e4d	Update sample config files (#48) ... Reviewed-on: #48 Co-authored-by: norm <normandy@biribiri.dev> Co-committed-by: norm <normandy@biribiri.dev>	2022-07-06 18:50:01 +00:00
sfr	058bf96798	implement Move activities (#45) ... Reviewed-on: #45 Co-authored-by: sfr <sol@solfisher.com> Co-committed-by: sfr <sol@solfisher.com>	2022-07-04 16:29:39 +00:00
floatingghost	87bb417c99	Merge pull request 'Update development docs' (#43) from norm/akkoma:docs-development into develop ... Reviewed-on: #43	2022-07-04 15:49:08 +00:00
Norm	5e02658e55	Update development docs	2022-07-03 22:34:54 -04:00
FloatingGhost	95ef3a8b1e	Use Akkoma modification for collections	2022-07-03 19:36:30 +01:00
norm	74bc22ae50	Update configuration docs (#40) ... Reviewed-on: #40 Co-authored-by: norm <normandy@biribiri.dev> Co-committed-by: norm <normandy@biribiri.dev>	2022-07-03 15:21:21 +00:00
norm	0e344ac8bb	Update administration docs (#39) ... Reviewed-on: #39 Co-authored-by: norm <normandy@biribiri.dev> Co-committed-by: norm <normandy@biribiri.dev>	2022-07-03 15:18:43 +00:00
norm	3ad3a114de	Update install docs (#38) ... Reviewed-on: #38 Co-authored-by: norm <normandy@biribiri.dev> Co-committed-by: norm <normandy@biribiri.dev>	2022-07-02 21:00:01 +00:00
floatingghost	7989b84d01	Merge branch 'develop' into documentation-migration	2022-07-01 12:12:24 +00:00
floatingghost	2937495712	fix ES import from live (#29) ... Reviewed-on: #29	2022-06-30 18:44:31 +00:00
FloatingGhost	bc9e76cce7	Add documentation for ES search	2022-06-30 17:36:57 +01:00
Ekaterina Vaartis	69d5d1a01b	Update meilisearch docs	2022-06-29 20:49:45 +01:00
Ekaterina Vaartis	b7462040cc	Change the meilisearch key auth to conform to 0.25.0	2022-06-29 20:49:45 +01:00
Ekaterina Vaartis	80e52f4d86	Add description for initial_indexing_chunk_size	2022-06-29 20:49:45 +01:00
Ekaterina Vaartis	426cff3372	Update search.md documentation with meilisearch indexing steps	2022-06-29 20:49:45 +01:00
Ekaterina Vaartis	c128798418	Rename Activity.Search to Search.DatabaseSearch	2022-06-29 20:49:44 +01:00
Ekaterina Vaartis	7a9d9cf457	Fix a typo in search docs	2022-06-29 20:48:44 +01:00
Ekaterina Vaartis	9ab0f130cc	Add more documentation about rum to meilisearch docs	2022-06-29 20:48:44 +01:00
Ekaterina Vaartis	375154e5de	Add search/meilisearch documentation	2022-06-29 20:48:29 +01:00
lewdthewides	60eec9d0c5	Instruct users to run 'git pull' as the pleroma user	2022-06-29 20:47:45 +01:00
Ilja	661d0ba481	Also use actor_type to determine if an account is a bot in antiFollowbotPolicy	2022-06-29 20:47:44 +01:00
Tusooa Zhu	dadc4eabf7	Document API addition	2022-06-29 20:46:52 +01:00
FloatingGhost	22090b2fd1	re-add gopher to URLs, fix markdown	2022-06-29 12:12:48 +01:00
FloatingGhost	1c8a2cf901	Update README, add migration docs	2022-06-29 12:05:59 +01:00
FloatingGhost	064c36274c	Purge gopher frontend	2022-06-27 17:31:16 +01:00
floatingghost	e6cd61619f	Purge SSH frontend (#23) ... Reviewed-on: #23	2022-06-27 11:32:06 +00:00
FloatingGhost	0d012ebea1	Revert "Merge branch 'remove/mastofe' into 'develop'" ... This reverts commit 6b3842cf50, reversing changes made to 6b1282a829.	2022-01-08 21:44:37 +00:00
Alex Gleason	e8b340aaa7	Docs: fix various Pleroma API endpoints paths, fix MFA response	2022-01-07 12:51:54 -06:00
marcin mikołajczak	de006443f0	MastoAPI: Profile directory	2021-12-26 02:35:17 +00:00
Alex Gleason	73609211a4	Merge branch 'account-notes' into 'develop' ... MastoAPI: Add user notes on accounts See merge request pleroma/pleroma!3540	2021-12-25 01:41:12 +00:00
Alex Gleason	b96a58ff28	Merge branch 'account-subscriptions' into 'develop' ... MastoAPI: accept notify param in follow request See merge request pleroma/pleroma!3555	2021-12-25 01:34:27 +00:00
Alex Gleason	2caade10df	Merge branch 'add-nodeinfo-doc' into 'develop' ... Add initial Nodeinfo document See merge request pleroma/pleroma!3546	2021-12-23 16:01:03 +00:00
Hakaba Hitoyo	87871ac857	Add initial Nodeinfo document	2021-12-23 16:01:02 +00:00
Alex Gleason	bd853199d9	Merge branch 'v2-suggestions' into 'develop' ... V2 suggestions See merge request pleroma/pleroma!3547	2021-12-19 17:31:17 +00:00
marcin mikołajczak	c96e52b88c	Add 'notifying' to relationship for compatibility with Mastodon ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-12-06 21:24:12 +01:00
Alex Gleason	6c0484d571	AdminAPI: suggest a user through the API	2021-11-26 15:19:01 -06:00
marcin mikołajczak	40414bf177	MastoAPI: Add user notes on accounts ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-11-21 16:56:26 +01:00
lain	e2772d6bf1	Merge branch 'block-behavior' into 'develop' ... Configurable block visibility, fixes #2123 Closes #2123 See merge request pleroma/pleroma!3242	2021-11-15 14:27:59 +00:00
lain	6e3df11693	Merge branch 'instance-deletion' into 'develop' ... AdminAPI: endpoint to delete all content from a remote instance See merge request pleroma/pleroma!3483	2021-11-15 14:24:13 +00:00
partev	ad5da6ae68	fix a typo "Optionnal" -> "Optional"	2021-09-12 15:31:49 +00:00
Haelwenn	6b3842cf50	Merge branch 'remove/mastofe' into 'develop' ... Remove MastoFE from Pleroma, fixes #2625 Closes #2625 See merge request pleroma/pleroma!3392	2021-09-07 16:41:53 +00:00
someone	cc4f20b130	mix pleroma.database set_text_search_config now runs concurrently and infinitely ... Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3514	2021-08-28 18:29:43 +02:00
Haelwenn	689a59f41f	Merge branch 'set_text_search_config_timeout' into 'develop' ... mix pleroma.database set_text_search_config now runs concurrently and infinitely See merge request pleroma/pleroma!3514	2021-08-28 16:11:52 +00:00
Haelwenn	26abe96abf	Merge branch 'docs_add_yunohost_installation' into 'develop' ... Add YunoHost to installation guides See merge request pleroma/pleroma!3497	2021-08-28 16:09:55 +00:00
someone	4b940e441a	mix pleroma.database set_text_search_config now runs concurrently and infinitely	2021-08-15 13:49:12 -04:00
Ilja	1cf89de89a	Make the OPT recomendation clearer ... AFAIK OTP releases are the recomended way of installing, but * People seem unaware of that and use from source installations because they use the guide with the name of their distro * People don't know what OTP releases are or what it means I added a warning on all installation-from-source guides and added the same explanation on the two OTP pages (the miigration to OTP and installing OTP) Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3485	2021-08-13 17:56:20 +02:00
Haelwenn	6c0ebc65fd	Merge branch 'docs_make_otp_recommendation_clearer' into 'develop' ... Make the OPT recomendation clearer See merge request pleroma/pleroma!3485	2021-08-10 06:09:31 +00:00
Ilja	438ad0d3f9	Make the OPT recomendation clearer ... AFAIK OTP releases are the recomended way of installing, but * People seem unaware of that and use from source installations because they use the guide with the name of their distro * People don't know what OTP releases are or what it means I added a warning on all installation-from-source guides and added the same explanation on the two OTP pages (the miigration to OTP and installing OTP)	2021-08-10 06:09:31 +00:00
Ilja	c29fc1aafb	Add YunoHost to installation guides	2021-08-07 12:49:28 +02:00
Ilja	506bf16363	Change docs ... * ./configuration/mrf.md * Change example * ./configuration/cheatsheet.md * Change descriptions to include that a reason is given * CHANGELOG.md * Add as breaking change	2021-08-06 07:59:53 +02:00
Alex Gleason	3674179b26	Merge remote-tracking branch 'pleroma/develop' into instance-deletion	2021-07-17 15:03:43 -05:00
Alex Gleason	54dbcfe02a	AdminAPI: add DELETE /instances/:instance to delete all content from a remote instance	2021-07-17 14:55:05 -05:00
Sean King	5d279a22b1	Merge develop branch upstream	2021-07-10 11:04:16 -06:00
Haelwenn (lanodan) Monnier	822196f393	docs/…/opt_en.md: Reuse /main/ repository url for the /community/ repo	2021-06-11 08:48:35 +02:00
Haelwenn (lanodan) Monnier	17f980e9ab	docs: Remove Erlang Solutions repository	2021-06-11 08:48:35 +02:00
Haelwenn (lanodan) Monnier	6b1f7f2f52	docs: Use one file to describe dependencies	2021-06-11 08:48:35 +02:00
Alex Gleason	fe4c4a7178	MRF: create MRF.Policy behaviour separate from MRF module ... Speeds up recompilation by reducing compile-time deps	2021-06-07 14:22:08 -05:00
Alex Gleason	879c2db0bd	Docs: /api/v1/pleroma/notification_settings --> /api/pleroma/notification_settings	2021-06-07 11:18:14 -05:00
Sean King	dc4814f0cd	Fix merge conflicts with upstream	2021-06-04 14:42:44 -06:00
Haelwenn	a5dce42c85	Merge branch 'chore/rename-chat' into 'develop' ... Rename the non-federating Chat feature to Shout See merge request pleroma/pleroma!2842	2021-06-03 15:52:16 +00:00
feld	275af29302	Merge branch 'Snow-develop-patch-01683' into 'develop' ... Update docs/description for allow_relay See merge request pleroma/pleroma!3438	2021-06-02 16:53:37 +00:00
Mark Felder	679d4c23e9	Update wording for relays in docs and config description	2021-06-02 11:30:09 -05:00
Mark Felder	d6432a65da	Move shout configuration from :instance, update docs and changelog	2021-06-01 11:49:46 -05:00
Haelwenn	a0ba44904a	Merge branch 'docs/goto-libera' into 'develop' ... Changing references of freenode to libera.chat See merge request pleroma/pleroma!3415	2021-05-31 17:42:36 +00:00
Haelwenn (lanodan) Monnier	03232a8223	Changing references of freenode to libera.chat	2021-05-31 17:08:20 +02:00
Alex Gleason	32ae8f4906	Merge remote-tracking branch 'pleroma/develop' into optional-config	2021-05-16 12:27:29 -05:00
Alex Gleason	b540fff908	Docs: use MIX_ENV=prod mix pleroma.instance gen	2021-05-16 12:26:51 -05:00
Alex Gleason	e7ac15905e	Merge remote-tracking branch 'upstream/develop' into oauth-token-id	2021-04-29 12:19:10 -05:00
Alex Gleason	762be6ce10	Merge remote-tracking branch 'upstream/develop' into block-behavior	2021-04-29 11:14:32 -05:00
Mark Felder	7eded72189	Fix incorrect shell command ... Can't be in /opt/pleroma/bin and then call ./bin/pleroma_ctl :)	2021-04-20 12:31:14 -05:00
rinpatch	79376b4afb	Merge branch 'feature/521-pinned-post-federation' into 'develop' ... Pinned posts federation Closes #521 See merge request pleroma/pleroma!3312	2021-04-16 09:53:47 +00:00
Sean King	fa2e62078c	Remove MastoFE configuration stuff	2021-04-15 23:51:04 -06:00
Sean King	f3b403fa98	Remove MastoFE stuff from docs and default panel	2021-04-15 23:37:18 -06:00
Sean King	d9fce0133e	Fix Mastodon interface link	2021-04-14 14:01:33 -06:00
Mark Felder	d29f6d6b6e	Add more details to the cheatsheat for FollowBot MRF	2021-03-30 11:10:44 -05:00
feld	2689463c7e	Apply 1 suggestion(s) to 1 file(s)	2021-03-30 11:10:43 -05:00
Mark Felder	840dc4b44b	Document :mrf_follow_bot	2021-03-30 11:10:34 -05:00
Alexander Strizhakov	3ec1dbd922	Let pins federate ... - save object ids on pin, instead of activity ids - pins federation - removed pinned_activities field from the users table - activityPub endpoint for user pins - pulling remote users pins	2021-03-25 13:03:40 +03:00
Alex Gleason	b6a69b5efd	Return token's primary key with POST /oauth/token	2021-03-24 12:50:05 -05:00
Alexander Strizhakov	03843a5386	migrating config to tmp folder	2021-03-23 14:29:02 +03:00
rinpatch	f930e83fa2	Merge branch 'fix/remove_auto_nsfw' into 'develop' ... Remove sensitive setting #nsfw See merge request pleroma/pleroma!3223	2021-03-19 08:48:22 +00:00
Ivan Tashkinov	882dd46843	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-03-02 08:26:30 +03:00
lain	6a71aa535b	Merge branch 'admin-api-versioning' into 'develop' ... Pleroma APIs versioning Closes #2509 See merge request pleroma/pleroma!3335	2021-02-28 16:22:22 +00:00
Haelwenn (lanodan) Monnier	3bc7d12271	Remove sensitive-property setting #nsfw, create HashtagPolicy	2021-02-27 21:26:17 +01:00
feld	840686ecd5	Merge branch 'fix/2498-expires_in-scheduled-posts' into 'develop' ... expires_in in scheduled status params Closes #2498 See merge request pleroma/pleroma!3315	2021-02-26 16:49:11 +00:00
PestToast	a30126271f	Removed a command that references "pleroma.env". This file does not seem to be generated at any point during the install, and not having it does not stop the instance from working, as far as I can tell.	2021-02-26 01:01:29 +00:00
Haelwenn	870f9cb80c	Merge branch 'docfix/chat-token' into 'develop' ... Update terminology in differences_in_mastoapi_responses.md See merge request pleroma/pleroma!3344	2021-02-24 17:26:26 +00:00