Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								d8a178274b
								
							
						 | 
						
							
							
								
								fix Activity.get_by_id
							
							
							
							
							
						 | 
						
							2019-09-13 07:12:34 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								58b17196fa
								
							
						 | 
						
							
							
								
								Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
							
							
							
							
							
						 | 
						
							2019-09-13 03:58:58 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ab2f21e470
								
							
						 | 
						
							
							
								
								tests for mastodon_api_controller.ex
							
							
							
							
							
						 | 
						
							2019-09-06 21:50:00 +03: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								efb8818e9e
								
							
						 | 
						
							
							
								
								Activity Expiration: Switch to 'expires_in' system.
							
							
							
							
							
						 | 
						
							2019-08-24 17:22:48 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								654d291b6d
								
							
						 | 
						
							
							
								
								update tests
							
							
							
							
							
						 | 
						
							2019-08-24 17:41:53 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								cc6c0b4ba6
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
							
							
							
							
							
						 | 
						
							2019-08-24 15:48:33 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								73bcbf4fa3
								
							
						 | 
						
							
							
								
								add tests
							
							
							
							
							
						 | 
						
							2019-08-24 11:03:13 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								399ca9133b
								
							
						 | 
						
							
							
								
								fix test
							
							
							
							
							
						 | 
						
							2019-08-22 21:54:37 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								f95b67c933
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into issue/1177
							
							
							
							
							
						 | 
						
							2019-08-22 21:13:03 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								64bfb41c55
								
							
						 | 
						
							
							
								
								fixed unfollow for relay actor
							
							
							
							
							
						 | 
						
							2019-08-22 06:57:55 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								85bd8a4e31
								
							
						 | 
						
							
							
								
								fixed clear config after test
							
							
							
							
							
						 | 
						
							2019-08-21 21:24:35 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								76bb3572dd
								
							
						 | 
						
							
							
								
								test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1
							
							
							
							
							
						 | 
						
							2019-08-20 20:20:12 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								74f7f308f8
								
							
						 | 
						
							
							
								
								Merge branch 'fix/admin-api-user-deletion' into 'develop'
							
							
							
							
							
							
							
							Fix deactivated user deletion
See merge request pleroma/pleroma!1546 
							
						 | 
						
							2019-08-20 19:34:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								8340fe8fcc
								
							
						 | 
						
							
							
								
								Merge branch 'digest-template' into 'develop'
							
							
							
							
							
							
							
							Improve digest email template
See merge request pleroma/pleroma!1565 
							
						 | 
						
							2019-08-20 12:55:51 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								ef43016b2c
								
							
						 | 
						
							
							
								
								Merge branch 'feature/custom-fields' into 'develop'
							
							
							
							
							
							
							
							Add custom profile fields
See merge request pleroma/pleroma!1488 
							
						 | 
						
							2019-08-20 12:44:14 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								d2c9befc64
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
							
							
							
							
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 | 
						
							2019-08-19 17:00:59 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								75a5dd41ee
								
							
						 | 
						
							
							
								
								Add more tests for Database tasks and DigestEmailWorker
							
							
							
							
							
						 | 
						
							2019-08-19 16:10:00 +00:00 | 
						
						
							
							
							
								
							
							
						 |