Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								72c2915ecd
								
							
						 | 
						
							
							
								
								Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads
							
							
							
							
							
						 | 
						
							2018-06-15 22:14:17 +02: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
								
							 
						 | 
						
							
							
							
							
								
							
							
								fc15f30a3c
								
							
						 | 
						
							
							
								
								fixup test
							
							
							
							
							
						 | 
						
							2018-06-13 21:45:27 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								1555c66650
								
							
						 | 
						
							
							
								
								Add unretweet TwAPI endpoint and cleanup AP.unannounce
							
							
							
							
							
						 | 
						
							2018-06-13 21:33:36 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								c773f42ca4
								
							
						 | 
						
							
							
								
								tests: update twitterapi user view tests for new locked variable
							
							
							
							
							
						 | 
						
							2018-06-11 22:15:53 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								f8e0942745
								
							
						 | 
						
							
							
								
								twitter api: add approve/deny endpoints
							
							
							
							
							
						 | 
						
							2018-06-11 22:15:53 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								d116af3bee
								
							
						 | 
						
							
							
								
								tests: add tests for /api/pleroma/friend_requests
							
							
							
							
							
						 | 
						
							2018-06-11 22:15:53 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								993312cdb3
								
							
						 | 
						
							
							
								
								twitterapi: add profile setting for locked/unlocked accounts
							
							
							
							
							
						 | 
						
							2018-06-11 22:15:53 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								a0c5b42e29
								
							
						 | 
						
							
							
								
								tests: assert the state prior to mutating it as well as afterward
							
							
							
							
							
						 | 
						
							2018-06-11 22:15:53 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								c99b9b9d92
								
							
						 | 
						
							
							
								
								testsuite: add mastodon api tests
							
							
							
							
							
						 | 
						
							2018-06-11 22:15:53 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								7f79b467b1
								
							
						 | 
						
							
							
								
								Merge branch 'feature/domain-blocks' into 'develop'
							
							
							
							
							
							
							
							Domain blocks
See merge request pleroma/pleroma!190 
							
						 | 
						
							2018-06-11 11:19:45 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								299ef74f2e
								
							
						 | 
						
							
							
								
								tests: add regression test for locking/unlocking account updates
							
							
							
							
							
						 | 
						
							2018-06-08 02:52:34 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									D Anzorge
								
							 
						 | 
						
							
							
							
							
								
							
							
								2cebaa7d3a
								
							
						 | 
						
							
							
								
								Add OAuth controller tests
							
							
							
							
							
							
							
							Tests for Pleroma.Web.OAuth.OAuthController 
							
						 | 
						
							2018-06-06 03:18:11 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								4856962434
								
							
						 | 
						
							
							
								
								MastoAPI: add domain blocking.
							
							
							
							
							
						 | 
						
							2018-06-03 22:21:23 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								8073af6e10
								
							
						 | 
						
							
							
								
								Better error handling for OstatusController.
							
							
							
							
							
						 | 
						
							2018-06-03 21:04:44 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								06439f64d0
								
							
						 | 
						
							
							
								
								Better error handling for ActivityPubController
							
							
							
							
							
						 | 
						
							2018-06-03 19:58:59 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4856ba596f
								
							
						 | 
						
							
							
								
								Better error handling for MastodonApiController.
							
							
							
							
							
						 | 
						
							2018-06-03 19:28:11 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								0f70e83e8c
								
							
						 | 
						
							
							
								
								Better error handling in TwitterApiController.
							
							
							
							
							
						 | 
						
							2018-06-03 19:11:22 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								98b8f08783
								
							
						 | 
						
							
							
								
								Merge branch 'fix/twitterapi-incorrect-follows-you' into 'develop'
							
							
							
							
							
							
							
							TwitterAPI: fix "Follows you" being shown for the wrong user.
Closes pleroma-fe#89
See merge request pleroma/pleroma!185 
							
						 | 
						
							2018-06-01 08:51:04 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								935e544e19
								
							
						 | 
						
							
							
								
								TwitterAPI: fix "Follows you" being shown for the wrong user.
							
							
							
							
							
						 | 
						
							2018-05-31 15:27:42 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								349400c06a
								
							
						 | 
						
							
							
								
								Fix url guessing attacks.
							
							
							
							
							
						 | 
						
							2018-05-30 20:00:27 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								f569b67cda
								
							
						 | 
						
							
							
								
								tests: update for html changes
							
							
							
							
							
						 | 
						
							2018-05-27 13:03:34 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								841ee8e3e4
								
							
						 | 
						
							
							
								
								Simplify DM query.
							
							
							
							
							
							
							
							Should also use indexes better. 
							
						 | 
						
							2018-05-26 16:25:32 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4b3ec53514
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
							
							
							
							
							
						 | 
						
							2018-05-26 16:00:59 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								1f3eb0f470
								
							
						 | 
						
							
							
								
								testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest)
							
							
							
							
							
						 | 
						
							2018-05-25 06:12:30 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								f3a71f2986
								
							
						 | 
						
							
							
								
								Merge branch 'feature/lists' into 'develop'
							
							
							
							
							
							
							
							Mastodon List API
See merge request pleroma/pleroma!138 
							
						 | 
						
							2018-05-24 20:22:43 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								c2dcd767cf
								
							
						 | 
						
							
							
								
								Merge branch 'feature/incoming-remote-unfollow' into 'develop'
							
							
							
							
							
							
							
							Add support for incoming remote unfollows and blocks/unblocks
See merge request pleroma/pleroma!158 
							
						 | 
						
							2018-05-24 19:52:24 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								c41012053a
								
							
						 | 
						
							
							
								
								Merge branch 'feature/change-password' into 'develop'
							
							
							
							
							
							
							
							Feature/change password
See merge request pleroma/pleroma!166 
							
						 | 
						
							2018-05-24 17:16:37 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								3dbd9809d4
								
							
						 | 
						
							
							
								
								MastoAPI: add lists.
							
							
							
							
							
						 | 
						
							2018-05-24 15:34:39 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								0b5bc62b33
								
							
						 | 
						
							
							
								
								Don't save double tags in AP objects we create
							
							
							
							
							
							
							
							This crashed Mastodon workers. 
							
						 | 
						
							2018-05-23 17:25:24 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								06c97f211f
								
							
						 | 
						
							
							
								
								Merge branch 'feature/deps-migration' into 'develop'
							
							
							
							
							
							
							
							Migrate to comeonin 4 and Cachex 3
See merge request pleroma/pleroma!162 
							
						 | 
						
							2018-05-23 09:03:11 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								72b93d13f8
								
							
						 | 
						
							
							
								
								Hook up block/unblock to TwitterAPI
							
							
							
							
							
						 | 
						
							2018-05-22 05:41:17 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								b2c6ae7d82
								
							
						 | 
						
							
							
								
								Hook up unfollow and (un)block to MastoAPI + tests
							
							
							
							
							
						 | 
						
							2018-05-22 04:27:40 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									csaurus
								
							 
						 | 
						
							
							
							
							
								
							
							
								4fd9df100f
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/mstdn-direct-api
							
							
							
							
							
						 | 
						
							2018-05-21 20:19:37 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Syldexia
								
							 
						 | 
						
							
							
							
							
								
							
							
								69aa7c213a
								
							
						 | 
						
							
							
								
								Fixed test
							
							
							
							
							
						 | 
						
							2018-05-21 23:06:03 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Syldexia
								
							 
						 | 
						
							
							
							
							
								
							
							
								d0690622cd
								
							
						 | 
						
							
							
								
								Added endpoint for changing passwords
							
							
							
							
							
						 | 
						
							2018-05-21 23:06:03 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								75cfd9d34d
								
							
						 | 
						
							
							
								
								webfinger: fix finding the XRD uri for statusnet instances
							
							
							
							
							
						 | 
						
							2018-05-21 12:41:31 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								d045b96f95
								
							
						 | 
						
							
							
								
								Add tests for incoming unfollow over OStatus
							
							
							
							
							
						 | 
						
							2018-05-21 05:11:13 -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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thog
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e55c6f311b
								
							
						 | 
						
							
							
								
								Migrate to comeonin 4 and Cachex 3
							
							
							
							
							
							
							
							Also fix some warning in the code and add a missing alias 
							
						 | 
						
							2018-05-20 20:08:40 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								413de8e4bc
								
							
						 | 
						
							
							
								
								More fixes.
							
							
							
							
							
						 | 
						
							2018-05-20 19:26:09 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								ff007af0c2
								
							
						 | 
						
							
							
								
								Return visilility in twitter api, too.
							
							
							
							
							
						 | 
						
							2018-05-20 18:01:24 +02:00 | 
						
						
							
							
							
								
							
							
						 |