| 
								
								
									 Aaron Tinio | a13d449b24 | Add tests for fallback routes | 2019-05-22 05:39:29 +08:00 |  | 
				
					
						| 
								
								
									 William Pitcock | f446f94290 | add changelog entry for object pruning | 2019-05-21 21:38:56 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 16b260fb19 | add mix task to prune the object database using a configured retention period | 2019-05-21 21:38:56 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 73df9d690d | object: fetcher: add support for reinjecting pruned objects | 2019-05-21 21:38:56 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | c2b0b82e6a | object: add Object.prune() | 2019-05-21 21:38:56 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 63b0b7190c | MastoAPI: Add GET /api/v1/polls/:id | 2019-05-21 20:40:35 +03:00 |  | 
				
					
						| 
								
								
									 lain | d378b342ba | MongooseIM: Add documentation. | 2019-05-21 18:57:36 +02:00 |  | 
				
					
						| 
								
								
									 rinpatch | ff61d34502 | Accept question objects for conversations | 2019-05-21 17:33:54 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 5f67c26baf | Accept strings in expires_in because sasuga javascript | 2019-05-21 17:30:51 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 0407ffe75f | Change validation error status codes to be more appropriate | 2019-05-21 17:12:38 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | ee68244141 | Do not stream out poll replies | 2019-05-21 16:58:15 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | d7c4d029c8 | Restrict poll replies when fetching activiites for context | 2019-05-21 14:35:20 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | f28747858b | Actual vote count in poll view | 2019-05-21 14:27:09 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | a53d062730 | Fix posting non-polls from mastofe | 2019-05-21 14:19:03 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | aafe30d94e | Handle poll votes | 2019-05-21 14:12:10 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 3f96b3e4b8 | Enforce poll limits and add error handling for MastodonAPI's post endpoint | 2019-05-21 10:54:20 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 76a7429bef | Add poll limits to /api/v1/instance and initial state | 2019-05-21 09:13:10 +03:00 |  | 
				
					
						| 
								
								
									 kaniini | be6b57193a | Merge branch 'trivial/increase-hackney-timeouts' into 'develop' http: bump connection timeout to 10 seconds
See merge request pleroma/pleroma!1183 | 2019-05-21 05:15:29 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | c972d0bb14 | http: bump connection timeout to 10 seconds | 2019-05-21 04:59:15 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 94caca924d | Merge branch 'fix/prometheus-ecto-error-when-not-configured' into 'develop' Fix prometheus-ecto error when not configured
Closes #917
See merge request pleroma/pleroma!1180 | 2019-05-21 01:36:06 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | d4847b17ca | Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop' Add virtual :thread_muted? field
Closes #901
See merge request pleroma/pleroma!1178 | 2019-05-20 23:30:19 +00:00 |  | 
				
					
						| 
								
								
									 Aaron Tinio | f96e9b28bb | Fix prometheus-ecto error when not configured | 2019-05-21 07:30:18 +08:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 75c7bb9289 | Additional reserved usernames | 2019-05-20 17:18:59 -05:00 |  | 
				
					
						| 
								
								
									 kaniini | 943d1b2f26 | Merge branch 'feature/user-configurable-mascot' into 'develop' Feature: user configurable mascot
See merge request pleroma/pleroma!1177 | 2019-05-20 18:17:42 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 643b563478 | Merge branch 'doc/mrf-simple-report-removal' into 'develop' Document MRF.Simple :report_removal
See merge request pleroma/pleroma!1179 | 2019-05-20 18:16:29 +00:00 |  | 
				
					
						| 
								
								
									 Aaron Tinio | 5aa107d912 | Document MRF.Simple :report_removal | 2019-05-21 00:59:12 +08:00 |  | 
				
					
						| 
								
								
									 Aaron Tinio | eb02edcad9 | Add virtual :thread_muted? field that may be set when fetching activities | 2019-05-21 00:35:46 +08:00 |  | 
				
					
						| 
								
								
									 Sadposter | daeae8e2e7 | Move default mascot configuration to config/ | 2019-05-20 16:12:55 +01:00 |  | 
				
					
						| 
								
								
									 Sadposter | d835810610 | Add changelog entry for mascot config | 2019-05-20 14:19:42 +01:00 |  | 
				
					
						| 
								
								
									 Sadposter | 3d0d9e7a56 | Use string map for default mascot | 2019-05-20 13:10:04 +01:00 |  | 
				
					
						| 
								
								
									 Sadposter | dc916ba15f | Format mascot tests | 2019-05-20 12:58:17 +01:00 |  | 
				
					
						| 
								
								
									 Sadposter | e81f0fc6d4 | Add mascot get/set tests | 2019-05-20 12:58:06 +01:00 |  | 
				
					
						| 
								
								
									 Sadposter | 54e9cb5c2d | Add API endpoints for a custom user mascot | 2019-05-20 12:39:23 +01:00 |  | 
				
					
						| 
								
								
									 kaniini | b30b51c3b7 | Merge branch 'feature/mrf-simple-report-filtering' into 'develop' Add report filtering to MRF.SimplePolicy
Closes #610
See merge request pleroma/pleroma!1176 | 2019-05-19 22:30:10 +00:00 |  | 
				
					
						| 
								
								
									 Aaron Tinio | 2375e9a95b | Add report filtering to MRF.SimplePolicy | 2019-05-20 06:02:50 +08:00 |  | 
				
					
						| 
								
								
									 rinpatch | 6430cb1bf7 | Restrict poll replies from fetch queries by default | 2019-05-19 17:44:18 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 1d90f9b969 | Remove tags/mentions/rich text from poll options because Mastodon and add custom emoji | 2019-05-19 17:06:44 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 5ece901af3 | Resolve merge conflicts and remove IO.inspects | 2019-05-18 13:37:38 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | fd920c8973 | Mastodon API: Add support for posting polls | 2019-05-18 13:29:28 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 8e9a764dfc | Merge branch 'feature/mrf-always-nsfw' into 'develop' suppress link previews from posts marked sensitive
Closes #865
See merge request pleroma/pleroma!1173 | 2019-05-18 07:13:18 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn | cd7a6a25d2 | Merge branch 'feature/http-ua-header-always' into 'develop' http: request builder: send user-agent when making requests
Closes #546
See merge request pleroma/pleroma!1174 | 2019-05-18 04:42:11 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | c4a55e167a | add Changelog entry | 2019-05-17 23:00:14 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | dc08159538 | also suppress link previews from posts marked #nsfw | 2019-05-17 22:13:24 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | c234ce546a | add CHANGELOG entry | 2019-05-17 20:31:39 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 290f5b2cfe | config: make sending the user agent configurable, disable sending the user agent in tests | 2019-05-17 20:28:58 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | d3b8cd342f | http: request builder: send user-agent when making requests | 2019-05-17 19:04:17 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 0da1233e8e | rich media: suppress link previews if post is marked as sensitive | 2019-05-17 18:49:43 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 78588dbd80 | mrf: simple policy: mark all posts instead of posts with media as sensitive if they match media_nsfw | 2019-05-17 18:49:10 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | d2dacadb6b | Merge branch 'rum-index' into 'develop' Search: Use RUM index.
See merge request pleroma/pleroma!1136 | 2019-05-17 16:35:19 +00:00 |  | 
				
					
						| 
								
								
									 lain | 075eecec90 | Linting. | 2019-05-17 18:32:30 +02:00 |  |