William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								95376ac1fe
								
							
						 | 
						
							
							
								
								html: add the ability to override the default scrub policy
							
							
							
							
							
						 | 
						
							2018-09-16 01:25:35 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								c2650f0ffb
								
							
						 | 
						
							
							
								
								Merge branch 'feature/html-scrub-policy' into 'develop'
							
							
							
							
							
							
							
							html scrub policy
See merge request pleroma/pleroma!339 
							
						 | 
						
							2018-09-16 01:05:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									shadowfacts
								
							 
						 | 
						
							
							
							
							
								
							
							
								39aed5348a
								
							
						 | 
						
							
							
								
								Add visible_in_picker to status emojis
							
							
							
							
							
						 | 
						
							2018-09-10 23:32:19 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								d3248e13e3
								
							
						 | 
						
							
							
								
								activitypub: transmogrifier: allow profile updates from bots
							
							
							
							
							
						 | 
						
							2018-09-10 01:57:03 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								e0b8c0ccba
								
							
						 | 
						
							
							
								
								MRF: reject non-public: use pattern match to remove unnecessary if block
							
							
							
							
							
						 | 
						
							2018-09-10 01:16:03 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								88094c266d
								
							
						 | 
						
							
							
								
								MRF: simple policy: refactor module to use guards and pattern matching
							
							
							
							
							
						 | 
						
							2018-09-10 01:16:02 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								97253df3ee
								
							
						 | 
						
							
							
								
								MRF: simple policy: contain media removal/nsfw ops to create activities only
							
							
							
							
							
						 | 
						
							2018-09-10 01:16:01 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								e82ce2a4b3
								
							
						 | 
						
							
							
								
								formatting
							
							
							
							
							
						 | 
						
							2018-09-10 00:28:40 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								358f88e10a
								
							
						 | 
						
							
							
								
								html: allow inline images by default (because of custom emoji)
							
							
							
							
							
						 | 
						
							2018-09-10 00:24:19 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								40e2f6e500
								
							
						 | 
						
							
							
								
								html: add default scrubbing profile and configuration knobs
							
							
							
							
							
						 | 
						
							2018-09-10 00:14:57 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								ac486fc59b
								
							
						 | 
						
							
							
								
								everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly
							
							
							
							
							
						 | 
						
							2018-09-10 00:14:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								255f46d7ab
								
							
						 | 
						
							
							
								
								html: new module providing a configurable markup scrubbing policy
							
							
							
							
							
						 | 
						
							2018-09-10 00:13:57 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Dominique Feyer
								
							 
						 | 
						
							
							
							
							
								
							
							
								801d645c6b
								
							
						 | 
						
							
							
								
								TASK: Fix formatting
							
							
							
							
							
						 | 
						
							2018-09-09 23:42:28 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Dominique Feyer
								
							 
						 | 
						
							
							
							
							
								
							
							
								b79c126ee0
								
							
						 | 
						
							
							
								
								Add missing URL encoding in create authorization redirect
							
							
							
							
							
						 | 
						
							2018-09-09 23:31:47 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hakaba Hitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								4e1bb7bccb
								
							
						 | 
						
							
							
								
								make limit for /api/v1/suggestions
							
							
							
							
							
						 | 
						
							2018-09-09 13:57:23 +09: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								530561a091
								
							
						 | 
						
							
							
								
								Merge branch 'add-secure-and-samesite-cookie-flags' into 'develop'
							
							
							
							
							
							
							
							Add Secure and SameSite cookie flags
See merge request pleroma/pleroma!302 
							
						 | 
						
							2018-09-07 23:55:42 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								3e4f39116b
								
							
						 | 
						
							
							
								
								Merge branch 'feature/custom_media_url' into 'develop'
							
							
							
							
							
							
							
							[Pleroma.Uploaders.Local]: Add configuration for custom url path
See merge request pleroma/pleroma!318 
							
						 | 
						
							2018-09-07 23:49:36 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Martin Kühl
								
							 
						 | 
						
							
							
							
							
								
							
							
								c1d07da4e1
								
							
						 | 
						
							
							
								
								Mastodon API: Fake support for loading filters
							
							
							
							
							
						 | 
						
							2018-09-07 16:12:44 +02: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
								
							 
						 | 
						
							
							
							
							
								
							
							
								70163aec9b
								
							
						 | 
						
							
							
								
								Add LegacyAuthenticationPlug to router.
							
							
							
							
							
						 | 
						
							2018-09-05 22:31:57 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								44b094908c
								
							
						 | 
						
							
							
								
								Update legacy passwords automatically.
							
							
							
							
							
						 | 
						
							2018-09-05 22:30:14 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								3aba585e7a
								
							
						 | 
						
							
							
								
								Add Plugs to router.
							
							
							
							
							
						 | 
						
							2018-09-05 21:57:56 +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
								
							 
						 | 
						
							
							
							
							
								
							
							
								636ad3e155
								
							
						 | 
						
							
							
								
								Add new plugs to router.
							
							
							
							
							
						 | 
						
							2018-09-05 19:13:53 +02: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
								
							 
						 | 
						
							
							
							
							
								
							
							
								8b020e03a6
								
							
						 | 
						
							
							
								
								change cond to if else
							
							
							
							
							
						 | 
						
							2018-09-05 01:37:48 -04: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
								
							 
						 | 
						
							
							
							
							
								
							
							
								9a21ff5f61
								
							
						 | 
						
							
							
								
								nodeinfo: add staffAccounts field to metadata
							
							
							
							
							
						 | 
						
							2018-09-03 14:48:31 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hakaba Hitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								b1124f1605
								
							
						 | 
						
							
							
								
								report chat and gopher support at /nodeinfo/2.0.json
							
							
							
							
							
						 | 
						
							2018-09-03 21:13:30 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								b61430163b
								
							
						 | 
						
							
							
								
								user: add moderator_user_query()
							
							
							
							
							
						 | 
						
							2018-09-03 12:03:23 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									shadowfacts
								
							 
						 | 
						
							
							
							
							
								
							
							
								35515cfa66
								
							
						 | 
						
							
							
								
								Update mastodon_api_controller.ex
							
							
							
							
							
						 | 
						
							2018-09-03 01:58:55 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									shadowfacts
								
							 
						 | 
						
							
							
							
							
								
							
							
								26f8697400
								
							
						 | 
						
							
							
								
								Update mastodon_api_controller.ex
							
							
							
							
							
						 | 
						
							2018-09-03 01:52:02 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									shadowfacts
								
							 
						 | 
						
							
							
							
							
								
							
							
								2b2bd0e047
								
							
						 | 
						
							
							
								
								Render notification IDs as strings, not numbers
							
							
							
							
							
						 | 
						
							2018-09-03 01:40:05 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thurloat
								
							 
						 | 
						
							
							
							
							
								
							
							
								4257f784bc
								
							
						 | 
						
							
							
								
								sloop around get_emoji/1 to check is_binary and have a fallthrough
							
							
							
							
							
							
							
							default that returns empty 
							
						 | 
						
							2018-09-02 20:44:37 -03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								754deb26dd
								
							
						 | 
						
							
							
								
								[Pleroma.Uploaders.Local]: Add configuration for custom url path
							
							
							
							
							
							
							
							One use-case being an external caching proxy 
							
						 | 
						
							2018-09-02 19:00:16 +02: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								3c7280934e
								
							
						 | 
						
							
							
								
								Merge branch 'security/activitypub-spoofing' into 'develop'
							
							
							
							
							
							
							
							security: activitypub spoofing
See merge request pleroma/pleroma!321 
							
						 | 
						
							2018-09-01 23:48:55 +00:00 | 
						
						
							
							
							
								
							
							
						 |