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

1105 Commits

Author SHA1 Message Date
Viacheslav Klimov
8eb68ff7a6 Revert changes to UserCredentials 2022-03-30 10:50:57 +03:00
Viacheslav Klimov
190430ffc4 Store 2FA account config in UserAuthSettings table 2022-03-29 19:18:00 +03:00
Viacheslav Klimov
95f41810ac Store 2FA account config is UserCredentials' additionalInfo 2022-03-29 11:32:27 +03:00
Viacheslav Klimov
040b6a31ad Rename packages for export/import 2022-03-25 15:54:07 +02:00
Viacheslav Klimov
5ee056ff8d Export/import API refactoring 2022-03-25 15:32:54 +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
Viacheslav Klimov
9eb03950fa 2FA: refactoring, tests 2022-03-17 18:49:08 +02:00
Viacheslav Klimov
01ad35d864 Get rid of boilerplate in import services 2022-03-16 20:02:51 +02:00
Viacheslav Klimov
849513541e Entities export/import API refactoring: permission checks and entity lifecycle events 2022-03-16 17:35:34 +02:00
Viacheslav Klimov
4062dc70fb Initial export/import API for devices, device profiles, assets, rule chains, dashboards and customers 2022-03-16 15:03:55 +02:00
Igor Kulikov
d7efbd6eba Merge with master 2022-03-15 12:42:18 +02:00
ShvaykaD
d4e6c013d2 added fixes after review 2022-03-14 13:01:46 +02:00
ShvaykaD
a26a4c4787 Feature/6233 implementation 2022-03-11 14:13:47 +02:00
Viacheslav Klimov
1ad769048c 2FA support for platform authentication 2022-03-10 18:15:42 +02:00
Igor Kulikov
a35bb0fb97
Merge pull request #6180 from ViacheslavKlimov/fix/lwm2m-import 
[3.3.4] Fix LwM2M devices import
 2022-03-07 14:50:25 +02:00
Viacheslav Klimov
066f40c63f Test for SmppSmsSender 2022-03-03 21:36:40 +02:00
Viacheslav Klimov
89c74cac8d Merge branch 'develop/3.4' into smpp-sms-sender 2022-03-02 17:39:41 +02:00
Andrii Shvaika
a7196c4fa7 Automatic conversion of rule chain metadata on the back end 2022-02-28 17:17:31 +02:00
ShvaykaD
c0d290a93e Merge remote-tracking branch 'upstream/develop/3.4' into feature/6169 2022-02-28 11:50:14 +02:00
ShvaykaD
2cbcd2c89d merge with master 2022-02-28 11:34:16 +02:00
Igor Kulikov
dabd25e760 Version set to 3.4.0-SNAPSHOT 2022-02-21 12:19:59 +02:00
YevhenBondarenko
4512185cad created Queue entity, dao and ui 2022-02-18 16:41:24 +02:00
Andrew Shvayka
282a6bc990
Merge pull request #6035 from volodymyr-babak/edge-ce-refactoring 
[3.3.4] Edge Community Edition support
 2022-02-15 17:29:01 +02:00
Andrii Shvaika
24829c29f7 Workaround for KAFKA-4090 2022-02-14 15:38:03 +02:00
Volodymyr Babak
95f6fcfe33 Merge branch 'master' of github.com:thingsboard/thingsboard into edge-ce-refactoring 2022-02-10 20:13:12 +02:00
ShvaykaD
1ae1dbef3a added DynamicProtoUtils 2022-02-10 17:25:53 +02:00
desoliture
e6053e8e7d Merge branch 'master' into alarmScheduleDynamicValues 
# Conflicts:
#	rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmRuleState.java
#	ui-ngx/src/app/modules/home/components/home-components.module.ts
 2022-02-08 13:28:45 +02:00
Igor Kulikov
312924a19b Version set to 3.3.4-SNAPSHOT 2022-02-07 09:55:37 +02:00
Volodymyr Babak
ffcc5be0ae Removed edge license and cloud endpoint from edge instance - refactoring edge ce 2022-02-04 17:34:46 +02:00
Viacheslav Klimov
6f84b411c3 Fix LwM2M devices import 2022-01-31 12:33:01 +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
Volodymyr Babak
8dc06e53a8 Moved update of edge on device actor to tb cluster service 2022-01-26 17:18:12 +02:00
Viacheslav Klimov
d99a8066fe Refactor RateLimitsUpdater; handle rate limits disabling 2022-01-21 15:18:39 +02:00
Viacheslav Klimov
487d7165cc Rate limits to tenant profile BE refactoring 2022-01-20 14:31:02 +02:00
Viacheslav Klimov
cb071ac0a2 Merge remote-tracking branch 'origin/master' into rate-limits-to-tenant-profile 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
#	application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java
#	dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateReadExecutor.java
#	dao/src/main/java/org/thingsboard/server/dao/util/AbstractBufferedRateExecutor.java
#	ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html
#	ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts
#	ui-ngx/src/app/shared/models/tenant.model.ts
 2022-01-20 13:40:53 +02:00
Volodymyr Babak
4401724f94 Merge remote-tracking branch 'origin/master' into code-review 2022-01-19 16:52:12 +02:00
Volodymyr Babak
f907ac1636 Added @ToString(callSuper = true) to filter classes for correct log output 2022-01-19 15:07:25 +02:00
Volodymyr Babak
0ba7b96283 Added @EqualsAndHashCode(callSuper = true) to @Data filter classes that exends 2022-01-19 13:15:08 +02:00
Volodymyr Babak
4e1cbf5c1e Code review minor misc fixes 2022-01-19 12:50:22 +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
Andrii Shvaika
4c00bfc0fa Merge with master. Fixed notifications, licenses and naming 2022-01-17 13:35:03 +02:00
Andrew Shvayka
c15b4ceec3
Merge pull request #5843 from smatvienko-tb/device-actor-performance 
[3.3.3] Device actor session inactivity performance + heap workout
 2022-01-17 11:21:56 +02:00
Andrii Shvaika
20c9e77083 Multi-Root Query implementation improvements 2022-01-14 14:01:43 +02:00
Andrew Shvayka
0c85479eaf
Merge pull request #5823 from desoliture1/ruleChainNameNoXss 
[3.3.3] Add noXss validation for names of ruleNodes
 2022-01-13 15:51:30 +02:00
desoliture
2a93edbac4 add cache support for TenantService 2022-01-13 12:35:01 +02:00
nickAS21
1b488781d5 lwm2m for profile bootstrap need input: X509 certificate (instead of X509 public key) 2022-01-11 19:07:33 +02:00
Sergey Matvienko
2e9d776845 TenantId static initializer replaced with a static variable order 2022-01-10 17:16:30 +02:00
Sergey Matvienko
8611349e4b TenantId static initializer 2022-01-10 15:03:15 +02:00
Sergey Matvienko
7d78437258 TenantId new instance replaced with factory method call fromUUID 2022-01-10 13:55:25 +02:00