lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								9e0686efa6
								
							
						 | 
						
							
							
								
								Move visibility into own module.
							
							
							
							
							
						 | 
						
							2019-02-22 13:29:52 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								62296f5a25
								
							
						 | 
						
							
							
								
								Fix private post card handling.
							
							
							
							
							
						 | 
						
							2019-02-22 12:02:51 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									KZ
								
							 
						 | 
						
							
							
							
							
								
							
							
								7c722c08f5
								
							
						 | 
						
							
							
								
								Fix: Fixing an outbox related bug when local user activity is empty
							
							
							
							
							
						 | 
						
							2019-02-22 04:37:48 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								e95dbecf3e
								
							
						 | 
						
							
							
								
								tests: fix formatting
							
							
							
							
							
						 | 
						
							2019-02-20 20:49:10 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								aa45674be6
								
							
						 | 
						
							
							
								
								tests: add test for fetching AP objects with application/json.
							
							
							
							
							
						 | 
						
							2019-02-20 20:45:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								3ee77e95b2
								
							
						 | 
						
							
							
								
								tests: fix tests
							
							
							
							
							
						 | 
						
							2019-02-20 17:23:05 +00: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								11b3c10c54
								
							
						 | 
						
							
							
								
								Merge branch 'muting' into 'develop'
							
							
							
							
							
							
							
							Implement muting, add it to the whole mastodon API
See merge request pleroma/pleroma!319 
							
						 | 
						
							2019-02-20 13:19:37 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								9ae79bb71a
								
							
						 | 
						
							
							
								
								Add test for muting functionality.
							
							
							
							
							
						 | 
						
							2019-02-20 13:47:44 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								337367d764
								
							
						 | 
						
							
							
								
								[#468] More OAuth scopes-specific tests.
							
							
							
							
							
						 | 
						
							2019-02-20 12:27:28 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								25b9e7a8c3
								
							
						 | 
						
							
							
								
								Added admin API for changing user activation status
							
							
							
							
							
						 | 
						
							2019-02-19 19:37:02 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								c0ecbf6669
								
							
						 | 
						
							
							
								
								[#468] Merged upstream/develop.
							
							
							
							
							
						 | 
						
							2019-02-19 19:10:55 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								833161b5d2
								
							
						 | 
						
							
							
								
								Merge branch 'feature/jobs' into 'develop'
							
							
							
							
							
							
							
							Job Queue
See merge request pleroma/pleroma!732 
							
						 | 
						
							2019-02-18 19:43:06 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								7456338ed3
								
							
						 | 
						
							
							
								
								Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
							
							
							
							
							
							
							
							Add OAuth tokens endpoint
See merge request pleroma/pleroma!805 
							
						 | 
						
							2019-02-18 04:02:41 +00: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								cd019a5927
								
							
						 | 
						
							
							
								
								Merge branch 'follow-request-count' into 'develop'
							
							
							
							
							
							
							
							Follow request count
See merge request pleroma/pleroma!817 
							
						 | 
						
							2019-02-18 04:01:26 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								3f38a05571
								
							
						 | 
						
							
							
								
								Merge branch 'csv-export' into 'develop'
							
							
							
							
							
							
							
							Add option to return all friends in twitter api.
Closes #602
See merge request pleroma/pleroma!833 
							
						 | 
						
							2019-02-18 03:59:46 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								fd17a0cc9b
								
							
						 | 
						
							
							
								
								Fix test
							
							
							
							
							
						 | 
						
							2019-02-18 00:10:48 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								79e503b3f5
								
							
						 | 
						
							
							
								
								Merge branch 'docker-speedup' into 'develop'
							
							
							
							
							
							
							
							Docker speedup
See merge request pleroma/pleroma!837 
							
						 | 
						
							2019-02-17 17:38:25 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								71c8c60ded
								
							
						 | 
						
							
							
								
								More speedup, test fixes.
							
							
							
							
							
						 | 
						
							2019-02-17 17:47:24 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								d0a94f98e0
								
							
						 | 
						
							
							
								
								more tests for HellthreadPolicy
							
							
							
							
							
						 | 
						
							2019-02-17 14:33:44 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								bc4f77b10b
								
							
						 | 
						
							
							
								
								[#468] Merged upstream/develop, resolved conflicts.
							
							
							
							
							
						 | 
						
							2019-02-17 14:07:04 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								72a4272d84
								
							
						 | 
						
							
							
								
								Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching
							
							
							
							
							
						 | 
						
							2019-02-16 19:52:46 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								38e15930cb
								
							
						 | 
						
							
							
								
								Add option to return all friends in twitter api.
							
							
							
							
							
							
							
							Mainly useful for user export. 
							
						 | 
						
							2019-02-16 17:01:15 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								921571c19b
								
							
						 | 
						
							
							
								
								Merge branch 'hellthread-filter-fix' into 'develop'
							
							
							
							
							
							
							
							Hellthread filter fix
Closes #634
See merge request pleroma/pleroma!831 
							
						 | 
						
							2019-02-15 13:18:35 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								dca6bee2f7
								
							
						 | 
						
							
							
								
								Rename test, add check for follower collection when delisting
							
							
							
							
							
						 | 
						
							2019-02-15 13:43:14 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								d943c90249
								
							
						 | 
						
							
							
								
								Add tests, change default config values, fix a bug
							
							
							
							
							
						 | 
						
							2019-02-15 12:47:50 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								ea2698beb7
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/activitypub-reserialization' into 'develop'
							
							
							
							
							
							
							
							activitypub transmogrifier: fix reserialization edge cases
See merge request pleroma/pleroma!826 
							
						 | 
						
							2019-02-14 19:54:16 +00: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								e031cc6473
								
							
						 | 
						
							
							
								
								tests: update tests for totalItems leak fix
							
							
							
							
							
						 | 
						
							2019-02-14 03:22:54 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								64620d8980
								
							
						 | 
						
							
							
								
								activitypub: user view: do not expose oAuth endpoints for instance users
							
							
							
							
							
						 | 
						
							2019-02-14 02:41:21 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								889ad95a2a
								
							
						 | 
						
							
							
								
								tests: add some reserialization tests based on IR differences
							
							
							
							
							
						 | 
						
							2019-02-14 00:59:18 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								063baca5e4
								
							
						 | 
						
							
							
								
								[#468] User UI for OAuth permissions restriction. Standardized storage format for scopes fields, updated usages.
							
							
							
							
							
						 | 
						
							2019-02-14 00:29:29 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								d54c483964
								
							
						 | 
						
							
							
								
								tests: add tests for endpoints
							
							
							
							
							
						 | 
						
							2019-02-13 19:48:24 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								62a45bdc11
								
							
						 | 
						
							
							
								
								Add revoke token
							
							
							
							
							
						 | 
						
							2019-02-13 12:59:56 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								61a4bc5095
								
							
						 | 
						
							
							
								
								Add OAuth tokens endpoint
							
							
							
							
							
						 | 
						
							2019-02-13 12:59:56 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								379d04692c
								
							
						 | 
						
							
							
								
								Filter summary in keywordpolicy
							
							
							
							
							
						 | 
						
							2019-02-11 21:35:40 +03: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								305d219413
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/web/federator/federator.ex
#	lib/pleroma/web/websub/websub.ex 
							
						 | 
						
							2019-02-11 13:54:21 +07: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								6a150de3bd
								
							
						 | 
						
							
							
								
								Add unique index and unique constraint check, uniqueness test fails
							
							
							
							
							
						 | 
						
							2019-02-09 20:52:11 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								478a05b4c9
								
							
						 | 
						
							
							
								
								Merged "check mute" test into the other two
							
							
							
							
							
						 | 
						
							2019-02-09 18:34:00 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								a0d732ec55
								
							
						 | 
						
							
							
								
								it works!!
							
							
							
							
							
						 | 
						
							2019-02-09 17:47:57 +01:00 | 
						
						
							
							
							
								
							
							
						 |