irynamatveieva
							
						 
					 | 
					
						
						
						
						
							
						
						
							649a8b65fd
							
						
					 | 
					
						
						
							
							fixed conflicts
						
						
						
						
						
						
					 | 
					
						2024-07-31 15:02:41 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							468c007882
							
						
					 | 
					
						
						
							
							Version set to 3.7.1-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2024-06-20 15:53:41 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								IrynaMatveieva
							
						 
					 | 
					
						
						
						
						
							
						
						
							74ac5a949f
							
						
					 | 
					
						
						
							
							added rule engine controller and send rest api call reply node
						
						
						
						
						
						
					 | 
					
						2024-05-14 10:05:41 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oleksandra Matviienko
							
						 
					 | 
					
						
						
						
						
							
						
						
							3d820bace6
							
						
					 | 
					
						
						
							
							junit-platform.properties and logback-test.xml added to rule-engine-api
						
						
						
						
						
						
						
						Signed-off-by: Oleksandra Matviienko <al.zzzeebra@gmail.com> 
						
						
					 | 
					
						2024-04-26 13:39:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oleksandra Matviienko
							
						 
					 | 
					
						
						
						
						
							
						
						
							e3be868bc6
							
						
					 | 
					
						
						
							
							JUnit5 migration in rule-engine-api
						
						
						
						
						
						
						
						Signed-off-by: Oleksandra Matviienko <al.zzzeebra@gmail.com> 
						
						
					 | 
					
						2024-04-26 13:30:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							ce44bbc248
							
						
					 | 
					
						
						
							
							Merge with hotfix/3.6.3
						
						
						
						
						
						
					 | 
					
						2024-04-11 17:52:26 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dashevchenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							dae4f313e2
							
						
					 | 
					
						
						
							
							merged with master
						
						
						
						
						
						
					 | 
					
						2024-03-26 19:09:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed44db6d25
							
						
					 | 
					
						
						
							
							Add delivery_method column to notification; persist mobile notifications
						
						
						
						
						
						
					 | 
					
						2024-03-22 14:20:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							4ed952a9d6
							
						
					 | 
					
						
						
							
							Merge branch 'master' into develop/3.7
						
						
						
						
						
						
					 | 
					
						2024-03-19 15:44:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dashevchenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							c1093dd627
							
						
					 | 
					
						
						
							
							merged with master
						
						
						
						
						
						
					 | 
					
						2024-03-04 11:54:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							a8e1ac9257
							
						
					 | 
					
						
						
							
							Merge pull request #8522 from thingsboard/feature/push-notifications
						
						
						
						
						
						
						
						Notifications to mobile app 
						
						
					 | 
					
						2024-02-16 16:15:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dmytro Skarzhynets
							
						 
					 | 
					
						
						
						
						
							
						
						
							e55d14325a
							
						
					 | 
					
						
						
							
							Refactor rate limiting to be configurable and use existing class
						
						
						
						
						
						
					 | 
					
						2024-02-15 17:09:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dashevchenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							aa24da06ea
							
						
					 | 
					
						
						
							
							TenantIdLoaderTest fix
						
						
						
						
						
						
					 | 
					
						2024-02-09 16:13:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladyslav_Prykhodko
							
						 
					 | 
					
						
						
						
						
							
						
						
							2023ddeb6c
							
						
					 | 
					
						
						
							
							Merge branch 'feature/push-notifications' of github.com:thingsboard/thingsboard into feature/push-notifications
						
						
						
						
						
						
					 | 
					
						2024-02-07 17:47:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							c7dd55925a
							
						
					 | 
					
						
						
							
							Mobile notifications: additionalConfig and Firebase notification data
						
						
						
						
						
						
					 | 
					
						2024-02-07 17:28:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							d2961e39e7
							
						
					 | 
					
						
						
							
							merge with master
						
						
						
						
						
						
					 | 
					
						2024-02-06 22:40:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dmytro Skarzhynets
							
						 
					 | 
					
						
						
						
						
							
						
						
							eadcf916f5
							
						
					 | 
					
						
						
							
							Add optimization using separate service which routes activity actions to device state service directly, when running in monolith. Refactor rule node tests
						
						
						
						
						
						
					 | 
					
						2024-01-26 16:15:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladyslav_Prykhodko
							
						 
					 | 
					
						
						
						
						
							
						
						
							31dad36129
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into feature/push-notifications
						
						
						
						
						
						
					 | 
					
						2024-01-25 16:40:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							4336c77461
							
						
					 | 
					
						
						
							
							Merge pull request #9937 from ksstech/event-audit-logs-services
						
						
						
						
						
						
						
						[3.6.3] Add Event and Audit Logs services to TbContext. 
						
						
					 | 
					
						2024-01-16 11:49:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							5acf527f1a
							
						
					 | 
					
						
						
							
							Version set to 3.7.0-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2024-01-16 11:43:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							a3471c367a
							
						
					 | 
					
						
						
							
							Merge PR#9968
						
						
						
						
						
						
					 | 
					
						2024-01-16 11:35:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							60be820915
							
						
					 | 
					
						
						
							
							merge with master
						
						
						
						
						
						
					 | 
					
						2024-01-15 18:51:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							78bcb5c4b4
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop/3.7' into feature/broadcast-logs-improvement
						
						
						
						
						
						
					 | 
					
						2024-01-11 16:46:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladyslav_Prykhodko
							
						 
					 | 
					
						
						
						
						
							
						
						
							83c3a6b3c9
							
						
					 | 
					
						
						
							
							Updated license header
						
						
						
						
						
						
					 | 
					
						2024-01-09 16:34:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladyslav_Prykhodko
							
						 
					 | 
					
						
						
						
						
							
						
						
							5739802fda
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into feature/push-notifications
						
						
						
						
						
						
					 | 
					
						2024-01-09 15:20:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dashevchenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							56f9dce242
							
						
					 | 
					
						
						
							
							updated BaseAttributeService, InternalTelemetryService, RuleEngineTelemetryService to store old methods for backward compatibility
						
						
						
						
						
						
					 | 
					
						2024-01-09 12:27:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							c0036d22c0
							
						
					 | 
					
						
						
							
							merge with master
						
						
						
						
						
						
					 | 
					
						2024-01-09 09:57:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5a72ed8df
							
						
					 | 
					
						
						
							
							Update license header to 2024 year.
						
						
						
						
						
						
					 | 
					
						2024-01-09 10:46:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							5647db457a
							
						
					 | 
					
						
						
							
							Merge branch 'develop/3.6.3' of github.com:thingsboard/thingsboard into feature/queue-in-rule-node
						
						
						
						
						
						
					 | 
					
						2024-01-08 13:31:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								devaskim
							
						 
					 | 
					
						
						
						
						
							
						
						
							c46b777618
							
						
					 | 
					
						
						
							
							Add Event and Audit Logs services to TbContext.
						
						
						
						
						
						
					 | 
					
						2024-01-03 21:32:59 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Volodymyr Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							d329df0323
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into feature/broadcast-logs-improvement
						
						
						
						
						
						
					 | 
					
						2024-01-02 19:37:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							7bf58e3891
							
						
					 | 
					
						
						
							
							Major refactoring for mobile app notifications
						
						
						
						
						
						
					 | 
					
						2023-12-28 12:30:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							bc35df1dd7
							
						
					 | 
					
						
						
							
							Version set to 3.6.3-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2023-12-27 12:58:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							6c0c891f60
							
						
					 | 
					
						
						
							
							Merge branch 'master' into feature/push-notifications
						
						
						
						
						
						
						
						# Conflicts:
#	application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
#	common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationDeliveryMethod.java
#	common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/NotificationTargetType.java
#	common/data/src/main/java/org/thingsboard/server/common/data/notification/template/DeliveryMethodNotificationTemplate.java
#	pom.xml
#	ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html
#	ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.scss
#	ui-ngx/src/app/modules/home/pages/notification/template/template-configuration.ts
#	ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.html
#	ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.scss
#	ui-ngx/src/app/shared/models/notification.models.ts 
						
						
					 | 
					
						2023-12-27 11:49:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							feb44656f1
							
						
					 | 
					
						
						
							
							merge with master
						
						
						
						
						
						
					 | 
					
						2023-12-26 00:58:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							4101fc3963
							
						
					 | 
					
						
						
							
							added upgrade tests, and minor fixes
						
						
						
						
						
						
					 | 
					
						2023-12-14 21:14:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e2c7f9579
							
						
					 | 
					
						
						
							
							refactoring
						
						
						
						
						
						
					 | 
					
						2023-12-13 10:35:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							e8dc2ddc2d
							
						
					 | 
					
						
						
							
							used TbNodeUpgradeUtils instead of rule-node upgrade
						
						
						
						
						
						
					 | 
					
						2023-12-12 20:47:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							6249bcc42b
							
						
					 | 
					
						
						
							
							Merge pull request #9416 from engix-ltd/entity-service-in-actor-context
						
						
						
						
						
						
						
						Add entity service to actor context. 
						
						
					 | 
					
						2023-12-12 15:08:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							3fea0f88f3
							
						
					 | 
					
						
						
							
							moved queueName from rule-node config to rule-node
						
						
						
						
						
						
					 | 
					
						2023-12-12 14:03:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							5191b690b7
							
						
					 | 
					
						
						
							
							Resolve entity's owner users in TbNotificationNode
						
						
						
						
						
						
					 | 
					
						2023-12-06 12:57:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dashevchenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							08727b4c36
							
						
					 | 
					
						
						
							
							added executor provider for pubsub queue, added env variable to manage pubsub queue executor provider thread pool
						
						
						
						
						
						
					 | 
					
						2023-11-15 14:51:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dashevchenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							4f22ef9733
							
						
					 | 
					
						
						
							
							created PubSubExecutor to use each time publisher is created and do not produce too much threads created
						
						
						
						
						
						
					 | 
					
						2023-11-14 17:36:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							df24c363ce
							
						
					 | 
					
						
						
							
							Version set to 3.6.2-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2023-11-13 17:07:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ShvaykaD
							
						 
					 | 
					
						
						
						
						
							
						
						
							92178384ea
							
						
					 | 
					
						
						
							
							added TbNodeUpgradeUtils && fixed upgrade when config is null or NullNode
						
						
						
						
						
						
					 | 
					
						2023-11-10 15:42:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							d2cda21d25
							
						
					 | 
					
						
						
							
							Merge hotfix branch
						
						
						
						
						
						
					 | 
					
						2023-11-01 10:24:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							be4c408324
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/hotfix/3.6' into feature/core-proto-subtype-implementation
						
						
						
						
						
						
					 | 
					
						2023-10-25 16:30:43 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							f01cbe0e36
							
						
					 | 
					
						
						
							
							Refactoring ToCoreNotificationMsg: implement replacement for raw bytes messages
						
						
						
						
						
						
					 | 
					
						2023-10-23 10:10:02 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								devaskim
							
						 
					 | 
					
						
						
						
						
							
						
						
							c3c7213004
							
						
					 | 
					
						
						
							
							Add entity service to actor context.
						
						
						
						
						
						
					 | 
					
						2023-10-15 18:04:21 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							cca7a87c19
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into feature/broadcast-logs-improvement
						
						
						
						
						
						
					 | 
					
						2023-10-11 13:13:03 +03:00 | 
					
					
						
						
							
							
							
						
					 |