| 
							
							
								 J. Nick Koston | f00e9528da | [api] Simplify message reading conditional | 2025-10-04 12:45:51 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 8f4decdce4 | Merge branch 'integration' into memory_api | 2025-10-04 12:40:48 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | deede5a479 | Merge branch 'api_logging_cleanups' into integration | 2025-10-04 12:40:43 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 0d5eb79000 | [api] Consolidate fatal error logging to reduce flash usage | 2025-10-04 12:40:02 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 76afcc7647 | Merge branch 'integration' into memory_api | 2025-10-04 11:25:30 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 2806b5e314 | Merge remote-tracking branch 'upstream/dev' into integration | 2025-10-04 11:25:21 -05:00 |  | 
			
				
					| 
							
							
								 mrtoy-me | 874db20b7d | [mpr121] cleaner setup (#11013) | 2025-10-04 08:54:31 -04:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | c640792482 | Merge branch 'integration' into memory_api | 2025-10-04 00:26:26 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 2a85ba1949 | Merge branch 'ota_fix_s3' into integration | 2025-10-04 00:26:20 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 44ffd08c33 | [esphome.ota] Fix ESP32-S3 OTA authentication with hardware SHA acceleration | 2025-10-04 00:22:18 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 2eea674c04 | [json] Fix missing defines.h include causing PSRAM allocator to be unused (#11008) | 2025-10-03 23:52:40 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 5600e52207 | Merge branch 'integration' into memory_api | 2025-10-03 20:35:52 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | c558308d6f | Merge branch 'use_idf_webserver_esp32' into integration | 2025-10-03 20:35:44 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 7060771cb4 | missed one | 2025-10-03 20:35:33 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | e27df825f8 | Merge branch 'integration' into memory_api | 2025-10-03 19:40:40 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 683d3fd19f | Merge branch 'json_missing_define' into integration | 2025-10-03 19:40:35 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 7d35c46ad3 | [json] Fix missing defines.h include causing PSRAM allocator to be unused | 2025-10-03 19:36:56 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | e20ad92bf7 | Merge branch 'integration' into memory_api | 2025-10-03 18:38:55 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 2b6fc94f31 | Merge branch 'bound_tx_buf' into integration | 2025-10-03 18:38:50 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 61d3a9a93a | Merge remote-tracking branch 'upstream/dev' into bound_tx_buf | 2025-10-03 18:38:20 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | ef3ab92979 | Merge branch 'integration' into memory_api | 2025-10-03 18:34:25 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | a51c288cf6 | Merge branch 'ble_connections_slots_are_shared_client_server' into integration | 2025-10-03 18:34:19 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 60f67382be | copilot review comments | 2025-10-03 18:31:21 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 944514eea4 | Merge branch 'integration' into memory_api | 2025-10-03 18:21:34 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | e2f25500bf | Merge branch 'ble_connections_slots_are_shared_client_server' into integration | 2025-10-03 18:21:29 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 6ebdb61098 | Merge upstream/dev into ble_connections_slots_are_shared_client_server | 2025-10-03 18:21:00 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 0137954f2b | [const] Move CONF_MAX_CONNECTIONS to const.py (#11007) | 2025-10-03 18:20:00 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 34e0620765 | Merge branch 'integration' into memory_api | 2025-10-03 18:11:25 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 389c76a922 | Merge branch 'ble_connections_slots_are_shared_client_server' into integration | 2025-10-03 18:11:17 -05:00 |  | 
			
				
					| 
							
							
								 Patrick | 0a40a30e4a | [esp32_can] support multiple CAN instances for platforms that support it (#10712) Co-authored-by: Jonathan Swoboda <154711427+swoboda1337@users.noreply.github.com> | 2025-10-03 23:10:19 +00:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 6b02b0cb59 | remove default from tracker | 2025-10-03 18:09:54 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | d660207c12 | Merge branch 'integration' into memory_api | 2025-10-03 18:07:17 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | eb9befde4d | merge | 2025-10-03 18:07:10 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 249080d118 | Merge branch 'integration' into memory_api | 2025-10-03 18:04:25 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 8cda4127bc | Merge branch 'conf_max_connections' into integration | 2025-10-03 18:04:17 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | e3d12cbac7 | Create CONF_MAX_CONNECTIONS const | 2025-10-03 18:01:15 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | d697d5df8b | preen | 2025-10-03 17:56:14 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 1570f83fd8 | lint | 2025-10-03 17:50:56 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | f16f826f12 | its shared | 2025-10-03 17:42:46 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 5e9c9e8e79 | Merge branch 'integration' into memory_api | 2025-10-03 17:08:07 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 0165c3d79b | Merge branch 'std_map_overkill_wifi' into integration | 2025-10-03 17:08:02 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 11a4d31e90 | [wifi] Optimize WPA2 EAP phase2 logging to reduce memory overhead | 2025-10-03 17:04:57 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 7887e136d6 | Merge branch 'integration' into memory_api | 2025-10-03 16:56:45 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | c30bd49568 | Merge branch 'use_idf_webserver_esp32' into integration | 2025-10-03 16:56:37 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 7621eb1f6e | revert clang-tidy changes, copilot disagrees | 2025-10-03 16:54:11 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 11b113b9db | Merge branch 'dev' into use_idf_webserver_esp32 | 2025-10-03 16:42:21 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | a3f4863fdc | Merge branch 'integration' into memory_api | 2025-10-03 16:41:25 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 76fc04f286 | Merge branch 'idf_query' into integration | 2025-10-03 16:41:20 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | e19b48599c | fix dangling pointer | 2025-10-03 16:40:10 -05:00 |  | 
			
				
					| 
							
							
								 J. Nick Koston | 9e6dc91051 | Merge branch 'integration' into memory_api | 2025-10-03 16:06:56 -05:00 |  |