Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								4695bdd81b
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into issue/1790-updated-oban
							
							
							
							
							
						 | 
						
							2020-07-03 10:36:41 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								244655e884
								
							
						 | 
						
							
							
								
								MastoAPI: Show source field when deleting
							
							
							
							
							
						 | 
						
							2020-06-26 19:52:20 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								a8d967762e
								
							
						 | 
						
							
							
								
								migrate to oban 2.0-rc1
							
							
							
							
							
						 | 
						
							2020-06-23 15:09:01 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								4ec2fb967e
								
							
						 | 
						
							
							
								
								Merge branch 'features/users-raw_bio' into 'develop'
							
							
							
							
							
							
							
							User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326 
							
						 | 
						
							2020-06-17 10:34:23 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9a4fde9766
								
							
						 | 
						
							
							
								
								Mogrify args as custom tuples
							
							
							
							
							
						 | 
						
							2020-06-16 15:53:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e1b07402ab
								
							
						 | 
						
							
							
								
								User: Add raw_bio, storing unformatted bio
							
							
							
							
							
							
							
							Related: https://git.pleroma.social/pleroma/pleroma/issues/1643 
							
						 | 
						
							2020-06-06 16:23:16 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								3bec0d2e50
								
							
						 | 
						
							
							
								
								Factory: Set users to be ap_enabled by default.
							
							
							
							
							
						 | 
						
							2020-05-25 12:59:42 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								a42a0716ec
								
							
						 | 
						
							
							
								
								Merge branch 'features/emoji_stealer' into 'develop'
							
							
							
							
							
							
							
							MRF.StealEmojiPolicy: New Policy
See merge request pleroma/pleroma!2385 
							
						 | 
						
							2020-05-21 13:31:49 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								490a3a34b6
								
							
						 | 
						
							
							
								
								Add OpenAPI spec for PleromaAPI.PleromaAPIController
							
							
							
							
							
						 | 
						
							2020-05-20 15:15:13 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e688d4ee69
								
							
						 | 
						
							
							
								
								MRF.StealEmojiPolicy: New Policy
							
							
							
							
							
							
							
							Inspired by https://git.pleroma.social/moonman/emoji-stealer-mrf/-/blob/master/steal_emoji_policy.ex 
							
						 | 
						
							2020-05-14 09:59:56 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b46811a074
								
							
						 | 
						
							
							
								
								Upgrade Comeonin to v5
							
							
							
							
							
							
							
							https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md 
							
						 | 
						
							2020-05-12 17:14:59 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4061841846
								
							
						 | 
						
							
							
								
								Merge branch 'streamer-worker-registry' into 'develop'
							
							
							
							
							
							
							
							Streamer rework
See merge request pleroma/pleroma!2426 
							
						 | 
						
							2020-05-07 09:13:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
							
							
								
							
							
								9491ba3e49
								
							
						 | 
						
							
							
								
								Streamer rework
							
							
							
							
							
						 | 
						
							2020-05-07 09:13:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								3d0c567fbc
								
							
						 | 
						
							
							
								
								Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
							
							
							
							
							
						 | 
						
							2020-05-07 08:14:54 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								f84c8f2f0d
								
							
						 | 
						
							
							
								
								Merge branch 'feature/1728-webfinger-acct-scheme' into 'develop'
							
							
							
							
							
							
							
							Webfinger: Request account info with the acct scheme
Closes #1728
See merge request pleroma/pleroma!2465 
							
						 | 
						
							2020-05-06 08:46:45 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								7fdc7078ae
								
							
						 | 
						
							
							
								
								Merge branch 'openapi/lists' into 'develop'
							
							
							
							
							
							
							
							Add OpenAPI spec for ListController
See merge request pleroma/pleroma!2453 
							
						 | 
						
							2020-05-06 08:43:21 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								332e016bcd
								
							
						 | 
						
							
							
								
								Add OpenAPI spec for ScheduledActivityController
							
							
							
							
							
						 | 
						
							2020-05-05 23:42:24 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5ec6aad567
								
							
						 | 
						
							
							
								
								Add OpenAPI spec for ListController
							
							
							
							
							
						 | 
						
							2020-05-05 17:05:34 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								335aabc39c
								
							
						 | 
						
							
							
								
								Transmogrifier tests: Extract like tests.
							
							
							
							
							
						 | 
						
							2020-05-04 14:45:28 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								a7966f2080
								
							
						 | 
						
							
							
								
								Webfinger: Request account info with the acct scheme
							
							
							
							
							
						 | 
						
							2020-05-03 13:48:01 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								44fbd09709
								
							
						 | 
						
							
							
								
								Merge branch 'issue/1577' into 'develop'
							
							
							
							
							
							
							
							[#1577] fix mediaType of object
See merge request pleroma/pleroma!2372 
							
						 | 
						
							2020-05-01 12:38:46 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								7b0c8f0fde
								
							
						 | 
						
							
							
								
								Add tests for account registration with captcha enabled and improve errors
							
							
							
							
							
						 | 
						
							2020-04-29 21:26:07 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ea5142b94b
								
							
						 | 
						
							
							
								
								convert markdown content to html
							
							
							
							
							
						 | 
						
							2020-04-28 09:32:43 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								2efc00b3cf
								
							
						 | 
						
							
							
								
								Use json_response_and_validate_schema/2 in tests to validate OpenAPI schema
							
							
							
							
							
						 | 
						
							2020-04-27 20:46:52 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f1ca917bb0
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into openapi/account
							
							
							
							
							
						 | 
						
							2020-04-27 14:33:00 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f362836742
								
							
						 | 
						
							
							
								
								Support validation for inline OpenAPI schema and automatic tests for examples
							
							
							
							
							
						 | 
						
							2020-04-24 15:16:15 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								736fead494
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into openapi/account
							
							
							
							
							
						 | 
						
							2020-04-20 18:40:02 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								a17bfb5fab
								
							
						 | 
						
							
							
								
								Merge branch 'feature/1584-client-captcha-options' into 'develop'
							
							
							
							
							
							
							
							Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252 
							
						 | 
						
							2020-04-17 09:19:35 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								260cbddc94
								
							
						 | 
						
							
							
								
								Add spec for AccountController.update_credentials
							
							
							
							
							
						 | 
						
							2020-04-13 18:16:07 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								c5c09fc61b
								
							
						 | 
						
							
							
								
								fix mediaType of object
							
							
							
							
							
						 | 
						
							2020-04-13 07:02:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f497cf2f7c
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into gun
							
							
							
							
							
						 | 
						
							2020-03-30 12:15:23 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								e999c67cee
								
							
						 | 
						
							
							
								
								Merge branch 'feature/funkwhale-audio' into 'develop'
							
							
							
							
							
							
							
							Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287 
							
						 | 
						
							2020-03-29 19:18:22 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a6ee6784bc
								
							
						 | 
						
							
							
								
								creating trusted app from adminFE & mix task
							
							
							
							
							
						 | 
						
							2020-03-23 10:44:47 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9bae9b1b1b
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into gun
							
							
							
							
							
						 | 
						
							2020-03-20 20:47:54 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								1c05f539aa
								
							
						 | 
						
							
							
								
								Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).
							
							
							
							
							
						 | 
						
							2020-03-20 18:33:00 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ec3719f539
								
							
						 | 
						
							
							
								
								Improved in-test config management functions.
							
							
							
							
							
						 | 
						
							2020-03-18 20:30:31 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f0651730bd
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into gun
							
							
							
							
							
						 | 
						
							2020-03-16 14:25:55 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								39ed608b13
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into gun
							
							
							
							
							
						 | 
						
							2020-03-12 18:31:10 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								bd40880fa0
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
							
							
							
							
							
							
							
							# Conflicts:
#	test/web/activity_pub/activity_pub_controller_test.exs 
							
						 | 
						
							2020-03-12 12:07:07 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								f92c447bbc
								
							
						 | 
						
							
							
								
								Merge branch 'relay-list-change' into 'develop'
							
							
							
							
							
							
							
							Relay list shows hosts without accepted follow
See merge request pleroma/pleroma!2240 
							
						 | 
						
							2020-03-11 15:10:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								863ec33ba2
								
							
						 | 
						
							
							
								
								Add support for funkwhale Audio activity
							
							
							
							
							
							
							
							reel2bits fixture not included as it lacks the Actor fixture for it.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624
Closes: https://git.pleroma.social/pleroma/pleroma/issues/764 
							
						 | 
						
							2020-03-11 13:46:42 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b696a8ac1
								
							
						 | 
						
							
							
								
								[#1560] Enforced authentication for non-federating instances in StaticFEController.
							
							
							
							
							
						 | 
						
							2020-03-11 14:05:56 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								5fc92deef3
								
							
						 | 
						
							
							
								
								[#1560] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.
							
							
							
							
							
						 | 
						
							2020-03-09 20:51:44 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								56ff02f2ef
								
							
						 | 
						
							
							
								
								removing GunMock to use Mox
							
							
							
							
							
						 | 
						
							2020-03-06 20:23:58 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								d9c5ae7c09
								
							
						 | 
						
							
							
								
								Update Copyrights for gun related files
							
							
							
							
							
						 | 
						
							2020-03-03 17:16:24 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								4427161ca3
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into gun
							
							
							
							
							
						 | 
						
							2020-03-03 17:15:49 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								5592db4757
								
							
						 | 
						
							
							
								
								Older copyright updates
							
							
							
							
							
						 | 
						
							2020-03-03 16:46:45 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								05da5f5cca
								
							
						 | 
						
							
							
								
								Update Copyrights
							
							
							
							
							
						 | 
						
							2020-03-03 16:44:49 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								884d9710b2
								
							
						 | 
						
							
							
								
								refactoring for gun api modules
							
							
							
							
							
						 | 
						
							2020-03-03 19:24:14 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								509c81e4b1
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into gun
							
							
							
							
							
						 | 
						
							2020-03-03 10:08:07 +03:00 | 
						
						
							
							
							
								
							
							
						 |