Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								12b1454245
								
							
						 | 
						
							
							
								
								[#1062] added option to disable send email
							
							
							
							
							
						 | 
						
							2019-07-10 05:34:21 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								d6b0fce6e9
								
							
						 | 
						
							
							
								
								Fix/1019 correct count remote users
							
							
							
							
							
						 | 
						
							2019-07-09 17:36:35 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								dd5a41e2a4
								
							
						 | 
						
							
							
								
								Apply suggestion to docs/config.md
							
							
							
							
							
						 | 
						
							2019-07-09 10:39:36 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								a799418573
								
							
						 | 
						
							
							
								
								[#161] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
							
							
							
							
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 | 
						
							2019-06-30 16:05:00 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								2b9d914089
								
							
						 | 
						
							
							
								
								[#161] Refactoring, documentation.
							
							
							
							
							
						 | 
						
							2019-06-30 15:58:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								acd20f166b
								
							
						 | 
						
							
							
								
								[#1026] Filter.AnonymizeFilename added ability to retain file extension with custom text
							
							
							
							
							
						 | 
						
							2019-06-30 07:28:35 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									deorsum
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c40ada7a5
								
							
						 | 
						
							
							
								
								Add a caveat for docker deployment in the config docs
							
							
							
							
							
						 | 
						
							2019-06-29 21:14:11 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								074ffee0b2
								
							
						 | 
						
							
							
								
								docs: add documentation for MediaProxyWarmingPolicy
							
							
							
							
							
						 | 
						
							2019-06-28 23:20:17 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								9f8e645dce
								
							
						 | 
						
							
							
								
								Merge branch 'feature/configurable-pack-extensions' into 'develop'
							
							
							
							
							
							
							
							Make default pack extensions configurable and default to png and gif
See merge request pleroma/pleroma!1338 
							
						 | 
						
							2019-06-26 05:34:02 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								41e4752950
								
							
						 | 
						
							
							
								
								Make default pack extensions configurable and default to png and gif
							
							
							
							
							
						 | 
						
							2019-06-26 06:48:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								ec01b7c934
								
							
						 | 
						
							
							
								
								Apply suggestion to docs/config.md
							
							
							
							
							
						 | 
						
							2019-06-26 03:23:26 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4ad15ad2a9
								
							
						 | 
						
							
							
								
								add ignore hosts and TLDs for rich_media
							
							
							
							
							
						 | 
						
							2019-06-25 22:25:37 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									aries
								
							 
						 | 
						
							
							
							
							
								
							
							
								550302c041
								
							
						 | 
						
							
							
								
								Apply suggestion to docs/config.md
							
							
							
							
							
						 | 
						
							2019-06-24 01:09:28 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									aries
								
							 
						 | 
						
							
							
							
							
								
							
							
								7daaaf84f1
								
							
						 | 
						
							
							
								
								Fix markdown mistakes
							
							
							
							
							
						 | 
						
							2019-06-24 01:28:01 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									aries
								
							 
						 | 
						
							
							
							
							
								
							
							
								4bac13966b
								
							
						 | 
						
							
							
								
								modify config.md for S3
							
							
							
							
							
						 | 
						
							2019-06-24 01:10:55 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								630ac6a921
								
							
						 | 
						
							
							
								
								docs: better description for mrf anti link spam
							
							
							
							
							
						 | 
						
							2019-06-20 03:01:03 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								736d8ad6be
								
							
						 | 
						
							
							
								
								implement anti link spam MRF
							
							
							
							
							
						 | 
						
							2019-06-19 15:58:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								c2ca1f22a2
								
							
						 | 
						
							
							
								
								it is changed in compile time
							
							
							
							
							
							
							
							we can't change module attributes and endpoint settings in runtime 
							
						 | 
						
							2019-06-14 15:45:05 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4265608097
								
							
						 | 
						
							
							
								
								Merge branch 'chore/tagpolicy_docs' into 'develop'
							
							
							
							
							
							
							
							Document TagPolicy in `rewrite_policy` section
See merge request pleroma/pleroma!1271 
							
						 | 
						
							2019-06-12 09:52:55 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								ced59be1ae
								
							
						 | 
						
							
							
								
								Document TagPolicy in rewrite_policy section
							
							
							
							
							
						 | 
						
							2019-06-11 22:15:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								6f29865d43
								
							
						 | 
						
							
							
								
								Add option to restrict all users to local content
							
							
							
							
							
						 | 
						
							2019-06-11 21:25:53 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad04d12de6
								
							
						 | 
						
							
							
								
								Replace MastodonAPIController.account_register/2 rate limiter
							
							
							
							
							
						 | 
						
							2019-06-11 16:06:03 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								2e5affce61
								
							
						 | 
						
							
							
								
								Add RateLimiter
							
							
							
							
							
						 | 
						
							2019-06-11 14:27:41 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor
								
							 
						 | 
						
							
							
							
							
								
							
							
								f82382de22
								
							
						 | 
						
							
							
								
								[#943] Make the unauthenticated users limitation optional
							
							
							
							
							
						 | 
						
							2019-06-06 12:17:49 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								3eefb274f4
								
							
						 | 
						
							
							
								
								OAuth consumer: tests fix, comments, Keycloak config notes.
							
							
							
							
							
						 | 
						
							2019-06-05 13:02:13 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4f2e359687
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into issue/941
							
							
							
							
							
						 | 
						
							2019-06-04 09:49:08 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								9f0d0d0805
								
							
						 | 
						
							
							
								
								Merge branch 'feature/mrf-subchain' into 'develop'
							
							
							
							
							
							
							
							MRF: subchain policy
See merge request pleroma/pleroma!1233 
							
						 | 
						
							2019-06-04 05:49:54 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								a536f515dd
								
							
						 | 
						
							
							
								
								Merge branch 'ueberauth_config_extension' into 'develop'
							
							
							
							
							
							
							
							Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification
See merge request pleroma/pleroma!1234 
							
						 | 
						
							2019-06-04 05:42:49 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								080e1aa70e
								
							
						 | 
						
							
							
								
								add option skip_thread_containment
							
							
							
							
							
						 | 
						
							2019-06-03 16:13:37 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								83663caa81
								
							
						 | 
						
							
							
								
								Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification.
							
							
							
							
							
						 | 
						
							2019-06-02 17:45:32 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								c724d8df98
								
							
						 | 
						
							
							
								
								docs: document mrf_subchain
							
							
							
							
							
						 | 
						
							2019-06-02 10:14:56 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								65db5e9f52
								
							
						 | 
						
							
							
								
								Resolve merge conflicts
							
							
							
							
							
						 | 
						
							2019-06-01 16:29:58 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								75e78d4e23
								
							
						 | 
						
							
							
								
								Merge branch 'feature/mrf-user-filter' into 'develop'
							
							
							
							
							
							
							
							mrf: add support for filtering users
See merge request pleroma/pleroma!1188 
							
						 | 
						
							2019-05-22 19:03:14 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								f0516d9114
								
							
						 | 
						
							
							
								
								Merge branch 'ssh-fixes' into 'develop'
							
							
							
							
							
							
							
							Ssh fixes
Closes #869 and #925
See merge request pleroma/pleroma!1191 
							
						 | 
						
							2019-05-22 18:57:34 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								7d9b33b3ce
								
							
						 | 
						
							
							
								
								update documentation for the new MRF features [no-ci]
							
							
							
							
							
						 | 
						
							2019-05-22 18:53:30 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								620908a2db
								
							
						 | 
						
							
							
								
								[#699] add worker to clean expired oauth tokens
							
							
							
							
							
						 | 
						
							2019-05-22 15:44:50 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								b22145cbc4
								
							
						 | 
						
							
							
								
								Documentation: Specify PEM format for SSH keys.
							
							
							
							
							
							
							
							Otherwise openssh-client 7.9 will generate a different format that can't be used
by esshd. 
							
						 | 
						
							2019-05-22 10:44:26 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								16b260fb19
								
							
						 | 
						
							
							
								
								add mix task to prune the object database using a configured retention period
							
							
							
							
							
						 | 
						
							2019-05-21 21:38:56 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								76a7429bef
								
							
						 | 
						
							
							
								
								Add poll limits to /api/v1/instance and initial state
							
							
							
							
							
						 | 
						
							2019-05-21 09:13:10 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sadposter
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								daeae8e2e7
								
							
						 | 
						
							
							
								
								Move default mascot configuration to config/
							
							
							
							
							
						 | 
						
							2019-05-20 16:12:55 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								412a3d8a0f
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
							
							
							
							
							
						 | 
						
							2019-05-17 12:26:59 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								aa11fa4864
								
							
						 | 
						
							
							
								
								add report uri and report to
							
							
							
							
							
						 | 
						
							2019-05-16 12:49:40 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								f1e67bdc31
								
							
						 | 
						
							
							
								
								Search: Add optional rum indexing / searching.
							
							
							
							
							
						 | 
						
							2019-05-15 15:28:01 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								a2be420f94
								
							
						 | 
						
							
							
								
								differences_in_mastoapi_responses.md: fullname & bio are optionnal
							
							
							
							
							
							
							
							[ci skip] 
							
						 | 
						
							2019-05-13 18:35:45 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								f46295faa7
								
							
						 | 
						
							
							
								
								unused config paramater
							
							
							
							
							
						 | 
						
							2019-05-07 09:07:06 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								1040caf096
								
							
						 | 
						
							
							
								
								fix format
							
							
							
							
							
							
							
							Modified-by: Maksim Pechnikov <parallel588@gmail.com> 
							
						 | 
						
							2019-05-06 17:51:03 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								aacac9da0b
								
							
						 | 
						
							
							
								
								Merge branch 'feature/bbs' into 'develop'
							
							
							
							
							
							
							
							BBS / SSH
See merge request pleroma/pleroma!997 
							
						 | 
						
							2019-05-06 17:17:03 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ce6ca0fefe
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
							
							
							
							
							
						 | 
						
							2019-05-06 16:45:22 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								6ad8ddfd29
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into feature/bbs
							
							
							
							
							
						 | 
						
							2019-05-04 15:00:45 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									xse
								
							 
						 | 
						
							
							
							
							
								
							
							
								2982061dfa
								
							
						 | 
						
							
							
								
								Fix syntax highlighting + clarify :frontend_configuration
							
							
							
							
							
						 | 
						
							2019-05-01 01:26:14 +02:00 | 
						
						
							
							
							
								
							
							
						 |