| 
								
								
									 Mark Felder | c410296120 | Try sending an empty map | 2019-03-25 19:00:35 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 6f090f981b | Attempt to fix incorrect federation of default instance avatars | 2019-03-25 18:47:04 -05:00 |  | 
				
					
						| 
								
								
									 rinpatch | 15aa94f40f | Merge branch 'fix/notification-id-index' into 'develop' Add an `id desc nulls last` index to notifications
See merge request pleroma/pleroma!975 | 2019-03-25 19:07:15 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 9725c93cea | Add an id index to notifications | 2019-03-25 21:59:52 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | b028b0f97d | Merge branch 'bugfix/missing-announces' into 'develop' fix up missing announcements with preloads
See merge request pleroma/pleroma!972 | 2019-03-25 09:24:08 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 26b0c802c3 | fix up missing announcements with preloads | 2019-03-25 07:38:09 +00:00 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 rinpatch | a32bcab04b | Merge branch 'fix/eldap-warnings' into 'develop' Ignore compilation warnings for undefined module :eldap
See merge request pleroma/pleroma!956 | 2019-03-24 11:17:40 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 9b6b2395e4 | Merge branch 'feature/object-normalize-preload' into 'develop' preloaded object normalization
See merge request pleroma/pleroma!967 | 2019-03-24 02:31:56 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | a5326bb783 | Remove useless echo | 2019-03-23 10:19:13 +03:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 4a3dd86a55 | tests: fix up activity collision test | 2019-03-23 03:17:51 +00: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 | aaec91b9a1 | relay test: don't do preloading (since follow objects are activities, it's a mess) | 2019-03-23 01:23:02 +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 | 4bf327b664 | Remove postgres from documentation related jobs | 2019-03-23 01:01:01 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 8b18955a59 | Merge branch 'hotfix/null-content' into 'develop' Fix text being nullable in TwitterAPI
See merge request pleroma/pleroma!966 | 2019-03-22 21:17:00 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 1b33986bfa | Fix text being nullable in TwitterAPI | 2019-03-23 00:10:50 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 55cf85376f | Add automatic doc build and deploy | 2019-03-22 23:31:04 +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 |  | 
				
					
						| 
								
								
									 kaniini | e1a8541450 | Merge branch 'fix/use-union-all' into 'develop' Ensure fts is prefered over trigram and use union_all instead of union in user search query
See merge request pleroma/pleroma!963 | 2019-03-22 07:00:04 +00: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 |  | 
				
					
						| 
								
								
									 kaniini | 519a294d0f | Merge branch 'reports/fix-remote-reporting-emails' into 'develop' reports: fix up email generation for remote reports
See merge request pleroma/pleroma!962 | 2019-03-22 01:35:54 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 27e03a2177 | reports: fix up email generation for remote reports | 2019-03-22 01:17:14 +00:00 |  |