10367 Commits

Author SHA1 Message Date
Viacheslav Klimov
32f2f4ccd0 Export/import of attributes 2022-05-31 13:19:36 +03:00
Andrii Shvaika
bf03475987 Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-05-31 13:19:28 +03:00
Andrii Shvaika
07b6813465 Separate AutoCommit settings 2022-05-31 13:19:16 +03:00
Igor Kulikov
bb9b58da5b Add author to entity version 2022-05-31 13:09:47 +03:00
Vladyslav_Prykhodko
9c8913edb4 UI: Redesigned 2fa login page 2022-05-31 13:06:58 +03:00
Igor Kulikov
89c04a3460 UI: Implement complex version load. 2022-05-31 11:33:49 +03:00
Towfiqul Islam
3ca205ef7e
Merge pull request #1 from laziestcoder/fix_typo
fix: typo fix in variable name and method name v3.4
2022-05-31 14:22:03 +06:00
towfiq
59f18b0e02 fix: typo fix in variable name and method name 2022-05-31 14:18:02 +06:00
nickAS21
d1b9b77528 refactoring: OtaPackageController: comments4 2022-05-31 10:55:54 +03:00
nickAS21
92d97560db refactoring: OtaPackageController: comments3 2022-05-30 20:26:26 +03:00
nickAS21
beaa064a44 refactoring: OtaPackageController: saveOtaPackageData, RuleChainController: fix bug test delete 2022-05-30 19:29:13 +03:00
Igor Kulikov
ab686d5dd0 UI: minor improvements 2022-05-30 19:24:58 +03:00
Igor Kulikov
80d1af8b92 Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-05-30 19:05:30 +03:00
Igor Kulikov
b6f964a5eb UI: Implement complex version create action. 2022-05-30 19:05:17 +03:00
Vladyslav_Prykhodko
b050468e7f UI: Move resend code in login 2fa page 2022-05-30 18:01:14 +03:00
Andrii Shvaika
518d9fd6f5 SID for Auto Version Create Config 2022-05-30 17:34:16 +03:00
Andrii Shvaika
34ac17ff83 Auto-commit draft 2022-05-30 17:32:13 +03:00
nickAS21
993052bbe3 refactoring: RuleChainController redundant empty lines 2022-05-30 16:46:30 +03:00
nickAS21
151086c394 refactoring: RuleChainController metadata 2022-05-30 16:26:17 +03:00
Vladyslav_Prykhodko
f68bbd58d7 Change 2fa mail pattern to replace code 2022-05-30 15:35:07 +03:00
nickAS21
a6a58a3256 refactoring: RuleChainController comments1 2022-05-30 15:12:22 +03:00
fe-dev
19c313dbed Refactoring 2022-05-30 14:54:41 +03:00
YevhenBondarenko
a5c1cce884 added queue to rest client 2022-05-30 12:30:00 +02:00
nickAS21
a778305b03 refactoring: RuleChainController fix bug clientSideRpc() 2022-05-30 13:21:22 +03:00
Vladyslav_Prykhodko
65541b9aed UI: Fix style sms auth dialog 2022-05-30 13:00:57 +03:00
Andrii Shvaika
f0d887b91a NPE fix in DefaultTbContext 2022-05-30 12:16:30 +03:00
kalutkaz
29fef94692
Merge branch 'develop/3.4' into fix/adaptMarkerTripAnimation 2022-05-30 09:43:01 +02:00
nickAS21
6714f263ae refactoring: RuleChainController del double code 2022-05-28 14:12:09 +03:00
nickAS21
20c612b7cc refactoring: RuleChainController 2022-05-27 20:18:52 +03:00
Igor Kulikov
0be0df6015 UI: Implemented entity version diff component. 2022-05-27 19:34:55 +03:00
Vladyslav_Prykhodko
7836ad6f90 UI: Add validation 2fa settings 2022-05-27 17:34:09 +03:00
Vladyslav_Prykhodko
095851897a UI: Fixed 2fa auth.guard and setting style 2022-05-27 16:04:34 +03:00
fe-dev
4ba75a7c38 UI: Fixed build project 2022-05-27 15:37:36 +03:00
Igor Kulikov
351de50cbc Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-05-27 13:14:26 +03:00
Igor Kulikov
e86b37b4af UI: Initial implementation of entity versions diff component 2022-05-27 13:14:18 +03:00
Viacheslav Klimov
985f7c79aa 2FA refactoring 2022-05-27 12:34:12 +03:00
Vladyslav_Prykhodko
026361ce69 UI: Revert change 2022-05-27 10:35:17 +03:00
nickAS21
7b3a3dc103 refactoring: OtaPackageController fix bug testDeleteFirmware 2022-05-26 21:21:51 +03:00
nickAS21
105acc16ba refactoring: OtaPackageController fix bug tests with OtaPackage 2022-05-26 20:32:22 +03:00
Igor Kulikov
9d5ce7c82c
Merge pull request #6601 from ViacheslavKlimov/entities-vc-refactoring
API to compare current entity data to specific version
2022-05-26 17:53:06 +03:00
Viacheslav Klimov
906d421f2d Merge branch 'develop/3.4' into feature/2fa 2022-05-26 17:44:38 +03:00
Vladyslav_Prykhodko
76de891890 UI: 2fa improvement settings 2022-05-26 16:26:14 +03:00
Viacheslav Klimov
eeb7dc2338 Improvements for 2FA 2022-05-26 16:13:24 +03:00
Andrii Shvaika
30b75c9a87 Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-05-26 15:31:26 +03:00
Andrii Shvaika
576c34b41a Delete repository on Tenant Deletion 2022-05-26 15:28:45 +03:00
nickAS21
9fe5f1fea1 refactoring: OtaPackageController 2022-05-26 15:25:05 +03:00
Viacheslav Klimov
9c2f96b262 Merge remote-tracking branch 'origin/feature/entities-version-control' into entities-vc-refactoring
# Conflicts:
#	common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/GitRepository.java
2022-05-26 15:22:24 +03:00
Viacheslav Klimov
e4ed8c5080 Api for comparing current entity data to specific version; refactoring 2022-05-26 15:10:46 +03:00
Igor Kulikov
c46b5b6448 Fix message 2022-05-26 14:34:25 +03:00
Igor Kulikov
6558b0b24d UI: Improve restore action 2022-05-26 14:27:22 +03:00