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
|
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 |
|
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 |
|
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
|
d4e4bf0964
|
Merge pull request #8721 from kalutkaz/fix/updatesImport
Add ToggleHeaderComponent to the module-map
|
2023-06-12 13:25:31 +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 |
|
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 |
|
Andrii Shvaika
|
1b15e78985
|
Merge branch 'resourcesByType' of github.com:dashevchenko/thingsboard into develop/3.5.2
|
2023-06-08 16:37:10 +03:00 |
|
dashevchenko
|
1025842668
|
fixed license
|
2023-06-08 16:18:45 +03:00 |
|
ShvaykaD
|
6be3cda55e
|
math node arguments/result key fields templatization
|
2023-06-08 13:25:00 +03:00 |
|
dashevchenko
|
a85f5b4330
|
added initial implementation
|
2023-06-08 12:30:35 +03:00 |
|
kalytka
|
a0e6128f36
|
Add ToggleHeaderComponent to the module-map
|
2023-06-08 11:26:00 +03:00 |
|
Vladyslav_Prykhodko
|
a48416e442
|
UI: Fixed process error in resource library component
|
2023-06-08 10:43:21 +03:00 |
|
Vladyslav_Prykhodko
|
01065ec0c5
|
UI: Fixed clear cache in SystemJs load resources
|
2023-06-08 10:32:26 +03:00 |
|
Vladyslav_Prykhodko
|
cc3e5681a8
|
UI: Added clearing cache resources when we change user
|
2023-06-07 16:28:10 +03:00 |
|
ShvaykaD
|
8b5fe7845b
|
Merge branch 'develop/3.5.2' of github.com:thingsboard/thingsboard into feature/rpc-response-handling-improvements
|
2023-06-07 16:02:45 +03:00 |
|
Andrii Shvaika
|
aa6a136ef8
|
Merge remote-tracking branch 'origin/fixes/notification-system' into develop/3.5.2
|
2023-06-07 16:02:30 +03:00 |
|
ShvaykaD
|
7ee861d55c
|
removed unused methods and variables
|
2023-06-07 15:55:47 +03:00 |
|
Vladyslav_Prykhodko
|
2be9a1e1c3
|
Merge remote-tracking branch 'upstream/develop/3.5.2' into dashevchenko-resourcesByType
|
2023-06-07 15:40:44 +03:00 |
|
Vladyslav_Prykhodko
|
1bde8d3dff
|
UI: Added support js module resource in widget/action
|
2023-06-07 15:37:47 +03:00 |
|
Andrew Shvayka
|
4d04e51e12
|
Merge pull request #8671 from thingsboard/feature/monitoring-refactoring
Monitoring service refactoring
|
2023-06-07 15:32:47 +03:00 |
|
dashevchenko
|
87786ef72d
|
refactoring
|
2023-06-07 15:27:44 +03:00 |
|
ShvaykaD
|
9899b8d9f4
|
reverted logic to set RPC status SUCCESSFUL even if it undelivered
|
2023-06-07 15:24:33 +03:00 |
|
Andrew Shvayka
|
7bb8f8732c
|
Merge pull request #8682 from AndriiLandiak/feature/redis-sentinel
[3.5.2] Redis Sentinel support
|
2023-06-07 15:24:18 +03:00 |
|
ShvaykaD
|
138128d837
|
added more logs to RPC processing logic in MQTT and CoAP transports
|
2023-06-07 15:18:45 +03:00 |
|
Andrew Shvayka
|
cc0d8a6de4
|
Merge pull request #8710 from Seraphym-Tuhai/fix_for_ui_tests
[3.5.2] Added UI smoke tests on make device public/private
|
2023-06-07 15:14:01 +03:00 |
|
dashevchenko
|
407effbc26
|
refactoring
|
2023-06-07 14:08:55 +03:00 |
|
dashevchenko
|
06dd204465
|
refactoring
|
2023-06-07 13:38:47 +03:00 |
|
dashevchenko
|
29384170d7
|
added tests
|
2023-06-07 13:16:55 +03:00 |
|
dashevchenko
|
f356a94b81
|
added new hash_code column to resource table
|
2023-06-07 00:06:55 +03:00 |
|
Igor Kulikov
|
c6dd11f576
|
Merge branch 'develop/3.5.2' into feature/basic-widget-config
|
2023-06-06 18:02:25 +03:00 |
|
Igor Kulikov
|
16afbad9f2
|
Merge pull request #8638 from ArtemDzhereleiko/AD/imp/rule-chain-selector
Rule chain selector
|
2023-06-06 17:57:57 +03:00 |
|
Igor Kulikov
|
7bca490ae7
|
Merge pull request #8571 from ArtemDzhereleiko/AD/imp/timeseries-table-widget-column-visability
Added columns visibility for Timeseries table
|
2023-06-06 17:55:29 +03:00 |
|
Igor Kulikov
|
001b23b402
|
Merge pull request #8587 from vvlladd28/improvement/edit-notification-template
Added the option to edit notification templates in the template selector
|
2023-06-06 17:54:12 +03:00 |
|
Igor Kulikov
|
0fa3040442
|
Merge branch 'develop/3.5.2' into feature/basic-widget-config
|
2023-06-06 17:21:18 +03:00 |
|
Igor Kulikov
|
d992355a3c
|
UI: Implement basic config form for Entities table widget.
|
2023-06-06 17:20:35 +03:00 |
|