| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 | 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/appsresponse | 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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(…) == 0toEnum.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 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 16ce129e38 | Split hide_network into hide_followers & hide_followings (fixed) | 2019-02-03 21:55:04 +03:00 |  | 
				
					
						| 
								
								
									 lain | e61f0be951 | Unbreak all the tests. | 2019-02-03 18:54:39 +01:00 |  | 
				
					
						| 
								
								
									 kaniini | 486749064f | Revert "Merge branch 'feature/split-hide-network' into 'develop'" This reverts merge request !733 | 2019-02-01 20:22:58 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 0a82a7e6d6 | Merge branch 'feature/split-hide-network' into 'develop' Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733 | 2019-02-01 17:05:29 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn | 00d4333373 | Merge branch 'features/glitch-soc-frontend' into 'develop' Features/glitch soc frontend
See merge request pleroma/pleroma!192 | 2019-01-31 10:16:11 +00:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 50d6183893 | Split hide_network into hide_followers & hide_followings | 2019-01-28 21:40:08 +03:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 339c26e12b | test: add status posting with OGP link preview test | 2019-01-28 06:19:00 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 132d815f1f | mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data | 2019-01-28 05:53:17 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | cda1470e02 | [MastoAPI][GlitchAPI] Add bookmarks | 2019-01-28 04:47:32 +01:00 |  | 
				
					
						| 
								
								
									 kaniini | 5eb81d2c72 | Merge branch 'features/mastoapi-multi-hashtag' into 'develop' MastodonAPI multi-hashtag
See merge request pleroma/pleroma!652 | 2019-01-27 12:45:50 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 1f7843b9b8 | mastodon api: use OGP uri instead of page_url for deducing domain name, fix test | 2019-01-26 15:24:16 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 3f64379b13 | Web.MastodonAPI.MastodonAPIController: Add Rich-Media support | 2019-01-26 14:18:23 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 22f2687f17 | Web.MastodonAPI.MastodonAPIControllerTest: Update for difference between all and any parameters | 2019-01-26 04:46:02 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 5a84def6a6 | Fix the logic in multi-hashtag TLs | 2019-01-26 04:46:02 +01:00 |  |