feld 
								
							 
						 
						
							
							
							
							
								
							
							
								3f65f2ea79 
								
							 
						 
						
							
							
								
								Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'  
							
							... 
							
							
							
							Support for hosts with scheme in MediaProxy whitelist setting
Closes  #1922 
See merge request pleroma/pleroma!2754  
							
						 
						
							2020-07-14 18:07:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								2909dc873b 
								
							 
						 
						
							
							
								
								Merge branch '1940-admin-token-oauthless-auth' into 'develop'  
							
							... 
							
							
							
							[#1940 ] Reinstated OAuth-less `admin_token` authentication
Closes  #1940 
See merge request pleroma/pleroma!2760  
							
						 
						
							2020-07-14 16:48:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								8d56fb6d22 
								
							 
						 
						
							
							
								
								Migrate in-db config after updating to Oban 2.0  
							
							
							
						 
						
							2020-07-14 13:15:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								9b225db7d8 
								
							 
						 
						
							
							
								
								[ #1940 ] Applied rate limit for requests with bad admin_token. Added doc warnings on admin_token setting.  
							
							
							
						 
						
							2020-07-14 11:58:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								442fe3cd45 
								
							 
						 
						
							
							
								
								Show examples for both OTP and source  
							
							
							
						 
						
							2020-07-13 09:56:05 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								0871e8b8fe 
								
							 
						 
						
							
							
								
								Make the query more precise  
							
							
							
						 
						
							2020-07-12 10:43:24 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								133004e22d 
								
							 
						 
						
							
							
								
								Improve database config migration and add documentation  
							
							
							
						 
						
							2020-07-12 10:38:07 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b376442325 
								
							 
						 
						
							
							
								
								MediaProxy whitelist setting now supports hosts with scheme  
							
							... 
							
							
							
							added deprecation warning about using bare domains 
							
						 
						
							2020-07-12 12:41:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								11dd29ef3f 
								
							 
						 
						
							
							
								
								Merge branch 'feature/upload-filter-exiftool' into 'develop'  
							
							... 
							
							
							
							Add Pleroma.Upload.Filter.Exiftool
Closes  #1935 
See merge request pleroma/pleroma!2744  
							
						 
						
							2020-07-11 11:31:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								d885540590 
								
							 
						 
						
							
							
								
								docs: API: fix update_credentials endpoints path, clarify update/verify_credentials endpoints paths  
							
							
							
						 
						
							2020-07-11 11:02:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6167593881 
								
							 
						 
						
							
							
								
								Support Exiftool for stripping EXIF data  
							
							... 
							
							
							
							We really only want to strip location data anyway, and mogrify strips color profiles. 
							
						 
						
							2020-07-10 16:46:26 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								167a619432 
								
							 
						 
						
							
							
								
								Merge branch 'fix/1924-s3-descriptions' into 'develop'  
							
							... 
							
							
							
							docs and descriptions for s3 settings
Closes  #1924 
See merge request pleroma/pleroma!2745  
							
						 
						
							2020-07-10 16:42:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b39eb6ecc5 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information  
							
							
							
						 
						
							2020-07-10 12:26:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								48f98a2748 
								
							 
						 
						
							
							
								
								Merge branch 'mix-tasks-improvement' into 'develop'  
							
							... 
							
							
							
							Mix tasks improvement
See merge request pleroma/pleroma!2723  
							
						 
						
							2020-07-10 08:58:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b1b8f5f11a 
								
							 
						 
						
							
							
								
								docs and descriptions for s3 settings  
							
							
							
						 
						
							2020-07-10 09:16:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c2edfd16e0 
								
							 
						 
						
							
							
								
								fix for user revoke invite task  
							
							
							
						 
						
							2020-07-09 18:59:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f4469dc741 
								
							 
						 
						
							
							
								
								Merge branch 'features/favicons' into 'develop'  
							
							... 
							
							
							
							Add support for remote favicons
See merge request pleroma/pleroma!2261  
							
						 
						
							2020-07-09 13:09:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								393a588265 
								
							 
						 
						
							
							
								
								Merge branch 'patch-1' into 'develop'  
							
							... 
							
							
							
							added link to changelog, removed repetition
See merge request pleroma/pleroma!2736  
							
						 
						
							2020-07-09 09:42:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Dym Sohin 
								
							 
						 
						
							
							
							
							
								
							
							
								6465257e1f 
								
							 
						 
						
							
							
								
								missed : (colon) before mrf_steal_emoji  
							
							
							
						 
						
							2020-07-09 09:23:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Dym Sohin 
								
							 
						 
						
							
							
							
							
								
							
							
								6e54972252 
								
							 
						 
						
							
							
								
								added link to changelog, removed repetition  
							
							
							
						 
						
							2020-07-09 03:15:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6335b32aa8 
								
							 
						 
						
							
							
								
								Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'  
							
							... 
							
							
							
							[#1895 ] Made hashtag timeline respect `:restrict_unauthenticated` instance setting
Closes  #1895 
See merge request pleroma/pleroma!2731  
							
						 
						
							2020-07-08 10:55:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								31fef95e35 
								
							 
						 
						
							
							
								
								Add changelog and documentation  
							
							
							
						 
						
							2020-07-08 06:29:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								312fc55f14 
								
							 
						 
						
							
							
								
								Add [:instances_favicons, :enabled] setting, defaults to false  
							
							
							
						 
						
							2020-07-08 06:28:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								20461137a3 
								
							 
						 
						
							
							
								
								[ #1895 ] Documentation hints on private instances and instance/restrict_unauthenticated setting.  
							
							
							
						 
						
							2020-07-07 20:44:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3e08e77151 
								
							 
						 
						
							
							
								
								[ #1895 ] Made hashtag timeline respect :restrict_unauthenticated instance setting.  
							
							
							
						 
						
							2020-07-07 20:37:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1adda637d3 
								
							 
						 
						
							
							
								
								Docs: Document resetting of images  
							
							
							
						 
						
							2020-07-07 16:53:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								729506c56a 
								
							 
						 
						
							
							
								
								Docs: document instance differences  
							
							
							
						 
						
							2020-07-06 11:16:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2e21ae1b6d 
								
							 
						 
						
							
							
								
								Docs: Add description limits to cheat sheet  
							
							
							
						 
						
							2020-07-06 11:08:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								01695716c8 
								
							 
						 
						
							
							
								
								Docs: Document accepts_chat_messages setting.  
							
							
							
						 
						
							2020-07-03 15:55:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b374fd622b 
								
							 
						 
						
							
							
								
								Docs: Document the added accepts_chat_messages user property.  
							
							
							
						 
						
							2020-07-03 14:24:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								02d855b2b9 
								
							 
						 
						
							
							
								
								Document the new API extension of /api/v1/instance  
							
							
							
						 
						
							2020-07-02 12:59:45 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								577da132da 
								
							 
						 
						
							
							
								
								Merge branch '1031-parent-visible' into 'develop'  
							
							... 
							
							
							
							Resolve "Add `pleroma.parent_visible` to the status view"
Closes  #1031 
See merge request pleroma/pleroma!2679  
							
						 
						
							2020-06-29 08:39:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								efb5d64e50 
								
							 
						 
						
							
							
								
								differences_in_mastoapi_responses: Update account fields  
							
							
							
						 
						
							2020-06-29 02:40:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								28d4e60f66 
								
							 
						 
						
							
							
								
								MastoAPI differences: Document not implemented features  
							
							
							
						 
						
							2020-06-25 12:32:06 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								637bae42b4 
								
							 
						 
						
							
							
								
								Docs: Document added parent_visible field.  
							
							
							
						 
						
							2020-06-24 13:31:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								1471b70ef1 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2020-06-23 20:56:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								c7d69e9256 
								
							 
						 
						
							
							
								
								Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'  
							
							... 
							
							
							
							Moving mrf settings from instance to separate mrf group
Closes  #1631 
See merge request pleroma/pleroma!2320  
							
						 
						
							2020-06-23 16:38:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								59e2a1018a 
								
							 
						 
						
							
							
								
								Merge branch 'fix_1586_provide_index_md' into 'develop'  
							
							... 
							
							
							
							Fix 1586 provide index md
See merge request pleroma/pleroma!2669  
							
						 
						
							2020-06-23 10:06:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								31489bc864 
								
							 
						 
						
							
							
								
								Merge branch 'docs_use_include_for_install_further_reading' into 'develop'  
							
							... 
							
							
							
							Add include for the "Further reading" section
See merge request pleroma/pleroma!2667  
							
						 
						
							2020-06-22 12:35:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8b5bdd164e 
								
							 
						 
						
							
							
								
								Merge branch 'fix/1825-admin-api-error-codes' into 'develop'  
							
							... 
							
							
							
							Proper error codes for error in adminFE
Closes  #1825 
See merge request pleroma/pleroma!2665  
							
						 
						
							2020-06-22 12:25:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								499324f7be 
								
							 
						 
						
							
							
								
								Removed a space that was too much  
							
							
							
						 
						
							2020-06-22 14:22:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								1e089cdf29 
								
							 
						 
						
							
							
								
								I forgot to git add some files, oops (should be squashed with MR)  
							
							
							
						 
						
							2020-06-22 14:18:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								a3b10a4f64 
								
							 
						 
						
							
							
								
								Fix 1586 Docs: provide a index.md  
							
							... 
							
							
							
							* I renamed the introduction.md to index.md
* I moved over the FE parts to an index file in the FE repo (will do an MR in the FE repo to actually add it)
* While I was at it, I also fixed some broken links 
							
						 
						
							2020-06-22 14:13:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								9f7ee5dfa2 
								
							 
						 
						
							
							
								
								Add include for the "Further reading" section  
							
							... 
							
							
							
							* I added an include and use this include for the installation guides that already had this section
* I added the "Further reading" section as well as te "Questions" section to the English guides that didn't have it yet
* I added a first point "How Federation Works/Why is my Federated Timeline empty?" to link to lains blogpost about this because we still get this question a lot in the #pleroma support channel
* I reordered the list a bit 
							
						 
						
							2020-06-22 11:41:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								93ae1c8bd3 
								
							 
						 
						
							
							
								
								Merge branch 'feature/1854-emoji-pagination' into 'develop'  
							
							... 
							
							
							
							Emoji and packs pagination
Closes  #1854 
See merge request pleroma/pleroma!2658  
							
						 
						
							2020-06-22 08:41:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c5863438ba 
								
							 
						 
						
							
							
								
								proper error codes for error in adminFE  
							
							
							
						 
						
							2020-06-20 13:53:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								15ba539258 
								
							 
						 
						
							
							
								
								cheatsheet.md: no_attachment_links → attachment_links  
							
							
							
						 
						
							2020-06-20 11:39:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								02ca8a363f 
								
							 
						 
						
							
							
								
								default page size for files  
							
							
							
						 
						
							2020-06-19 14:46:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3e3f9253e6 
								
							 
						 
						
							
							
								
								adding overall count for packs and files  
							
							
							
						 
						
							2020-06-19 10:17:24 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4975ed86bc 
								
							 
						 
						
							
							
								
								emoji pagination for pack show action  
							
							
							
						 
						
							2020-06-18 18:50:03 +03:00