| 
								
								
									 Sean King | 2780cdd4e7 | Add CHANGELOG entry | 2021-04-19 16:06:19 -06:00 |  | 
				
					
						| 
								
								
									 Sean King | d1eb1913e8 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/opt-out-of-google-floc | 2021-04-19 15:42:38 -06:00 |  | 
				
					
						| 
								
								
									 feld | 7183655a07 | Merge branch 'fix/tests' into 'develop' Fix tests broken since !3312
See merge request pleroma/pleroma!3395 | 2021-04-19 21:34:38 +00:00 |  | 
				
					
						| 
								
								
									 Mark Felder | efed94a23e | Fix error response which was breaking tests related to pinned posts | 2021-04-19 16:23:57 -05:00 |  | 
				
					
						| 
								
								
									 Sean King | 2b4f958b2a | Add opting out of Google FLoC to HTTPSecurityPlug headers | 2021-04-18 14:00:18 -06:00 |  | 
				
					
						| 
								
								
									 rinpatch | c6dcd863e2 | Apply rinpatch's suggestion(s) to 1 file(s) | 2021-04-16 09:59:50 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 15f87cf658 | Merge branch 'features/ingestion-ecto-tag' into 'develop' TagValidator: New
See merge request pleroma/pleroma!3244 | 2021-04-16 09:55:55 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 79376b4afb | Merge branch 'feature/521-pinned-post-federation' into 'develop' Pinned posts federation
Closes #521
See merge request pleroma/pleroma!3312 | 2021-04-16 09:53:47 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 0ababdc068 | Merge branch 'fix/2593-reading-exported-config-file' into 'develop' Reading the file, instead of config keyword in ReleaseRuntimeProvider
Closes #2593
See merge request pleroma/pleroma!3381 | 2021-04-16 09:50:26 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn | 152cb3074e | Merge branch 'fix/notifsettings-breaking-login' into 'develop' Enforce user.notification_settings is NOT NULL
Closes #2571
See merge request pleroma/pleroma!3386 | 2021-04-15 21:34:55 +00:00 |  | 
				
					
						| 
								
								
									 feld | 0a7c2a32ba | Merge branch 'develop' into 'fix/notifsettings-breaking-login' # Conflicts:
#   CHANGELOG.md | 2021-04-15 14:59:26 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn | 0ba8efc950 | Merge branch 'fix/mastodon-interface-docs-link' into 'develop' Fix Mastodon interface link in documentation, fixes #2622
Closes #2622
See merge request pleroma/pleroma!3391 | 2021-04-15 05:44:01 +00:00 |  | 
				
					
						| 
								
								
									 Sean King | d9fce0133e | Fix Mastodon interface link | 2021-04-14 14:01:33 -06:00 |  | 
				
					
						| 
								
								
									 feld | 1bf2b645c5 | Merge branch 'fix/adminapi-concurrent-limiter' into 'develop' Fix ConcurrentLimiter settings via AdminAPI
See merge request pleroma/pleroma!3390 | 2021-04-14 16:52:02 +00:00 |  | 
				
					
						| 
								
								
									 Mark Felder | f95b52255b | Revert guards on string_to_elixir_types/1, remove unnecessary assignment in test | 2021-04-14 09:39:57 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | c3b8c77967 | Improve string_to_elixir_types/1 with guards | 2021-04-13 14:39:57 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 861f192852 | Document fixed ability to save ConcurrentLimiter settings in ConfigDB | 2021-04-13 14:39:44 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | ee53ad4d77 | Add ConcurrentLimiter to module_name?/1 and apply string_to_elixir_types/1 to search_opts keys during update_or_create/1 | 2021-04-13 14:39:31 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 905efc57e9 | Initial test validating the AdminAPI issue | 2021-04-13 14:39:28 -05:00 |  | 
				
					
						| 
								
								
									 Haelwenn | d2a03d3c86 | Merge branch 'fix/instance-thumbnail-url' into 'develop' Fix URL to custom instance thumbnail
Closes #2611
See merge request pleroma/pleroma!3388 | 2021-04-13 19:05:07 +00:00 |  | 
				
					
						| 
								
								
									 Mark Felder | cdd271b065 | Fix assignment / assertion | 2021-04-13 10:55:54 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 9fbcdc15b1 | Validate custom instance thumbnail set via AdminAPI produces correct URL | 2021-04-13 10:52:53 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 0feafcc20c | Use URI.merge to prevent concatenating two canonical URLs when a custom instance thumbnail was uploaded via AdminFE | 2021-04-09 10:30:27 -05:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 681a42c359 | release runtime provider fix for paths | 2021-04-08 15:45:31 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 5ef4659b37 | test/pleroma/web/common_api_test.exs: Strip : around emoji key-name | 2021-04-05 19:25:55 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 6d6bef64bf | fetcher_test: Remove assert on fake Create having an ap_id | 2021-04-05 19:19:12 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 53193b84b1 | utils: Fix maybe_splice_recipient when "object" isn’t a map | 2021-04-05 19:19:12 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 0b88accae6 | fetcher_test: Fix missing mock function | 2021-04-05 19:19:12 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 6c9f6e62c8 | transmogrifier: Fixing votes from Note to Answer | 2021-04-05 19:19:12 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 461123110b | Object.Fetcher: Fix getting transmogrifier reject reason | 2021-04-05 19:19:12 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | b0c778fde7 | NoteHandlingTest: remove fix_explicit_addressing-related test | 2021-04-05 19:19:12 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | d1205406d9 | ActivityPubControllerTest: Apply same addr changes to object | 2021-04-05 19:19:12 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 96212b2e32 | Fix addressing | 2021-04-05 19:19:12 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 641184fc7a | recipients fixes/hardening for CreateGenericValidator | 2021-04-05 19:19:11 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | c944932674 | Pipeline Ingestion: Note | 2021-04-05 19:19:11 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | e2a3365b5c | ObjectValidator.CommonFixes: Introduce fix_objects_defaults and fix_activity_defaults | 2021-04-05 19:19:11 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | e56779dd8d | Transmogrifier: Simplify fix_explicit_addressing and fix_implicit_addressing | 2021-04-05 19:19:11 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | ef36f7fa5c | Move tag fixup to object_validator | 2021-04-05 19:07:45 +02:00 |  | 
				
					
						| 
								
								
									 feld | f8cef70416 | Merge branch 'chore/CHANGELOG' into 'develop' Fix CHANGELOG entry meant for next release
See merge request pleroma/pleroma!3387 | 2021-04-01 15:26:46 +00:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 31ce8a3730 | Fix CHANGELOG entry meant for next release | 2021-04-01 10:15:01 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 765f0907df | Document user login failure fix for NULL notification_settings | 2021-04-01 10:07:57 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 4ecf6ceea6 | Enforce user.notification_settings is NOT NULL | 2021-04-01 10:06:24 -05:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 7ebfe89900 | object_validators: Mark validate_data as private | 2021-04-01 14:18:41 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 37a7f521fd | Insert string-hashtags in Pipeline Cannot be done in Ecto schemas because only one type is allowed in arrays, and
needs to be done before the MRFs. | 2021-04-01 14:18:41 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 5ae27c8451 | pipeline_test: Fix usage of %Activity{} | 2021-04-01 14:18:40 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 9015df2229 | TagValidator: New | 2021-04-01 14:18:40 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn | 96fe4dd4e2 | Merge branch 'revert-c368bf6d' into 'develop' Revert "Merge branch 'patch-fix-open-api-spec' into 'develop'"
See merge request pleroma/pleroma!3385 | 2021-04-01 12:11:21 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn | 1e3db07586 | Revert "Merge branch 'patch-fix-open-api-spec' into 'develop'" This reverts merge request !3382 | 2021-04-01 12:00:58 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | ce9ed6c730 | Merge branch 'refactor/object_validator_validate' into 'develop' object_validator: Refactor most of validate/2 to a generic block
See merge request pleroma/pleroma!3383 | 2021-04-01 11:10:12 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | af1cd28f9b | object_validator: Refactor most of validate/2 to a generic block | 2021-04-01 12:18:52 +02:00 |  |