14334 Commits

Author SHA1 Message Date
ViacheslavKlimov
ddfdcef858 Improvements for user notification settings structure 2023-07-12 12:50:29 +03:00
Vladyslav
8f780d0bda
Merge pull request #8878 from ArtemDzhereleiko/AD/feature/user-notification-settings-by-type
User notification settings by notification type
2023-07-06 10:38:56 +03:00
Artem Dzhereleiko
88b1bfc95b UI: User notification settings by notification type and remove slack 2023-07-05 13:19:29 +03:00
ViacheslavKlimov
ea2d5485f4 Remove Slack from user-level settings 2023-07-05 12:46:35 +03:00
ViacheslavKlimov
6eb4510e2a User notification settings - by notification type 2023-06-30 13:46:19 +03:00
Vladyslav
165543c598
Merge pull request #8819 from ArtemDzhereleiko/feature/account-notification-settings
User notification settings
2023-06-27 15:54:21 +03:00
Artem Dzhereleiko
6dfd0a5439 UI: Fixed routing path for fullscreen mode 2023-06-27 13:04:02 +03:00
Artem Dzhereleiko
d50e05bb5d UI: Refactoring 2023-06-27 11:04:59 +03:00
Artem Dzhereleiko
8dcd32e4b3 UI: User notification settings 2023-06-26 10:44:07 +03:00
ViacheslavKlimov
1d45ea3e8b Fix MockNotificationSettingsService 2023-06-23 16:23:42 +03:00
ViacheslavKlimov
d49a6c3e92 Notification settings for rules 2023-06-23 16:11:21 +03:00
ViacheslavKlimov
bbcf4b1ff1 Fix MockNotificationSettingsService 2023-06-20 18:07:37 +03:00
ViacheslavKlimov
ab93f6266d Add getUserNotificationSettings api 2023-06-20 12:10:28 +03:00
ViacheslavKlimov
014497cd89 User-level notification settings 2023-06-20 12:04:48 +03:00
Andrew Shvayka
6b8cbbd3c9
Merge pull request #8745 from ArtemDzhereleiko/AD/bug-fix/mail-server-oauth2
Fixed oauth2 mail server settings
2023-06-15 12:59:10 +03:00
Andrew Shvayka
1a910934ee
Merge pull request #8759 from kalutkaz/enrichmentRuleNode
Updated enrichment rule nodes UI
2023-06-14 17:47:30 +03:00
kalytka
d7c3f1647a Updated enrichment rule nodes UI 2023-06-14 14:57:16 +03:00
Andrew Shvayka
7258c5de73
Merge pull request #8702 from thingsboard/feature/exceeded-rate-limits-notifications
Notifications about exceeded rate limits
2023-06-13 17:40:45 +03:00
Andrii Shvaika
4abf7ccd5a Merge with master 2023-06-13 17:18:32 +03:00
ViacheslavKlimov
0bd7f74c47 Fix issues 2023-06-13 14:12:54 +03:00
ViacheslavKlimov
f98eee5407 Merge branch 'develop/3.5.2' into feature/exceeded-rate-limits-notifications
# Conflicts:
#	application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
#	application/src/main/resources/thingsboard.yml
#	application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
#	dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotifications.java
#	ui-ngx/src/app/modules/common/modules-map.ts
2023-06-13 13:49:51 +03:00
Andrew Shvayka
405548d44a
Merge pull request #8733 from thingsboard/fix_bug_switch_tbel
[FIX_BUG][3.5.1] switch: add validation to tbel
2023-06-13 12:26:08 +03:00
Andrew Shvayka
7d31d25aa0
Merge pull request #8729 from thingsboard/fixes/notification-system
Notifications deduplication improvements
2023-06-13 12:25:07 +03:00
Andrew Shvayka
7fa9be1a68
Merge pull request #8634 from thingsboard/feature/rule-nodes-versioning
Rule Node Versioning + Improvements
2023-06-13 12:14:02 +03:00
Artem Dzhereleiko
7ac6eac802 UI: Fixed oauth2 mail server settings 2023-06-13 12:13:51 +03:00
nickAS21
6d69c9b213 fix_bug_switch: add CompileException2 2023-06-13 11:39:48 +03:00
Andrii Shvaika
997b915905 Merge with develop/3.5.2 2023-06-13 11:30:29 +03:00
ViacheslavKlimov
39d7498c59 Merge branch 'develop/3.5.2' into fixes/notification-system 2023-06-12 21:37:21 +03:00
nickAS21
7f0c5f219b fix_bug_switch: add CompileException 2023-06-12 19:00:59 +03:00
Andrew Shvayka
80baf9f54d
Merge pull request #8725 from ShvaykaD/feature/math-node-fields-templatization
Math node fields templatization
2023-06-12 18:02:59 +03:00
Andrew Shvayka
e556afb511
Merge pull request #8731 from ShvaykaD/bugfix/PROD-2116
fixed NPE in Flow output node when it used after split array msg node
2023-06-12 18:01:08 +03:00
ShvaykaD
a5de29c1f4 code readability fix 2023-06-12 15:50:49 +03:00
ShvaykaD
9ff8406703 added code style fixes && moved duplicate code block to method 2023-06-12 14:17:55 +03:00
ShvaykaD
e5a2712d89 changed logic to ack msg if stack is null 2023-06-12 13:53:10 +03:00
Andrew Shvayka
dd900dafba
Merge pull request #8713 from ShvaykaD/feature/rpc-response-handling-improvements
RPC queue stuck issue on response handling for undelivered rpc && logging improvements
2023-06-12 13:42:59 +03:00
Andrew Shvayka
866e236c14
Merge pull request #8722 from vvlladd28/improvement/ui-rule-node/math-function
Math function rule node: fixed validation
2023-06-12 13:30:09 +03:00
Andrew Shvayka
d4e4bf0964
Merge pull request #8721 from kalutkaz/fix/updatesImport
Add ToggleHeaderComponent to the module-map
2023-06-12 13:25:31 +03:00
nickAS21
f534e2db64 fix_bug_switch: add validation to tbel mew msg 2023-06-12 13:05:10 +03:00
Andrew Shvayka
e30cf55988
Merge pull request #8723 from dashevchenko/mailConfigTemplates
Mail config templates, oauth2 protocol for mail server
2023-06-09 16:05:43 +03:00
nickAS21
a85d0b6129 fix_bug_switch: add validation to tbel 2023-06-09 15:13:33 +03:00
Andrew Shvayka
db5c3e5c16
Merge pull request #8727 from volodymyr-babak/edge-connection-fix
[Hotfix] Check edge session before removal to avoid removing live session
2023-06-09 14:55:30 +03:00
ShvaykaD
f191357b90 fixed NPE in Flow output node when it used after split array msg node 2023-06-09 14:32:58 +03:00
dashevchenko
9d57be98bf refactoring 2023-06-09 13:06:40 +03:00
dashevchenko
44c784c248 refactoring 2023-06-08 18:37:06 +03:00
ViacheslavKlimov
93e8770023 Don't write to cache on each deduplication 2023-06-08 18:28:57 +03:00
ViacheslavKlimov
b77078c24e Notifications deduplication improvements 2023-06-08 18:15:56 +03:00
Andrii Shvaika
59d21eb9d7 Simplify permission check 2023-06-08 17:59:08 +03:00
Andrii Shvaika
d34a65eada Resources access for Customer Users 2023-06-08 17:44:20 +03:00
Andrew Shvayka
5a60b45051
Merge pull request #8728 from YevhenBondarenko/fix/azure-root-ca
fixed azure root ca load
2023-06-08 17:21:29 +03:00
YevhenBondarenko
9dd10b0b75 fixed Iterator already obtained 2023-06-08 15:51:10 +02:00