lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								ae9c4983d7 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/gopher-empty-lines' into 'develop'  
							
							... 
							
							
							
							lib/pleroma/gopher/server.ex: Fix errorneous empty lines
See merge request pleroma/pleroma!270  
							
						 
						
							2018-08-12 10:55:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								e81f788cb8 
								
							 
						 
						
							
							
								
								Merge branch 'emoji-in-account-view' into 'develop'  
							
							... 
							
							
							
							Render emoji in user profiles
See merge request pleroma/pleroma!265  
							
						 
						
							2018-08-12 10:41:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								af30f3f648 
								
							 
						 
						
							
							
								
								lib/pleroma/gopher/server.ex: Fix errorneous empty lines  
							
							
							
						 
						
							2018-08-10 18:01:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								afb71b3038 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/fix-gopher-server-i' into 'develop'  
							
							... 
							
							
							
							fix gopher server informational messages
See merge request pleroma/pleroma!268  
							
						 
						
							2018-08-10 13:45:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									trqx@goat.si 
								
							 
						 
						
							
							
							
							
								
							
							
								e7b00f202f 
								
							 
						 
						
							
							
								
								fix gopher server informational messages  
							
							... 
							
							
							
							some gopher clients did not accept those lines due to a missing tab 
							
						 
						
							2018-08-10 10:45:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								37b802682c 
								
							 
						 
						
							
							
								
								HTML-sanitize usernames before emojifying.  
							
							
							
						 
						
							2018-08-09 13:07:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								ed9738e031 
								
							 
						 
						
							
							
								
								Add tests for emoji in user profiles  
							
							... 
							
							
							
							Also use the correct field in TwitterAPI... 
							
						 
						
							2018-08-08 09:24:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								cee63ad3f7 
								
							 
						 
						
							
							
								
								TwitterAPI user view: add screen_name_html and description_html.  
							
							
							
						 
						
							2018-08-08 08:38:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								c2d1a5e9c4 
								
							 
						 
						
							
							
								
								MastoAPI AccountView: render profile emoji.  
							
							
							
						 
						
							2018-08-07 21:56:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								59b42531a3 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/duplicate-follow-requests' into 'develop'  
							
							... 
							
							
							
							user: filter out duplicate follow requests
Closes  #228 
See merge request pleroma/pleroma!263  
							
						 
						
							2018-08-06 18:07:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								c957cd98f0 
								
							 
						 
						
							
							
								
								Merge branch 'feature/camelcase-hashtags' into 'develop'  
							
							... 
							
							
							
							formatter: preserve case of hashtags
Closes  #165 
See merge request pleroma/pleroma!262  
							
						 
						
							2018-08-06 18:07:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								275c42e438 
								
							 
						 
						
							
							
								
								user: filter out duplicate follow requests  
							
							
							
						 
						
							2018-08-05 01:11:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								0ee29994a5 
								
							 
						 
						
							
							
								
								formatter: preserve case of hashtags  
							
							... 
							
							
							
							when generating hashtag links, we used the casefolded version that we use in
the link URLs, instead of the original version.
accordingly, adjust the formatter to use the original text for the links, while
keeping the casefolded version for the URLs. 
							
						 
						
							2018-08-05 00:37:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								d7368ea272 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/digest-legacy-compat' into 'develop'  
							
							... 
							
							
							
							activitypub: actually send digest header when federating
See merge request pleroma/pleroma!261  
							
						 
						
							2018-08-01 10:37:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								3be58ad34e 
								
							 
						 
						
							
							
								
								activitypub: actually send digest header when federating  
							
							... 
							
							
							
							this is needed for backwards compatibility with non-digest pleroma instances 
							
						 
						
							2018-08-01 10:32:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								ab4b4538ce 
								
							 
						 
						
							
							
								
								Merge branch 'security/digest-signature-validation' into 'develop'  
							
							... 
							
							
							
							digest signature validation
See merge request pleroma/pleroma!260  
							
						 
						
							2018-08-01 08:11:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								8da406afa2 
								
							 
						 
						
							
							
								
								activitypub: verify remote http signature digests by recomputing the digest and replacing the digest header  
							
							
							
						 
						
							2018-07-31 23:24:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2890aef9e8 
								
							 
						 
						
							
							
								
								activitypub: add digest header to outbound messages and sign it  
							
							
							
						 
						
							2018-07-31 23:24:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								ba72c51a0f 
								
							 
						 
						
							
							
								
								Merge branch 'feature/filter_exif' into 'develop'  
							
							... 
							
							
							
							Feature/filter exif (  solve #187  )
See merge request pleroma/pleroma!237  
							
						 
						
							2018-07-25 07:16:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tristan Mahé 
								
							 
						 
						
							
							
							
							
								
							
							
								bc2668bb63 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/filter_exif  
							
							
							
						 
						
							2018-07-19 17:44:18 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								41b0ecef95 
								
							 
						 
						
							
							
								
								Merge branch 'tests/plume' into 'develop'  
							
							... 
							
							
							
							Articles/Notes with a actor list outside object
See merge request pleroma/pleroma!252  
							
						 
						
							2018-07-19 07:35:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								54963a6379 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/activitystreams-notice-urls' into 'develop'  
							
							... 
							
							
							
							ostatus: return AS2 objects on /notice and /activities URLs like with /objects.
Closes  #206 
See merge request pleroma/pleroma!251  
							
						 
						
							2018-07-19 07:31:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								6f23fb53d3 
								
							 
						 
						
							
							
								
								Merge branch 'feature/fe-configuration' into 'develop'  
							
							... 
							
							
							
							serverside frontend configuration
See merge request pleroma/pleroma!256  
							
						 
						
							2018-07-19 07:31:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								b7001ea9e7 
								
							 
						 
						
							
							
								
								Merge branch 'feature/media-description' into 'develop'  
							
							... 
							
							
							
							Feature/media description
Closes  #174 
See merge request pleroma/pleroma!255  
							
						 
						
							2018-07-18 08:52:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2b3f049b06 
								
							 
						 
						
							
							
								
								config: formatting  
							
							
							
						 
						
							2018-07-18 00:05:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								b23630076f 
								
							 
						 
						
							
							
								
								TwitterAPI: present pleroma frontend config in API  
							
							
							
						 
						
							2018-07-17 15:46:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								cf219b6add 
								
							 
						 
						
							
							
								
								config: make instance description configurable  
							
							
							
						 
						
							2018-07-17 15:46:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								18cac1e36b 
								
							 
						 
						
							
							
								
								test: mastodon attachments: update for added description field  
							
							
							
						 
						
							2018-07-17 03:40:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								489453c246 
								
							 
						 
						
							
							
								
								tests: verify media description api support is working  
							
							
							
						 
						
							2018-07-17 03:40:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								99c0252314 
								
							 
						 
						
							
							
								
								mastodon api: support descriptions in media api, add PUT endpoint for updating metadata about a media upload  
							
							
							
						 
						
							2018-07-17 03:40:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								cd19d37a90 
								
							 
						 
						
							
							
								
								mastodon api: use object name as alt text  
							
							
							
						 
						
							2018-07-17 03:40:46 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f10291a1d3 
								
							 
						 
						
							
							
								
								upload: use generic Document object type instead of Image (mastodon compatibility)  
							
							... 
							
							
							
							Mastodon does not use the object name as alt text when the object is an Image. 
							
						 
						
							2018-07-17 03:40:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tristan Mahé 
								
							 
						 
						
							
							
							
							
								
							
							
								5469fb9561 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/filter_exif  
							
							
							
						 
						
							2018-07-13 11:14:37 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7501481db4 
								
							 
						 
						
							
							
								
								[Pleroma.Web.ActivityPub.Transmogrifier] Add Person finding  
							
							
							
						 
						
							2018-07-12 23:37:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8472fba2a7 
								
							 
						 
						
							
							
								
								[Pleroma.Web.ActivityPub.Transmogrifier]: Fix actor key outside of object  
							
							... 
							
							
							
							The code here is copied from feature/peertube by lain.
Co-authored-by: lain <lain@soykaf.club> 
							
						 
						
							2018-07-12 23:37:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								24b5a75d09 
								
							 
						 
						
							
							
								
								Add test for Plume Articles  
							
							
							
						 
						
							2018-07-12 23:08:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f1a29fc43c 
								
							 
						 
						
							
							
								
								test: ostatus controller: add AS2 fetching tests  
							
							
							
						 
						
							2018-07-12 20:32:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								0899588e4d 
								
							 
						 
						
							
							
								
								ostatus: return AS2 objects on /notice and /activities URLs like with /objects.  
							
							
							
						 
						
							2018-07-12 17:15:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								d93789dfde 
								
							 
						 
						
							
							
								
								Merge branch 'feature/object-normalization' into 'develop'  
							
							... 
							
							
							
							object normalization
See merge request pleroma/pleroma!238  
							
						 
						
							2018-07-12 16:48:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								ceffb91065 
								
							 
						 
						
							
							
								
								Merge branch 'feature/mediaproxy-nodeinfo' into 'develop'  
							
							... 
							
							
							
							[Pleroma.Web.Nodeinfo.NodeinfoController]: add mediaProxy metadata
Closes  #229 
See merge request pleroma/pleroma!235  
							
						 
						
							2018-07-12 16:47:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								b1fcfcfae1 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/activitypub-object-actor' into 'develop'  
							
							... 
							
							
							
							activitypub: more robustly handle object-to-actor associations
See merge request pleroma/pleroma!250  
							
						 
						
							2018-07-12 16:46:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								cbef1030b7 
								
							 
						 
						
							
							
								
								Merge branch 'feature/message-summary' into 'develop'  
							
							... 
							
							
							
							message summary
See merge request pleroma/pleroma!249  
							
						 
						
							2018-07-12 16:45:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								590d4df77c 
								
							 
						 
						
							
							
								
								activitypub: more robustly handle object-to-actor associations  
							
							
							
						 
						
							2018-07-12 16:39:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								b832df1e15 
								
							 
						 
						
							
							
								
								formatting  
							
							
							
						 
						
							2018-07-12 16:12:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								4fb64c1d86 
								
							 
						 
						
							
							
								
								testsuite: twitter api: add summary where necessary  
							
							
							
						 
						
							2018-07-12 16:12:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f03e57f764 
								
							 
						 
						
							
							
								
								twitter api: activity representer: add summary field for testsuite  
							
							
							
						 
						
							2018-07-12 16:12:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								152a526237 
								
							 
						 
						
							
							
								
								twitter api: refactor activity html generation, add support for Articles  
							
							
							
						 
						
							2018-07-12 16:11:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								3b799f22b7 
								
							 
						 
						
							
							
								
								twitterapi: activity view: expose message summary text  
							
							
							
						 
						
							2018-07-12 16:11:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								b806aa36c8 
								
							 
						 
						
							
							
								
								Update nodeinfo_controller.ex  
							
							
							
						 
						
							2018-07-12 06:00:55 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								fe4387077a 
								
							 
						 
						
							
							
								
								Merge branch 'feature/default-scope' into 'develop'  
							
							... 
							
							
							
							default scope setting
See merge request pleroma/pleroma!239  
							
						 
						
							2018-07-12 05:59:12 +00:00