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

1657 Commits

Author SHA1 Message Date
Viacheslav Klimov
41fede9b43 Add checks for SMS and mail service when setting up 2FA provider; 2Fa verification mail template 2022-05-17 18:31:49 +03:00
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
Viacheslav Klimov
bcc736991e Multiple used 2FA providers for account 2022-05-04 14:29:36 +03:00
Sergey Matvienko
5c6a5bcb6a
Merge branch 'develop/3.4' into tests-speedup-tenant 2022-04-26 14:37:01 +03:00
Sergey Matvienko
fcb0cd93e3 nosql-test.properties added Main queue to handle the init issue 2022-04-26 14:29:39 +03:00
Sergey Matvienko
e760d45bd6 application-test.properties low latency to speed up tests 2022-04-26 11:49:30 +03:00
Volodymyr Babak
d3eda0c473 Added edge_event config to yml file 2022-04-21 10:42:39 +03:00
Volodymyr Babak
878d9743ce Organize imports 2022-04-20 18:11:29 +03:00
Volodymyr Babak
f8687cb983 Make save edge event method async 2022-04-20 17:17:46 +03:00
Andrii Shvaika
9dacc93c2d Merge remote-tracking branch 'origin/master' into develop/3.4 2022-04-20 11:49:21 +03:00
Andrii Shvaika
349f331890 Merge PR #6320 2022-04-20 11:45:17 +03:00
Sergey Matvienko
92f141e2ca CustomerServiceSqlTest refactored in async manner to improve performance 2022-04-19 17:20:58 +03:00
Yuriy Lytvynchuk
e1b9f8211b getValueForSQLQuery: valueParameter.ToString() -> String.valueOf(valueParameter) 2022-04-13 17:55:38 +03:00
Yuriy Lytvynchuk
4b8e2efc38 logQuery: Log format modification 2022-04-13 17:19:11 +03:00
Yuriy Lytvynchuk
cecbacfad4 Query: add SQL string with parameters 2022-04-12 18:20:55 +03:00
Yuriy Lytvynchuk
1a4cf21bb1 Query: add SQL string with parameters 2022-04-11 20:00:07 +03:00
Yuriy Lytvynchuk
1f029983d1 Query: add SQL string with parameters 2022-04-11 19:33:59 +03:00
Yuriy Lytvynchuk
ee4a3b90cc Query: add SQL string with parameters 2022-04-08 23:12:07 +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
Yuriy
5809b0d6a8 QUERY: add SQL string with parameters 2022-04-05 17:53:54 +03:00
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
b396aa4a38 Use JdbcTemplate in EntitiesSchemaSqlTest 2022-03-28 16:26:05 +03:00
Viacheslav Klimov
6182ae7415 Add test for schema reinstall 2022-03-28 15:41:09 +03:00
Viacheslav Klimov
50422363f0 Fix install script for fk_device_profile_ota_package constraint to work on repeated install 2022-03-28 14:26:56 +03:00
YevhenBondarenko
287485831d fixed entity view caching 2022-03-26 00:49:30 +02:00
Viacheslav Klimov
472edc8409 Refactor controller exceptions handling 2022-03-23 12:07:52 +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
8bbe6bafd8 Refactor 2FA; add refilling setting to TbRateLimits 2022-03-22 15:49:57 +02:00
Viacheslav Klimov
20a4f3cc4c 2FA: lock account after X unsuccessful verification attempts; refactoring 2022-03-20 14:13:54 +02:00
Viacheslav Klimov
0c36d4809c 2FA: rate limiting, validation, refactoring 2022-03-19 19:34:45 +02:00
Viacheslav Klimov
9eb03950fa 2FA: refactoring, tests 2022-03-17 18:49:08 +02:00
Yevhen
5d82d738ee updated spring and netty versions 2022-03-15 21:44:27 +01:00
Igor Kulikov
d7efbd6eba Merge with master 2022-03-15 12:42:18 +02:00
Viacheslav Klimov
e2c9a5ffdf TOTP and SMS 2FA providers; 2FA set-up API 2022-03-10 17:59:59 +02:00
Viacheslav Klimov
5bf9107deb Merge branch 'master' into fix/ota-device-profile 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
 2022-03-02 17:32:41 +02:00
Andrii Shvaika
da8bff5209 Rule Chain Service improvement for invalid rule chain ids 2022-02-28 17:27:48 +02:00
Andrii Shvaika
a7196c4fa7 Automatic conversion of rule chain metadata on the back end 2022-02-28 17:17:31 +02: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
3af76140cd Merge with master 2022-02-21 11:54:41 +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
64d3f5c803 Remove redundant event types from cleanup procedure 2022-02-18 12:12:39 +02:00
Andrii Shvaika
7cc2508479 Improvement to events cleanup script 2022-02-18 12:08:43 +02:00
Andrew Shvayka
1c656378f7
Merge pull request #6009 from van-vanich/fix_AbstractJpaDaoTest 
[3.4] Fix AbstractJpaDaoTest
 2022-02-08 15:21:53 +02:00
Viacheslav Klimov
30527b547f Merge branch 'master' into fix/ota-device-profile 2022-02-07 11:40:42 +02:00
Viacheslav Klimov
f51a66b585 Delete OTA update packages of device profile with cascade when this profile is deleted 2022-02-04 18:06:40 +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
van-vanich
6318c7636c fix issue with failure test, because before other tests saved and don't delete Alarm 2022-02-04 15:55:31 +02:00