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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								434601a5c3
								
							
						 | 
						
							
							
								
								Return private / direct posts on user timelines, too.
							
							
							
							
							
						 | 
						
							2018-05-20 16:15:18 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								8b0c222b43
								
							
						 | 
						
							
							
								
								Merge branch 'feature/account-deletion' into 'develop'
							
							
							
							
							
							
							
							Feature/account deletion
Closes #115
See merge request pleroma/pleroma!157 
							
						 | 
						
							2018-05-20 10:57:19 +00: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Syldexia
								
							 
						 | 
						
							
							
							
							
								
							
							
								d1366f8d46
								
							
						 | 
						
							
							
								
								Modified deleting an account to run as a task
							
							
							
							
							
						 | 
						
							2018-05-19 13:35:49 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								7831b38705
								
							
						 | 
						
							
							
								
								Merge branch 'feature/webfinger-mime-ld-json' into 'develop'
							
							
							
							
							
							
							
							webfinger: handle application/ld+json links
See merge request pleroma/pleroma!159 
							
						 | 
						
							2018-05-19 09:31:08 +00: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								f32e19f668
								
							
						 | 
						
							
							
								
								webfinger: add tests
							
							
							
							
							
						 | 
						
							2018-05-19 01:28:27 -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
								
							 
						 | 
						
							
							
							
							
								
							
							
								1d4bbec6b3
								
							
						 | 
						
							
							
								
								Fix User search.
							
							
							
							
							
							
							
							Now uses a trigram based search. This is a lot faster and gives better
results. Closes #185. 
							
						 | 
						
							2018-05-16 17:55:20 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Syldexia
								
							 
						 | 
						
							
							
							
							
								
							
							
								98b36d359a
								
							
						 | 
						
							
							
								
								Fixed formatting and test
							
							
							
							
							
						 | 
						
							2018-05-13 15:43:42 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Syldexia
								
							 
						 | 
						
							
							
							
							
								
							
							
								5bfb7b4ce6
								
							
						 | 
						
							
							
								
								Moved account deletion stuff to somewhere that hopefully makes more sense
							
							
							
							
							
						 | 
						
							2018-05-13 14:36:02 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Syldexia
								
							 
						 | 
						
							
							
							
							
								
							
							
								a16117225f
								
							
						 | 
						
							
							
								
								Added endpoint for user account deletion
							
							
							
							
							
						 | 
						
							2018-05-13 14:35:48 +01: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pierrick Brun
								
							 
						 | 
						
							
							
							
							
								
							
							
								89603eda9e
								
							
						 | 
						
							
							
								
								do not create notification for yourself
							
							
							
							
							
						 | 
						
							2018-05-11 11:31:17 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								9810153aeb
								
							
						 | 
						
							
							
								
								Streamer: Don't send out stream events for blocked users.
							
							
							
							
							
						 | 
						
							2018-05-05 13:40:47 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								c464355d1a
								
							
						 | 
						
							
							
								
								Idempotency: Use special cache, keep for 6 hours.
							
							
							
							
							
						 | 
						
							2018-05-05 11:15:57 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								90c4bed0af
								
							
						 | 
						
							
							
								
								Don't expire idempotency cache for five minutes.
							
							
							
							
							
						 | 
						
							2018-05-04 21:15:39 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								fcd3eca167
								
							
						 | 
						
							
							
								
								MastodonAPI: Support idempotency key.
							
							
							
							
							
						 | 
						
							2018-05-04 20:30:29 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								8b4ee0ea51
								
							
						 | 
						
							
							
								
								Fix formatting
							
							
							
							
							
						 | 
						
							2018-05-04 03:19:48 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								bc215f5684
								
							
						 | 
						
							
							
								
								Fix format.
							
							
							
							
							
						 | 
						
							2018-04-29 11:28:26 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								b7584edcea
								
							
						 | 
						
							
							
								
								Merge branch 'patch-bio' into 'develop'
							
							
							
							
							
							
							
							replace newlines in profiles with <br>
See merge request pleroma/pleroma!136 
							
						 | 
						
							2018-04-29 09:26:47 +00:00 | 
						
						
							
							
							
								
							
							
						 |