| 
								
								
									 William Pitcock | 72ba5b4ab7 | activitypub: user view: formatting | 2019-02-14 03:13:07 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 5307c211b8 | activitypub: user view: report totalItems=0 for follows/followers when hidden | 2019-02-14 03:10:00 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 6542b86292 | activitypub: user view: remove totalItems from user outbox (this is based on a counter in User.Info, but the counter is not reliable.) | 2019-02-14 03:02:45 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | ee2fa1a314 | activitypub: user view: remove totalInbox from user inbox view It is not really feasible to quickly calculate the totalItems value and
it shouldn't be trusted anyway. | 2019-02-14 03:01:39 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 64620d8980 | activitypub: user view: do not expose oAuth endpoints for instance users | 2019-02-14 02:41:21 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 9bd6ed975e | activitypub: user view: use route helpers instead of hardcoded URIs | 2019-02-13 19:34:43 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 29e946ace4 | activitypub: user view: add oauthRegistrationEndpoint to user profiles | 2019-02-13 19:34:43 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | db8abd958d | activitypub: user view: fix up endpoints rendering | 2019-02-13 19:34:43 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 90facd3598 | user view: add AP C2S oauth endpoints to local user profiles | 2019-02-13 19:34:43 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 379d04692c | Filter summary in keywordpolicy | 2019-02-11 21:35:40 +03:00 |  | 
				
					
						| 
								
								
									 lambda | d53e36bf1e | Revert "Merge branch 'object-creation' into 'develop'" This reverts merge request !802 | 2019-02-11 08:07:39 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 6c8d15da11 | Merge branch 'fix/credo-issues' into 'develop' Fix credo issues
See merge request pleroma/pleroma!786 | 2019-02-10 20:54:21 +00:00 |  | 
				
					
						| 
								
								
									 lain | f8388be9c6 | Do object insertion through Cachex So we don't flood our postgres logs with errors. Should also make things
slightly faster. | 2019-02-09 22:01:08 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 6a6a5b3251 | de-group alias/es | 2019-02-09 16:31:17 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | d2e4eb7c74 | Web.ActivityPub.ActivityPub: assign the Enum.filter to recipients & simplify it | 2019-02-09 14:59:21 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 60ea29dfe6 | Credo fixes: alias grouping/ordering | 2019-02-09 14:59:20 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 8bcfac93a8 | Make credo happy | 2019-02-09 14:59:20 +01:00 |  | 
				
					
						| 
								
								
									 rinpatch | 7356659273 | wow | 2019-02-08 15:12:13 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | f88dec8b33 | What idiot did that? (me) | 2019-02-08 13:16:50 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 6c21f5aa16 | Merge branch 'develop' into feature/keyword-policy | 2019-02-08 13:12:33 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 8a0b755c19 | rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy | 2019-02-08 13:12:09 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 46aa8c18a2 | Add keyword policy | 2019-02-08 12:38:24 +03:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 74518d0b60 | hide_followings was renamed to hide_followers in the FE, but never synced up in the BE This was a dirty regex replace which worked on my server | 2019-02-06 22:34:44 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | f7aedbcc55 | Merge branch 'fix/activitypub-user-view-badmap' into 'develop' Fix if clause in activity_pub user_view
See merge request pleroma/pleroma!783 | 2019-02-06 17:47:58 +00:00 |  | 
				
					
						| 
								
								
									 href | f753043ce0 | Fix if clause in activity_pub user_view | 2019-02-06 18:42:19 +01:00 |  | 
				
					
						| 
								
								
									 kaniini | d120aa63f0 | Merge branch 'fix-dm-index' into 'develop' Massage index until it actually does the stuff we want.
See merge request pleroma/pleroma!772 | 2019-02-05 20:27:31 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 681ba1e52f | Merge branch 'feature/ap-c2s-whoami' into 'develop' activitypub: c2s: add /api/ap/whoami endpoint for andstatus
See merge request pleroma/pleroma!773 | 2019-02-05 20:26:31 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | eb2b1960e0 | Merge branch 'feature/split-hide-network-v2' into 'develop' Split hide_network into hide_followers & hide_followings (fixed)
See merge request pleroma/pleroma!765 | 2019-02-05 18:56:59 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | e71ab5a10f | activitypub: transmogrifier: fix bare tags | 2019-02-05 00:43:28 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | db1165f70f | activitypub: c2s: add /api/ap/whoami endpoint for andstatus | 2019-02-04 22:58:29 +00:00 |  | 
				
					
						| 
								
								
									 lain | f3c8b02d65 | Massage index until it actually does the stuff we want. Also makes the index a lot smoler. | 2019-02-04 23:47:29 +01:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 7d110be119 | activitypub: mrf: tag policy: fix force-unlisted and sandbox actions | 2019-02-04 19:03:54 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 64a3993425 | activitypub: mrf: tag policy: add support for subscription control | 2019-02-04 17:48:48 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | ff2c28fd6d | activitypub: mrf: tag policy: refactor the filtering hook a bit | 2019-02-04 17:06:37 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 9a69f08e86 | activitypub: mrf: tag policy: add support for processing follow requests | 2019-02-04 17:04:05 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 084bb8ccd5 | activitypub: mrf: tag policy: implement force-unlisted and sandbox | 2019-02-04 17:04:05 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 88e32a32ce | mrf: add initial MRF.TagPolicy engine | 2019-02-04 17:04:05 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 89762ad230 | Merge branch 'feature/hellthread-filter-improvements' into 'develop' Improve hellthread filter
Closes #584
See merge request pleroma/pleroma!766 | 2019-02-04 12:36:50 +00:00 |  | 
				
					
						| 
								
								
									 Karen Konou | 58262a8b8a | removed a debug thingy | 2019-02-04 11:22:25 +00:00 |  | 
				
					
						| 
								
								
									 Karen Konou | 4430641349 | squished a bug | 2019-02-04 12:09:00 +01:00 |  | 
				
					
						| 
								
								
									 Karen Konou | 3cf046babb | actually commited the changes | 2019-02-04 10:23:43 +01:00 |  | 
				
					
						| 
								
								
									 Karen Konou | 63a4f4b7be | fixed Map,put arguments, updated nomenclature | 2019-02-04 10:23:07 +01:00 |  | 
				
					
						| 
								
								
									 Karen Konou | 583c4e0f17 | more tweaks, fixed silly mistakes... | 2019-02-03 23:56:20 +01:00 |  | 
				
					
						| 
								
								
									 Karen Konou | e10cda7541 | implemented tweaks | 2019-02-03 22:46:06 +01:00 |  | 
				
					
						| 
								
								
									 Karen Konou | 531507a635 | fixed things | 2019-02-03 20:45:32 +01:00 |  | 
				
					
						| 
								
								
									 Karen Konou | 10130fa7d6 | made toggleable, added docs | 2019-02-03 20:27:28 +01:00 |  | 
				
					
						| 
								
								
									 Karen Konou | 0ef0ae35ab | added optional delist feature | 2019-02-03 20:12:23 +01:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 16ce129e38 | Split hide_network into hide_followers & hide_followings (fixed) | 2019-02-03 21:55:04 +03:00 |  | 
				
					
						| 
								
								
									 lambda | 69a38644bc | Merge branch '589-fix-cache' into 'develop' Resolve "Update object cache on favs/boosts"
Closes #589
See merge request pleroma/pleroma!764 | 2019-02-03 18:19:40 +00:00 |  | 
				
					
						| 
								
								
									 lain | 505a084058 | Still do caching in tests. | 2019-02-03 18:28:14 +01:00 |  |