thingsboard-aplcache

Merge branch 'master' of https://github.com/thingsboard/thingsboard # …

6/6/2018 5:56:08 AM

Conflicts:
#	ui/src/app/locale/locale.constant-zh.js

Signed-off-by: charlie <charlie_weng@163.com>

charlie

Commit: 3121d47

Tree: c979636

Parents: 68ff23e
75c0c5b

up Signed-off-by: charlie <charlie_weng@163.com>

6/4/2018 3:32:39 AM

charlie

Commit: 68ff23e

Tree: 9266df4

Parents: 72aa9d0

Merge branch 'master' of https://github.com/thingsboard/thingsboard

6/4/2018 3:29:29 AM

charlie

Commit: 72aa9d0

Tree: 736eb9f

Parents: 3a11454
6223001

fix Signed-off-by: charlie <charlie_weng@163.com>

6/1/2018 12:49:22 AM

charlie

Commit: 3a11454

Tree: 2670b17

Parents: b42e511

fix locale.constant-zh.js Signed-off-by: charlie <charlie_weng@163.com>

6/1/2018 12:35:09 AM

charlie

Commit: b42e511

Tree: 273c0b8

Parents: 1dc334d

Merge branch 'master' of https://github.com/thingsboard/thingsboard

5/31/2018 7:50:44 AM

charlie

Commit: 1dc334d

Tree: 0832787

Parents: 2d2b4b5
e3038f8

fix locale.constant-zh.js Signed-off-by: charlie <charlie_weng@163.com>

5/31/2018 7:48:41 AM

charlie

Commit: 2d2b4b5

Tree: d5ea7e1

Parents: fd31e5f

Merge pull request #875 from mp-loki/master Fix for UnsupportedOperationException: …

6/18/2018 8:53:41 AM

JsonNull in case if device typ…

Igor Kulikov

Commit: d9b650e

Tree: fcc0d09

Parents: f23d22c
489a1a6

Fix for UnsupportedOperationException: JsonNull in case …

6/17/2018 12:23:13 AM

if device type arrives as null

mp-loki

Commit: 489a1a6

Tree: d3f8eed

Parents: 1f58c1b

Merge pull request #676 from jktu2870/improvements Added …

6/18/2018 8:53:05 AM

autofocus for search buttons

Igor Kulikov

Commit: f23d22c

Tree: a63f1a7

Parents: 83ed998
1534549