William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								5d895093fd
								
							
						 | 
						
							
							
								
								twitter api: embed card in twitterapi posts
							
							
							
							
							
						 | 
						
							2019-01-28 05:53:17 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								5a37ddc2dc
								
							
						 | 
						
							
							
								
								mastodon api: embed card in status object
							
							
							
							
							
						 | 
						
							2019-01-28 05:53:17 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								132d815f1f
								
							
						 | 
						
							
							
								
								mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data
							
							
							
							
							
						 | 
						
							2019-01-28 05:53:17 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								71bb90073b
								
							
						 | 
						
							
							
								
								/notice/:id - send the FE index even if 404
							
							
							
							
							
							
							
							this allows to open private activities by URL when you are logged in,
and to let the FE display a 404 page 
							
						 | 
						
							2019-01-27 22:51:50 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								16ab1437d6
								
							
						 | 
						
							
							
								
								Merge branch 'safe-render-activities' into 'develop'
							
							
							
							
							
							
							
							Views: wrap activity rendering in a rescue
See merge request pleroma/pleroma!723 
							
						 | 
						
							2019-01-27 20:10:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								ea12371a01
								
							
						 | 
						
							
							
								
								Merge branch 'discard-invalid-likes' into 'develop'
							
							
							
							
							
							
							
							Transmogrifier: fix incoming objects with invalid likes
See merge request pleroma/pleroma!724 
							
						 | 
						
							2019-01-27 19:10:15 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								77f2137383
								
							
						 | 
						
							
							
								
								Transmogrifier: fix incoming objects with invalid likes
							
							
							
							
							
						 | 
						
							2019-01-27 19:33:21 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								9af798ad40
								
							
						 | 
						
							
							
								
								Merge branch 'flake-random-worker-id' into 'develop'
							
							
							
							
							
							
							
							Flake: random worker id
See merge request pleroma/pleroma!721 
							
						 | 
						
							2019-01-27 15:16:06 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e0e0cc5ab0
								
							
						 | 
						
							
							
								
								Flake: random worker id
							
							
							
							
							
						 | 
						
							2019-01-27 16:04:36 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								5eb81d2c72
								
							
						 | 
						
							
							
								
								Merge branch 'features/mastoapi-multi-hashtag' into 'develop'
							
							
							
							
							
							
							
							MastodonAPI multi-hashtag
See merge request pleroma/pleroma!652 
							
						 | 
						
							2019-01-27 12:45:50 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a65c188593
								
							
						 | 
						
							
							
								
								Web.MastodonAPI.AccountView: Add is_moderator and is_admin
							
							
							
							
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/557 
							
						 | 
						
							2019-01-27 10:33:22 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								8f2f471e94
								
							
						 | 
						
							
							
								
								rich media: gracefully handle fetching nil URIs
							
							
							
							
							
						 | 
						
							2019-01-26 16:36:17 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								155a884300
								
							
						 | 
						
							
							
								
								Merge branch 'flake-from-int' into 'develop'
							
							
							
							
							
							
							
							Flake: support integers in from_string/1
See merge request pleroma/pleroma!715 
							
						 | 
						
							2019-01-26 16:17:50 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								d6015338c8
								
							
						 | 
						
							
							
								
								Flake: support integers in from_string/1
							
							
							
							
							
							
							
							Some previously issued stateless tokens have integer ids in them. 
							
						 | 
						
							2019-01-26 16:58:23 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								3e66723f7e
								
							
						 | 
						
							
							
								
								Merge branch 'join-in-preloads' into 'develop'
							
							
							
							
							
							
							
							Join on preloads to avoid N+1 queries
See merge request pleroma/pleroma!714 
							
						 | 
						
							2019-01-26 15:57:02 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								de956b9e04
								
							
						 | 
						
							
							
								
								Web.MastodonAPI.MastodonAPIController: tag+any bookmark params in a array and flatten it
							
							
							
							
							
						 | 
						
							2019-01-26 16:46:20 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								1f7843b9b8
								
							
						 | 
						
							
							
								
								mastodon api: use OGP uri instead of page_url for deducing domain name, fix test
							
							
							
							
							
						 | 
						
							2019-01-26 15:24:16 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								86037e9c39
								
							
						 | 
						
							
							
								
								mastodon api: use HTML.extract_first_external_url()
							
							
							
							
							
						 | 
						
							2019-01-26 15:13:27 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								8018ae7ae5
								
							
						 | 
						
							
							
								
								Join on preloads to avoid N+1 queries
							
							
							
							
							
						 | 
						
							2019-01-26 15:55:53 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								be9abb2cc5
								
							
						 | 
						
							
							
								
								html: add utility function to extract first URL from an object and cache the result
							
							
							
							
							
						 | 
						
							2019-01-26 14:55:12 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								78047d57bf
								
							
						 | 
						
							
							
								
								mastodon api: provider_name setting is required too on the card
							
							
							
							
							
						 | 
						
							2019-01-26 14:47:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
							
							
								
							
							
								39863236eb
								
							
						 | 
						
							
							
								
								Web.MastodonAPI.MastodonAPIController: generic get_status_card/1 function for MastoAPI 2.6.x
							
							
							
							
							
							
							
							Mastodon API 2.6.x added a card key to the Status object so the Card can be shown in the timeline without an extra request at each status. 
							
						 | 
						
							2019-01-26 14:18:23 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
							
							
								
							
							
								3f64379b13
								
							
						 | 
						
							
							
								
								Web.MastodonAPI.MastodonAPIController: Add Rich-Media support
							
							
							
							
							
						 | 
						
							2019-01-26 14:18:23 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5a84def6a6
								
							
						 | 
						
							
							
								
								Fix the logic in multi-hashtag TLs
							
							
							
							
							
						 | 
						
							2019-01-26 04:46:02 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4ad0ad14ed
								
							
						 | 
						
							
							
								
								Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests
							
							
							
							
							
						 | 
						
							2019-01-26 04:46:01 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								1a9bb4daa0
								
							
						 | 
						
							
							
								
								[Web.ActivityPub.ActivityPub]: Fix restrict_tag()
							
							
							
							
							
							
							
							Thanks to Senko-san <kurisu@iscute.moe> for the help on array-matching 
							
						 | 
						
							2019-01-26 04:46:01 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f9cae0d04f
								
							
						 | 
						
							
							
								
								[WIP,MastoAPI] Multi-tag timelines
							
							
							
							
							
						 | 
						
							2019-01-26 04:45:36 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								15aa45ae8a
								
							
						 | 
						
							
							
								
								Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities with content: nil
							
							
							
							
							
						 | 
						
							2019-01-26 03:50:49 +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 | 
						
						
							
							
							
								
							
							
						 |