| 
								
								
									 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 | ef6829382a | Clean captchas up periodically, not schedule it after theyre created | 2018-12-16 23:53:44 +03:00 |  | 
				
					
						| 
								
								
									 Ekaterina Vaartis | 73576ab64e | Fix captcha tests | 2018-12-16 23:01:44 +03:00 |  | 
				
					
						| 
								
								
									 Ekaterina Vaartis | e8537208bd | Add a captcha mock for tests | 2018-12-15 22:38:39 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 89b3729afa | fix warnings | 2018-12-12 09:09:19 +03:00 |  | 
				
					
						| 
								
								
									 lain | c81c74d847 | Treat warnings as errors outside of tests. | 2018-12-10 19:13:53 +01:00 |  | 
				
					
						| 
								
								
									 kaniini | ccf0b46dd6 | Merge branch '210_twitter_api_uploads_alt_text' into 'develop' [#210] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496 | 2018-12-06 07:36:21 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 848151f7cb | [#210] [TwitterAPI] Made actor be stored for uploads. Added ownership check to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring. | 2018-12-05 13:37:06 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 50e72f6c48 | remove httpoison_mock | 2018-12-04 18:09:22 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | dd8aee332c | formatting the code | 2018-12-04 17:48:55 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 5c6d47614d | all tests passed | 2018-12-04 17:44:15 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | a9e4a97586 | update test | 2018-12-04 14:04:06 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 7ec64ac33f | update test | 2018-12-04 14:04:06 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 80bfdb4e7d | update test | 2018-12-04 14:04:06 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 6cfdc11e32 | update test | 2018-12-04 14:04:06 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | c508d41c34 | add http requests mock | 2018-12-04 14:04:06 +03:00 |  | 
				
					
						| 
								
								
									 lain | c443c9bd72 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info | 2018-12-01 09:55:46 +01:00 |  | 
				
					
						| 
								
								
									 href | b19597f602 | reverse proxy / uploads | 2018-11-30 18:00:47 +01:00 |  | 
				
					
						| 
								
								
									 lain | 47d883d3ab | Fix User deactivation. | 2018-11-18 18:06:02 +01:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 55640c4804 | tests: add a test to verify the general fake direction protection works in all cases | 2018-11-17 20:31:20 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | dc1d8e13b4 | tests: add a testcase for user collision | 2018-11-17 20:20:45 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | b483ae0a72 | tests: add a second spoofing variant | 2018-11-17 18:25:32 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 010fcb73d7 | test: httpoison mock: add second spoofing activity test | 2018-11-17 18:11:17 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 1d9fcbf2ba | add missing prismo testcase data | 2018-11-10 11:11:01 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 958c5e02e8 | tests: add a testcase for matching osada users in the formatter | 2018-10-17 19:27:05 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | d830a243a3 | transmogrifier: more robustly handle dereferencing pointer URIs | 2018-09-27 20:00:48 +02:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 303af9ba4c | tests: add regression tests | 2018-09-01 23:33:10 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 74c74decf5 | Basic peertube support. | 2018-08-21 18:24:09 +02:00 |  | 
				
					
						| 
								
								
									 kaniini | 5fbb14f5ec | Merge branch 'bugfix/federation-kroeg' into 'develop' fix federation with kroeg
See merge request pleroma/pleroma!272 | 2018-08-16 15:20:15 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 38361e7b5e | Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop' Fix: Output repeats at ActivityPub outbox
Closes #191
See merge request pleroma/pleroma!175 | 2018-08-16 15:19:46 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | b8560e5ed5 | testsuite: formatting | 2018-08-14 17:15:33 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 7fbcd4caaf | test: add kroeg fixtures | 2018-08-14 17:09:17 +00:00 |  | 
				
					
						| 
								
								
									 hakabahitoyo | 9c1b6f11c5 | improve test | 2018-07-21 02:57:56 +09:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 24b5a75d09 | Add test for Plume Articles | 2018-07-12 23:08:28 +02:00 |  | 
				
					
						| 
								
								
									 lambda | 0a0c6bf394 | Merge branch 'bugfix/webfinger-xml-crash' into 'develop' webfinger robustness improvements
See merge request pleroma/pleroma!195 | 2018-06-06 16:44:44 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 1620ec502c | testsuite: update fixture URIs that were http | 2018-06-06 16:36:58 +00:00 |  | 
				
					
						| 
								
								
									 D Anzorge | 2cebaa7d3a | Add OAuth controller tests Tests for Pleroma.Web.OAuth.OAuthController | 2018-06-06 03:18:11 +02:00 |  | 
				
					
						| 
								
								
									 lain | 4b3ec53514 | Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api | 2018-05-26 16:00:59 +02:00 |  | 
				
					
						| 
								
								
									 lain | 1cd6194dee | More efficient queries. | 2018-05-24 12:44:26 +02:00 |  | 
				
					
						| 
								
								
									 csaurus | 4fd9df100f | Merge branch 'develop' into feature/mstdn-direct-api | 2018-05-21 20:19:37 -04:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 75cfd9d34d | webfinger: fix finding the XRD uri for statusnet instances | 2018-05-21 12:41:31 +00:00 |  | 
				
					
						| 
								
								
									 lambda | 7831b38705 | Merge branch 'feature/webfinger-mime-ld-json' into 'develop' webfinger: handle application/ld+json links
See merge request pleroma/pleroma!159 | 2018-05-19 09:31:08 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 725b05d04a | run mix format | 2018-05-19 08:48:15 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 6e8de2faae | run mix format | 2018-05-19 08:37:04 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 4033ed6714 | tests: add test for hubzilla follow activity too | 2018-05-19 03:28:32 -05:00 |  | 
				
					
						| 
								
								
									 William Pitcock | f32e19f668 | webfinger: add tests | 2018-05-19 01:28:27 -05:00 |  | 
				
					
						| 
								
								
									 csaurus | d0ad13c12e | Add direct_note[_activity]_factory and a couple tests | 2018-05-14 21:54:25 -04:00 |  | 
				
					
						| 
								
								
									 Mark Felder | ab4aa5720a | Fix a bunch of unused variable warnings | 2018-05-04 20:59:01 +00:00 |  | 
				
					
						| 
								
								
									 lain | 4afbef39f4 | Format the code. | 2018-03-30 15:01:53 +02:00 |  |