eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								c140cc7bf3 
								
							 
						 
						
							
							
								
								Update the documentation to use make it use /api/v1/pleroma instead of /api/pleroma  
							
							
							
						 
						
							2021-02-22 04:33:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								239057155f 
								
							 
						 
						
							
							
								
								[ #3286 ] Documentation on configuring Pleroma as OAuth 2.0 provider.  
							
							
							
						 
						
							2021-01-29 16:36:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								003402df40 
								
							 
						 
						
							
							
								
								Add ability to invalidate cache entries for Apache  
							
							
							
						 
						
							2021-01-21 14:20:13 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6d48144a9d 
								
							 
						 
						
							
							
								
								use proper naming  
							
							... 
							
							
							
							for MediaProxyWarmingPolicy in ConcurrentLimiter 
							
						 
						
							2021-01-21 09:50:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dece31a031 
								
							 
						 
						
							
							
								
								Update docs  
							
							
							
						 
						
							2021-01-21 09:47:22 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b4ff63d020 
								
							 
						 
						
							
							
								
								configurable limits for ConcurrentLimiter  
							
							... 
							
							
							
							Pleroma.Web.RichMedia.Helpers & Pleroma.Web.MediaProxy 
							
						 
						
							2021-01-21 09:47:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								8b28dce82a 
								
							 
						 
						
							
							
								
								Deprecate Pleroma.Uploaders.S3, :public_endpoint  
							
							
							
						 
						
							2021-01-12 16:31:35 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f6c22f4d08 
								
							 
						 
						
							
							
								
								Cheatsheet: Add docs about reset token expiration  
							
							
							
						 
						
							2020-11-19 12:28:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								2c55f7d7cb 
								
							 
						 
						
							
							
								
								Remove FedSockets  
							
							... 
							
							
							
							Current FedSocket implementation has a bunch of problems. It doesn't
have proper error handling (in case of an error the server just doesn't
respond until the connection is closed, while the client doesn't match
any error messages and just assumes there has been an error after 15s)
and the code is full of bad descisions (see: fetch registry which uses
uuids for no reason and waits for a response by recursively querying a
 ets table until the value changes, or double JSON encoding).
Sometime ago I almost completed rewriting fedsockets from scrach to
adress these issues. However, while doing so, I realized that fedsockets
 are just too overkill for what they were trying to accomplish, which is
 reduce the overhead of federation by not signing every message.
This could be done without reimplementing failure states and endpoint
 logic we already have with HTTP by, for example, using TLS cert auth,
or switching to a more performant signature algorithm. I opened
https://git.pleroma.social/pleroma/pleroma/-/issues/2262  for further
discussion on alternatives to fedsockets.
From discussions I had with other Pleroma developers it seems like they
 would approve the descision to remove them as well,
therefore I am submitting this patch. 
							
						 
						
							2020-11-17 17:28:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4a2d7a7a5d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into feature/account-export  
							
							
							
						 
						
							2020-10-28 15:33:36 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ad605e3e16 
								
							 
						 
						
							
							
								
								Rename Pleroma.Backup to Pleroma.User.Backup  
							
							
							
						 
						
							2020-10-20 17:16:58 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								1b8fd7e65a 
								
							 
						 
						
							
							
								
								Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts  
							
							
							
						 
						
							2020-10-16 17:36:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								1fb9452131 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/account-export  
							
							
							
						 
						
							2020-10-14 15:27:15 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4c4ea9a348 
								
							 
						 
						
							
							
								
								changes after rebase  
							
							
							
						 
						
							2020-10-13 17:10:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3be8ab5103 
								
							 
						 
						
							
							
								
								RemoteIp module name  
							
							
							
						 
						
							2020-10-13 16:43:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e52dd62e14 
								
							 
						 
						
							
							
								
								Add configurable temporary directory  
							
							
							
						 
						
							2020-10-07 18:34:30 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								27bc121ec0 
								
							 
						 
						
							
							
								
								Require email  
							
							
							
						 
						
							2020-10-07 18:34:30 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3ad7492f9d 
								
							 
						 
						
							
							
								
								Add config for Pleroma.Backup  
							
							
							
						 
						
							2020-10-07 18:34:29 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								b90eda3d8b 
								
							 
						 
						
							
							
								
								Improve description yet again  
							
							
							
						 
						
							2020-10-06 17:36:29 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e08eb4aba0 
								
							 
						 
						
							
							
								
								Don't leak internal variables in the docs. They're useless to users.  
							
							
							
						 
						
							2020-10-06 17:29:56 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								b8c05f4876 
								
							 
						 
						
							
							
								
								Improve descriptions for reserved and proxies  
							
							
							
						 
						
							2020-10-06 17:21:27 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								7aff2b47c5 
								
							 
						 
						
							
							
								
								Fix docs for default headers used by RemoteIp. We only use X-Forwarded-For by default.  
							
							
							
						 
						
							2020-10-06 15:47:11 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								6c052bd5b6 
								
							 
						 
						
							
							
								
								Merge branch 'media-preview-proxy-nostream' into 'develop'  
							
							... 
							
							
							
							Media preview proxy
See merge request pleroma/pleroma!3001  
							
						 
						
							2020-09-18 18:38:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Steven Fuchs 
								
							 
						 
						
							
							
							
							
								
							
							
								f2ef9735c5 
								
							 
						 
						
							
							
								
								Federate data through persistent websocket connections  
							
							
							
						 
						
							2020-09-18 11:58:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								7cdbd91d83 
								
							 
						 
						
							
							
								
								[ #2497 ] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.  
							
							
							
						 
						
							2020-09-17 17:13:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								0b5e72ecf0 
								
							 
						 
						
							
							
								
								Remove :managed_config option.  
							
							... 
							
							
							
							In practice, it was already removed half a year ago, but the description
 and cheatsheet entries were still there.
The migration intentionally does not use ConfigDB.get_by_params, since
this will break migration code as soon as we add a new field is added
 to ConfigDB.
Closes  #2086  
							
						 
						
							2020-09-14 18:04:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								40c847dc2a 
								
							 
						 
						
							
							
								
								Spelling  
							
							... 
							
							
							
							Reported by:	trevoke 
							
						 
						
							2020-09-11 17:42:39 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								a098e10fd6 
								
							 
						 
						
							
							
								
								Document ephemeral activity changes better  
							
							... 
							
							
							
							Also remove the example from the cheatsheet, there is no need for it
when the types are simple 
							
						 
						
							2020-09-10 21:52:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								2c2094d4b2 
								
							 
						 
						
							
							
								
								configurable lifetime for ephemeral activities  
							
							
							
						 
						
							2020-09-10 21:51:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7dd986a563 
								
							 
						 
						
							
							
								
								expire mfa tokens  through Oban  
							
							
							
						 
						
							2020-09-10 16:01:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								96697db3bc 
								
							 
						 
						
							
							
								
								RelMe and Feed no longer configurable  
							
							
							
						 
						
							2020-09-08 20:21:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								21efda2edb 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted  
							
							
							
						 
						
							2020-09-08 09:31:26 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								efff2caccc 
								
							 
						 
						
							
							
								
								docs: cheatsheet: add ForceBotUnlistedPolicy  
							
							
							
						 
						
							2020-09-08 11:34:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a83916fdac 
								
							 
						 
						
							
							
								
								adapter options unification  
							
							... 
							
							
							
							not needed options deletion 
							
						 
						
							2020-09-07 19:59:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								19691389b9 
								
							 
						 
						
							
							
								
								Rich media: Add failure tracking  
							
							
							
						 
						
							2020-09-02 14:59:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b76839e008 
								
							 
						 
						
							
							
								
								Cheatsheet: Remove misleading example  
							
							
							
						 
						
							2020-08-26 13:53:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c1d51944c7 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads  
							
							
							
						 
						
							2020-08-25 11:44:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								368fd04b47 
								
							 
						 
						
							
							
								
								Cheatsheet: Add information about filename descriptions  
							
							
							
						 
						
							2020-08-18 13:22:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								60ac83a4c1 
								
							 
						 
						
							
							
								
								[ #2046 ] Added test for pleroma/restrict_unauthenticated defaults on private instance. Updated docs and changelog.  
							
							
							
						 
						
							2020-08-15 18:30:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								091da10832 
								
							 
						 
						
							
							
								
								Add the ActivityExpirationPolicy MRF to docs and clarify post expiration criteria.  
							
							
							
						 
						
							2020-08-12 11:00:01 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								54e2af8293 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into fix/ldap-auth-issues  
							
							
							
						 
						
							2020-08-07 14:55:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								60fe0a08f0 
								
							 
						 
						
							
							
								
								Docs: Remove wrong / confusing auth docs.  
							
							
							
						 
						
							2020-08-07 17:59:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6ddea8ebe8 
								
							 
						 
						
							
							
								
								Add a note about the proper value for uid  
							
							
							
						 
						
							2020-08-07 09:42:10 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								532d6f94ae 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads  
							
							
							
						 
						
							2020-08-04 15:10:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								28584bb224 
								
							 
						 
						
							
							
								
								Merge branch 'email-blacklist' into 'develop'  
							
							... 
							
							
							
							Add email blacklist, fixes  #1404 
Closes  #1404 
See merge request pleroma/pleroma!2837  
							
						 
						
							2020-08-04 11:00:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e3953923ac 
								
							 
						 
						
							
							
								
								Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop'  
							
							... 
							
							
							
							fixes 1957 Add option to send user chatmessage instead of dm
Closes  #1957 
See merge request pleroma/pleroma!2782  
							
						 
						
							2020-08-03 21:01:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dc88b6f091 
								
							 
						 
						
							
							
								
								Add email blacklist,  fixes   #1404  
							
							
							
						 
						
							2020-08-02 14:53:42 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								f671d7e68c 
								
							 
						 
						
							
							
								
								Add welcome chatmessages  
							
							... 
							
							
							
							* I added the option in config/config.exs
* created a new module lib/pleroma/user/welcome_chat_message.ex
* Added it to the registration flow
* added to the cheatsheet
* added to the config/description.ex
* added to the Changelog.md 
							
						 
						
							2020-08-02 15:54:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4b18a07392 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'revert-1ac0969c' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !2825  
							
						 
						
							2020-07-31 15:18:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								010d77ec85 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'mrf-silence-2' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !2820  
							
						 
						
							2020-07-31 15:17:09 +00:00