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

373 Commits

Author SHA1 Message Date
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
Volodymyr Babak
f8687cb983 Make save edge event method async 2022-04-20 17:17:46 +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
Viacheslav Klimov
95f41810ac Store 2FA account config is UserCredentials' additionalInfo 2022-03-29 11:32:27 +03: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
Viacheslav Klimov
20a4f3cc4c 2FA: lock account after X unsuccessful verification attempts; refactoring 2022-03-20 14:13:54 +02:00
Yevhen
5d82d738ee updated spring and netty versions 2022-03-15 21:44:27 +01:00
Andrii Shvaika
4775869786 Merge branch 'master' into develop/3.4 2022-02-28 11:48:31 +02:00
Volodymyr Babak
1b9d70f2fe Refactoring validators - moved them to a separate classes 2022-02-21 19:18:27 +02:00
Igor Kulikov
dabd25e760 Version set to 3.4.0-SNAPSHOT 2022-02-21 12:19:59 +02:00
Igor Kulikov
c3dde26c69 Implement events batch insert. Remove 'region' filter from tenant find queries. 2022-02-18 16:57:48 +02:00
Andrii Shvaika
7cc2508479 Improvement to events cleanup script 2022-02-18 12:08:43 +02:00
Igor Kulikov
312924a19b Version set to 3.3.4-SNAPSHOT 2022-02-07 09:55:37 +02:00
Andrii Shvaika
66b58549c5 Propagate alarms to Customer or Tenant without relations 2022-01-19 11:49:38 +02:00
Igor Kulikov
da4c742872 Update license year to 2022 2022-01-17 14:07:46 +02:00
Igor Kulikov
6306a27909
Merge pull request #5629 from ArtemDzhereleiko/control-widget/rpc-persistent-table 
[3.3.3] UI: New control widget Persistent table
 2022-01-12 16:30:29 +02:00
Viacheslav Klimov
13a74c784e Events clearing by filter 2022-01-04 12:27:22 +02:00
Viacheslav Klimov
144da0367a Refactor events clearing 2022-01-04 12:25:05 +02:00
Swoq
b9e6c2b75e Event clearing 2022-01-04 12:25:05 +02:00
Andrew Shvayka
2d0890b43e
Merge pull request #5750 from YevhenBondarenko/feature/ts-notification 
[3.3.3] ts latest notifications
 2021-12-24 17:00:45 +02:00
ArtemDzhereleiko
6a6b0638da Update and resolve conflicts 2021-12-21 12:22:48 +02:00
YevhenBondarenko
6d61b249e5 improvements (not notify if lates ts has not been deleted) 2021-12-20 15:23:28 +02:00
YevhenBondarenko
b8d49b66a6 send notifications by rewriteLatestIfDeleted 2021-12-17 16:36:19 +02:00
Igor Kulikov
ab2a7e4357
Merge pull request #5569 from dmytro-landiak/save-ts-no-latest 
[3.3.3] Save timeseries without latest persistence
 2021-12-17 13:16:44 +02:00
Andrii Shvaika
eebce55d5a Improved upgrade script performance 2021-12-09 15:12:03 +02:00
Andrii Shvaika
bbd1d8ae86 Migration script 2021-12-03 11:57:31 +02:00
Andrii Shvaika
c3fa9b9f43 Nested rule chains 2021-12-02 19:13:18 +02:00
ArtemDzhereleiko
5d4579ce28 UI: New control widget Persistent table 2021-11-26 17:00:51 +02:00
Igor Kulikov
7187ecfdb1 Version set to 3.3.3-SNAPSHOT 2021-11-24 12:24:27 +02:00
Andrii Shvaika
3ffd62f844 Fix corner case when access token matches user name in credentials 2021-11-24 09:36:14 +02:00
Dima Landiak
c43e8950a2 save ts without latest 2021-11-16 18:43:52 +02:00
Viacheslav Klimov
17f9eebe23 Set serialVersionUIDs for cached entities 2021-11-04 16:25:15 +02:00
Viacheslav Klimov
2814c377ac Refactor rule chains importing 2021-10-11 16:29:46 +03:00
YevhenBondarenko
ffe16b8dfb Merge remote-tracking branch 'upstream/master' into feature/bulk-import/device-credentials 
# Conflicts:
#	ui-ngx/src/app/modules/home/components/import-export/import-export.service.ts
 2021-09-09 17:18:28 +03:00
Viacheslav Klimov
d14f6a4ddd Refactor device bulk import 2021-09-07 18:52:29 +03:00
Viacheslav Klimov
bd1cfa4491 Merge branch 'master' into feature/bulk-import/device-credentials 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/EdgeController.java
 2021-09-07 16:32:22 +03:00
Igor Kulikov
b173e0799c Update OS package plugin version. Code cleanup. 2021-09-07 11:47:43 +03:00
Igor Kulikov
049627db97 Version set to 3.3.2-SNAPSHOT 2021-09-06 18:55:10 +03:00
Igor Kulikov
02b8b8b873
Merge branch 'master' into dependency-upgrade-test-scope 2021-09-01 14:57:02 +03:00
Andrew Shvayka
f47985ccc6
Merge pull request #5157 from thingsboard/develop/3.3.1 
Refactoring: Introduced Edge License service.
 2021-08-27 16:01:26 +03:00
Andrii Shvaika
37fd7f4988 Validation and Replacement of Queue names in the Device profile 2021-08-26 15:51:59 +03:00
Volodymyr Babak
6f9ac66863 Refactoring: Introduced Edge License service. Remove web dependency from dao 2021-08-25 15:59:26 +03:00
Volodymyr Babak
5007eccb26 Added logs for edge license check. Replaced Object class with JsonNode 2021-08-20 13:14:18 +03:00
Andrii Shvaika
3661647c3a Version set to 3.3.1-SNAPSHOT 2021-08-16 12:39:43 +03:00
Viacheslav Klimov
e33a336ed9 Merge remote-tracking branch 'origin/master' into feature/bulk-import/device-credentials 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/DeviceController.java
#	application/src/main/java/org/thingsboard/server/controller/EdgeController.java
#	common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceService.java
#	ui-ngx/src/app/core/http/device.service.ts
 2021-08-09 12:27:53 +03:00
Andrii Shvaika
2078c71d32 Added module cluster-api and used it in rule engine and other services 2021-08-06 17:33:52 +03:00
Sergey Matvienko
e223dda96f test scope: dependency upgrade a refactor for all POMs in project 2021-08-06 13:53:35 +03:00
Viacheslav Klimov
3505810280 Bulk import device credentials handling refactoring 2021-08-05 15:13:05 +03:00
Volodymyr Babak
9fd816387b Merge branch 'master' of github.com:thingsboard/thingsboard into edge-fix-concurrent-async-issue 2021-07-22 16:48:56 +03:00
Volodymyr Babak
3ae5acbcc8 Added lock on edge event save/read. Removed save async method 2021-07-22 15:59:47 +03:00