3094 Commits

Author SHA1 Message Date
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
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
b5bce3e187 merge with develop/3.5.1 2023-05-19 19:03:11 +02:00
Andrew Shvayka
da9bea1f20
Merge pull request #8519 from adovh/replace_ObjectMapper_usages_with_JacksonUtil
[3.5.1]Replace object mapper usages with jackson utils
2023-05-19 17:07:16 +03: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
YevhenBondarenko
c9fb23e105 SystemUtil improvements 2023-05-10 17:53:50 +02:00
YevhenBondarenko
bcd2b94156 fixed start for windows 2023-05-10 17:18:45 +02:00
AndriiD
7187fbb4d3 Replace object mapper usages with jackson utils 2023-05-10 14:10:58 +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
ViacheslavKlimov
c39e8568ae Upgrade improvements for notification system 2023-05-02 12:46:50 +03:00
YevhenBondarenko
fbf9773a61 optimize imports 2023-05-02 10:57:58 +02:00
ViacheslavKlimov
a4281fd6d3 Deduplication for new platform version notification 2023-05-01 19:28:11 +03:00
Igor Kulikov
44cf98de0e Merge branch 'master' of github.com:thingsboard/thingsboard 2023-05-01 15:42:06 +03:00
Igor Kulikov
1f334d58ad Introduce SystemParams object holding necessary UI system parameters 2023-05-01 15:41:55 +03:00
Andrii Shvaika
aceeab8544 Merge branch 'master' of github.com:thingsboard/thingsboard 2023-05-01 13:36:43 +03:00
Andrii Shvaika
6bf957cc5b Merge branch 'feature/sparkplug-shared-attributes' 2023-05-01 13:18:45 +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
ViacheslavKlimov
bf7454ad3c Move rate limiting to one service 2023-04-28 14:28:16 +03:00
Andrii Shvaika
7a385e34d1 DeviceInfo for Edge support 2023-04-28 14:27:17 +03:00
Andrii Shvaika
dcbc4c5c7d Device Info Filter 2023-04-27 19:09:56 +03:00
Andrii Shvaika
8e20fd8800 Metric wildcards and default attributes 2023-04-27 17:08:34 +03:00
ViacheslavKlimov
c542bb9b16 Notification system API description for Swagger 2023-04-27 13:55:16 +03:00
Andrii Shvaika
2278d98824 Merge remote-tracking branch 'origin/develop/3.5' into feature/sparkplug-shared-attributes 2023-04-27 11:30:19 +03:00
Igor Kulikov
a736f177ef Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into feature/home-page 2023-04-26 18:08:13 +03:00
Andrii Shvaika
a405999a88 Use shared attributes for sparkplug devices 2023-04-25 19:03:17 +03:00