Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								a8d967762e
								
							
						 | 
						
							
							
								
								migrate to oban 2.0-rc1
							
							
							
							
							
						 | 
						
							2020-06-23 15:09:01 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								bf8310f380
								
							
						 | 
						
							
							
								
								Add missing default config value for :instance, instance_thumbnail
							
							
							
							
							
							
							
							Follows up on b7fc61e17b 
							
						 | 
						
							2020-06-22 17:35:02 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								3462d4b995
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into issue/1855
							
							
							
							
							
						 | 
						
							2020-06-17 12:50:06 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								579763126f
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into issue/1855
							
							
							
							
							
						 | 
						
							2020-06-15 15:24:55 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								58e4e3db8b
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
							
							
							
							
							
						 | 
						
							2020-06-15 16:03:40 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								2e8a236cef
								
							
						 | 
						
							
							
								
								fix invalidates media url's
							
							
							
							
							
						 | 
						
							2020-06-14 21:02:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
							
							
								
							
							
								cb7be6eef2
								
							
						 | 
						
							
							
								
								Remove use of atoms in MRF.UserAllowListPolicy
							
							
							
							
							
						 | 
						
							2020-06-13 12:08:46 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								697cf92024
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
							
							
							
							
							
						 | 
						
							2020-06-12 18:25:29 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4655407451
								
							
						 | 
						
							
							
								
								Apply suggestion to config/description.exs
							
							
							
							
							
						 | 
						
							2020-06-12 14:03:33 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								1f35acce54
								
							
						 | 
						
							
							
								
								Merge OGP parser with TwitterCard
							
							
							
							
							
						 | 
						
							2020-06-11 17:57:31 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								da22119c2f
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into global-status-expiration
							
							
							
							
							
						 | 
						
							2020-06-08 17:21:47 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								6977500ef7
								
							
						 | 
						
							
							
								
								Merge branch 'tagline' into 'develop'
							
							
							
							
							
							
							
							Update default instance description
See merge request pleroma/pleroma!2600 
							
						 | 
						
							2020-06-02 14:10:53 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a7627bdc7a
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into global-status-expiration
							
							
							
							
							
						 | 
						
							2020-06-01 15:48:51 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								ac31f687c0
								
							
						 | 
						
							
							
								
								Config: Default to Hackney again
							
							
							
							
							
							
							
							Gun needs some server setting changes (files) and has problems with
OTP 23 (wildcards), so use Hackney as a default again for now. 
							
						 | 
						
							2020-06-01 13:35:39 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								d4a18d44fe
								
							
						 | 
						
							
							
								
								Update default instance description
							
							
							
							
							
						 | 
						
							2020-05-28 11:56:30 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								337ca33e5e
								
							
						 | 
						
							
							
								
								Config: Restore old new background image
							
							
							
							
							
							
							
							Became lost in a settings restructure 
							
						 | 
						
							2020-05-26 16:00:56 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roman Chvanikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								8eb1dfadca
								
							
						 | 
						
							
							
								
								Update CHANGELOG and docs
							
							
							
							
							
						 | 
						
							2020-05-22 18:30:13 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roman Chvanikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								cc82229ba7
								
							
						 | 
						
							
							
								
								Add filename_display_max_length config
							
							
							
							
							
						 | 
						
							2020-05-22 18:19:25 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								b7fc61e17b
								
							
						 | 
						
							
							
								
								Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
							
							
							
							
							
						 | 
						
							2020-05-21 04:41:42 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								42b06d78df
								
							
						 | 
						
							
							
								
								Merge branch 'chore/update-config-fe' into 'develop'
							
							
							
							
							
							
							
							Synchronize :fe settings in config.exs
See merge request pleroma/pleroma!2560 
							
						 | 
						
							2020-05-20 17:45:19 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c48626585
								
							
						 | 
						
							
							
								
								Also add new sidebarRight setting
							
							
							
							
							
						 | 
						
							2020-05-20 12:22:31 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								94ba5a7802
								
							
						 | 
						
							
							
								
								Merge branch 'exposed-background-image' into 'develop'
							
							
							
							
							
							
							
							InstanceView: Expose background image link.
See merge request pleroma/pleroma!2545 
							
						 | 
						
							2020-05-20 10:53:54 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								6dd1575c64
								
							
						 | 
						
							
							
								
								Merge branch 'issue/1509' into 'develop'
							
							
							
							
							
							
							
							[#1509]  purge media from cache after delete
See merge request pleroma/pleroma!2539 
							
						 | 
						
							2020-05-20 10:35:36 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								918ee46417
								
							
						 | 
						
							
							
								
								Synchronize :fe settings in config.exs
							
							
							
							
							
						 | 
						
							2020-05-19 16:05:39 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								188b32145e
								
							
						 | 
						
							
							
								
								InstanceView: Expose background image link.
							
							
							
							
							
							
							
							This will make it easier for more clients to support this feature. 
							
						 | 
						
							2020-05-18 13:29:30 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								c33a4315fb
								
							
						 | 
						
							
							
								
								updated docs
							
							
							
							
							
						 | 
						
							2020-05-18 06:48:19 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								64b3d81e50
								
							
						 | 
						
							
							
								
								Merge branch 'feature/remove-settings-that-shouldnt-be-altered' into 'develop'
							
							
							
							
							
							
							
							Remove settings that shouldn't be altered
Closes admin-fe#110
See merge request pleroma/pleroma!2540 
							
						 | 
						
							2020-05-17 07:48:52 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4b28d812cf
								
							
						 | 
						
							
							
								
								Merge branch 'restricted-relations-embedding' into 'develop'
							
							
							
							
							
							
							
							Restricted support for embedded relationships
See merge request pleroma/pleroma!2456 
							
						 | 
						
							2020-05-17 07:26:51 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								3f8d68bdf3
								
							
						 | 
						
							
							
								
								added example cache purge script
							
							
							
							
							
						 | 
						
							2020-05-17 05:56:20 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Angelina Filippova
								
							 
						 | 
						
							
							
							
							
								
							
							
								4a925b964a
								
							
						 | 
						
							
							
								
								Remove description of the settings that should't be altered
							
							
							
							
							
						 | 
						
							2020-05-16 20:39:42 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								cb40602a16
								
							
						 | 
						
							
							
								
								added media proxy invalidation
							
							
							
							
							
						 | 
						
							2020-05-15 21:39:42 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								54b4824186
								
							
						 | 
						
							
							
								
								Lint
							
							
							
							
							
						 | 
						
							2020-05-13 17:07:14 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								6f53d8815e
								
							
						 | 
						
							
							
								
								Clarify where the Features panel is
							
							
							
							
							
						 | 
						
							2020-05-13 16:57:33 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								2560a4aa56
								
							
						 | 
						
							
							
								
								Formatting
							
							
							
							
							
						 | 
						
							2020-05-13 16:51:23 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								0c82a967ec
								
							
						 | 
						
							
							
								
								Add missing showFeaturesPanel setting
							
							
							
							
							
						 | 
						
							2020-05-13 16:49:56 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								5131149056
								
							
						 | 
						
							
							
								
								add postContentType setting
							
							
							
							
							
						 | 
						
							2020-05-13 16:45:16 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								52a95a0265
								
							
						 | 
						
							
							
								
								Add missing nsfwCensorImage option
							
							
							
							
							
						 | 
						
							2020-05-13 16:40:04 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								923ab78807
								
							
						 | 
						
							
							
								
								Add missing hideSitename setting
							
							
							
							
							
						 | 
						
							2020-05-13 16:36:33 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								c86cdb76a7
								
							
						 | 
						
							
							
								
								Add hideFilteredStatuses and hideMutedPosts settings
							
							
							
							
							
						 | 
						
							2020-05-13 16:35:12 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								7f00698c3b
								
							
						 | 
						
							
							
								
								Add greentext option
							
							
							
							
							
						 | 
						
							2020-05-13 16:32:38 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								38fb5eaf6a
								
							
						 | 
						
							
							
								
								formattingOptionsEnabled no longer exists
							
							
							
							
							
						 | 
						
							2020-05-13 16:31:15 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								4bdde143f9
								
							
						 | 
						
							
							
								
								Add disableChat option
							
							
							
							
							
						 | 
						
							2020-05-13 16:30:24 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								2420d7f439
								
							
						 | 
						
							
							
								
								Spelling/grammar
							
							
							
							
							
						 | 
						
							2020-05-13 16:26:49 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								4aad764c1d
								
							
						 | 
						
							
							
								
								enableEmojiPicker is not a setting
							
							
							
							
							
						 | 
						
							2020-05-13 16:24:37 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								2e28b50132
								
							
						 | 
						
							
							
								
								scopeOptionsEnabled has been replaced with minimalScopesMode
							
							
							
							
							
						 | 
						
							2020-05-13 16:23:42 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								e2c80e62f1
								
							
						 | 
						
							
							
								
								Stickers setting does not exist
							
							
							
							
							
						 | 
						
							2020-05-13 16:19:17 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								1e48aee50e
								
							
						 | 
						
							
							
								
								Alpha sort FE config descriptions
							
							
							
							
							
						 | 
						
							2020-05-13 16:18:26 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								1b93581162
								
							
						 | 
						
							
							
								
								Synchronize suggestions with all available static/config.json settings
							
							
							
							
							
						 | 
						
							2020-05-13 16:03:42 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								fd2fb2bb2e
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/web/mastodon_api/controllers/status_controller.ex
#	lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
#	test/web/mastodon_api/controllers/timeline_controller_test.exs
#	test/web/mastodon_api/views/status_view_test.exs 
							
						 | 
						
							2020-05-13 12:42:36 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								da6a38d205
								
							
						 | 
						
							
							
								
								copy/paste fix for descriptions
							
							
							
							
							
						 | 
						
							2020-05-11 09:35:20 +03:00 | 
						
						
							
							
							
								
							
							
						 |