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

739 Commits

Author SHA1 Message Date
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
Sergey Matvienko
1bf579288a tests: fixed test performance degradation (100% C2 Compiler) by removing -Xss384k and Mockito.clearAllCaches() 2023-03-01 01:05:19 +01:00
Sergey Matvienko
27f5f8c077 Cassandra tests moved from cassandra-unit to testcontainers 2023-02-28 16:31:54 +01:00
Sergey Matvienko
bf5f11f7c7 tests: surefire plugin: -Xss384k -XX:+UseStringDeduplication -XX:MaxGCPauseMillis=20 2023-02-27 21:36:24 +01:00
Sergey Matvienko
c38dd12703 test dependency upgrade: surefire.version 3.0.0-M9 2023-02-27 21:30:31 +01:00
Vladyslav_Prykhodko
2212a6d9be Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system 2023-02-14 11:09:34 +02:00
Igor Kulikov
3aed9db82f UI: Angular 14 migration 2023-02-02 16:55:27 +02:00
Vladyslav_Prykhodko
8174a97926 Merge with klimov/feature/notification-system 2023-01-31 17:46:12 +02:00
Andrii Shvaika
a203c336f1 Merge with master 2023-01-31 16:20:04 +02:00
Igor Kulikov
cbdc4517e4 Update license header year to 2023 2023-01-31 10:43:56 +02:00
Andrii Shvaika
76082c7177 Version set to 3.5.0-SNAPSHOT 2023-01-10 17:24:26 +02:00
Andrii Shvaika
e23fc18dc6 Merge remote-tracking branch 'origin/master' into develop/3.5 2023-01-10 17:04:35 +02:00
ViacheslavKlimov
7eff0fc346 Merge remote-tracking branch 'origin/develop/3.5' into feature/monitoring-service 2023-01-08 15:02:48 +02:00
Igor Kulikov
4c3154da4b Version set to 3.4.4-SNAPSHOT 2022-12-28 13:33:57 +02:00
Andrii Shvaika
0a0099207e Merge branch 'master' into develop/3.5 2022-12-28 12:30:52 +02:00
Andrii Shvaika
509da5dee4 Merge branch 'feature/notification-system' of github.com:ViacheslavKlimov/thingsboard into feature/notification-system 2022-12-27 13:07:55 +02:00
Andrii Shvaika
34d7a6ced8 Merge remote-tracking branch 'origin/master' into develop/3.5 2022-12-27 13:06:46 +02:00
Andrew Shvayka
19513ec027
Merge pull request #7804 from ShvaykaD/feature/base-entity-service-improvement 
[3.5] improvements for base entity service v2
 2022-12-22 14:14:47 +02:00
ShvaykaD
652a8c9e89 added getEntityType method in EntityDaoService 2022-12-22 13:02:39 +02:00
ViacheslavKlimov
7792e80283 Merge branch 'master' into feature/notification-system 2022-12-21 17:53:41 +02:00
Serafym Tuhai
0c4762f968 Merge branch 'master' of github.com:thingsboard/thingsboard into UITests 2022-12-20 19:12:55 +02:00