Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							42f4c0c2be
							
						
					 | 
					
						
						
							
							Merge pull request #8293 from adovh/bug/fix-1899-rulechain-messages-sent-to-wrong-tenant
						
						
						
						
						
						
						
						fix rulechain messages sent to wrong tenant 
						
						
					 | 
					
						2023-04-06 13:09:09 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladyslav_Prykhodko
							
						 
					 | 
					
						
						
						
						
							
						
						
							61537ac5cb
							
						
					 | 
					
						
						
							
							Updated rule node core config
						
						
						
						
						
						
					 | 
					
						2023-04-06 11:49:36 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							7aa215f49d
							
						
					 | 
					
						
						
							
							Fix notification request update handling in cluster mode; Rule nodes fixes
						
						
						
						
						
						
					 | 
					
						2023-04-05 14:28:50 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladyslav_Prykhodko
							
						 
					 | 
					
						
						
						
						
							
						
						
							ef94a8c198
							
						
					 | 
					
						
						
							
							UI: Add new rule node and refactoring code
						
						
						
						
						
						
					 | 
					
						2023-04-04 18:08:44 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							a4ad8feb7f
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/improvements/notification-system' into improvements/notification-system
						
						
						
						
						
						
					 | 
					
						2023-04-04 12:58:57 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							bbaf2a5054
							
						
					 | 
					
						
						
							
							Notification rule trigger via ClusterService
						
						
						
						
						
						
					 | 
					
						2023-04-04 12:58:47 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladyslav_Prykhodko
							
						 
					 | 
					
						
						
						
						
							
						
						
							c4bb1d8476
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop/3.5' into improvements/notification-system
						
						
						
						
						
						
					 | 
					
						2023-04-04 12:52:24 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							28a90e965a
							
						
					 | 
					
						
						
							
							Merge pull request #8274 from volodymyr-babak/edge-alarm-id
						
						
						
						
						
						
						
						[3.5] Alarm entity that was delivered from the edge is stored with provided ID 
						
						
					 | 
					
						2023-04-04 12:19:39 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							d221cf1354
							
						
					 | 
					
						
						
							
							Slack rule node refactoring; default notification settings improvements
						
						
						
						
						
						
					 | 
					
						2023-04-03 20:20:46 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd50eabd40
							
						
					 | 
					
						
						
							
							Notification rule node; refactoring
						
						
						
						
						
						
					 | 
					
						2023-04-03 19:02:23 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								AndriiD
							
						 
					 | 
					
						
						
						
						
							
						
						
							58da439240
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/develop/3.5' into bug/fix-1899-rulechain-messages-sent-to-wrong-tenant
						
						
						
						
						
						
					 | 
					
						2023-04-03 16:33:56 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Volodymyr Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d4f1e31dc
							
						
					 | 
					
						
						
							
							Code review updates - remove redundant alarmService.findById - use correct alarm service method based on msg type
						
						
						
						
						
						
					 | 
					
						2023-04-03 13:41:02 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								AndriiD
							
						 
					 | 
					
						
						
						
						
							
						
						
							d8dbf94162
							
						
					 | 
					
						
						
							
							added entity check in rulenode init
						
						
						
						
						
						
					 | 
					
						2023-03-31 16:27:00 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladyslav_Prykhodko
							
						 
					 | 
					
						
						
						
						
							
						
						
							8874dfa35a
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop/3.5' into improvements/notification-system
						
						
						
						
						
						
					 | 
					
						2023-03-31 12:50:46 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							64fe075fdd
							
						
					 | 
					
						
						
							
							Update rule nodes UI
						
						
						
						
						
						
					 | 
					
						2023-03-30 19:04:58 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							c4827f20f3
							
						
					 | 
					
						
						
							
							API usage limit notification rule
						
						
						
						
						
						
					 | 
					
						2023-03-28 13:29:49 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							b53f656f72
							
						
					 | 
					
						
						
							
							added notification entities to the TenantIdLoader
						
						
						
						
						
						
					 | 
					
						2023-03-23 23:39:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							4ea97e6f30
							
						
					 | 
					
						
						
							
							Configured notification delivery methods check
						
						
						
						
						
						
					 | 
					
						2023-03-23 15:10:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							0308b0128d
							
						
					 | 
					
						
						
							
							Entities limit notifications
						
						
						
						
						
						
					 | 
					
						2023-03-20 17:33:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e7c1a8a5a
							
						
					 | 
					
						
						
							
							Merge branch 'develop/3.5' into feature/notification-system
						
						
						
						
						
						
					 | 
					
						2023-03-16 13:12:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							4a20adc62e
							
						
					 | 
					
						
						
							
							Alarm related notification rules
						
						
						
						
						
						
					 | 
					
						2023-03-16 13:12:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							0d07d70818
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/notification-system' into feature/notification-system
						
						
						
						
						
						
					 | 
					
						2023-03-15 12:32:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							ba8f27fa76
							
						
					 | 
					
						
						
							
							Notification system refactoring and improvements
						
						
						
						
						
						
					 | 
					
						2023-03-15 12:32:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Matvienko
							
						 
					 | 
					
						
						
						
						
							
						
						
							b00f5d26ae
							
						
					 | 
					
						
						
							
							log node refactored and tests improved
						
						
						
						
						
						
					 | 
					
						2023-03-14 13:48:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							ab5769a252
							
						
					 | 
					
						
						
							
							Merge with develop/3.5
						
						
						
						
						
						
					 | 
					
						2023-03-13 15:52:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Matvienko
							
						 
					 | 
					
						
						
						
						
							
						
						
							2f207d5a26
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'ce/develop/3.5' into fix/logNode-isStandardForTBEL
						
						
						
						
						
						
					 | 
					
						2023-03-13 13:06:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							e058786956
							
						
					 | 
					
						
						
							
							Merge pull request #8174 from zzzeebra/feature/junit5-migration-exceptions
						
						
						
						
						
						
						
						[3.5] junit5 migration - exception annotation refactoring 
						
						
					 | 
					
						2023-03-10 12:51:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							a56261ac9d
							
						
					 | 
					
						
						
							
							Merge with develop/3.5
						
						
						
						
						
						
					 | 
					
						2023-03-08 13:11:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							aadf7f8295
							
						
					 | 
					
						
						
							
							Merge with develop/3.5
						
						
						
						
						
						
					 | 
					
						2023-03-06 17:59:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							fefc6df533
							
						
					 | 
					
						
						
							
							Merge with master
						
						
						
						
						
						
					 | 
					
						2023-03-06 16:33:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oleksandra Matviienko
							
						 
					 | 
					
						
						
						
						
							
						
						
							7327adf239
							
						
					 | 
					
						
						
							
							junit5: TbGetTelemetryNodeTest annotation exceptions refactoring
						
						
						
						
						
						
					 | 
					
						2023-03-06 15:17:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladyslav_Prykhodko
							
						 
					 | 
					
						
						
						
						
							
						
						
							069ef4de5b
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system
						
						
						
						
						
						
					 | 
					
						2023-03-06 10:21:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							639eb3459d
							
						
					 | 
					
						
						
							
							Merge branch 'develop/3.5' into feature/angular15
						
						
						
						
						
						
					 | 
					
						2023-03-03 17:42:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							79670d9f9d
							
						
					 | 
					
						
						
							
							Notification system improvements
						
						
						
						
						
						
					 | 
					
						2023-02-28 19:19:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							ce77d5d1bc
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/angular15' into feature/alarm-assign
						
						
						
						
						
						
					 | 
					
						2023-02-28 18:34:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Matvienko
							
						 
					 | 
					
						
						
						
						
							
						
						
							27f5f8c077
							
						
					 | 
					
						
						
							
							Cassandra tests moved from cassandra-unit to testcontainers
						
						
						
						
						
						
					 | 
					
						2023-02-28 16:31:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							d2876e7a79
							
						
					 | 
					
						
						
							
							Merge branch 'develop/3.5' into feature/angular15
						
						
						
						
						
						
					 | 
					
						2023-02-28 15:15:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							1b73595e59
							
						
					 | 
					
						
						
							
							UI: Angular 15 migration
						
						
						
						
						
						
					 | 
					
						2023-02-28 15:14:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								AndriiD
							
						 
					 | 
					
						
						
						
						
							
						
						
							1ce1ed6665
							
						
					 | 
					
						
						
							
							added rulenode-core-config.js
						
						
						
						
						
						
					 | 
					
						2023-02-28 14:19:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							76b133376c
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/develop/3.5' into feature/alarm-assign
						
						
						
						
						
						
					 | 
					
						2023-02-28 13:38:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							38b2cf41c4
							
						
					 | 
					
						
						
							
							Fix soem tests and added upgrade script
						
						
						
						
						
						
					 | 
					
						2023-02-24 14:56:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							69b5a5f425
							
						
					 | 
					
						
						
							
							Alarm Service refactoring
						
						
						
						
						
						
					 | 
					
						2023-02-23 19:03:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							c922bbb989
							
						
					 | 
					
						
						
							
							Alarm service refactroing
						
						
						
						
						
						
					 | 
					
						2023-02-23 12:31:07 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Volodymyr Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							d93ba0e751
							
						
					 | 
					
						
						
							
							Code simplify - remove method
						
						
						
						
						
						
					 | 
					
						2023-02-22 16:29:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Volodymyr Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							d0fbecc4c5
							
						
					 | 
					
						
						
							
							Organize imports
						
						
						
						
						
						
					 | 
					
						2023-02-22 16:10:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Volodymyr Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							1a6cd82461
							
						
					 | 
					
						
						
							
							License header fix
						
						
						
						
						
						
					 | 
					
						2023-02-22 13:29:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Volodymyr Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							881cc886f9
							
						
					 | 
					
						
						
							
							Add newline to end of files
						
						
						
						
						
						
					 | 
					
						2023-02-21 16:53:08 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Volodymyr Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							9bbb88ab0f
							
						
					 | 
					
						
						
							
							Add functionality to support multiple certificate entries in pem file
						
						
						
						
						
						
					 | 
					
						2023-02-21 16:50:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							feb84ace48
							
						
					 | 
					
						
						
							
							Deprecation of the alarm status
						
						
						
						
						
						
					 | 
					
						2023-02-20 17:11:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							dd5c970b3a
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/develop/3.5' into feature/notification-system
						
						
						
						
						
						
						
						# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/BaseController.java 
						
						
					 | 
					
						2023-02-20 12:57:32 +02:00 | 
					
					
						
						
							
							
							
						
					 |