Andrii Shvaika
|
5ec1793f6e
|
To simplify merge
|
2022-06-14 16:05:27 +03:00 |
|
nickAS21
|
f36fc44afc
|
Merge branch 'develop/3.4' into refactoring_tests_alarm_customer
|
2022-06-14 15:18:01 +03:00 |
|
Andrii Shvaika
|
bd3fbafea3
|
Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control
|
2022-06-14 15:13:42 +03:00 |
|
Andrii Shvaika
|
7c16904c5e
|
Send events after transaction finish
|
2022-06-14 15:13:27 +03:00 |
|
Viacheslav Klimov
|
e3ec5db618
|
Set external ids of referenced entities on export
|
2022-06-14 14:54:36 +03:00 |
|
nickAS21
|
6d2d876d64
|
refactoring: commit1
|
2022-06-14 14:45:42 +03:00 |
|
ivankozka
|
728ae083b6
|
fix typo in swagger api
|
2022-06-14 14:16:15 +03:00 |
|
Igor Kulikov
|
d6959ca7e2
|
Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control
|
2022-06-14 12:42:47 +03:00 |
|
Igor Kulikov
|
58a438c73c
|
Version control - handle entity view attributes update
|
2022-06-14 12:42:32 +03:00 |
|
Andrii Shvaika
|
08dea33afc
|
Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control
|
2022-06-14 12:28:47 +03:00 |
|
Andrii Shvaika
|
1838e147a6
|
Batch Relations save for import performance improvement
|
2022-06-14 12:28:37 +03:00 |
|
fe-dev
|
8bccd857eb
|
UI: Add input placeholder
|
2022-06-14 12:06:46 +03:00 |
|
nickAS21
|
eab4e333a9
|
refactoring: alarm - add Mockito to create
|
2022-06-14 12:03:05 +03:00 |
|
Igor Kulikov
|
389ed5594e
|
UI: Fix duplicate enum
|
2022-06-14 11:31:30 +03:00 |
|
Igor Kulikov
|
3b6bd49d58
|
Merge branch 'develop/3.4' into feature/entities-version-control
|
2022-06-14 11:19:14 +03:00 |
|
Igor Kulikov
|
86b88c2699
|
Fix compilation errors. UI: Add entity view VC support.
|
2022-06-14 11:18:38 +03:00 |
|
Vladyslav_Prykhodko
|
fbb90fe79a
|
UI: Fixed vulnerabilities in tb-js-executor
|
2022-06-14 11:18:24 +03:00 |
|
Igor Kulikov
|
741347948d
|
Merge pull request #6707 from ArtemDzhereleiko/AD/bug-fix/add-widget-dialog
[3.4] Fix remove padding from add widget dialog
|
2022-06-14 11:11:56 +03:00 |
|
Igor Kulikov
|
f25dd50254
|
Merge pull request #6704 from ViacheslavKlimov/entity-view-ie
Entity views VC
|
2022-06-14 11:07:57 +03:00 |
|
fe-dev
|
6ebd4120c1
|
UI: Remove padding
|
2022-06-14 10:21:01 +03:00 |
|
nickAS21
|
258417346f
|
refactoring: customer - test start
|
2022-06-14 09:16:32 +03:00 |
|
Vladyslav_Prykhodko
|
81e64f348c
|
UI: Fixed vulnerabilities in tb-web-ui
|
2022-06-13 18:06:32 +03:00 |
|
YevhenBondarenko
|
619cabf514
|
fixed install app
|
2022-06-13 16:55:28 +02:00 |
|
fe-dev
|
afc3820b79
|
UI: Change placeholder
|
2022-06-13 16:48:15 +03:00 |
|
fe-dev
|
eb105d0859
|
UI: Refactoring phone input
|
2022-06-13 16:37:40 +03:00 |
|
Andrii Shvaika
|
43cc99b9aa
|
Merge remote-tracking branch 'origin/develop/3.4' into feature/entities-version-control
|
2022-06-13 16:28:01 +03:00 |
|
Andrii Shvaika
|
4605d7e56c
|
Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control
|
2022-06-13 16:21:19 +03:00 |
|
Andrii Shvaika
|
82763495e0
|
Perofrmance improvements
|
2022-06-13 16:21:05 +03:00 |
|
Viacheslav Klimov
|
67137e563d
|
License header for EntityViewImportService
|
2022-06-13 14:38:34 +03:00 |
|
Volodymyr Babak
|
2a3126822e
|
Minor code review changes
|
2022-06-13 13:52:40 +03:00 |
|
Viacheslav Klimov
|
e78a891044
|
Entity views export/import
|
2022-06-13 13:47:45 +03:00 |
|
Volodymyr Babak
|
5312f97acb
|
Fixing incorrect check for missing related rule chains #2
|
2022-06-13 13:10:50 +03:00 |
|
Igor Kulikov
|
0590c911cd
|
Merge pull request #6692 from ArtemDzhereleiko/AD/bug-fix/alarm-table-widget
[3.4] UI: Bug fix of alarm widget table
|
2022-06-13 12:49:17 +03:00 |
|
Igor Kulikov
|
a1b0817e06
|
Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control
|
2022-06-13 12:20:32 +03:00 |
|
Igor Kulikov
|
18ec32f092
|
Merge with develop/3.4
|
2022-06-13 12:20:08 +03:00 |
|
Andrii Shvaika
|
7983f0ee07
|
Performance improvements and refactoring
|
2022-06-13 12:18:44 +03:00 |
|
Igor Kulikov
|
b5f052cbc5
|
Fix typo
|
2022-06-13 12:17:15 +03:00 |
|
Andrew Shvayka
|
185926b02a
|
Merge pull request #6698 from YevhenBondarenko/fix/build
[3.4] fixed device profile node
|
2022-06-13 12:01:20 +03:00 |
|
YevhenBondarenko
|
6351366aed
|
fixed device profile node
|
2022-06-13 10:57:28 +02:00 |
|
YevhenBondarenko
|
50f3072608
|
allow circular references
|
2022-06-13 10:13:39 +02:00 |
|
Andrew Shvayka
|
1d21ee52d9
|
Merge pull request #6689 from ViacheslavKlimov/vc-improvements
VC improvements
|
2022-06-13 10:18:22 +03:00 |
|
nickAS21
|
0cd24bb16e
|
refactoring: alarm - test start
|
2022-06-12 20:28:12 +03:00 |
|
YevhenBondarenko
|
08d5cb5e93
|
migrated spring boot to version 2.7 due to vulnerabilities
|
2022-06-11 15:05:14 +02:00 |
|
YevhenBondarenko
|
98c78cd511
|
updated spring redis and spring security versions
|
2022-06-10 20:02:56 +02:00 |
|
Volodymyr Babak
|
dd9648d999
|
Fixing incorrect check for missing related rule chains #1
|
2022-06-10 18:47:52 +03:00 |
|
Igor Kulikov
|
5fef80a990
|
Merge pull request #6690 from volodymyr-babak/bug/edge-fix-delayed-status
[UI][3.4] Fixed bug with incorrect display of delayed status
|
2022-06-10 18:05:07 +03:00 |
|
Igor Kulikov
|
54cc729bee
|
Merge pull request #6688 from vvlladd28/bug/dashboard-page/edit-widget
[3.4] UI: Fixed incorrect switch edit widget panel when active add widget panel in dashboard page
|
2022-06-10 18:03:58 +03:00 |
|
Igor Kulikov
|
d5082bf123
|
Merge pull request #6683 from vvlladd28/bug/knob-control/resize
[3.4] UI: Fixed not correct work vertical resize in knob widget
|
2022-06-10 18:01:58 +03:00 |
|
Igor Kulikov
|
27f1b82c5e
|
Merge pull request #6675 from vvlladd28/improvement/page/security
[3.4] UI: Improvement view new security page
|
2022-06-10 17:54:47 +03:00 |
|
Igor Kulikov
|
a12a59d8c4
|
Merge pull request #6646 from ViacheslavKlimov/2fa-improvements
[3.4] 2FA improvements
|
2022-06-10 17:52:45 +03:00 |
|