lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								91c8467582
								
							
						 | 
						
							
							
								
								OStatusController: Add Mastodon activity compat route.
							
							
							
							
							
						 | 
						
							2020-05-22 17:11:59 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								355aa3bdc7
								
							
						 | 
						
							
							
								
								ActivityPubController: Add Mastodon activity compat route.
							
							
							
							
							
						 | 
						
							2020-05-22 17:06:12 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								8a4bd9e5d1
								
							
						 | 
						
							
							
								
								OStatusController: Add Mastodon compatibility route for objects.
							
							
							
							
							
						 | 
						
							2020-05-22 16:47:22 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								ca755f9a73
								
							
						 | 
						
							
							
								
								ActivityPubController: Add Mastodon compatibility route.
							
							
							
							
							
						 | 
						
							2020-05-22 16:15:29 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								2c4844237f
								
							
						 | 
						
							
							
								
								Refactoring of :if_func / :unless_func plug options (general availability). Added tests for Pleroma.Web.Plug.
							
							
							
							
							
						 | 
						
							2020-04-30 18:19:51 +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
								
							 
						 | 
						
							
							
							
							
								
							
							
								0cf1d4fcd0
								
							
						 | 
						
							
							
								
								[#1560] Restricted AP- & OStatus-related routes for non-federating instances.
							
							
							
							
							
						 | 
						
							2020-02-22 19:48:41 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								4b10804f21
								
							
						 | 
						
							
							
								
								OStatus controller: don't serve json at /notice/, redirect instead
							
							
							
							
							
						 | 
						
							2019-11-25 17:55:17 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steven Fuchs
								
							 
						 | 
						
							
							
							
							
								
							
							
								94627baa5c
								
							
						 | 
						
							
							
								
								New rate limiter
							
							
							
							
							
						 | 
						
							2019-11-11 12:13:06 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								d379b48769
								
							
						 | 
						
							
							
								
								kill almost all of the OStatus module
							
							
							
							
							
						 | 
						
							2019-10-18 14:50:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								835ad52378
								
							
						 | 
						
							
							
								
								remove Salmon module
							
							
							
							
							
						 | 
						
							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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steven Fuchs
								
							 
						 | 
						
							
							
							
							
								
							
							
								e1d2d69c87
								
							
						 | 
						
							
							
								
								Clean up views
							
							
							
							
							
						 | 
						
							2019-09-23 22:33:59 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4f548cb2b7
								
							
						 | 
						
							
							
								
								added test for Ostatus
							
							
							
							
							
						 | 
						
							2019-09-12 10:25:43 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								37dd3867bb
								
							
						 | 
						
							
							
								
								Log admin/moderator actions
							
							
							
							
							
						 | 
						
							2019-08-25 19:39:37 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								a79ebac592
								
							
						 | 
						
							
							
								
								Improve AP routes rate limit
							
							
							
							
							
						 | 
						
							2019-08-22 16:03:43 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								8d899d6197
								
							
						 | 
						
							
							
								
								Add :ap_routes rate limit
							
							
							
							
							
						 | 
						
							2019-08-20 22:10:36 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								159bbec570
								
							
						 | 
						
							
							
								
								added tests for OstatusController
							
							
							
							
							
						 | 
						
							2019-07-29 05:02:20 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								5104f65b69
								
							
						 | 
						
							
							
								
								Wrap error messages into gettext helpers
							
							
							
							
							
						 | 
						
							2019-07-10 18:10:09 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								debf7f016d
								
							
						 | 
						
							
							
								
								ostatus: use preload objects with Object.normalize() when opportunistic
							
							
							
							
							
						 | 
						
							2019-03-23 03:05:57 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a3a9cec483
								
							
						 | 
						
							
							
								
								[Credo] fix Credo.Check.Readability.AliasOrder
							
							
							
							
							
						 | 
						
							2019-03-13 04:26:54 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								9e0686efa6
								
							
						 | 
						
							
							
								
								Move visibility into own module.
							
							
							
							
							
						 | 
						
							2019-02-22 13:29:52 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								5a4e2905fe
								
							
						 | 
						
							
							
								
								Merge branch 'fix/twittercards' into 'develop'
							
							
							
							
							
							
							
							Fix Twitter Cards
See merge request pleroma/pleroma!815 
							
						 | 
						
							2019-02-22 04:38:14 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								1803d9a022
								
							
						 | 
						
							
							
								
								fix fetching AP objects with application/json
							
							
							
							
							
						 | 
						
							2019-02-20 20:45:40 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f4bfc628ca
								
							
						 | 
						
							
							
								
								Player: allow styles on CSP, loop videos
							
							
							
							
							
						 | 
						
							2019-02-19 18:56:57 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								aa9af1d639
								
							
						 | 
						
							
							
								
								CSP: Allow iframes on embed player
							
							
							
							
							
						 | 
						
							2019-02-19 18:19:13 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								2d21ea1a0e
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into fix/twittercards
							
							
							
							
							
						 | 
						
							2019-02-19 16:58:28 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								10a11f083c
								
							
						 | 
						
							
							
								
								Embed player suitable for Twitter Cards
							
							
							
							
							
						 | 
						
							2019-02-19 17:47:48 +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
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6a6a5b3251
								
							
						 | 
						
							
							
								
								de-group alias/es
							
							
							
							
							
						 | 
						
							2019-02-09 16:31:17 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								60ea29dfe6
								
							
						 | 
						
							
							
								
								Credo fixes: alias grouping/ordering
							
							
							
							
							
						 | 
						
							2019-02-09 14:59:20 +01: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								d3677d2b4d
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'MAIN/develop' into feature/jobs
							
							
							
							
							
						 | 
						
							2019-01-31 15:07:49 +07: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								55affbca7f
								
							
						 | 
						
							
							
								
								add a job queue
							
							
							
							
							
						 | 
						
							2019-01-28 22:17:17 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								d3f9e6f6fe
								
							
						 | 
						
							
							
								
								[#534] Merged upstream/develop.
							
							
							
							
							
						 | 
						
							2019-01-28 15:39:14 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								9560abea10
								
							
						 | 
						
							
							
								
								[#534] Refactoring / tweaks per MR review.
							
							
							
							
							
						 | 
						
							2019-01-28 11:03:52 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								71bb90073b
								
							
						 | 
						
							
							
								
								/notice/:id - send the FE index even if 404
							
							
							
							
							
							
							
							this allows to open private activities by URL when you are logged in,
and to let the FE display a 404 page 
							
						 | 
						
							2019-01-27 22:51:50 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								c9b418e547
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into 'oembed_provider'
							
							
							
							
							
							
							
							# Conflicts:
#   lib/pleroma/activity.ex 
							
						 | 
						
							2019-01-25 05:00:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								8654a591f0
								
							
						 | 
						
							
							
								
								[#534] Updating external instances reachability on incoming federation.
							
							
							
							
							
						 | 
						
							2019-01-24 17:37:23 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								98c8184c1f
								
							
						 | 
						
							
							
								
								Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
							
							
							
							
							
						 | 
						
							2019-01-21 08:00:41 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								44693fbf6e
								
							
						 | 
						
							
							
								
								Formating
							
							
							
							
							
						 | 
						
							2019-01-20 01:28:46 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								afd83db0d7
								
							
						 | 
						
							
							
								
								Provide local og:url for remote activities
							
							
							
							
							
						 | 
						
							2019-01-19 10:58:27 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								1b1af4798a
								
							
						 | 
						
							
							
								
								Use object instead of activity for metadata
							
							
							
							
							
						 | 
						
							2019-01-18 09:32:52 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								dd1432d695
								
							
						 | 
						
							
							
								
								Disable previews for any activity, but create
							
							
							
							
							
						 | 
						
							2019-01-16 09:42:24 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								ff6c9a5c96
								
							
						 | 
						
							
							
								
								Introduce get_by_id in Activity, replace newlines with spaces
							
							
							
							
							
						 | 
						
							2019-01-15 20:00:21 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								e4dc3f71ae
								
							
						 | 
						
							
							
								
								Resolve merge conflict
							
							
							
							
							
						 | 
						
							2019-01-13 13:38:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sxsdv1
								
							 
						 | 
						
							
							
							
							
								
							
							
								20c0dd1e24
								
							
						 | 
						
							
							
								
								Support activity+json request for activity
							
							
							
							
							
						 | 
						
							2019-01-09 09:33:30 +01:00 | 
						
						
							
							
							
								
							
							
						 |