dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,167 Commits 106 Branches 71 Tags
Commit Graph

14167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ShvaykaD
e5a2712d89 changed logic to ack msg if stack is null 2023-06-12 13:53:10 +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
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
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
Andrii Shvaika
aa6a136ef8 Merge remote-tracking branch 'origin/fixes/notification-system' into develop/3.5.2 2023-06-07 16:02:30 +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
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
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
Andrew Shvayka
d72c841d15
Merge pull request #8676 from dashevchenko/serviceBusQueueFix 
Updated version of azure-servicebus java sdk
 2023-06-06 17:03:21 +03:00
Andrew Shvayka
835f8b48f9
Merge pull request #8706 from imbeacon/fix/swagger-models 
Fixes for models in Swagger
 2023-06-06 16:44:25 +03:00
dashevchenko
31cf975495 Merge remote-tracking branch 'upstream/develop/3.5.2' into resourcesByType 2023-06-06 12:42:47 +03:00
dashevchenko
051c7c384d added etag header for resources/{id}/download endpoint 2023-06-06 11:52:08 +03:00
Igor Kulikov
c71d29c507 UI: Entities table basic widget config. 2023-06-05 19:52:34 +03:00
Andrii Landiak
4065c94131 Refactor naming to resolve redis compose in black-box tests 2023-06-05 17:15:32 +03:00
Seraphym-Tuhai
1df9c12f6f Merge branch 'develop/3.5.2' of https://github.com/thingsboard/thingsboard into ui_tests_devices_make_public_private 2023-06-05 16:44:43 +03:00
Artem Dzhereleiko
1f6e0e8271 UI: Refactoring 2023-06-05 15:26:48 +03:00
Artem Dzhereleiko
df9026e2df Merge remote-tracking branch 'upstream/develop/3.5.2' into AD/imp/rule-chain-selector 2023-06-05 15:14:46 +03:00
Artem Dzhereleiko
3df0d80242 Merge remote-tracking branch 'upstream/master' into AD/imp/rule-chain-selector 2023-06-05 15:05:39 +03:00
Artem Dzhereleiko
86c8ee6bde UI: Refactoring and add support edge rule chains 2023-06-05 15:05:01 +03:00
Andrii Landiak
90bf0a0ace Rewrite readme for redis sentinel 2023-06-05 13:39:06 +03:00
Andrii Landiak
72423991b9 Add option compatibility for DockerComposeContainer to work locally with docker compose 2023-06-05 13:14:44 +03:00
Igor Kulikov
a033fd6aad
Merge pull request #8708 from thingsboard/feature/widget-config 
Widget configuration improvement + basic widget configuration mode.
 2023-06-05 11:48:03 +03:00
Igor Kulikov
7a342884bf UI: Implement widgets config basic mode. Widgets config minor refactoring. 2023-06-02 19:43:13 +03:00
Igor Kulikov
1fe00ac46a UI: Implement widgets config basic mode. Widgets config minor refactoring. 2023-06-02 19:37:16 +03:00
ViacheslavKlimov
f2684e124d Fix AlarmCommentControllerTest 2023-06-02 18:20:15 +03:00
Seraphym-Tuhai
b1211f2bd5 small refactoring 2023-06-02 15:43:19 +03:00
Seraphym-Tuhai
f3ba9bc1b9 Merge branch 'develop/3.5.2' of https://github.com/thingsboard/thingsboard into ui_tests_devices_make_public_private 2023-06-02 15:11:09 +03:00
ViacheslavKlimov
184a554d08 More tests for notification rules; fix unstable tests 2023-06-02 15:00:03 +03:00
ViacheslavKlimov
64571eeff2 Don't use Rule Engine message as notification rule trigger 2023-06-02 14:58:12 +03:00
ViacheslavKlimov
f5cd8a9a52 Notification system - less async operations 2023-06-02 14:57:00 +03:00
ViacheslavKlimov
67656a2757 Notifications deduplication 2023-06-02 14:50:23 +03:00
Igor Kulikov
4ab93c8c52 Merge branch 'develop/3.5.2' into feature/widget-config 2023-06-02 13:15:45 +03:00
dashevchenko
34c8909adf moved servicebus conflicting dependency to exclusions 2023-06-02 13:05:08 +03:00