Vladyslav_Prykhodko 
							
						 
					 
					
						
						
						
						
							
						
						
							d5c3f4c997 
							
						 
					 
					
						
						
							
							Merge master in develop/3.3  
						
						 
						
						
						
						
					 
					
						2021-01-27 13:31:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Igor Kulikov 
							
						 
					 
					
						
						
						
						
							
						
						
							61723da391 
							
						 
					 
					
						
						
							
							Version set to 3.3.0-SNAPSHOT  
						
						 
						
						
						
						
					 
					
						2021-01-26 10:17:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Volodymyr Babak 
							
						 
					 
					
						
						
						
						
							
						
						
							ae8564110a 
							
						 
					 
					
						
						
							
							Code clean up  
						
						 
						
						
						
						
					 
					
						2021-01-25 17:30:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Volodymyr Babak 
							
						 
					 
					
						
						
						
						
							
						
						
							bc3008ad7b 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into develop/3.3-edge  
						
						 
						
						
						
						
					 
					
						2021-01-17 01:47:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Igor Kulikov 
							
						 
					 
					
						
						
						
						
							
						
						
							d31358b2ea 
							
						 
					 
					
						
						
							
							Update license header - set 2021 year  
						
						 
						
						
						
						
					 
					
						2021-01-11 13:42:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Volodymyr Babak 
							
						 
					 
					
						
						
						
						
							
						
						
							eb24519772 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge  
						
						 
						
						
						
						
					 
					
						2020-12-29 16:55:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Volodymyr Babak 
							
						 
					 
					
						
						
						
						
							
						
						
							995bac539c 
							
						 
					 
					
						
						
							
							Added findMissingToRelatedRuleChains method  
						
						 
						
						
						
						
					 
					
						2020-12-24 14:15:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Volodymyr Babak 
							
						 
					 
					
						
						
						
						
							
						
						
							e58af8fb22 
							
						 
					 
					
						
						
							
							Added findMissingToRelatedRuleChains method  
						
						 
						
						
						
						
					 
					
						2020-12-24 13:39:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Volodymyr Babak 
							
						 
					 
					
						
						
						
						
							
						
						
							df11b383c1 
							
						 
					 
					
						
						
							
							Naming conventions update  
						
						 
						
						
						
						
					 
					
						2020-12-23 19:12:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Igor Kulikov 
							
						 
					 
					
						
						
						
						
							
						
						
							6814c21ee9 
							
						 
					 
					
						
						
							
							restore ver 3.2.1-SNAPSHOT  
						
						 
						
						
						
						
					 
					
						2020-12-23 18:24:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Volodymyr Babak 
							
						 
					 
					
						
						
						
						
							
						
						
							c5d93d17f4 
							
						 
					 
					
						
						
							
							Naming conventions update  
						
						 
						
						
						
						
					 
					
						2020-12-23 18:24:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Igor Kulikov 
							
						 
					 
					
						
						
						
						
							
						
						
							bfee301625 
							
						 
					 
					
						
						
							
							Set ver to 2.5.6-SNAPSHOT  
						
						 
						
						
						
						
					 
					
						2020-12-23 17:47:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nickAS21 
							
						 
					 
					
						
						
						
						
							
						
						
							1150d4e4f3 
							
						 
					 
					
						
						
							
							Lwm2m: backEnd: add saveDeviceWithCredential  
						
						 
						
						
						
						
					 
					
						2020-12-22 16:23:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								deaflynx 
							
						 
					 
					
						
						
						
						
							
						
						
							f9e2d128a2 
							
						 
					 
					
						
						
							
							Import refactor  
						
						 
						
						
						
						
					 
					
						2020-12-18 14:36:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								deaflynx 
							
						 
					 
					
						
						
						
						
							
						
						
							ceadc391f3 
							
						 
					 
					
						
						
							
							Added EdgeInfo, fix for CustomerIsPublic  
						
						 
						
						
						
						
					 
					
						2020-12-18 14:15:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Volodymyr Babak 
							
						 
					 
					
						
						
						
						
							
						
						
							ead9fd9e5d 
							
						 
					 
					
						
						
							
							Code review fixes  
						
						 
						
						
						
						
					 
					
						2020-12-17 10:54:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Volodymyr Babak 
							
						 
					 
					
						
						
						
						
							
						
						
							846f5ba86b 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'deaflynx/develop/3.3-edge' into develop/3.3-edge  
						
						 
						
						
						
						
					 
					
						2020-12-14 12:55:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Artem Babak 
							
						 
					 
					
						
						
						
						
							
						
						
							4b08103857 
							
						 
					 
					
						
						
							
							Removed device's methods for edge  
						
						 
						
						
						
						
					 
					
						2020-12-14 11:35:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Artem Babak 
							
						 
					 
					
						
						
						
						
							
						
						
							c19cf2372e 
							
						 
					 
					
						
						
							
							Added findEntityViewByTenantIdAndEdgeIdAndType and findDevicesByTenantIdAndEdgeIdAndDeviceProfileId  
						
						 
						
						
						
						
					 
					
						2020-12-11 08:48:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								YevhenBondarenko 
							
						 
					 
					
						
						
						
						
							
						
						
							9a03fbadc7 
							
						 
					 
					
						
						
							
							added ability to get attributes and timeseries keys by entity query  
						
						 
						
						
						
						
					 
					
						2020-12-10 17:55:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Artem Babak 
							
						 
					 
					
						
						
						
						
							
						
						
							3ffa7e3592 
							
						 
					 
					
						
						
							
							Added button unassignFromEdge for entities. Added findAssetsByTenantIdAndEdgeIdAndType()  
						
						 
						
						
						
						
					 
					
						2020-12-10 16:59:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Yevhen Bondarenko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5d30243eea 
							
						 
					 
					
						
						
							
							added ability to get attributes and timeseries keys by device profile id ( #3817 )  
						
						 
						
						... 
						
						
						
						* added ability to get attributes and timeseries keys by entity ids
* refactored
* refactored
* get attributes and timeseries keys by device profile improvements
* added limit
* added device_profile_id index and upgrade script
* improvements
* refactored 
						
						
					 
					
						2020-12-10 15:18:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrii Shvaika 
							
						 
					 
					
						
						
						
						
							
						
						
							460cec99ec 
							
						 
					 
					
						
						
							
							Version set to 3.3-SNAPSHOT  
						
						 
						
						
						
						
					 
					
						2020-12-09 11:07:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zbeacon 
							
						 
					 
					
						
						
						
						
							
						
						
							680eb89fa0 
							
						 
					 
					
						
						
							
							Added validation for device name in provision request, if it is present. Added session closing when provision client tries to use topics not allowed for provisioning feature  
						
						 
						
						
						
						
					 
					
						2020-11-25 10:55:06 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							123ea76c94 
							
						 
					 
					
						
						
							
							Improvements for data points storage  
						
						 
						
						
						
						
					 
					
						2020-11-03 18:59:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrii Shvaika 
							
						 
					 
					
						
						
						
						
							
						
						
							35dbe509f0 
							
						 
					 
					
						
						
							
							Data Points storage  
						
						 
						
						
						
						
					 
					
						2020-11-03 13:43:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrii Shvaika 
							
						 
					 
					
						
						
						
						
							
						
						
							78ac876103 
							
						 
					 
					
						
						
							
							Bug fixes for Device Profile node  
						
						 
						
						
						
						
					 
					
						2020-10-29 13:26:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Artem Babak 
							
						 
					 
					
						
						
						
						
							
						
						
							74b150b384 
							
						 
					 
					
						
						
							
							Added getCustomerEdgeInfos() implementation  
						
						 
						
						
						
						
					 
					
						2020-10-21 05:40:25 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								YevhenBondarenko 
							
						 
					 
					
						
						
						
						
							
						
						
							42dd386182 
							
						 
					 
					
						
						
							
							Merge branch 'feature/usage-records' of  https://github.com/thingsboard/thingsboard  into feature/usage-records  
						
						 
						
						
						
						
					 
					
						2020-10-20 19:30:41 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrii Shvaika 
							
						 
					 
					
						
						
						
						
							
						
						
							9d14a38966 
							
						 
					 
					
						
						
							
							Tenant Profile updates for ApiUsageStateService  
						
						 
						
						
						
						
					 
					
						2020-10-20 18:57:15 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								YevhenBondarenko 
							
						 
					 
					
						
						
						
						
							
						
						
							7e88376030 
							
						 
					 
					
						
						
							
							created alias ApiUsageState  
						
						 
						
						
						
						
					 
					
						2020-10-20 18:55:52 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrii Shvaika 
							
						 
					 
					
						
						
						
						
							
						
						
							9ec4b77672 
							
						 
					 
					
						
						
							
							Improvements to ApiUsageState persistence  
						
						 
						
						
						
						
					 
					
						2020-10-20 15:50:04 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrii Shvaika 
							
						 
					 
					
						
						
						
						
							
						
						
							b598a73954 
							
						 
					 
					
						
						
							
							Renaming of UsageRecord to ApiUsageState  
						
						 
						
						
						
						
					 
					
						2020-10-19 19:51:58 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrii Shvaika 
							
						 
					 
					
						
						
						
						
							
						
						
							2e694e1d64 
							
						 
					 
					
						
						
							
							Dao layer for UsageRecords  
						
						 
						
						
						
						
					 
					
						2020-10-19 15:39:15 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Igor Kulikov 
							
						 
					 
					
						
						
						
						
							
						
						
							19b8464937 
							
						 
					 
					
						
						
							
							Merge device provisioning feature  
						
						 
						
						
						
						
					 
					
						2020-10-12 19:39:47 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Igor Kulikov 
							
						 
					 
					
						
						
						
						
							
						
						
							40be6e588c 
							
						 
					 
					
						
						
							
							Fix device wizard dialog. Fix install script for oauth2 client registration templates.  
						
						 
						
						
						
						
					 
					
						2020-10-12 18:05:26 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zbeacon 
							
						 
					 
					
						
						
						
						
							
						
						
							1a718593ec 
							
						 
					 
					
						
						
							
							Refactoring  
						
						 
						
						
						
						
					 
					
						2020-10-12 16:19:36 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Volodymyr Babak 
							
						 
					 
					
						
						
						
						
							
						
						
							95786f858c 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/edge' into feature/3.0-edge  
						
						 
						
						
						
						
					 
					
						2020-10-12 15:19:06 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrii Shvaika 
							
						 
					 
					
						
						
						
						
							
						
						
							6d185f1c01 
							
						 
					 
					
						
						
							
							Improvements to device profile rule node  
						
						 
						
						
						
						
					 
					
						2020-10-12 14:29:20 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zbeacon 
							
						 
					 
					
						
						
						
						
							
						
						
							005ad70657 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/thingsboard/thingsboard  into feature/device-provision-3.2-onlyProfileVersion  
						
						 
						
						
						
						
					 
					
						2020-10-12 13:57:01 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Volodymyr Babak 
							
						 
					 
					
						
						
						
						
							
						
						
							dd780d05df 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into feature/3.0-edge  
						
						 
						
						
						
						
					 
					
						2020-10-12 12:00:54 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Igor Kulikov 
							
						 
					 
					
						
						
						
						
							
						
						
							2b53b2f8db 
							
						 
					 
					
						
						
							
							Merge branch 'feature/dynamic-oauth2-new-table' of  https://github.com/vzikratyi-tb/thingsboard  into vzikratyi-tb-feature/dynamic-oauth2-new-table  
						
						 
						
						
						
						
					 
					
						2020-10-12 10:42:21 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zbeacon 
							
						 
					 
					
						
						
						
						
							
						
						
							35f6f40ca3 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/thingsboard/thingsboard  into feature/device-provision-3.2-onlyProfileVersion  
						
						 
						
						
						
						
					 
					
						2020-10-09 17:35:30 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zbeacon 
							
						 
					 
					
						
						
						
						
							
						
						
							93278f7236 
							
						 
					 
					
						
						
							
							Refactoring according to comments  
						
						 
						
						
						
						
					 
					
						2020-10-09 17:32:32 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vladyslav_Prykhodko 
							
						 
					 
					
						
						
						
						
							
						
						
							0f66d738c6 
							
						 
					 
					
						
						
							
							Merge upstream/master  
						
						 
						
						
						
						
					 
					
						2020-10-08 17:28:40 +03:00