dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,359 Commits 106 Branches 71 Tags
Commit Graph

440 Commits

Author SHA1 Message Date
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
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
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
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
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
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
80b2cffcca
Merge pull request #831 from iglilaw/master 
l10n improvements
 2018-06-04 11:34:36 +03:00
Igor Kulikov
fd905987a8 Version set to 2.0.2-SNAPSHOT 2018-06-04 10:23:49 +03:00
charlie
68ff23e2c5 up 
Signed-off-by: charlie <charlie_weng@163.com>
 2018-06-04 14:32:39 +08:00
charlie
72aa9d0a44 Merge branch 'master' of https://github.com/thingsboard/thingsboard 2018-06-04 14:29:29 +08:00
iglilaw
2ab0340b3e Added missing strings 2018-06-03 08:06:51 +02:00
iglilaw
95f2e7ae67 Added missing strings 2018-06-03 08:00:21 +02:00
iglilaw
e389cca6da Added missing strings 2018-06-03 07:50:58 +02:00
iglilaw
a7b16a39ec Added missing strings 2018-06-03 07:31:41 +02:00
iglilaw
b5e18daa0e Changed order 2018-06-03 07:31:11 +02:00
iglilaw
88edb64df7 Removed plugin, rule & rule plugin strings 
Removed plugin, rule & rule plugin strings from spanish, korean, russian & chinese.
 2018-06-03 06:56:34 +02:00
Igor Kulikov
9b499e2238 Add new nodes help links. 2018-06-01 15:33:33 +03:00
charlie
3a1145424c fix 
Signed-off-by: charlie <charlie_weng@163.com>
 2018-06-01 11:49:22 +08:00
charlie
b42e511f22 fix locale.constant-zh.js 
Signed-off-by: charlie <charlie_weng@163.com>
 2018-06-01 11:35:09 +08:00
Igor Kulikov
6c2a7d6fff RuleChain UI: Coordinates protection. 2018-05-31 14:21:55 +03:00
charlie
2d2b4b5c12 fix locale.constant-zh.js 
Signed-off-by: charlie <charlie_weng@163.com>
 2018-05-31 18:48:41 +08:00
Igor Kulikov
13d49da4cb Version set to 2.0.1-SNAPSHOT 2018-05-29 14:44:04 +03:00
Andrew Shvayka
331548bfa7
Merge pull request #804 from untilbit/patch-2 
Removed Rule and Plugin strings
 2018-05-28 18:59:07 +03:00
Igor Kulikov
66de7bd17f Update help links 2018-05-28 18:58:35 +03:00
Igor Kulikov
0ea054c6ae Help links improvements 2018-05-25 16:27:43 +03:00
Igor Kulikov
e556b48372 Fix css. Add docUrl to rule node definition. 2018-05-25 16:00:10 +03:00
Igor Kulikov
76a8157387 Improve link dragging behaviour 2018-05-24 20:03:39 +03:00
Ismail
90a9b22fdb
Removed Rule and Plugin strings 2018-05-24 09:38:29 +02:00
Igor Kulikov
f19b2efb89 Merge branch 'master' into develop/2.0 2018-05-23 17:24:45 +03:00
Igor Kulikov
e90a708185 Update Rule Nodes help links. 2018-05-21 19:58:25 +03:00
Igor Kulikov
4230262960 Add rule node help links. Improve rule nodes description. 2018-05-21 11:47:48 +03:00
jacklicn
4591d16844
Add Chinese translation for audit-log. 2018-05-21 12:42:36 +08:00
Igor Kulikov
606d21ab79 Rule Chain UI improvements. 2018-05-18 21:22:31 +03:00
Igor Kulikov
efbc65e11f Enable/Disable Sandboxed JavaScript environment. UI: Tidy button to format java scripts. 2018-05-18 19:41:02 +03:00
Andrew Shvayka
9bcb38bc13 Version set to 2.0.0-SNAPSHOT 2018-05-17 09:23:05 +03:00
Igor Kulikov
7d179c6af8 Merged with master 2018-05-16 18:26:18 +03:00
Igor Kulikov
c5de82341f RuleChain UI improvements. 2018-05-16 18:11:25 +03:00
jacklicn
33c3d1daf4
Add missed import statements! 2018-05-16 11:56:52 +08:00
Igor Kulikov
9f87e4a73d Remove Rules and Plugins UI 2018-05-15 19:14:50 +03:00
Igor Kulikov
bce5d9332e Ability to change Root rule chain. 2018-05-15 17:47:00 +03:00
jacklicn
ad65b5b7f6
fixed missed semicolon! 2018-05-15 22:26:51 +08:00
Igor Kulikov
cbceca66f8 Add latest debug input information to test script dialog. Add device attributes node. 2018-05-14 19:26:40 +03:00
Igor Kulikov
829c9a28cf Update post telemetry message body format. Add relationType to rule nodes msg debug. 2018-05-11 20:04:02 +03:00
Igor Kulikov
2dec050a37 Separate Alarm node to Create and Clear Alarm nodes. 2018-05-11 18:53:50 +03:00
Igor Kulikov
9529d3e052 Rule Node UI config hints. 2018-05-10 12:49:08 +03:00