nickAS21
							
						 
					 | 
					
						
						
						
						
							
						
						
							f36fc44afc
							
						
					 | 
					
						
						
							
							Merge branch 'develop/3.4' into refactoring_tests_alarm_customer
						
						
						
						
						
						
					 | 
					
						2022-06-14 15:18:01 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							6351366aed
							
						
					 | 
					
						
						
							
							fixed device profile node
						
						
						
						
						
						
					 | 
					
						2022-06-13 10:57:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nickAS21
							
						 
					 | 
					
						
						
						
						
							
						
						
							0cd24bb16e
							
						
					 | 
					
						
						
							
							refactoring: alarm - test start
						
						
						
						
						
						
					 | 
					
						2022-06-12 20:28:12 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							44749f1306
							
						
					 | 
					
						
						
							
							Merge pull request #5818 from desoliture1/alarmScheduleDynamicValues
						
						
						
						
						
						
						
						[3.4] Add support for dynamic values for schedules in alarm rules 
						
						
					 | 
					
						2022-06-10 17:46:32 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladyslav_Prykhodko
							
						 
					 | 
					
						
						
						
						
							
						
						
							484a62b964
							
						
					 | 
					
						
						
							
							Updated rulenode-core-config
						
						
						
						
						
						
					 | 
					
						2022-06-02 11:40:39 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							44403cd2c2
							
						
					 | 
					
						
						
							
							merge with develop/3.4
						
						
						
						
						
						
					 | 
					
						2022-06-01 21:55:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Viacheslav Klimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							985f7c79aa
							
						
					 | 
					
						
						
							
							2FA refactoring
						
						
						
						
						
						
					 | 
					
						2022-05-27 12:34:12 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Viacheslav Klimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							906d421f2d
							
						
					 | 
					
						
						
							
							Merge branch 'develop/3.4' into feature/2fa
						
						
						
						
						
						
					 | 
					
						2022-05-26 17:44:38 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							fa4a20d711
							
						
					 | 
					
						
						
							
							Added resolve by queue name for backward compatibility
						
						
						
						
						
						
					 | 
					
						2022-05-19 10:04:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							abe127c3fa
							
						
					 | 
					
						
						
							
							fixed checkpoint node
						
						
						
						
						
						
					 | 
					
						2022-05-19 01:18:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Viacheslav Klimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							866ad82187
							
						
					 | 
					
						
						
							
							Email 2FA verification message improvements
						
						
						
						
						
						
					 | 
					
						2022-05-18 12:50:12 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Viacheslav Klimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							41fede9b43
							
						
					 | 
					
						
						
							
							Add checks for SMS and mail service when setting up 2FA provider; 2Fa verification mail template
						
						
						
						
						
						
					 | 
					
						2022-05-17 18:31:49 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							b037fb09b0
							
						
					 | 
					
						
						
							
							merge with develop/3.4
						
						
						
						
						
						
					 | 
					
						2022-05-16 12:59:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							321730ed02
							
						
					 | 
					
						
						
							
							added upgrade for queues
						
						
						
						
						
						
					 | 
					
						2022-05-11 23:02:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fe-dev
							
						 
					 | 
					
						
						
						
						
							
						
						
							bdf1807223
							
						
					 | 
					
						
						
							
							UI: Update rulenode core
						
						
						
						
						
						
					 | 
					
						2022-05-11 14:20:37 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc3c2cfec2
							
						
					 | 
					
						
						
							
							merge with develop/3.4
						
						
						
						
						
						
					 | 
					
						2022-05-09 22:27:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Viacheslav Klimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							a85dcdbd3c
							
						
					 | 
					
						
						
							
							Merge branch 'develop/3.4' into feature/2fa
						
						
						
						
						
						
						
						# Conflicts:
#	application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
#	pom.xml
#	ui-ngx/src/assets/locale/locale.constant-en_US.json 
						
						
					 | 
					
						2022-05-06 11:42:10 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Viacheslav Klimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							4480badd78
							
						
					 | 
					
						
						
							
							Email 2FA provider; 2FA API improvements
						
						
						
						
						
						
					 | 
					
						2022-05-05 18:08:54 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							15104028ea
							
						
					 | 
					
						
						
							
							Investigating the cache issues
						
						
						
						
						
						
					 | 
					
						2022-04-29 16:12:22 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Matvienko
							
						 
					 | 
					
						
						
						
						
							
						
						
							ca8df0130f
							
						
					 | 
					
						
						
							
							TbLogNode.java standard implementation without calling JS when JsScript equals default config
						
						
						
						
						
						
					 | 
					
						2022-04-26 15:26:31 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Volodymyr Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							878d9743ce
							
						
					 | 
					
						
						
							
							Organize imports
						
						
						
						
						
						
					 | 
					
						2022-04-20 18:11:29 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Volodymyr Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							f8687cb983
							
						
					 | 
					
						
						
							
							Make save edge event method async
						
						
						
						
						
						
					 | 
					
						2022-04-20 17:17:46 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							65be4cd16c
							
						
					 | 
					
						
						
							
							Merge pull request #6437 from volodymyr-babak/fix-push-to-edge-node
						
						
						
						
						
						
						
						[3.4] Fixes for bug - push to edge node generates timeout message 
						
						
					 | 
					
						2022-04-20 14:08:09 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							9dacc93c2d
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop/3.4
						
						
						
						
						
						
					 | 
					
						2022-04-20 11:49:21 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							75e2b60eb8
							
						
					 | 
					
						
						
							
							Implemented isolated rule engine queue consumers
						
						
						
						
						
						
					 | 
					
						2022-04-19 23:02:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Volodymyr Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							5b4e92974d
							
						
					 | 
					
						
						
							
							Use getMetadataTs method instead of direct fetch from metadata
						
						
						
						
						
						
					 | 
					
						2022-04-19 10:21:26 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Volodymyr Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							978861e56c
							
						
					 | 
					
						
						
							
							Minor refactoring. Added missing timeseries_updated message type
						
						
						
						
						
						
					 | 
					
						2022-04-18 11:52:23 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Volodymyr Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							ef4adbda7b
							
						
					 | 
					
						
						
							
							Ack messages in case no edges are related. Refactored push to cloud/edge nodes
						
						
						
						
						
						
					 | 
					
						2022-04-18 11:52:14 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							4e4ac0012c
							
						
					 | 
					
						
						
							
							used queueId instead of queueName in DeviceProfile and TbMsg
						
						
						
						
						
						
					 | 
					
						2022-04-13 21:55:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							19b5c59034
							
						
					 | 
					
						
						
							
							fixed kafka node (success if error not null)
						
						
						
						
						
						
					 | 
					
						2022-03-24 23:03:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Viacheslav Klimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							d746a04186
							
						
					 | 
					
						
						
							
							Merge branch 'develop/3.4' into feature/2fa
						
						
						
						
						
						
						
						# Conflicts:
#	application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java 
						
						
					 | 
					
						2022-03-22 15:54:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Viacheslav Klimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							062af3af81
							
						
					 | 
					
						
						
							
							2FA: cleanup code
						
						
						
						
						
						
					 | 
					
						2022-03-21 09:21:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							d7efbd6eba
							
						
					 | 
					
						
						
							
							Merge with master
						
						
						
						
						
						
					 | 
					
						2022-03-15 12:42:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Viacheslav Klimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							e2c9a5ffdf
							
						
					 | 
					
						
						
							
							TOTP and SMS 2FA providers; 2FA set-up API
						
						
						
						
						
						
					 | 
					
						2022-03-10 17:59:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							6d57293bb9
							
						
					 | 
					
						
						
							
							Update rule nodes configuration UI: Fix required message for 'Period key value' field of 'calculate delta' rule node.
						
						
						
						
						
						
					 | 
					
						2022-03-02 14:28:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							17b127b6b8
							
						
					 | 
					
						
						
							
							Performance improvements to launch sequence
						
						
						
						
						
						
					 | 
					
						2022-03-02 08:02:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							6270c185ae
							
						
					 | 
					
						
						
							
							Create Alarm Rule Node - option to owerride alarm details for alarm from message.
						
						
						
						
						
						
					 | 
					
						2022-02-28 16:36:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							4775869786
							
						
					 | 
					
						
						
							
							Merge branch 'master' into develop/3.4
						
						
						
						
						
						
					 | 
					
						2022-02-28 11:48:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							76faf274f6
							
						
					 | 
					
						
						
							
							Merge pull request #6133 from desoliture1/alarmRuleNodePropagateToTenantFix
						
						
						
						
						
						
						
						[3.3.4] Fix building alarms in `TbCreateAlarmNode` 
						
						
					 | 
					
						2022-02-22 00:01:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							dabd25e760
							
						
					 | 
					
						
						
							
							Version set to 3.4.0-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2022-02-21 12:19:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								desoliture
							
						 
					 | 
					
						
						
						
						
							
						
						
							95a426015e
							
						
					 | 
					
						
						
							
							add corresponding test
						
						
						
						
						
						
					 | 
					
						2022-02-18 16:58:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								desoliture
							
						 
					 | 
					
						
						
						
						
							
						
						
							570eda50d0
							
						
					 | 
					
						
						
							
							fix building alarms in TbCreateAlarmNode
						
						
						
						
						
						
					 | 
					
						2022-02-18 16:12:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							24829c29f7
							
						
					 | 
					
						
						
							
							Workaround for KAFKA-4090
						
						
						
						
						
						
					 | 
					
						2022-02-14 15:38:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								desoliture
							
						 
					 | 
					
						
						
						
						
							
						
						
							e6053e8e7d
							
						
					 | 
					
						
						
							
							Merge branch 'master' into alarmScheduleDynamicValues
						
						
						
						
						
						
						
						# Conflicts:
#	rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmRuleState.java
#	ui-ngx/src/app/modules/home/components/home-components.module.ts 
						
						
					 | 
					
						2022-02-08 13:28:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							423a9e2e04
							
						
					 | 
					
						
						
							
							Update 'gps geofencing events' node default configuration. Update rule nodes configuration UI
						
						
						
						
						
						
					 | 
					
						2022-02-07 12:53:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							99afad3f6f
							
						
					 | 
					
						
						
							
							Merge branch 'master' of github.com:thingsboard/thingsboard
						
						
						
						
						
						
					 | 
					
						2022-02-07 12:14:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							8a50270feb
							
						
					 | 
					
						
						
							
							Add support of configurable perimeter key name while fetching perimeter from metadata.
						
						
						
						
						
						
					 | 
					
						2022-02-07 12:13:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							312924a19b
							
						
					 | 
					
						
						
							
							Version set to 3.3.4-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2022-02-07 09:55:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								desoliture
							
						 
					 | 
					
						
						
						
						
							
						
						
							ae85dae8bd
							
						
					 | 
					
						
						
							
							fix processing isActive logic in custom schedules when endsOn equals zero
						
						
						
						
						
						
					 | 
					
						2022-02-01 18:23:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							e8eb7083b3
							
						
					 | 
					
						
						
							
							Update rule nodes UI
						
						
						
						
						
						
					 | 
					
						2022-01-27 09:51:05 +02:00 | 
					
					
						
						
							
							
							
						
					 |