4006 Commits

Author SHA1 Message Date
Andrii Shvaika
829a3e257e Merge with develop/3.4 2022-06-16 08:35:56 +03:00
Igor Kulikov
c4bdee92db PSQL annotation and dialect cleanup. 2022-06-15 14:04:13 +03:00
Igor Kulikov
0c1d3611cd
Merge pull request #5983 from amarkevich/PostgreSQL10Dialect
switch to PostgreSQL10Dialect
2022-06-15 13:07:23 +03:00
nickAS21
835e8d5d1e refactoring: commit4 2022-06-15 12:57:14 +03:00
nickAS21
eceec2af0c Merge branch 'develop/3.4' into refactoring_tests_alarm_customer
refactoring: alarm resolving the conflict
2022-06-15 12:24:29 +03:00
Andrii Shvaika
fe4ec688b0 Put external Id into Context 2022-06-15 12:02:28 +03:00
Andrii Shvaika
6579807bb6 Bug fixes and no more tenant id in the git repo 2022-06-15 11:44:23 +03:00
Andrii Shvaika
aba4fa8215 Performance improvement for entities export 2022-06-15 11:09:08 +03:00
Andrii Shvaika
c63805bcf1 Merge the PR #6713 2022-06-15 10:55:48 +03:00
Andrii Shvaika
1df554c837 Refactoring 2022-06-15 10:45:04 +03:00
Andrii Shvaika
b55dbdf050 Entity Export refactoring 2022-06-15 10:32:19 +03:00
Andrii Shvaika
8e3054c999 Entities Import Context 2022-06-15 09:42:52 +03:00
Andrew Shvayka
a9cad82371
Merge pull request #6352 from desoliture1/subCustomerAlarmsCheckerTestsFix
[3.4] Tests for Alarms availability with users hierarchy
2022-06-14 19:17:27 +03:00
Igor Kulikov
0190887a07
Merge pull request #5650 from resmo/feature/add-forward_headers_strategy-config
[3.4] Add option to configure spring's server.forward_headers_strategy
2022-06-14 17:59:26 +03:00
nickAS21
281c266d26 refactoring: commit3 (error) 2022-06-14 17:00:55 +03:00
nickAS21
c9558b5e08 refactoring: commit2 (error) 2022-06-14 16:59:21 +03:00
Viacheslav Klimov
5df2ca5372 Set external ids instead of internal on export 2022-06-14 16:42:33 +03:00
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
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
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