| 
								
								
									 Alex Gleason | 67726453f8 | Credo fix | 2020-09-11 14:10:52 -05:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | c361df11b4 | Docs: AdminAPI chat moderation | 2020-09-11 14:10:45 -05:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | 02d70228b5 | AdminAPI: fix delete chat message | 2020-09-11 14:10:35 -05:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | 9dd0b23da4 | AdminAPI: show chat | 2020-09-11 14:10:28 -05:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | f13b52a703 | AdminAPI: list messages in a chat | 2020-09-11 14:10:19 -05:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | c41430b23e | Refactor with Chat.for_user_query/1 | 2020-09-11 14:10:13 -05:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | fb0de07343 | AdminAPI: list chats for a user | 2020-09-11 14:10:05 -05:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | b40a627ab0 | AdminAPI: delete a chat message | 2020-09-11 14:09:58 -05:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | f88dc1937e | MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1 | 2020-09-11 14:09:50 -05:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | f1f44069ae | Fetcher: Correctly return MRF reject reason | 2020-09-11 20:00:41 +02:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 0bda85857e | Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy # Conflicts:
#	lib/pleroma/instances/instance.ex | 2020-09-11 17:19:58 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 9fb88c814d | Merge branch 'feat/log-possible-hol' into 'develop' ConnectionPool: Log possible HTTP1 blocks
See merge request pleroma/pleroma!2989 | 2020-09-11 12:50:05 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 89a7efab69 | ConnectionPool: Log possible HTTP1 blocks | 2020-09-11 15:37:39 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn | 36c9197ac3 | Apply 1 suggestion(s) to 1 file(s) | 2020-09-11 10:46:16 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 53dc61ba90 | Merge branch 'bugfix/favicon-none-found' into 'develop' instance: Handle not getting a favicon
See merge request pleroma/pleroma!2988 | 2020-09-11 10:42:25 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | dbc013f24c | instance: Handle not getting a favicon | 2020-09-11 11:37:46 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn | 03d1730f30 | Merge branch 'fix/2134-old-cron-jobs' into 'develop' Migration to remove old cron jobs
Closes #2134
See merge request pleroma/pleroma!2987 | 2020-09-11 08:58:01 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | e3ca0a7e2d | migration to remove old cron jobs | 2020-09-11 09:09:28 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | f18178cb09 | AttachmentValidator: directly embed url schema and pass it fix_media_type | 2020-09-11 01:40:20 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 1b3d5956b1 | Pipeline Ingestion: Article | 2020-09-11 01:40:20 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 2132b24a9d | object_validators: likes & announcements as [ObjectID] | 2020-09-11 01:39:39 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 846b59ccb0 | Pipeline Ingestion: Video | 2020-09-11 01:39:39 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | b73e9ef686 | transmogrifier: Call strip_internal_fields on pipeline ingestion | 2020-09-11 01:39:38 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | da876d09e8 | federator: normalize only actor, catch actor error | 2020-09-11 00:56:21 +02:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 55562ca936 | Merge branch 'develop' into feature/gen-magic | 2020-09-10 16:05:22 -05:00 |  | 
				
					
						| 
								
								
									 rinpatch | 6316350918 | Merge branch 'oban-overuse' into 'develop' Expired activities as scheduled jobs in Oban
See merge request pleroma/pleroma!2916 | 2020-09-10 19:17:15 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 4d18a50f3c | [#2497] Formatting fix. | 2020-09-10 21:54:26 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 82b56cdb9b | CHANGELOG.md: clarify that the functionality is not removed, just the config options | 2020-09-10 21:53:58 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 15aece7238 | remove validate_expires_at from enqueue method | 2020-09-10 21:52:31 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | a098e10fd6 | Document ephemeral activity changes better Also remove the example from the cheatsheet, there is no need for it
when the types are simple | 2020-09-10 21:52:30 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 2c2094d4b2 | configurable lifetime for ephemeral activities | 2020-09-10 21:51:59 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 4954667fb2 | changelog | 2020-09-10 21:51:58 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | f24828a3e8 | oban warning | 2020-09-10 21:51:30 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 29c1178c2b | migration fix | 2020-09-10 21:50:41 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | eb5ff715f7 | pin/unpin for activities with expires_at option | 2020-09-10 21:50:41 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | b3485a6dbf | little clean up | 2020-09-10 21:50:41 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 6f2d114518 | use another stream function in migration | 2020-09-10 21:50:41 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 357d971a10 | expiration for new pipeline | 2020-09-10 21:50:41 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 93e1c8df9d | reject activity creation if passed expires_at option and expiring activities are not configured | 2020-09-10 21:50:41 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 4981b5a1a3 | copyright header | 2020-09-10 21:50:41 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 5381d4b78b | drop activity_expirations table | 2020-09-10 21:50:41 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 5ad0cc4c86 | move old expirations into Oban | 2020-09-10 21:50:41 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 629a8de9cb | deprecation warning changed namespace for activity expiration configuration | 2020-09-10 21:50:41 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | de4c935071 | don't expire pinned posts | 2020-09-10 21:50:41 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 9bf1065a06 | schedule activity expiration in Oban | 2020-09-10 21:50:40 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 0254696e30 | Merge branch 'feature/1790-oban-overuse-clear-oauth-token' into 'develop' Feature/1790 removing expired tokens through Oban scheduled jobs
See merge request pleroma/pleroma!2957 | 2020-09-10 18:45:04 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 541a3eede2 | Merge branch 'chores/remove-ostatus-fixtures' into 'develop' Remove OStatus in testsuite
See merge request pleroma/pleroma!2968 | 2020-09-10 18:41:00 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 53cf7fef6e | Merge branch 'fix/streaming-termination-errors' into 'develop' Fix two pseudo-errors in websocket handler
Closes #2131
See merge request pleroma/pleroma!2982 | 2020-09-10 18:40:54 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 45c299e5b5 | Merge branch '2130-mfa-users-oauth-login-fix' into 'develop' [#2130] Fixed OAuth OOB authentication for users with enabled MFA
Closes #2130
See merge request pleroma/pleroma!2979 | 2020-09-10 18:38:48 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 275602daa7 | Streaming integration tests: remove unexpected error assumption For some reason instead of fixing unexpected errors, we made tests
assert they indeed trigger... Now that the errors are fixed these were
failing | 2020-09-10 21:28:47 +03:00 |  |