Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							4523ee9d1e
							
						
					 | 
					
						
						
							
							Merge branch 'master' of github.com:thingsboard/thingsboard
						
						
						
						
						
						
					 | 
					
						2023-05-08 19:02:43 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							fff7bb7273
							
						
					 | 
					
						
						
							
							UI Version Control: Fix remove other entities popover.
						
						
						
						
						
						
					 | 
					
						2023-05-08 19:02:29 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Javier Núñez
							
						 
					 | 
					
						
						
						
						
							
						
						
							48177c9e5a
							
						
					 | 
					
						
						
							
							Improve Thingsboard Edge translation
						
						
						
						
						
						
					 | 
					
						2023-05-08 17:54:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							43674b7f29
							
						
					 | 
					
						
						
							
							Ignore a flaky test that is based on wrong cache strategy
						
						
						
						
						
						
					 | 
					
						2023-05-08 18:45:56 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Javier Núñez
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0f33c479a
							
						
					 | 
					
						
						
							
							Update spanish locale to 3.5
						
						
						
						
						
						
					 | 
					
						2023-05-08 17:43:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								deaflynx
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ef743b85b
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into fix/prod-1975/edit-json-validation
						
						
						
						
						
						
					 | 
					
						2023-05-08 18:20:05 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								deaflynx
							
						 
					 | 
					
						
						
						
						
							
						
						
							c303d4dea3
							
						
					 | 
					
						
						
							
							Fix PROD-1975: ValueInputComponent change: add updateView() after closing openEditJSONDialog
						
						
						
						
						
						
					 | 
					
						2023-05-08 17:54:27 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							762412f964
							
						
					 | 
					
						
						
							
							Merge pull request #8503 from vvlladd28/bug/widget-config/change-datasource-type
						
						
						
						
						
						
						
						Fixed incorrect updated dataSource validator when changing dataSource type 
						
						
					 | 
					
						2023-05-08 17:52:55 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							bdfe1ff2c8
							
						
					 | 
					
						
						
							
							Merge pull request #8502 from vvlladd28/bug/mat-datepicker/timeinterval
						
						
						
						
						
						
						
						Patch for library @mat-datetimepicker/core 
						
						
					 | 
					
						2023-05-08 17:50:31 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							7a9943878d
							
						
					 | 
					
						
						
							
							Merge pull request #8466 from Seraphym-Tuhai/assign-from-alarm-widget
						
						
						
						
						
						
						
						[3.5] Added UI tests on assign from alarm widget 
						
						
					 | 
					
						2023-05-08 17:50:09 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							0673fe75ba
							
						
					 | 
					
						
						
							
							Merge pull request #8499 from vvlladd28/bug/notification/size-action-button
						
						
						
						
						
						
						
						Minor noification improvement 
						
						
					 | 
					
						2023-05-08 17:46:24 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							ee30581859
							
						
					 | 
					
						
						
							
							Install views in tests
						
						
						
						
						
						
					 | 
					
						2023-05-08 17:43:27 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d6e1f6ee04
							
						
					 | 
					
						
						
							
							Merge pull request #8501 from YevhenBondarenko/views-and-functions
						
						
						
						
						
						
						
						moved views and functions to a separate file 
						
						
					 | 
					
						2023-05-08 17:37:21 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladyslav_Prykhodko
							
						 
					 | 
					
						
						
						
						
							
						
						
							da124a27a4
							
						
					 | 
					
						
						
							
							UI: Fixed incorrect updated dataSource validator when changing dataSource type
						
						
						
						
						
						
					 | 
					
						2023-05-08 17:32:08 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladyslav_Prykhodko
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e199b984f
							
						
					 | 
					
						
						
							
							UI: Created patch for library @mat-datetimepicker/core support correct timeinterval 1 minute
						
						
						
						
						
						
					 | 
					
						2023-05-08 17:08:32 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							2145bd462d
							
						
					 | 
					
						
						
							
							Merge pull request #8500 from thingsboard/revert-8373-replace_ObjectMapper_usages_with_JacksonUtil
						
						
						
						
						
						
						
						Revert "[3.5.1]Replace object mapper usages with jackson utils" 
						
						
					 | 
					
						2023-05-08 14:54:35 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							1a366d476e
							
						
					 | 
					
						
						
							
							Revert "[3.5.1]Replace object mapper usages with jackson utils"
						
						
						
						
						
						
					 | 
					
						2023-05-08 14:54:21 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							ac704fc9a3
							
						
					 | 
					
						
						
							
							Merge pull request #8373 from adovh/replace_ObjectMapper_usages_with_JacksonUtil
						
						
						
						
						
						
						
						[3.5.1]Replace object mapper usages with jackson utils 
						
						
					 | 
					
						2023-05-08 14:50:08 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							f1876456ca
							
						
					 | 
					
						
						
							
							moved views and functions to a separate file
						
						
						
						
						
						
					 | 
					
						2023-05-08 13:47:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								AndriiD
							
						 
					 | 
					
						
						
						
						
							
						
						
							15d8b8ce91
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/develop/3.5.1' into replace_ObjectMapper_usages_with_JacksonUtil
						
						
						
						
						
						
					 | 
					
						2023-05-08 13:07:32 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d65e27826a
							
						
					 | 
					
						
						
							
							Merge pull request #8478 from adovh/remove-redundant_test_classes
						
						
						
						
						
						
						
						[3.5.1] removed redundant tests 
						
						
					 | 
					
						2023-05-08 12:59:45 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							ead9d3be70
							
						
					 | 
					
						
						
							
							Merge with develop/3.5.1
						
						
						
						
						
						
					 | 
					
						2023-05-08 12:54:07 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							1a4eb3cf64
							
						
					 | 
					
						
						
							
							Merge pull request #8487 from YevhenBondarenko/fix/singleton-node
						
						
						
						
						
						
						
						fixed singleton mode update 
						
						
					 | 
					
						2023-05-08 12:17:12 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							7d36125d1b
							
						
					 | 
					
						
						
							
							Merge pull request #8483 from AndriiLandiak/bug/fix-cacerts-path-yml
						
						
						
						
						
						
						
						Bug/Yml cannot scan a double-quoted scalar on Windows 
						
						
					 | 
					
						2023-05-08 12:11:17 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladyslav_Prykhodko
							
						 
					 | 
					
						
						
						
						
							
						
						
							ffa481d780
							
						
					 | 
					
						
						
							
							UI: Fixed size notification action button; added validation button text length
						
						
						
						
						
						
					 | 
					
						2023-05-08 11:20:37 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							81b4459687
							
						
					 | 
					
						
						
							
							Merge pull request #8485 from vvlladd28/improvement/decorators/coercion
						
						
						
						
						
						
						
						Added decorators to coercion input component value 
						
						
					 | 
					
						2023-05-05 17:48:37 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							ef7d9b81b6
							
						
					 | 
					
						
						
							
							Merge pull request #8484 from vvlladd28/bug/rulenode/credentials
						
						
						
						
						
						
						
						Fixed rulenode incorrect edit credentials 
						
						
					 | 
					
						2023-05-05 17:47:31 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							c4bd7fb889
							
						
					 | 
					
						
						
							
							Merge pull request #8482 from ArtemDzhereleiko/AD/bug-fix/settings-card-padding
						
						
						
						
						
						
						
						Fixed padding for repository settings fieldset 
						
						
					 | 
					
						2023-05-05 17:46:42 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							f94d92c6b4
							
						
					 | 
					
						
						
							
							Merge pull request #8481 from ArtemDzhereleiko/AD/bug-fix/event-entity-table-copy-cell
						
						
						
						
						
						
						
						Event table fixed width for cell with copy button 
						
						
					 | 
					
						2023-05-05 17:45:49 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladyslav_Prykhodko
							
						 
					 | 
					
						
						
						
						
							
						
						
							e1fbfd64de
							
						
					 | 
					
						
						
							
							UI: Coerce decorator method rename
						
						
						
						
						
						
					 | 
					
						2023-05-05 12:49:05 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							260a3a2d41
							
						
					 | 
					
						
						
							
							merge with master
						
						
						
						
						
						
					 | 
					
						2023-05-05 09:53:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							d3bc69f652
							
						
					 | 
					
						
						
							
							fixed singleton mode update
						
						
						
						
						
						
					 | 
					
						2023-05-04 16:56:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladyslav_Prykhodko
							
						 
					 | 
					
						
						
						
						
							
						
						
							7da4d9b4fe
							
						
					 | 
					
						
						
							
							UI: Add new coercion decorator method
						
						
						
						
						
						
					 | 
					
						2023-05-04 17:53:27 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladyslav_Prykhodko
							
						 
					 | 
					
						
						
						
						
							
						
						
							f438c51b12
							
						
					 | 
					
						
						
							
							UI: Rename decorators file and added coercion to module map
						
						
						
						
						
						
					 | 
					
						2023-05-04 17:46:43 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladyslav_Prykhodko
							
						 
					 | 
					
						
						
						
						
							
						
						
							a08f9f750b
							
						
					 | 
					
						
						
							
							Updated rulenode-core-config.js: Fixed incorrect show credentials
						
						
						
						
						
						
					 | 
					
						2023-05-04 16:47:42 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								AndriiD
							
						 
					 | 
					
						
						
						
						
							
						
						
							93c219c83e
							
						
					 | 
					
						
						
							
							renamed base controller/service tests
						
						
						
						
						
						
					 | 
					
						2023-05-04 16:43:13 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Artem Dzhereleiko
							
						 
					 | 
					
						
						
						
						
							
						
						
							cabb5663f7
							
						
					 | 
					
						
						
							
							UI: Fixed paddign for fieldset
						
						
						
						
						
						
					 | 
					
						2023-05-04 16:21:21 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							cc7564f137
							
						
					 | 
					
						
						
							
							Fix java cacerts path file separator for thingsboard.yml config
						
						
						
						
						
						
					 | 
					
						2023-05-04 16:16:55 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Artem Dzhereleiko
							
						 
					 | 
					
						
						
						
						
							
						
						
							54b9a5c37a
							
						
					 | 
					
						
						
							
							UI: Fix for event table fixed width for cell with copy button
						
						
						
						
						
						
					 | 
					
						2023-05-04 15:17:50 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								AndriiD
							
						 
					 | 
					
						
						
						
						
							
						
						
							32e5d8561b
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/develop/3.5.1' into replace_ObjectMapper_usages_with_JacksonUtil
						
						
						
						
						
						
						
						# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/SystemInfoController.java
#	dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ConfigTemplateServiceTest.java
#	rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNode.java
#	rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNode.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java 
						
						
					 | 
					
						2023-05-04 14:35:41 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							86743b907a
							
						
					 | 
					
						
						
							
							Merge pull request #8464 from thingsboard/improvements/notification-system
						
						
						
						
						
						
						
						Notifications deduplication; upgrade improvements 
						
						
					 | 
					
						2023-05-04 12:47:03 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								AndriiD
							
						 
					 | 
					
						
						
						
						
							
						
						
							0e84fc1c6a
							
						
					 | 
					
						
						
							
							removed redundant tests
						
						
						
						
						
						
					 | 
					
						2023-05-04 12:35:53 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							dfa32952fc
							
						
					 | 
					
						
						
							
							Merge pull request #8470 from vvlladd28/bug/notification/preview-error
						
						
						
						
						
						
						
						Fixed error when we review in send notification 
						
						
					 | 
					
						2023-05-03 17:32:27 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							40f55d0932
							
						
					 | 
					
						
						
							
							Merge pull request #8469 from ArtemDzhereleiko/AD/fix/default-icon-size
						
						
						
						
						
						
						
						Fixed default icon size for table cell action 
						
						
					 | 
					
						2023-05-03 17:31:32 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							662a1bc8c9
							
						
					 | 
					
						
						
							
							Merge pull request #8475 from ArtemDzhereleiko/AD/imp/device-credentials
						
						
						
						
						
						
						
						Add copy and generate action for device credentials 
						
						
					 | 
					
						2023-05-03 17:28:23 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							6c8f3c19de
							
						
					 | 
					
						
						
							
							Active devices count to debug
						
						
						
						
						
						
					 | 
					
						2023-05-03 16:32:33 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							36743eb5af
							
						
					 | 
					
						
						
							
							Branch name validation
						
						
						
						
						
						
					 | 
					
						2023-05-03 16:31:31 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							f969f07f2f
							
						
					 | 
					
						
						
							
							Minor performance optimization
						
						
						
						
						
						
					 | 
					
						2023-05-03 16:27:41 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Artem Dzhereleiko
							
						 
					 | 
					
						
						
						
						
							
						
						
							69da3e63eb
							
						
					 | 
					
						
						
							
							UI: refactoring for decorator
						
						
						
						
						
						
					 | 
					
						2023-05-03 16:07:07 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Artem Dzhereleiko
							
						 
					 | 
					
						
						
						
						
							
						
						
							4a53707124
							
						
					 | 
					
						
						
							
							UI: Refactoring
						
						
						
						
						
						
					 | 
					
						2023-05-03 15:59:31 +03:00 | 
					
					
						
						
							
							
							
						
					 |