Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								ce823fa88e
								
							
						 | 
						
							
							
								
								Fix rate limit test
							
							
							
							
							
						 | 
						
							2019-06-14 19:24:31 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								63ab3c30eb
								
							
						 | 
						
							
							
								
								Merge branch 'feature/rate-limiter' into 'develop'
							
							
							
							
							
							
							
							Feature/Rate Limiter
Closes #943
See merge request pleroma/pleroma!1266 
							
						 | 
						
							2019-06-11 11:32:01 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad04d12de6
								
							
						 | 
						
							
							
								
								Replace MastodonAPIController.account_register/2 rate limiter
							
							
							
							
							
						 | 
						
							2019-06-11 16:06:03 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								76fc4c92bb
								
							
						 | 
						
							
							
								
								Fix tests.
							
							
							
							
							
						 | 
						
							2019-06-07 17:16:56 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								3eefb274f4
								
							
						 | 
						
							
							
								
								OAuth consumer: tests fix, comments, Keycloak config notes.
							
							
							
							
							
						 | 
						
							2019-06-05 13:02:13 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								56fd7dbdd7
								
							
						 | 
						
							
							
								
								remove @websub and @ostatus module-level constants
							
							
							
							
							
						 | 
						
							2019-05-25 04:43:11 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								80d55d428f
								
							
						 | 
						
							
							
								
								tests: websub: check only that signature validation succeeds or fails
							
							
							
							
							
						 | 
						
							2019-05-25 04:34:16 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								290f5b2cfe
								
							
						 | 
						
							
							
								
								config: make sending the user agent configurable, disable sending the user agent in tests
							
							
							
							
							
						 | 
						
							2019-05-17 20:28:58 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								8784a7d1b4
								
							
						 | 
						
							
							
								
								RUM: Set rum status by the environment.
							
							
							
							
							
						 | 
						
							2019-05-17 15:21:24 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								aa11fa4864
								
							
						 | 
						
							
							
								
								add report uri and report to
							
							
							
							
							
						 | 
						
							2019-05-16 12:49:40 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								2ca8d20053
								
							
						 | 
						
							
							
								
								Fix rate-limiting tests
							
							
							
							
							
						 | 
						
							2019-05-14 23:16:34 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								c349573791
								
							
						 | 
						
							
							
								
								Merge develop to 788-separate-email-addresses
							
							
							
							
							
							
							
							Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs 
							
						 | 
						
							2019-04-13 12:24:38 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								fe13a1d78c
								
							
						 | 
						
							
							
								
								adding notify_email setting for trigger emails
							
							
							
							
							
						 | 
						
							2019-04-10 17:57:41 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								1791ee8ec4
								
							
						 | 
						
							
							
								
								s/Pleroma.Mailer/Pleroma.Emails.Mailer/
							
							
							
							
							
						 | 
						
							2019-04-10 06:33:19 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								2056efa714
								
							
						 | 
						
							
							
								
								Add scheduler for sending scheduled activities to the queue
							
							
							
							
							
						 | 
						
							2019-04-06 23:56:29 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor
								
							 
						 | 
						
							
							
							
							
								
							
							
								9a39d1d846
								
							
						 | 
						
							
							
								
								Replace Pleroma.Jobs with pleroma_job_queue
							
							
							
							
							
						 | 
						
							2019-03-29 12:46:05 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								28cfb2c37a
								
							
						 | 
						
							
							
								
								Enable dedupe by default
							
							
							
							
							
						 | 
						
							2019-03-15 12:11:13 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								e2fe796c63
								
							
						 | 
						
							
							
								
								Add some tests
							
							
							
							
							
						 | 
						
							2019-03-14 22:02:48 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								bc7570c282
								
							
						 | 
						
							
							
								
								[#647] tests for web push
							
							
							
							
							
						 | 
						
							2019-03-06 13:20:12 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								3a3a3996b7
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/federator/federator.ex 
							
						 | 
						
							2019-02-04 20:50:28 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								e61f0be951
								
							
						 | 
						
							
							
								
								Unbreak all the tests.
							
							
							
							
							
						 | 
						
							2019-02-03 18:54:39 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								55affbca7f
								
							
						 | 
						
							
							
								
								add a job queue
							
							
							
							
							
						 | 
						
							2019-01-28 22:17:17 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ekaterina Vaartis
								
							 
						 | 
						
							
							
							
							
								
							
							
								d112990776
								
							
						 | 
						
							
							
								
								Specifically disable captcha for automatic tests, it makes them fail
							
							
							
							
							
						 | 
						
							2018-12-22 23:07:44 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								52ac7dce5c
								
							
						 | 
						
							
							
								
								Merge branch 'captcha' into 'develop'
							
							
							
							
							
							
							
							Captcha
See merge request pleroma/pleroma!550 
							
						 | 
						
							2018-12-17 19:45:14 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b12a904911
								
							
						 | 
						
							
							
								
								Integration tests for mastodon websocket
							
							
							
							
							
						 | 
						
							2018-12-17 17:09:06 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ekaterina Vaartis
								
							 
						 | 
						
							
							
							
							
								
							
							
								c859cd1d61
								
							
						 | 
						
							
							
								
								Fix style
							
							
							
							
							
						 | 
						
							2018-12-15 23:39:23 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ekaterina Vaartis
								
							 
						 | 
						
							
							
							
							
								
							
							
								e8537208bd
								
							
						 | 
						
							
							
								
								Add a captcha mock for tests
							
							
							
							
							
						 | 
						
							2018-12-15 22:38:39 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4e7d98922e
								
							
						 | 
						
							
							
								
								[#114] Added tests for "POST /api/account/password_reset".
							
							
							
							
							
						 | 
						
							2018-12-12 17:04:52 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								0020b22688
								
							
						 | 
						
							
							
								
								add VAPID to test config
							
							
							
							
							
						 | 
						
							2018-12-06 20:17:00 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ec34de0c1f
								
							
						 | 
						
							
							
								
								WebSub fix test
							
							
							
							
							
						 | 
						
							2018-12-04 14:03:32 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								3ce16e5a56
								
							
						 | 
						
							
							
								
								init tesla and updated the http requests in Pleroma.Web.Websub
							
							
							
							
							
						 | 
						
							2018-12-04 14:03:32 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b19597f602
								
							
						 | 
						
							
							
								
								reverse proxy / uploads
							
							
							
							
							
						 | 
						
							2018-11-30 18:00:47 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thog
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e55c6f311b
								
							
						 | 
						
							
							
								
								Migrate to comeonin 4 and Cachex 3
							
							
							
							
							
							
							
							Also fix some warning in the code and add a missing alias 
							
						 | 
						
							2018-05-20 20:08:40 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								737c42920a
								
							
						 | 
						
							
							
								
								Speling
							
							
							
							
							
						 | 
						
							2018-05-04 22:05:01 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								d30907e573
								
							
						 | 
						
							
							
								
								Make it possible to use custom database connection parameters
							
							
							
							
							
						 | 
						
							2018-05-04 21:00:18 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4afbef39f4
								
							
						 | 
						
							
							
								
								Format the code.
							
							
							
							
							
						 | 
						
							2018-03-30 15:01:53 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								5794558077
								
							
						 | 
						
							
							
								
								Read variable for testing db.
							
							
							
							
							
						 | 
						
							2017-11-02 17:45:33 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								d982f04a65
								
							
						 | 
						
							
							
								
								Mock HTTPoison in testing.
							
							
							
							
							
						 | 
						
							2017-05-05 14:16:54 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								1422e7aa84
								
							
						 | 
						
							
							
								
								Handle incoming websub subscriptions.
							
							
							
							
							
						 | 
						
							2017-04-28 15:45:10 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								8fb73c28bb
								
							
						 | 
						
							
							
								
								Only have one subscription per callback.
							
							
							
							
							
						 | 
						
							2017-04-22 13:44:21 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								08fdbd6f3a
								
							
						 | 
						
							
							
								
								Add Uploads.
							
							
							
							
							
						 | 
						
							2017-03-29 01:39:01 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								e32dbfc9a5
								
							
						 | 
						
							
							
								
								Add basic auth.
							
							
							
							
							
						 | 
						
							2017-03-20 17:56:45 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								a93f3421a7
								
							
						 | 
						
							
							
								
								Phoenix skeleton
							
							
							
							
							
						 | 
						
							2017-03-17 17:09:58 +01:00 | 
						
						
							
							
							
								
							
							
						 |