| 
								
								
									 William Pitcock | 4030837d91 | notification: add non_follows/non_followers notification control settings | 2019-05-25 05:19:47 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 56fd7dbdd7 | remove @websub and @ostatus module-level constants | 2019-05-25 04:43:11 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 80d55d428f | tests: websub: check only that signature validation succeeds or fails | 2019-05-25 04:34:16 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 9bec891eb4 | kill @httpoison | 2019-05-25 04:24:21 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 9f44fa0686 | Merge branch 'fix/nodeinfo-unavailable-when-not-federating' into 'develop' Keep nodeinfo available when not federating
Closes #923
See merge request pleroma/pleroma!1202 | 2019-05-25 01:45:17 +00:00 |  | 
				
					
						| 
								
								
									 Aaron Tinio | 9415932af5 | Keep nodeinfo available when not federating | 2019-05-25 08:15:12 +08:00 |  | 
				
					
						| 
								
								
									 kaniini | 625fec58ff | Merge branch 'bugfix/mention-all-people-in-beginning-dm' into 'develop' Mention all people in the beginning of DM
Closes #924
See merge request pleroma/pleroma!1194 | 2019-05-24 20:34:23 +00:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | bbea5691da | Mention all people in the beginning of DM | 2019-05-24 20:34:23 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 8a0ee011ac | Merge branch 'feature/static-headers' into 'develop' Improve serving of static assets
See merge request pleroma/pleroma!1200 | 2019-05-24 20:33:55 +00:00 |  | 
				
					
						| 
								
								
									 feld | f916e4cdd9 | Move the Cache Control header test to its own file We can consolidate our cache control header tests here | 2019-05-24 20:33:55 +00:00 |  | 
				
					
						| 
								
								
									 lambda | 6499adc6a8 | Merge branch 'reverse_proxy_upstream_v4_fix' into 'develop' explicitly set reverse proxy upstream to IPv4
Closes #930
See merge request pleroma/pleroma!1197 | 2019-05-24 09:54:45 +00:00 |  | 
				
					
						| 
								
								
									 Alfie Pates | 356c047759 | explicitly set reverse proxy upstream to IPv4 since Pleroma.Web.Endpoint binds on IPv4 only and `localhost.` resolves to
  [::0] on some systems
  fixes #930. | 2019-05-23 22:33:27 +01:00 |  | 
				
					
						| 
								
								
									 rinpatch | 8b2d39c1ec | Change the order of preloading when fetching activities for context | 2019-05-23 14:03:16 +03:00 |  | 
				
					
						| 
								
								
									 kaniini | 75e78d4e23 | Merge branch 'feature/mrf-user-filter' into 'develop' mrf: add support for filtering users
See merge request pleroma/pleroma!1188 | 2019-05-22 19:03:14 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | e6b175ed6c | Fix credo issues | 2019-05-22 21:57:46 +03:00 |  | 
				
					
						| 
								
								
									 kaniini | f0516d9114 | Merge branch 'ssh-fixes' into 'develop' Ssh fixes
Closes #869 and #925
See merge request pleroma/pleroma!1191 | 2019-05-22 18:57:34 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 7d9b33b3ce | update documentation for the new MRF features [no-ci] | 2019-05-22 18:53:30 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 8086c7aed6 | tests: add tests for banner and avatar removal | 2019-05-22 18:53:12 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | baf72d6c58 | mrf: simple policy: add the ability to strip avatars and banners from user profiles | 2019-05-22 18:53:12 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 60f882b09f | activitypub: run user objects through MRF filters | 2019-05-22 18:53:12 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 75b6c4b004 | mrf: defang policy modules for filtering user profile objects | 2019-05-22 18:53:12 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | ac7702f800 | Exclude Answers from fetching by default | 2019-05-22 21:52:12 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 19c90d47c4 | Normalize poll votes to Answer objects | 2019-05-22 21:17:57 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 0b4f569c5b | Merge branch 'fix/prune-objects-times-out' into 'develop' Disable timeouts for object pruning query
See merge request pleroma/pleroma!1193 | 2019-05-22 17:19:51 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 54e10a3e55 | Disable timeouts for object pruning query | 2019-05-22 20:10:52 +03:00 |  | 
				
					
						| 
								
								
									 lambda | 83ca12f45e | Merge branch 'issue/699' into 'develop' [#699] add worker to clean expired oauth tokens
See merge request pleroma/pleroma!1184 | 2019-05-22 15:44:50 +00:00 |  | 
				
					
						| 
								
								
									 Maksim | 620908a2db | [#699] add worker to clean expired oauth tokens | 2019-05-22 15:44:50 +00:00 |  | 
				
					
						| 
								
								
									 lambda | 78ac8ee561 | Update CHANGELOG.md | 2019-05-22 11:07:51 +00:00 |  | 
				
					
						| 
								
								
									 lambda | 714d8d4ef9 | Merge branch 'feature/object-pruning' into 'develop' Object pruning
See merge request pleroma/pleroma!1181 | 2019-05-22 11:04:30 +00:00 |  | 
				
					
						| 
								
								
									 lain | f323031927 | Mix: Only start sshd when needed, second try. | 2019-05-22 12:57:20 +02:00 |  | 
				
					
						| 
								
								
									 lambda | ad535ae55b | Merge branch 'bring-ecto-back-to-mainline' into 'develop' Mix: Bring ecto-sql back to mainline.
See merge request pleroma/pleroma!1192 | 2019-05-22 10:05:05 +00:00 |  | 
				
					
						| 
								
								
									 lain | f4cfcead88 | Mix: Bring ecto-sql back to mainline. | 2019-05-22 11:44:17 +02:00 |  | 
				
					
						| 
								
								
									 lain | 3b12e1ba7c | Changelog: Add tip for debian users. | 2019-05-22 11:01:10 +02:00 |  | 
				
					
						| 
								
								
									 rinpatch | 10ca1f91de | Add GIN index on object data->'name' | 2019-05-22 11:56:53 +03:00 |  | 
				
					
						| 
								
								
									 lain | b22145cbc4 | Documentation: Specify PEM format for SSH keys. Otherwise openssh-client 7.9 will generate a different format that can't be used
by esshd. | 2019-05-22 10:44:26 +02:00 |  | 
				
					
						| 
								
								
									 lain | db9a82d168 | Linting. | 2019-05-22 10:40:15 +02:00 |  | 
				
					
						| 
								
								
									 lain | b6cf62ddea | Mix: Don't start esshd application if we don't need it. | 2019-05-22 10:28:50 +02:00 |  | 
				
					
						| 
								
								
									 lain | f9e0d09ec0 | Changelog: Add SSH mode. | 2019-05-22 10:17:32 +02:00 |  | 
				
					
						| 
								
								
									 lambda | ff363f70b5 | Merge branch 'refactor/keys' into 'develop' move key generation functions into Pleroma.Keys module
See merge request pleroma/pleroma!1186 | 2019-05-22 06:28:16 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 1344c85e2f | salmon: fix credo | 2019-05-22 05:58:51 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | cdac5efd10 | Merge branch 'bugfix/account_view_source.note' into 'develop' MastoAPI AccountView: fill source.note with plaintext version of note
Closes #926
See merge request pleroma/pleroma!1189 | 2019-05-22 05:39:01 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 0e2c215a00 | MastoAPI AccountView: fill source.note with plaintext version of note Closes: https://git.pleroma.social/pleroma/pleroma/issues/926 | 2019-05-22 07:22:19 +02:00 |  | 
				
					
						| 
								
								
									 kaniini | 79c2cef2fb | Merge branch 'mongooseim-support' into 'develop' MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172 | 2019-05-22 04:06:54 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | ab6e15622b | Merge branch 'fix/api-fallback' into 'develop' Do not fallback to index.html for /api/* routes
Closes #920
See merge request pleroma/pleroma!1182 | 2019-05-22 04:05:41 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 334ffcb86f | Merge branch 'bugfix/dm-being-truncated' into 'develop' Do not truncate DM when it contains newlines and safe_dm_mentions is set to true
Closes #904
See merge request pleroma/pleroma!1185 | 2019-05-22 04:04:20 +00:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | 9134848170 | Do not truncate DM when it contains newlines and safe_dm_mentions is set to true | 2019-05-22 04:04:20 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 045803346d | move key generation functions into Pleroma.Keys module | 2019-05-22 03:58:15 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | a023ca004c | prune objects task: use Repo.delete_all() | 2019-05-22 03:12:48 +00:00 |  | 
				
					
						| 
								
								
									 Aaron Tinio | f76268135c | Fix failing test | 2019-05-22 07:16:11 +08:00 |  | 
				
					
						| 
								
								
									 Aaron Tinio | 3ab9255eda | Respond with a 404 Not implemented JSON error message when requested API is not implemented | 2019-05-22 07:15:52 +08:00 |  |