rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								df2dab69a7
								
							
						 | 
						
							
							
								
								Merge branch 'begone-the-dot-hack' into 'develop'
							
							
							
							
							
							
							
							Remove the dot hack when posting from Mastodon API and add proper errors when the post exceeds character limits
See merge request pleroma/pleroma!1298 
							
						 | 
						
							2019-06-19 10:22:23 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								966317e052
								
							
						 | 
						
							
							
								
								Merge branch 'deps/update-auto-linker' into 'develop'
							
							
							
							
							
							
							
							Deps: Update auto_linker
See merge request pleroma/pleroma!1300 
							
						 | 
						
							2019-06-18 20:47:36 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								f30a3241d2
								
							
						 | 
						
							
							
								
								Deps: Update auto_linker
							
							
							
							
							
						 | 
						
							2019-06-18 16:08:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								c7acca2abb
								
							
						 | 
						
							
							
								
								Mastodon API: Sanitize display names
							
							
							
							
							
							
							
							Closes #1000 
							
						 | 
						
							2019-06-18 14:12:11 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								c4e4f7d0e4
								
							
						 | 
						
							
							
								
								Add proper error handling for when the post exceeds character limits
							
							
							
							
							
						 | 
						
							2019-06-18 05:05:05 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								dce27de733
								
							
						 | 
						
							
							
								
								Mastodon API: Remove the dot hack
							
							
							
							
							
						 | 
						
							2019-06-18 05:04:41 +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
								
							 
						 | 
						
							
							
							
							
								
							
							
								0f59265a50
								
							
						 | 
						
							
							
								
								salmon fix
							
							
							
							
							
							
							
							removed some ownership sandbox error 
							
						 | 
						
							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
								
							 
						 | 
						
							
							
							
							
								
							
							
								641bcaa44e
								
							
						 | 
						
							
							
								
								Sanitize HTML in ReportView
							
							
							
							
							
							
							
							Closes #990 
							
						 | 
						
							2019-06-16 01:30:32 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								135c196769
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/980-polls-double-vote' into 'develop'
							
							
							
							
							
							
							
							MastodonAPI Controller: Band-Aid double vote problem.
See merge request pleroma/pleroma!1275 
							
						 | 
						
							2019-06-15 15:13:48 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								37ee6c6e2c
								
							
						 | 
						
							
							
								
								Merge branch 'update/phoenix-and-plug' into 'develop'
							
							
							
							
							
							
							
							Update Phoenix
See merge request pleroma/pleroma!1290 
							
						 | 
						
							2019-06-15 15:09:14 +00: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								9b908697dd
								
							
						 | 
						
							
							
								
								OEmbed.OEmbedController does not exist in the Pleroma codebase. It was removed in commit 92c5640f
							
							
							
							
							
							
							
							and this leftover artifact breaks compiling now. 
							
						 | 
						
							2019-06-15 07:04:01 -05: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								7363a0ea8a
								
							
						 | 
						
							
							
								
								Revert "Only run Floki if title is missing from the map"
							
							
							
							
							
							
							
							This reverts commit 97d2b1a45a. 
							
						 | 
						
							2019-06-12 18:32:28 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								97d2b1a45a
								
							
						 | 
						
							
							
								
								Only run Floki if title is missing from the map
							
							
							
							
							
						 | 
						
							2019-06-12 18:27:35 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								097fdf6a5d
								
							
						 | 
						
							
							
								
								Attempt to use <title> from HTML as a fallback
							
							
							
							
							
						 | 
						
							2019-06-12 17:56:51 -05: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
								
							 
						 | 
						
							
							
							
							
								
							
							
								966543379d
								
							
						 | 
						
							
							
								
								MastodonAPI Controller: Band-Aid double vote problem.
							
							
							
							
							
						 | 
						
							2019-06-12 16:36:23 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								bf22ed5fbd
								
							
						 | 
						
							
							
								
								Update auto_linker dependency
							
							
							
							
							
						 | 
						
							2019-06-12 15:53:33 +07: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								bc8f059367
								
							
						 | 
						
							
							
								
								Add rate limiting for search endpoints
							
							
							
							
							
						 | 
						
							2019-06-11 14:28:39 +07: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								92213fb87c
								
							
						 | 
						
							
							
								
								Replace Mix.env with Pleroma.Config.get(:env)
							
							
							
							
							
							
							
							Mix.env/0 is not availible in release environments such as distillery or
elixir's built-in releases. 
							
						 | 
						
							2019-06-06 23:59:51 +03: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
								
							 
						 | 
						
							
							
							
							
								
							
							
								e1370ba131
								
							
						 | 
						
							
							
								
								Utils: Use update_follow_state_for_all when appropriate.
							
							
							
							
							
						 | 
						
							2019-06-05 16:51:28 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad19bfc7fe
								
							
						 | 
						
							
							
								
								Utils: Split update_follow_state and update_follow_state_for_all.
							
							
							
							
							
						 | 
						
							2019-06-05 16:43:35 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								076c9ae40e
								
							
						 | 
						
							
							
								
								User: Remove superfluous maybe_follow.
							
							
							
							
							
						 | 
						
							2019-06-05 14:24:31 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								3115b64cfe
								
							
						 | 
						
							
							
								
								Transmogrifier: Add tests for incoming follows to locked accounts.
							
							
							
							
							
						 | 
						
							2019-06-05 14:10:46 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								3eefb274f4
								
							
						 | 
						
							
							
								
								OAuth consumer: tests fix, comments, Keycloak config notes.
							
							
							
							
							
						 | 
						
							2019-06-05 13:02:13 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								93397fce3d
								
							
						 | 
						
							
							
								
								Contain search for unauthenticated users
							
							
							
							
							
						 | 
						
							2019-06-05 16:37:43 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								18c35d84fd
								
							
						 | 
						
							
							
								
								NodeInfo: Add explicit addressing to nodeinfo.
							
							
							
							
							
						 | 
						
							2019-06-04 17:14:25 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								1e7bb69a95
								
							
						 | 
						
							
							
								
								update ActivityPub#fetch_activities_query
							
							
							
							
							
						 | 
						
							2019-06-04 15:21:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								d3d1704e84
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into issue/941
							
							
							
							
							
						 | 
						
							2019-06-04 15:06:58 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								0acfcf6c52
								
							
						 | 
						
							
							
								
								update ActivityPub#fetch_activities_query
							
							
							
							
							
						 | 
						
							2019-06-04 15:04:36 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								17383861ed
								
							
						 | 
						
							
							
								
								Fix CommonAPI.vote returning tuples inside of the activity array instead of just activities
							
							
							
							
							
						 | 
						
							2019-06-04 13:38:32 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								29b022bb59
								
							
						 | 
						
							
							
								
								Restrict get_existing_votes to only get Create activities
							
							
							
							
							
						 | 
						
							2019-06-04 12:42:10 +03:00 | 
						
						
							
							
							
								
							
							
						 |