| 
								
								
									 Ivan Tashkinov | 1a4875adfa | [#1559] Support for "follow_request" notifications (configurable). (Not currently supported by PleromaFE, thus disabled by default). | 2020-04-07 21:52:32 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | dd4d10b275 | Merge branch 'fix-auto-link-for-profile-fields' into 'develop' Use Pleroma.Formatter.linkify/2 instead
See merge request pleroma/pleroma!2352 | 2020-04-07 11:41:10 +00:00 |  | 
				
					
						| 
								
								
									 lain | 1d4ab06505 | Merge branch 'featureflag/emoji_reactions' into 'develop' Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313 | 2020-04-06 12:51:35 +00:00 |  | 
				
					
						| 
								
								
									 lain | 349b9d86dc | Merge branch 'remake-remodel-2' into 'develop' Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315 | 2020-04-06 11:59:01 +00:00 |  | 
				
					
						| 
								
								
									 lain | 772bc258cd | ObjectID Validator: Refactor. | 2020-04-06 13:53:24 +02:00 |  | 
				
					
						| 
								
								
									 lain | e67cde0ed6 | Transmogrifier: Refactoring / Renaming. | 2020-04-06 13:46:34 +02:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | aa78325117 | [#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests. | 2020-04-02 19:23:30 +03:00 |  | 
				
					
						| 
								
								
									 feld | ef7d2b0f11 | Merge branch 'gun' into 'develop' Gun adapter
Closes #945
See merge request pleroma/pleroma!1861 | 2020-04-01 17:05:09 +00:00 |  | 
				
					
						| 
								
								
									 lain | 037b49c415 | Validators: Correct ObjectID filename | 2020-04-01 16:10:17 +02:00 |  | 
				
					
						| 
								
								
									 rinpatch | bfec45bf74 | Merge branch 'fix/1601-add-new-meta-tag' into 'develop' Restrict remote users from indexing
Closes #1601
See merge request pleroma/pleroma!2341 | 2020-04-01 12:55:52 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 94ddbe4098 | restrict remote users from indexing | 2020-04-01 09:57:12 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 185520d1b4 | Provide known-good user.uri, remove User.profile_url/1 | 2020-03-31 23:55:29 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | b30fb1f3bb | User: Fix use of source_data in profile_url/1 | 2020-03-31 23:54:20 +02:00 |  | 
				
					
						| 
								
								
									 kPherox | 7408f003a6 | Use Pleroma.Formatter.linkifyinstead ofAutoLinker.link | 2020-04-01 02:52:30 +09:00 |  | 
				
					
						| 
								
								
									 lain | c982093cc2 | Transmogrifier: Fix BAD code by RINPATCH | 2020-03-31 19:33:41 +02:00 |  | 
				
					
						| 
								
								
									 lain | 1b323ce1c6 | Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex | 2020-03-31 17:28:18 +00:00 |  | 
				
					
						| 
								
								
									 lain | ecac57732a | Transmogrifier: Only add context if it really is onne. | 2020-03-31 19:16:45 +02:00 |  | 
				
					
						| 
								
								
									 lain | 51fc504705 | Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2 | 2020-03-31 19:06:08 +02:00 |  | 
				
					
						| 
								
								
									 lain | 288f2b5a7c | Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex | 2020-03-31 17:00:55 +00:00 |  | 
				
					
						| 
								
								
									 lain | 0be1fa0a86 | Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex | 2020-03-31 17:00:48 +00:00 |  | 
				
					
						| 
								
								
									 lain | 057438a657 | CommonAPI: DRY up a bit. | 2020-03-31 17:56:05 +02:00 |  | 
				
					
						| 
								
								
									 lain | 643f15e77b | Validators: ObjectID is an http uri. | 2020-03-31 16:11:38 +02:00 |  | 
				
					
						| 
								
								
									 kPherox | d191b0942f | Remove no longer used function | 2020-03-31 22:50:18 +09:00 |  | 
				
					
						| 
								
								
									 lain | f6835333be | Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex | 2020-03-31 12:55:25 +00:00 |  | 
				
					
						| 
								
								
									 lain | 8bd5ad8664 | Merge branch 'benchmark-improvements' into 'develop' Benchmark improvements
See merge request pleroma/pleroma!2308 | 2020-03-30 14:48:00 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | b607ae1a1c | removing grouped reports admin api endpoint | 2020-03-30 13:51:45 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 1fcdcb12a7 | updating gun with bug fix https://github.com/ninenines/gun/issues/222 | 2020-03-30 12:47:12 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | f497cf2f7c | Merge branch 'develop' into gun | 2020-03-30 12:15:23 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | eb9744cade | activities generation tasks | 2020-03-30 11:42:25 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn | e999c67cee | Merge branch 'feature/funkwhale-audio' into 'develop' Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287 | 2020-03-29 19:18:22 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | dfbc05d496 | Misc refactoring / tweaks ( ThreadMute.exists?/2). | 2020-03-27 08:01:03 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 6b793d3f83 | Ensured no auxiliary computations (actors list preparation etc.) related to relationships preloading if no user is present (for statuses / accounts / relationships rendering). | 2020-03-26 21:54:01 +03:00 |  | 
				
					
						| 
								
								
									 lain | 29ab1d9f8d | Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2 | 2020-03-26 17:24:10 +01:00 |  | 
				
					
						| 
								
								
									 lain | 69fc1dd69f | Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex | 2020-03-26 14:45:28 +00:00 |  | 
				
					
						| 
								
								
									 lain | 0c60c0a76a | Validators: Use correct type for IDs. | 2020-03-26 15:44:14 +01:00 |  | 
				
					
						| 
								
								
									 lain | 0adaab8e75 | Bump copyright dates. | 2020-03-26 15:37:42 +01:00 |  | 
				
					
						| 
								
								
									 lain | eaacc64839 | Refactors. | 2020-03-26 15:33:10 +01:00 |  | 
				
					
						| 
								
								
									 lain | ee979dd6d7 | Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2 | 2020-03-26 15:24:06 +01:00 |  | 
				
					
						| 
								
								
									 lain | d7aa0b645b | Apply suggestion to lib/pleroma/web/activity_pub/object_validator.ex | 2020-03-26 14:23:19 +00:00 |  | 
				
					
						| 
								
								
									 lain | 4cf1007a7d | ActivityPub: Small refactor. | 2020-03-26 15:16:54 +01:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 112101ca52 | Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering # Conflicts:
#	lib/pleroma/thread_mute.ex | 2020-03-26 09:43:58 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | af820f8cf1 | Merge branch 'benchmark_timeline' into 'develop' Benchmarks: Add timeline benchmark
See merge request pleroma/pleroma!2325 | 2020-03-25 18:06:00 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 460e41585c | Further preloading (more endpoints), refactoring, tests. | 2020-03-25 20:33:34 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | be5e2c4dbb | Applied relationships preloading to GET /api/v1/accounts/relationships. Refactoring (User.binary_id/1). | 2020-03-25 17:01:45 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 3fa3d45dbe | [#1364] Minor improvements / comments. Further fixes of incorrect usage of "relations" as a short form of "relationships". | 2020-03-25 13:05:00 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 012d428e1f | Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control | 2020-03-25 09:05:17 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | e743c22329 | Fixed incorrect usage of "relations" as a short form of "relationships". | 2020-03-25 09:04:00 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 212c31c637 | Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions | 2020-03-24 20:32:49 +01:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 8f1d622b8d | Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering | 2020-03-24 22:15:37 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 13cbb9f6ad | Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related). | 2020-03-24 22:14:26 +03:00 |  |