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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								bf6aa6f1a8
								
							
						 | 
						
							
							
								
								Fix report content stopping to be nullable
							
							
							
							
							
						 | 
						
							2019-06-16 13:06:12 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								44de34d170
								
							
						 | 
						
							
							
								
								Credo fixes
							
							
							
							
							
						 | 
						
							2019-06-16 01:35:45 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								e943905bd7
								
							
						 | 
						
							
							
								
								Add tests for report view
							
							
							
							
							
						 | 
						
							2019-06-16 01:30:14 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								52b1b0e45d
								
							
						 | 
						
							
							
								
								Merge branch '963_oob_oauth_redirect_fix' into 'develop'
							
							
							
							
							
							
							
							[#963] No redirect on OOB OAuth authorize request with existing authorization
See merge request pleroma/pleroma!1276 
							
						 | 
						
							2019-06-15 13:45:50 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								a440cf856d
								
							
						 | 
						
							
							
								
								Mastodon API: Return the token needed for the chat.
							
							
							
							
							
						 | 
						
							2019-06-15 10:59:35 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								62ffc00a5d
								
							
						 | 
						
							
							
								
								Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'
							
							
							
							
							
							
							
							AccountView: Add user background.
See merge request pleroma/pleroma!1280 
							
						 | 
						
							2019-06-14 16:49:28 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								ee4ed87fb4
								
							
						 | 
						
							
							
								
								[#948] /api/v1/account_search added optional parameters (limit, offset, following)
							
							
							
							
							
						 | 
						
							2019-06-14 11:39:57 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								eac298083f
								
							
						 | 
						
							
							
								
								MastodonAPI: Add a way to update the background image.
							
							
							
							
							
						 | 
						
							2019-06-14 11:19:22 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								5965efb216
								
							
						 | 
						
							
							
								
								AccountView: Add user background.
							
							
							
							
							
						 | 
						
							2019-06-13 19:08:05 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								a12f8e13c8
								
							
						 | 
						
							
							
								
								Improve <title> fallback; Add a test
							
							
							
							
							
						 | 
						
							2019-06-13 15:02:46 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4b2c29016c
								
							
						 | 
						
							
							
								
								[#963] No redirect on OOB OAuth authorize request with existing authorization. OAuth-related refactoring.
							
							
							
							
							
						 | 
						
							2019-06-12 21:30:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								63ab3c30eb
								
							
						 | 
						
							
							
								
								Merge branch 'feature/rate-limiter' into 'develop'
							
							
							
							
							
							
							
							Feature/Rate Limiter
Closes #943
See merge request pleroma/pleroma!1266 
							
						 | 
						
							2019-06-11 11:32:01 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad04d12de6
								
							
						 | 
						
							
							
								
								Replace MastodonAPIController.account_register/2 rate limiter
							
							
							
							
							
						 | 
						
							2019-06-11 16:06:03 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								365268d522
								
							
						 | 
						
							
							
								
								Add more tests for using media_proxy and whitelists
							
							
							
							
							
						 | 
						
							2019-06-10 11:34:11 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								dffc9f060a
								
							
						 | 
						
							
							
								
								replace missing mock with a 404
							
							
							
							
							
						 | 
						
							2019-06-07 20:48:25 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								d020f68e87
								
							
						 | 
						
							
							
								
								Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched
							
							
							
							
							
						 | 
						
							2019-06-07 20:40:38 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								7e9f7ea0c2
								
							
						 | 
						
							
							
								
								MastodonAPI: Add test for user search.
							
							
							
							
							
						 | 
						
							2019-06-06 16:16:22 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								3f6da9c45a
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/377-stuck-follow-request' into 'develop'
							
							
							
							
							
							
							
							Bugfix/377 stuck follow request
Closes #377
See merge request pleroma/pleroma!1250 
							
						 | 
						
							2019-06-05 15:52:40 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								a511d2f900
								
							
						 | 
						
							
							
								
								Merge branch 'improve-search' into 'develop'
							
							
							
							
							
							
							
							[#943] Contain search for unauthenticated users
See merge request pleroma/pleroma!1220 
							
						 | 
						
							2019-06-05 15:51:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad19bfc7fe
								
							
						 | 
						
							
							
								
								Utils: Split update_follow_state and update_follow_state_for_all.
							
							
							
							
							
						 | 
						
							2019-06-05 16:43:35 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								827a51e777
								
							
						 | 
						
							
							
								
								CommonAPI: Add test for accept_follow_request.
							
							
							
							
							
						 | 
						
							2019-06-05 15:45:16 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								3115b64cfe
								
							
						 | 
						
							
							
								
								Transmogrifier: Add tests for incoming follows to locked accounts.
							
							
							
							
							
						 | 
						
							2019-06-05 14:10:46 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								024dfdc39c
								
							
						 | 
						
							
							
								
								Typo + Linting.
							
							
							
							
							
						 | 
						
							2019-06-05 12:45:28 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								8b9a0dd4a7
								
							
						 | 
						
							
							
								
								User: Don't error out when following a user that's already followed.
							
							
							
							
							
							
							
							This leads to a few situations where it is impossible to follow a user. 
							
						 | 
						
							2019-06-05 12:06:45 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b04f07a1e
								
							
						 | 
						
							
							
								
								Limit search for unauthenticated users to local users only
							
							
							
							
							
						 | 
						
							2019-06-05 16:51:04 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								e4babb1c9f
								
							
						 | 
						
							
							
								
								Merge branch 'explicit-addressing' into 'develop'
							
							
							
							
							
							
							
							Explicit addressing
See merge request pleroma/pleroma!1239 
							
						 | 
						
							2019-06-05 08:28:20 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								d3d1704e84
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into issue/941
							
							
							
							
							
						 | 
						
							2019-06-04 15:06:58 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								bbff7554de
								
							
						 | 
						
							
							
								
								Add tests for get_existing_votes
							
							
							
							
							
						 | 
						
							2019-06-04 13:47:53 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4cab98b7bf
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into explicit-addressing
							
							
							
							
							
						 | 
						
							2019-06-04 11:23:46 +02: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
								
							 
						 | 
						
							
							
							
							
								
							
							
								9d2563a3de
								
							
						 | 
						
							
							
								
								Merge branch 'generic-fe-settings' into 'develop'
							
							
							
							
							
							
							
							Generic settings store for frontend user settings
See merge request pleroma/pleroma!1221 
							
						 | 
						
							2019-06-04 05:43:43 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								64ada7f960
								
							
						 | 
						
							
							
								
								fix tests
							
							
							
							
							
						 | 
						
							2019-06-03 22:51:14 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								f13d6c7f78
								
							
						 | 
						
							
							
								
								update api to set skip_thread_containment
							
							
							
							
							
						 | 
						
							2019-06-03 21:02:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								804b6a4d8f
								
							
						 | 
						
							
							
								
								CommonAPI.Utils: Add tests.
							
							
							
							
							
						 | 
						
							2019-06-03 19:08:38 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								80d4d83aac
								
							
						 | 
						
							
							
								
								CommonAPI: Add explicit addressing.
							
							
							
							
							
						 | 
						
							2019-06-03 18:17:08 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								080e1aa70e
								
							
						 | 
						
							
							
								
								add option skip_thread_containment
							
							
							
							
							
						 | 
						
							2019-06-03 16:13:37 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								dc91bcc0af
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/polls-2-electric-boogalo
							
							
							
							
							
						 | 
						
							2019-06-03 13:16:17 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								314758c25b
								
							
						 | 
						
							
							
								
								Merge branch 'align-mastodon-conversations' into 'develop'
							
							
							
							
							
							
							
							Mastodon Conversations API: Align to Mastodon behavior
See merge request pleroma/pleroma!1215 
							
						 | 
						
							2019-06-03 09:48:37 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								026b245dbc
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/polls-2-electric-boogalo
							
							
							
							
							
						 | 
						
							2019-06-03 11:14:52 +03:00 | 
						
						
							
							
							
								
							
							
						 |