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

2383 Commits

Author SHA1 Message Date
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
Volodymyr Babak
bc101bf328 Merge remote-tracking branch 'upstream/develop/3.4' into feature/edge-converters-integration 2022-06-03 13:47:18 +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
Volodymyr Babak
e184d1df60 Merge remote-tracking branch 'origin/develop/3.4' into feature/edge-converters-integration 2022-06-02 16:45:40 +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
YevhenBondarenko
44403cd2c2 merge with develop/3.4 2022-06-01 21:55:34 +02:00
Andrii Shvaika
54e3884334 Version load error and 'exportCredentials' setting support 2022-06-01 16:55:38 +03:00
Andrii Shvaika
5a0eb8b640 Ordering and localization 2022-06-01 13:56:35 +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
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
Andrii Shvaika
518d9fd6f5 SID for Auto Version Create Config 2022-05-30 17:34:16 +03:00
Andrii Shvaika
34ac17ff83 Auto-commit draft 2022-05-30 17:32:13 +03:00
Viacheslav Klimov
985f7c79aa 2FA refactoring 2022-05-27 12:34:12 +03:00
Viacheslav Klimov
906d421f2d Merge branch 'develop/3.4' into feature/2fa 2022-05-26 17:44:38 +03:00
Vladyslav_Prykhodko
76de891890 UI: 2fa improvement settings 2022-05-26 16:26:14 +03:00
Viacheslav Klimov
eeb7dc2338 Improvements for 2FA 2022-05-26 16:13:24 +03:00
Viacheslav Klimov
9c2f96b262 Merge remote-tracking branch 'origin/feature/entities-version-control' into entities-vc-refactoring 
# Conflicts:
#	common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/GitRepository.java
 2022-05-26 15:22:24 +03:00
Viacheslav Klimov
e4ed8c5080 Api for comparing current entity data to specific version; refactoring 2022-05-26 15:10:46 +03:00
Andrii Shvaika
905b60da6a Fix GitRepository.status command, Increased timeout between poll commands. 2022-05-26 12:32:51 +03:00
Volodymyr Babak
4a77cc27cb Renaming ..ToEdgeService to ..ToEdge 2022-05-26 12:24:41 +03:00