kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								bc14c98de1 
								
							 
						 
						
							
							
								
								Merge branch 'features/s3-uploader-digital-ocean' into 'develop'  
							
							... 
							
							
							
							add overriding truncated_namespace condition for truncating paths for digital ocean
See merge request pleroma/pleroma!969  
							
						 
						
							2019-03-25 02:25:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								63ffa4842c 
								
							 
						 
						
							
							
								
								Merge branch 'fix/mastoapi-liked' into 'develop'  
							
							... 
							
							
							
							Serve non-public activities in /api/v1/favourites
Closes  #648 
See merge request pleroma/pleroma!970  
							
						 
						
							2019-03-25 02:24:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								a7f58b3c13 
								
							 
						 
						
							
							
								
								Serve non-public activities in /api/v1/favourites  
							
							... 
							
							
							
							Fixes  #648  
						
							2019-03-25 02:15:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Austin Lanari 
								
							 
						 
						
							
							
							
							
								
							
							
								6c96d68f77 
								
							 
						 
						
							
							
								
								add overriding truncated_namespace condition for truncating paths for digital ocean  
							
							
							
						 
						
							2019-03-24 11:32:09 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								750de7d842 
								
							 
						 
						
							
							
								
								Merge branch 'features/mrf-keyword-nil-summary' into 'develop'  
							
							... 
							
							
							
							mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
See merge request pleroma/pleroma!968  
							
						 
						
							2019-03-24 15:02:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								eab9425cc4 
								
							 
						 
						
							
							
								
								mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil  
							
							
							
						 
						
							2019-03-24 15:47:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								4aa699271c 
								
							 
						 
						
							
							
								
								activity: use left join instead of inner join when fetching activities that may or may not have a child object  
							
							
							
						 
						
							2019-03-23 03:17:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								332dc1371b 
								
							 
						 
						
							
							
								
								user: use preloads when deleting accounts  
							
							
							
						 
						
							2019-03-23 03:06:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								debf7f016d 
								
							 
						 
						
							
							
								
								ostatus: use preload objects with Object.normalize() when opportunistic  
							
							
							
						 
						
							2019-03-23 03:05:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								3c2350cbee 
								
							 
						 
						
							
							
								
								object: downgrade normalize warning to debug severity  
							
							
							
						 
						
							2019-03-23 03:05:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								8c70156157 
								
							 
						 
						
							
							
								
								activitypub: object view: use preloaded object when possible  
							
							
							
						 
						
							2019-03-23 03:05:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f9d5c13b21 
								
							 
						 
						
							
							
								
								activity: add get_by_ap_id_with_object()  
							
							
							
						 
						
							2019-03-23 03:05:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ce47eb8b29 
								
							 
						 
						
							
							
								
								activitypub: when fetching objects, use the preloaded object from the synthesized activity  
							
							
							
						 
						
							2019-03-23 03:05:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								aabcecb269 
								
							 
						 
						
							
							
								
								notification: formatting  
							
							
							
						 
						
							2019-03-23 02:30:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								07cdd9ed02 
								
							 
						 
						
							
							
								
								streamer: use the preloaded object if possible  
							
							
							
						 
						
							2019-03-23 02:29:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c62220c500 
								
							 
						 
						
							
							
								
								rich media: helpers: only crawl Create activities  
							
							
							
						 
						
							2019-03-23 02:28:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								9a06d9f6e8 
								
							 
						 
						
							
							
								
								notification: preload child objects  
							
							
							
						 
						
							2019-03-23 02:28:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								4cedf45423 
								
							 
						 
						
							
							
								
								relay: use preloaded object since we always have it  
							
							
							
						 
						
							2019-03-23 02:28:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e430a71d37 
								
							 
						 
						
							
							
								
								ostatus: fetch preloaded object in note handler for testsuite  
							
							
							
						 
						
							2019-03-23 01:17:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								73efe95368 
								
							 
						 
						
							
							
								
								activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)  
							
							
							
						 
						
							2019-03-23 01:09:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ba7299fc87 
								
							 
						 
						
							
							
								
								activitypub: add missing with_preloaded_object()  
							
							
							
						 
						
							2019-03-23 00:53:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e4307cadc8 
								
							 
						 
						
							
							
								
								activitypub: splice in the child object if we have one  
							
							
							
						 
						
							2019-03-23 00:40:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								a6973a668e 
								
							 
						 
						
							
							
								
								formatting  
							
							
							
						 
						
							2019-03-23 00:28:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								59518cbcd8 
								
							 
						 
						
							
							
								
								activity: fix credo nitpick  
							
							
							
						 
						
							2019-03-23 00:26:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								b3bf523c09 
								
							 
						 
						
							
							
								
								rich media: use optimized Object.normalize()  
							
							
							
						 
						
							2019-03-23 00:22:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e75e43b949 
								
							 
						 
						
							
							
								
								common api: use the optimized Object.normalize whenever possible  
							
							
							
						 
						
							2019-03-23 00:22:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								9aea7cc224 
								
							 
						 
						
							
							
								
								activitypub: preload child objects when fetching timelines  
							
							
							
						 
						
							2019-03-23 00:10:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								092cedede5 
								
							 
						 
						
							
							
								
								activity: add with_preloaded_object() convenience  
							
							
							
						 
						
							2019-03-23 00:09:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								62bccddde0 
								
							 
						 
						
							
							
								
								object: add support for preloading objects when walking an activity graph in normal form  
							
							
							
						 
						
							2019-03-22 23:51:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								1b33986bfa 
								
							 
						 
						
							
							
								
								Fix text being nullable in TwitterAPI  
							
							
							
						 
						
							2019-03-23 00:10:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								fee360e581 
								
							 
						 
						
							
							
								
								Merge branch 'safe-mentions' into 'develop'  
							
							... 
							
							
							
							NodeInfo: Return safe_dm_mentions feature flag.
See merge request pleroma/pleroma!964  
							
						 
						
							2019-03-22 11:03:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e2afce34b6 
								
							 
						 
						
							
							
								
								NodeInfo: Return safe_dm_mentions feature flag.  
							
							
							
						 
						
							2019-03-22 11:57:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								3229c7a1d6 
								
							 
						 
						
							
							
								
								Ensure fts is prefered over trigram and use union_all instead of union in user search query  
							
							
							
						 
						
							2019-03-22 08:39:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								27e03a2177 
								
							 
						 
						
							
							
								
								reports: fix up email generation for remote reports  
							
							
							
						 
						
							2019-03-22 01:17:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								1c3d3d0c2b 
								
							 
						 
						
							
							
								
								Merge branch 'safe-mentions' into 'develop'  
							
							... 
							
							
							
							Add safe dm mode option.
See merge request pleroma/pleroma!958  
							
						 
						
							2019-03-22 00:50:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								3cc2554fa3 
								
							 
						 
						
							
							
								
								mastodon api: add conversation_id extension (ref  #674 )  
							
							
							
						 
						
							2019-03-21 23:25:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								fea3696799 
								
							 
						 
						
							
							
								
								common api: move context functions from twitterapi  
							
							
							
						 
						
							2019-03-21 23:24:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								bf8b29e080 
								
							 
						 
						
							
							
								
								Merge branch 'feature/move-search-to-db' into 'develop'  
							
							... 
							
							
							
							Move gluing search results from application to database and get mutuals a higher score multiplier
See merge request pleroma/pleroma!960  
							
						 
						
							2019-03-21 21:41:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								88096c65a5 
								
							 
						 
						
							
							
								
								Move gluing search results from application to database and get mutuals  
							
							... 
							
							
							
							a higher score multiplier 
							
						 
						
							2019-03-21 23:16:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Quentin Rameau 
								
							 
						 
						
							
							
							
							
								
							
							
								80bc9ed2ba 
								
							 
						 
						
							
							
								
								Add a gopher url port config option  
							
							... 
							
							
							
							This lets the user advertise a different port in the gopher urls,
for example listening locally on port 7070 but telling clients to
connect to the regular port 70. 
							
						 
						
							2019-03-21 19:59:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								b92a16aa00 
								
							 
						 
						
							
							
								
								Merge branch 'ecto-3-migration' into 'develop'  
							
							... 
							
							
							
							Ecto 3.0.7 (ecto_sql 3.0.5) migration
See merge request pleroma/pleroma!957  
							
						 
						
							2019-03-21 16:24:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bf27190f7f 
								
							 
						 
						
							
							
								
								UtilController: Return state of safe dm mentions.  
							
							
							
						 
						
							2019-03-21 16:20:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8468f3f6d4 
								
							 
						 
						
							
							
								
								Add safe dm mode option.  
							
							
							
						 
						
							2019-03-20 21:09:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								19a19bdd81 
								
							 
						 
						
							
							
								
								Fix migration timestamp type  
							
							
							
						 
						
							2019-03-20 16:04:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9a7b817c9a 
								
							 
						 
						
							
							
								
								Ecto 3.0.5 migration  
							
							... 
							
							
							
							kms 
							
						 
						
							2019-03-20 15:59:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								7ac9fff437 
								
							 
						 
						
							
							
								
								Format  
							
							
							
						 
						
							2019-03-20 01:40:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								ed8a2935f5 
								
							 
						 
						
							
							
								
								Use ILIKE to search users  
							
							
							
						 
						
							2019-03-20 01:37:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								1685e4258f 
								
							 
						 
						
							
							
								
								transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection  
							
							
							
						 
						
							2019-03-19 18:39:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								67ff8d9311 
								
							 
						 
						
							
							
								
								user: properly cope with actors which do not declare a followers collection  
							
							
							
						 
						
							2019-03-19 18:23:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								cd055983c3 
								
							 
						 
						
							
							
								
								transmogrifier: when determining followers collection URI, we may need to fetch the actor  
							
							
							
						 
						
							2019-03-19 18:04:57 +00:00