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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								4f82e42e4e
								
							
						 | 
						
							
							
								
								websub: remove entirely
							
							
							
							
							
						 | 
						
							2019-10-18 14:50:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								422aa6befe
								
							
						 | 
						
							
							
								
								Ostatus DeleteHandler: Fix for new option format.
							
							
							
							
							
						 | 
						
							2019-10-11 12:53:09 +02: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								03ad31328c
								
							
						 | 
						
							
							
								
								OStatus Announce Representer: Do not depend on the object being embedded
							
							
							
							
							
							
							
							in the Create activity 
							
						 | 
						
							2019-08-07 00:23:58 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								1dfde4151c
								
							
						 | 
						
							
							
								
								Merge branch 'refactor/use-constants' into 'develop'
							
							
							
							
							
							
							
							refactoring: begin to use constants
See merge request pleroma/pleroma!1500 
							
						 | 
						
							2019-07-29 16:30:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								159bbec570
								
							
						 | 
						
							
							
								
								added tests for OstatusController
							
							
							
							
							
						 | 
						
							2019-07-29 05:02:20 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								b93498eb52
								
							
						 | 
						
							
							
								
								constants: add as_public constant and use it everywhere
							
							
							
							
							
						 | 
						
							2019-07-29 02:43:19 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								5104f65b69
								
							
						 | 
						
							
							
								
								Wrap error messages into gettext helpers
							
							
							
							
							
						 | 
						
							2019-07-10 18:10:09 +07: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								9bec891eb4
								
							
						 | 
						
							
							
								
								kill @httpoison
							
							
							
							
							
						 | 
						
							2019-05-25 04:24:21 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								69158f1065
								
							
						 | 
						
							
							
								
								ostatus: only as:Public activities are representable
							
							
							
							
							
						 | 
						
							2019-05-12 05:04:16 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								1d78e42fd4
								
							
						 | 
						
							
							
								
								Remove get_in_reply_to calls in some functions because the result is unused and it does not have any side-effects
							
							
							
							
							
						 | 
						
							2019-05-10 13:49:34 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								e4523c3010
								
							
						 | 
						
							
							
								
								Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
							
							
							
							
							
						 | 
						
							2019-05-09 22:27:00 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								d21d921def
								
							
						 | 
						
							
							
								
								Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
							
							
							
							
							
						 | 
						
							2019-04-22 11:27:29 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								debf7f016d
								
							
						 | 
						
							
							
								
								ostatus: use preload objects with Object.normalize() when opportunistic
							
							
							
							
							
						 | 
						
							2019-03-23 03:05:57 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								e430a71d37
								
							
						 | 
						
							
							
								
								ostatus: fetch preloaded object in note handler for testsuite
							
							
							
							
							
						 | 
						
							2019-03-23 01:17:26 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c3d41b2b6e
								
							
						 | 
						
							
							
								
								[Credo] make all variables use snake_case
							
							
							
							
							
						 | 
						
							2019-03-13 04:26:56 +01: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 | 
						
						
							
							
							
								
							
							
						 |