kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								2cc043591c 
								
							 
						 
						
							
							
								
								Merge branch 'feature/static-fe' into 'develop'  
							
							... 
							
							
							
							Static frontend
See merge request pleroma/pleroma!1917  
							
						 
						
							2019-11-11 19:10:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								72cc92259e 
								
							 
						 
						
							
							
								
								Default config: Use extended nickname format  
							
							
							
						 
						
							2019-11-11 12:49:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4499a7a075 
								
							 
						 
						
							
							
								
								Disable attachment links by default  
							
							... 
							
							
							
							Closes  #1394  
						
							2019-11-10 15:02:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e08bd99bab 
								
							 
						 
						
							
							
								
								Apply suggestion to config/config.exs  
							
							
							
						 
						
							2019-11-10 11:02:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4885d403fe 
								
							 
						 
						
							
							
								
								Apply suggestion to config/config.exs  
							
							
							
						 
						
							2019-11-10 10:44:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								9d0b989521 
								
							 
						 
						
							
							
								
								add subject to atom feed  
							
							
							
						 
						
							2019-11-10 11:10:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Phil Hagelberg 
								
							 
						 
						
							
							
							
							
								
							
							
								886a07ba57 
								
							 
						 
						
							
							
								
								Move static_fe config to its own section instead of in :instance.  
							
							
							
						 
						
							2019-11-09 18:08:45 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								2f4e9a068f 
								
							 
						 
						
							
							
								
								Bump fast_sanitize to 0.1.1  
							
							... 
							
							
							
							The parser C-Node has been completely rewritten to not use the deprecated
`erl_interface` api.
Closes  #1378  since Nodex was ripped out and the replacement randomizes
master node name. 
							
						 
						
							2019-11-08 00:51:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9434e151a9 
								
							 
						 
						
							
							
								
								Blacklist myhtmlex nodes from swarm  
							
							
							
						 
						
							2019-10-29 01:16:22 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								05d111b622 
								
							 
						 
						
							
							
								
								Use the default scrubber before mediaproxy transformation  
							
							
							
						 
						
							2019-10-29 01:15:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									KokaKiwi 
								
							 
						 
						
							
							
							
							
								
							
							
								638457ba94 
								
							 
						 
						
							
							
								
								MastoFE: Add PWA manifest.  
							
							
							
						 
						
							2019-10-19 12:15:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5c6c3026ea 
								
							 
						 
						
							
							
								
								Merge branch 'patch-1' into 'develop'  
							
							... 
							
							
							
							Fix a typo in default static directory configuration for OTP releases
Closes  #1289 
See merge request pleroma/pleroma!1829  
							
						 
						
							2019-10-18 22:29:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								c6de0cbb4a 
								
							 
						 
						
							
							
								
								config: disable Websub and Salmon publisher modules  
							
							
							
						 
						
							2019-10-18 14:50:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									yalh76 
								
							 
						 
						
							
							
							
							
								
							
							
								fb5dce481c 
								
							 
						 
						
							
							
								
								Fix  https://git.pleroma.social/pleroma/pleroma/issues/1289  
							
							
							
						 
						
							2019-10-10 20:05:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ecd7ac855b 
								
							 
						 
						
							
							
								
								Benchmark config: Don't use the sql sandbox.  
							
							
							
						 
						
							2019-10-10 15:42:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2629493804 
								
							 
						 
						
							
							
								
								Benchmark config: Database adjustments.  
							
							
							
						 
						
							2019-10-10 15:01:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c54ae662dc 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into benchmark-finishing  
							
							
							
						 
						
							2019-10-10 14:40:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								02f8e2a8ab 
								
							 
						 
						
							
							
								
								Gitlab: Run benchmark in CI.  
							
							
							
						 
						
							2019-10-10 14:24:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								4b3f77a99f 
								
							 
						 
						
							
							
								
								Extract RSS Feed functionality from OStatus  
							
							
							
						 
						
							2019-10-07 12:20:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								f459aabdfa 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2019-10-06 09:30:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								b8b98ac40f 
								
							 
						 
						
							
							
								
								Add missing extended_nickname_format setting to the default config  
							
							
							
						 
						
							2019-10-03 10:40:49 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								6ffa2b5f66 
								
							 
						 
						
							
							
								
								[ #1260 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2019-09-30 17:41:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								f9380289eb 
								
							 
						 
						
							
							
								
								Add remote_ip plug  
							
							
							
						 
						
							2019-09-27 21:59:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								19263f30c3 
								
							 
						 
						
							
							
								
								Merge branch 'support-rel-ugc' into 'develop'  
							
							... 
							
							
							
							Add support for `rel="ugc"`
Closes  #1255 
See merge request pleroma/pleroma!1679  
							
						 
						
							2019-09-23 22:41:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rachel Fae Fox 
								
							 
						 
						
							
							
							
							
								
							
							
								63af6951fa 
								
							 
						 
						
							
							
								
								add tunable for stream uploads, as needed for jortage to work.  
							
							
							
						 
						
							2019-09-23 20:38:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								d639cdcecb 
								
							 
						 
						
							
							
								
								Update "config/description.exs"  
							
							
							
						 
						
							2019-09-19 14:56:10 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								cf3041220a 
								
							 
						 
						
							
							
								
								Add support for rel="ugc"  
							
							
							
						 
						
							2019-09-19 14:56:10 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								3e972c0456 
								
							 
						 
						
							
							
								
								Add :shared_pack_cache_seconds_per_file to description.exs  
							
							
							
						 
						
							2019-09-19 00:23:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								ee620ecbf1 
								
							 
						 
						
							
							
								
								Add caching for emoji pack sharing  
							
							
							
						 
						
							2019-09-19 00:16:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								7e4c8b56ea 
								
							 
						 
						
							
							
								
								Add tests for emoji pack sharing  
							
							
							
						 
						
							2019-09-19 00:16:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								32d64102cb 
								
							 
						 
						
							
							
								
								description.exs: uncomment type for email logo  
							
							
							
						 
						
							2019-09-17 23:05:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c0c5628200 
								
							 
						 
						
							
							
								
								description.exs: remove empty strings on descriptions  
							
							
							
						 
						
							2019-09-17 23:05:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								50ec445b2c 
								
							 
						 
						
							
							
								
								description.exs: remove empty strings and arrays  
							
							
							
						 
						
							2019-09-17 23:05:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								35dcea3e13 
								
							 
						 
						
							
							
								
								Remove [true,false] for booleans, it is implicit  
							
							
							
						 
						
							2019-09-17 21:47:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e7afb67c5c 
								
							 
						 
						
							
							
								
								[ #1260 ] Rate-limiting for create authentication and related requests.  
							
							
							
						 
						
							2019-09-17 16:16:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								d6ab78e610 
								
							 
						 
						
							
							
								
								Set account_field_value_length limit to 2048 by default  
							
							
							
						 
						
							2019-09-16 21:48:01 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								96816ceaa2 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'revert-4fabf83a' into 'develop'"  
							
							... 
							
							
							
							This reverts commit fe7fd331264fabf83ad0 
							
						 
						
							2019-09-16 17:55:04 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								c623b4324d 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'streamer-refactoring' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !1653  
							
						 
						
							2019-09-16 09:09:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Steven Fuchs 
								
							 
						 
						
							
							
							
							
								
							
							
								aab264db82 
								
							 
						 
						
							
							
								
								Streamer refactoring  
							
							
							
						 
						
							2019-09-16 07:44:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e127b9ab6d 
								
							 
						 
						
							
							
								
								[ #1149 ] Rewritten readme as config/description.exs.  
							
							
							
						 
						
							2019-09-14 16:28:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								6bcedb693c 
								
							 
						 
						
							
							
								
								[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							... 
							
							
							
							# Conflicts:
#	docs/config.md
#	mix.lock 
							
						 
						
							2019-09-14 16:11:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f884987ace 
								
							 
						 
						
							
							
								
								Merge branch 'admin-config-description' into 'develop'  
							
							... 
							
							
							
							Admin config description
Closes  #1178  and #1209 
See merge request pleroma/pleroma!1611  
							
						 
						
							2019-09-13 12:36:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								56828abf6d 
								
							 
						 
						
							
							
								
								Use Jason for rendering responses  
							
							... 
							
							
							
							Although Jason readme says Phoenix 1.4+ already does it by default, [it actually does it only for new projects](3bfb9f6e90/lib/phoenix.ex (L58-L59) 
							
						 
						
							2019-09-11 23:06:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								e47089cf55 
								
							 
						 
						
							
							
								
								web_cache_ttl description  
							
							
							
						 
						
							2019-09-11 09:32:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								10827eecad 
								
							 
						 
						
							
							
								
								formatting  
							
							
							
						 
						
							2019-09-11 09:25:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								5db2920644 
								
							 
						 
						
							
							
								
								Apply suggestion to config/description.exs  
							
							
							
						 
						
							2019-09-11 09:25:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								65bc9e66ad 
								
							 
						 
						
							
							
								
								Apply suggestion to config/description.exs  
							
							
							
						 
						
							2019-09-11 09:25:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								6721301086 
								
							 
						 
						
							
							
								
								some changes  
							
							
							
						 
						
							2019-09-11 09:25:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								171cefd889 
								
							 
						 
						
							
							
								
								description.exs  
							
							
							
						 
						
							2019-09-11 09:25:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								11e12b5761 
								
							 
						 
						
							
							
								
								Add Pleroma.Plugs.Cache  
							
							
							
						 
						
							2019-09-09 18:53:08 +00:00