rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								16487716af 
								
							 
						 
						
							
							
								
								Merge branch 'support/test' into 'develop'  
							
							 
							
							... 
							
							
							
							clears `robot.txt` after tests
See merge request pleroma/pleroma!1715  
							
						 
						
							2019-09-25 18:51:45 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								dd4263da5a 
								
							 
						 
						
							
							
								
								Apply suggestion to test/tasks/instance_test.exs  
							
							 
							
							
							
						 
						
							2019-09-25 17:47:22 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								118d6dcdf4 
								
							 
						 
						
							
							
								
								Fix nodeinfo handling  
							
							 
							
							
							
						 
						
							2019-09-25 12:32:19 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								ba9d35a904 
								
							 
						 
						
							
							
								
								Add an API endpoint for listing remote packs  
							
							 
							
							
							
						 
						
							2019-09-25 12:32:19 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								1b2e4a0ae0 
								
							 
						 
						
							
							
								
								clears robot.txt after tests  
							
							 
							
							
							
						 
						
							2019-09-25 13:27:31 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								1a858134ed 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1218  
							
							 
							
							
							
						 
						
							2019-09-25 12:24:12 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								29dd8ab9c0 
								
							 
						 
						
							
							
								
								Merge branch 'feature/force-password-reset' into 'develop'  
							
							 
							
							... 
							
							
							
							Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705  
							
						 
						
							2019-09-23 22:42:34 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								19263f30c3 
								
							 
						 
						
							
							
								
								Merge branch 'support-rel-ugc' into 'develop'  
							
							 
							
							... 
							
							
							
							Add support for `rel="ugc"`
Closes  #1255 
See merge request pleroma/pleroma!1679  
							
						 
						
							2019-09-23 22:41:31 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								760df67a7b 
								
							 
						 
						
							
							
								
								Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'  
							
							 
							
							... 
							
							
							
							Fix private and direct statuses not being filtered out from the public timeline for an authenticated user.
Closes  #1223 
See merge request pleroma/pleroma!1703  
							
						 
						
							2019-09-23 22:35:09 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								ad9595ca55 
								
							 
						 
						
							
							
								
								Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'  
							
							 
							
							... 
							
							
							
							added tests /activity_pub/transmogrifier.ex
See merge request pleroma/pleroma!1651  
							
						 
						
							2019-09-23 22:34:52 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Steven Fuchs 
								
							 
						 
						
							
							
							
							
								
							
							
								e1d2d69c87 
								
							 
						 
						
							
							
								
								Clean up views  
							
							 
							
							
							
						 
						
							2019-09-23 22:33:59 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								38245f1336 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into test/activity_pub/transmogrifier.ex  
							
							 
							
							
							
						 
						
							2019-09-23 21:32:50 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								fd48bd80eb 
								
							 
						 
						
							
							
								
								Merge branch 'better-emoji-packs' into 'develop'  
							
							 
							
							... 
							
							
							
							Shareable emoji packs
Closes  #833  and #1096 
See merge request pleroma/pleroma!1551  
							
						 
						
							2019-09-23 18:20:08 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6b3d5ed6db 
								
							 
						 
						
							
							
								
								Emoji API Controller: Follow phoenix directory structure  
							
							 
							
							
							
						 
						
							2019-09-23 21:14:51 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								6f25668215 
								
							 
						 
						
							
							
								
								Admin API: Add ability to force user's password reset  
							
							 
							
							
							
						 
						
							2019-09-22 16:08:07 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								7cf1252455 
								
							 
						 
						
							
							
								
								Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (GET /api/v1/timelines/public)  
							
							 
							
							
							
						 
						
							2019-09-20 18:27:00 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b80c41a14f 
								
							 
						 
						
							
							
								
								Merge branch 'outbox_pagination' into 'develop'  
							
							 
							
							... 
							
							
							
							Fix AP outbox pagination
See merge request pleroma/pleroma!1700  
							
						 
						
							2019-09-19 16:53:59 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									D Anzorge 
								
							 
						 
						
							
							
							
							
								
							
							
								9aca2cc95d 
								
							 
						 
						
							
							
								
								Add test for correct AP outbox pagination  
							
							 
							
							
							
						 
						
							2019-09-19 16:49:27 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								95c948110c 
								
							 
						 
						
							
							
								
								Add rel="ugc" to hashtags and mentions  
							
							 
							
							
							
						 
						
							2019-09-19 14:56:10 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								cf3041220a 
								
							 
						 
						
							
							
								
								Add support for rel="ugc"  
							
							 
							
							
							
						 
						
							2019-09-19 14:56:10 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								fe5e0b7846 
								
							 
						 
						
							
							
								
								Mastodon API: Return pleroma.direct_conversation_id when creating direct messages (POST /api/v1/statuses)  
							
							 
							
							
							
						 
						
							2019-09-19 08:59:25 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d4ed3a35b8 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into test/activity_pub/transmogrifier.ex  
							
							 
							
							
							
						 
						
							2019-09-19 07:35:34 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								f95a2b2cda 
								
							 
						 
						
							
							
								
								Merge branch 'issue/733' into 'develop'  
							
							 
							
							... 
							
							
							
							[#733 ] added test for Ostatus
See merge request pleroma/pleroma!1657  
							
						 
						
							2019-09-18 22:28:10 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								b0ec82d24a 
								
							 
						 
						
							
							
								
								Merge branch 'chores/bump-copyright-year' into 'develop'  
							
							 
							
							... 
							
							
							
							Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698  
							
						 
						
							2019-09-18 21:57:49 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								447514dfa2 
								
							 
						 
						
							
							
								
								Bump copyright years of files changed in 2019  
							
							 
							
							... 
							
							
							
							Done via the following command:
git diff 1e6c102bfc  --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/' 
							
						 
						
							2019-09-18 23:21:11 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								b585134c90 
								
							 
						 
						
							
							
								
								Get the nodeinfo address from the well-known  
							
							 
							
							
							
						 
						
							2019-09-19 00:16:34 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								a1325d5fd9 
								
							 
						 
						
							
							
								
								Change path from nodeinfo to metadata->features  
							
							 
							
							
							
						 
						
							2019-09-19 00:16:34 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								36f2275dc9 
								
							 
						 
						
							
							
								
								A feature for shareable emoji packs, use it in download_from & tests  
							
							 
							
							
							
						 
						
							2019-09-19 00:16:33 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								74fb6d8647 
								
							 
						 
						
							
							
								
								Move EmojiAPIController from EmojiAPI to PleromaAPI  
							
							 
							
							
							
						 
						
							2019-09-19 00:16:33 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								6cd651a38b 
								
							 
						 
						
							
							
								
								Make the emoji controller api more RESTy  
							
							 
							
							
							
						 
						
							2019-09-19 00:16:33 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								7c784128fd 
								
							 
						 
						
							
							
								
								Change emoji api responses to JSON  
							
							 
							
							
							
						 
						
							2019-09-19 00:16:33 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								9eb2ee4df0 
								
							 
						 
						
							
							
								
								Allow importing old (emoji.txt / plain) packs from the filesystem  
							
							 
							
							
							
						 
						
							2019-09-19 00:16:33 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								f5131540dc 
								
							 
						 
						
							
							
								
								Add a way to create emoji packs via an endpoint  
							
							 
							
							
							
						 
						
							2019-09-19 00:16:33 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								8dbdd5c280 
								
							 
						 
						
							
							
								
								Allow uploading new emojis to packs from URLs  
							
							 
							
							
							
						 
						
							2019-09-19 00:16:33 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								9afe7258dd 
								
							 
						 
						
							
							
								
								Implememt emoji pack file updating + write tests  
							
							 
							
							
							
						 
						
							2019-09-19 00:16:33 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								9dc9689144 
								
							 
						 
						
							
							
								
								Add tests for pack metadata updating  
							
							 
							
							
							
						 
						
							2019-09-19 00:16:33 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								adf31d596e 
								
							 
						 
						
							
							
								
								Add tests for downloading from fallback url  
							
							 
							
							
							
						 
						
							2019-09-19 00:16:33 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								2a94eca096 
								
							 
						 
						
							
							
								
								Change YAML to JSON  
							
							 
							
							
							
						 
						
							2019-09-19 00:16:33 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								2d4b8f3d20 
								
							 
						 
						
							
							
								
								Add an endpoint for deleting emoji packs  
							
							 
							
							
							
						 
						
							2019-09-19 00:16:33 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								7e4c8b56ea 
								
							 
						 
						
							
							
								
								Add tests for emoji pack sharing  
							
							 
							
							
							
						 
						
							2019-09-19 00:16:33 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								ab2ca3038f 
								
							 
						 
						
							
							
								
								Merge branch 'hide-follower-following-count' into 'develop'  
							
							 
							
							... 
							
							
							
							Add a setting to hide follows/followers stats from the user profile
See merge request pleroma/pleroma!1663  
							
						 
						
							2019-09-18 21:13:15 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								25b4365656 
								
							 
						 
						
							
							
								
								Merge branch 'admin_api_invite_tokens' into 'develop'  
							
							 
							
							... 
							
							
							
							POST for creating invite tokens in admin api
See merge request pleroma/pleroma!1637  
							
						 
						
							2019-09-18 21:11:37 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								220afadc55 
								
							 
						 
						
							
							
								
								Merge branch 'restore-tests' into 'develop'  
							
							 
							
							... 
							
							
							
							Restore tests for `change_password` and `delete_account`
See merge request pleroma/pleroma!1658  
							
						 
						
							2019-09-18 21:05:18 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								56286447ee 
								
							 
						 
						
							
							
								
								Merge branch 'fix/test-upload-cleanup' into 'develop'  
							
							 
							
							... 
							
							
							
							Cleanup uploads after the tests are finished
See merge request pleroma/pleroma!1695  
							
						 
						
							2019-09-18 21:00:09 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								a12aeb09c4 
								
							 
						 
						
							
							
								
								Cleanup uploads after the tests are finished  
							
							 
							
							
							
						 
						
							2019-09-18 23:34:13 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								eb87a86b5b 
								
							 
						 
						
							
							
								
								Preserve internal fields when reinjecting  
							
							 
							
							
							
						 
						
							2019-09-18 19:53:51 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								84a40f6f26 
								
							 
						 
						
							
							
								
								Capture log in object refetch tests  
							
							 
							
							
							
						 
						
							2019-09-18 18:31:24 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								7ef575d11e 
								
							 
						 
						
							
							
								
								Initial poll refresh support  
							
							 
							
							... 
							
							
							
							Implement refreshing the object with an interval and call the function
when getting the poll. 
							
						 
						
							2019-09-18 18:13:21 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								4faf2b1555 
								
							 
						 
						
							
							
								
								post for creating invite tokens in admin api  
							
							 
							
							
							
						 
						
							2019-09-18 10:49:14 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								0447c42715 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/733  
							
							 
							
							
							
						 
						
							2019-09-17 22:20:39 +03:00