William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								856b5e1ca4 
								
							 
						 
						
							
							
								
								config: chase pleroma-fe updates from MR pleroma-fe!324.  
							
							 
							
							
							
						 
						
							2018-08-31 04:01:21 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								a26d5e6b2a 
								
							 
						 
						
							
							
								
								Merge branch 'feature/rich-text' into 'develop'  
							
							 
							
							... 
							
							
							
							rich text support
See merge request pleroma/pleroma!309  
							
						 
						
							2018-08-31 03:41:00 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								6aa65b68b8 
								
							 
						 
						
							
							
								
								common api: add support for formatting messages outside of twitter-style plain text  
							
							 
							
							
							
						 
						
							2018-08-31 03:13:59 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								e838969495 
								
							 
						 
						
							
							
								
								Merge branch 'use-media-proxy-in-suggestions-api' into 'develop'  
							
							 
							
							... 
							
							
							
							use media proxy for the suggestions api
See merge request pleroma/pleroma!305  
							
						 
						
							2018-08-30 23:06:30 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								65e8d47cfb 
								
							 
						 
						
							
							
								
								Merge branch 'backendhack' into 'develop'  
							
							 
							
							... 
							
							
							
							Flexible Storage Backends
See merge request pleroma/pleroma!304  
							
						 
						
							2018-08-30 23:05:01 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thurloat 
								
							 
						 
						
							
							
							
							
								
							
							
								adffad5502 
								
							 
						 
						
							
							
								
								increase uploader behaviour documentation accuracy.  
							
							 
							
							
							
						 
						
							2018-08-30 09:20:29 -03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thurloat 
								
							 
						 
						
							
							
							
							
								
							
							
								af01f0196a 
								
							 
						 
						
							
							
								
								Add backend failure handling with :ok | :error so the uploader can handle it.  
							
							 
							
							... 
							
							
							
							defaulting to :ok, since that's the currently level of error handling. 
							
						 
						
							2018-08-29 22:07:28 -03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								29b5e30c46 
								
							 
						 
						
							
							
								
								activity: drop recipients_to/recipients_cc fields  
							
							 
							
							
							
						 
						
							2018-08-29 18:41:02 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								de9acebbf3 
								
							 
						 
						
							
							
								
								activitypub: use jsonb query for containment instead of recipients_to/recipients_cc.  
							
							 
							
							
							
						 
						
							2018-08-29 18:41:02 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ddc6f32b75 
								
							 
						 
						
							
							
								
								Fix Mastodon API when actor's nickname is null  
							
							 
							
							
							
						 
						
							2018-08-29 16:32:50 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								cce9d008f9 
								
							 
						 
						
							
							
								
								streamer: contain list updates in the same way as we do with the database query  
							
							 
							
							
							
						 
						
							2018-08-29 09:23:05 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ded9091206 
								
							 
						 
						
							
							
								
								mastodon api: use bounded AP object graph query to enforce containment of private statuses  
							
							 
							
							
							
						 
						
							2018-08-29 08:51:51 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								643fae6e36 
								
							 
						 
						
							
							
								
								activitypub: allow querying the activity/object graph bounded to a specific to/cc set  
							
							 
							
							
							
						 
						
							2018-08-29 08:51:23 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								81673b8136 
								
							 
						 
						
							
							
								
								activity: add recipients_to and recipients_cc fields  
							
							 
							
							
							
						 
						
							2018-08-29 08:42:33 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thurloat 
								
							 
						 
						
							
							
							
							
								
							
							
								d424e9fa5f 
								
							 
						 
						
							
							
								
								fix S3 ref in sample config to generate proper path.  
							
							 
							
							
							
						 
						
							2018-08-28 23:49:23 -03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thurloat 
								
							 
						 
						
							
							
							
							
								
							
							
								ab9e5d64d6 
								
							 
						 
						
							
							
								
								add a sample swift config  
							
							 
							
							
							
						 
						
							2018-08-28 22:39:33 -03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thurloat 
								
							 
						 
						
							
							
							
							
								
							
							
								2ff25ac0ce 
								
							 
						 
						
							
							
								
								A hobbldey-working swift client.  
							
							 
							
							... 
							
							
							
							apparently, all elixir openstack libraries are trash
luckily, the APIs are stupid easy. 
							
						 
						
							2018-08-28 22:32:24 -03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thurloat 
								
							 
						 
						
							
							
							
							
								
							
							
								9fc20ed572 
								
							 
						 
						
							
							
								
								works now, tested with profile photo upload on local backend.  
							
							 
							
							
							
						 
						
							2018-08-28 20:04:26 -03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thurloat 
								
							 
						 
						
							
							
							
							
								
							
							
								dad39b24a1 
								
							 
						 
						
							
							
								
								add the behaviour, work on actually making it work.  
							
							 
							
							
							
						 
						
							2018-08-28 19:48:03 -03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thurloat 
								
							 
						 
						
							
							
							
							
								
							
							
								8d2d7a8859 
								
							 
						 
						
							
							
								
								Implement uploader behaviour  
							
							 
							
							... 
							
							
							
							run formatter <# 
							
						 
						
							2018-08-28 09:57:41 -03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								6cbfb5ab5d 
								
							 
						 
						
							
							
								
								use media proxy for suggestions api  
							
							 
							
							
							
						 
						
							2018-08-28 17:01:17 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thurloat 
								
							 
						 
						
							
							
							
							
								
							
							
								0df558a6a5 
								
							 
						 
						
							
							
								
								cleaning up a bit.  
							
							 
							
							
							
						 
						
							2018-08-27 22:45:53 -03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thurloat 
								
							 
						 
						
							
							
							
							
								
							
							
								709816a0f8 
								
							 
						 
						
							
							
								
								example of flexible storage backends  
							
							 
							
							
							
						 
						
							2018-08-27 22:20:54 -03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								d22f66655b 
								
							 
						 
						
							
							
								
								upload: formatting  
							
							 
							
							
							
						 
						
							2018-08-28 00:25:30 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								1596185ac6 
								
							 
						 
						
							
							
								
								upload: add the S3 support itself  
							
							 
							
							
							
						 
						
							2018-08-28 00:18:44 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								03c35e579b 
								
							 
						 
						
							
							
								
								sample config: add S3 public endpoint option  
							
							 
							
							
							
						 
						
							2018-08-28 00:18:24 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								86c007ddd2 
								
							 
						 
						
							
							
								
								upload: strip exif data before finalizing the file path  
							
							 
							
							
							
						 
						
							2018-08-27 23:36:30 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e95d958b52 
								
							 
						 
						
							
							
								
								sample config: show how amazon s3 support is activated, including third-party clones like wasabi  
							
							 
							
							
							
						 
						
							2018-08-27 23:30:53 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								5dd6542db5 
								
							 
						 
						
							
							
								
								formatting  
							
							 
							
							
							
						 
						
							2018-08-27 10:46:01 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								1089d3658e 
								
							 
						 
						
							
							
								
								user: fix up notification last calculation [NOT related to upstream]  
							
							 
							
							
							
						 
						
							2018-08-27 10:46:01 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								46c7c2380c 
								
							 
						 
						
							
							
								
								Merge branch 'feature/relay' into 'develop'  
							
							 
							
							... 
							
							
							
							message relay
Closes  #144 
See merge request pleroma/pleroma!264  
							
						 
						
							2018-08-27 08:29:25 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								440b459cd1 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/announce-timeline-flooding' into 'develop'  
							
							 
							
							... 
							
							
							
							activitypub: filter destination list for announce activities differently than normal (closes  #164 )
Closes  #164 
See merge request pleroma/pleroma!227  
							
						 
						
							2018-08-27 08:25:27 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								63094cfd3e 
								
							 
						 
						
							
							
								
								Merge branch 'feature/emoji-in-local-users' into 'develop'  
							
							 
							
							... 
							
							
							
							Add emoji to local user profiles.
Closes  #202 
See merge request pleroma/pleroma!271  
							
						 
						
							2018-08-26 23:24:41 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								bc3c30430e 
								
							 
						 
						
							
							
								
								fix formatting  
							
							 
							
							
							
						 
						
							2018-08-26 22:46:25 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								1ad5cbed51 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/common-api-visibility-orphan' into 'develop'  
							
							 
							
							... 
							
							
							
							common api: properly handle replying to orphaned threads
See merge request pleroma/pleroma!299  
							
						 
						
							2018-08-26 22:39:15 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								741c6ad671 
								
							 
						 
						
							
							
								
								common api: handle replying to orphaned threads  
							
							 
							
							
							
						 
						
							2018-08-26 22:37:36 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								c9e4c45e0e 
								
							 
						 
						
							
							
								
								Merge branch 'login-with-email' into 'develop'  
							
							 
							
							... 
							
							
							
							When logging in, try treating the login as an email
Closes  #245 
See merge request pleroma/pleroma!295  
							
						 
						
							2018-08-26 21:35:12 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								0f5bff8c66 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'feature/relay'  
							
							 
							
							... 
							
							
							
							# Conflicts:
#   lib/pleroma/web/activity_pub/utils.ex 
							
						 
						
							2018-08-26 21:06:15 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									hakabahitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								946a0769c4 
								
							 
						 
						
							
							
								
								remove unused settings from /api/statusnet/config  
							
							 
							
							
							
						 
						
							2018-08-26 17:40:15 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								540cce5d10 
								
							 
						 
						
							
							
								
								When logging in, try treating the login as an email  
							
							 
							
							... 
							
							
							
							Closes  #245  
							
						 
						
							2018-08-25 23:29:03 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								ffa552f1a4 
								
							 
						 
						
							
							
								
								Merge branch 'feature/twitterapi-object-description' into 'develop'  
							
							 
							
							... 
							
							
							
							twitter api: provide object descriptions as attachment description field
See merge request pleroma/pleroma!293  
							
						 
						
							2018-08-25 00:20:25 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								aab2bdddf4 
								
							 
						 
						
							
							
								
								twitter api: provide object descriptions as attachment description field  
							
							 
							
							
							
						 
						
							2018-08-25 00:12:58 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								290798b821 
								
							 
						 
						
							
							
								
								http: fix TLS server name indication  
							
							 
							
							... 
							
							
							
							by default, hackney only sent TLS server name indication if TLS was locked
to TLS 1.2.
since there are many instances out there not speaking TLS 1.2, it is not
acceptable to lock SNI to TLS 1.2.
closes  #261  
							
						 
						
							2018-08-24 20:04:50 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								be7a6db1f5 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/formatter-single-char-nicks' into 'develop'  
							
							 
							
							... 
							
							
							
							formatter: fix single char local nicknames
Closes  #163 
See merge request pleroma/pleroma!290  
							
						 
						
							2018-08-24 18:42:14 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								9ded0ee1a5 
								
							 
						 
						
							
							
								
								Merge branch 'config/fe-collapse-subject' into 'develop'  
							
							 
							
							... 
							
							
							
							fe config: add collapse_message_with_subject fe option
See merge request pleroma/pleroma!289  
							
						 
						
							2018-08-24 18:27:43 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								3e10d13909 
								
							 
						 
						
							
							
								
								formatter: adjust regexp captures to match local users with single character nicknames ( closes   #163 )  
							
							 
							
							
							
						 
						
							2018-08-24 18:22:47 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								09cb402203 
								
							 
						 
						
							
							
								
								fe config: add collapse_message_with_subject fe option  
							
							 
							
							
							
						 
						
							2018-08-24 18:21:42 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									hakabahitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								bf9f68b681 
								
							 
						 
						
							
							
								
								debug  
							
							 
							
							
							
						 
						
							2018-08-23 11:52:18 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								a909fe45a6 
								
							 
						 
						
							
							
								
								formatting  
							
							 
							
							
							
						 
						
							2018-08-23 01:34:36 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								52b44184b4 
								
							 
						 
						
							
							
								
								transmogrifier: reject activities lacking a valid ID  
							
							 
							
							
							
						 
						
							2018-08-23 01:25:26 +00:00