lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								2c8deecdd2
								
							
						 | 
						
							
							
								
								Merge branch 'add-local-field-to-status' into 'develop'
							
							
							
							
							
							
							
							MastoAPI StatusView: Add locality indicator.
See merge request pleroma/pleroma!920 
							
						 | 
						
							2019-03-11 13:26:12 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4811eefa6e
								
							
						 | 
						
							
							
								
								MastoAPI StatusView: Add locality indicator.
							
							
							
							
							
						 | 
						
							2019-03-11 13:48:27 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								6038c8a753
								
							
						 | 
						
							
							
								
								Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec
							
							
							
							
							
						 | 
						
							2019-03-11 09:02:03 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								735f40047a
								
							
						 | 
						
							
							
								
								Merge branch 'delete-status' into 'develop'
							
							
							
							
							
							
							
							Allow an admin to delete a user status #721 (MastoAPI)
See merge request pleroma/pleroma!914 
							
						 | 
						
							2019-03-08 22:47:41 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								130fc9eae6
								
							
						 | 
						
							
							
								
								Merge branch 'fetch-posts-on-first-federation' into 'develop'
							
							
							
							
							
							
							
							Fetch user's outbox posts on first federation with that user
Closes #131
See merge request pleroma/pleroma!907 
							
						 | 
						
							2019-03-08 22:33:31 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								2827dfea50
								
							
						 | 
						
							
							
								
								Allow an admin to delete a user status
							
							
							
							
							
						 | 
						
							2019-03-08 20:21:56 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ekaterina Vaartis
								
							 
						 | 
						
							
							
							
							
								
							
							
								b775fded10
								
							
						 | 
						
							
							
								
								Add tests for fetch_ordered_collection
							
							
							
							
							
						 | 
						
							2019-03-08 16:28:40 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								3c5926fe91
								
							
						 | 
						
							
							
								
								tests: add regression test
							
							
							
							
							
						 | 
						
							2019-03-07 12:20:04 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								992145e64c
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/delete-activity-audience' into 'develop'
							
							
							
							
							
							
							
							expand the audience of delete activities to all recipients of the deleted object
Closes #682
See merge request pleroma/pleroma!891 
							
						 | 
						
							2019-03-07 11:31:08 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								7342b5a45f
								
							
						 | 
						
							
							
								
								Preserve parameters in link headers (Mastodon API)
							
							
							
							
							
						 | 
						
							2019-03-07 09:12:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								0fe715f3ba
								
							
						 | 
						
							
							
								
								Merge branch 'chore/merge-search-into-list-users' into 'develop'
							
							
							
							
							
							
							
							Merge search endpoint into /users
See merge request pleroma/pleroma!898 
							
						 | 
						
							2019-03-06 22:27:42 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								07f8c79a69
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/rel-me_list' into 'develop'
							
							
							
							
							
							
							
							Web.RelMe: Fix having other values in rel attr
See merge request pleroma/pleroma!901 
							
						 | 
						
							2019-03-06 13:20:51 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								bc7570c282
								
							
						 | 
						
							
							
								
								[#647] tests for web push
							
							
							
							
							
						 | 
						
							2019-03-06 13:20:12 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								28d5b40d0a
								
							
						 | 
						
							
							
								
								Add handling of objects not in database
							
							
							
							
							
						 | 
						
							2019-03-05 23:15:22 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								bcd8ef65e0
								
							
						 | 
						
							
							
								
								Merge branch 'add-admin-to-node-info' into 'develop'
							
							
							
							
							
							
							
							Include admins in nodeinfo
Closes #689
See merge request pleroma/pleroma!899 
							
						 | 
						
							2019-03-05 07:05:44 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								788a354ce0
								
							
						 | 
						
							
							
								
								Web.RelMe: Fix having other values in rel attr
							
							
							
							
							
							
							
							One example of this is Github which puts a rel="nofollow me" on the
profile link. 
							
						 | 
						
							2019-03-05 02:13:22 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								d1de0a30cc
								
							
						 | 
						
							
							
								
								Include admins in nodeinfo
							
							
							
							
							
						 | 
						
							2019-03-05 03:17:24 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								e34710b988
								
							
						 | 
						
							
							
								
								Format & update docs
							
							
							
							
							
						 | 
						
							2019-03-04 21:33:53 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								9f3cb38012
								
							
						 | 
						
							
							
								
								helpers: use AutoLinker to validate URIs as well as the other tests
							
							
							
							
							
						 | 
						
							2019-03-04 18:31:49 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								d7a278a733
								
							
						 | 
						
							
							
								
								tests: add tests for rich media helper functions
							
							
							
							
							
						 | 
						
							2019-03-04 18:31:49 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								d45dbdce5a
								
							
						 | 
						
							
							
								
								Merge branch 'feature/add-status-text-to-notifications' into 'develop'
							
							
							
							
							
							
							
							Add status text to notifications (mentions and reposts)
Closes #696
See merge request pleroma/pleroma!897 
							
						 | 
						
							2019-03-04 18:29:13 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								f620199836
								
							
						 | 
						
							
							
								
								Merge search endpoint into /users
							
							
							
							
							
						 | 
						
							2019-03-04 21:26:32 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								cc7b35e097
								
							
						 | 
						
							
							
								
								Add status text to notifications (mentions and reposts)
							
							
							
							
							
						 | 
						
							2019-03-04 20:47:34 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								ca5d894e68
								
							
						 | 
						
							
							
								
								Merge branch 'fix/like-adressing' into 'develop'
							
							
							
							
							
							
							
							Stop adresssing like activities to actor's follower collection on non-public posts
See merge request pleroma/pleroma!896 
							
						 | 
						
							2019-03-04 15:59:57 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								33c614bce0
								
							
						 | 
						
							
							
								
								Stop adresssing like activities to actor's follower collection on non-public posts
							
							
							
							
							
						 | 
						
							2019-03-04 18:09:58 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								aab86698a5
								
							
						 | 
						
							
							
								
								Expand "to" of delete activities
							
							
							
							
							
						 | 
						
							2019-03-04 11:18:45 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								86e4b48a5e
								
							
						 | 
						
							
							
								
								Fix DM visibility for blocking users
							
							
							
							
							
						 | 
						
							2019-03-04 06:24:27 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								ace4231628
								
							
						 | 
						
							
							
								
								Merge branch 'features/bio_rel_me' into 'develop'
							
							
							
							
							
							
							
							Add rel=me to the User bio
Closes #423
See merge request pleroma/pleroma!813 
							
						 | 
						
							2019-03-03 16:00:49 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								6c6a2dbfdd
								
							
						 | 
						
							
							
								
								Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
							
							
							
							
							
							
							
							Add pagination and search to users
See merge request pleroma/pleroma!873 
							
						 | 
						
							2019-03-03 15:59:15 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								c93479c6f5
								
							
						 | 
						
							
							
								
								Merge branch 'count-only-public-statuses' into 'develop'
							
							
							
							
							
							
							
							Increment user note count only on public activities #703
See merge request pleroma/pleroma!884 
							
						 | 
						
							2019-03-03 15:49:19 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								d5418e9ff7
								
							
						 | 
						
							
							
								
								Remove follow_request_count as it's not needed for FE anymore.
							
							
							
							
							
							
							
							MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load. 
							
						 | 
						
							2019-03-03 18:42:27 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								9b63fda9c7
								
							
						 | 
						
							
							
								
								Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'
							
							
							
							
							
							
							
							[#675] Do not show DMs in mentions timeline
See merge request pleroma/pleroma!877 
							
						 | 
						
							2019-03-03 11:13:59 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								c46950d3b1
								
							
						 | 
						
							
							
								
								Increment user note count only on public activities
							
							
							
							
							
						 | 
						
							2019-03-03 14:08:43 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								2ec8cf5665
								
							
						 | 
						
							
							
								
								Add pagination to search
							
							
							
							
							
						 | 
						
							2019-03-02 17:21:30 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								f38c316e6e
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/oauth-scopes-join' into 'develop'
							
							
							
							
							
							
							
							Bugfix: OAuth scopes formatting
Closes #702
See merge request pleroma/pleroma!881 
							
						 | 
						
							2019-03-02 06:39:07 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								8e6f7fdb86
								
							
						 | 
						
							
							
								
								RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil
							
							
							
							
							
						 | 
						
							2019-03-02 06:58:42 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								25e588496a
								
							
						 | 
						
							
							
								
								Pleroma.Web.RelMeTest: Add test against Pleroma.Web.RelMe
							
							
							
							
							
						 | 
						
							2019-03-02 06:31:33 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								bb9e40968a
								
							
						 | 
						
							
							
								
								Web.OAuth.OAuthControllerTest: Add test against token formatting
							
							
							
							
							
						 | 
						
							2019-03-02 04:10:57 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								f384a9a256
								
							
						 | 
						
							
							
								
								Format
							
							
							
							
							
						 | 
						
							2019-03-01 20:23:19 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								f1a4c3163b
								
							
						 | 
						
							
							
								
								Show current user in users list as well
							
							
							
							
							
						 | 
						
							2019-03-01 20:23:03 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b08b470f6
								
							
						 | 
						
							
							
								
								Add "local" params to users search
							
							
							
							
							
						 | 
						
							2019-03-01 20:13:02 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								9c6abec4d8
								
							
						 | 
						
							
							
								
								use commonapi.post instead of activitybulder
							
							
							
							
							
						 | 
						
							2019-03-01 15:48:04 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								1341ee650e
								
							
						 | 
						
							
							
								
								[#675] Do not show DMs in mentions timeline
							
							
							
							
							
						 | 
						
							2019-03-01 09:37:29 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								46f29b9da1
								
							
						 | 
						
							
							
								
								Add search users endpoint
							
							
							
							
							
						 | 
						
							2019-02-28 19:04:47 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								70e82a3465
								
							
						 | 
						
							
							
								
								Add test for the second page
							
							
							
							
							
						 | 
						
							2019-02-28 17:54:02 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								cf426a719d
								
							
						 | 
						
							
							
								
								Merge branch 'with-mutes' into 'develop'
							
							
							
							
							
							
							
							Add `with_muted` param.
Closes #683
See merge request pleroma/pleroma!872 
							
						 | 
						
							2019-02-28 10:22:19 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								3c849d0438
								
							
						 | 
						
							
							
								
								Merge branch 'deactivated-in-user-view' into 'develop'
							
							
							
							
							
							
							
							Add activation status to the regular user view
See merge request pleroma/pleroma!874 
							
						 | 
						
							2019-02-28 10:08:31 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								6b11011039
								
							
						 | 
						
							
							
								
								Added deactivated to the user view
							
							
							
							
							
						 | 
						
							2019-02-28 09:08:34 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								2883f75a3a
								
							
						 | 
						
							
							
								
								Add pagination to users admin API
							
							
							
							
							
						 | 
						
							2019-02-28 01:11:56 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								bbbdbec4fd
								
							
						 | 
						
							
							
								
								Remove parts of the old activity view.
							
							
							
							
							
							
							
							Not used anymore. 
							
						 | 
						
							2019-02-27 17:24:51 +01:00 | 
						
						
							
							
							
								
							
							
						 |