3024 Commits

Author SHA1 Message Date
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
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
Igor Kulikov
f1ca4c7cfd Merged and fixed locales 2020-02-20 15:24:41 +02:00
Igor Kulikov
70f7189458 Update html value card 2020-02-20 13:31:04 +02:00
Igor Kulikov
a1fcd397d5 Update rule nodes config UI 2020-02-20 13:15:23 +02:00
Igor Kulikov
e03c6468cb Fix tests 2020-02-20 12:57:20 +02:00
Igor Kulikov
96d3b245b0 Revert to version 3.0.0-SNAPSHOT 2020-02-20 12:35:01 +02:00
Igor Kulikov
e9b2c3107e Merge with master 2020-02-20 12:33:36 +02:00
Igor Kulikov
3e2a87135f Prepare for merge with master 2020-02-20 10:26:43 +02:00
Chantsova Ekaterina
9f0871af7f
Update field alignment on init, not only on resize; prevent dispaying in a row, when fields should be displayed in a column (#2434) 2020-02-20 10:17:35 +02:00
Igor Kulikov
4bbc48317c Merge branch 'master' of github.com:thingsboard/thingsboard 2020-02-20 10:16:07 +02:00
Igor Kulikov
c17b8cd96c Fix: Add missing groupId to json forms builder function. 2020-02-20 10:15:57 +02:00
Andrii Shvaika
2a58c6f209 fixed RestClient.saveRelation method 2020-02-20 10:13:37 +02:00
Andrii Shvaika
4cd45e4b3e Fix for RestClient.getActivateToken method 2020-02-20 08:13:48 +02:00
Igor Kulikov
2a5fffe5f4 Fix upgrade 2020-02-19 19:40:42 +02:00
Igor Kulikov
755f777b16 Fix upgrade 2020-02-19 19:07:32 +02:00
Andrii Shvaika
de6affd805 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-02-19 17:20:45 +02:00
Andrii Shvaika
89a91020ff Merge branch 'YevhenBondarenko-feature/rest-client' 2020-02-19 17:20:20 +02:00
Igor Kulikov
2bdc1ac3f5 Merge branch 'vvlladd28-bugs/translate_lv_LV' 2020-02-19 17:20:07 +02:00
Andrii Shvaika
317ead6a38 Merge branch 'feature/rest-client' of https://github.com/YevhenBondarenko/thingsboard into YevhenBondarenko-feature/rest-client 2020-02-19 17:20:03 +02:00
Igor Kulikov
ea25db121b Merge branch 'bugs/translate_lv_LV' of https://github.com/vvlladd28/thingsboard into vvlladd28-bugs/translate_lv_LV 2020-02-19 17:19:53 +02:00
Vladyslav
5113f90a17
Fix name gateway widget (#2421) 2020-02-19 17:16:09 +02:00
Chantsova Ekaterina
37173bba10
Features/flot thresholds (#2412)
* Thresholds draft

* Make generated thresholds unique

* Code refactoring
2020-02-19 17:12:22 +02:00
Igor Kulikov
01108b89a1 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-02-19 17:08:57 +02:00
Igor Kulikov
9d212bf39e fixed: infinite loop caused by default md-dialog resize function in Safari 2020-02-19 17:08:43 +02:00
Vladyslav_Prykhodko
284638e093 Fix translate language Latvian 2020-02-19 16:48:25 +02:00
Dmitriy Mushat
d5c3a9cc5d
fixed: focus on fullscreen for react schema grouped forms (#2400) 2020-02-19 16:14:18 +02:00
Chantsova Ekaterina
1540f08695
Add ability to use custom translations and labels containing apostrophe in table default sort order (#2397) 2020-02-19 16:10:54 +02:00
Igor Kulikov
7adeaf21c6 Merge branch 'fumil-master' 2020-02-19 16:06:40 +02:00
Igor Kulikov
8ed03b22bd Fix conflicts. Store locale translations only in default en_US 2020-02-19 16:06:19 +02:00
Vladyslav
2ea3b0bdaf
Add service methods to claim a device (#2391) 2020-02-19 15:50:19 +02:00
Igor Kulikov
f8a3181802 Merge branch 'yefimov-andrey-increase-dashboard-conf' 2020-02-19 15:47:54 +02:00