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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zbeacon
							
						 
					 | 
					
						
						
						
						
							
						
						
							0427eeea9d
							
						
					 | 
					
						
						
							
							Added check - does assigned information available
						
						
						
						
						
						
					 | 
					
						2023-02-18 13:07:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							c16dfd4407
							
						
					 | 
					
						
						
							
							Alarm query updates
						
						
						
						
						
						
					 | 
					
						2023-02-17 16:15:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							d1e135d004
							
						
					 | 
					
						
						
							
							Send notification without template creation
						
						
						
						
						
						
					 | 
					
						2023-02-17 15:44:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							d77e8f0cba
							
						
					 | 
					
						
						
							
							Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into feature/alarm-assign
						
						
						
						
						
						
					 | 
					
						2023-02-17 12:44:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							f877fdef3f
							
						
					 | 
					
						
						
							
							Alarm assignee as an object
						
						
						
						
						
						
					 | 
					
						2023-02-17 12:37:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							8b6950031e
							
						
					 | 
					
						
						
							
							Alarm asignee updates
						
						
						
						
						
						
					 | 
					
						2023-02-17 12:14:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dashevchenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							b261cb2ab1
							
						
					 | 
					
						
						
							
							renamed UserData to UserEmailInfo
						
						
						
						
						
						
					 | 
					
						2023-02-17 11:12:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							04eb8c989a
							
						
					 | 
					
						
						
							
							Revert the AlarmInfo items. We will update the assignee via separate message
						
						
						
						
						
						
					 | 
					
						2023-02-16 18:47:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dashevchenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							a613e1dbc6
							
						
					 | 
					
						
						
							
							refactoring
						
						
						
						
						
						
					 | 
					
						2023-02-16 17:46:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							c392df2b8f
							
						
					 | 
					
						
						
							
							Alarm Query to fetch onloy assigned alarms
						
						
						
						
						
						
					 | 
					
						2023-02-16 14:10:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zbeacon
							
						 
					 | 
					
						
						
						
						
							
						
						
							dda627b63e
							
						
					 | 
					
						
						
							
							Added getting NameLabelAndCustomerDetails to EntityService
						
						
						
						
						
						
					 | 
					
						2023-02-16 14:03:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dashevchenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							4470ae9a05
							
						
					 | 
					
						
						
							
							added tests
						
						
						
						
						
						
					 | 
					
						2023-02-16 13:45:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dashevchenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							559b741749
							
						
					 | 
					
						
						
							
							added REST method in UserController to get users by query
						
						
						
						
						
						
					 | 
					
						2023-02-16 00:37:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							3932993b58
							
						
					 | 
					
						
						
							
							Alarm assignment improvements
						
						
						
						
						
						
					 | 
					
						2023-02-15 19:14:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dashevchenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							2c5c0a17bf
							
						
					 | 
					
						
						
							
							refactoring
						
						
						
						
						
						
					 | 
					
						2023-02-15 17:12:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dashevchenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							133c8f9ae4
							
						
					 | 
					
						
						
							
							added new column for user_credentials table
						
						
						
						
						
						
					 | 
					
						2023-02-15 12:25:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladyslav_Prykhodko
							
						 
					 | 
					
						
						
						
						
							
						
						
							3eba03cccc
							
						
					 | 
					
						
						
							
							Fixed after merge 'upstream/develop/3.5'
						
						
						
						
						
						
					 | 
					
						2023-02-14 11:39:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladyslav_Prykhodko
							
						 
					 | 
					
						
						
						
						
							
						
						
							2212a6d9be
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system
						
						
						
						
						
						
					 | 
					
						2023-02-14 11:09:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zbeacon
							
						 
					 | 
					
						
						
						
						
							
						
						
							9250af1904
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning
						
						
						
						
						
						
					 | 
					
						2023-02-13 19:55:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dashevchenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							6c5054a6e8
							
						
					 | 
					
						
						
							
							added caching, added PUT methods, refactored code
						
						
						
						
						
						
					 | 
					
						2023-02-10 17:08:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nickAS21
							
						 
					 | 
					
						
						
						
						
							
						
						
							a3e31c109c
							
						
					 | 
					
						
						
							
							sparkplug: add attributes by Metric`s name, STATE ONLINE
						
						
						
						
						
						
					 | 
					
						2023-02-09 18:49:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Volodymyr Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							e45775ce8f
							
						
					 | 
					
						
						
							
							Organize imports
						
						
						
						
						
						
					 | 
					
						2023-02-09 13:18:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Volodymyr Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							76f11c320b
							
						
					 | 
					
						
						
							
							Move update of dashboard alias to dashboard service. Added test for backward compatibility
						
						
						
						
						
						
					 | 
					
						2023-02-09 13:06:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dashevchenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							f3b6531362
							
						
					 | 
					
						
						
							
							merged with develop/3.5
						
						
						
						
						
						
					 | 
					
						2023-02-07 14:59:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dashevchenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							16c5a4f1f9
							
						
					 | 
					
						
						
							
							refactoring
						
						
						
						
						
						
					 | 
					
						2023-02-07 14:49:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dashevchenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							f214864503
							
						
					 | 
					
						
						
							
							added controller methods for saving user settings in UserController
						
						
						
						
						
						
					 | 
					
						2023-02-07 13:55:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							bbaaa6b972
							
						
					 | 
					
						
						
							
							Tests for Rule Engine component lifecycle event notification rule; improvements
						
						
						
						
						
						
					 | 
					
						2023-02-02 14:15:54 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Volodymyr Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							133856b35b
							
						
					 | 
					
						
						
							
							Added @JsonIgnore interface for newly added list of subtypes - for backward compatibility
						
						
						
						
						
						
					 | 
					
						2023-02-02 13:18:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Volodymyr Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							cbf4297593
							
						
					 | 
					
						
						
							
							Add support for dashboard filter backward compatibility
						
						
						
						
						
						
					 | 
					
						2023-02-02 13:13:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							058c97e4de
							
						
					 | 
					
						
						
							
							Fix headers and remove extra constants from Model Constants
						
						
						
						
						
						
					 | 
					
						2023-02-02 10:20:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							60c7d213cc
							
						
					 | 
					
						
						
							
							Merge branch 'develop/3.5' of github.com:AndriiLandiak/thingsboard into feature/x509-device-cert-impr
						
						
						
						
						
						
					 | 
					
						2023-02-02 10:06:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							7d9fff4e44
							
						
					 | 
					
						
						
							
							New notification rule triggers: alarm comment and Rule Engine component lifecycle event; refactoring
						
						
						
						
						
						
					 | 
					
						2023-02-01 20:00:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Volodymyr Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							d534fb31e1
							
						
					 | 
					
						
						
							
							Updated filter types - add possibility to select multiple subtypes
						
						
						
						
						
						
					 | 
					
						2023-02-01 17:21:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							0943b80d8e
							
						
					 | 
					
						
						
							
							Fix schema and micro refactoring
						
						
						
						
						
						
					 | 
					
						2023-02-01 16:49:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zbeacon
							
						 
					 | 
					
						
						
						
						
							
						
						
							26a9f10109
							
						
					 | 
					
						
						
							
							Updated alarm websocket subscriptions
						
						
						
						
						
						
					 | 
					
						2023-01-31 18:41:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladyslav_Prykhodko
							
						 
					 | 
					
						
						
						
						
							
						
						
							8174a97926
							
						
					 | 
					
						
						
							
							Merge with klimov/feature/notification-system
						
						
						
						
						
						
					 | 
					
						2023-01-31 17:46:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							a203c336f1
							
						
					 | 
					
						
						
							
							Merge with master
						
						
						
						
						
						
					 | 
					
						2023-01-31 16:20:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							63dbd1ef68
							
						
					 | 
					
						
						
							
							Refactor SlackNotificationTargetConfig
						
						
						
						
						
						
					 | 
					
						2023-01-31 13:19:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							789120e2c9
							
						
					 | 
					
						
						
							
							Notification rules: more tests, additionalConfig with description; refactor NotificationSettings
						
						
						
						
						
						
					 | 
					
						2023-01-31 13:12:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							cbdc4517e4
							
						
					 | 
					
						
						
							
							Update license header year to 2023
						
						
						
						
						
						
					 | 
					
						2023-01-31 10:43:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							5cd82cfda3
							
						
					 | 
					
						
						
							
							Notification rule info; api to get targets by ids array
						
						
						
						
						
						
					 | 
					
						2023-01-30 15:39:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							be5eed96dc
							
						
					 | 
					
						
						
							
							Slack notification target; refactoring
						
						
						
						
						
						
					 | 
					
						2023-01-30 14:50:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ShvaykaD
							
						 
					 | 
					
						
						
						
						
							
						
						
							f5e20b5a3e
							
						
					 | 
					
						
						
							
							move default queue names and topics to DataConstants
						
						
						
						
						
						
					 | 
					
						2023-01-26 13:37:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							e8543f39d5
							
						
					 | 
					
						
						
							
							Fix CacheKey toString and validation logs
						
						
						
						
						
						
					 | 
					
						2023-01-24 16:37:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Volodymyr Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							08114319eb
							
						
					 | 
					
						
						
							
							DEPRECATED - deprecated. Revert ENTITY_MERGE_RPC_MESSAGE and set as deprecated
						
						
						
						
						
						
					 | 
					
						2023-01-24 12:56:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Volodymyr Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							f7db1d6612
							
						
					 | 
					
						
						
							
							Revert deprecated enum
						
						
						
						
						
						
					 | 
					
						2023-01-23 17:03:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Volodymyr Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							94c69acf5d
							
						
					 | 
					
						
						
							
							Introduced BaseDeviceEdgeProcessor
						
						
						
						
						
						
					 | 
					
						2023-01-23 12:21:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							7957da4a9e
							
						
					 | 
					
						
						
							
							Updated: send full chain to kafka with single message and do whole logic on core
						
						
						
						
						
						
					 | 
					
						2023-01-20 19:02:14 +02:00 | 
					
					
						
						
							
							
							
						
					 |