rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ffcebe7e22 
								
							 
						 
						
							
							
								
								timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user  
							
							
							
						 
						
							2020-03-01 01:13:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								19e559fe51 
								
							 
						 
						
							
							
								
								Merge branch 'rate-limiter-runtime-settings' into 'develop'  
							
							... 
							
							
							
							RateLimiter improvements: runtime configurability, no default limits in tests
See merge request pleroma/pleroma!2250  
							
						 
						
							2020-02-29 21:52:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								6f2efb1c45 
								
							 
						 
						
							
							
								
								Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.  
							
							
							
						 
						
							2020-02-27 18:46:05 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								4ab07cf0d5 
								
							 
						 
						
							
							
								
								Admin API: Exclude boosts from GET /api/pleroma/admin/users/:nickname/statuses and GET /api/pleroma/admin/instance/:instance/statuses  
							
							
							
						 
						
							2020-02-26 22:35:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								7ad5c51f23 
								
							 
						 
						
							
							
								
								Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope  
							
							
							
						 
						
							2020-02-24 21:46:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								c0146f4859 
								
							 
						 
						
							
							
								
								DOCS Theming your instance  
							
							... 
							
							
							
							I added a new file to explain
* where a custom theme can be created
* where themes can be downloaded
* where to add the theme on the server
* how to make the theme available on the instance
* how to set the theme as default on the instance 
							
						 
						
							2020-02-24 17:48:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								8f0ca19b9c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	config/config.exs 
							
						 
						
							2020-02-22 09:31:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Igeljäger 
								
							 
						 
						
							
							
							
							
								
							
							
								1ed485ec1d 
								
							 
						 
						
							
							
								
								added why doing a vacuum after restoring a backup is so important  
							
							
							
						 
						
							2020-02-21 15:30:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								c5570e0493 
								
							 
						 
						
							
							
								
								Merge branch 'single_emoji_reaction' into 'develop'  
							
							... 
							
							
							
							Single emoji reaction
Closes  #1578 
See merge request pleroma/pleroma!2226  
							
						 
						
							2020-02-20 23:50:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3eddd9caa6 
								
							 
						 
						
							
							
								
								Merge branch 'require-signature' into 'develop'  
							
							... 
							
							
							
							Add an option to require fetches to be signed
Closes  #1444 
See merge request pleroma/pleroma!2071  
							
						 
						
							2020-02-20 12:13:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d536a00d42 
								
							 
						 
						
							
							
								
								Merge branch 'docs_updating' into 'develop'  
							
							... 
							
							
							
							DOCS Add OTP to updating.md
See merge request pleroma/pleroma!2108  
							
						 
						
							2020-02-20 12:03:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								0c65a8c3d0 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation  
							
							... 
							
							
							
							# Conflicts:
#	config/config.exs 
							
						 
						
							2020-02-20 15:00:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e0b2de6385 
								
							 
						 
						
							
							
								
								Merge branch 'feature/new-registrations-digest' into 'develop'  
							
							... 
							
							
							
							New users digest email
Closes  #1514 
See merge request pleroma/pleroma!2128  
							
						 
						
							2020-02-20 11:58:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3af6d3f8e2 
								
							 
						 
						
							
							
								
								Emoji Reactions: Add documentation  
							
							
							
						 
						
							2020-02-19 17:17:05 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								53a7680c16 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'fix/mrf-sample-doc'  
							
							... 
							
							
							
							# Conflicts:
#   docs/configuration/mrf.md 
							
						 
						
							2020-02-18 20:58:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								3416948cdf 
								
							 
						 
						
							
							
								
								Merge branch 'fix/mrf-docs' into 'develop'  
							
							... 
							
							
							
							Fix MRF documentation
See merge request pleroma/pleroma!2187  
							
						 
						
							2020-02-18 20:57:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								61d9f43e46 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation  
							
							
							
						 
						
							2020-02-18 17:46:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c07efd5b42 
								
							 
						 
						
							
							
								
								Merge branch 'need-reboot-flag' into 'develop'  
							
							... 
							
							
							
							need_reboot flag for adminFE
See merge request pleroma/pleroma!2188  
							
						 
						
							2020-02-18 14:32:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								269d592181 
								
							 
						 
						
							
							
								
								[ #1505 ] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).  
							
							
							
						 
						
							2020-02-15 20:41:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								589bffa57d 
								
							 
						 
						
							
							
								
								Merge branch 'fix/mrf-sample-doc' of git.pleroma.social:pleroma/pleroma into fix/mrf-sample-doc  
							
							
							
						 
						
							2020-02-14 11:06:04 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								31749559e1 
								
							 
						 
						
							
							
								
								Fix MRF docs further. I don't think anyone has actually tested with the old docs.  
							
							
							
						 
						
							2020-02-14 11:04:27 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								6caf6a86c5 
								
							 
						 
						
							
							
								
								Apply suggestion to docs/configuration/mrf.md  
							
							
							
						 
						
							2020-02-14 16:55:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								88a76d0142 
								
							 
						 
						
							
							
								
								Update suggested path for location of your custom MRF  
							
							
							
						 
						
							2020-02-14 10:55:18 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2c95b0fab9 
								
							 
						 
						
							
							
								
								Make the sample code actually compile  
							
							
							
						 
						
							2020-02-13 15:19:01 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								24c526a0b1 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge  
							
							
							
						 
						
							2020-02-11 13:58:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2f1c61255f 
								
							 
						 
						
							
							
								
								Merge branch 'doc/unlisted-search' into 'develop'  
							
							... 
							
							
							
							differences_in_mastoapi_responses.md: Add note about unlisted results
Closes  #1164 
See merge request pleroma/pleroma!2195  
							
						 
						
							2020-02-11 11:44:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6875ccb6bf 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/new-registrations-digest  
							
							
							
						 
						
							2020-02-11 13:54:55 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5ebffd5224 
								
							 
						 
						
							
							
								
								Merge branch 'docs/kyclos' into 'develop'  
							
							... 
							
							
							
							clients.md: Add Kyclos
See merge request pleroma/pleroma!2196  
							
						 
						
							2020-02-11 08:04:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								209e4d8432 
								
							 
						 
						
							
							
								
								clients.md: Add Kyclos  
							
							
							
						 
						
							2020-02-11 02:27:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ad16f38b9c 
								
							 
						 
						
							
							
								
								differences_in_mastoapi_responses.md: Add note about unlisted results  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/1164  
							
						 
						
							2020-02-11 01:59:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								94e5ca1105 
								
							 
						 
						
							
							
								
								Merge branch 'issue/1383' into 'develop'  
							
							... 
							
							
							
							[#1383 ] Switch periodic jobs from quantum to oban
See merge request pleroma/pleroma!2015  
							
						 
						
							2020-02-11 00:04:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								a9e946b99a 
								
							 
						 
						
							
							
								
								DOCS Backup/Restore/Migrate your instance  
							
							... 
							
							
							
							* Added "Migrate" to the title because these steps can also be used to migrate the instance to another server
* Added an optional step to reinstall pleroma (esp. for migrating servers)
* Currently the steps threw an error 'could not execute query: ERROR: function "activity_visibility already exists with the same argument types'
   * I added a new step to drop and recreate an empty pleroma-database
   * I played around with the `-c` and `-C` options of pg_restore, but dropping and recreating seemd to be the only way I got it working
   * This was tested on Debian Stretch, psql (PostgreSQL) 9.6.15 
							
						 
						
							2020-02-10 23:53:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								6813c0302c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1383  
							
							
							
						 
						
							2020-02-10 20:49:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dad23e3766 
								
							 
						 
						
							
							
								
								need_reboot flag  
							
							
							
						 
						
							2020-02-08 13:00:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								815f659ed8 
								
							 
						 
						
							
							
								
								Fix MRF documentation  
							
							
							
						 
						
							2020-02-07 22:17:08 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								57098713c0 
								
							 
						 
						
							
							
								
								Apply suggestion to docs/API/pleroma_api.md  
							
							
							
						 
						
							2020-02-07 15:18:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								713645d5c5 
								
							 
						 
						
							
							
								
								Apply suggestion to docs/API/pleroma_api.md  
							
							
							
						 
						
							2020-02-07 15:17:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								ce95882009 
								
							 
						 
						
							
							
								
								EmojiReactions: Add docs and Changelog  
							
							
							
						 
						
							2020-02-07 14:59:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f13b7878b4 
								
							 
						 
						
							
							
								
								Merge branch 'rename_emoji_reactios' into 'develop'  
							
							... 
							
							
							
							EmojiReactions: Rename to EmojiReacts
See merge request pleroma/pleroma!2181  
							
						 
						
							2020-02-07 10:35:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								01da001da1 
								
							 
						 
						
							
							
								
								fix  
							
							
							
						 
						
							2020-02-07 10:48:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								8a79f20c21 
								
							 
						 
						
							
							
								
								EmojiReactions: Rename to EmojiReacts  
							
							
							
						 
						
							2020-02-06 18:09:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								e12bf05f23 
								
							 
						 
						
							
							
								
								Merge branch 'fix/dymamic-docs' into 'develop'  
							
							... 
							
							
							
							Simplify in-database config docs
See merge request pleroma/pleroma!2178  
							
						 
						
							2020-02-06 16:03:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6769ecd948 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into fix/dymamic-docs  
							
							
							
						 
						
							2020-02-06 15:04:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6722dade42 
								
							 
						 
						
							
							
								
								Simplify in-database config docs  
							
							... 
							
							
							
							Large part of it was no longer true (i.e none of the changes need
recompilation anymore and you can't brick an instance by changing them,
it's not necessary to manually truncate the db manually anymore) 
							
						 
						
							2020-02-06 15:00:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c85aa6e87f 
								
							 
						 
						
							
							
								
								removing confusing error  
							
							
							
						 
						
							2020-02-06 12:50:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5db6ac8ee4 
								
							 
						 
						
							
							
								
								removing migrate_from_db endpoint from admin api  
							
							
							
						 
						
							2020-02-05 20:36:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								49e80a1537 
								
							 
						 
						
							
							
								
								Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'  
							
							... 
							
							
							
							Restarting pleroma from outside application
See merge request pleroma/pleroma!2144  
							
						 
						
							2020-02-05 16:59:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								90b862e7ab 
								
							 
						 
						
							
							
								
								Add cheatsheet entry  
							
							
							
						 
						
							2020-02-04 16:22:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								2c40c8b4a2 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1383  
							
							
							
						 
						
							2020-02-03 21:42:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								774cba84f5 
								
							 
						 
						
							
							
								
								Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop'  
							
							... 
							
							
							
							Re-enable rate limiter and enable remote ip
See merge request pleroma/pleroma!2164  
							
						 
						
							2020-01-30 18:47:44 +00:00