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

4737 Commits

Author SHA1 Message Date
oyurov
6d34aa237c Refactoring 2022-11-02 13:03:17 +01:00
ShvaykaD
fea91220f0 fix error in merge with master 2022-11-02 12:55:03 +02:00
ShvaykaD
e9961a3a39 merge with master 2022-11-02 12:00:05 +02:00
oyurov
215a44b7c7 Added tests 2022-11-02 09:19:51 +01:00
oyurov
d10289253f Refactor 2022-11-02 08:46:58 +01:00
Sergey Matvienko
a08c716ad2 upgrade for JwtSetting targeted from 3.4.1 to 3.4.2 2022-11-01 20:11:41 +02:00
Sergey Matvienko
db3ca06f4d Merge remote-tracking branch 'ce/master' into jwt-random 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/AdminController.java
#	application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
#	application/src/main/java/org/thingsboard/server/service/security/model/token/JwtTokenFactory.java
 2022-11-01 20:05:50 +02:00
Sergey Matvienko
ea80f9838e JwtSettings API added to the admin controller 2022-11-01 20:04:37 +02:00
ViacheslavKlimov
386c664025 Fix audit logs migration procedure 2022-11-01 17:57:34 +02:00
Andrii Shvaika
c10e491de7 Merge branch 'master' of github.com:thingsboard/thingsboard 2022-11-01 16:56:55 +02:00
Andrii Shvaika
08b226c18f Bump Cassandra versions 2022-11-01 16:56:47 +02:00
Volodymyr Babak
a2b404788b Fix incorrect usage or log.XXX methods - replace String.format with log.XXX formatter 2022-11-01 15:58:13 +02:00
Sergey Matvienko
069e77eb17 Merge remote-tracking branch 'ce/master' into cassandra-cloud-astra 2022-11-01 14:11:58 +02:00
oyurov
4d271ff730 Refactor 2022-11-01 12:08:57 +01:00
oyurov
87cd103ec8 Refactor 2022-11-01 11:53:09 +01:00
Volodymyr Babak
ba645e4570 Merge remote-tracking branch 'upstream/master' into feature/edge-limit-attempt 2022-11-01 11:04:56 +02:00
Yuriy Lytvynchuk
4744f93cda Merge remote-tracking branch 'upstream/master' into feature/check_tenant_entity_for_nodes 2022-11-01 10:31:05 +02:00
Igor Kulikov
dbef7c4ece Fix tests 2022-11-01 09:52:19 +02:00
Volodymyr Babak
19287fa250 Merge remote-tracking branch 'origin/master' into feature/edge-limit-attempt 2022-10-31 19:09:25 +02:00
Andrew Shvayka
3844ff6372
Merge pull request #7395 from volodymyr-babak/feature/edge-multi-customers 
[3.4.2] Edge PE - customers hierarchy support
 2022-10-31 18:49:01 +02:00
Andrew Shvayka
7ba76e8f59
Merge pull request #7483 from deaflynx/version-control-read-only 
[3.4.2] Feature: Version control Repository settings with 'Read-only' flag
 2022-10-31 18:05:58 +02:00
ViacheslavKlimov
4d34c328d6 New TbNotificationNode; refactoring 2022-10-31 17:44:21 +02:00
ViacheslavKlimov
89d2a337e1 WebSocket API for notifications; refactoring 2022-10-31 14:05:08 +02:00
ViacheslavKlimov
4c61d63149 Upgrade script, indexes 2022-10-31 14:04:29 +02:00
Andrew Shvayka
0fb0fb03c6
Merge pull request #7324 from imbeacon/fix/rate-limits 
[3.4.2] Fix for rate limits filter
 2022-10-31 13:36:41 +02:00
Andrew Shvayka
e452085d78
Merge pull request #7278 from CooL16/feature/oauth2-open-targeted-url 
[3.4.2] Feature: Redirect to the targeted url after successful login via oauth2
 2022-10-31 13:06:01 +02:00
Andrew Shvayka
952ddf791a
Merge pull request #7250 from dmytro-landiak/bulk-import-fix 
[3.4.2][Bug] Bulk import null node handling fix
 2022-10-31 12:53:43 +02:00
Volodymyr Babak
7c80781c24 Minor code refactoring - added tenant as entity id 2022-10-28 15:41:57 +03:00
Igor Kulikov
c7bd92c9f8 Merge branch 'feature/mvel-executor' of github.com:thingsboard/thingsboard into feature/mvel-executor 2022-10-28 14:36:02 +03:00
Igor Kulikov
fabc433ae2 Fix NPE in rule node mvel script engine while metadata unbinding. Update MVEL dependency version 2022-10-28 14:35:49 +03:00
Andrii Shvaika
3f819487d6 Added var for clear code 2022-10-28 13:18:00 +03:00
ViacheslavKlimov
a2facbd648 Merge remote-tracking branch 'origin/master' into feature/notification-system 2022-10-28 13:17:16 +03:00
Andrii Shvaika
001700e14b Merge branch 'feature/mvel-executor' of github.com:thingsboard/thingsboard into feature/mvel-executor 2022-10-28 13:00:42 +03:00
Andrii Shvaika
d00bcbfa83 MVEL executor tests 2022-10-28 13:00:28 +03:00
ViacheslavKlimov
879e707958 Don't auto-commit if read-only enabled in repository settings 2022-10-28 12:26:44 +03:00
Igor Kulikov
7c2897226d Update default rule chains with mvel script. Update rule nodes config UI. 2022-10-28 12:21:50 +03:00
Volodymyr Babak
cbcf6192d8 Edge device test - disconnect mqtt client 2022-10-27 17:32:25 +03:00
Volodymyr Babak
0389513b40 Improved edge rpc session logging 2022-10-27 17:13:36 +03:00
Volodymyr Babak
b13ec070cf Refactored telemetry edge processor to reuse in whitelabeling processor 2022-10-27 15:50:09 +03:00
Volodymyr Babak
60998c6f6b Double check for scope - use SERVER_SCOPE if not set 2022-10-27 15:26:07 +03:00
Andrii Shvaika
bfe79780dd MVEL executor improvements 2022-10-27 14:03:48 +03:00
Volodymyr Babak
3a7cc56c88 Fixed edge telemetry stability test 2022-10-27 12:03:33 +03:00
Volodymyr Babak
8fdeecdf07 Fixed incorrect api usage count by customer. Fixed duplciate ATTRIBUTE_UPDATE events 2022-10-26 18:21:19 +03:00
ViacheslavKlimov
f5247386fa Notification system improvements and refactoring 2022-10-26 17:50:33 +03:00
Volodymyr Babak
03bc439bb9 Cancel general process if sync process started 2022-10-25 16:22:31 +03:00
ViacheslavKlimov
a53a50e99f Read-only option in VC repository settings 2022-10-25 12:07:57 +03:00
Andrii Shvaika
830a612bf8 Refactoring of the JS thread pool size configuration 2022-10-25 10:36:11 +03:00
Volodymyr Babak
7a2bd5dfad Organize imports 2022-10-24 18:34:07 +03:00
Volodymyr Babak
546b477c34 Attemp to send downlink 10 times max in case edge connected - discard all other attempts and ack failed messages 2022-10-24 18:32:22 +03:00
Andrew Shvayka
4cc7e7b373
Merge pull request #7456 from ViacheslavKlimov/fix/sql-deadlock-info 
[3.4.2] SQL batch sort enabled by default; additional deadlock logging
 2022-10-24 18:25:16 +03:00