3054 Commits

Author SHA1 Message Date
Igor Kulikov
0705ac4926 Add hybrid mode for docker-compose. Update postgreSQL version to 11. 2020-02-27 19:09:32 +02:00
Igor Kulikov
1157df05e9 Entity Admin widgets. Introduce updateAliases method of alias controller. 2020-02-27 17:06:32 +02:00
Igor Kulikov
1d960b96bc UI improvements: href support for side menu 2020-02-27 12:16:58 +02:00
Igor Kulikov
c14d36d4ea Update haproxy config 2020-02-27 11:05:59 +02:00
Igor Kulikov
2fcc907769 Merge branch 'master' into develop/3.0 2020-02-27 09:59:00 +02:00
Igor Kulikov
57c2915e65 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-02-27 09:58:40 +02:00
Igor Kulikov
e9befd0a50 Docker - update postgres container configuration 2020-02-27 09:58:29 +02:00
Igor Kulikov
3b21d8f058 Improve web-ui microservice 2020-02-26 20:43:39 +02:00
Igor Kulikov
784b8af66c Merge branch 'develop/3.0' of github.com:thingsboard/thingsboard into develop/3.0 2020-02-26 19:43:34 +02:00
Igor Kulikov
ec6a14a34a Minor improvements 2020-02-26 19:43:16 +02:00
Volodymyr Babak
141c0588b4 Stats interval fixes 2020-02-26 19:40:27 +02:00
Volodymyr Babak
57eeff3c12 Stats interval fixes 2020-02-26 19:39:39 +02:00
Igor Kulikov
b3e90244c2 Fixed time pagelink for table 2020-02-26 18:38:35 +02:00
Igor Kulikov
15d7970ba9 Propagate UI changes. 2020-02-26 18:15:04 +02:00
Igor Kulikov
cf175acaa4 Propagate UI changes. 2020-02-26 12:36:34 +02:00
Igor Kulikov
a122563619 Propagate UI changes 2020-02-25 19:11:25 +02:00
Igor Kulikov
19dac7d5aa Propagate UI changes 2020-02-25 12:30:38 +02:00
Igor Kulikov
2e30317f9b Propagate UI changes 2020-02-25 11:43:35 +02:00
Igor Kulikov
7bc1e2c58e JSON form component improvements. Fix timewindow panel 2020-02-25 10:23:40 +02:00
Igor Kulikov
87ade8ada3 Merge branch 'master' into develop/3.0 2020-02-24 18:27:08 +02:00
Igor Kulikov
e563939c66 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-02-24 18:24:50 +02:00
Igor Kulikov
7a2b76b8c0 SQL DAO Refactoring 2020-02-24 18:24:40 +02:00
Yevhen Bondarenko
1ce365d8df
Improvements RestJsonConverter (#2452)
* Improvements RestJsonConverter

* Refactored RestJsonConverter
2020-02-24 18:24:10 +02:00
Igor Kulikov
2f11d4336f Merge data comparison feature 2020-02-24 17:16:02 +02:00
Igor Kulikov
eda23bbffc Propagate UI changes 2020-02-21 19:41:02 +02:00
Igor Kulikov
9c5e3c769d Merge branch 'develop/3.0' of github.com:thingsboard/thingsboard into develop/3.0 2020-02-21 19:04:59 +02:00
Igor Kulikov
44a938d8f6 Propagate UI changes 2020-02-21 19:04:49 +02:00
Andrii Shvaika
620b66b700 Merge branch 'develop/3.0' of github.com:thingsboard/thingsboard into develop/3.0 2020-02-21 18:02:00 +02:00
Andrii Shvaika
c4fd267f9e Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-02-21 18:01:45 +02:00
Andrii Shvaika
4b0aae896d Rest API support of strict data types in getTelemetry requests 2020-02-21 18:01:15 +02:00
Igor Kulikov
416432e3ed Merge branch 'develop/3.0' of github.com:thingsboard/thingsboard into develop/3.0 2020-02-21 16:31:15 +02:00
Igor Kulikov
bcbc089460 Merge Alarms fetch improvements 2020-02-21 16:31:03 +02:00
YevhenBondarenko
e207545ce0 Improvement TelemetryController, change TsData value to Object 2020-02-21 16:02:00 +02:00
Andrii Shvaika
77ccf03723 Merge with master 2020-02-21 15:50:11 +02:00
Andrii Shvaika
45e3172cb3 Merge branch 'master' into develop/3.0 2020-02-21 15:48:31 +02:00
Andrii Shvaika
f2aefb5570 Fix for PostgreSQL Inserts logic 2020-02-21 15:47:11 +02:00
Andrew Shvayka
18f925d6ed
Merge pull request #2443 from thingsboard/feature/rest-client-improvement-3.0
Feature/rest client improvement 3.0
2020-02-21 13:46:17 +02:00
Andrii Shvaika
c51057bb0c Change version to 3.0 2020-02-21 13:45:10 +02:00
Andrii Shvaika
9d33d5b4e5 Merge remote-tracking branch 'origin/develop/3.0' into feature/rest-client-improvement-3.0 2020-02-21 13:44:01 +02:00
Andrii Shvaika
106bcd8cc0 Minimize Dependency 2020-02-21 13:42:44 +02:00
YevhenBondarenko
30eaa28f6c added rest-client dependencies 2020-02-21 13:42:44 +02:00
YevhenBondarenko
54b0de0c2c move rest-client to own module 2020-02-21 13:42:44 +02:00
Andrii Shvaika
1164ceb747 Minimize Dependency 2020-02-21 13:41:46 +02:00
YevhenBondarenko
20ca9ca396 added rest-client dependencies 2020-02-21 13:33:03 +02:00
YevhenBondarenko
3c20546d5f move rest-client to own module 2020-02-21 13:33:03 +02:00
Andrii Shvaika
445a8474a5 Merge branch 'master' into develop/3.0 2020-02-21 13:30:21 +02:00
Andrii Shvaika
5eb24b2e18 Reverted change of the dashboard configuration size 2020-02-21 13:28:39 +02:00
Andrii Shvaika
3f0cd0d555 Reverted change of the dashboard configuration size 2020-02-21 13:28:30 +02:00
Igor Kulikov
5531f92c6a Merge security functionality 2020-02-20 18:50:00 +02:00
Igor Kulikov
05f0619a2d Merge import device/asset functionality 2020-02-20 16:35:11 +02:00