Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a3cffd3566 
								
							 
						 
						
							
							
								
								formatter: Stop using phoenix HTML and format it ourselves  
							
							 
							
							... 
							
							
							
							* Pheonix has an extra scheme whitelist conflicting with ours
* Pheonix doesn’t seems to do URL encoding, just HTML encoding
Closes: https://git.pleroma.social/pleroma/pleroma/issues/307  
							
						 
						
							2018-09-28 17:32:27 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								34b6d444d6 
								
							 
						 
						
							
							
								
								Merge branch 'feature/twitter_api/fields' into 'develop'  
							
							 
							
							... 
							
							
							
							[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
See merge request pleroma/pleroma!360  
							
						 
						
							2018-09-28 09:25:27 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a74daabfae 
								
							 
						 
						
							
							
								
								[Pleroma.Web.TwitterAPI.UserViewTest]: Add test for mastodon-fields  
							
							 
							
							
							
						 
						
							2018-09-28 11:17:33 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								82b57ebad1 
								
							 
						 
						
							
							
								
								[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"  
							
							 
							
							
							
						 
						
							2018-09-28 10:44:45 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d830a243a3 
								
							 
						 
						
							
							
								
								transmogrifier: more robustly handle dereferencing pointer URIs  
							
							 
							
							
							
						 
						
							2018-09-27 20:00:48 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								eebe33e86a 
								
							 
						 
						
							
							
								
								transmogrifier: Add support for array-less hashtags, add broken announce, harden get_actor  
							
							 
							
							
							
						 
						
							2018-09-27 20:00:47 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2c820e10b8 
								
							 
						 
						
							
							
								
								transmogrifier_test: incoming notices with tag not being an array (kroeg)  
							
							 
							
							
							
						 
						
							2018-09-27 20:00:47 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								85b59d07b6 
								
							 
						 
						
							
							
								
								test: add smoketests for the scrubbing policies  
							
							 
							
							
							
						 
						
							2018-09-22 03:45:37 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								56577d8b48 
								
							 
						 
						
							
							
								
								twitter api: add no_rich_text option to userview for account prefs  
							
							 
							
							
							
						 
						
							2018-09-22 03:24:40 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								bd03644ca8 
								
							 
						 
						
							
							
								
								test: add tests for new User.html_filter_policy()  
							
							 
							
							
							
						 
						
							2018-09-22 03:02:05 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								200ab27e7a 
								
							 
						 
						
							
							
								
								test: add test proving that users are refreshed when stale  
							
							 
							
							
							
						 
						
							2018-09-20 23:50:56 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a8eaecadee 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)  
							
							 
							
							
							
						 
						
							2018-09-20 16:24:29 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								43d0b7bf7a 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.StatusView] add replies_count  
							
							 
							
							
							
						 
						
							2018-09-20 16:10:46 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									shadowfacts 
								
							 
						 
						
							
							
							
							
								
							
							
								85b8590109 
								
							 
						 
						
							
							
								
								Update status_view_test.exs  
							
							 
							
							
							
						 
						
							2018-09-10 23:40:29 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								a4fe14de02 
								
							 
						 
						
							
							
								
								tests: break the cycle using pleroma.factory  
							
							 
							
							
							
						 
						
							2018-09-09 12:56:25 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								fc92bb28b4 
								
							 
						 
						
							
							
								
								tests: try breaking the cycle a different way  
							
							 
							
							
							
						 
						
							2018-09-09 12:43:58 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								33a5294fad 
								
							 
						 
						
							
							
								
								test: user enabled plug tests: fix circular reference  
							
							 
							
							
							
						 
						
							2018-09-09 12:23:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								045953225e 
								
							 
						 
						
							
							
								
								Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'  
							
							 
							
							... 
							
							
							
							auth overhaul and legacy GS auth
See merge request pleroma/pleroma!331  
							
						 
						
							2018-09-08 09:20:34 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Martin Kühl 
								
							 
						 
						
							
							
							
							
								
							
							
								619f67768a 
								
							 
						 
						
							
							
								
								Mastodon API: Add unsupported attributes to relationship responses  
							
							 
							
							... 
							
							
							
							These attributes are documented as required by the Mastodon API.
Since we don’t support them (I think?), respond with default values. 
							
						 
						
							2018-09-07 16:12:44 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d22af29bb4 
								
							 
						 
						
							
							
								
								Fix warning.  
							
							 
							
							
							
						 
						
							2018-09-05 22:42:50 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								44b094908c 
								
							 
						 
						
							
							
								
								Update legacy passwords automatically.  
							
							 
							
							
							
						 
						
							2018-09-05 22:30:14 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Martin Kühl 
								
							 
						 
						
							
							
							
							
								
							
							
								ff38ffd9f8 
								
							 
						 
						
							
							
								
								Fix the tests  
							
							 
							
							
							
						 
						
							2018-09-05 22:20:59 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e601165426 
								
							 
						 
						
							
							
								
								Add UserEnabledPlug.  
							
							 
							
							
							
						 
						
							2018-09-05 21:53:53 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5ce1ebb179 
								
							 
						 
						
							
							
								
								Add SetUserSessionIdPlug.  
							
							 
							
							
							
						 
						
							2018-09-05 21:42:42 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								4a3dbd9d4e 
								
							 
						 
						
							
							
								
								Merge branch 'fix/sign-in-with-toot' into 'develop'  
							
							 
							
							... 
							
							
							
							Fix sign-in and sign-out with Toot!
See merge request pleroma/pleroma!306  
							
						 
						
							2018-09-05 18:20:26 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								12bc73dd28 
								
							 
						 
						
							
							
								
								Add EnsureUserKeyPlug, smaller fixes  
							
							 
							
							
							
						 
						
							2018-09-05 19:06:28 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								32465b9939 
								
							 
						 
						
							
							
								
								Simplify AuthenticationPlug  
							
							 
							
							
							
						 
						
							2018-09-05 18:53:38 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9a96c93be7 
								
							 
						 
						
							
							
								
								Add SessionAuthenticationPlug.  
							
							 
							
							
							
						 
						
							2018-09-05 18:37:02 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a3f54fca4d 
								
							 
						 
						
							
							
								
								Add LegacyAuthenticationPlug  
							
							 
							
							
							
						 
						
							2018-09-05 18:17:33 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3cf17dc402 
								
							 
						 
						
							
							
								
								Add EnsureAuthenticatedPlug  
							
							 
							
							
							
						 
						
							2018-09-05 17:59:19 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								faf5347748 
								
							 
						 
						
							
							
								
								Add UserFetcherPlug.  
							
							 
							
							
							
						 
						
							2018-09-05 17:44:38 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								42bd985e66 
								
							 
						 
						
							
							
								
								Add BasicAuthDecoderPlug  
							
							 
							
							
							
						 
						
							2018-09-05 17:30:05 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Moon Man 
								
							 
						 
						
							
							
							
							
								
							
							
								1a8bc26e52 
								
							 
						 
						
							
							
								
								auth against sha512-crypt password hashes, upgrade to pbkdf2  
							
							 
							
							
							
						 
						
							2018-09-05 00:21:44 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								76c67a41c1 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'feature/staff-discovery-api'  
							
							 
							
							... 
							
							
							
							# Conflicts:
#   lib/pleroma/web/nodeinfo/nodeinfo_controller.ex 
							
						 
						
							2018-09-03 14:55:42 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								d3f6814feb 
								
							 
						 
						
							
							
								
								tests: add test for staffAccounts presence in nodeinfo  
							
							 
							
							
							
						 
						
							2018-09-03 14:48:36 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								1c9e539b47 
								
							 
						 
						
							
							
								
								Merge branch 'feature/mastodon_api_2.4.x' into 'develop'  
							
							 
							
							... 
							
							
							
							Add/Fix Mastodon endpoints for 2.4.3 compatibility
See merge request pleroma/pleroma!266  
							
						 
						
							2018-09-03 12:33:36 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								7ca2a2ddea 
								
							 
						 
						
							
							
								
								Merge branch 'nil-bio-emojis' into 'develop'  
							
							 
							
							... 
							
							
							
							add nil clause for Formatter.get_emoji/1 to return an empty result
Closes  #274 
See merge request pleroma/pleroma!315  
							
						 
						
							2018-09-03 05:54:11 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								b7923aa304 
								
							 
						 
						
							
							
								
								Merge branch 'hotfix_broken_likes' into 'develop'  
							
							 
							
							... 
							
							
							
							hotfix for broken like completely breaking the notifications API
See merge request pleroma/pleroma!284  
							
						 
						
							2018-09-02 12:37:00 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								834515fb51 
								
							 
						 
						
							
							
								
								formatter: don't add XSS emoji  
							
							 
							
							
							
						 
						
							2018-09-02 00:04:09 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								303af9ba4c 
								
							 
						 
						
							
							
								
								tests: add regression tests  
							
							 
							
							
							
						 
						
							2018-09-01 23:33:10 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Martin Kühl 
								
							 
						 
						
							
							
							
							
								
							
							
								b60d232719 
								
							 
						 
						
							
							
								
								AccountView: sensitive is supposed to be a boolean, not a string  
							
							 
							
							
							
						 
						
							2018-09-01 23:10:48 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Will Pearson 
								
							 
						 
						
							
							
							
							
								
							
							
								0c2a0e3551 
								
							 
						 
						
							
							
								
								Specify default scope in verify_credentials  
							
							 
							
							... 
							
							
							
							Certain Mastodon/Pleroma front ends call verify_credentials to get the
default scope of a new toot.
Currently, Pleroma hardcodes this value to "public".
This patch changes it to the user's default_scope value. 
							
						 
						
							2018-08-31 21:04:46 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thurloat 
								
							 
						 
						
							
							
							
							
								
							
							
								a9c0f395cb 
								
							 
						 
						
							
							
								
								add nil clause for Formatter.get_emoji/1 to return an empty result  
							
							 
							
							
							
						 
						
							2018-08-31 14:29:23 -03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								58539e1357 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'feature/rich-text' into 'develop'"  
							
							 
							
							... 
							
							
							
							This reverts merge request !309  
							
						 
						
							2018-08-31 09:51:20 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e7871ed05e 
								
							 
						 
						
							
							
								
								tests: add tests for evil HTML filtering  
							
							 
							
							
							
						 
						
							2018-08-31 03:34:56 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								9cac7c957c 
								
							 
						 
						
							
							
								
								test: add testcase proving lists system does not leak non-public posts  
							
							 
							
							
							
						 
						
							2018-08-29 08:50:23 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								0f1c629d65 
								
							 
						 
						
							
							
								
								better solution, added test.  
							
							 
							
							
							
						 
						
							2018-08-27 17:07:26 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6e030129fb 
								
							 
						 
						
							
							
								
								[MastodonAPI] Add filters  
							
							 
							
							
							
						 
						
							2018-08-27 15:09:05 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d008f2d69c 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.AccountView]: Add bot field  
							
							 
							
							
							
						 
						
							2018-08-27 15:09:04 +02: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