| 
								
								
									 Haelwenn (lanodan) Monnier | 24b5a75d09 | Add test for Plume Articles | 2018-07-12 23:08:28 +02:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 8546551257 | activitypub: switch to using x509 representation for public keys instead of pkcs#1 | 2018-07-12 03:30:22 +00:00 |  | 
				
					
						| 
								
								
									 lambda | be800d7936 | Merge branch 'bugfix/block-follow-relationships' into 'develop' fix follow relationship leaks when blocked
See merge request pleroma/pleroma!230 | 2018-06-19 09:42:45 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 3707a7fa42 | tests: transmogrifier: ensure incoming blocks have the same effect as local blocks | 2018-06-19 00:59:28 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | a2c6778ce6 | tests: add regression test for contentMap-only posts | 2018-06-18 22:14:51 +00:00 |  | 
				
					
						| 
								
								
									 lambda | 8c7fdcb31b | Merge branch 'feature/twitterapi-unrepeat' into 'develop' Add TwitterAPI unretweet endpoint and cleanup AP.unannounce
See merge request pleroma/pleroma!218 | 2018-06-14 07:19:36 +00:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 1555c66650 | Add unretweet TwAPI endpoint and cleanup AP.unannounce | 2018-06-13 21:33:36 -04:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 299ef74f2e | tests: add regression test for locking/unlocking account updates | 2018-06-08 02:52:34 +00:00 |  | 
				
					
						| 
								
								
									 lain | 06439f64d0 | Better error handling for ActivityPubController | 2018-06-03 19:58:59 +02:00 |  | 
				
					
						| 
								
								
									 lain | 5e76adb07e | Fix url guessing attacks. | 2018-05-30 20:00:45 +02:00 |  | 
				
					
						| 
								
								
									 lain | 0a6c897c94 | Formatting. | 2018-05-26 15:11:50 +02:00 |  | 
				
					
						| 
								
								
									 lain | bfce29866f | Make Mastodon follow hack more explicit. | 2018-05-26 15:07:21 +02:00 |  | 
				
					
						| 
								
								
									 lain | 3839a11ef5 | Don't treat remote accepts/rejects as local. Also, use specialized functions to get safe data. | 2018-05-26 14:07:46 +02:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 1db0dc3072 | tests: add tests to verify the accept request is discarded if no follow activity could be found | 2018-05-26 11:20:53 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 7cf3cf77cf | activitypub transmogrifier: cleanups and tests for incoming accepts/rejects | 2018-05-25 12:53:12 +00:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | b2c6ae7d82 | Hook up unfollow and (un)block to MastoAPI + tests | 2018-05-22 04:27:40 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | cc5373b846 | Fix unblock handling | 2018-05-21 05:00:58 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 89c5de9096 | Fix unfollows | 2018-05-20 21:01:14 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 56de0216ae | pass user to User.blocks?/2 instead of ap_id | 2018-05-20 19:45:05 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 1afd6d37bd | Merge remote-tracking branch 'upstream/develop' into feature/incoming-remote-unfollow Fixed some conflicts in transmogrifier.ex | 2018-05-20 19:17:15 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | d46393f6ef | Fix test for blocks | 2018-05-20 02:15:56 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 1e43de0f86 | Formatting and add tests for blocks/unblocks | 2018-05-19 21:23:52 -04:00 |  | 
				
					
						| 
								
								
									 Thog | 6f39ecc41b | Support Undo like activities (Fix #139) | 2018-05-19 22:14:15 +02:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 4033ed6714 | tests: add test for hubzilla follow activity too | 2018-05-19 03:28:32 -05:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 19c96c8a19 | tests: add tests for Transmogrifier.maybe_fix_user_object() | 2018-05-19 03:28:30 -05:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 8d11bae0d5 | Revert "Undo formatting in user.ex" This reverts commit e6dc15b96c. | 2018-05-17 23:55:00 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | e6dc15b96c | Undo formatting in user.ex | 2018-05-17 23:53:34 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | d8c842a771 | Add support for incoming remote unfollows | 2018-05-17 22:15:57 -04:00 |  | 
				
					
						| 
								
								
									 lain | 89954a2ce7 | Fix format. | 2018-05-13 13:02:24 +02:00 |  | 
				
					
						| 
								
								
									 lain | c7a85de35c | Revert "Remove 'unlisted' handling for now." This reverts commit 1027d1f696. | 2018-05-13 12:38:13 +02:00 |  | 
				
					
						| 
								
								
									 lain | 1027d1f696 | Remove 'unlisted' handling for now. It's just too slow (over 1 second on small systems, haven't looked at
the queries in detail yet). We'll need some other way to handle it. | 2018-05-13 12:07:11 +02:00 |  | 
				
					
						| 
								
								
									 lambda | aeff2d6474 | Merge branch 'feature/unrepeats' into 'develop' Add unrepeats
Closes #69
See merge request pleroma/pleroma!113 | 2018-05-13 09:32:29 +00:00 |  | 
				
					
						| 
								
								
									 lain | ec531ca281 | Add test. | 2018-05-13 11:18:48 +02:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 16b793656d | Add tests for unrepeats | 2018-05-11 15:30:47 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 8b4ee0ea51 | Fix formatting | 2018-05-04 03:19:48 -04:00 |  | 
				
					
						| 
								
								
									 lambda | a7a40bb8f1 | Merge branch 'fix/blocked-user-boosts' into 'develop' ActivityPub.ex: do not return boosted statuses from blocked users.
See merge request pleroma/pleroma!111 | 2018-04-28 13:49:12 +00:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 2d775bf1be | Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature/unrepeats | 2018-04-25 01:58:50 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | e981280fa7 | Formatting fixes | 2018-04-25 01:43:45 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 9e0dd21ed6 | Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats | 2018-04-25 00:46:28 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 8c0806539c | Embed announce activity data instead of linking to it | 2018-04-22 21:28:51 -04:00 |  | 
				
					
						| 
								
								
									 lain | 0574df273c | Small cleanup. | 2018-04-22 10:01:10 +02:00 |  | 
				
					
						| 
								
								
									 eal | 22bfeac256 | Update note count in ActivityPub.create. | 2018-04-21 12:58:04 +03:00 |  | 
				
					
						| 
								
								
									 lain | 9e6ae44729 | Formatting fixes. | 2018-04-21 09:43:53 +02:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | f0798440de | Use correct activity for undo | 2018-04-20 23:22:16 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 7b4f55238e | Handle unrepeats via the TwitterAPI | 2018-04-18 06:00:40 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 687db1bc3a | Expose unannounce activity so that it can be tested | 2018-04-18 03:39:42 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 5b0d0b9ab2 | Add unreblogging tests | 2018-04-14 22:34:06 -04:00 |  | 
				
					
						| 
								
								
									 eal | 48380aeccc | ActivityPub.ex: do not return boosted statuses from blocked users. | 2018-04-14 14:26:20 +03:00 |  | 
				
					
						| 
								
								
									 lain | b3b7ab5d9a | Load all users at once in timelines. | 2018-04-02 16:35:41 +02:00 |  | 
				
					
						| 
								
								
									 lain | bc31bee7c4 | Generates contexts and ids on insertion time. | 2018-04-02 15:17:09 +02:00 |  |