| 
								
								
									 Jeff Becker | 5ddd15d794 | make httppoison use configurable http proxy | 2017-12-30 13:08:36 -05:00 |  | 
				
					
						| 
								
								
									 eal | 5c09d8d3f1 | Unlink follow import process from the one processing request. Mistakes were made. | 2017-12-23 16:40:43 +02:00 |  | 
				
					
						| 
								
								
									 lambda | ad180ad6dd | Merge branch 'media-proxy-fix-encoding' into 'develop' Remove a useless URI.encode call in MediaProxy
See merge request pleroma/pleroma!42 | 2017-12-22 12:07:10 +00:00 |  | 
				
					
						| 
								
								
									 href | 0ccd0e5cc9 | Remove a useless URI.encode call in MediaProxy | 2017-12-21 20:59:10 +01:00 |  | 
				
					
						| 
								
								
									 lambda | 35ac549a99 | Merge branch 'media-proxy' into 'develop' Media proxy
See merge request pleroma/pleroma!34 | 2017-12-20 14:22:24 +00:00 |  | 
				
					
						| 
								
								
									 Lain Iwakura | 2a744cdff8 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop | 2017-12-19 16:15:45 +01:00 |  | 
				
					
						| 
								
								
									 Lain Iwakura | f1f79c0dca | Fix timelines in subway tooter. | 2017-12-19 16:15:07 +01:00 |  | 
				
					
						| 
								
								
									 lambda | 29c9812789 | Merge branch 'fix/twitterapi-follow-lists' into 'develop' Fix follower/following lists.
Closes #29
See merge request pleroma/pleroma!41 | 2017-12-18 22:44:15 +00:00 |  | 
				
					
						| 
								
								
									 Lain Iwakura | 47887ac848 | MastoAPI: Fix always-sensitive bugs. | 2017-12-18 16:56:03 +01:00 |  | 
				
					
						| 
								
								
									 Lain Iwakura | 846d59a536 | Send out salmons before websub. | 2017-12-18 16:16:22 +01:00 |  | 
				
					
						| 
								
								
									 eal | 1969773fb4 | Fix follower/following lists. Add tests. | 2017-12-18 16:37:26 +02:00 |  | 
				
					
						| 
								
								
									 lambda | 6b48489237 | Merge branch 'feature/follow-import' into 'develop' Add follow import.
See merge request pleroma/pleroma!40 | 2017-12-18 10:59:57 +00:00 |  | 
				
					
						| 
								
								
									 eal | fdfb508259 | Run follow import in the background. | 2017-12-12 21:04:41 +02:00 |  | 
				
					
						| 
								
								
									 eal | d89193a8d7 | Allow uploading a file for follow import. | 2017-12-12 21:03:28 +02:00 |  | 
				
					
						| 
								
								
									 Lain Iwakura | 4a13b84887 | Add recipients field to activities. Also do some very basic checks for AP message insertion. | 2017-12-12 18:07:14 +01:00 |  | 
				
					
						| 
								
								
									 eal | 39ccfdc084 | Add follow import. | 2017-12-12 18:35:23 +02:00 |  | 
				
					
						| 
								
								
									 href | f909aec050 | proxy emojis (i fix emojos better than gargon but sshhhhh) | 2017-12-12 12:30:24 +01:00 |  | 
				
					
						| 
								
								
									 href | 8e82547179 | fix content-type and fallback to image/jpeg | 2017-12-12 11:45:55 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 888ec9e579 | ActivityPub: Check inbox requests for valid signature. | 2017-12-12 10:17:50 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | a9c23e1c32 | Add plug to validate signed http requests. | 2017-12-12 10:17:21 +01:00 |  | 
				
					
						| 
								
								
									 eal | 9223038319 | Fix some more tests. | 2017-12-11 21:01:36 +02:00 |  | 
				
					
						| 
								
								
									 Lain Iwakura | e2e6365035 | ActivityPub: Add controller tests. | 2017-12-11 18:22:48 +01:00 |  | 
				
					
						| 
								
								
									 Lain Iwakura | 64330d9455 | ActivityPub: Add object routes / controller. | 2017-12-11 18:21:33 +01:00 |  | 
				
					
						| 
								
								
									 Lain Iwakura | a89a613e4e | ActivityPub: Use only string keys in views. | 2017-12-11 18:20:41 +01:00 |  | 
				
					
						| 
								
								
									 Lain Iwakura | da005d3332 | ActivityPub: Add Objects View. | 2017-12-11 18:19:46 +01:00 |  | 
				
					
						| 
								
								
									 eal | 79b3397c17 | Fix tests. | 2017-12-11 18:41:03 +02:00 |  | 
				
					
						| 
								
								
									 lambda | 4b06e46a3a | Merge branch 'fix/tootdon-mentions' into 'develop' Fix Tootdon linking the whole status when mentioning someone.
See merge request pleroma/pleroma!39 | 2017-12-11 16:21:43 +00:00 |  | 
				
					
						| 
								
								
									 eal | b00e230760 | Add a bunch of useless HTML to mentions. | 2017-12-11 18:14:33 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | c3bcafc51b | HTTPSig: Add method to validate conn | 2017-12-11 10:37:40 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 5599c5920c | Basic incoming AP support. | 2017-12-11 10:37:22 +01:00 |  | 
				
					
						| 
								
								
									 href | 9093b2cf49 | Merge remote-tracking branch 'upstream/develop' into media-proxy | 2017-12-11 02:45:28 +01:00 |  | 
				
					
						| 
								
								
									 href | d1806ec07f | nginx sample config, quickly tested | 2017-12-11 02:40:19 +01:00 |  | 
				
					
						| 
								
								
									 href | 077faaed8c | Limit body size to 25MB | 2017-12-11 02:31:37 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 25118aeef7 | Add link to AP address in webfinger. | 2017-12-09 15:34:43 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 30e9b22f96 | Merge branch 'develop' into feature/activitypub | 2017-12-09 11:00:56 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | d5a13c10ac | Merge branch 'feature/user_deletion' into develop | 2017-12-09 10:10:45 +01:00 |  | 
				
					
						| 
								
								
									 Lain Iwakura | ef2322bdb7 | Delete notifications on activity deletion. | 2017-12-08 18:17:30 +01:00 |  | 
				
					
						| 
								
								
									 Lain Iwakura | bad499b3fd | Basic user deletion. | 2017-12-08 17:50:11 +01:00 |  | 
				
					
						| 
								
								
									 lambda | 35cfbf43a0 | Merge branch 'fix/linkify' into 'develop' Fix links with HTML elements and/or parentheses.
See merge request pleroma/pleroma!38 | 2017-12-08 12:34:03 +00:00 |  | 
				
					
						| 
								
								
									 lambda | 40c30ab895 | Merge branch 'fix/mastoapi-attachment-linking' into 'develop' MastoAPI: don't add attachment links.
Closes #92
See merge request pleroma/pleroma!37 | 2017-12-08 12:32:33 +00:00 |  | 
				
					
						| 
								
								
									 lambda | d7da3ca05d | Merge branch 'postgresetup' into 'develop' first version of safe DB setup
See merge request pleroma/pleroma!32 | 2017-12-08 12:31:14 +00:00 |  | 
				
					
						| 
								
								
									 eal | a3e68f0233 | Allow parentheses in links. | 2017-12-07 21:38:31 +02:00 |  | 
				
					
						| 
								
								
									 eal | bf91e5659f | Fix HTML escape breaking some links. | 2017-12-07 21:36:06 +02:00 |  | 
				
					
						| 
								
								
									 eal | 5436dbaeaf | MastoAPI: don't add attachment links. | 2017-12-07 20:44:09 +02:00 |  | 
				
					
						| 
								
								
									 eal | afd0ea37f3 | Add websocket upgrade to example nginx config. | 2017-12-07 20:07:51 +02:00 |  | 
				
					
						| 
								
								
									 Lain Iwakura | 6df6ad0b42 | User deletion: Remove relationships. | 2017-12-07 18:13:05 +01:00 |  | 
				
					
						| 
								
								
									 Lain Iwakura | a78ae2a685 | Don't follow deactivated users. | 2017-12-07 17:51:55 +01:00 |  | 
				
					
						| 
								
								
									 Lain Iwakura | b727ecc5e7 | Add function to deactivate users. | 2017-12-07 17:47:23 +01:00 |  | 
				
					
						| 
								
								
									 Lain Iwakura | 0ec5aeb8a7 | Don't log in deactivated users. | 2017-12-07 17:41:34 +01:00 |  | 
				
					
						| 
								
								
									 Lain Iwakura | e31a5ff4af | Priority queue fixes. | 2017-12-06 16:51:11 +01:00 |  |