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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									zonk 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f38056d2a1 
								
							 
						 
						
							
							
								
								Update terminology in differences_in_mastoapi_responses.md  
							
							 
							
							
							
						 
						
							2021-02-24 18:16:10 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									AkiraFukushima 
								
							 
						 
						
							
							
							
							
								
							
							
								6ff4ef12fd 
								
							 
						 
						
							
							
								
								Fix URL of Whalebird in docs  
							
							 
							
							
							
						 
						
							2021-02-23 21:31:06 +09:00