| 
								
								
									 lain | ed4f9f6a29 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static-fe-prioritize-json | 2020-07-06 12:07:56 +02:00 |  | 
				
					
						| 
								
								
									 lain | 208baf157a | ActivityPub: Add new 'capabilities' to user. | 2020-07-06 11:38:40 +02:00 |  | 
				
					
						| 
								
								
									 lain | 74b88c0a8b | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information | 2020-07-06 11:27:06 +02:00 |  | 
				
					
						| 
								
								
									 rinpatch | 69f0b286f7 | Merge branch '1915-dont-filter-announce-notifications' into 'develop' Streamer: Don't filter out announce notifications.
Closes #1915
See merge request pleroma/pleroma!2719 | 2020-07-06 09:21:03 +00:00 |  | 
				
					
						| 
								
								
									 lain | a2cabb99ca | Merge branch 'filter-tesla-config' into 'develop' Filter tesla config
See merge request pleroma/pleroma!2722 | 2020-07-06 09:20:10 +00:00 |  | 
				
					
						| 
								
								
									 lain | 58da575935 | Changelog: Document description limits. | 2020-07-06 11:18:01 +02:00 |  | 
				
					
						| 
								
								
									 lain | 729506c56a | Docs: document instance differences | 2020-07-06 11:16:58 +02:00 |  | 
				
					
						| 
								
								
									 lain | cc8b4e48d9 | InstanceView: Add chat limit, description limit | 2020-07-06 11:12:37 +02:00 |  | 
				
					
						| 
								
								
									 lain | 2e21ae1b6d | Docs: Add description limits to cheat sheet | 2020-07-06 11:08:53 +02:00 |  | 
				
					
						| 
								
								
									 lain | af7720237b | Upload: Restrict description length | 2020-07-06 11:08:13 +02:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 818f3c2393 | test fixes | 2020-07-06 09:30:43 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 028a241b7d | tests fixes | 2020-07-06 09:30:42 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | da509487b2 | adding benchmarks in new format | 2020-07-06 09:30:42 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 20c27bef40 | renaming back and reject nil on create | 2020-07-06 09:30:42 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 52ff75413a | Apply suggestion to test/notification_test.exs | 2020-07-06 09:30:42 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 086a260c04 | Apply suggestion to test/notification_test.exs | 2020-07-06 09:30:42 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 771748db1f | Apply suggestion to lib/pleroma/filter.ex | 2020-07-06 09:30:41 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 6558f31cda | don't filter notifications for follow and move types | 2020-07-06 09:30:41 +03:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | 8277b29790 | Restrict thread statuses that contain user's irreversible filters | 2020-07-06 09:30:39 +03:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | 5af1bf443d | Skip notifications for statuses that contain an irreversible filtered word | 2020-07-06 09:28:22 +03:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | 4a8c26654e | Restrict statuses that contain user's irreversible filters | 2020-07-06 09:28:21 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 465ddcfd20 | migration to delete migrated tesla setting | 2020-07-06 09:12:29 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 480dfafa83 | don't save tesla settings into db | 2020-07-06 08:48:20 +03:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | fc1f34b851 | Delete activity before sending response to client | 2020-07-06 00:01:25 +03:00 |  | 
				
					
						| 
								
								
									 Mark Felder | af612bd006 | Ensure all CSP parameters for remote hosts have a scheme | 2020-07-05 10:11:43 -05:00 |  | 
				
					
						| 
								
								
									 lain | cf56655614 | Streamer: Don't filter out announce notifications. | 2020-07-04 17:11:37 +02:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 991bd78dda | Document the Captcha CSP fix | 2020-07-03 17:19:43 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | e9a28078ad | Rename function and clarify that CSP is only strict with MediaProxy enabled | 2020-07-03 17:18:22 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | eaa59daa4c | Add Captcha endpoint to CSP headers when MediaProxy is enabled. Our CSP rules are lax when MediaProxy enabled, but lenient otherwise.
This fixes broken captcha on instances not using MediaProxy. | 2020-07-03 17:06:20 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | e8710a3f87 | Revert "Document Oban update" This reverts commit bc956d0c41. | 2020-07-03 13:49:02 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | bc956d0c41 | Document Oban update | 2020-07-03 11:29:17 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 4d3d867f10 | Update Oban to 2.0-rc3 | 2020-07-03 10:37:07 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 4695bdd81b | Merge branch 'develop' into issue/1790-updated-oban | 2020-07-03 10:36:41 -05:00 |  | 
				
					
						| 
								
								
									 lain | c2a052a346 | Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop' MastoAPI 2.9.0: status text on deletion
See merge request pleroma/pleroma!2690 | 2020-07-03 15:06:33 +00:00 |  | 
				
					
						| 
								
								
									 lain | 9a27ef47f1 | Merge branch '1912-leading-trailing-space-search' into 'develop' SearchController: Trim query.
Closes #1912
See merge request pleroma/pleroma!2717 | 2020-07-03 14:59:12 +00:00 |  | 
				
					
						| 
								
								
									 lain | cbf2fe9649 | Update changelog | 2020-07-03 16:46:11 +02:00 |  | 
				
					
						| 
								
								
									 lain | d3efb50262 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text | 2020-07-03 16:44:31 +02:00 |  | 
				
					
						| 
								
								
									 lain | 19fbfbb767 | Merge branch '1892-exclude-bots-from-search-results' into 'develop' [#1892] Exclusion of service actors from user search results
Closes #1892
See merge request pleroma/pleroma!2708 | 2020-07-03 14:38:22 +00:00 |  | 
				
					
						| 
								
								
									 lain | 945e75c8e8 | SearchController: Trim query. | 2020-07-03 16:36:55 +02:00 |  | 
				
					
						| 
								
								
									 lain | ef4c16f6f1 | Update changelog | 2020-07-03 15:59:42 +02:00 |  | 
				
					
						| 
								
								
									 lain | 01695716c8 | Docs: Document accepts_chat_messagessetting. | 2020-07-03 15:55:18 +02:00 |  | 
				
					
						| 
								
								
									 lain | e3b5559780 | AccountController: Make setting accepts_chat_messages possible. | 2020-07-03 15:54:25 +02:00 |  | 
				
					
						| 
								
								
									 lain | 4a7b89e372 | ChatMessageValidator: Additional validation. | 2020-07-03 15:13:27 +02:00 |  | 
				
					
						| 
								
								
									 lain | 3ca9af1f9f | Account Schema: Add accepts_chat_messages | 2020-07-03 14:31:04 +02:00 |  | 
				
					
						| 
								
								
									 lain | b374fd622b | Docs: Document the added accepts_chat_messagesuser property. | 2020-07-03 14:24:54 +02:00 |  | 
				
					
						| 
								
								
									 lain | 5c0bf4c472 | ActivityPub: Ingest information about chat acceptance. | 2020-07-03 13:58:34 +02:00 |  | 
				
					
						| 
								
								
									 lain | 8289ec67a8 | Litepub: Add acceptsChatMessages to schema. | 2020-07-03 13:39:21 +02:00 |  | 
				
					
						| 
								
								
									 lain | 26a7cc3f00 | UserView: Add acceptsChatMessages field | 2020-07-03 13:38:59 +02:00 |  | 
				
					
						| 
								
								
									 lain | db76c26469 | AccountViewTest: Fix test. | 2020-07-03 13:24:16 +02:00 |  | 
				
					
						| 
								
								
									 lain | 37fdb05058 | User, Migration: Change accepts_chat_messagesto be nullableThis is to model the ambiguous state of most users. | 2020-07-03 13:12:23 +02:00 |  |