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

455 Commits

Author SHA1 Message Date
Sergey Matvienko
e82fc6d533 cassandra-all 3.11.14 have no dependency on cassandra-thrift. added for dao test scope and tools package along with cassandra-all 2022-11-02 12:11:57 +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
Sergey Matvienko
63d13048d3 postgresql driver update up to 42.5.0 2022-11-01 15:17:56 +02:00
Igor Kulikov
42b84f9b5b Update protobuf-dynamic version to 1.0.4TB 2022-11-01 10:49:58 +02:00
Andrew Shvayka
f01248e730
Merge pull request #7442 from sanshengshui/master 
[3.4.2] Feature -upgrade protobuf version from 3.17.2 -> 3.21.7, support Mac M1(ARM Core) protobuf files compile
 2022-10-31 17:58:11 +02:00
Andrew Shvayka
22904797e4
Update protobuf to 3.21.9 2022-10-31 17:57:47 +02:00
Andrii Shvaika
445fe90a1d Bump MVEL version 2022-10-28 18:26:27 +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
Igor Kulikov
7c2897226d Update default rule chains with mvel script. Update rule nodes config UI. 2022-10-28 12:21:50 +03:00
Igor Kulikov
1898ea4a15 Minor fixes 2022-10-27 17:30:08 +03:00
Igor Kulikov
4607d89369 Update mvel2 dependency 2022-10-27 11:24:48 +03:00
sanshengshui
6cb2c8e820 upgrade protobuf version from 3.17.2 -> 3.21.7, support Mac M1(ARM Core) protobuf files compile 2022-10-18 15:55:17 +08:00
Andrii Shvaika
813f632deb MVEL executor 2022-10-17 19:03:44 +03:00
Andrii Shvaika
9769f95c27 Refactoring of the JS API to separate module: Script API 2022-10-17 16:36:57 +03:00
Andrew Shvayka
cd6e50312c
Merge pull request #7348 from thingsboard/feature/math-rule-node 
[3.4.2] Math rule node
 2022-09-29 12:54:07 +03:00
Andrii Shvaika
f9b7f6540e Math Function rule node 2022-09-27 14:57:18 +03:00
Yuriy Lytvynchuk
3c4618c8dc Merge remote-tracking branch 'upstream/master' into feature/node_json_path 2022-09-23 13:49:30 +03:00
Sergey Matvienko
f0d19afd9c dao timescale test suite added, testcontainers version upgraded to support timescaledb 2022-09-08 19:40:56 +03:00
Volodymyr Babak
2652957562 Update bouncycastle from 1.67 to 1.69 to avoid duplicate of dependencies 2022-08-26 14:56:52 +03:00
Andrii Shvaika
dea933d906 Version set to 3.4.2 2022-08-19 15:25:18 +03:00
Yuriy Lytvynchuk
b7c68d7cfb new ruleNode 'json path' 2022-08-17 12:48:40 +03:00
Andrii Shvaika
fa0433a7eb Version set to 3.4.1-SNAPSHOT 2022-07-19 15:30:16 +03:00
Andrii Shvaika
eb1f280a5a Merge branch 'kafka-client-3-2-0' of github.com:smatvienko-tb/thingsboard into develop/3.4 2022-06-22 15:34:26 +03:00
Andrii Shvaika
6f78d8245a Merge branch 'restApiCallNodeJsonVarFix' of github.com:desoliture1/thingsboard into develop/3.4 2022-06-22 11:23:28 +03:00
Sergey Matvienko
97571c6453 kafka-client bumped up to 3.2.0, original org.apache.kafka.common.network.NetworkReceive with no changes, the custom NetworkReceive not modified 2022-06-21 19:12:03 +03:00
Andrew Shvayka
11e43aa68e
Merge pull request #6686 from YevhenBondarenko/fix/vulnerabilities 
[3.4]  fix vulnerabilities
 2022-06-21 17:20:32 +03:00
Andrii Shvaika
829a3e257e Merge with develop/3.4 2022-06-16 08:35:56 +03:00
Igor Kulikov
c4bdee92db PSQL annotation and dialect cleanup. 2022-06-15 14:04:13 +03:00
Andrew Shvayka
dbfd6ecfe7
Merge branch 'develop/3.4' into restApiCallNodeJsonVarFix 2022-06-14 19:13:54 +03:00
YevhenBondarenko
08d5cb5e93 migrated spring boot to version 2.7 due to vulnerabilities 2022-06-11 15:05:14 +02:00
YevhenBondarenko
98c78cd511 updated spring redis and spring security versions 2022-06-10 20:02:56 +02:00
YevhenBondarenko
a1e812bc0c fixed spring vulnerabilities 2022-06-10 14:21:35 +02:00
YevhenBondarenko
d965f85f22 fixed gson vulnerabilities 2022-06-10 13:15:57 +02:00
YevhenBondarenko
1687c5ba77 fixed antisamy vulnerabilities 2022-06-10 12:56:32 +02:00
Andrii Shvaika
63750ef8a0 Merge with develop/3.4 2022-06-02 13:59:15 +03:00
Viacheslav Klimov
906d421f2d Merge branch 'develop/3.4' into feature/2fa 2022-05-26 17:44:38 +03:00
Igor Kulikov
cd30e9a4b1 Fix merge conflicts 2022-05-19 12:31:00 +03:00
Igor Kulikov
0b6de71768 Implement version control ssh access with private key. Improve VC settings REST methods. Add tenantId field to admin settings. Add DB upgrade. 2022-05-19 12:01:06 +03:00
Andrii Shvaika
7ec45fd5f1 Rename Data structures. Create separate module. 2022-05-18 10:40:02 +03:00
Andrii Shvaika
0905aff7a0 Merge with develop/3.4 2022-05-17 17:00:25 +03:00
Viacheslav Klimov
f82be0153b Entities VC with Git - initial implementation 2022-05-14 17:26:18 +03:00
Viacheslav Klimov
a85dcdbd3c Merge branch 'develop/3.4' into feature/2fa 
# Conflicts:
#	application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
#	pom.xml
#	ui-ngx/src/assets/locale/locale.constant-en_US.json
 2022-05-06 11:42:10 +03:00
Sergey Matvienko
8adc0c739f removed sql test suites in favour independent test run, fixed NoSqlDaoServiceTestSuite 2022-04-28 18:45:58 +03:00
Andrew Shvayka
b9b813385f
Merge pull request #5671 from ViacheslavKlimov/smpp-sms-sender 
[3.4] SMPP SMS provider
 2022-04-28 12:03:57 +03:00
Andrew Shvayka
126e8b9639
Merge pull request #6265 from YevhenBondarenko/feature/update-versions 
[3.4] updated spring, netty and jackson versions
 2022-04-08 14:30:04 +03:00
ivankozka
f3deb9c885 extract mock-server dependencies to the parent pom 2022-04-06 18:36:39 +03:00
YevhenBondarenko
ec79601e5e updated spring versions via CVE-2021-22096 2022-04-04 12:45:58 +02:00
Viacheslav Klimov
d746a04186 Merge branch 'develop/3.4' into feature/2fa 
# Conflicts:
#	application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
 2022-03-22 15:54:53 +02:00
YevhenBondarenko
ebd5b200b4 updated jackson version 2022-03-22 10:30:32 +02:00