| 
								
								
									 Haelwenn | d81acb5f62 | Merge branch 'description-limits' into 'develop' Add limits to image descriptions
See merge request pleroma/pleroma!2724 | 2020-07-07 03:00:52 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn | 2a323d3797 | Merge branch '1507-static-fe-prioritize-json' into 'develop' StaticFE: Prioritize json in requests.
Closes #1507
See merge request pleroma/pleroma!2695 | 2020-07-07 00:04:24 +00:00 |  | 
				
					
						| 
								
								
									 Mark Felder | da4029391d | IO list, not concatenation | 2020-07-06 11:28:08 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 65843d92c4 | Simplify the logic | 2020-07-06 10:59:41 -05:00 |  | 
				
					
						| 
								
								
									 lain | a6a12b241f | FollowValidator: Add basic validation. | 2020-07-06 15:57:19 +02:00 |  | 
				
					
						| 
								
								
									 lain | 4e3b3998ad | BlockValidation test: Rename. | 2020-07-06 15:44:35 +02:00 |  | 
				
					
						| 
								
								
									 lain | eb87430803 | ObjectValidator tests: Extract block validation tests. | 2020-07-06 15:14:58 +02:00 |  | 
				
					
						| 
								
								
									 lain | 410c1fab31 | ObjectValidator tests: Extract update validation tests. | 2020-07-06 15:13:11 +02:00 |  | 
				
					
						| 
								
								
									 lain | b2e1ea9226 | ObjectValidation tests: Extract announce validation tests. | 2020-07-06 15:11:49 +02:00 |  | 
				
					
						| 
								
								
									 lain | bbaf108aee | ObjectValidator tests: Extract undo validation tests. | 2020-07-06 15:09:41 +02:00 |  | 
				
					
						| 
								
								
									 lain | 168256dce9 | ObjectValidation tests: Extract like validation tests. | 2020-07-06 15:08:11 +02:00 |  | 
				
					
						| 
								
								
									 lain | e6a13d97d0 | ObjectValidation tests: Extract delete validation tests. | 2020-07-06 15:05:02 +02:00 |  | 
				
					
						| 
								
								
									 lain | 60d4c6c91d | ObjectValidator tests: Extract emoji react testing | 2020-07-06 15:02:35 +02:00 |  | 
				
					
						| 
								
								
									 lain | e0baaa967c | ObjectValidator tests: Extract chat tests | 2020-07-06 13:01:44 +02:00 |  | 
				
					
						| 
								
								
									 lain | 0aa4c20d78 | ObjectValidator Test: Extract attachments. | 2020-07-06 12:59:06 +02:00 |  | 
				
					
						| 
								
								
									 lain | 65fd28e0c4 | Config: Remove Statusnet preloader. | 2020-07-06 12:25:25 +02:00 |  | 
				
					
						| 
								
								
									 lain | 28feba8af4 | Preloaders: Remove status_net preloader | 2020-07-06 12:24:45 +02:00 |  | 
				
					
						| 
								
								
									 lain | f787eb1acf | Update frontend | 2020-07-06 12:20:20 +02:00 |  | 
				
					
						| 
								
								
									 lain | 30d0df8e2f | Update frontend | 2020-07-06 12:17:08 +02:00 |  | 
				
					
						| 
								
								
									 lain | 1963e143c5 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api | 2020-07-06 12:15:59 +02:00 |  | 
				
					
						| 
								
								
									 lain | 158c26d7dd | StaticFE Plug: Use phoenix helper to get the requested format. | 2020-07-06 12:11:10 +02:00 |  | 
				
					
						| 
								
								
									 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 |  |