ViacheslavKlimov
|
6859e051b6
|
Merge branch 'rc' of github.com:thingsboard/thingsboard into tmp-merge
|
2024-12-03 14:10:53 +02:00 |
|
ViacheslavKlimov
|
0a11b47a7b
|
license:format
|
2024-12-03 14:10:41 +02:00 |
|
Igor Kulikov
|
90ef67bf59
|
Merge pull request #12151 from ChantsovaEkaterina/feature/advanced-timewindow-configuration
Timewindow: added ability to select (hide particular) intervals and aggregation options in panel
|
2024-12-03 13:46:33 +02:00 |
|
Igor Kulikov
|
2677bfdc96
|
Merge branch 'master' of github.com:thingsboard/thingsboard
|
2024-12-03 13:23:34 +02:00 |
|
Igor Kulikov
|
3db9d68c12
|
UI: Add JS modules support for mobile action functions.
|
2024-12-03 13:23:22 +02:00 |
|
Andrew Shvayka
|
e6b2c9bf7c
|
Merge pull request #12173 from thingsboard/revert-11918-fix-email-sender-address
Revert "Fix email sender address issue"
|
2024-12-03 12:18:30 +01:00 |
|
Andrew Shvayka
|
d90e628e81
|
Revert "Fix email sender address issue"
|
2024-12-03 13:12:38 +02:00 |
|
Andrii Shvaika
|
915c50bee6
|
Code cleanup
|
2024-12-03 13:03:56 +02:00 |
|
Viacheslav Klimov
|
89d3d81868
|
Merge pull request #12163 from thingsboard/fix/housekeeper-processor
Improvements for Housekeeping service
|
2024-12-03 13:00:59 +02:00 |
|
ViacheslavKlimov
|
dd02e44822
|
Housekeeper: cancel task future in finally block
|
2024-12-03 12:59:24 +02:00 |
|
Andrew Shvayka
|
5c33456de5
|
Merge pull request #11689 from dskarzh/safe-scheduler
Safe scheduled thread pool
|
2024-12-03 11:51:33 +01:00 |
|
Ekaterina Chantsova
|
38c99de001
|
Merge with master, resolve conflicts
|
2024-12-03 12:24:31 +02:00 |
|
Igor Kulikov
|
a411213d6c
|
Merge pull request #12118 from vvlladd28/improvement/validation-message-jwt
Improvement validation message on JWT security settings
|
2024-12-03 11:59:31 +02:00 |
|
Igor Kulikov
|
bd5ade822d
|
Merge pull request #12117 from vvlladd28/bug/attribute-card
Fixed incorrect show long number in attribute card
|
2024-12-03 11:58:29 +02:00 |
|
Igor Kulikov
|
c6dda94a48
|
Merge pull request #12171 from thingsboard/feature/js-module
Introduce support of reusable JavaScript modules for UI JavaScript functions.
|
2024-12-03 11:50:32 +02:00 |
|
Viacheslav Klimov
|
a58f3aed65
|
Merge pull request #11647 from cbecker/oauth2-custom-add-none-auth-method
Custom OAuth 2.0: Add NONE auth method needed for some auth servers like Django
|
2024-12-03 11:47:29 +02:00 |
|
Igor Kulikov
|
f0b3d84c41
|
Merge branch 'master' into feature/js-module
|
2024-12-03 11:23:51 +02:00 |
|
Andrii Shvaika
|
bfe2977b53
|
Code cleanup
|
2024-12-03 11:22:07 +02:00 |
|
Igor Kulikov
|
cc468e34f7
|
Merge branch 'master' into feature/js-module
|
2024-12-03 11:03:43 +02:00 |
|
Andrii Shvaika
|
d1efcf2b6f
|
Fix typo
|
2024-12-03 10:57:54 +02:00 |
|
Andrii Shvaika
|
6ed415e442
|
Upgrade scripts
|
2024-12-03 10:55:18 +02:00 |
|
Igor Kulikov
|
93711914ba
|
Merge branch 'master' into feature/js-module
|
2024-12-03 10:19:02 +02:00 |
|
Andrii Shvaika
|
99e58579b9
|
Fix startup issue and compilation error
|
2024-12-03 10:18:03 +02:00 |
|
Andrii Shvaika
|
e1ad1cb9f5
|
Merge remote-tracking branch 'origin/feature/rule-node-debug'
|
2024-12-03 09:58:51 +02:00 |
|
Andrew Shvayka
|
d887bda137
|
Merge pull request #11244 from AdrienAdB/patch-1
Update template.service
|
2024-12-03 08:55:27 +01:00 |
|
Igor Kulikov
|
ea28f1d77e
|
Merge pull request #12114 from ArtemDzhereleiko/AD/bug-fix/hp-sand-filter
Refactoring SCADA symbols
|
2024-12-02 19:53:09 +02:00 |
|
Dmytro Skarzhynets
|
6b4c802d51
|
Use Thingsboard scheduled executor in git sync service
|
2024-12-02 19:00:32 +02:00 |
|
Dmytro Skarzhynets
|
a5fb3ee15f
|
Differentiate between two log messages
|
2024-12-02 18:59:46 +02:00 |
|
Andrew Shvayka
|
525e03b939
|
Merge pull request #12165 from maxunbearable/feature/rule-node-debug-ui-adjs
UI: debug strategy fixes
|
2024-12-02 17:52:40 +01:00 |
|
mpetrov
|
f67d6279dc
|
UI: debug strategy fixes
|
2024-12-02 18:48:46 +02:00 |
|
ViacheslavKlimov
|
c42cf2817e
|
Housekeeper: interrupt task processing on timeout
|
2024-12-02 18:24:03 +02:00 |
|
Andrew Shvayka
|
43ec0ed467
|
Merge pull request #12164 from dashevchenko/activeTenantDevices
Active tenant devices filter for RestClient
|
2024-12-02 17:11:15 +01:00 |
|
dashevchenko
|
7b21a1fde5
|
adding active-filter if not null
|
2024-12-02 18:02:17 +02:00 |
|
Andrii Shvaika
|
fbf35f9850
|
Merge with master
|
2024-12-02 18:02:08 +02:00 |
|
Dmytro Skarzhynets
|
68aaf3c918
|
Merge branch 'master' into safe-scheduler
# Conflicts:
# common/util/src/main/java/org/thingsboard/common/util/ThingsBoardExecutors.java
|
2024-12-02 17:43:07 +02:00 |
|
Igor Kulikov
|
1e3819626e
|
Merge branch 'master' into feature/js-module
|
2024-12-02 17:37:22 +02:00 |
|
Igor Kulikov
|
0373e05f76
|
Update tests postgresql image version to 16.6
|
2024-12-02 17:36:37 +02:00 |
|
Andrew Shvayka
|
0fac9cc2c7
|
Merge pull request #11918 from bulbatross/fix-email-sender-address
Fix email sender address issue
|
2024-12-02 16:26:17 +01:00 |
|
Andrew Shvayka
|
cd0e8a0211
|
Merge pull request #12024 from smatvienko-tb/hotfix/js-debug-logs-with-script-bodies
js-executor: added request body on debug level
|
2024-12-02 16:23:45 +01:00 |
|
Andrew Shvayka
|
3dc3d3a32e
|
Merge pull request #12148 from sprijk/nl_BE_translations
Improved some translations for nl_BE.
|
2024-12-02 16:22:08 +01:00 |
|
Ekaterina Chantsova
|
d5c9035ffe
|
Timewindow: update styles for inputs which may have empty suffix
|
2024-12-02 16:57:09 +02:00 |
|
Igor Kulikov
|
50862e6380
|
Merge branch 'master' into feature/js-module
|
2024-12-02 16:36:23 +02:00 |
|
Igor Kulikov
|
16e04efc9e
|
UI: Add support of js modules: Table widgets, Markdown widgets, QR code widget, Data key generation function.
|
2024-12-02 16:35:52 +02:00 |
|
Viacheslav Klimov
|
c8193a3462
|
Merge pull request #12161 from vvlladd28/rule-node-ui/custom-table-save
Updated rulenode-core-config.js (save to custom table)
|
2024-12-02 16:35:22 +02:00 |
|
Ekaterina Chantsova
|
055555d4a0
|
Merge remote-tracking branch 'upstream/master' into feature/advanced-timewindow-configuration
|
2024-12-02 16:09:23 +02:00 |
|
Andrew Shvayka
|
03ac89bdde
|
Merge pull request #12159 from AndriiLandiak/feature/edge-limit
Edges maximum number configuration
|
2024-12-02 14:55:50 +01:00 |
|
Andrew Shvayka
|
ad43c52f83
|
Merge pull request #12133 from YevhenBondarenko/feature/schema-settings-validation
Upgrade version and product validation, upgrade refactoring
|
2024-12-02 14:51:53 +01:00 |
|
Vladyslav_Prykhodko
|
05d5180ea6
|
Updated rulenode-core-config.js (save to custom table)
|
2024-12-02 15:49:02 +02:00 |
|
Ekaterina Chantsova
|
e0806f4890
|
Merge remote-tracking branch 'upstream/master' into feature/advanced-timewindow-configuration
|
2024-12-02 15:22:33 +02:00 |
|
Ekaterina Chantsova
|
e87cfff7fd
|
Timewindow: update styles for interval options configuration on mobile
|
2024-12-02 15:20:51 +02:00 |
|