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

432 Commits

Author SHA1 Message Date
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
YevhenBondarenko
6bd9ae043e updated netty-tcnative version 2022-03-21 18:45:19 +02:00
Yevhen
5d82d738ee updated spring and netty versions 2022-03-15 21:44:27 +01:00
Viacheslav Klimov
e2c9a5ffdf TOTP and SMS 2FA providers; 2FA set-up API 2022-03-10 17:59:59 +02:00
Viacheslav Klimov
89c74cac8d Merge branch 'develop/3.4' into smpp-sms-sender 2022-03-02 17:39:41 +02:00
Igor Kulikov
dabd25e760 Version set to 3.4.0-SNAPSHOT 2022-02-21 12:19:59 +02:00
Andrii Shvaika
24829c29f7 Workaround for KAFKA-4090 2022-02-14 15:38:03 +02:00
Igor Kulikov
312924a19b Version set to 3.3.4-SNAPSHOT 2022-02-07 09:55:37 +02:00
ArtemDzhereleiko
ddca2d318f Merge branch 'smpp-sms-sender' of git://github.com/ViacheslavKlimov/thingsboard into ViacheslavKlimov-smpp-sms-sender 2022-01-28 18:37:07 +02:00
YevhenBondarenko
57510b4d54 Merge branch 'master' of github.com:thingsboard/thingsboard into feature/californium-update 
# Conflicts:
#	common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapService.java
#	common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/secure/TbLwM2MDtlsCertificateVerifier.java
 2022-01-20 13:23:30 +02:00
desoliture1
9c2b0cf0b8
[3.3.3] Self-intersecting polygons, polygons with holes, multiple polygons support (#5687) 
* fix coordinate containing checking for self-intersecting polygons

* add multipolygons and holes suppot

* Refactor GeoUtil

* add support for building polygons by two coordinates

* add corresponding tests for polygon processing from GeoUtils

* refactor GeoUtil, update JTS lib to 1.18.2 version

* refactor

Co-authored-by: Viacheslav Klimov <viacheslavklimov11@gmail.com>
 2022-01-20 11:05:40 +02:00
YevhenBondarenko
292220cddc updated Californium and Leshan versions 2022-01-20 09:41:36 +02:00
Igor Kulikov
da4c742872 Update license year to 2022 2022-01-17 14:07:46 +02:00
Andrii Shvaika
20c9e77083 Multi-Root Query implementation improvements 2022-01-14 14:01:43 +02:00
Igor Kulikov
4c0eb6247b
Merge pull request #5802 from thingsboard/lwm2m_trust_cert 
[3.3.3]lwm2m_trust_cert
 2022-01-13 11:02:36 +02:00
nickAS21
c655b58977 lwm2m delete security files jks and in yml security enable = false 2021-12-30 12:31:21 +02:00
Jagveer Loky
9921451b40
Update Log4j 2.17.0 to 2.17.1 2021-12-30 10:14:49 +00:00
Andrew Shvayka
283ec2aa1a
Merge pull request #5583 from thingsboard/develop/3.3.3 
Develop 3.3.3 to Master
 2021-12-30 11:28:50 +02:00
Sergey Matvienko
79bc08e022 upgrade logback version to pass vulnerability check 2021-12-30 10:43:25 +02:00
Sergey Matvienko
233f58cc46 netty version upgrade from 4.1.71.Final to 4.1.72.Final 2021-12-30 10:43:14 +02:00
YevhenBondarenko
8c4d40dd68 merge with master 2021-12-29 08:52:56 +02:00
Volodymyr Babak
c3e65c5019 Fixed dependency - use data commons instead of boot jpa starter 2021-12-23 14:21:59 +02:00
Larry Diamond
c0075009a8 remediation for log4shell CVE-2021-45105 2021-12-18 16:07:33 -05:00
YevhenBondarenko
f0c2b5df35 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.3.3 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
#	application/src/main/resources/thingsboard.yml
#	application/src/test/java/org/thingsboard/server/transport/TransportSqlTestSuite.java
#	common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/config/LwM2MTransportServerConfig.java
#	ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-profile-components.module.ts
 2021-12-16 15:47:51 +02:00