dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,358 Commits 106 Branches 71 Tags
Commit Graph

2353 Commits

Author SHA1 Message Date
Andrii Shvaika
5cad77910f Improved method that replaces uuids 2022-06-18 10:48:02 +03:00
Andrii Shvaika
7a4fec93cd Fix re-import of rule chains, and different not related test 2022-06-18 09:28:54 +03:00
Andrii Shvaika
3d85fb7c0a Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-06-17 16:10:55 +03:00
Andrii Shvaika
fa5335130b Entities import/export for CE 2022-06-17 16:10:29 +03:00
Igor Kulikov
1e75f9f0e3 Merge with develop/3.4 2022-06-17 13:59:32 +03:00
Igor Kulikov
d982c09f68 Fix conflicts 2022-06-17 13:04:32 +03:00
Andrii Shvaika
8099c19eb7 Merge #6730 2022-06-17 11:56:54 +03:00
Andrii Shvaika
493b8f2f7b Improved comparison of the objects before import 2022-06-16 17:53:05 +03:00
Viacheslav Klimov
6e27ed46d6 Merge remote-tracking branch 'origin/feature/entities-version-control' into vc-improvements 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/BaseEntityImportService.java
#	application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java
#	common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/EntityImportSettings.java
 2022-06-16 12:36:27 +03:00
Andrii Shvaika
15c1e215d4 Improve performance of relation and rule chain service 2022-06-16 12:09:17 +03:00
Viacheslav Klimov
88fcff5556 Set external ids in the config of rule chains and dashboards on export; add JsonIgnoreProperties in export data 2022-06-16 11:10:49 +03:00
Andrii Shvaika
2fb13de456 Backport of the permance improvements from PE 2022-06-16 08:47:19 +03:00
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
Andrii Shvaika
6579807bb6 Bug fixes and no more tenant id in the git repo 2022-06-15 11:44:23 +03:00
Andrii Shvaika
c63805bcf1 Merge the PR #6713 2022-06-15 10:55:48 +03:00
Viacheslav Klimov
5df2ca5372 Set external ids instead of internal on export 2022-06-14 16:42:33 +03:00
Andrii Shvaika
7c16904c5e Send events after transaction finish 2022-06-14 15:13:27 +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
Igor Kulikov
f25dd50254
Merge pull request #6704 from ViacheslavKlimov/entity-view-ie 
Entity views VC
 2022-06-14 11:07:57 +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
e78a891044 Entity views export/import 2022-06-13 13:47:45 +03:00
Igor Kulikov
18ec32f092 Merge with develop/3.4 2022-06-13 12:20:08 +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
Igor Kulikov
44749f1306
Merge pull request #5818 from desoliture1/alarmScheduleDynamicValues 
[3.4] Add support for dynamic values for schedules in alarm rules
 2022-06-10 17:46:32 +03:00
Viacheslav Klimov
cc52452d75 Remove admin settings on tenant deletion 2022-06-10 16:19:46 +03:00
Viacheslav Klimov
fcd84f6277 Export/import of Widgets Bundles 2022-06-07 15:18:40 +03:00
Viacheslav Klimov
16891917ee Minor fixes for 2FA 2022-06-06 18:41:58 +03:00
Igor Kulikov
d9410e5330 Merge with develop/3.4 2022-06-06 16:25:17 +03:00
Andrii Shvaika
c5ff1252f5 Startup sequence optimization 2022-06-06 15:47:39 +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
fa87a2fc8f fixed Rate limits test 2022-06-06 09:35:04 +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
636b561f72 Merge with develop/3.4 2022-06-03 15:08:39 +03:00
Andrii Shvaika
a87b91b2df LwM2M Transport Service 2022-06-03 13:28:31 +03:00
Andrii Shvaika
165148a126 Fixed and improved startup sequence 2022-06-03 12:18:47 +03:00
Igor Kulikov
0e9acbec7a Improve upgrade scripts 2022-06-02 17:39:19 +03:00
Andrii Shvaika
37da2a95ca Fix credentials issue 2022-06-02 15:34:59 +03:00
Andrii Shvaika
63750ef8a0 Merge with develop/3.4 2022-06-02 13:59:15 +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
Viacheslav Klimov
468bc44d5d Merge with feature/entities-version-control 2022-06-02 12:04:58 +03:00
Viacheslav Klimov
2a4ab29b23 Fix batch version load 2022-06-02 11:44:21 +03:00