lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								6c2903d9a1
								
							
						 | 
						
							
							
								
								Merge branch 'feld-warnings' into 'develop'
							
							
							
							
							
							
							
							Clean up warnings
See merge request pleroma/pleroma!144 
							
						 | 
						
							2018-05-06 18:42:31 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								9810153aeb
								
							
						 | 
						
							
							
								
								Streamer: Don't send out stream events for blocked users.
							
							
							
							
							
						 | 
						
							2018-05-05 13:40:47 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								c464355d1a
								
							
						 | 
						
							
							
								
								Idempotency: Use special cache, keep for 6 hours.
							
							
							
							
							
						 | 
						
							2018-05-05 11:15:57 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								ab4aa5720a
								
							
						 | 
						
							
							
								
								Fix a bunch of unused variable warnings
							
							
							
							
							
						 | 
						
							2018-05-04 20:59:01 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								90c4bed0af
								
							
						 | 
						
							
							
								
								Don't expire idempotency cache for five minutes.
							
							
							
							
							
						 | 
						
							2018-05-04 21:15:39 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								fcd3eca167
								
							
						 | 
						
							
							
								
								MastodonAPI: Support idempotency key.
							
							
							
							
							
						 | 
						
							2018-05-04 20:30:29 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								bc215f5684
								
							
						 | 
						
							
							
								
								Fix format.
							
							
							
							
							
						 | 
						
							2018-04-29 11:28:26 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								b7584edcea
								
							
						 | 
						
							
							
								
								Merge branch 'patch-bio' into 'develop'
							
							
							
							
							
							
							
							replace newlines in profiles with <br>
See merge request pleroma/pleroma!136 
							
						 | 
						
							2018-04-29 09:26:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								a7a40bb8f1
								
							
						 | 
						
							
							
								
								Merge branch 'fix/blocked-user-boosts' into 'develop'
							
							
							
							
							
							
							
							ActivityPub.ex: do not return boosted statuses from blocked users.
See merge request pleroma/pleroma!111 
							
						 | 
						
							2018-04-28 13:49:12 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Wim Vanderbauwhede
								
							 
						 | 
						
							
							
							
							
								
							
							
								6908f29e0a
								
							
						 | 
						
							
							
								
								Added a test (written by @andrewzah) for the MR
							
							
							
							
							
						 | 
						
							2018-04-28 12:01:43 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Dashie
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9972678a68
								
							
						 | 
						
							
							
								
								Add User.decrease_note_count and call it from ActivityPub.delete
							
							
							
							
							
						 | 
						
							2018-04-24 11:34:18 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								0574df273c
								
							
						 | 
						
							
							
								
								Small cleanup.
							
							
							
							
							
						 | 
						
							2018-04-22 10:01:10 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								114ca9e069
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into fix/note-count-not-updating
							
							
							
							
							
						 | 
						
							2018-04-22 09:56:24 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								0c221943ef
								
							
						 | 
						
							
							
								
								Formatter: Use proper escaping for links.
							
							
							
							
							
						 | 
						
							2018-04-21 18:27:31 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								22bfeac256
								
							
						 | 
						
							
							
								
								Update note count in ActivityPub.create.
							
							
							
							
							
						 | 
						
							2018-04-21 12:58:04 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								9e6ae44729
								
							
						 | 
						
							
							
								
								Formatting fixes.
							
							
							
							
							
						 | 
						
							2018-04-21 09:43:53 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								a61e8ac154
								
							
						 | 
						
							
							
								
								Formatting.
							
							
							
							
							
						 | 
						
							2018-04-20 13:10:57 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								fa37acfcc7
								
							
						 | 
						
							
							
								
								TwitterAPI: Add Qvitter notification endpoint.
							
							
							
							
							
						 | 
						
							2018-04-19 21:46:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								48380aeccc
								
							
						 | 
						
							
							
								
								ActivityPub.ex: do not return boosted statuses from blocked users.
							
							
							
							
							
						 | 
						
							2018-04-14 14:26:20 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Gian Sass
								
							 
						 | 
						
							
							
							
							
								
							
							
								2de2e29df2
								
							
						 | 
						
							
							
								
								Oops
							
							
							
							
							
						 | 
						
							2018-04-11 15:51:02 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Gian Sass
								
							 
						 | 
						
							
							
							
							
								
							
							
								3a5c0465eb
								
							
						 | 
						
							
							
								
								Add unit test for pinned statuses
							
							
							
							
							
						 | 
						
							2018-04-11 15:48:32 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								70bcdf32bd
								
							
						 | 
						
							
							
								
								Only search in public data for now.
							
							
							
							
							
							
							
							This should be the data the user is allowed to see later, but this
will stop accidental private message leaks. 
							
						 | 
						
							2018-04-07 16:40:45 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								60f92e406c
								
							
						 | 
						
							
							
								
								Accept port number in urls.
							
							
							
							
							
						 | 
						
							2018-04-06 16:35:54 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								81600c94f4
								
							
						 | 
						
							
							
								
								Handle + in links.
							
							
							
							
							
						 | 
						
							2018-04-04 11:29:03 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								806550c921
								
							
						 | 
						
							
							
								
								Use user url in mention if we have it.
							
							
							
							
							
						 | 
						
							2018-04-03 18:32:46 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								b3b7ab5d9a
								
							
						 | 
						
							
							
								
								Load all users at once in timelines.
							
							
							
							
							
						 | 
						
							2018-04-02 16:35:41 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								360c51f1f5
								
							
						 | 
						
							
							
								
								Use context_ids directly if we have them.
							
							
							
							
							
						 | 
						
							2018-04-02 15:28:35 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								bc31bee7c4
								
							
						 | 
						
							
							
								
								Generates contexts and ids on insertion time.
							
							
							
							
							
						 | 
						
							2018-04-02 15:17:09 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								a4db3a732f
								
							
						 | 
						
							
							
								
								Pre-fetch conversation ids.
							
							
							
							
							
						 | 
						
							2018-04-02 14:46:56 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								0a14d155d6
								
							
						 | 
						
							
							
								
								Fail faster.
							
							
							
							
							
						 | 
						
							2018-04-02 13:13:14 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								1b57522bba
								
							
						 | 
						
							
							
								
								Fix some test stuff.
							
							
							
							
							
						 | 
						
							2018-04-02 13:13:04 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								2222e5599c
								
							
						 | 
						
							
							
								
								Don't fetch anything except ap_id for follower / following
							
							
							
							
							
							
							
							collections.
Should speed up the queries because ecto doesn't have to parse the json. 
							
						 | 
						
							2018-03-31 20:02:09 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								802736679c
								
							
						 | 
						
							
							
								
								Remove unused ActivityRepresenter module.
							
							
							
							
							
						 | 
						
							2018-03-30 16:50:30 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								e90f8f6c4b
								
							
						 | 
						
							
							
								
								TwApi ActivityView: Add delete activities.
							
							
							
							
							
						 | 
						
							2018-03-30 15:32:43 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								1f32ba052c
								
							
						 | 
						
							
							
								
								TwApi ActivityView: Add follows.
							
							
							
							
							
						 | 
						
							2018-03-30 15:17:13 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4afbef39f4
								
							
						 | 
						
							
							
								
								Format the code.
							
							
							
							
							
						 | 
						
							2018-03-30 15:01:53 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								c1d529ee94
								
							
						 | 
						
							
							
								
								TwApi ActivityView: Add announces.
							
							
							
							
							
						 | 
						
							2018-03-30 14:46:36 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								1f1caab138
								
							
						 | 
						
							
							
								
								TwApi ActivityView: Add Like rendering.
							
							
							
							
							
						 | 
						
							2018-03-30 13:49:09 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								361016349f
								
							
						 | 
						
							
							
								
								Add ActivityViewTest.
							
							
							
							
							
						 | 
						
							2018-03-30 12:57:55 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								e30752bc79
								
							
						 | 
						
							
							
								
								Add basic activity view.
							
							
							
							
							
						 | 
						
							2018-03-27 22:24:19 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								37e5014d3e
								
							
						 | 
						
							
							
								
								Reduce OP fetching queries.
							
							
							
							
							
						 | 
						
							2018-03-27 18:18:24 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								ff7afe46b9
								
							
						 | 
						
							
							
								
								Don't try to fetch OP if none is there.
							
							
							
							
							
						 | 
						
							2018-03-27 17:43:08 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								9556c8f6e7
								
							
						 | 
						
							
							
								
								Forgot to fix one of the links in a test
							
							
							
							
							
						 | 
						
							2018-03-27 02:08:46 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								5ba2f4b6d8
								
							
						 | 
						
							
							
								
								Update tests to reflect hashtag link changes
							
							
							
							
							
						 | 
						
							2018-03-27 02:07:07 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								2aea3bc632
								
							
						 | 
						
							
							
								
								activitypub transmogrifier: rewrite incoming hashtags
							
							
							
							
							
						 | 
						
							2018-03-24 16:42:17 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								e3a81fe58f
								
							
						 | 
						
							
							
								
								Fetch the same data from json webfinger as from xml webfinger.
							
							
							
							
							
						 | 
						
							2018-03-24 14:45:54 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								eb7ce61ca5
								
							
						 | 
						
							
							
								
								Fix hashtags.
							
							
							
							
							
						 | 
						
							2018-03-24 11:03:10 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								5da2355e71
								
							
						 | 
						
							
							
								
								For outgoing objects, fake mastodon style ap id for ostatus.
							
							
							
							
							
						 | 
						
							2018-03-23 16:07:02 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								32ae918843
								
							
						 | 
						
							
							
								
								Clear caches on test.
							
							
							
							
							
						 | 
						
							2018-03-22 12:44:32 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								ff7afc0465
								
							
						 | 
						
							
							
								
								tests: webfinger: test quering a JSON response for activitypub actor URI
							
							
							
							
							
						 | 
						
							2018-03-22 00:36:13 -05:00 | 
						
						
							
							
							
								
							
							
						 |