William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ae8fa5d0aa 
								
							 
						 
						
							
							
								
								docs: document conversation_id extension  
							
							 
							
							
							
						 
						
							2019-03-21 23:27:42 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								3cc2554fa3 
								
							 
						 
						
							
							
								
								mastodon api: add conversation_id extension (ref  #674 )  
							
							 
							
							
							
						 
						
							2019-03-21 23:25:41 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								fea3696799 
								
							 
						 
						
							
							
								
								common api: move context functions from twitterapi  
							
							 
							
							
							
						 
						
							2019-03-21 23:24:04 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								bf8b29e080 
								
							 
						 
						
							
							
								
								Merge branch 'feature/move-search-to-db' into 'develop'  
							
							 
							
							... 
							
							
							
							Move gluing search results from application to database and get mutuals a higher score multiplier
See merge request pleroma/pleroma!960  
							
						 
						
							2019-03-21 21:41:04 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								88096c65a5 
								
							 
						 
						
							
							
								
								Move gluing search results from application to database and get mutuals  
							
							 
							
							... 
							
							
							
							a higher score multiplier 
							
						 
						
							2019-03-21 23:16:32 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								b48fddef5f 
								
							 
						 
						
							
							
								
								Merge branch 'feature/gopher-dstport' into 'develop'  
							
							 
							
							... 
							
							
							
							Add a gopher url port config option
See merge request pleroma/pleroma!959  
							
						 
						
							2019-03-21 17:08:40 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Quentin Rameau 
								
							 
						 
						
							
							
							
							
								
							
							
								80bc9ed2ba 
								
							 
						 
						
							
							
								
								Add a gopher url port config option  
							
							 
							
							... 
							
							
							
							This lets the user advertise a different port in the gopher urls,
for example listening locally on port 7070 but telling clients to
connect to the regular port 70. 
							
						 
						
							2019-03-21 19:59:43 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								b92a16aa00 
								
							 
						 
						
							
							
								
								Merge branch 'ecto-3-migration' into 'develop'  
							
							 
							
							... 
							
							
							
							Ecto 3.0.7 (ecto_sql 3.0.5) migration
See merge request pleroma/pleroma!957  
							
						 
						
							2019-03-21 16:24:57 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								b68fb3dc17 
								
							 
						 
						
							
							
								
								Merge branch 'imageoptim' into 'develop'  
							
							 
							
							... 
							
							
							
							used imageOptim to reduce size of image files
See merge request pleroma/pleroma!944  
							
						 
						
							2019-03-21 00:59:24 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e59cfa7cac 
								
							 
						 
						
							
							
								
								modify the migrations to use naive_datetime_usec  
							
							 
							
							
							
						 
						
							2019-03-20 16:16:29 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								cbc4a76b43 
								
							 
						 
						
							
							
								
								Fix filter migration  
							
							 
							
							
							
						 
						
							2019-03-20 16:13:23 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								19a19bdd81 
								
							 
						 
						
							
							
								
								Fix migration timestamp type  
							
							 
							
							
							
						 
						
							2019-03-20 16:04:59 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9a7b817c9a 
								
							 
						 
						
							
							
								
								Ecto 3.0.5 migration  
							
							 
							
							... 
							
							
							
							kms 
							
						 
						
							2019-03-20 15:59:54 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								0d14def0ca 
								
							 
						 
						
							
							
								
								Merge branch '2019-03-20-update-frontend' into 'develop'  
							
							 
							
							... 
							
							
							
							Update frontend
See merge request pleroma/pleroma!955  
							
						 
						
							2019-03-20 08:07:25 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								41511d1926 
								
							 
						 
						
							
							
								
								Update frontend  
							
							 
							
							
							
						 
						
							2019-03-20 08:58:25 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								606766b010 
								
							 
						 
						
							
							
								
								Merge branch 'fix/search-users-for-admin' into 'develop'  
							
							 
							
							... 
							
							
							
							Rework users search
Closes admin-fe#12
See merge request pleroma/pleroma!954  
							
						 
						
							2019-03-20 00:37:20 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								7ac9fff437 
								
							 
						 
						
							
							
								
								Format  
							
							 
							
							
							
						 
						
							2019-03-20 01:40:50 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								ed8a2935f5 
								
							 
						 
						
							
							
								
								Use ILIKE to search users  
							
							 
							
							
							
						 
						
							2019-03-20 01:37:40 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								9b80203ea5 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/activitypub-public' into 'develop'  
							
							 
							
							... 
							
							
							
							activitypub addressing improvements
Closes  #730  and #739 
See merge request pleroma/pleroma!953  
							
						 
						
							2019-03-19 21:36:20 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								1685e4258f 
								
							 
						 
						
							
							
								
								transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection  
							
							 
							
							
							
						 
						
							2019-03-19 18:39:33 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								67ff8d9311 
								
							 
						 
						
							
							
								
								user: properly cope with actors which do not declare a followers collection  
							
							 
							
							
							
						 
						
							2019-03-19 18:23:06 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								cd055983c3 
								
							 
						 
						
							
							
								
								transmogrifier: when determining followers collection URI, we may need to fetch the actor  
							
							 
							
							
							
						 
						
							2019-03-19 18:04:57 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								455bb526f6 
								
							 
						 
						
							
							
								
								test: add test for list sanitization  
							
							 
							
							
							
						 
						
							2019-03-19 17:53:40 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								fd0aa58ee0 
								
							 
						 
						
							
							
								
								tests: add test for as:Public issues  
							
							 
							
							
							
						 
						
							2019-03-19 17:49:29 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								d487b753c3 
								
							 
						 
						
							
							
								
								activitypub: transmogrifier: do not allow missing lists to be interpreted as nil  
							
							 
							
							
							
						 
						
							2019-03-19 17:30:25 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								798da28812 
								
							 
						 
						
							
							
								
								activitypub: transmogrifier: ensure as:Public activities are delivered to followers  
							
							 
							
							
							
						 
						
							2019-03-19 17:27:42 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									optikfluffel 
								
							 
						 
						
							
							
							
							
								
							
							
								00c5d7248f 
								
							 
						 
						
							
							
								
								fix UploadTest to use new image_tmp.jpg  
							
							 
							
							
							
						 
						
							2019-03-19 10:10:48 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									optikfluffel 
								
							 
						 
						
							
							
							
							
								
							
							
								a907522690 
								
							 
						 
						
							
							
								
								used imageOptim to reduce size of image files  
							
							 
							
							
							
						 
						
							2019-03-19 10:10:48 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								43bd7f47db 
								
							 
						 
						
							
							
								
								Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'  
							
							 
							
							... 
							
							
							
							Order users by nickname
See merge request pleroma/pleroma!945  
							
						 
						
							2019-03-18 23:08:31 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								a5675c965a 
								
							 
						 
						
							
							
								
								Merge branch 'doc/mastodon-api-accounts-extension' into 'develop'  
							
							 
							
							... 
							
							
							
							Document additional pleroma changes to /api/v1/accounts/:id
See merge request pleroma/pleroma!952  
							
						 
						
							2019-03-18 20:32:24 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								325c106cb5 
								
							 
						 
						
							
							
								
								Document additional pleroma changes to /api/v1/accounts/:id  
							
							 
							
							
							
						 
						
							2019-03-18 19:48:56 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								aba4c27120 
								
							 
						 
						
							
							
								
								Merge branch 'masto-api-notifications' into 'develop'  
							
							 
							
							... 
							
							
							
							Add support for exclude_types, limit and min_id in Mastodon notifications
See merge request pleroma/pleroma!949  
							
						 
						
							2019-03-18 19:17:36 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d0eb25a3da 
								
							 
						 
						
							
							
								
								Merge branch 'fix-initial-posts' into 'develop'  
							
							 
							
							... 
							
							
							
							Check if the user has indeed not been federated with before fetching initial posts
See merge request pleroma/pleroma!951  
							
						 
						
							2019-03-18 17:57:19 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								a1aacc08a4 
								
							 
						 
						
							
							
								
								Check if the user has indeed not been federated with  
							
							 
							
							... 
							
							
							
							Just updating the user triggered post fetching too, now it
shouldn't. It only happened in the AP user fetching since that's
what's used to update users 
							
						 
						
							2019-03-18 20:16:31 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9073039d72 
								
							 
						 
						
							
							
								
								Merge branch 'add-is-seen-mastodon-api-doc' into 'develop'  
							
							 
							
							... 
							
							
							
							Added documentation for Pleroma-specific is_seen in Mastodon API
See merge request pleroma/pleroma!948  
							
						 
						
							2019-03-18 09:58:51 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								1588688a11 
								
							 
						 
						
							
							
								
								Added support for exclude_types, limit, and min_id in Mastodon  
							
							 
							
							... 
							
							
							
							notifications.
Unify Mastodon-compatible pagination logic. 
							
						 
						
							2019-03-18 11:27:27 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								9971bf5be1 
								
							 
						 
						
							
							
								
								Added documentation for Pleroma-specific is_seen in Mastodon API  
							
							 
							
							
							
						 
						
							2019-03-18 10:40:10 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								1344e34ed3 
								
							 
						 
						
							
							
								
								Merge branch 'feature/allow-link-rel-attribute' into 'develop'  
							
							 
							
							... 
							
							
							
							Allow 'rel' attribute on `<a>` link with specific values (for hashtag recognition).
See merge request pleroma/pleroma!946  
							
						 
						
							2019-03-18 00:38:09 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fong-Wan Chau 
								
							 
						 
						
							
							
							
							
								
							
							
								4ed2618f6c 
								
							 
						 
						
							
							
								
								Allow 'rel' attribute on <a> link with specific values (for hashtag recognition).  
							
							 
							
							
							
						 
						
							2019-03-17 11:03:19 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								22ca1d1dfe 
								
							 
						 
						
							
							
								
								Merge branch 'feature/order-users-by-nickname-admin-api' of git.pleroma.social:maxf/pleroma into feature/order-users-by-nickname-admin-api  
							
							 
							
							
							
						 
						
							2019-03-17 13:30:05 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								76a13bc5a2 
								
							 
						 
						
							
							
								
								Fix test  
							
							 
							
							
							
						 
						
							2019-03-17 13:29:28 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								93291c3d7a 
								
							 
						 
						
							
							
								
								Order users by nickname  
							
							 
							
							
							
						 
						
							2019-03-17 13:23:31 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								cb2bdd5c07 
								
							 
						 
						
							
							
								
								Order users by nickname  
							
							 
							
							
							
						 
						
							2019-03-17 13:23:08 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								6d6f48d079 
								
							 
						 
						
							
							
								
								Merge branch 'feature/federated-flags' into 'develop'  
							
							 
							
							... 
							
							
							
							Federated reports
See merge request pleroma/pleroma!935  
							
						 
						
							2019-03-16 19:27:56 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								28df397454 
								
							 
						 
						
							
							
								
								Merge branch 'feature/oauth-me' into 'develop'  
							
							 
							
							... 
							
							
							
							oauth: add me property to token responses
See merge request pleroma/pleroma!942  
							
						 
						
							2019-03-16 08:44:02 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								c69dc2acf1 
								
							 
						 
						
							
							
								
								Merge branch 'feature/reblog-muting' into 'develop'  
							
							 
							
							... 
							
							
							
							Implement mastodon's reblog hiding feature
See merge request pleroma/pleroma!916  
							
						 
						
							2019-03-16 04:31:31 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								f58d47d6f7 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/ldap-test-fix' into 'develop'  
							
							 
							
							... 
							
							
							
							test: fix defective ldap setup/teardown
See merge request pleroma/pleroma!943  
							
						 
						
							2019-03-16 04:13:53 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								40134598a8 
								
							 
						 
						
							
							
								
								test: fix defective ldap setup/teardown  
							
							 
							
							
							
						 
						
							2019-03-16 04:05:19 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e0edc706cf 
								
							 
						 
						
							
							
								
								oauth: add me property to token responses  
							
							 
							
							
							
						 
						
							2019-03-16 01:12:50 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								532e8b0a43 
								
							 
						 
						
							
							
								
								Merge branch 'mark-notifications-as-read' into 'develop'  
							
							 
							
							... 
							
							
							
							Allow to mark a single notification as read
See merge request pleroma/pleroma!941  
							
						 
						
							2019-03-16 00:30:04 +00:00