Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								cb2bdd5c07 
								
							 
						 
						
							
							
								
								Order users by nickname  
							
							
							
						 
						
							2019-03-17 13:23:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								6d6f48d079 
								
							 
						 
						
							
							
								
								Merge branch 'feature/federated-flags' into 'develop'  
							
							... 
							
							
							
							Federated reports
See merge request pleroma/pleroma!935  
							
						 
						
							2019-03-16 19:27:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								28df397454 
								
							 
						 
						
							
							
								
								Merge branch 'feature/oauth-me' into 'develop'  
							
							... 
							
							
							
							oauth: add me property to token responses
See merge request pleroma/pleroma!942  
							
						 
						
							2019-03-16 08:44:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								c69dc2acf1 
								
							 
						 
						
							
							
								
								Merge branch 'feature/reblog-muting' into 'develop'  
							
							... 
							
							
							
							Implement mastodon's reblog hiding feature
See merge request pleroma/pleroma!916  
							
						 
						
							2019-03-16 04:31:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e0edc706cf 
								
							 
						 
						
							
							
								
								oauth: add me property to token responses  
							
							
							
						 
						
							2019-03-16 01:12:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								43fb03be5a 
								
							 
						 
						
							
							
								
								Allow to mark a single notification as read  
							
							
							
						 
						
							2019-03-15 23:56:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								4b3c86c1a6 
								
							 
						 
						
							
							
								
								Merge branch 'fix/mediaproxy-capture-content-disposition-filename' into 'develop'  
							
							... 
							
							
							
							MediaProxy: parse filename from content-disposition for non-whitelisted types
See merge request pleroma/pleroma!936  
							
						 
						
							2019-03-15 20:06:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								8b352af4dd 
								
							 
						 
						
							
							
								
								Merge branch 'feature/openldap-support' into 'develop'  
							
							... 
							
							
							
							OpenLDAP support
Closes  #203 
See merge request pleroma/pleroma!859  
							
						 
						
							2019-03-15 19:57:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								d8244c2a1b 
								
							 
						 
						
							
							
								
								remove unused function  
							
							
							
						 
						
							2019-03-15 15:03:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								dfeb3aec44 
								
							 
						 
						
							
							
								
								fix credo warning  
							
							
							
						 
						
							2019-03-15 14:36:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								094e1ef048 
								
							 
						 
						
							
							
								
								formatting  
							
							
							
						 
						
							2019-03-15 14:28:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								da53c079db 
								
							 
						 
						
							
							
								
								Refactor to store user ap_id, add tests  
							
							
							
						 
						
							2019-03-15 14:20:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								be465c762b 
								
							 
						 
						
							
							
								
								formatting  
							
							
							
						 
						
							2019-03-15 14:18:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								15b21d1983 
								
							 
						 
						
							
							
								
								refactor filtering mechanism  
							
							
							
						 
						
							2019-03-15 14:18:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								aa71139e4a 
								
							 
						 
						
							
							
								
								Fix elixir 1.8 vs 1.7 format conflict  
							
							
							
						 
						
							2019-03-15 14:18:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								fe4c1d26fc 
								
							 
						 
						
							
							
								
								Add ActivityPub.contain_activity checks to streamer  
							
							
							
						 
						
							2019-03-15 14:18:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								c8f31e0bc2 
								
							 
						 
						
							
							
								
								Implement mastodon's reblog hiding feature  
							
							
							
						 
						
							2019-03-15 14:18:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								41fc67aa49 
								
							 
						 
						
							
							
								
								Merge branch 'mastoapi/mime_type' into 'develop'  
							
							... 
							
							
							
							Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938  
							
						 
						
							2019-03-15 09:48:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d7a34b604b 
								
							 
						 
						
							
							
								
								Extend MastoAPI to provide attachment mimetypes  
							
							
							
						 
						
							2019-03-15 11:58:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d02f1120f9 
								
							 
						 
						
							
							
								
								Content-Disposition regex improvements  
							
							
							
						 
						
							2019-03-15 08:29:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								0f42ea87d6 
								
							 
						 
						
							
							
								
								Merge branch 'notifications-is-seen' into 'develop'  
							
							... 
							
							
							
							MastoAPI notifications is_seen
See merge request pleroma/pleroma!934  
							
						 
						
							2019-03-15 02:59:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								c708656b5e 
								
							 
						 
						
							
							
								
								Merge branch 'robotstxt' into 'develop'  
							
							... 
							
							
							
							Add robots.txt
Closes  #723 
See merge request pleroma/pleroma!929  
							
						 
						
							2019-03-15 02:50:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pearson 
								
							 
						 
						
							
							
							
							
								
							
							
								3dadaa4432 
								
							 
						 
						
							
							
								
								robots.txt  
							
							... 
							
							
							
							Add default robots.txt that allows bots access to all paths.
Add mix task to generate robots.txt taht allows bots access to no paths.
Document custom emojis, MRF and static_dir
static_dir documentation includes docs for the robots.txt Mix task. 
							
						 
						
							2019-03-15 02:28:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								958227d556 
								
							 
						 
						
							
							
								
								MediaProxy: parse filename from content-disposition for non-whitelisted types  
							
							
							
						 
						
							2019-03-15 01:36:29 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								100413bf2c 
								
							 
						 
						
							
							
								
								Add is_seen to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests  
							
							
							
						 
						
							2019-03-15 01:35:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								423fd07928 
								
							 
						 
						
							
							
								
								activitypub: inject to/cc fields on non-forwarded reports since Flag activities are now Forwardable  
							
							
							
						 
						
							2019-03-14 19:52:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								5c7b774f09 
								
							 
						 
						
							
							
								
								reports: unify sending e-mail for both remote and local reports  
							
							
							
						 
						
							2019-03-14 19:44:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								64b0120d67 
								
							 
						 
						
							
							
								
								activitypub: add support for forwarding reports  
							
							
							
						 
						
							2019-03-14 19:36:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								cbdd11c381 
								
							 
						 
						
							
							
								
								Merge develop to bump elixir version in the CI so I don't get failing formatting  
							
							
							
						 
						
							2019-03-14 22:33:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								3b48d5f0c2 
								
							 
						 
						
							
							
								
								common api: add support for forwarding reports  
							
							
							
						 
						
							2019-03-14 19:29:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								379442ad17 
								
							 
						 
						
							
							
								
								activitypub: utils: also match Activity objects  
							
							
							
						 
						
							2019-03-14 19:29:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								0f3ecb2bfb 
								
							 
						 
						
							
							
								
								activitypub: transmogrifier: accept remote Flag activities  
							
							
							
						 
						
							2019-03-14 19:06:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f86f7dbb8f 
								
							 
						 
						
							
							
								
								activitypub: utils: rework make_flag_data to accept either activity payloads or IRIs  
							
							
							
						 
						
							2019-03-14 19:05:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e2fe796c63 
								
							 
						 
						
							
							
								
								Add some tests  
							
							
							
						 
						
							2019-03-14 22:02:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								34fc0dca2e 
								
							 
						 
						
							
							
								
								Merge branch 'hotfix/delete-activities' into 'develop'  
							
							... 
							
							
							
							Fix delete activities not federating
See merge request pleroma/pleroma!933  
							
						 
						
							2019-03-14 17:49:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e630e5e135 
								
							 
						 
						
							
							
								
								Fix delete activities not federating  
							
							
							
						 
						
							2019-03-14 20:43:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									link0ff 
								
							 
						 
						
							
							
							
							
								
							
							
								54e7087ab4 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/openldap-support  
							
							
							
						 
						
							2019-03-14 17:43:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								59333f2d56 
								
							 
						 
						
							
							
								
								Merge branch 'admin-api-account-view-namespace' into 'develop'  
							
							... 
							
							
							
							MastodonAPI.Admin.AccountView → AdminAPI.AccountView
See merge request pleroma/pleroma!930  
							
						 
						
							2019-03-14 02:01:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								86871c8a04 
								
							 
						 
						
							
							
								
								Merge branch 'feature/add-local-to-users-admin-api' into 'develop'  
							
							... 
							
							
							
							Add "local" & "tags" to users admin API
See merge request pleroma/pleroma!932  
							
						 
						
							2019-03-14 02:00:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								f3964f4024 
								
							 
						 
						
							
							
								
								Ensure empty array is returned for tags  
							
							
							
						 
						
							2019-03-14 03:17:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								257d8e78e5 
								
							 
						 
						
							
							
								
								Add tags  
							
							
							
						 
						
							2019-03-14 01:52:24 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								4e72762322 
								
							 
						 
						
							
							
								
								Merge branch 'mastofe-content-types' into 'develop'  
							
							... 
							
							
							
							Set content types settings on mastofe endpoint.
See merge request pleroma/pleroma!894  
							
						 
						
							2019-03-13 22:04:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								e416c344dd 
								
							 
						 
						
							
							
								
								Unify unfollow, accept and reject follow requests using CommonAPI  
							
							
							
						 
						
							2019-03-13 20:28:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								490d9cf7b1 
								
							 
						 
						
							
							
								
								Add "local" to users admin API  
							
							
							
						 
						
							2019-03-13 16:04:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cc0f2f8ba3 
								
							 
						 
						
							
							
								
								MastodonAPI.Admin.AccountView → AdminAPI.AccountView  
							
							
							
						 
						
							2019-03-13 12:17:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d43b1c0b5d 
								
							 
						 
						
							
							
								
								Pleroma.Web.TwitterAPI.Controller: Remove duplicated alias/es  
							
							
							
						 
						
							2019-03-13 04:26:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4b73ca638e 
								
							 
						 
						
							
							
								
								[Credo][CI] Add readability as it’s fixed  
							
							
							
						 
						
							2019-03-13 04:26:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								23960309a0 
								
							 
						 
						
							
							
								
								[Credo] Change quoted string with 3+ quotes to sigils  
							
							
							
						 
						
							2019-03-13 04:26:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c42d34b2ec 
								
							 
						 
						
							
							
								
								[Credo] fix Credo.Check.Readability.MaxLineLength  
							
							
							
						 
						
							2019-03-13 04:26:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8cd3eada7d 
								
							 
						 
						
							
							
								
								[Credo] write large numbers with underscore separation  
							
							
							
						 
						
							2019-03-13 04:26:56 +01:00