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

878 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
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
Igor Kulikov
d7efbd6eba Merge with master 2022-03-15 12:42:18 +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
Andrii Shvaika
a7196c4fa7 Automatic conversion of rule chain metadata on the back end 2022-02-28 17:17:31 +02:00
Igor Kulikov
dabd25e760 Version set to 3.4.0-SNAPSHOT 2022-02-21 12:19:59 +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
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
Volodymyr Babak
8dc06e53a8 Moved update of edge on device actor to tb cluster service 2022-01-26 17:18:12 +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
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
Sergey Matvienko
48ac1a256e TenantId factory method fromUUID added to reduce optimize TenantId instances count in heap memory. Factory as default @JsonCreator 2022-01-10 13:39:54 +02:00
desoliture
b64eccf333 add noXss validation for ruleNodes name 2022-01-05 16:24:12 +02:00
Andrew Shvayka
c875e36dc0
Merge pull request #5200 from van-vanich/command_in 
[3.3.3] Add operation IN and NOT_IN for String value type to key filter
 2021-12-30 13:05:39 +02: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
Andrew Shvayka
1d53b326c8
Merge pull request #5793 from volodymyr-babak/ping-pong 
Added functionality to handle pong responses on web sockets
 2021-12-29 13:38:34 +02:00
Volodymyr Babak
791b0594fd Fixed dynamic query count statistics. Updated default ping timeout to 30 seconds 2021-12-29 13:32:00 +02:00
Andrew Shvayka
2734757f32
Merge pull request #5765 from volodymyr-babak/edge-event-sort-fix-2 
[3.3.3] Edge tests fixes #2
 2021-12-29 12:42:23 +02:00
YevhenBondarenko
8c4d40dd68 merge with master 2021-12-29 08:52:56 +02:00
zbeacon
5d6ac71e24 Merge branch 'master' of https://github.com/thingsboard/thingsboard into feature/notify-gateway-about-device-changed 2021-12-28 09:46:54 +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
Volodymyr Babak
c3e65c5019 Fixed dependency - use data commons instead of boot jpa starter 2021-12-23 14:21:59 +02:00
Volodymyr Babak
1934b7387d Moved toSort from DaoUtil to PageLink/TimePageLink classes 2021-12-22 17:10:28 +02:00
YevhenBondarenko
07824ed50c refactored 2021-12-20 15:38:08 +02:00
YevhenBondarenko
6d61b249e5 improvements (not notify if lates ts has not been deleted) 2021-12-20 15:23:28 +02:00
zbeacon
e8f3950c05 Merge branch 'master' of https://github.com/thingsboard/thingsboard into feature/notify-gateway-about-device-changed 2021-12-17 13:49:39 +02:00
Igor Kulikov
3c75bdf51f
Merge pull request #5564 from van-vanich/imrove_equals_for_BaseReadTsKvQuery 
[3.3.3] improve equals for BaseReadTsKvQuery
 2021-12-17 12:47:36 +02:00
Igor Kulikov
2f6912a438
Merge pull request #5710 from desoliture1/pass_with_spaces_fix 
[3.3.x] Add allow-whitespace password policy
 2021-12-16 17:37:26 +02:00
Igor Kulikov
21a1ab2f4b
Merge pull request #5654 from desoliture1/rpc-delete-feature 
[3.3.3] Deleted rpc status
 2021-12-16 17:30:34 +02:00
YevhenBondarenko
b79c2407c4 ts notification 2021-12-16 16:54:57 +02:00