rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d4a76b0a6f 
								
							 
						 
						
							
							
								
								Don't embed the first page in inboxes/outboxes and refactor the views to  
							
							... 
							
							
							
							follow View/Controller pattern
Note that I mentioned the change in 1.1 section because I intend to
backport this, if this is not needed I will move it back to Unreleased. 
							
						 
						
							2019-09-26 03:45:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c64ab84e6a 
								
							 
						 
						
							
							
								
								Merge branch 'fix-tests' into 'develop'  
							
							... 
							
							
							
							Fix `Activity.all_by_actor_and_id/2` test
See merge request pleroma/pleroma!1668 
(cherry picked from commit 3ae448b592b870ae08 
							
						 
						
							2019-09-14 18:14:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								dca545bb0d 
								
							 
						 
						
							
							
								
								Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs  
							
							
							
						 
						
							2019-09-14 15:25:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ae33cca4cf 
								
							 
						 
						
							
							
								
								Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs  
							
							
							
						 
						
							2019-09-14 15:25:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								056780fd8e 
								
							 
						 
						
							
							
								
								Mastodon API: Respect post privacy in favourited/reblogged endpoints  
							
							
							
						 
						
							2019-09-14 15:21:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								53a3ad6043 
								
							 
						 
						
							
							
								
								Merge branch 'cleanup-activity' into 'develop'  
							
							... 
							
							
							
							Cleanup `Pleroma.Activity` and add more tests
See merge request pleroma/pleroma!1623  
							
						 
						
							2019-09-13 14:48:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								0d9609894f 
								
							 
						 
						
							
							
								
								Merge branch 'feature/change-email' into 'develop'  
							
							... 
							
							
							
							Add email change endpoint
Closes  #1156 
See merge request pleroma/pleroma!1580  
							
						 
						
							2019-09-13 12:46:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f884987ace 
								
							 
						 
						
							
							
								
								Merge branch 'admin-config-description' into 'develop'  
							
							... 
							
							
							
							Admin config description
Closes  #1178  and #1209 
See merge request pleroma/pleroma!1611  
							
						 
						
							2019-09-13 12:36:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								25d8216804 
								
							 
						 
						
							
							
								
								Add email change endpoint  
							
							
							
						 
						
							2019-09-13 13:09:35 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								5bfbad13ad 
								
							 
						 
						
							
							
								
								Add more tests for Pleroma.Activity  
							
							
							
						 
						
							2019-09-13 12:49:52 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								39dc9b470c 
								
							 
						 
						
							
							
								
								Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils  
							
							
							
						 
						
							2019-09-13 12:44:59 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								102eb4455c 
								
							 
						 
						
							
							
								
								Fix associated test as well  
							
							
							
						 
						
							2019-09-12 12:29:08 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								a1f2dfb10a 
								
							 
						 
						
							
							
								
								expanding regex sigils to use modifiers  
							
							
							
						 
						
							2019-09-11 09:25:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								3d12e05f43 
								
							 
						 
						
							
							
								
								Fix Activity.all_by_ids_with_object/1 test  
							
							
							
						 
						
							2019-09-11 01:08:37 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								b40b10b53d 
								
							 
						 
						
							
							
								
								Add an endpoint to get multiple statuses by IDs  
							
							
							
						 
						
							2019-09-10 13:39:45 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								11e12b5761 
								
							 
						 
						
							
							
								
								Add Pleroma.Plugs.Cache  
							
							
							
						 
						
							2019-09-09 18:53:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								e0f84d0043 
								
							 
						 
						
							
							
								
								Fix ActivityPubController.read_inbox/2  
							
							
							
						 
						
							2019-09-10 01:11:57 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								896ffabe37 
								
							 
						 
						
							
							
								
								Merge branch 'so-long-twitterapi' into 'develop'  
							
							... 
							
							
							
							Removing TwitterAPI
See merge request pleroma/pleroma!1605  
							
						 
						
							2019-09-06 08:43:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								fe7cf44c40 
								
							 
						 
						
							
							
								
								Merge branch 'feature/mastoapi-accounts-external' into 'develop'  
							
							... 
							
							
							
							Mastdon API: Add ability to get a remote account by nickname to `/api/v1/accounts/:id`
See merge request pleroma/pleroma!1622  
							
						 
						
							2019-09-05 12:48:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								b312ca3d52 
								
							 
						 
						
							
							
								
								Mastodon API Poll view: Fix handling of polls without an end date  
							
							
							
						 
						
							2019-09-05 12:03:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								3face45467 
								
							 
						 
						
							
							
								
								Mastodon API: Add pleroma.thread_muted to Status entity  
							
							... 
							
							
							
							Needed for pleroma-fe!941 
							
						 
						
							2019-09-04 14:17:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c2b6c1b089 
								
							 
						 
						
							
							
								
								Extend /api/pleroma/notifications/read to mark multiple notifications  
							
							... 
							
							
							
							as read and make it respond with Mastoapi entities 
							
						 
						
							2019-09-04 12:38:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								cc1d1ee406 
								
							 
						 
						
							
							
								
								Mastdon API: Add ability to get a remote account by nickname to  
							
							... 
							
							
							
							`/api/v1/accounts/:id` 
							
						 
						
							2019-09-03 19:26:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								b15cfd80ef 
								
							 
						 
						
							
							
								
								Return "total" optionally  
							
							
							
						 
						
							2019-09-03 13:58:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								a4c5f71e93 
								
							 
						 
						
							
							
								
								Return total from pagination + tests  
							
							
							
						 
						
							2019-09-02 22:48:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9cabc02864 
								
							 
						 
						
							
							
								
								Remove a useless import  
							
							
							
						 
						
							2019-08-31 10:57:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								dbfcba85ec 
								
							 
						 
						
							
							
								
								Add a changelog entry for twitterapi removal and fix credo issues  
							
							
							
						 
						
							2019-08-31 10:45:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								64410497d2 
								
							 
						 
						
							
							
								
								Remove TwitterAPI representers  
							
							
							
						 
						
							2019-08-31 10:41:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								985122cc03 
								
							 
						 
						
							
							
								
								Remove Activity, User and Notification views from TwitterAPI  
							
							
							
						 
						
							2019-08-31 10:31:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								90c2dae9a4 
								
							 
						 
						
							
							
								
								Remove most of Pleroma.Web.TwitterAPI.TwitterAPI  
							
							
							
						 
						
							2019-08-31 10:20:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								d9d7765383 
								
							 
						 
						
							
							
								
								Merge branch 'fix-osada-follow' into 'develop'  
							
							... 
							
							
							
							Transmogrifier: Fix follow handling when the actor is an object.
Closes  #1211 
See merge request pleroma/pleroma!1604  
							
						 
						
							2019-08-28 07:10:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								66519f2100 
								
							 
						 
						
							
							
								
								Merge branch 'list-controller' into 'develop'  
							
							... 
							
							
							
							Extract list actions from `MastodonAPIController` into `ListController`
See merge request pleroma/pleroma!1600  
							
						 
						
							2019-08-27 21:15:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								00abe099cd 
								
							 
						 
						
							
							
								
								added tests for ActivityPub.like\unlike  
							
							
							
						 
						
							2019-08-27 16:21:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								eb1739c596 
								
							 
						 
						
							
							
								
								Remove most of TwitterAPIController  
							
							
							
						 
						
							2019-08-27 12:29:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3da65292b3 
								
							 
						 
						
							
							
								
								Transmogrifier: Fix follow handling when the actor is an object.  
							
							
							
						 
						
							2019-08-26 14:34:52 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								c338224c93 
								
							 
						 
						
							
							
								
								Fix sporadic test  
							
							
							
						 
						
							2019-08-26 17:24:22 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								019ced0558 
								
							 
						 
						
							
							
								
								Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers and test/web/mastodon_api/views  
							
							
							
						 
						
							2019-08-26 19:37:57 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								30510ade0e 
								
							 
						 
						
							
							
								
								Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests  
							
							
							
						 
						
							2019-08-26 19:37:54 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								3b1b631c2a 
								
							 
						 
						
							
							
								
								Add validation in Pleroma.List.create/2  
							
							
							
						 
						
							2019-08-26 18:59:57 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								6dc24422dc 
								
							 
						 
						
							
							
								
								Merge branch 'issue/1177' into 'develop'  
							
							... 
							
							
							
							[#1177 ] fixed unfollow for relay actor
See merge request pleroma/pleroma!1589  
							
						 
						
							2019-08-25 19:43:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								37dd3867bb 
								
							 
						 
						
							
							
								
								Log admin/moderator actions  
							
							
							
						 
						
							2019-08-25 19:39:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								503139b343 
								
							 
						 
						
							
							
								
								Merge branch 'fix-all-custom-fields-deleted' into 'develop'  
							
							... 
							
							
							
							Fix not to use unupdated attachments when all fields are deleted
See merge request pleroma/pleroma!1596  
							
						 
						
							2019-08-25 19:35:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kPherox 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d74efde94e 
								
							 
						 
						
							
							
								
								Update test for custom profile fields  
							
							
							
						 
						
							2019-08-26 02:06:52 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5e7098cf69 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/rel_me_missing_mocks' into 'develop'  
							
							... 
							
							
							
							Implement missing mocks for rel=me
See merge request pleroma/pleroma!1598  
							
						 
						
							2019-08-25 16:12:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								20c3f613d8 
								
							 
						 
						
							
							
								
								HttpRequestMock: Remove useless error = error  
							
							
							
						 
						
							2019-08-25 08:55:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f3b1266273 
								
							 
						 
						
							
							
								
								user_test.exs: fix rel=me tests  
							
							
							
						 
						
							2019-08-25 08:48:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								211e163770 
								
							 
						 
						
							
							
								
								Implement missing mocks for rel=me  
							
							
							
						 
						
							2019-08-25 08:03:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e22737ffb5 
								
							 
						 
						
							
							
								
								HttpRequestMock: Improve non-implemented error message  
							
							
							
						 
						
							2019-08-25 07:33:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								18668447d2 
								
							 
						 
						
							
							
								
								HttpRequestMock: Log mock errors as warnings  
							
							
							
						 
						
							2019-08-25 07:33:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								90986667ce 
								
							 
						 
						
							
							
								
								Merge branch 'admin-create-users' into 'develop'  
							
							... 
							
							
							
							user creation admin api will create multiple users
See merge request pleroma/pleroma!1170  
							
						 
						
							2019-08-24 16:04:19 +00:00