Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								ff55e3c16f
								
							
						 | 
						
							
							
								
								Create mentions only for explicitly mentioned users
							
							
							
							
							
						 | 
						
							2019-07-10 13:29:50 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								008c55e4e9
								
							
						 | 
						
							
							
								
								add test for search_controller/ 100% coverage
							
							
							
							
							
						 | 
						
							2019-07-10 08:28:03 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								2d2b50ccca
								
							
						 | 
						
							
							
								
								Send and handle "Delete" activity for deleted users
							
							
							
							
							
						 | 
						
							2019-07-10 05:16:08 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								93a0eeab16
								
							
						 | 
						
							
							
								
								Add license/copyright to all project files
							
							
							
							
							
						 | 
						
							2019-07-10 05:13:23 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								bb8065a1fd
								
							
						 | 
						
							
							
								
								tests MRF filters
							
							
							
							
							
						 | 
						
							2019-07-10 05:12:21 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								8a41d34673
								
							
						 | 
						
							
							
								
								[#878] Tests improvements per code review.
							
							
							
							
							
						 | 
						
							2019-07-09 22:37:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								6fc0c27be3
								
							
						 | 
						
							
							
								
								[#878] Uncommented test statement.
							
							
							
							
							
						 | 
						
							2019-07-09 22:28:04 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								829e997223
								
							
						 | 
						
							
							
								
								[#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/object.ex
#	test/web/activity_pub/transmogrifier_test.exs
#	test/web/ostatus/ostatus_test.exs 
							
						 | 
						
							2019-07-09 21:46:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								1417627d07
								
							
						 | 
						
							
							
								
								Merge branch 'remove-avatar-header' into 'develop'
							
							
							
							
							
							
							
							Ability to reset avatar, profile banner and backgroud
See merge request pleroma/pleroma!1187 
							
						 | 
						
							2019-07-09 17:51:41 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								95c085174d
								
							
						 | 
						
							
							
								
								Merge branch 'test-speedup' into 'develop'
							
							
							
							
							
							
							
							Testing: Don't federate in testing.
See merge request pleroma/pleroma!1391 
							
						 | 
						
							2019-07-09 15:35:28 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								376a55c97f
								
							
						 | 
						
							
							
								
								Merge branch '161-incoming-replies-depth-limit' into 'develop'
							
							
							
							
							
							
							
							[#161] Limited replies depth on incoming federation (memory leaks fix)
Closes #161
See merge request pleroma/pleroma!1361 
							
						 | 
						
							2019-07-09 14:15:10 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								abe2e8881f
								
							
						 | 
						
							
							
								
								Testing: Don't federate in testing.
							
							
							
							
							
						 | 
						
							2019-07-09 15:30:51 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								daff85a985
								
							
						 | 
						
							
							
								
								[#878] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.
							
							
							
							
							
						 | 
						
							2019-07-08 19:53:02 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								72b88c82bc
								
							
						 | 
						
							
							
								
								Mastodon API: Fix embedded relationships not being rendered inside of statuses
							
							
							
							
							
						 | 
						
							2019-07-08 12:07:08 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad8d86e7c6
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
							
							
							
							
							
						 | 
						
							2019-07-06 10:17:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugenij
								
							 
						 | 
						
							
							
							
							
								
							
							
								ab50c6b3ca
								
							
						 | 
						
							
							
								
								Add fallback value to the admin report view.
							
							
							
							
							
							
							
							This is to avoid 500 error when the reported user no longer exists
in the database. 
							
						 | 
						
							2019-07-02 01:27:00 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugenij
								
							 
						 | 
						
							
							
							
							
								
							
							
								1f76740e10
								
							
						 | 
						
							
							
								
								Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
							
							
							
							
							
						 | 
						
							2019-06-30 09:08:46 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c60a562a7
								
							
						 | 
						
							
							
								
								Fix not being able to pin unlisted posts
							
							
							
							
							
							
							
							Closes #1038 
							
						 | 
						
							2019-06-29 22:27:42 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b7b1040b3
								
							
						 | 
						
							
							
								
								[#161] Limited replies depth on incoming federation in order to prevent memory leaks on recursive replies fetching.
							
							
							
							
							
						 | 
						
							2019-06-29 20:04:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								d1549a6375
								
							
						 | 
						
							
							
								
								Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop'
							
							
							
							
							
							
							
							Merge admin and mastodon user views for reports
See merge request pleroma/pleroma!1346 
							
						 | 
						
							2019-06-29 00:12:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								c22f0bfb80
								
							
						 | 
						
							
							
								
								test: add tests for mediaproxy warming policy
							
							
							
							
							
						 | 
						
							2019-06-28 23:41:42 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								90927e6a9a
								
							
						 | 
						
							
							
								
								Kowalski, analysis!
							
							
							
							
							
						 | 
						
							2019-06-28 15:27:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								452ca5250d
								
							
						 | 
						
							
							
								
								Merge admin and mastodon user views for reports
							
							
							
							
							
						 | 
						
							2019-06-28 15:15:32 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								d53fb55bb7
								
							
						 | 
						
							
							
								
								Return correct response when reply to a direct message is not direct itself
							
							
							
							
							
						 | 
						
							2019-06-26 10:59:27 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4ad15ad2a9
								
							
						 | 
						
							
							
								
								add ignore hosts and TLDs for rich_media
							
							
							
							
							
						 | 
						
							2019-06-25 22:25:37 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								0cb8e710fb
								
							
						 | 
						
							
							
								
								add test
							
							
							
							
							
						 | 
						
							2019-06-25 18:06:08 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								a0c4ebb4d7
								
							
						 | 
						
							
							
								
								[#184] small refactoring  reset password
							
							
							
							
							
						 | 
						
							2019-06-24 19:01:56 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugenij
								
							 
						 | 
						
							
							
							
							
								
							
							
								f2c03425b0
								
							
						 | 
						
							
							
								
								Broadcast conversation update when DM is deleted
							
							
							
							
							
						 | 
						
							2019-06-24 07:14:04 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								27b9605de0
								
							
						 | 
						
							
							
								
								Merge branch 'rich_media_titles_two' into 'develop'
							
							
							
							
							
							
							
							Rich media titles two
See merge request pleroma/pleroma!1325 
							
						 | 
						
							2019-06-23 05:43:11 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								b37ede5df3
								
							
						 | 
						
							
							
								
								log capturing
							
							
							
							
							
						 | 
						
							2019-06-23 08:16:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								982cad0268
								
							
						 | 
						
							
							
								
								support for config groups
							
							
							
							
							
						 | 
						
							2019-06-23 08:16:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sachin Joshi
								
							 
						 | 
						
							
							
							
							
								
							
							
								a0c65bbd6c
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into 'remove-avatar-header'
							
							
							
							
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 | 
						
							2019-06-23 03:25:50 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								410add1c30
								
							
						 | 
						
							
							
								
								support for tuples with more than 2 values
							
							
							
							
							
						 | 
						
							2019-06-22 17:30:53 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								0e415921cd
								
							
						 | 
						
							
							
								
								Rich Media Parser: Do not return just a title if nothing else is there.
							
							
							
							
							
						 | 
						
							2019-06-22 16:22:59 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								58c4d5312b
								
							
						 | 
						
							
							
								
								Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'""
							
							
							
							
							
							
							
							This reverts commit b6af80f769. 
							
						 | 
						
							2019-06-22 15:12:57 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								f0fccb7578
								
							
						 | 
						
							
							
								
								fix for int and modules
							
							
							
							
							
						 | 
						
							2019-06-22 09:01:30 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								55742d978d
								
							
						 | 
						
							
							
								
								Merge branch 'feature/mrf-anti-link-spam' into 'develop'
							
							
							
							
							
							
							
							implement anti link spam MRF
See merge request pleroma/pleroma!1307 
							
						 | 
						
							2019-06-21 22:56:54 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								e3534f5b3c
								
							
						 | 
						
							
							
								
								Merge branch 'oauth_secure_redirect' into 'develop'
							
							
							
							
							
							
							
							OAuth security improvements (`redirect_uri` listing enforcement)
See merge request pleroma/pleroma!1302 
							
						 | 
						
							2019-06-21 22:31:12 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								b6af80f769
								
							
						 | 
						
							
							
								
								Revert "Merge branch 'fix/ogp-title' into 'develop'"
							
							
							
							
							
							
							
							This reverts merge request !1277 
							
						 | 
						
							2019-06-21 11:36:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								32320c1ee9
								
							
						 | 
						
							
							
								
								Fixes for dynamic configuration
							
							
							
							
							
						 | 
						
							2019-06-20 17:43:57 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								21dacd4b15
								
							
						 | 
						
							
							
								
								unbreak polls
							
							
							
							
							
						 | 
						
							2019-06-19 16:33:49 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								736d8ad6be
								
							
						 | 
						
							
							
								
								implement anti link spam MRF
							
							
							
							
							
						 | 
						
							2019-06-19 15:58:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								9f45f93949
								
							
						 | 
						
							
							
								
								Added more redirect_uri checks to prevent redirect to not explicitly listed URI.
							
							
							
							
							
						 | 
						
							2019-06-18 17:00:49 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								c7acca2abb
								
							
						 | 
						
							
							
								
								Mastodon API: Sanitize display names
							
							
							
							
							
							
							
							Closes #1000 
							
						 | 
						
							2019-06-18 14:12:11 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								49a49d3763
								
							
						 | 
						
							
							
								
								Merge branch 'removing-test-errors' into 'develop'
							
							
							
							
							
							
							
							Removing test errors
See merge request pleroma/pleroma!1296 
							
						 | 
						
							2019-06-17 14:16:23 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								c34327b22e
								
							
						 | 
						
							
							
								
								Merge branch 'fix/sanitize-report-content' into 'develop'
							
							
							
							
							
							
							
							Sanitize HTML in ReportView
Closes #990
See merge request pleroma/pleroma!1293 
							
						 | 
						
							2019-06-16 18:05:00 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								2e2edcb461
								
							
						 | 
						
							
							
								
								capturing errors
							
							
							
							
							
						 | 
						
							2019-06-16 20:10:12 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								a04bf131e0
								
							
						 | 
						
							
							
								
								[#570] add user:notification stream
							
							
							
							
							
						 | 
						
							2019-06-16 10:33:25 +00:00 | 
						
						
							
							
							
								
							
							
						 |