| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 William Pitcock | 26670b09a7 | tests: add a rich media card that contains all relevant fields | 2019-02-06 18:27:55 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 6eb8c1eb92 | test: add some regression tests for the rich media card rendering | 2019-02-06 18:12:26 +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 | 364cf5369b | test: update mastodon status view tests | 2019-01-28 05:53:17 +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 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | a65c188593 | Web.MastodonAPI.AccountView: Add is_moderator and is_admin Closes: https://git.pleroma.social/pleroma/pleroma/issues/557 | 2019-01-27 10:33:22 +01: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 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | d8f446f438 | Web.MastodonAPI.MastodonAPIControllerTest: Add test against multi-hashtag timeline | 2019-01-26 04:46:01 +01:00 |  | 
				
					
						| 
								
								
									 kaniini | 4c99b6d35a | Merge branch 'fix/tusky-dm' into 'develop' Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683 | 2019-01-25 05:19:32 +00:00 |  | 
				
					
						| 
								
								
									 lain | 2de208817c | Merge branch 'develop' into rename/pleroma_activity_consistency | 2019-01-23 13:05:58 +01:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 34d59e4008 | [#502] Fixed User.active_local_user_query to return users with nil or missing info.deactivated. Adjusted test. | 2019-01-22 17:12:53 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 98c8184c1f | Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1 | 2019-01-21 08:00:41 +01:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 0a97badddd | Format | 2019-01-19 04:26:52 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 651a1d64b5 | Add current user to mentioned | 2019-01-19 04:25:15 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | e116e55cab | Add actor to recipients | 2019-01-18 22:40:52 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 954dc4a4ad | [#502] Fixed user_countin/api/v1/instanceto include only active local users. | 2019-01-17 19:16:02 +03:00 |  | 
				
					
						| 
								
								
									 lain | 943324b661 | MastoAPI: Don't break on missing users. | 2019-01-16 15:13:09 +01:00 |  | 
				
					
						| 
								
								
									 lambda | 608cc65d43 | Merge branch 'feature/improve-microformats' into 'develop' improve microformats support
See merge request pleroma/pleroma!672 | 2019-01-16 09:06:47 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 90433b988e | [#518] Fixed /api/v1/instance ("domain_count" value) and /api/v1/instance/peers responses. | 2019-01-16 11:07:46 +03:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 85a5be6220 | tests: fixup | 2019-01-16 04:09:01 +00:00 |  | 
				
					
						| 
								
								
									 Sadposter | 98d9ae0718 | Add test for mastodon API /favourites endpoint | 2019-01-13 15:17:47 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 6cbe63726d | improve tests | 2019-01-09 19:54:37 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 7b6c5f0a9d | improve test readability | 2019-01-08 16:01:35 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | e679da4c34 | add pinnedproperty toStatusView | 2019-01-08 15:27:02 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 63dbd87568 | rename posttostatus | 2019-01-08 15:25:50 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | f24087f96e | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts | 2019-01-07 20:55:32 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 380e9fba21 | add pinned posts | 2019-01-07 20:45:33 +07:00 |  | 
				
					
						| 
								
								
									 lain | 7dcafb4894 | MastoAPI: Add test. | 2019-01-07 13:13:37 +01:00 |  | 
				
					
						| 
								
								
									 kaniini | bee6acd51d | Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop' Create tombstone instead of object deletion
See merge request pleroma/pleroma!593 | 2018-12-27 19:37:55 +00:00 |  | 
				
					
						| 
								
								
									 Vyr Cossont | e4562105e7 | Implement exclude_reblogs and include_rts | 2018-12-26 21:38:00 -08:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | aeb89bece6 | Remove unused test | 2018-12-25 03:38:02 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | f75f707f6c | Revert Activity tombstones, add ObjectTombstone struct | 2018-12-25 03:00:06 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 18a4cbb244 | Capitalize "tombstone" | 2018-12-24 20:09:18 +03:00 |  |