YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							7f9a9c7fb3
							
						
					 | 
					
						
						
							
							merge with develop/3.6
						
						
						
						
						
						
					 | 
					
						2023-06-05 15:58:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							db6f310284
							
						
					 | 
					
						
						
							
							migration to spring boot 3.1
						
						
						
						
						
						
					 | 
					
						2023-06-05 15:24:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							790513788a
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/develop/3.5.2' into develop/3.6
						
						
						
						
						
						
					 | 
					
						2023-06-02 14:59:40 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							aecea7d6a5
							
						
					 | 
					
						
						
							
							Removed SearchTextEntity
						
						
						
						
						
						
					 | 
					
						2023-06-01 16:01:45 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							56338924a1
							
						
					 | 
					
						
						
							
							Remove Additional info from entities that do not have such field
						
						
						
						
						
						
					 | 
					
						2023-06-01 15:31:58 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							be41ec8bef
							
						
					 | 
					
						
						
							
							Fix minor issues. Merged with develop/3.5.2
						
						
						
						
						
						
					 | 
					
						2023-06-01 15:10:08 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							c29e0dbf75
							
						
					 | 
					
						
						
							
							Merge branch 'develop/3.6' of github.com:thingsboard/thingsboard into feature/java-17
						
						
						
						
						
						
					 | 
					
						2023-05-29 14:48:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							da90c21b6c
							
						
					 | 
					
						
						
							
							Merge with develop/3.5.2. Version set to 3.6.0-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2023-05-29 13:45:17 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							2a1259570b
							
						
					 | 
					
						
						
							
							Temporary version set to 3.5.2-SNAPSHOT to merge
						
						
						
						
						
						
					 | 
					
						2023-05-29 13:43:10 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nickAS21
							
						 
					 | 
					
						
						
						
						
							
						
						
							4edf1ade2f
							
						
					 | 
					
						
						
							
							search_text: equals byteAdditionalInfo == null 3
						
						
						
						
						
						
					 | 
					
						2023-05-27 17:15:18 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nickAS21
							
						 
					 | 
					
						
						
						
						
							
						
						
							7c1924446b
							
						
					 | 
					
						
						
							
							search_text: equals byteAdditionalInfo == null 2
						
						
						
						
						
						
					 | 
					
						2023-05-27 13:30:45 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nickAS21
							
						 
					 | 
					
						
						
						
						
							
						
						
							08b9bf9f14
							
						
					 | 
					
						
						
							
							search_text: equals byteAdditionalInfo == null
						
						
						
						
						
						
					 | 
					
						2023-05-27 10:16:04 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nickAS21
							
						 
					 | 
					
						
						
						
						
							
						
						
							ca2b2cfdd4
							
						
					 | 
					
						
						
							
							search_text: rollback additionalInfo == null
						
						
						
						
						
						
					 | 
					
						2023-05-27 08:16:34 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nickAS21
							
						 
					 | 
					
						
						
						
						
							
						
						
							1d35acd340
							
						
					 | 
					
						
						
							
							search_text: additionalInfo == null
						
						
						
						
						
						
					 | 
					
						2023-05-26 21:56:45 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nickAS21
							
						 
					 | 
					
						
						
						
						
							
						
						
							35bbff3cac
							
						
					 | 
					
						
						
							
							regactoring text_search for entity
						
						
						
						
						
						
					 | 
					
						2023-05-25 17:05:46 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							1ccd7f9fd5
							
						
					 | 
					
						
						
							
							Merge pull request #8533 from thingsboard/feature/notification-configs-vc
						
						
						
						
						
						
						
						Version control for notification configs 
						
						
					 | 
					
						2023-05-24 17:29:16 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							f05f2e2053
							
						
					 | 
					
						
						
							
							Remove SearchText from Device
						
						
						
						
						
						
					 | 
					
						2023-05-24 14:17:00 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							508a990ab1
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/develop/3.5.2' into feature/notification-configs-vc
						
						
						
						
						
						
					 | 
					
						2023-05-23 15:20:21 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							bf63eaccfe
							
						
					 | 
					
						
						
							
							Merge branch 'master' into develop/3.5.2
						
						
						
						
						
						
					 | 
					
						2023-05-22 17:50:05 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							07cba2b16c
							
						
					 | 
					
						
						
							
							Merge pull request #8598 from dashevchenko/xxe_fixed
						
						
						
						
						
						
						
						Fixed xxe vulnerability 
						
						
					 | 
					
						2023-05-22 17:46:51 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ae1f1e329
							
						
					 | 
					
						
						
							
							Version set to 3.5.2-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2023-05-22 16:32:24 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							59cc8244b5
							
						
					 | 
					
						
						
							
							Version set to 3.5.1-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2023-05-22 16:31:19 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							c422e39724
							
						
					 | 
					
						
						
							
							Version set to 3.5.1-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2023-05-22 16:26:54 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							c0b0c7ac5d
							
						
					 | 
					
						
						
							
							Merge branch 'develop/3.5.1' into develop/3.5.2
						
						
						
						
						
						
					 | 
					
						2023-05-22 15:27:47 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							7e1d06b3cd
							
						
					 | 
					
						
						
							
							Merge pull request #8456 from thingsboard/improvements/rate-limits
						
						
						
						
						
						
						
						Rate limits improvements 
						
						
					 | 
					
						2023-05-22 15:25:30 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							6120fb132a
							
						
					 | 
					
						
						
							
							Version set to 3.5.2. Migration script improved
						
						
						
						
						
						
					 | 
					
						2023-05-22 13:16:06 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dashevchenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							9b461272c4
							
						
					 | 
					
						
						
							
							fixed xxe vulnerability
						
						
						
						
						
						
					 | 
					
						2023-05-22 13:11:14 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							f2545fb942
							
						
					 | 
					
						
						
							
							Merge branch 'develop/3.6' of github.com:thingsboard/thingsboard into feature/java-17
						
						
						
						
						
						
					 | 
					
						2023-05-19 19:06:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							b5bce3e187
							
						
					 | 
					
						
						
							
							merge with develop/3.5.1
						
						
						
						
						
						
					 | 
					
						2023-05-19 19:03:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							bba26ca676
							
						
					 | 
					
						
						
							
							merge with develop/3.5.1
						
						
						
						
						
						
					 | 
					
						2023-05-19 18:20:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							27c88e914d
							
						
					 | 
					
						
						
							
							Merge pull request #8556 from dashevchenko/smsDisabledFlag
						
						
						
						
						
						
						
						Added feature to disable sms messaging 
						
						
					 | 
					
						2023-05-19 16:51:43 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dashevchenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ef6501225
							
						
					 | 
					
						
						
							
							refactoring
						
						
						
						
						
						
					 | 
					
						2023-05-19 16:47:34 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Viacheslav Klimov
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							e3646c9ea9
							
						
					 | 
					
						
						
							
							Merge branch 'develop/3.5.1' into feature/notification-configs-vc
						
						
						
						
						
						
					 | 
					
						2023-05-19 15:40:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladyslav_Prykhodko
							
						 
					 | 
					
						
						
						
						
							
						
						
							31858ea48e
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop/3.5.1' into feature/notification-rules-disabling
						
						
						
						
						
						
					 | 
					
						2023-05-19 13:51:57 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							ce83ee4444
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/develop/3.5.1' into improvements/rate-limits
						
						
						
						
						
						
						
						# Conflicts:
#	application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java 
						
						
					 | 
					
						2023-05-17 12:28:51 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dashevchenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							f28dd12bab
							
						
					 | 
					
						
						
							
							fixed NPE
						
						
						
						
						
						
					 | 
					
						2023-05-16 16:47:05 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dashevchenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							a6c52809cd
							
						
					 | 
					
						
						
							
							added sms disabled feature for tenant profile configuration
						
						
						
						
						
						
					 | 
					
						2023-05-16 15:04:39 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							6fda898851
							
						
					 | 
					
						
						
							
							Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.6
						
						
						
						
						
						
					 | 
					
						2023-05-15 12:09:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							7058f99068
							
						
					 | 
					
						
						
							
							Version set to 3.5.1-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2023-05-12 15:45:11 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							b7f19a12cf
							
						
					 | 
					
						
						
							
							Version control for notification configs
						
						
						
						
						
						
					 | 
					
						2023-05-12 14:54:14 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							5cec1b8af2
							
						
					 | 
					
						
						
							
							Ability to disable notification rule
						
						
						
						
						
						
					 | 
					
						2023-05-11 14:57:40 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							ead9d3be70
							
						
					 | 
					
						
						
							
							Merge with develop/3.5.1
						
						
						
						
						
						
					 | 
					
						2023-05-08 12:54:07 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							86743b907a
							
						
					 | 
					
						
						
							
							Merge pull request #8464 from thingsboard/improvements/notification-system
						
						
						
						
						
						
						
						Notifications deduplication; upgrade improvements 
						
						
					 | 
					
						2023-05-04 12:47:03 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							36743eb5af
							
						
					 | 
					
						
						
							
							Branch name validation
						
						
						
						
						
						
					 | 
					
						2023-05-03 16:31:31 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							fbf9773a61
							
						
					 | 
					
						
						
							
							optimize imports
						
						
						
						
						
						
					 | 
					
						2023-05-02 10:57:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							40d6e67131
							
						
					 | 
					
						
						
							
							migrate to java 17
						
						
						
						
						
						
					 | 
					
						2023-05-02 00:46:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							a4281fd6d3
							
						
					 | 
					
						
						
							
							Deduplication for new platform version notification
						
						
						
						
						
						
					 | 
					
						2023-05-01 19:28:11 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f334d58ad
							
						
					 | 
					
						
						
							
							Introduce SystemParams object holding necessary UI system parameters
						
						
						
						
						
						
					 | 
					
						2023-05-01 15:41:55 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Shvayka
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d03f236263
							
						
					 | 
					
						
						
							
							Merge pull request #8440 from thingsboard/improvements/notification-system
						
						
						
						
						
						
						
						Improvements for notification system 
						
						
					 | 
					
						2023-05-01 12:43:48 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							89efe12c45
							
						
					 | 
					
						
						
							
							Fix Equals And HashCode issue for Device/Asset/EntityView Info
						
						
						
						
						
						
					 | 
					
						2023-04-28 17:09:01 +03:00 | 
					
					
						
						
							
							
							
						
					 |