| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 7a4228be5a | fix for new instances | 2019-06-16 10:01:15 +00: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 |  | 
				
					
						| 
								
								
									 lain | 7f48b90bfb | Merge branch 'fix/hashtag-rich-media' into 'develop' Fix hashtags being picked up by rich media parser
Closes #989
See merge request pleroma/pleroma!1288 | 2019-06-14 11:52:04 +00:00 |  | 
				
					
						| 
								
								
									 Maksim | ee4ed87fb4 | [#948] /api/v1/account_search added optional parameters (limit, offset, following) | 2019-06-14 11:39:57 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | d0ebc0edf3 | Fix hashtags being picked up by rich media parser Closes #989 | 2019-06-14 14:34:42 +03:00 |  | 
				
					
						| 
								
								
									 Egor | 58a094b605 | Add copyright info to containment.ex | 2019-06-14 09:26:36 +00:00 |  | 
				
					
						| 
								
								
									 lain | eac298083f | MastodonAPI: Add a way to update the background image. | 2019-06-14 11:19:22 +02:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | b22b10d3aa | Improve rate limiter documentation Documents how to disable rate limiting | 2019-06-14 15:02:10 +07:00 |  | 
				
					
						| 
								
								
									 lain | 315f090f59 | Prometheus: Remove flaky process collection NIF. | 2019-06-13 20:30:04 +02:00 |  | 
				
					
						| 
								
								
									 lain | 5965efb216 | AccountView: Add user background. | 2019-06-13 19:08:05 +02:00 |  | 
				
					
						| 
								
								
									 lain | 6f5a0cc14e | Merge branch 'fix/ogp-title' into 'develop' Rich Media Parser: Attempt to use <title> from HTML as a fallback
Closes #979
See merge request pleroma/pleroma!1277 | 2019-06-13 13:26:39 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 30e54fd7e2 | Handle HTTP 404 response | 2019-06-13 17:13:35 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | afae3ada22 | Handle HTTP "410 Gone" response | 2019-06-13 16:34:03 +07: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 |  | 
				
					
						| 
								
								
									 lain | f46c628e6b | Merge branch 'update_auto_linker' into 'develop' Update `auto_linker` dependency
See merge request pleroma/pleroma!1272 | 2019-06-12 09:52:29 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 817c66bc3e | Remove search result order for non-RUM indexes | 2019-06-12 16:22:56 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | bf22ed5fbd | Update auto_linkerdependency | 2019-06-12 15:53:33 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 6f29865d43 | Add option to restrict all users to local content | 2019-06-11 21:25:53 +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/2rate 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 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 2e5affce61 | Add RateLimiter | 2019-06-11 14:27:41 +07:00 |  | 
				
					
						| 
								
								
									 kaniini | f2d72b1fe4 | Merge branch 'preload-changes' into 'develop' Conversations: Fetch users in one query.
See merge request pleroma/pleroma!1258 | 2019-06-11 02:37:08 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 3ecfe2a6d4 | Merge branch 'develop' into feature/releases | 2019-06-09 13:55:32 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 2a659b35f1 | Add migrate/rollback to release tasks | 2019-06-09 13:33:44 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 7223c1b643 | Use Mix.shell().yes? if available | 2019-06-08 20:10:48 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | d7ec0898e5 | Make mix tasks work in a release | 2019-06-08 17:40:40 +03:00 |  | 
				
					
						| 
								
								
									 lain | 1e0fa899b6 | Merge branch 'fix/transmogrifier-inReplyTo' into 'develop' Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched
See merge request pleroma/pleroma!1259 | 2019-06-08 10:22:15 +00: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 | 970f71e222 | Conversations: Fetch users in one query. | 2019-06-07 17:51:47 +02:00 |  |