Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								51ab8d0128
								
							
						 | 
						
							
							
								
								Add account_approval_required instance setting
							
							
							
							
							
						 | 
						
							2020-07-12 20:27:58 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								d6f67fa91b
								
							
						 | 
						
							
							
								
								Merge branch 'issue/1790-updated-oban' into 'develop'
							
							
							
							
							
							
							
							[#1790] updated oban to 2.0.0
See merge request pleroma/pleroma!2674 
							
						 | 
						
							2020-07-10 17:39:46 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								3c0c1fd2ef
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into issue/1790-updated-oban
							
							
							
							
							
						 | 
						
							2020-07-10 11:34:53 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b1b8f5f11a
								
							
						 | 
						
							
							
								
								docs and descriptions for s3 settings
							
							
							
							
							
						 | 
						
							2020-07-10 09:16:53 +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
								
							 
						 | 
						
							
							
							
							
								
							
							
								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
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								312fc55f14
								
							
						 | 
						
							
							
								
								Add [:instances_favicons, :enabled] setting, defaults to false
							
							
							
							
							
						 | 
						
							2020-07-08 06:28:40 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								8939ff39e4
								
							
						 | 
						
							
							
								
								Merge branch 'remove-twitter-api' into 'develop'
							
							
							
							
							
							
							
							Remove some TwitterAPI endpoints
See merge request pleroma/pleroma!2327 
							
						 | 
						
							2020-07-07 18:26:07 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								20461137a3
								
							
						 | 
						
							
							
								
								[#1895] Documentation hints on private instances and instance/restrict_unauthenticated setting.
							
							
							
							
							
						 | 
						
							2020-07-07 20:44:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									DYM
								
							 
						 | 
						
							
							
							
							
								
							
							
								a784c09db8
								
							
						 | 
						
							
							
								
								added hyper:// to default protocols
							
							
							
							
							
						 | 
						
							2020-07-07 09:05:54 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								65fd28e0c4
								
							
						 | 
						
							
							
								
								Config: Remove Statusnet preloader.
							
							
							
							
							
						 | 
						
							2020-07-06 12:25:25 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								af7720237b
								
							
						 | 
						
							
							
								
								Upload: Restrict description length
							
							
							
							
							
						 | 
						
							2020-07-06 11:08:13 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								4695bdd81b
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into issue/1790-updated-oban
							
							
							
							
							
						 | 
						
							2020-07-03 10:36:41 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								80076f1974
								
							
						 | 
						
							
							
								
								Lint, long lines
							
							
							
							
							
						 | 
						
							2020-07-02 10:33:27 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								d169e51b7e
								
							
						 | 
						
							
							
								
								Improve descriptions, move primary MRF settings to top for AdminFE ordering
							
							
							
							
							
						 | 
						
							2020-07-02 10:27:15 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								6b5563ed2c
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/1885-MRF-metadata
							
							
							
							
							
						 | 
						
							2020-07-02 09:57:57 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								d884b6f704
								
							
						 | 
						
							
							
								
								Merge branch 'feature/update-description' into 'develop'
							
							
							
							
							
							
							
							Update settings descriptions and labels
See merge request pleroma/pleroma!2709 
							
						 | 
						
							2020-07-02 08:43:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Angelina Filippova
								
							 
						 | 
						
							
							
							
							
								
							
							
								df2d6564d5
								
							
						 | 
						
							
							
								
								Add labels, update descriptions and labels
							
							
							
							
							
						 | 
						
							2020-07-01 03:01:15 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								0313520cd2
								
							
						 | 
						
							
							
								
								Config: Reduce default preloaders to configuration endpoints.
							
							
							
							
							
							
							
							Fetching the timeline is a bit heavy to do by default. 
							
						 | 
						
							2020-06-27 12:18:37 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f89390110b
								
							
						 | 
						
							
							
								
								added tab & labels for mrf policies
							
							
							
							
							
						 | 
						
							2020-06-27 12:18:34 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e7bc0273e5
								
							
						 | 
						
							
							
								
								additional data to MRF policies in descriptions
							
							
							
							
							
						 | 
						
							2020-06-26 15:22:08 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								91cd023720
								
							
						 | 
						
							
							
								
								Pleroma.Upload.Filter.Mogrify args description
							
							
							
							
							
						 | 
						
							2020-06-26 09:03:07 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								8288419686
								
							
						 | 
						
							
							
								
								Merge branch 'preload-data' into 'develop'
							
							
							
							
							
							
							
							Preload data into index.html
Closes #1660
See merge request pleroma/pleroma!2381 
							
						 | 
						
							2020-06-25 21:35:39 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								1d0804b49f
								
							
						 | 
						
							
							
								
								Merge branch 'chore/remove-reference-to-distsn' into 'develop'
							
							
							
							
							
							
							
							Remove reference to defunct distsn.org
See merge request pleroma/pleroma!2675 
							
						 | 
						
							2020-06-25 10:42:57 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								f585622f85
								
							
						 | 
						
							
							
								
								Apply suggestion to config/description.exs
							
							
							
							
							
						 | 
						
							2020-06-25 10:17:16 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								439a1a0218
								
							
						 | 
						
							
							
								
								added wrapper Pleroma.HTTP for ExAws.S3
							
							
							
							
							
						 | 
						
							2020-06-25 07:12:29 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								cc837f9d15
								
							
						 | 
						
							
							
								
								fixed config/descpiption.exs
							
							
							
							
							
						 | 
						
							2020-06-24 21:21:33 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								721fc7c554
								
							
						 | 
						
							
							
								
								added wrapper Pleroma.HTTP for Tzdata.HTTPClient
							
							
							
							
							
						 | 
						
							2020-06-24 09:12:32 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								54039100fe
								
							
						 | 
						
							
							
								
								Remove reference to defunct distsn.org
							
							
							
							
							
						 | 
						
							2020-06-23 11:17:26 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								ed189568f3
								
							
						 | 
						
							
							
								
								moving mrf settings from instance to separate group
							
							
							
							
							
						 | 
						
							2020-06-16 18:32:18 +03: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								26f710b9e3
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into preload-data
							
							
							
							
							
						 | 
						
							2020-06-12 16:52:52 -05: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									stwf
								
							 
						 | 
						
							
							
							
							
								
							
							
								75e886b506
								
							
						 | 
						
							
							
								
								fix config
							
							
							
							
							
						 | 
						
							2020-06-03 17:32:03 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									stwf
								
							 
						 | 
						
							
							
							
							
								
							
							
								906ac57ba8
								
							
						 | 
						
							
							
								
								Merge branch 'preload-data' of git.pleroma.social:stwf/pleroma into preload-data
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/web/preload/status_net.ex 
							
						 | 
						
							2020-06-03 17:25:53 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									stwf
								
							 
						 | 
						
							
							
							
							
								
							
							
								5677b21e82
								
							
						 | 
						
							
							
								
								clean up
							
							
							
							
							
						 | 
						
							2020-06-03 17:24:35 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									stwf
								
							 
						 | 
						
							
							
							
							
								
							
							
								3b8180d7d1
								
							
						 | 
						
							
							
								
								add status_net/config
							
							
							
							
							
						 | 
						
							2020-06-03 16:34:03 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									stwf
								
							 
						 | 
						
							
							
							
							
								
							
							
								29ae5bb771
								
							
						 | 
						
							
							
								
								preload data into index.html
							
							
							
							
							
						 | 
						
							2020-06-03 16:34:03 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									stwf
								
							 
						 | 
						
							
							
							
							
								
							
							
								aa26dc6a13
								
							
						 | 
						
							
							
								
								add status_net/config
							
							
							
							
							
						 | 
						
							2020-06-03 13:40:48 -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 | 
						
						
							
							
							
								
							
							
						 |