1536 Commits

Author SHA1 Message Date
Igor Kulikov
62224e8226 Clean up 2018-06-18 15:03:04 +03:00
Igor Kulikov
97afaf63fa
Merge pull request #878 from janbols/master
Fix install_dev_db.sh by using sudo instead of su
2018-06-18 14:58:11 +03:00
Igor Kulikov
55f9acf405
Merge pull request #874 from charliexp/master
fix chinese
2018-06-18 14:56:46 +03:00
Igor Kulikov
d9b650e7d8
Merge pull request #875 from mp-loki/master
Fix for UnsupportedOperationException: JsonNull in case if device typ…
2018-06-18 14:53:41 +03:00
Igor Kulikov
f23d22cf17
Merge pull request #676 from jktu2870/improvements
Added autofocus for search buttons
2018-06-18 14:53:05 +03:00
Igor Kulikov
83ed998967
Merge pull request #674 from jktu2870/bugs
Widget action buttons overlays with data loading indicator
2018-06-18 14:51:08 +03:00
Igor Kulikov
f081b656d0 Multiple labels support. 2018-06-18 14:33:50 +03:00
Jan Bols
0a0ed137bd When following instructions on https://thingsboard.io/docs/user-guide/contribution/how-to-contribute/#create-database-schema-and-populate-demo-data, the install script doesn't work when the thingsboard user doens't have a password because su is used instead of sudo. 2018-06-18 11:57:47 +02:00
mp-loki
489a1a6b62 Fix for UnsupportedOperationException: JsonNull in case if device type arrives as null 2018-06-16 23:24:29 -04:00
Igor Kulikov
1f58c1b0d6 Fix subscription service: ignore unmatched updates. 2018-06-15 17:07:01 +03:00
charlie
9560a65718 Merge branch 'master' of https://github.com/thingsboard/thingsboard 2018-06-15 11:46:41 +08:00
steve
0546cb1e85 Added description to the device card. Allows viewing of the description of a device or more importantly can have a friendly name showing on the device card instead of a long unique mac id. 2018-06-14 17:18:25 +03:00
steve
42a451fcf3 Fixed ugly null pointer exception when there is no or incomplete root rule chain.
Make it go to an log entry instead.
2018-06-14 17:18:25 +03:00
Igor Kulikov
31c23b0766
Merge pull request #870 from Terny22/digital-gauge-issues
fixed issues in updating digital-value with progress-bar-animation
2018-06-14 16:18:40 +03:00
Sergey Tarnavskiy
716762606e fixed issues in updating digital-value with progress-bar-animation 2018-06-14 16:02:03 +03:00
Igor Kulikov
b922e070ae UI layout fixes. 2018-06-12 17:22:35 +03:00
Igor Kulikov
01cb77f51d Version set to 2.0.4-SNAPSHOT 2018-06-12 15:50:44 +03:00
Igor Kulikov
95a46352be Merge branch 'master' into release-2.0 v2.0.3 2018-06-12 14:49:02 +03:00
vparomskiy
cdf3cb6598 flags should be added before jar file specified 2018-06-12 14:47:30 +03:00
Igor Kulikov
7c1e8d44a0 Version set to 2.0.3 2018-06-12 13:42:02 +03:00
vparomskiy
20318fff5d (windows) add flags for GC tuning and logging
(windows) add default heap size flags
2018-06-12 10:43:23 +03:00
charlie
9653009023 Merge branch 'master' of https://github.com/thingsboard/thingsboard 2018-06-12 13:44:43 +08:00
Andrew Shvayka
cf723c72c2 Changed version to v2.0.3-SNAPSHOT 2018-06-11 19:03:34 +03:00
Andrew Shvayka
f406e9d1c0 Merge branch 'release-2.0' 2018-06-11 19:02:42 +03:00
Andrew Shvayka
31a940aeb6 Fix for issue 842 2018-06-11 18:59:55 +03:00
vparomskiy
3b1b610f7a add flags for GC tuning and logging 2018-06-11 18:13:35 +03:00
vparomskiy
b13b810e4e use threadsafe collection during subscription 2018-06-11 18:13:02 +03:00
charlie
6649064097 Merge branch 'master' of https://github.com/charliexp/thingsboard
# Conflicts:
#	ui/src/app/locale/locale.constant-zh.js

Signed-off-by: charlie <charlie_weng@163.com>
2018-06-11 17:08:12 +08:00
charlie
dc254b7cc1 fix chinese
Signed-off-by: charlie <charlie_weng@163.com>
2018-06-11 16:54:50 +08:00
Chen Xi
5ba6b67cd5 A device created by gateway should be auto assigned to the customer that the gateway is assigned to 2018-06-10 01:07:09 +03:00
charlie
011016eca1 Merge branch 'master' of https://github.com/thingsboard/thingsboard 2018-06-09 12:44:29 +08:00
Andrew Shvayka
ce5a4f591b
Merge pull request #841 from thingsboard/fix-for-qos-0
Fix for QoS 0
2018-06-07 23:32:56 +03:00
Dima Landiak
712e1ae9b7 test fix 2018-06-06 18:07:16 +03:00
charlie
3121d47489 Merge branch 'master' of https://github.com/thingsboard/thingsboard
# Conflicts:
#	ui/src/app/locale/locale.constant-zh.js

Signed-off-by: charlie <charlie_weng@163.com>
2018-06-06 16:56:08 +08:00
Dima Landiak
a58eb0f74e typo 2018-06-05 18:36:49 +03:00
Dima Landiak
ce9967488b jpa delete timeseries implementation, partitions delete fix 2018-06-05 18:25:39 +03:00
Volodymyr Babak
b0acf23c6d Fix for QoS 0 2018-06-05 16:15:46 +03:00
oleg
1534549d85 UI:Improvement. "Widget auto focus on search input" 2018-06-05 14:16:24 +03:00
Dima Landiak
e37e7242fd find and save new latest if previous deleted 2018-06-04 19:38:08 +03:00
charlie
c79a213eb7 Merge branch 'master' of https://github.com/charliexp/thingsboard
# Conflicts:
#	ui/src/app/locale/locale.constant-zh.js
2018-06-04 23:17:22 +08:00
Igor Kulikov
ee8f7405fc Merge with master. Version set to 2.0.2. v2.0.2 2018-06-04 18:09:56 +03:00
Igor Kulikov
75c0c5b3d0 Fix bugs. 2018-06-04 17:32:23 +03:00
Andrew Shvayka
1960af7818 Merge branch 'master' of github.com:thingsboard/thingsboard 2018-06-04 13:44:13 +03:00
Andrew Shvayka
8ad7558b3e Cluster mode for DeviceStateService and multiple fixes 2018-06-04 13:43:10 +03:00
Igor Kulikov
aa6c479833 Merge branch 'master' of github.com:thingsboard/thingsboard 2018-06-04 12:34:52 +03:00
Igor Kulikov
7f6ad9a6a6 Fix Test BaseHttpDeviceApiTest.testGetAttributes 2018-06-04 12:34:40 +03:00
Andrew Shvayka
fa2071c776
Merge pull request #832 from lucky2you/gateway-rpc-resp-no-ack
BUGFIX: fixed the server do not send a PUBLIC ACK on v1/gateway/rpc
2018-06-04 11:51:50 +03:00
Igor Kulikov
80b2cffcca
Merge pull request #831 from iglilaw/master
l10n improvements
2018-06-04 11:34:36 +03:00
Igor Kulikov
b19274ed95
Merge pull request #834 from lonwern/master
Fixed couldn't get shared attributes.
2018-06-04 11:32:56 +03:00
Igor Kulikov
309598c2ac subscribtion -> subscription typo fix. 2018-06-04 11:22:14 +03:00