lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								a79ce94dd4
								
							
						 | 
						
							
							
								
								Merge branch 'feature/fake-statuses' into 'develop'
							
							
							
							
							
							
							
							Add fake status submit
See merge request pleroma/pleroma!995 
							
						 | 
						
							2019-04-02 14:17:43 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								b95cf3d490
								
							
						 | 
						
							
							
								
								Merge branch 'get_by_id' into 'develop'
							
							
							
							
							
							
							
							Replace `Repo.get_by` with existing functions
See merge request pleroma/pleroma!1010 
							
						 | 
						
							2019-04-02 12:43:28 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								fdb4357e9b
								
							
						 | 
						
							
							
								
								Rename fake param to preview and make the tests check that the object was not inserted to the db
							
							
							
							
							
						 | 
						
							2019-04-02 14:31:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								26d509cc86
								
							
						 | 
						
							
							
								
								Merge branch 'get_by_id' into 'develop'
							
							
							
							
							
							
							
							Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible
See merge request pleroma/pleroma!1009 
							
						 | 
						
							2019-04-02 10:52:29 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									cascode
								
							 
						 | 
						
							
							
							
							
								
							
							
								95c92c49c9
								
							
						 | 
						
							
							
								
								Fix account lookup for nicknames beginning with numbers
							
							
							
							
							
						 | 
						
							2019-04-02 10:51:33 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								9a59c26619
								
							
						 | 
						
							
							
								
								replace Repo.get_by(User, ap_id: ap_id) with User.get_by_ap_id(ap_id)
							
							
							
							
							
						 | 
						
							2019-04-02 17:47:52 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								11c2d6bdc4
								
							
						 | 
						
							
							
								
								change Repo.get(Activity, id) => Activity.get_by_id(id) in tests
							
							
							
							
							
						 | 
						
							2019-04-02 17:08:03 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								1b3d921921
								
							
						 | 
						
							
							
								
								change Repo.get(User, id) => User.get_by_id(id)
							
							
							
							
							
						 | 
						
							2019-04-02 17:01:26 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								1bb4d5d65b
								
							
						 | 
						
							
							
								
								Implement fake status submit
							
							
							
							
							
						 | 
						
							2019-03-29 21:59:04 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								a4ab60ac54
								
							
						 | 
						
							
							
								
								Add vapid_key to the POST /api/v1/apps response
							
							
							
							
							
						 | 
						
							2019-03-26 23:27:37 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								691d1208b5
								
							
						 | 
						
							
							
								
								Add GET /api/v1/apps/verify_credentials
							
							
							
							
							
						 | 
						
							2019-03-26 21:53:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								47b49ab1a1
								
							
						 | 
						
							
							
								
								Test for MastoAPI /api/v1/instance response structure (formatting fix).
							
							
							
							
							
						 | 
						
							2019-03-26 18:18:36 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								caf0e9cf33
								
							
						 | 
						
							
							
								
								Test for MastoAPI /api/v1/instance response structure.
							
							
							
							
							
						 | 
						
							2019-03-26 18:13:24 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								3cc2554fa3
								
							
						 | 
						
							
							
								
								mastodon api: add conversation_id extension (ref #674)
							
							
							
							
							
						 | 
						
							2019-03-21 23:25:41 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fong-Wan Chau
								
							 
						 | 
						
							
							
							
							
								
							
							
								4ed2618f6c
								
							
						 | 
						
							
							
								
								Allow 'rel' attribute on <a> link with specific values (for hashtag recognition).
							
							
							
							
							
						 | 
						
							2019-03-17 11:03:19 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								13c298d354
								
							
						 | 
						
							
							
								
								Fix tests to assume reblogs shown by default
							
							
							
							
							
						 | 
						
							2019-03-15 14:18:21 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								41fc67aa49
								
							
						 | 
						
							
							
								
								Merge branch 'mastoapi/mime_type' into 'develop'
							
							
							
							
							
							
							
							Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938 
							
						 | 
						
							2019-03-15 09:48:50 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								d7a34b604b
								
							
						 | 
						
							
							
								
								Extend MastoAPI to provide attachment mimetypes
							
							
							
							
							
						 | 
						
							2019-03-15 11:58:12 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								100413bf2c
								
							
						 | 
						
							
							
								
								Add is_seen to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests
							
							
							
							
							
						 | 
						
							2019-03-15 01:35:48 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								23960309a0
								
							
						 | 
						
							
							
								
								[Credo] Change quoted string with 3+ quotes to sigils
							
							
							
							
							
						 | 
						
							2019-03-13 04:26:56 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a3a9cec483
								
							
						 | 
						
							
							
								
								[Credo] fix Credo.Check.Readability.AliasOrder
							
							
							
							
							
						 | 
						
							2019-03-13 04:26:54 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								c231ed610a
								
							
						 | 
						
							
							
								
								Merge branch 'masto-api-followers-following' into 'develop'
							
							
							
							
							
							
							
							MastoAPI followers/following endpoints
See merge request pleroma/pleroma!924 
							
						 | 
						
							2019-03-12 16:27:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								984b5f8adf
								
							
						 | 
						
							
							
								
								MastoAPI followers/following endpoints
							
							
							
							
							
						 | 
						
							2019-03-12 16:01:24 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								3474066f6d
								
							
						 | 
						
							
							
								
								MastoAPI Accounts: Add fetching by nickname.
							
							
							
							
							
							
							
							This is to make it easier for the frontends to handle domain.com/users/nickname
urls. 
							
						 | 
						
							2019-03-11 15:18:32 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4811eefa6e
								
							
						 | 
						
							
							
								
								MastoAPI StatusView: Add locality indicator.
							
							
							
							
							
						 | 
						
							2019-03-11 13:48:27 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								2827dfea50
								
							
						 | 
						
							
							
								
								Allow an admin to delete a user status
							
							
							
							
							
						 | 
						
							2019-03-08 20:21:56 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								7342b5a45f
								
							
						 | 
						
							
							
								
								Preserve parameters in link headers (Mastodon API)
							
							
							
							
							
						 | 
						
							2019-03-07 09:12:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								bc7570c282
								
							
						 | 
						
							
							
								
								[#647] tests for web push
							
							
							
							
							
						 | 
						
							2019-03-06 13:20:12 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								86e4b48a5e
								
							
						 | 
						
							
							
								
								Fix DM visibility for blocking users
							
							
							
							
							
						 | 
						
							2019-03-04 06:24:27 +03: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								c1ae495878
								
							
						 | 
						
							
							
								
								Add user muted status info to MastodonAPI.
							
							
							
							
							
						 | 
						
							2019-02-27 16:46:47 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								1536640962
								
							
						 | 
						
							
							
								
								mastodon api: embed relationship card under account card for Pleroma FE convenience
							
							
							
							
							
						 | 
						
							2019-02-27 13:01:10 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								62296f5a25
								
							
						 | 
						
							
							
								
								Fix private post card handling.
							
							
							
							
							
						 | 
						
							2019-02-22 12:02:51 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor
								
							 
						 | 
						
							
							
							
							
								
							
							
								bff9eb5ef7
								
							
						 | 
						
							
							
								
								Reports
							
							
							
							
							
						 | 
						
							2019-02-20 16:51:25 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								59c27f29c8
								
							
						 | 
						
							
							
								
								Add some nicer urls in status view.
							
							
							
							
							
						 | 
						
							2019-02-20 17:36:16 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								6fe7acd58e
								
							
						 | 
						
							
							
								
								[#468] Merged upstream/develop.
							
							
							
							
							
						 | 
						
							2019-02-20 16:48:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								04ee877a20
								
							
						 | 
						
							
							
								
								[#468] Added OAuth scopes-specific tests.
							
							
							
							
							
						 | 
						
							2019-02-19 22:28:21 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ekaterina Vaartis
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad2cf4fd86
								
							
						 | 
						
							
							
								
								Add test for mastodon muting endpoints
							
							
							
							
							
						 | 
						
							2019-02-19 21:49:55 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								c23bd05737
								
							
						 | 
						
							
							
								
								Merge branch 'features/flavour-switching' into 'develop'
							
							
							
							
							
							
							
							[MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807 
							
						 | 
						
							2019-02-18 04:01:51 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								72a4272d84
								
							
						 | 
						
							
							
								
								Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching
							
							
							
							
							
						 | 
						
							2019-02-16 19:52:46 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								ecdf0657ba
								
							
						 | 
						
							
							
								
								Add logic for keeping follow_request_count up-to-date on the follow,
							
							
							
							
							
							
							
							`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view. 
							
						 | 
						
							2019-02-15 12:20:20 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								19756d68f2
								
							
						 | 
						
							
							
								
								Merge branch 'fix/credo-issues-test' into 'develop'
							
							
							
							
							
							
							
							Fix credo issues in ./test
See merge request pleroma/pleroma!808 
							
						 | 
						
							2019-02-14 03:55:26 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								ac72b578da
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/thread-muting
							
							
							
							
							
						 | 
						
							2019-02-11 12:10:49 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								c01ef574c1
								
							
						 | 
						
							
							
								
								Refactor as per Rin's suggestions, add endpoint tests
							
							
							
							
							
						 | 
						
							2019-02-11 12:04:02 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								74579115a7
								
							
						 | 
						
							
							
								
								test: Change lenght(…) == 0 to Enum.empty?(…)
							
							
							
							
							
						 | 
						
							2019-02-11 03:44:16 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								8bb7e19b38
								
							
						 | 
						
							
							
								
								test: de-group alias/es
							
							
							
							
							
						 | 
						
							2019-02-11 03:44:15 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								74518d0b60
								
							
						 | 
						
							
							
								
								hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
							
							
							
							
							
							
							
							This was a dirty regex replace which worked on my server 
							
						 | 
						
							2019-02-06 22:34:44 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								26670b09a7
								
							
						 | 
						
							
							
								
								tests: add a rich media card that contains all relevant fields
							
							
							
							
							
						 | 
						
							2019-02-06 18:27:55 +00:00 | 
						
						
							
							
							
								
							
							
						 |