Volodymyr Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							d79d00aa87
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into develop/3.3-edge
						
						
						
						
						
						
					 | 
					
						2020-12-07 10:46:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							87a8cec7b5
							
						
					 | 
					
						
						
							
							Version set to 3.2.1-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2020-12-01 18:05:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							a87956ebfd
							
						
					 | 
					
						
						
							
							Improvements to Storage Days calculation
						
						
						
						
						
						
					 | 
					
						2020-11-28 16:38:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							e19bd433ad
							
						
					 | 
					
						
						
							
							improvements asset validation for RE statistics
						
						
						
						
						
						
					 | 
					
						2020-11-25 14:32:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							7cd2a870f5
							
						
					 | 
					
						
						
							
							count assets by tenantId improvements
						
						
						
						
						
						
					 | 
					
						2020-11-25 14:32:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							856555f5fa
							
						
					 | 
					
						
						
							
							Merge branch 'master' of github.com:thingsboard/thingsboard
						
						
						
						
						
						
					 | 
					
						2020-11-23 19:22:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							241a45cce4
							
						
					 | 
					
						
						
							
							Fix sort by originator type
						
						
						
						
						
						
					 | 
					
						2020-11-23 19:22:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							04bb1e5f4f
							
						
					 | 
					
						
						
							
							Add missing cases for email and sms api limits
						
						
						
						
						
						
					 | 
					
						2020-11-23 18:28:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							eb8975d504
							
						
					 | 
					
						
						
							
							SMS Email Limits
						
						
						
						
						
						
					 | 
					
						2020-11-20 18:02:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							3cabec954e
							
						
					 | 
					
						
						
							
							Critical bug fix
						
						
						
						
						
						
					 | 
					
						2020-11-19 17:06:54 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							0fb1147ab2
							
						
					 | 
					
						
						
							
							Alarm Query Tests improved
						
						
						
						
						
						
					 | 
					
						2020-11-19 12:04:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							5f8e592595
							
						
					 | 
					
						
						
							
							Reverted changes to the logging from previous commit
						
						
						
						
						
						
					 | 
					
						2020-11-19 11:33:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							0fff851210
							
						
					 | 
					
						
						
							
							Alarm Query fix for propagated alarms with entities assigned to customer
						
						
						
						
						
						
					 | 
					
						2020-11-19 11:26:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ShvaykaD
							
						 
					 | 
					
						
						
						
						
							
						
						
							be094fc62a
							
						
					 | 
					
						
						
							
							fix license
						
						
						
						
						
						
					 | 
					
						2020-11-16 19:15:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ShvaykaD
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc310f4cab
							
						
					 | 
					
						
						
							
							merge with master
						
						
						
						
						
						
					 | 
					
						2020-11-16 19:13:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							aa61db22f2
							
						
					 | 
					
						
						
							
							added validations for DeviceProfileAlarm type
						
						
						
						
						
						
					 | 
					
						2020-11-16 18:49:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							706fd01d76
							
						
					 | 
					
						
						
							
							Device Profile Proto Improvement
						
						
						
						
						
						
					 | 
					
						2020-11-16 17:18:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ShvaykaD
							
						 
					 | 
					
						
						
						
						
							
						
						
							861fd65109
							
						
					 | 
					
						
						
							
							merge with master
						
						
						
						
						
						
					 | 
					
						2020-11-13 16:33:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ShvaykaD
							
						 
					 | 
					
						
						
						
						
							
						
						
							4a18781304
							
						
					 | 
					
						
						
							
							added TransportPayloadTypeConfiguration, fix tests, ui
						
						
						
						
						
						
					 | 
					
						2020-11-13 16:19:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							2df72b4ec1
							
						
					 | 
					
						
						
							
							license format
						
						
						
						
						
						
					 | 
					
						2020-11-13 15:51:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							a1d9ce6e45
							
						
					 | 
					
						
						
							
							created validateNumberOfEntitiesPerTenant
						
						
						
						
						
						
					 | 
					
						2020-11-13 15:32:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							4eccf7f916
							
						
					 | 
					
						
						
							
							fix validateCreate from UserServiceImpl
						
						
						
						
						
						
					 | 
					
						2020-11-13 13:00:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							ba1b000adb
							
						
					 | 
					
						
						
							
							added maxCustomers, maxUsers, maxDashboards, maxRuleChains for TenantProfile
						
						
						
						
						
						
					 | 
					
						2020-11-13 11:55:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							0dd9450b92
							
						
					 | 
					
						
						
							
							Fix for ApiStats security checks
						
						
						
						
						
						
					 | 
					
						2020-11-12 09:55:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ShvaykaD
							
						 
					 | 
					
						
						
						
						
							
						
						
							18a57d638d
							
						
					 | 
					
						
						
							
							merge with master
						
						
						
						
						
						
					 | 
					
						2020-11-11 18:25:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ShvaykaD
							
						 
					 | 
					
						
						
						
						
							
						
						
							46e2ebe3a4
							
						
					 | 
					
						
						
							
							moved DeviceController proto schema  check to DeviceProfileServiceImpl
						
						
						
						
						
						
					 | 
					
						2020-11-11 17:58:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							5de0059eb7
							
						
					 | 
					
						
						
							
							apiUsageState improvements
						
						
						
						
						
						
					 | 
					
						2020-11-11 16:25:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							a5e8cab5e0
							
						
					 | 
					
						
						
							
							Merge pull request #3700 from YevhenBondarenko/feature/api-usage-state-tmp
						
						
						
						
						
						
						
						api usage state alias improvements 
						
						
					 | 
					
						2020-11-11 14:03:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							b76ec50123
							
						
					 | 
					
						
						
							
							refactored
						
						
						
						
						
						
					 | 
					
						2020-11-11 13:03:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							ebf10b55c8
							
						
					 | 
					
						
						
							
							api usage state alias improvements
						
						
						
						
						
						
					 | 
					
						2020-11-11 12:59:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							ca0b0b20a7
							
						
					 | 
					
						
						
							
							Merge branch 'master' into develop/2.5.5
						
						
						
						
						
						
					 | 
					
						2020-11-11 11:54:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zbeacon
							
						 
					 | 
					
						
						
						
						
							
						
						
							92ba5907b0
							
						
					 | 
					
						
						
							
							Added validation for deviceName/attribute key contains only spaces situation
						
						
						
						
						
						
					 | 
					
						2020-11-11 11:05:07 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							9531e891c8
							
						
					 | 
					
						
						
							
							added validation with maxDevices and maxAssets to deviceService and assetService
						
						
						
						
						
						
					 | 
					
						2020-11-11 11:03:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Volodymyr Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							3cc0c5baf0
							
						
					 | 
					
						
						
							
							Set version to 3.3.0-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2020-11-10 16:43:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							ac866faab0
							
						
					 | 
					
						
						
							
							Improvements to the ApiUsageState
						
						
						
						
						
						
					 | 
					
						2020-11-10 16:19:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							3518a3d927
							
						
					 | 
					
						
						
							
							Merge with master
						
						
						
						
						
						
					 | 
					
						2020-11-09 10:42:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							123ea76c94
							
						
					 | 
					
						
						
							
							Improvements for data points storage
						
						
						
						
						
						
					 | 
					
						2020-11-03 18:59:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							a64c4e3e20
							
						
					 | 
					
						
						
							
							DeviceProfileNode fix for conditions based on the attributes
						
						
						
						
						
						
					 | 
					
						2020-11-03 13:05:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							78ac876103
							
						
					 | 
					
						
						
							
							Bug fixes for Device Profile node
						
						
						
						
						
						
					 | 
					
						2020-10-29 13:26:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							7724495cb1
							
						
					 | 
					
						
						
							
							added default queue for device profile
						
						
						
						
						
						
					 | 
					
						2020-10-28 17:20:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							461da688f4
							
						
					 | 
					
						
						
							
							Merge with 2.5.5
						
						
						
						
						
						
					 | 
					
						2020-10-28 15:24:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							03581c2941
							
						
					 | 
					
						
						
							
							Usage records
						
						
						
						
						
						
					 | 
					
						2020-10-27 18:30:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							8bd617e3b5
							
						
					 | 
					
						
						
							
							created tests for rule chain metadata validator
						
						
						
						
						
						
					 | 
					
						2020-10-27 18:18:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							44a700e89a
							
						
					 | 
					
						
						
							
							rule chain circles validation improvements
						
						
						
						
						
						
					 | 
					
						2020-10-27 18:18:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							174570610b
							
						
					 | 
					
						
						
							
							added circles validation in BaseRuleChainService
						
						
						
						
						
						
					 | 
					
						2020-10-27 18:18:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							b38b47f409
							
						
					 | 
					
						
						
							
							JS Invoke Service stats
						
						
						
						
						
						
					 | 
					
						2020-10-22 18:51:34 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							0b83ae8b9a
							
						
					 | 
					
						
						
							
							Merge branch 'feature/usage-records' of github.com:thingsboard/thingsboard into feature/usage-records
						
						
						
						
						
						
					 | 
					
						2020-10-22 15:56:38 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							0e0ab6ca39
							
						
					 | 
					
						
						
							
							Improvements to API State
						
						
						
						
						
						
					 | 
					
						2020-10-22 15:56:31 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							41212e11c0
							
						
					 | 
					
						
						
							
							created tenant profile configuration
						
						
						
						
						
						
					 | 
					
						2020-10-22 15:50:12 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Artem Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							74b150b384
							
						
					 | 
					
						
						
							
							Added getCustomerEdgeInfos() implementation
						
						
						
						
						
						
					 | 
					
						2020-10-21 05:40:25 +03:00 | 
					
					
						
						
							
							
							
						
					 |