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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								027714b519
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
							
							
							
							
							
						 | 
						
							2020-03-06 11:48:30 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								05da5f5cca
								
							
						 | 
						
							
							
								
								Update Copyrights
							
							
							
							
							
						 | 
						
							2020-03-03 16:44:49 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								bd8624d649
								
							
						 | 
						
							
							
								
								[#1560] Added tests for non-federating instance bahaviour to OStatusControllerTest.
							
							
							
							
							
						 | 
						
							2020-03-02 22:02:21 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								4b10804f21
								
							
						 | 
						
							
							
								
								OStatus controller: don't serve json at /notice/, redirect instead
							
							
							
							
							
						 | 
						
							2019-11-25 17:55:17 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								cd90735a4b
								
							
						 | 
						
							
							
								
								tests: ostatus controller tests: fix sporadic compilation failure
							
							
							
							
							
						 | 
						
							2019-10-19 23:16:15 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								48059c03c9
								
							
						 | 
						
							
							
								
								fix up some tests
							
							
							
							
							
						 | 
						
							2019-10-18 14:50:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								d379b48769
								
							
						 | 
						
							
							
								
								kill almost all of the OStatus module
							
							
							
							
							
						 | 
						
							2019-10-18 14:50:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								4f82e42e4e
								
							
						 | 
						
							
							
								
								websub: remove entirely
							
							
							
							
							
						 | 
						
							2019-10-18 14:50:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								4b3f77a99f
								
							
						 | 
						
							
							
								
								Extract RSS Feed functionality from OStatus
							
							
							
							
							
						 | 
						
							2019-10-07 12:20:41 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								26f66fb70a
								
							
						 | 
						
							
							
								
								Merge branch 'features/apc2s-media-upload' into 'develop'
							
							
							
							
							
							
							
							AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706 
							
						 | 
						
							2019-09-30 11:21:49 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								0dc8f3d6d2
								
							
						 | 
						
							
							
								
								/api/ap/uploadMedia → /api/ap/upload_media
							
							
							
							
							
						 | 
						
							2019-09-24 19:03:06 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								209395c7e6
								
							
						 | 
						
							
							
								
								Add User.change_info/2 and User.update_info/2
							
							
							
							
							
						 | 
						
							2019-09-24 19:50:07 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								815b904508
								
							
						 | 
						
							
							
								
								Add support for AP C2S uploadMedia
							
							
							
							
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171 
							
						 | 
						
							2019-09-23 20:00:12 +02: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4f548cb2b7
								
							
						 | 
						
							
							
								
								added test for Ostatus
							
							
							
							
							
						 | 
						
							2019-09-12 10:25:43 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								a320358703
								
							
						 | 
						
							
							
								
								added test helpers to clear config after tests
							
							
							
							
							
						 | 
						
							2019-08-19 15:34:29 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								5329e84d62
								
							
						 | 
						
							
							
								
								OStatus tests: stop relying on embedded objects
							
							
							
							
							
						 | 
						
							2019-08-07 00:58:48 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								813c686dd7
								
							
						 | 
						
							
							
								
								Disallow following locked accounts over OStatus
							
							
							
							
							
						 | 
						
							2019-07-31 22:05:12 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								f72e0b7cad
								
							
						 | 
						
							
							
								
								ostatus: explicitly disallow protocol downgrade from activitypub
							
							
							
							
							
							
							
							This closes embargoed bug #1135. 
							
						 | 
						
							2019-07-31 18:17:31 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								159bbec570
								
							
						 | 
						
							
							
								
								added tests for OstatusController
							
							
							
							
							
						 | 
						
							2019-07-29 05:02:20 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								43a7cd27fe
								
							
						 | 
						
							
							
								
								[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest
							
							
							
							
							
						 | 
						
							2019-07-20 13:07:51 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								93a0eeab16
								
							
						 | 
						
							
							
								
								Add license/copyright to all project files
							
							
							
							
							
						 | 
						
							2019-07-10 05:13:23 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								829e997223
								
							
						 | 
						
							
							
								
								[#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/object.ex
#	test/web/activity_pub/transmogrifier_test.exs
#	test/web/ostatus/ostatus_test.exs 
							
						 | 
						
							2019-07-09 21:46:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								95c085174d
								
							
						 | 
						
							
							
								
								Merge branch 'test-speedup' into 'develop'
							
							
							
							
							
							
							
							Testing: Don't federate in testing.
See merge request pleroma/pleroma!1391 
							
						 | 
						
							2019-07-09 15:35:28 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								abe2e8881f
								
							
						 | 
						
							
							
								
								Testing: Don't federate in testing.
							
							
							
							
							
						 | 
						
							2019-07-09 15:30:51 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								daff85a985
								
							
						 | 
						
							
							
								
								[#878] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.
							
							
							
							
							
						 | 
						
							2019-07-08 19:53:02 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								2b9d914089
								
							
						 | 
						
							
							
								
								[#161] Refactoring, documentation.
							
							
							
							
							
						 | 
						
							2019-06-30 15:58:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b7b1040b3
								
							
						 | 
						
							
							
								
								[#161] Limited replies depth on incoming federation in order to prevent memory leaks on recursive replies fetching.
							
							
							
							
							
						 | 
						
							2019-06-29 20:04:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								249b31ffe5
								
							
						 | 
						
							
							
								
								Fix specs.
							
							
							
							
							
						 | 
						
							2019-05-17 11:49:13 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								7ed682213f
								
							
						 | 
						
							
							
								
								Fix/902 random compile failing
							
							
							
							
							
						 | 
						
							2019-05-17 07:25:20 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								e4523c3010
								
							
						 | 
						
							
							
								
								Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
							
							
							
							
							
						 | 
						
							2019-05-09 22:27:00 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor
								
							 
						 | 
						
							
							
							
							
								
							
							
								b9cdf6d3b9
								
							
						 | 
						
							
							
								
								Use User.get_cached* everywhere
							
							
							
							
							
						 | 
						
							2019-04-22 07:20:43 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								627e5a0a49
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/database-compaction
							
							
							
							
							
						 | 
						
							2019-04-17 12:22:32 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								11c2d6bdc4
								
							
						 | 
						
							
							
								
								change Repo.get(Activity, id) => Activity.get_by_id(id) in tests
							
							
							
							
							
						 | 
						
							2019-04-02 17:08:03 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								1b3d921921
								
							
						 | 
						
							
							
								
								change Repo.get(User, id) => User.get_by_id(id)
							
							
							
							
							
						 | 
						
							2019-04-02 17:01:26 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a3a9cec483
								
							
						 | 
						
							
							
								
								[Credo] fix Credo.Check.Readability.AliasOrder
							
							
							
							
							
						 | 
						
							2019-03-13 04:26:54 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								8bb7e19b38
								
							
						 | 
						
							
							
								
								test: de-group alias/es
							
							
							
							
							
						 | 
						
							2019-02-11 03:44:15 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								e61f0be951
								
							
						 | 
						
							
							
								
								Unbreak all the tests.
							
							
							
							
							
						 | 
						
							2019-02-03 18:54:39 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								92753b0cd9
								
							
						 | 
						
							
							
								
								[#534] Made federation push sender be determined basing on content instead of referer header. Updated tests.
							
							
							
							
							
						 | 
						
							2019-01-29 13:12:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								d3f9e6f6fe
								
							
						 | 
						
							
							
								
								[#534] Merged upstream/develop.
							
							
							
							
							
						 | 
						
							2019-01-28 15:39:14 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								1d2f41642c
								
							
						 | 
						
							
							
								
								[#534] Various tweaks. Tests for Instances and Instance.
							
							
							
							
							
						 | 
						
							2019-01-28 15:25:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								d99650270b
								
							
						 | 
						
							
							
								
								[#534] Federation reachability filtering tests.
							
							
							
							
							
						 | 
						
							2019-01-25 20:38:54 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								7bc6208b2f
								
							
						 | 
						
							
							
								
								Fix ostatus test
							
							
							
							
							
						 | 
						
							2019-01-18 10:35:52 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								8cea00e1dc
								
							
						 | 
						
							
							
								
								Remove OpenGraph test from Ostatus tests
							
							
							
							
							
						 | 
						
							2019-01-16 10:53:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								e4dc3f71ae
								
							
						 | 
						
							
							
								
								Resolve merge conflict
							
							
							
							
							
						 | 
						
							2019-01-13 13:38:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								bee6acd51d
								
							
						 | 
						
							
							
								
								Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'
							
							
							
							
							
							
							
							Create tombstone instead of object deletion
See merge request pleroma/pleroma!593 
							
						 | 
						
							2018-12-27 19:37:55 +00:00 | 
						
						
							
							
							
								
							
							
						 |