ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							238e15f77d
							
						
					 | 
					
						
						
							
							Merge with master
						
						
						
						
						
						
					 | 
					
						2023-11-02 11:20:54 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							70eb9030c2
							
						
					 | 
					
						
						
							
							Image resources
						
						
						
						
						
						
					 | 
					
						2023-11-01 14:16:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							2a4cabc2bc
							
						
					 | 
					
						
						
							
							Merge branch 'feature/edge-resource-support' of github.com:AndriiLandiak/thingsboard
						
						
						
						
						
						
					 | 
					
						2023-10-31 17:59:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							3ec2e0956f
							
						
					 | 
					
						
						
							
							Merge pull request #9185 from AndriiLandiak/feature/edge-sync-improvement
						
						
						
						
						
						
						
						Edge Synchronization improvement using EdgeId 
						
						
					 | 
					
						2023-10-31 17:54:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							1378cafbef
							
						
					 | 
					
						
						
							
							Merge branch 'feature/edge-sync-improvement' into feature/edge-resource-support
						
						
						
						
						
						
					 | 
					
						2023-10-31 10:46:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							42e67c0d7e
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into feature/edge-resource-support
						
						
						
						
						
						
					 | 
					
						2023-10-27 12:21:42 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dashevchenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e53280ca8
							
						
					 | 
					
						
						
							
							added api request parameter to retrieve all tenant bundles without system
						
						
						
						
						
						
					 | 
					
						2023-10-26 17:04:25 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ShvaykaD
							
						 
					 | 
					
						
						
						
						
							
						
						
							6701ef46f5
							
						
					 | 
					
						
						
							
							fixed upgrade script for rule nodes
						
						
						
						
						
						
					 | 
					
						2023-10-18 11:00:20 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Volodymyr Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							919e0c5081
							
						
					 | 
					
						
						
							
							Code review. Minor refactoring: Sync -> EdgeId. Logging updates. Avoid usage of OBJECT_MAPPER.
						
						
						
						
						
						
					 | 
					
						2023-10-12 15:55:39 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Volodymyr Babak
							
						 
					 | 
					
						
						
						
						
							
						
						
							38dabc7f38
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into feature/edge-sync-improvement
						
						
						
						
						
						
					 | 
					
						2023-10-12 15:16:40 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							cca7a87c19
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into feature/broadcast-logs-improvement
						
						
						
						
						
						
					 | 
					
						2023-10-11 13:13:03 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							5ace34bccf
							
						
					 | 
					
						
						
							
							Improve code, fix failing tests
						
						
						
						
						
						
					 | 
					
						2023-10-11 12:37:48 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							987bcf476c
							
						
					 | 
					
						
						
							
							Add syncManager for EntityStateListener because of actor creation problem
						
						
						
						
						
						
					 | 
					
						2023-10-11 10:37:03 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							917d90d87d
							
						
					 | 
					
						
						
							
							Merge pull request #9381 from YevhenBondarenko/fix/alarm-service
						
						
						
						
						
						
						
						alarm service improvements (removed deprecated methods) 
						
						
					 | 
					
						2023-10-10 11:01:02 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							a1d73faa26
							
						
					 | 
					
						
						
							
							Merge pull request #9388 from thingsboard/hotfix/3.6
						
						
						
						
						
						
						
						Hotfix/3.6 
						
						
					 | 
					
						2023-10-10 11:00:35 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							1b8e4800d0
							
						
					 | 
					
						
						
							
							Improvements for deletion by tenantId
						
						
						
						
						
						
					 | 
					
						2023-10-09 11:10:28 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							6ed6cc298c
							
						
					 | 
					
						
						
							
							Refactoring for deletion of devices, assets, dashboards, users
						
						
						
						
						
						
					 | 
					
						2023-10-09 11:07:37 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							79d655eedc
							
						
					 | 
					
						
						
							
							removed deprecadted methods
						
						
						
						
						
						
					 | 
					
						2023-10-06 21:46:08 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							92b09b8514
							
						
					 | 
					
						
						
							
							Minor refactoring: still not working as expected
						
						
						
						
						
						
					 | 
					
						2023-10-05 14:09:03 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							2b9575d81a
							
						
					 | 
					
						
						
							
							Merge branch 'master' into hotfix/3.6
						
						
						
						
						
						
					 | 
					
						2023-10-04 15:50:56 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							6ec4b8cf72
							
						
					 | 
					
						
						
							
							TTL for queue stats and RE exceptions
						
						
						
						
						
						
					 | 
					
						2023-10-04 15:29:26 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							5141b77bba
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into feature/broadcast-logs-improvement
						
						
						
						
						
						
					 | 
					
						2023-10-04 12:54:05 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							0360e655ae
							
						
					 | 
					
						
						
							
							Merge with master
						
						
						
						
						
						
					 | 
					
						2023-10-03 18:49:57 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							91fc161c4f
							
						
					 | 
					
						
						
							
							Implement widget types / bundles pagination and full text search. Add widget types tags. UI: Implement scroll grid component.
						
						
						
						
						
						
					 | 
					
						2023-09-28 18:16:20 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							e768afc948
							
						
					 | 
					
						
						
							
							Merge 3.6 -> 3.7
						
						
						
						
						
						
					 | 
					
						2023-09-28 12:20:06 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							dd4b874b5f
							
						
					 | 
					
						
						
							
							Version set to 3.6.1-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2023-09-27 17:38:27 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							8cefca23ac
							
						
					 | 
					
						
						
							
							Version set to 3.6.1-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2023-09-25 11:27:00 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							61c9eb977f
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop/3.6' into feature/broadcast-logs-improvement
						
						
						
						
						
						
					 | 
					
						2023-09-13 11:57:17 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							43c2ae653d
							
						
					 | 
					
						
						
							
							Resource support for edge
						
						
						
						
						
						
					 | 
					
						2023-09-11 17:04:25 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							bb6d04be3b
							
						
					 | 
					
						
						
							
							Logic for handling rule chain updates from edge, including metadata
						
						
						
						
						
						
					 | 
					
						2023-09-08 14:54:02 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Maksym Dudnik
							
						 
					 | 
					
						
						
						
						
							
						
						
							a1543f8095
							
						
					 | 
					
						
						
							
							Merge branch 'develop/3.6' of https://github.com/thingsboard/thingsboard into gateway_list
						
						
						
						
						
						
						
						 Conflicts:
	application/src/main/data/json/system/widget_bundles/gateway_widgets.json 
						
						
					 | 
					
						2023-09-06 15:45:08 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							ce3cbb78b1
							
						
					 | 
					
						
						
							
							Merge pull request #8825 from YevhenBondarenko/feature/alarm-types
						
						
						
						
						
						
						
						Alarm type auto-complete in the alarm filter 
						
						
					 | 
					
						2023-09-06 12:17:54 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							98c245e293
							
						
					 | 
					
						
						
							
							Switch to version 3.6.0
						
						
						
						
						
						
					 | 
					
						2023-09-05 18:28:15 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							ad9fedaded
							
						
					 | 
					
						
						
							
							merge with develop/3.5.2
						
						
						
						
						
						
					 | 
					
						2023-09-05 15:46:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							db663cb5bc
							
						
					 | 
					
						
						
							
							Merge pull request #9035 from imbeacon/customer-removing-alarm-unassign
						
						
						
						
						
						
						
						Fix for alarm unassign on user or customer removed 
						
						
					 | 
					
						2023-09-05 16:07:53 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							e2520ae0f5
							
						
					 | 
					
						
						
							
							Provide edgeId for EdgeEventSourcingListener to handle cloud entities updated on Edge and process to other Edges
						
						
						
						
						
						
					 | 
					
						2023-09-05 09:38:48 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							c4377f514f
							
						
					 | 
					
						
						
							
							merge with develop/3.5.2
						
						
						
						
						
						
					 | 
					
						2023-09-04 20:00:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							15d53a95cc
							
						
					 | 
					
						
						
							
							added ON DELETE CASCADE and improvements
						
						
						
						
						
						
					 | 
					
						2023-09-04 19:45:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							c783e44ac6
							
						
					 | 
					
						
						
							
							UI: Add widget panel: implement all widgets mode.
						
						
						
						
						
						
					 | 
					
						2023-09-04 18:04:20 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							1fb9ba622e
							
						
					 | 
					
						
						
							
							Widget -> Widget Bundle Many to Many support.
						
						
						
						
						
						
					 | 
					
						2023-08-31 12:09:42 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							acdf5ad48c
							
						
					 | 
					
						
						
							
							Implement ability to move widget types between widget bundles. Ability to deprecate widget type.
						
						
						
						
						
						
					 | 
					
						2023-08-28 18:54:12 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							85361c609a
							
						
					 | 
					
						
						
							
							EntityStateListener: process entity broadcasting service to handle all event
						
						
						
						
						
						
					 | 
					
						2023-08-21 15:32:19 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							ada9ff7b4e
							
						
					 | 
					
						
						
							
							merge with develop/3.5.2
						
						
						
						
						
						
					 | 
					
						2023-08-18 16:48:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							c57cb2b754
							
						
					 | 
					
						
						
							
							Switch to unique widget type FQN.
						
						
						
						
						
						
					 | 
					
						2023-08-18 16:14:21 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladyslav_Prykhodko
							
						 
					 | 
					
						
						
						
						
							
						
						
							35284eacd6
							
						
					 | 
					
						
						
							
							Merge branch 'feature/alarm-types' of github.com:YevhenBondarenko/thingsboard into YevhenBondarenko-feature/alarm-types
						
						
						
						
						
						
					 | 
					
						2023-08-18 12:52:21 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Maksym Dudnik
							
						 
					 | 
					
						
						
						
						
							
						
						
							6fd269063b
							
						
					 | 
					
						
						
							
							Merge branch 'develop/3.5.2' of https://github.com/thingsboard/thingsboard into gateway_list
						
						
						
						
						
						
						
						 Conflicts:
	ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts 
						
						
					 | 
					
						2023-08-18 12:43:29 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								imbeacon
							
						 
					 | 
					
						
						
						
						
							
						
						
							c4d12c6ba9
							
						
					 | 
					
						
						
							
							Refactored DefaultTbAlarmService, added improvements for alarm unassignment on user removing, updated namings and tests.
						
						
						
						
						
						
					 | 
					
						2023-08-18 12:03:27 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								imbeacon
							
						 
					 | 
					
						
						
						
						
							
						
						
							6ae894702a
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop/3.5.2' into customer-removing-alarm-unassign
						
						
						
						
						
						
					 | 
					
						2023-08-16 14:28:04 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Landiak
							
						 
					 | 
					
						
						
						
						
							
						
						
							e53ea0f20b
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop/3.5.2' into feature/edge-tenant-sync
						
						
						
						
						
						
					 | 
					
						2023-08-16 13:44:45 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								imbeacon
							
						 
					 | 
					
						
						
						
						
							
						
						
							35b86999b1
							
						
					 | 
					
						
						
							
							Added timestamp to entity deleted event, to have correct assign ts in alarms after unassignment
						
						
						
						
						
						
					 | 
					
						2023-08-16 11:18:31 +03:00 | 
					
					
						
						
							
							
							
						
					 |