Artem Halushko
|
1227b704d2
|
Merge branch 'develop/3.0' of https://github.com/thingsboard/thingsboard into map/3.0
|
2020-03-05 14:04:44 +02:00 |
|
Artem Halushko
|
e7cf3be661
|
Merge https://github.com/thingsboard/thingsboard into map/3.0
|
2020-03-05 14:04:14 +02:00 |
|
Vladyslav
|
ee07ddb876
|
Fix create color range
|
2020-03-05 13:33:12 +02:00 |
|
Vladyslav
|
29429cb0c4
|
Fix create color range
|
2020-03-05 13:33:02 +02:00 |
|
Artem Halushko
|
6818c9932e
|
add some settings support
|
2020-03-05 11:56:07 +02:00 |
|
Dmytro Shvaika
|
30ba274eca
|
fix setting additional_info
|
2020-03-04 17:21:04 +02:00 |
|
Dmytro Shvaika
|
67fa64d448
|
fix NPE
|
2020-03-04 17:21:04 +02:00 |
|
Dmytro Shvaika
|
31b06fefdd
|
added InsertRepository for Relation Dao
|
2020-03-04 17:21:04 +02:00 |
|
Igor Kulikov
|
c9b1e24e24
|
Merge branch 'master' into develop/3.0
|
2020-03-04 15:56:30 +02:00 |
|
Igor Kulikov
|
a9df9df99e
|
Remove unnecessary Admin settings validation
|
2020-03-04 15:56:12 +02:00 |
|
Igor Kulikov
|
07244a6154
|
fix TLS version
|
2020-03-04 15:49:33 +02:00 |
|
Igor Kulikov
|
ecda407012
|
Merge branch 'master' into develop/3.0
|
2020-03-04 15:48:48 +02:00 |
|
Yevhen Bondarenko
|
244bcc7822
|
fix tls version (#2450)
|
2020-03-04 15:47:49 +02:00 |
|
Igor Kulikov
|
5fbb379315
|
Fix cassandra to SQL migrate service annotation
|
2020-03-04 15:33:04 +02:00 |
|
Artem Halushko
|
240f58948d
|
map bouds support
|
2020-03-04 13:53:53 +02:00 |
|
Igor Kulikov
|
466b4ea3e5
|
Fix upgrade
|
2020-03-04 10:21:55 +02:00 |
|
Igor Kulikov
|
80fae20d21
|
Merge branch 'master' into develop/3.0
|
2020-03-04 10:12:01 +02:00 |
|
Vladyslav
|
4e16675ea4
|
Add change gauge color (#2480)
|
2020-03-04 10:11:24 +02:00 |
|
Vladyslav
|
90ae060cbe
|
Add gauge color limit (#2479)
|
2020-03-04 10:09:59 +02:00 |
|
Igor Kulikov
|
5933397e51
|
Merge branch 'develop/3.0' of github.com:thingsboard/thingsboard into develop/3.0
|
2020-03-04 10:08:58 +02:00 |
|
Igor Kulikov
|
4d73835bb4
|
Cassansra to PostgreSQL migration.
|
2020-03-04 10:08:47 +02:00 |
|
Artem Halushko
|
f6ca099613
|
data update & polyline support
|
2020-03-03 19:24:58 +02:00 |
|
YevhenBondarenko
|
0e265060f6
|
added query delete to JavaAttributeDao
|
2020-03-03 12:12:32 +02:00 |
|
YevhenBondarenko
|
a58db6b7ec
|
added query delete to JavaAttributeDao
|
2020-03-03 12:12:28 +02:00 |
|
Artem Halushko
|
8149d9d42d
|
add simple marker suppor
|
2020-03-03 11:12:21 +02:00 |
|
Igor Kulikov
|
f3e8fd4b3c
|
Fix upograde
|
2020-03-03 09:43:49 +02:00 |
|
Igor Kulikov
|
278d9f1dfd
|
Add license headers
|
2020-03-03 09:39:23 +02:00 |
|
Artem Halushko
|
7412f5fbdf
|
Merge branch 'develop/3.0' of https://github.com/thingsboard/thingsboard into map/3.0
|
2020-03-02 19:22:44 +02:00 |
|
Artem Halushko
|
f3615348b7
|
here maps support && WIP on markers
|
2020-03-02 19:18:29 +02:00 |
|
Vladyslav
|
516ae3d814
|
Create ui to support attribute type JSON (#2471)
|
2020-03-02 17:55:29 +02:00 |
|
Igor Kulikov
|
25ba81394d
|
Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0
|
2020-03-02 17:50:52 +02:00 |
|
Vladyslav
|
0ed0725643
|
[2.5] Feature add support json[ui] (#2446)
* Merge with master
* Refactoring code
* Add license header
Co-authored-by: Andrew Shvayka <ashvayka@thingsboard.io>
|
2020-03-02 17:50:37 +02:00 |
|
Igor Kulikov
|
95466c3912
|
Merge branch 'develop/3.0' of github.com:thingsboard/thingsboard into develop/3.0
|
2020-03-02 17:43:21 +02:00 |
|
Igor Kulikov
|
b490e4ef4d
|
Cassandra 2.5.0 to SQL migration
|
2020-03-02 17:43:10 +02:00 |
|
Artem Halushko
|
1730cddcb3
|
refactor schemes
|
2020-03-02 16:34:46 +02:00 |
|
Dmytro Shvaika
|
7d898f58a1
|
added better logging to ts upgrade
|
2020-03-02 14:50:21 +02:00 |
|
YevhenBondarenko
|
bf755f1c46
|
remove min and max json query from AggregationRepository
|
2020-03-02 14:48:04 +02:00 |
|
YevhenBondarenko
|
f522dbca2a
|
Created HsqlEntityDatabaseSchemaService, improvement TimescaleTsDatabaseUpgradeService and TimescaleInsertTsRepository
|
2020-03-02 14:48:04 +02:00 |
|
Artem Halushko
|
43b9a6b39f
|
added image map support
|
2020-03-02 12:15:14 +02:00 |
|
Dmytro Shvaika
|
db65eac638
|
added better logging to ts upgrade
|
2020-03-02 12:11:47 +02:00 |
|
YevhenBondarenko
|
118c81da5f
|
remove min and max json query from AggregationRepository
|
2020-03-02 12:11:09 +02:00 |
|
YevhenBondarenko
|
7de309e217
|
Created HsqlEntityDatabaseSchemaService, improvement TimescaleTsDatabaseUpgradeService and TimescaleInsertTsRepository
|
2020-03-02 12:11:09 +02:00 |
|
Igor Kulikov
|
e7d00f4b68
|
Multiple input widget
|
2020-02-28 19:49:14 +02:00 |
|
Artem Halushko
|
257fb94bc0
|
add google maps support
|
2020-02-28 14:33:24 +02:00 |
|
Igor Kulikov
|
f6e5b01c02
|
Merge branch 'master' into develop/3.0
|
2020-02-28 14:13:32 +02:00 |
|
Igor Kulikov
|
96147bff8f
|
Fix PreAuthorize annotation for claimDevice REST method.
|
2020-02-28 14:13:12 +02:00 |
|
Igor Kulikov
|
75a417986b
|
Implement device claiming widget.
|
2020-02-28 14:11:52 +02:00 |
|
Artem Halushko
|
b5c6b97395
|
add tencent map
|
2020-02-28 13:48:23 +02:00 |
|
Artem Halushko
|
f15bad8e6d
|
add leaflet css
|
2020-02-28 12:47:18 +02:00 |
|
Artem Halushko
|
f8e2b3b599
|
Merge branch 'develop/3.0' of https://github.com/thingsboard/thingsboard into map/3.0
|
2020-02-28 12:14:08 +02:00 |
|