4262 Commits

Author SHA1 Message Date
Andrii Shvaika
5ec1793f6e To simplify merge 2022-06-14 16:05:27 +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
nickAS21
eab4e333a9 refactoring: alarm - add Mockito to create 2022-06-14 12:03:05 +03:00
Igor Kulikov
86b88c2699 Fix compilation errors. UI: Add entity view VC support. 2022-06-14 11:18:38 +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
nickAS21
258417346f refactoring: customer - test start 2022-06-14 09:16:32 +03:00
YevhenBondarenko
619cabf514 fixed install app 2022-06-13 16:55:28 +02: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
Viacheslav Klimov
e78a891044 Entity views export/import 2022-06-13 13:47:45 +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
YevhenBondarenko
50f3072608 allow circular references 2022-06-13 10:13:39 +02: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
Volodymyr Babak
dd9648d999 Fixing incorrect check for missing related rule chains #1 2022-06-10 18:47:52 +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
Viacheslav Klimov
2a5c7528ac VC request timing out 2022-06-10 16:48:12 +03:00
Viacheslav Klimov
cc52452d75 Remove admin settings on tenant deletion 2022-06-10 16:19:46 +03:00
Viacheslav Klimov
7c2283e3cd Add indexes for external_id 2022-06-10 15:10:36 +03:00
Volodymyr Babak
131cff88e4 BaseEdgeTest - Added DELETE attribute after test complete 2022-06-10 14:52:47 +03:00
Volodymyr Babak
6adf0f256e Report device activity from edge service - set active flag to true on cloud 2022-06-10 14:48:20 +03:00
Igor Kulikov
666dd12c1b
Merge pull request #6654 from ViacheslavKlimov/vc-improvements
Widgets Bundles VC
2022-06-10 12:40:35 +03:00
Igor Kulikov
2f982a1f53 Merge branch 'develop/3.4' into feature/entities-version-control 2022-06-09 17:09:34 +03:00
Igor Kulikov
9afdd97363
Merge pull request #6672 from kalutkaz/fix/pieFlotWidget
[3.4] UI: Fix visual bugs in pie flot widget
2022-06-09 16:55:51 +03:00
Viacheslav Klimov
bcfb7388c5 Fix entity removing in vc 2022-06-07 15:47:15 +03:00
Viacheslav Klimov
fcd84f6277 Export/import of Widgets Bundles 2022-06-07 15:18:40 +03:00
Andrii Shvaika
e958cb0fab Tiny Refactoring 2022-06-07 13:21:47 +03:00
Viacheslav Klimov
3b70c334cc Update 2fa tests 2022-06-07 13:04:37 +03:00
kalutkaz
4082d901d0 update Pie widgets 2022-06-07 11:27:06 +03:00
Viacheslav Klimov
16891917ee Minor fixes for 2FA 2022-06-06 18:41:58 +03:00
Igor Kulikov
6f1b3a93fe Version control permissions 2022-06-06 16:42:47 +03:00
Andrii Shvaika
623f621d64 Merge remote-tracking branch 'origin/develop/3.4' into feature/entities-version-control 2022-06-06 15:21:04 +03:00
Igor Kulikov
fe58206bbe Merge branch 'develop/3.4' of github.com:thingsboard/thingsboard into develop/3.4 2022-06-06 15:13:44 +03:00
Igor Kulikov
e49da1035b Fix backward compatibility for defaultQueueName field of device profile 2022-06-06 15:13:15 +03:00
Viacheslav Klimov
7131f6ffa8 Fix AdminSettings api 2022-06-06 11:45:08 +03:00
YevhenBondarenko
ac751b09f9 fixed hash partition service initialization 2022-06-06 09:17:19 +02:00
Andrew Shvayka
6173795580
Merge pull request #6519 from volodymyr-babak/bug-edge-device-profile-non-default-transport
[3.4] [Bug] Device profile with non default transport is not propagated to edge
2022-06-03 15:23:36 +03:00
Andrew Shvayka
ee771dd055
Merge pull request #6522 from rocknitive/feature/coap-piggyback-response
[3.4] Piggybacked CoAP responses
2022-06-03 15:21:20 +03:00
Igor Kulikov
17736ce93f Remove unused imports 2022-06-03 15:17:00 +03:00