ArtemDzhereleiko
							
						 
					 | 
					
						
						
						
						
							
						
						
							6a6b0638da
							
						
					 | 
					
						
						
							
							Update and resolve conflicts
						
						
						
						
						
						
					 | 
					
						2021-12-21 12:22:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							ca5a2e5d80
							
						
					 | 
					
						
						
							
							Merge pull request #5753 from smatvienko-tb/pagelink_sorted
						
						
						
						
						
						
						
						Unsorted page link replaced with sort by id ASC. 
						
						
					 | 
					
						2021-12-20 18:13:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Matvienko
							
						 
					 | 
					
						
						
						
						
							
						
						
							0583880ec7
							
						
					 | 
					
						
						
							
							test: ota package refactored to get better output on assertion
						
						
						
						
						
						
					 | 
					
						2021-12-20 16:50:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Matvienko
							
						 
					 | 
					
						
						
						
						
							
						
						
							c14bba5b1e
							
						
					 | 
					
						
						
							
							dao util: PageLink unsorted replaced with ORDER BY is ASC
						
						
						
						
						
						
					 | 
					
						2021-12-20 16:49:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Matvienko
							
						 
					 | 
					
						
						
						
						
							
						
						
							57b09b2328
							
						
					 | 
					
						
						
							
							device delete transactional and cache evict refactor
						
						
						
						
						
						
					 | 
					
						2021-12-20 15:35:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							ab2a7e4357
							
						
					 | 
					
						
						
							
							Merge pull request #5569 from dmytro-landiak/save-ts-no-latest
						
						
						
						
						
						
						
						[3.3.3] Save timeseries without latest persistence 
						
						
					 | 
					
						2021-12-17 13:16:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							6a45abcd3b
							
						
					 | 
					
						
						
							
							Merge pull request #5492 from smatvienko-tb/isNumber_fix
						
						
						
						
						
						
						
						[3.3.3] fixed EntityDataAdapter.convertValue that convert "500D" (valid Java number) into "500.0" as double 
						
						
					 | 
					
						2021-12-17 12:41:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							aa374fb2ec
							
						
					 | 
					
						
						
							
							Merge pull request #5557 from smatvienko-tb/partitioning_incorrect_parameter_npe_fix
						
						
						
						
						
						
						
						Fixed NPE in case of incorrect partitioning name parameter 
						
						
					 | 
					
						2021-12-17 12:40:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							adc3ef514b
							
						
					 | 
					
						
						
							
							Merge pull request #5383 from smatvienko-tb/sql_tests_on_postgres_testcontainer
						
						
						
						
						
						
						
						[3.3.3] dao sql tests: run on postgresql container with in-memory disk using testcontainers jdbc (jdbc:tc:postgresql:12.8) 
						
						
					 | 
					
						2021-12-17 12:39:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							37fd2f5da2
							
						
					 | 
					
						
						
							
							Fix conflicts
						
						
						
						
						
						
					 | 
					
						2021-12-16 17:27:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							4bc2eba8a2
							
						
					 | 
					
						
						
							
							Add important index
						
						
						
						
						
						
					 | 
					
						2021-12-14 12:31:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Matvienko
							
						 
					 | 
					
						
						
						
						
							
						
						
							e680b33c9c
							
						
					 | 
					
						
						
							
							fixed EntityDataAdapter.convertValue that convert "500D" (valid Java number) into "500" as double.
						
						
						
						
						
						
					 | 
					
						2021-12-13 19:40:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Matvienko
							
						 
					 | 
					
						
						
						
						
							
						
						
							34b4aeac49
							
						
					 | 
					
						
						
							
							added code defaults sql.remove_null_chars=true (same as thingsboard.yaml) to simplify test setup
						
						
						
						
						
						
					 | 
					
						2021-12-13 15:52:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Matvienko
							
						 
					 | 
					
						
						
						
						
							
						
						
							f51edb3a45
							
						
					 | 
					
						
						
							
							Merge branch 'master' into sql_tests_on_postgres_testcontainer
						
						
						
						
						
						
					 | 
					
						2021-12-13 14:03:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							eebce55d5a
							
						
					 | 
					
						
						
							
							Improved upgrade script performance
						
						
						
						
						
						
					 | 
					
						2021-12-09 15:12:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							435d76c107
							
						
					 | 
					
						
						
							
							Merge with master
						
						
						
						
						
						
					 | 
					
						2021-12-08 16:46:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							b5da8752c5
							
						
					 | 
					
						
						
							
							Use output rule node name instead of label
						
						
						
						
						
						
					 | 
					
						2021-12-08 16:23:54 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							d3c20b2e57
							
						
					 | 
					
						
						
							
							Alarm Query performance improvements
						
						
						
						
						
						
					 | 
					
						2021-12-07 18:50:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							bbd1d8ae86
							
						
					 | 
					
						
						
							
							Migration script
						
						
						
						
						
						
					 | 
					
						2021-12-03 11:57:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							9cf0ab6900
							
						
					 | 
					
						
						
							
							Rename of the related rule chains when customer renames the output label
						
						
						
						
						
						
					 | 
					
						2021-12-02 20:00:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							c3fa9b9f43
							
						
					 | 
					
						
						
							
							Nested rule chains
						
						
						
						
						
						
					 | 
					
						2021-12-02 19:13:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ArtemDzhereleiko
							
						 
					 | 
					
						
						
						
						
							
						
						
							5d4579ce28
							
						
					 | 
					
						
						
							
							UI: New control widget Persistent table
						
						
						
						
						
						
					 | 
					
						2021-11-26 17:00:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							7187ecfdb1
							
						
					 | 
					
						
						
							
							Version set to 3.3.3-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2021-11-24 12:24:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dima Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							3f6fb04949
							
						
					 | 
					
						
						
							
							no class entity with id exists for relation fix
						
						
						
						
						
						
					 | 
					
						2021-11-18 16:42:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dima Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							453b1b82ba
							
						
					 | 
					
						
						
							
							added max timeout param to the get calls in tests
						
						
						
						
						
						
					 | 
					
						2021-11-16 19:03:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dima Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							4dc2b6ca01
							
						
					 | 
					
						
						
							
							test improved
						
						
						
						
						
						
					 | 
					
						2021-11-16 18:47:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dima Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							916b32264c
							
						
					 | 
					
						
						
							
							added test
						
						
						
						
						
						
					 | 
					
						2021-11-16 18:47:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dima Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							fbdbea7f59
							
						
					 | 
					
						
						
							
							refactoring
						
						
						
						
						
						
					 | 
					
						2021-11-16 18:45:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dima Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							c43e8950a2
							
						
					 | 
					
						
						
							
							save ts without latest
						
						
						
						
						
						
					 | 
					
						2021-11-16 18:43:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Matvienko
							
						 
					 | 
					
						
						
						
						
							
						
						
							1cda63e74d
							
						
					 | 
					
						
						
							
							fixed NPE in case of incorrect partitioning name parameter (now you will see the normal log message with error)
						
						
						
						
						
						
						
						(cherry picked from commit f247e96d97dfa136c553f9b359a47f33b2d60acf) 
						
						
					 | 
					
						2021-11-15 18:30:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Viacheslav Klimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							7801c3d7aa
							
						
					 | 
					
						
						
							
							Fix up fields length validation for rule nodes and alarm rules
						
						
						
						
						
						
					 | 
					
						2021-11-09 15:49:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Matvienko
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c340dc7d2
							
						
					 | 
					
						
						
							
							tests added for update service for convertDeviceProfileAlarmRulesForVersion330
						
						
						
						
						
						
					 | 
					
						2021-11-08 13:51:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dima Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							541110b344
							
						
					 | 
					
						
						
							
							fixed concurrency exception when deleting relation
						
						
						
						
						
						
					 | 
					
						2021-11-08 09:41:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							676a60e804
							
						
					 | 
					
						
						
							
							Revert "[3.3.3] Entities search within all tenants"
						
						
						
						
						
						
					 | 
					
						2021-11-05 18:26:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							8e0eab37a8
							
						
					 | 
					
						
						
							
							Merge pull request #5474 from ViacheslavKlimov/sysadmin-entities-search
						
						
						
						
						
						
						
						[3.3.3] Entities search within all tenants 
						
						
					 | 
					
						2021-11-05 18:26:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							71bed873b0
							
						
					 | 
					
						
						
							
							Merge pull request #5166 from ViacheslavKlimov/fields-validation
						
						
						
						
						
						
						
						[3.3.2] Fields length validation 
						
						
					 | 
					
						2021-11-04 16:56:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Matvienko
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e71c0b9fe
							
						
					 | 
					
						
						
							
							EntityDataAdapterTest added to verify convertValue method
						
						
						
						
						
						
					 | 
					
						2021-11-04 14:50:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Viacheslav Klimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							ab0ad885ab
							
						
					 | 
					
						
						
							
							Entities text search by substring in JPA repositories
						
						
						
						
						
						
					 | 
					
						2021-11-04 13:19:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Viacheslav Klimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							fe5215c7cc
							
						
					 | 
					
						
						
							
							Minor refactoring
						
						
						
						
						
						
					 | 
					
						2021-11-04 12:55:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Viacheslav Klimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							2d845c7840
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into fields-validation
						
						
						
						
						
						
						
						# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
#	common/data/src/main/java/org/thingsboard/server/common/data/Customer.java
#	common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfile.java
#	common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java
#	common/data/src/main/java/org/thingsboard/server/common/data/OtaPackageInfo.java
#	common/data/src/main/java/org/thingsboard/server/common/data/TbResource.java
#	common/data/src/main/java/org/thingsboard/server/common/data/TbResourceInfo.java
#	common/data/src/main/java/org/thingsboard/server/common/data/TenantProfile.java
#	common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java
#	common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java
#	common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelation.java
#	common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java
#	common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java
#	common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetsBundle.java 
						
						
					 | 
					
						2021-11-04 12:43:54 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							447dcdcad5
							
						
					 | 
					
						
						
							
							Merge pull request #4878 from smatvienko-tb/feature/sql-query-timeout
						
						
						
						
						
						
						
						Timeout for all SQL queries to survive enormous heavy query 
						
						
					 | 
					
						2021-11-03 16:45:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Viacheslav Klimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d28a28b08
							
						
					 | 
					
						
						
							
							Implement entities search within all tenants
						
						
						
						
						
						
					 | 
					
						2021-11-01 20:04:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Volodymyr Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							ba9ad04a90
							
						
					 | 
					
						
						
							
							Validate tenant profile usage - can not use isolated profiles in monolith setup
						
						
						
						
						
						
					 | 
					
						2021-10-28 17:07:32 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Matvienko
							
						 
					 | 
					
						
						
						
						
							
						
						
							25c669f420
							
						
					 | 
					
						
						
							
							dao test dependency: removed duplicated spring-boot-starter-test
						
						
						
						
						
						
					 | 
					
						2021-10-28 14:26:22 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Swoq
							
						 
					 | 
					
						
						
						
						
							
						
						
							81f2d122a1
							
						
					 | 
					
						
						
							
							precise reference to id
						
						
						
						
						
						
					 | 
					
						2021-10-27 09:54:53 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Swoq
							
						 
					 | 
					
						
						
						
						
							
						
						
							b36f851349
							
						
					 | 
					
						
						
							
							Fix default ordering in Entity Query Repository
						
						
						
						
						
						
					 | 
					
						2021-10-27 09:54:53 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Matvienko
							
						 
					 | 
					
						
						
						
						
							
						
						
							7f1f298774
							
						
					 | 
					
						
						
							
							cassandra buffered rate executor: separate beans for read and write operations
						
						
						
						
						
						
					 | 
					
						2021-10-21 19:07:53 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							4ae4c7c381
							
						
					 | 
					
						
						
							
							Merge with master
						
						
						
						
						
						
					 | 
					
						2021-10-19 16:42:44 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							dda6138393
							
						
					 | 
					
						
						
							
							Merge pull request #5328 from ViacheslavKlimov/bulk-import-improvements
						
						
						
						
						
						
						
						Concurrent bulk import processing 
						
						
					 | 
					
						2021-10-19 15:47:17 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							96d20b073b
							
						
					 | 
					
						
						
							
							Merge pull request #5351 from ViacheslavKlimov/fix/rule-chains-import
						
						
						
						
						
						
						
						Rule chains import refactoring 
						
						
					 | 
					
						2021-10-19 15:44:45 +03:00 | 
					
					
						
						
							
							
							
						
					 |