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

9830 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Kulikov
4b01aa6f1e Clear repository on settings update 2022-05-19 13:21:19 +03:00
Igor Kulikov
587066cfd3 Ability to remove version control settings 2022-05-19 13:19:43 +03:00
Igor Kulikov
2eb94fd95e Fix beans cycle dependency 2022-05-19 12:38:06 +03:00
Igor Kulikov
cd30e9a4b1 Fix merge conflicts 2022-05-19 12:31:00 +03:00
Igor Kulikov
0b6de71768 Implement version control ssh access with private key. Improve VC settings REST methods. Add tenantId field to admin settings. Add DB upgrade. 2022-05-19 12:01:06 +03:00
Andrew Shvayka
a63b747808
Merge pull request #6566 from ViacheslavKlimov/vc-refactoring 
Refactor loadEntitiesVersion
 2022-05-19 11:17:40 +03:00
Viacheslav Klimov
567ee5d75b Refactor loadEntitiesVersion 2022-05-18 18:49:21 +03:00
Andrew Shvayka
d2c918c2f9
Merge pull request #6562 from thingsboard/feature/vc-microservice 
Feature/vc microservice
 2022-05-18 14:47:51 +03:00
Andrii Shvaika
c6ebf049a2 Version Control Service refactoring 2022-05-18 14:46:54 +03:00
Andrii Shvaika
7ec45fd5f1 Rename Data structures. Create separate module. 2022-05-18 10:40:02 +03:00
Andrew Shvayka
846d9bba75
Merge pull request #6559 from ViacheslavKlimov/feature/entities-vc 
Changes to version create request; fixes for git api usage
 2022-05-18 09:17:54 +03:00
Viacheslav Klimov
9b209e4075 Refactor version create request; fixes for git api usage 2022-05-17 18:00:53 +03:00
Andrii Shvaika
0905aff7a0 Merge with develop/3.4 2022-05-17 17:00:25 +03:00
Andrew Shvayka
89ca417b10
Merge pull request #6558 from ViacheslavKlimov/feature/entities-vc 
Entity Version Control
 2022-05-17 16:38:12 +03:00
Viacheslav Klimov
5a43788b24 VC refactoring; Swagger examples 2022-05-17 15:32:07 +03:00
Igor Kulikov
2b8bf1972e UI: Fix trip animation widget label calculation. Map widgets code cleanup. 2022-05-17 14:23:44 +03:00
Andrii Shvaika
24db25e3b7 WS Client race-condition fix 2022-05-17 12:51:01 +03:00
Andrii Shvaika
4f6ef91d33 Fix race conditions in WS test client 2022-05-17 12:49:54 +03:00
ShvaykaD
02df48cfbe Merge branch 'develop/3.4' of github.com:thingsboard/thingsboard into feature/mqtt-tests-spead-up 2022-05-17 10:40:16 +03:00
Andrii Shvaika
f9aae60a52 Sync relation creation for device creation through gateway 2022-05-17 09:55:07 +03:00
ShvaykaD
f4aec3d731 Merge branch 'develop/3.4' of github.com:thingsboard/thingsboard into feature/mqtt-tests-spead-up 2022-05-16 17:44:50 +03:00
ShvaykaD
87a2f66a71 MQTT RPC tests speed up 2022-05-16 17:23:12 +03:00
Viacheslav Klimov
2302213b3c Refactor version create request structures 2022-05-16 17:03:23 +03:00
Andrii Shvaika
097862b59f Licnese headers 2022-05-16 17:00:34 +03:00
Andrii Shvaika
ec7a36cd89 Fix race conditions on WS subscribe commands processing 2022-05-16 16:58:50 +03:00
Andrii Shvaika
f30e769ecc Fix EntityViewController test 2022-05-16 16:58:50 +03:00
Igor Kulikov
2d2824fa4a
Merge pull request #6555 from thingsboard/feature/widget-data-page-size 
[3.4] Add 'Maximum entities per datasource' parameter to widget configuration
 2022-05-16 16:56:16 +03:00
Igor Kulikov
4a20d153c5 UI: Use 'Maximum entities per datasource' parameter from widget configuration instead of hardcoded value 1024 2022-05-16 16:35:07 +03:00
Viacheslav Klimov
074ea8af6c VC refactoring 2022-05-16 16:09:00 +03:00
Viacheslav Klimov
073875f406 Entities VC improvements and refactoring 2022-05-14 17:26:33 +03:00
Viacheslav Klimov
b3dfed5bad API for listing entities at version, loading all entities at version, listing all available versions 2022-05-14 17:26:23 +03:00
Viacheslav Klimov
f82be0153b Entities VC with Git - initial implementation 2022-05-14 17:26:18 +03:00
Viacheslav Klimov
335b4ef465 Improvements for import of rule chains and dashboards 2022-05-14 17:24:06 +03:00
ShvaykaD
8d06950e8e Merge branch 'develop/3.4' of github.com:thingsboard/thingsboard into feature/mqtt-tests-spead-up 2022-05-13 15:50:01 +03:00
Andrew Shvayka
ba634ada27
Merge pull request #6536 from thingsboard/bug/cache-issues 
Fix misc cache issues with race conditions
 2022-05-13 11:41:28 +03:00
Andrii Shvaika
a352452093 Move Device Cache to common package 2022-05-13 10:11:06 +03:00
Igor Kulikov
c5a7159499
Merge pull request #6545 from thingsboard/feature/widget-settings 
[3.4] Advanced widget settings: replace auto-generated JSON forms with Angular components
 2022-05-12 16:46:26 +03:00
Andrii Shvaika
d1c1b70578 Merge branch 'develop/3.4' into bug/cache-issues 2022-05-12 16:45:46 +03:00
Andrii Shvaika
adc675822e Remove redundant test that breaks every time someone adds new service 2022-05-12 16:40:38 +03:00
Andrii Shvaika
23485d43b0 Improvements to TbCustomerService 2022-05-12 15:23:04 +03:00
Andrew Shvayka
ff1f71b510
Merge pull request #6540 from thingsboard/refactoring_02_CustomerController 
[3.4] refactoring_02: - Customer controller
 2022-05-12 14:54:13 +03:00
Igor Kulikov
61b07f6031 UI: Fix json content component css 2022-05-12 14:31:47 +03:00
ShvaykaD
838370b625 fix typo in AbstractMqttTimeseriesIntegrationTest 2022-05-12 14:07:06 +03:00
ShvaykaD
0879b1afae replaced thread sleeps in telemetry tests 2022-05-12 14:04:26 +03:00
Igor Kulikov
8e4e27e685 Merge branch 'develop/3.4' into feature/widget-settings 2022-05-12 11:03:34 +03:00
ShvaykaD
d7291d1171 updated timeseries and attributes tests & cleanup code 2022-05-12 10:59:39 +03:00
Andrii Shvaika
8c07aca7ef Fix tests 2022-05-12 10:21:50 +03:00
nickAS21
bc71c22e62 refactoring: - Customer controller - fix bug: org.thingsboard.server.edge.sql.EdgeSqlTest.testAlarms(org.thingsboard.server.edge.sql.EdgeSqlTest) 2022-05-12 09:00:30 +03:00
Igor Kulikov
33e5b033ec UI: Widget settings forms support for extensions 2022-05-11 18:16:30 +03:00
nickAS21
fa9f464810 refactoring: - Customer controller - finish 2022-05-11 17:53:26 +03:00