lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								94d8f1ab30
								
							
						 | 
						
							
							
								
								Merge branch '394_user_tags' into 'develop'
							
							
							
							
							
							
							
							[#394] User tags
Closes #394
See merge request pleroma/pleroma!508 
							
						 | 
						
							2018-12-07 18:25:38 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								7b19487389
								
							
						 | 
						
							
							
								
								[#394] Added users.tags and admin routes to tag and untag users. Added tests.
							
							
							
							
							
						 | 
						
							2018-12-06 20:06:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								4944498133
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/compat/push-subscriptions
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/plugs/oauth_plug.ex 
							
						 | 
						
							2018-12-06 20:15:16 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4996fb07d8
								
							
						 | 
						
							
							
								
								Genereate uuids for existing info fields.
							
							
							
							
							
						 | 
						
							2018-12-01 12:00:33 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Martin Kühl
								
							 
						 | 
						
							
							
							
							
								
							
							
								d94ee5cd50
								
							
						 | 
						
							
							
								
								Mastodon API: Support push subscription CRUD
							
							
							
							
							
						 | 
						
							2018-09-22 07:04:01 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								c9f6eb9a41
								
							
						 | 
						
							
							
								
								user: implement dynamic refresh of profiles (gets rid of need for fix_ap_users task)
							
							
							
							
							
						 | 
						
							2018-09-20 23:50:56 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								76c67a41c1
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into 'feature/staff-discovery-api'
							
							
							
							
							
							
							
							# Conflicts:
#   lib/pleroma/web/nodeinfo/nodeinfo_controller.ex 
							
						 | 
						
							2018-09-03 14:55:42 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								1c9e539b47
								
							
						 | 
						
							
							
								
								Merge branch 'feature/mastodon_api_2.4.x' into 'develop'
							
							
							
							
							
							
							
							Add/Fix Mastodon endpoints for 2.4.3 compatibility
See merge request pleroma/pleroma!266 
							
						 | 
						
							2018-09-03 12:33:36 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								cf5d1302aa
								
							
						 | 
						
							
							
								
								migrations: add is_moderator index for users table
							
							
							
							
							
						 | 
						
							2018-09-03 11:55:12 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								1a70d41f8e
								
							
						 | 
						
							
							
								
								migrations: add index creation migration and recipients_to/cc removal migration
							
							
							
							
							
						 | 
						
							2018-08-29 18:41:02 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								038139d641
								
							
						 | 
						
							
							
								
								migrations: drop filler migration
							
							
							
							
							
						 | 
						
							2018-08-29 18:41:02 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								40ea07cd2f
								
							
						 | 
						
							
							
								
								migrations: add migration to fill in recipients_to/recipients_cc fields
							
							
							
							
							
						 | 
						
							2018-08-29 08:43:24 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								81673b8136
								
							
						 | 
						
							
							
								
								activity: add recipients_to and recipients_cc fields
							
							
							
							
							
						 | 
						
							2018-08-29 08:42:33 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6e030129fb
								
							
						 | 
						
							
							
								
								[MastodonAPI] Add filters
							
							
							
							
							
						 | 
						
							2018-08-27 15:09:05 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								13440a80e1
								
							
						 | 
						
							
							
								
								Merge branch 'feature/invites' into 'develop'
							
							
							
							
							
							
							
							Invites
Closes #108
See merge request pleroma/pleroma!208 
							
						 | 
						
							2018-08-12 12:04:15 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								4f589998ee
								
							
						 | 
						
							
							
								
								activitypub: support filtering activities by whether or not they are a reply (closes #109)
							
							
							
							
							
						 | 
						
							2018-06-18 03:21:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Henry Jameson
								
							 
						 | 
						
							
							
							
							
								
							
							
								f42ffbe9a8
								
							
						 | 
						
							
							
								
								Initial invites support + tests.
							
							
							
							
							
						 | 
						
							2018-06-12 14:55:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								564c73ab24
								
							
						 | 
						
							
							
								
								Merge branch 'feature/list-streaming' into 'develop'
							
							
							
							
							
							
							
							MastoAPI: Add streaming for lists.
See merge request pleroma/pleroma!183 
							
						 | 
						
							2018-06-12 07:19:45 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								29c9c8d93b
								
							
						 | 
						
							
							
								
								Extract host from ap_id, add index
							
							
							
							
							
						 | 
						
							2018-06-06 21:13:40 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								5d3fdbc082
								
							
						 | 
						
							
							
								
								MastoAPI: Add streaming for lists.
							
							
							
							
							
						 | 
						
							2018-05-30 16:48:59 +03: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								a8369db4f2
								
							
						 | 
						
							
							
								
								MastoAPI: add lists.
							
							
							
							
							
						 | 
						
							2018-05-24 13:18:39 +03: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								94c1f28ba4
								
							
						 | 
						
							
							
								
								Modify sort index for activities.
							
							
							
							
							
							
							
							This prevents a problem that made the local timeline very slow when
there were few posts. 
							
						 | 
						
							2018-05-13 12:54:08 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								0abd8a6bad
								
							
						 | 
						
							
							
								
								Fix migration.
							
							
							
							
							
						 | 
						
							2018-03-27 19:59:54 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								b56bb88c02
								
							
						 | 
						
							
							
								
								Drop index for 'local', it confuses the query planner.
							
							
							
							
							
						 | 
						
							2018-03-27 19:48:01 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								bd4926288e
								
							
						 | 
						
							
							
								
								Speed up follower query.
							
							
							
							
							
						 | 
						
							2018-03-26 10:31:22 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								1d1271ca1e
								
							
						 | 
						
							
							
								
								Add index for user follower address.
							
							
							
							
							
						 | 
						
							2018-03-26 09:53:47 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								f48bc5c3e1
								
							
						 | 
						
							
							
								
								Make User.following a postgres array.
							
							
							
							
							
						 | 
						
							2018-02-21 22:20:29 +01: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lain Iwakura
								
							 
						 | 
						
							
							
							
							
								
							
							
								50dca016f2
								
							
						 | 
						
							
							
								
								Add count index for local users.
							
							
							
							
							
						 | 
						
							2017-11-30 15:00:12 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								ccde03285d
								
							
						 | 
						
							
							
								
								add sort index for activities
							
							
							
							
							
						 | 
						
							2017-11-09 15:16:10 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								9e60de695d
								
							
						 | 
						
							
							
								
								Fix migration for empty db.
							
							
							
							
							
						 | 
						
							2017-11-09 13:45:17 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								6bf261589f
								
							
						 | 
						
							
							
								
								Update activities in own migration.
							
							
							
							
							
						 | 
						
							2017-11-09 13:32:53 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								20b8b87743
								
							
						 | 
						
							
							
								
								Update in chunks.
							
							
							
							
							
						 | 
						
							2017-11-09 12:33:38 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								f1d27a5fbb
								
							
						 | 
						
							
							
								
								Add actor column to activities.
							
							
							
							
							
						 | 
						
							2017-11-09 10:41:19 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								9af560083f
								
							
						 | 
						
							
							
								
								Use more efficient user note count update query.
							
							
							
							
							
						 | 
						
							2017-10-24 14:16:17 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								29c261e75b
								
							
						 | 
						
							
							
								
								Drop superflous index.
							
							
							
							
							
						 | 
						
							2017-10-24 11:07:21 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								9f417fd5e9
								
							
						 | 
						
							
							
								
								Speed up deletion and related queries.
							
							
							
							
							
						 | 
						
							2017-10-23 18:30:09 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								6af164f27b
								
							
						 | 
						
							
							
								
								Add password reset.
							
							
							
							
							
						 | 
						
							2017-10-19 17:37:24 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								62ca2617cd
								
							
						 | 
						
							
							
								
								Add tag index.
							
							
							
							
							
							
							
							This still isn't optimal, but at least it isn't super slow. 
							
						 | 
						
							2017-09-17 14:05:53 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								78485e24ac
								
							
						 | 
						
							
							
								
								Fixup old migrations.
							
							
							
							
							
						 | 
						
							2017-09-17 00:01:49 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								f0257c7516
								
							
						 | 
						
							
							
								
								Add fts search index.
							
							
							
							
							
						 | 
						
							2017-09-16 11:06:55 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								07b694814e
								
							
						 | 
						
							
							
								
								Optimize conversation fetching.
							
							
							
							
							
						 | 
						
							2017-09-12 13:48:48 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								61adf676d5
								
							
						 | 
						
							
							
								
								Add basic mastodon notification support.
							
							
							
							
							
						 | 
						
							2017-09-11 18:53:19 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								2a298d70f9
								
							
						 | 
						
							
							
								
								Add very basic oauth and mastodon api support.
							
							
							
							
							
						 | 
						
							2017-09-06 19:06:25 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								396c32a6da
								
							
						 | 
						
							
							
								
								Add follower_address to users, add on generation.
							
							
							
							
							
						 | 
						
							2017-07-19 18:49:25 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								5e17e04144
								
							
						 | 
						
							
							
								
								Make user timelines faster for users with few statuses.
							
							
							
							
							
						 | 
						
							2017-07-01 16:43:10 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								07cee92cd4
								
							
						 | 
						
							
							
								
								Add correct index.
							
							
							
							
							
						 | 
						
							2017-06-20 16:25:28 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								9cf38d6796
								
							
						 | 
						
							
							
								
								Use more efficient queries.
							
							
							
							
							
						 | 
						
							2017-06-20 16:18:42 +02:00 | 
						
						
							
							
							
								
							
							
						 |