10091 Commits

Author SHA1 Message Date
Andrii Shvaika
63750ef8a0 Merge with develop/3.4 2022-06-02 13:59:15 +03:00
Andrew Shvayka
309ac0b1ec
Merge pull request #6534 from YevhenBondarenko/feature/queue-entity
[3.4] Queues API and UI
2022-06-02 13:21:35 +03:00
Andrii Shvaika
3877cae8b9 Merge branch 'develop/3.4' of github.com:thingsboard/thingsboard into develop/3.4 2022-06-02 13:05:38 +03:00
Andrii Shvaika
d4bf9dd5d9 Adding @TbCoreComponent to the 2FA services to fix rule-engine msa 2022-06-02 13:05:17 +03:00
Igor Kulikov
a07583b31d Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-06-02 12:32:24 +03:00
Igor Kulikov
57a9a0a6d3 UI: Version load error handling 2022-06-02 12:32:10 +03:00
Andrew Shvayka
8f9a7e0401
Merge pull request #6616 from ViacheslavKlimov/vc-improvements
VC improvements
2022-06-02 12:15:58 +03:00
Andrew Shvayka
cfa72fd887
Merge pull request #6597 from desoliture1/entities-version-control-side
Add version control queue factory realizations for other QueueFactories
2022-06-02 12:07:08 +03:00
Andrew Shvayka
d0b3d4ad29
Merge pull request #6614 from laziestcoder/develop/3.4
[3.4] fix: typo fix in variable name and method name
2022-06-02 12:05:00 +03:00
Viacheslav Klimov
468bc44d5d Merge with feature/entities-version-control 2022-06-02 12:04:58 +03:00
Andrii Shvaika
03869ee528 Fix of the rule node sorting in the rule chain metadata 2022-06-02 11:58:33 +03:00
Viacheslav Klimov
0674a7d727 Performance improvements for dashboard import 2022-06-02 11:44:51 +03:00
Viacheslav Klimov
2a4ab29b23 Fix batch version load 2022-06-02 11:44:21 +03:00
Vladyslav_Prykhodko
484a62b964 Updated rulenode-core-config 2022-06-02 11:40:39 +03:00
YevhenBondarenko
7471e73326 Merge branch 'develop/3.4' of github.com:thingsboard/thingsboard into feature/queue-entity 2022-06-02 09:56:45 +02:00
Andrew Shvayka
8020bafd08
Merge pull request #6608 from ArtemDzhereleiko/AD/fix-for-build
[3.4] UI: Fixed build project
2022-06-02 10:30:39 +03:00
Igor Kulikov
50c6178c89 Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-06-02 10:22:34 +03:00
fe-dev
370919ef48 UI: fix trackby and add customtranslation title 2022-06-02 09:47:54 +03:00
YevhenBondarenko
96ea21e5db Merge branch 'feature/queue-entity' of github.com:YevhenBondarenko/thingsboard into feature/queue-entity 2022-06-01 22:01:03 +02:00
YevhenBondarenko
44403cd2c2 merge with develop/3.4 2022-06-01 21:55:34 +02:00
fe-dev
c377f80caa UI: Fix bugs 2022-06-01 19:14:09 +03:00
Igor Kulikov
14023e4cc9 UI: Implement rule chain page version control. 2022-06-01 18:02:52 +03:00
Andrii Shvaika
dff8387834 Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-06-01 16:56:23 +03:00
Andrii Shvaika
54e3884334 Version load error and 'exportCredentials' setting support 2022-06-01 16:55:38 +03:00
Igor Kulikov
8382850d1a UI: Minor improvements 2022-06-01 16:35:20 +03:00
Andrew Shvayka
11e313150d
Merge pull request #6235 from ViacheslavKlimov/feature/2fa
[3.4] Two-factor authentication
2022-06-01 14:05:54 +03:00
Andrii Shvaika
c350712bfb Merge with base brnach 2022-06-01 13:58:43 +03:00
Andrii Shvaika
5a0eb8b640 Ordering and localization 2022-06-01 13:56:35 +03:00
Igor Kulikov
df5a235e53 UI: Improve restore and create entity version components. 2022-06-01 13:10:32 +03:00
YevhenBondarenko
0bf8749ca5 fixed race condition during queue creating 2022-06-01 12:05:00 +02:00
Viacheslav Klimov
4c8b3bd7cb Merge remote-tracking branch 'origin/feature/entities-version-control' into vc-improvements 2022-06-01 12:45:33 +03:00
Vladyslav_Prykhodko
9fd78e595c Fixed testі 2022-06-01 10:44:13 +03:00
Vladyslav_Prykhodko
fd6ead6c48 Fixed test 2022-06-01 10:02:23 +03:00
Igor Kulikov
654305198d Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-05-31 18:42:46 +03:00
Igor Kulikov
7841c5ff6f UI: Implement auto-commit settings 2022-05-31 18:42:33 +03:00
Viacheslav Klimov
9eb32add2b UI for export/import api rate limiting 2022-05-31 18:11:24 +03:00
Andrii Shvaika
ac0b1a9879 getEntityDataInfo API call 2022-05-31 17:46:23 +03:00
Viacheslav Klimov
1610222b72 Export/import api rate limiting 2022-05-31 17:27:53 +03:00
Vladyslav_Prykhodko
da058ccfc1 UI: Fixed validation 2022-05-31 17:22:25 +03:00
Andrii Shvaika
7bd51cb4ce Public Customer import fix. No commit when no changes 2022-05-31 17:13:50 +03:00
Andrii Shvaika
59325226ac Sort order and diff fixes 2022-05-31 16:38:10 +03:00
Igor Kulikov
09402f40ac UI: Refactor vc settings to repository settings. Add remove other entities confirm. 2022-05-31 16:16:24 +03:00
Viacheslav Klimov
18083f1094 Merge remote-tracking branch 'zhenya/feature/queue-entity' into vc-improvements 2022-05-31 16:10:15 +03:00
Andrew Shvayka
e23dc2accb
Merge pull request #6615 from ViacheslavKlimov/vc-improvements
Export/import of attributes
2022-05-31 14:12:40 +03:00
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