Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								ee22fff5ac 
								
							 
						 
						
							
							
								
								remove deprecated PleromaFE configuration  
							
							
							
						 
						
							2019-05-15 15:29:59 +05:45 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								1caa6331ea 
								
							 
						 
						
							
							
								
								Group def perform() together to fix the build  
							
							
							
						 
						
							2019-05-14 12:33:03 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								fa4bd898f1 
								
							 
						 
						
							
							
								
								Merge branch 'fix/gopher' into 'develop'  
							
							... 
							
							
							
							gopher: fix rendering of post content (closes  #895 )
Closes  #895 
See merge request pleroma/pleroma!1150  
							
						 
						
							2019-05-14 15:41:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								51325fd60c 
								
							 
						 
						
							
							
								
								gopher: fix rendering of post content ( closes   #895 )  
							
							
							
						 
						
							2019-05-14 15:35:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								692919c7d2 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/use-job-queue-everywhere' into 'develop'  
							
							... 
							
							
							
							use job queue everywhere
Closes  #862 
See merge request pleroma/pleroma!1142  
							
						 
						
							2019-05-14 15:27:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ac3a3abf6b 
								
							 
						 
						
							
							
								
								clean up follow/block imports a little  
							
							
							
						 
						
							2019-05-14 15:07:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								dfd031c26a 
								
							 
						 
						
							
							
								
								Merge branch 'fix/pleroma-config-get-when-value-is-false' into 'develop'  
							
							... 
							
							
							
							Fix Pleroma.Config.get!/1 raising an error when value is false
See merge request pleroma/pleroma!1148  
							
						 
						
							2019-05-14 14:58:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								52297920e7 
								
							 
						 
						
							
							
								
								Refactoring  oauth response.  
							
							
							
						 
						
							2019-05-14 14:49:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								b92c004ea8 
								
							 
						 
						
							
							
								
								Reuse query from User.restrict_deactivated/1  
							
							
							
						 
						
							2019-05-14 18:29:10 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								5e2b491276 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/disable-account  
							
							
							
						 
						
							2019-05-14 18:15:56 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								a18b2c0b12 
								
							 
						 
						
							
							
								
								Fix Pleroma.Config.get!/1 raising an error when value is false  
							
							
							
						 
						
							2019-05-14 06:40:59 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								bbacdf2352 
								
							 
						 
						
							
							
								
								Bump Mastodon API level  
							
							
							
						 
						
							2019-05-13 15:52:16 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								498bfdf403 
								
							 
						 
						
							
							
								
								Switch to Jason over Poison  
							
							
							
						 
						
							2019-05-13 15:37:38 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								69a9e0563c 
								
							 
						 
						
							
							
								
								user: migrate follow/blocks import to job queue  
							
							
							
						 
						
							2019-05-13 19:36:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								57d11ac9db 
								
							 
						 
						
							
							
								
								activitypub: move post rich media fetching to job queue  
							
							
							
						 
						
							2019-05-13 19:36:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								32d4630c9c 
								
							 
						 
						
							
							
								
								user: move initial post fetching to job queue  
							
							
							
						 
						
							2019-05-13 19:36:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								b14a314ce7 
								
							 
						 
						
							
							
								
								Merge branch 'feature/federator-behaviours' into 'develop'  
							
							... 
							
							
							
							federator modularization (outgoing)
See merge request pleroma/pleroma!1140  
							
						 
						
							2019-05-13 18:58:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								a2be420f94 
								
							 
						 
						
							
							
								
								differences_in_mastoapi_responses.md: fullname & bio are optionnal  
							
							... 
							
							
							
							[ci skip] 
							
						 
						
							2019-05-13 18:35:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								7701a4c841 
								
							 
						 
						
							
							
								
								Make irreversible field default to false in filters  
							
							
							
						 
						
							2019-05-14 00:13:15 +05:45 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								44b182732e 
								
							 
						 
						
							
							
								
								nodeinfo: gather supported protocol names from federation modules  
							
							
							
						 
						
							2019-05-12 19:15:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								28f7f4c6de 
								
							 
						 
						
							
							
								
								webfinger: build the response based on enabled federation modules  
							
							
							
						 
						
							2019-05-12 19:05:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								55fa4b812a 
								
							 
						 
						
							
							
								
								federator: websub removal  
							
							
							
						 
						
							2019-05-12 05:04:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c23276a59a 
								
							 
						 
						
							
							
								
								activitypub: publisher: fixups  
							
							
							
						 
						
							2019-05-12 05:04:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								fedaca15a3 
								
							 
						 
						
							
							
								
								websub: adapt to work as a federator publishing module  
							
							
							
						 
						
							2019-05-12 05:04:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								179293e51c 
								
							 
						 
						
							
							
								
								salmon: refactor to work as a federator publishing module  
							
							
							
						 
						
							2019-05-12 05:04:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2aee62a456 
								
							 
						 
						
							
							
								
								federator: publisher: only attempt publishing if we know the activity is representable  
							
							
							
						 
						
							2019-05-12 05:04:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								69158f1065 
								
							 
						 
						
							
							
								
								ostatus: only as:Public activities are representable  
							
							
							
						 
						
							2019-05-12 05:04:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								85377c0b67 
								
							 
						 
						
							
							
								
								federator: move activitypub relaying to the AP publisher module  
							
							
							
						 
						
							2019-05-12 05:04:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								676752bb83 
								
							 
						 
						
							
							
								
								federator: hook up Publisher.publish()  
							
							
							
						 
						
							2019-05-12 05:04:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f7a6a37c4e 
								
							 
						 
						
							
							
								
								federator: remove no longer used :publish_single_ap  
							
							
							
						 
						
							2019-05-12 05:04:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								10695a28d2 
								
							 
						 
						
							
							
								
								federator: publisher: add publish() wrapper  
							
							
							
						 
						
							2019-05-12 05:04:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								0afc8d7856 
								
							 
						 
						
							
							
								
								federator: publisher: integrate job queue, simplify publish_one logic  
							
							
							
						 
						
							2019-05-12 05:04:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ef1f9e8d4e 
								
							 
						 
						
							
							
								
								activitypub: split out outgoing federation into a federation module  
							
							
							
						 
						
							2019-05-12 05:04:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e7d292f80e 
								
							 
						 
						
							
							
								
								federator: add publisher module defining a contract for publishing behaviours  
							
							
							
						 
						
							2019-05-12 03:08:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								b9f84a382a 
								
							 
						 
						
							
							
								
								Normalize the object only after ensuring the activity type is Create  
							
							
							
						 
						
							2019-05-12 03:01:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								131f883207 
								
							 
						 
						
							
							
								
								Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop'  
							
							... 
							
							
							
							Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
See merge request pleroma/pleroma!1129  
							
						 
						
							2019-05-11 16:52:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								f01f995816 
								
							 
						 
						
							
							
								
								make url uniform in admin api  
							
							
							
						 
						
							2019-05-11 14:46:00 +05:45 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								c953ae8c3d 
								
							 
						 
						
							
							
								
								Initial bundle of basic AdminFE  
							
							... 
							
							
							
							Due to CSP headers we only allow connecting to self. If you want to
host AdminFE on a separate domain without CSP headers you will be able
to connect to any public Pleroma host. 
							
						 
						
							2019-05-11 01:34:17 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								2a54e8c1f5 
								
							 
						 
						
							
							
								
								Use "repeated" instead of "retweeted" for repeated statuses in Twitter API  
							
							... 
							
							
							
							This makes it consistent with the language used in Pleroma FE (at least
in English).
Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533  
							
						 
						
							2019-05-09 19:58:34 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e4523c3010 
								
							 
						 
						
							
							
								
								Fix get_in_reply_to in OStatus' activity representer depending on embedded objects  
							
							
							
						 
						
							2019-05-09 22:27:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								bfeb33e951 
								
							 
						 
						
							
							
								
								Merge develop  
							
							... 
							
							
							
							Merge conflict in lib/pleroma/activity.ex 
							
						 
						
							2019-05-08 14:34:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								799e1f48b5 
								
							 
						 
						
							
							
								
								Refactoring functions for dealing with oauth scopes.  
							
							
							
						 
						
							2019-05-08 10:52:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								14deed7f7d 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop'  
							
							... 
							
							
							
							Optimize bookmarks by preloading them with activities
Closes  #861 
See merge request pleroma/pleroma!1121  
							
						 
						
							2019-05-07 19:37:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								d64c3b604e 
								
							 
						 
						
							
							
								
								twitterapi: use order constraint to force descending order  
							
							
							
						 
						
							2019-05-07 19:33:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								6020ff3fb6 
								
							 
						 
						
							
							
								
								activitypub: add optional order constraint to timeline query builder  
							
							
							
						 
						
							2019-05-07 19:33:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4c5125dedc 
								
							 
						 
						
							
							
								
								Remove bookmarks assoc and add a fake bookmark assoc instead  
							
							
							
						 
						
							2019-05-07 19:33:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								be067ec2ab 
								
							 
						 
						
							
							
								
								Use with_preloaded_bookmark in create_by_object_ap_id_with_object  
							
							
							
						 
						
							2019-05-07 19:33:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								3a7c14645e 
								
							 
						 
						
							
							
								
								- Actually use preloaded bookmarks in views  
							
							... 
							
							
							
							- Preload bookmarks in bookmark timeline
- Rework bookmark preload tests 
							
						 
						
							2019-05-07 19:33:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f841eb7cdb 
								
							 
						 
						
							
							
								
								Preload bookmarks wherever the object is preloaded  
							
							
							
						 
						
							2019-05-07 19:33:22 +00:00