href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f83bae7c22
								
							
						 | 
						
							
							
								
								Views: wrap activity rendering in a rescue
							
							
							
							
							
							
							
							this avoids complete timeline breakage when an activity fucks up
rendering. 
							
						 | 
						
							2019-01-27 19:16:20 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								3a5b3c5a3a
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'pl/develop' into oembed_provider
							
							
							
							
							
						 | 
						
							2019-01-25 10:40:51 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c99b6d35a
								
							
						 | 
						
							
							
								
								Merge branch 'fix/tusky-dm' into 'develop'
							
							
							
							
							
							
							
							Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683 
							
						 | 
						
							2019-01-25 05:19:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								c9b418e547
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into 'oembed_provider'
							
							
							
							
							
							
							
							# Conflicts:
#   lib/pleroma/activity.ex 
							
						 | 
						
							2019-01-25 05:00:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								4df71cd88b
								
							
						 | 
						
							
							
								
								Merge branch 'classic-flakeids' into 'develop'
							
							
							
							
							
							
							
							Flake Ids for Users and Activities
Closes #450
See merge request pleroma/pleroma!645 
							
						 | 
						
							2019-01-25 04:59:06 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								9274cabe01
								
							
						 | 
						
							
							
								
								Use correct logic to determine "attentions" list
							
							
							
							
							
						 | 
						
							2019-01-24 23:30:43 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a3ba72d978
								
							
						 | 
						
							
							
								
								Fix clippy with one/five lines
							
							
							
							
							
						 | 
						
							2019-01-24 16:53:14 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								be43aa2875
								
							
						 | 
						
							
							
								
								FlakeId: ignore null mac for workerid, use first mac
							
							
							
							
							
						 | 
						
							2019-01-24 13:08:27 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								54ec6d09b0
								
							
						 | 
						
							
							
								
								mrf: add anti-followbot policy
							
							
							
							
							
						 | 
						
							2019-01-24 09:35:19 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4333fea1dc
								
							
						 | 
						
							
							
								
								Send "hide_network" in user_view
							
							
							
							
							
						 | 
						
							2019-01-23 19:47:51 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								4a278cd80a
								
							
						 | 
						
							
							
								
								Merge branch 's3-namespace' into 'develop'
							
							
							
							
							
							
							
							S3 uploader: support for namespaced bucket
Closes #532
See merge request pleroma/pleroma!699 
							
						 | 
						
							2019-01-23 13:25:04 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								2de208817c
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into rename/pleroma_activity_consistency
							
							
							
							
							
						 | 
						
							2019-01-23 13:05:58 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a92c43bc4b
								
							
						 | 
						
							
							
								
								Clippy!
							
							
							
							
							
						 | 
						
							2019-01-23 11:26:38 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								973c9eed18
								
							
						 | 
						
							
							
								
								Treat User.Info pinned ids as strings
							
							
							
							
							
						 | 
						
							2019-01-23 11:26:37 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e36a434b99
								
							
						 | 
						
							
							
								
								FlakeId.from_string/1: remove old, un-needed conversion
							
							
							
							
							
						 | 
						
							2019-01-23 11:26:36 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								422e60ad76
								
							
						 | 
						
							
							
								
								2019
							
							
							
							
							
						 | 
						
							2019-01-23 11:26:35 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								cdc5e6ff5c
								
							
						 | 
						
							
							
								
								ActivityPub: restrict_since/restrict_max: ignore empty param
							
							
							
							
							
						 | 
						
							2019-01-23 11:26:35 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9d63b27dcd
								
							
						 | 
						
							
							
								
								Test FlakeID old id compat & Ecto type
							
							
							
							
							
						 | 
						
							2019-01-23 11:26:34 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								28d77e373c
								
							
						 | 
						
							
							
								
								Flake Ids for Users and Activities
							
							
							
							
							
						 | 
						
							2019-01-23 11:26:27 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								707cd9389c
								
							
						 | 
						
							
							
								
								Merge branch 'fix/activity_get_by_id' into 'develop'
							
							
							
							
							
							
							
							Add get_by_id to activity.ex
See merge request pleroma/pleroma!695 
							
						 | 
						
							2019-01-22 14:28:17 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								34d59e4008
								
							
						 | 
						
							
							
								
								[#502] Fixed User.active_local_user_query to return users with nil or missing info.deactivated. Adjusted test.
							
							
							
							
							
						 | 
						
							2019-01-22 17:12:53 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								e460820fcf
								
							
						 | 
						
							
							
								
								Add get_by_id to activity.ex
							
							
							
							
							
						 | 
						
							2019-01-22 10:55:10 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f9a3269099
								
							
						 | 
						
							
							
								
								Uploader callback controller
							
							
							
							
							
						 | 
						
							2019-01-21 22:44:14 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								99763999c1
								
							
						 | 
						
							
							
								
								reverse_proxy - always override plug's cache-control
							
							
							
							
							
						 | 
						
							2019-01-21 15:17:24 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								97412d9f94
								
							
						 | 
						
							
							
								
								S3 Namespace
							
							
							
							
							
						 | 
						
							2019-01-21 14:42:16 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								8cd853ce0c
								
							
						 | 
						
							
							
								
								Merge branch '530_federator_user_info_overwrite_fix' into 'develop'
							
							
							
							
							
							
							
							[#530] Prevents user `info` from being overwritten because of race conditions
Closes #530
See merge request pleroma/pleroma!691 
							
						 | 
						
							2019-01-21 13:03:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								69454c8345
								
							
						 | 
						
							
							
								
								Merge branch 'feature/dm-sanity' into 'develop'
							
							
							
							
							
							
							
							DM sanitization
See merge request pleroma/pleroma!458 
							
						 | 
						
							2019-01-21 12:35:10 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								a4d3fec8a7
								
							
						 | 
						
							
							
								
								[#502] Code comments update.
							
							
							
							
							
						 | 
						
							2019-01-21 14:52:41 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								aa480f4a8b
								
							
						 | 
						
							
							
								
								[#530] Prevents user info from being overwritten because of race conditions
							
							
							
							
							
							
							
							and non-partial update of embed (in WebFinger.ensure_keys_present and other places). 
							
						 | 
						
							2019-01-21 14:16:51 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								7390192c03
								
							
						 | 
						
							
							
								
								Activity: mix format (2 empty lines)
							
							
							
							
							
						 | 
						
							2019-01-21 08:00:41 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								98c8184c1f
								
							
						 | 
						
							
							
								
								Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
							
							
							
							
							
						 | 
						
							2019-01-21 08:00:41 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								2fdbd4d137
								
							
						 | 
						
							
							
								
								Activity: create_activity_by_object_id_query/1 → create_by_object_ap_id/1 when is_list
							
							
							
							
							
						 | 
						
							2019-01-21 08:00:40 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f8ab1b7427
								
							
						 | 
						
							
							
								
								Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1
							
							
							
							
							
						 | 
						
							2019-01-21 08:00:38 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4ad5a0abb9
								
							
						 | 
						
							
							
								
								Activity: all_by_object_ap_id_q/1 → create_by_object_ap_id/1
							
							
							
							
							
						 | 
						
							2019-01-21 07:51:01 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								75e4c8f0b2
								
							
						 | 
						
							
							
								
								Activity: all_non_create_by_object_ap_id_q → by_object_ap_id
							
							
							
							
							
						 | 
						
							2019-01-21 07:50:57 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b82c6dc536
								
							
						 | 
						
							
							
								
								Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1
							
							
							
							
							
						 | 
						
							2019-01-21 07:49:59 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								cf1f35a93a
								
							
						 | 
						
							
							
								
								Send delete event over Mastodon streaming api
							
							
							
							
							
							
							
							Closes #116 
							
						 | 
						
							2019-01-20 13:00:46 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								f3045a179e
								
							
						 | 
						
							
							
								
								Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'
							
							
							
							
							
							
							
							I1t/pleroma 477 user search improvements
See merge request pleroma/pleroma!685 
							
						 | 
						
							2019-01-20 10:24:05 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								5834b08fe7
								
							
						 | 
						
							
							
								
								Set custom similarity limit.
							
							
							
							
							
						 | 
						
							2019-01-20 10:57:49 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								aa37313416
								
							
						 | 
						
							
							
								
								activitypub: short-circuit is_public?() with directMessage flag check
							
							
							
							
							
						 | 
						
							2019-01-20 02:33:21 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								7c9749f793
								
							
						 | 
						
							
							
								
								transmogrifier: slightly clean up fix_explicit_addressing pipeline
							
							
							
							
							
						 | 
						
							2019-01-20 02:27:48 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								420651157b
								
							
						 | 
						
							
							
								
								transmogrifier: don't apply heuristics against messages which have directMessage set true
							
							
							
							
							
						 | 
						
							2019-01-20 02:27:48 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								ddae43eb43
								
							
						 | 
						
							
							
								
								activitypub: add is_private?/is_direct? helpers
							
							
							
							
							
						 | 
						
							2019-01-20 02:27:48 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								9adc80afff
								
							
						 | 
						
							
							
								
								common api: set directMessage flag on our own posts
							
							
							
							
							
						 | 
						
							2019-01-20 02:27:48 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								75dfa1f0b0
								
							
						 | 
						
							
							
								
								mastodon api: get_visibility(): DMs never have a cc list.
							
							
							
							
							
						 | 
						
							2019-01-20 02:27:48 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								681f40ee5c
								
							
						 | 
						
							
							
								
								activitypub: transmogrifier: fix up to/cc addressing brain damage caused by mastodon-style explicit DMs
							
							
							
							
							
						 | 
						
							2019-01-20 02:27:48 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								8d06be35e0
								
							
						 | 
						
							
							
								
								activitypub: utils: add determine_explicit_mentions() and tests
							
							
							
							
							
						 | 
						
							2019-01-20 02:27:48 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								42612b1c8d
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/improve-boost-targeting' into 'develop'
							
							
							
							
							
							
							
							improve handling of non-public Announces
See merge request pleroma/pleroma!681 
							
						 | 
						
							2019-01-19 23:44:08 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								b108aeee08
								
							
						 | 
						
							
							
								
								Make use of the indices.
							
							
							
							
							
							
							
							Indices in postgresql rely on operators, so they won't be used if you use only functions. 
							
						 | 
						
							2019-01-20 00:31:17 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								44693fbf6e
								
							
						 | 
						
							
							
								
								Formating
							
							
							
							
							
						 | 
						
							2019-01-20 01:28:46 +03:00 | 
						
						
							
							
							
								
							
							
						 |