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

709 Commits

Author SHA1 Message Date
YevhenBondarenko
ce87bc5e13 to springdoc migration 2023-06-12 13:25:37 +02:00
ViacheslavKlimov
3150580dce Merge branch 'develop/3.5.2' into feature/push-notifications 
# Conflicts:
#	application/pom.xml
#	pom.xml
 2023-06-12 14:12:19 +03:00
dashevchenko
a85f5b4330 added initial implementation 2023-06-08 12:30:35 +03:00
YevhenBondarenko
7f9a9c7fb3 merge with develop/3.6 2023-06-05 15:58:16 +02:00
YevhenBondarenko
db6f310284 migration to spring boot 3.1 2023-06-05 15:24:47 +02:00
Andrii Shvaika
c9966ef3ef Extracted proto files to a separate module 2023-06-02 16:27:06 +03:00
Andrii Shvaika
790513788a Merge remote-tracking branch 'origin/develop/3.5.2' into develop/3.6 2023-06-02 14:59:40 +03:00
dashevchenko
34c8909adf moved servicebus conflicting dependency to exclusions 2023-06-02 13:05:08 +03:00
dashevchenko
dadde5535e added dependencies to avoid conflicts 2023-06-01 19:17:23 +03:00
dashevchenko
20443a7256 upgraded version for azure-servicebus sdk 2023-05-30 23:00:23 +03:00
Igor Kulikov
ceda0f14e6 Merge branch 'master' into develop/3.5.2 2023-05-30 18:47:33 +03:00
Igor Kulikov
a6e2f6aafb Update apache curator version to 5.5.0 2023-05-30 17:43:35 +03:00
Igor Kulikov
9ae1f1e329 Version set to 3.5.2-SNAPSHOT 2023-05-22 16:32:24 +03:00
Igor Kulikov
59cc8244b5 Version set to 3.5.1-SNAPSHOT 2023-05-22 16:31:19 +03:00
Igor Kulikov
c422e39724 Version set to 3.5.1-SNAPSHOT 2023-05-22 16:26:54 +03:00
Andrii Shvaika
6120fb132a Version set to 3.5.2. Migration script improved 2023-05-22 13:16:06 +03:00
YevhenBondarenko
1849007610 msa and packaging java 17 support 2023-05-19 19:08:03 +02:00
YevhenBondarenko
f2545fb942 Merge branch 'develop/3.6' of github.com:thingsboard/thingsboard into feature/java-17 2023-05-19 19:06:45 +02:00
YevhenBondarenko
bba26ca676 merge with develop/3.5.1 2023-05-19 18:20:27 +02:00
YevhenBondarenko
6fda898851 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.6 2023-05-15 12:09:22 +02:00
Igor Kulikov
7058f99068 Version set to 3.5.1-SNAPSHOT 2023-05-12 15:45:11 +03:00
ViacheslavKlimov
9add2962a6 Push-notifications to mobile 2023-05-10 18:20:36 +03:00
YevhenBondarenko
bcd2b94156 fixed start for windows 2023-05-10 17:18:45 +02:00
YevhenBondarenko
40d6e67131 migrate to java 17 2023-05-02 00:46:34 +02:00
YevhenBondarenko
4977108550 Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into develop/3.6 2023-04-21 19:34:31 +02:00
Andrew Shvayka
4b0709567c
Merge pull request #8349 from thingsboard/fix/vulnerabilities 
fix vulnerabilities
 2023-04-12 17:33:30 +03:00
Andrii Shvaika
a137243301 Fix maven resource plugin to be consistent with PE 2023-04-12 12:40:49 +03:00
Andrii Shvaika
6fe6dc2561 Fix build due to filtering maven plugin bug 2023-04-11 19:17:39 +03:00
YevhenBondarenko
46935d4517 updated jedis version 2023-04-11 16:34:56 +02:00
YevhenBondarenko
72ea018efc updated spring versions 2023-04-11 14:05:28 +02:00
ViacheslavKlimov
df16a6a310 Refactoring for monitoring service 2023-04-10 10:57:27 +03:00
ViacheslavKlimov
7a30cc1b68 Merge branch 'develop/3.5' into feature/monitoring-service 
# Conflicts:
#	msa/pom.xml
#	rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java
 2023-04-07 17:31:26 +03:00
Yevhen Bondarenko
5b4c049f0c
Merge pull request #7628 from WHBANG/oscs_fix_cdq6k9oau51t49so8c4g 
fix(sec): upgrade org.springframework.security:spring-security-oauth2-client to 5.7.5
 2023-04-07 14:41:54 +02:00
Andrii Shvaika
166afbd782 Merge branch 'develop/3.5' into develop/3.6 2023-04-07 15:41:24 +03:00
Andrii Shvaika
b1884f675a Update service and TBEL version improvement 2023-04-05 15:43:09 +03:00
Andrew Shvayka
09b3299015
Revert "[Fix bug][3.5] tbel json decode id" 2023-04-04 18:15:21 +03:00
Andrew Shvayka
6b93de8bef
Update pom.xml 2023-04-04 18:10:19 +03:00
nickAS21
98ee962560 tbel: 
- ver 1.0.6
- public interface ExecutionObject
      -> int getId(); to int getExecutionObjectId();
 2023-03-28 13:42:19 +03:00
YevhenBondarenko
0101f6fc90 Merge branch 'feature/notification-system' of github.com:thingsboard/thingsboard into feature/home-page 2023-03-23 22:14:45 +01:00
YevhenBondarenko
671c7db5c9 added new metrics 2023-03-21 17:19:51 +01:00
Vladyslav_Prykhodko
1b2b84e48e Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system 2023-03-21 15:32:23 +02:00
Andrii Shvaika
80f43b09fa Merge remote-tracking branch 'origin/develop/3.5' into feature/notification-system 2023-03-20 16:42:53 +02:00
nickAS21
14755d159e add new lwm2mObjectModels to install 2023-03-17 17:43:08 +02:00
Andrii Shvaika
1960d99504 REST template concurrency 2023-03-17 13:50:49 +02:00
YevhenBondarenko
265e33241a version set to 3.6.0-SNAPSHOT 2023-03-10 14:45:49 +01:00
ViacheslavKlimov
8fcbe876e8 Merge branch 'develop/3.5' into feature/notification-system 
# Conflicts:
#	pom.xml
 2023-03-08 18:16:16 +02:00
Seraphym-Tuhai
8171893905 update allure-maven version 2023-03-06 15:17:02 +02:00
Vladyslav_Prykhodko
069ef4de5b Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system 2023-03-06 10:21:41 +02:00
Seraphym-Tuhai
99e389cec5 add screenshot after test 2023-03-03 16:48:32 +02:00
Andrew Shvayka
109ccccd14
Merge pull request #8147 from smatvienko-tb/feature/testcontainers-cassandra 
[3.5] Cassandra tests moved from cassandra-unit to testcontainers
 2023-03-01 12:30:45 +02:00