| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 0f412cf6e6 | Create tombstone instead of object deletion | 2018-12-24 02:25:36 +03:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 3c08d229db | tests: add legal boilerplate | 2018-12-23 20:57:10 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 9f48485f64 | tests: mastodon api: add test verifying that peertube videos are correctly rendered | 2018-12-23 13:44:01 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | aed0f90287 | [#114] Added pleroma.confirmation_pendingto user views, adjusted view tests. | 2018-12-18 17:22:45 +03:00 |  | 
				
					
						| 
								
								
									 href | b12a904911 | Integration tests for mastodon websocket | 2018-12-17 17:09:06 +01:00 |  | 
				
					
						| 
								
								
									 eal | 28478a9c4f | Merge branch 'fix/masto-put-settings' into 'develop' Mastodon API: Fix PUT /api/web/settings
See merge request pleroma/pleroma!557 | 2018-12-16 11:21:26 +00:00 |  | 
				
					
						| 
								
								
									 eal | 4c783e35c0 | Mastodon API: Fix PUT /api/web/settings | 2018-12-16 13:15:34 +02:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | ea72ac549b | fix case when tags is invalid | 2018-12-14 23:16:12 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | d3ec09bb38 | fix tags | 2018-12-14 22:09:04 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 89b3729afa | fix warnings | 2018-12-12 09:09:19 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 9442588ae9 | fix hashtags in api response | 2018-12-09 11:24:46 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 7a2162bbcb | [#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map. | 2018-12-06 22:26:25 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | abbf347dc7 | [#394] View tests fix. | 2018-12-06 20:38:52 +03:00 |  | 
				
					
						| 
								
								
									 kaniini | ccf0b46dd6 | Merge branch '210_twitter_api_uploads_alt_text' into 'develop' [#210] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496 | 2018-12-06 07:36:21 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 3e90f688f1 | [#210] Mastodon: actor storing for media uploads, ownership check to update_media. Refactoring. | 2018-12-06 10:26:17 +03:00 |  | 
				
					
						| 
								
								
									 kaniini | 48a0315646 | Merge branch 'follower-hiding' into 'develop' Network hiding
Closes #356
See merge request pleroma/pleroma!490 | 2018-12-05 21:41:53 +00:00 |  | 
				
					
						| 
								
								
									 lain | 76d6b1c6ab | Merge remote-tracking branch 'origin' into follower-hiding | 2018-12-05 21:27:56 +01:00 |  | 
				
					
						| 
								
								
									 lain | 3ea4476445 | MastodonAPI: Show users their own network. | 2018-12-05 21:25:06 +01:00 |  | 
				
					
						| 
								
								
									 Vald | 028904c333 | lint | 2018-12-06 01:46:53 +05:30 |  | 
				
					
						| 
								
								
									 Vald | 911a877576 | resolved api and controller test failures | 2018-12-06 01:46:30 +05:30 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 848151f7cb | [#210] [TwitterAPI] Made actor be stored for uploads. Added ownership check to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring. | 2018-12-05 13:37:06 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 7ec64ac33f | update test | 2018-12-04 14:04:06 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 4b70e5eae9 | Parse bio for MastodonAPI | 2018-12-03 18:59:50 +03:00 |  | 
				
					
						| 
								
								
									 lain | 2a639de9b3 | MastodonApi: Implement hide_network. | 2018-12-02 17:48:00 +01:00 |  | 
				
					
						| 
								
								
									 lain | 347df6421d | Fix masto api user updating. | 2018-12-01 10:40:01 +01:00 |  | 
				
					
						| 
								
								
									 lain | d0ec2812bd | Merge remote-tracking branch 'origin' into validate-user-info | 2018-11-30 17:34:20 +01:00 |  | 
				
					
						| 
								
								
									 lain | badbe2656c | More fixes. | 2018-11-27 18:12:03 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | cc8952b45f | Web.MastodonApi.MastodonSocketTest: Add test for unauthenticated websocket | 2018-11-24 08:51:35 +01:00 |  | 
				
					
						| 
								
								
									 lain | 0bea0308f1 | Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate-user-info | 2018-11-20 20:16:16 +01:00 |  | 
				
					
						| 
								
								
									 lain | 0896cf4c0f | Fix most mastodon api bugs. | 2018-11-20 20:12:39 +01:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 5b3480d896 | tests: fix up some more broken mastodon api testcases | 2018-11-20 19:08:41 +00:00 |  |