332 Commits

Author SHA1 Message Date
Andrew Shvayka
fe5d4029d9 Merge remote-tracking branch 'origin/master' into asset-alarm-mgmt 2017-05-24 10:23:54 +03:00
Andrew Shvayka
4e36232a25 Ignore incomplete test for Alarm Management 2017-05-24 10:17:35 +03:00
Andrew Shvayka
0a0b02485f Merge pull request #144 from thingsboard/release-1.2
Release 1.2
2017-05-23 15:17:22 +03:00
Andrew Shvayka
9d3bd3b315 Alarm search query implementation 2017-05-23 13:53:03 +03:00
Andrew Shvayka
bb1832913d Merge branch 'master' into asset-alarm-mgmt 2017-05-23 12:24:46 +03:00
Andrew Shvayka
43c174cdbd Merge pull request #140 from junehappylove/patch-1
Fixed some translation errors
2017-05-22 13:02:31 +03:00
Andrew Shvayka
c060e999c1 Merge pull request #141 from toti1212/fix-profile-controller-character
[Fix] - Fixed character in profile.controller.js
2017-05-22 13:02:03 +03:00
Rodrigo Suarez
fb8bdf1ecb [Fix] - Fixed character in profile.controller.js 2017-05-19 20:08:27 -03:00
Andrew Shvayka
96dad362c3 Few minor fixes to license files 2017-05-18 13:13:36 +03:00
june
1e39410802 Fixed some translation errors
Fixed some translation errors
2017-05-18 11:26:51 +08:00
Andrew Shvayka
7c7b70c5ab Improvemetns to Alarm DAO and service 2017-05-17 20:05:59 +03:00
Andrew Shvayka
bee943baab Initial implementation of Asset, Relation and Alarm services 2017-05-17 18:43:55 +03:00
Andrew Shvayka
9495c29d1b Merge pull request #138 from toti1212/add-spanish-language
Added Spanish language
2017-05-16 12:56:59 +03:00
Rodrigo Suarez
eef215be77 Update locale.constant.js 2017-05-15 22:23:51 -03:00
Rodrigo Suarez
c4ea017718 Added Spanish language 2017-05-15 22:17:29 -03:00
Igor Kulikov
4665e25a03 UI: sort history data 2017-05-15 20:24:32 +03:00
Andrew Shvayka
c3ce0d16a3 Merge pull request #136 from dyosick/master
Add russian localization.
2017-05-15 11:28:25 +03:00
DK
930408d581 Add russian localization. 2017-05-15 12:23:24 +05:00
Andrew Shvayka
2cfaf8f0f3 Version set to 1.2.3 v1.2.3 2017-05-09 17:35:03 +03:00
Andrew Shvayka
71c4e0a48c Merge pull request #135 from thingsboard/master
Merge 1.2.3 to release branch
2017-05-09 16:45:24 +03:00
Andrew Shvayka
6a51eda945 Merge pull request #134 from thingsboard/release-1.2
Fixed default cassandra  docker volume
2017-05-09 16:38:41 +03:00
Andrew Shvayka
a3737d6506 TB-55: Fixed shared attributes subscription 2017-05-08 11:01:12 +03:00
june
38741e733b Add Chinese Translation for Version 1.2.3 (#131)
* add the chinese language.

* do not update .toDelete file

* commit

* add the Chinese language supported

* commit
2017-05-07 22:38:50 +03:00
Andrew Shvayka
7d09019fd2 Merge pull request #130 from volodymyr-babak/master
TB-57: Added support for custom header of REST API Call Plugin
2017-05-07 14:10:57 +03:00
volodymyr-babak
0f34ff5188 TB-57: Added support for custom header of REST API Call Plugin 2017-05-07 10:00:26 +03:00
Andrew Shvayka
0847551074 Merge pull request #127 from pudoj/release-1.2
Adding Chineese locale
2017-05-07 09:49:56 +03:00
Andrew Shvayka
611c970f2f Merge pull request #128 from bhtak/mqtt_fix
fix the message type of UnSubAck message
2017-05-07 00:00:14 +03:00
Bohun Tak
81adf02f8a fix the message type of UnSubAck message 2017-05-06 22:59:02 +09:00
wangjunwei
67d1c37d60 delete unused notes 2017-05-06 21:32:35 +08:00
wangjunwei
d27999ddf9 add the Chinese support.of all it support english,korean&chinese 2017-05-06 21:26:32 +08:00
wangjunwei
cbdd0848f0 can not use both space & tab in the js 2017-05-06 08:52:39 +08:00
wangjunwei
1eb3c9b164 add Chinese language 2017-05-06 07:41:54 +08:00
Andrew Shvayka
adcfc9703c TB-56: Improvement to the TimePlugin to support timezone operations 2017-05-05 17:02:43 +03:00
Andrew Shvayka
eea77c5906 Merge pull request #122 from yuyihan666/master
CORS
2017-05-04 11:12:56 +03:00
yyh
e13ce80731 update licenses 2017-05-04 09:33:44 +08:00
Igor Kulikov
bfd654d84f Add social share buttons for public dashboards sharing. Improve dashboard toolbar configuration. Add project version information to bottom right part of the dashboard. 2017-05-03 14:24:26 +03:00
yyh
a0b2b59d7b update licenses 2017-05-03 17:54:17 +08:00
余艺韩
2de798571f CORS 2017-05-03 17:13:42 +08:00
Igor Kulikov
912c572aed UI: Map widget improvements. 2017-04-27 12:37:58 +03:00
Andrew Shvayka
b855d82f7a Merge branch 'master' of github.com:thingsboard/thingsboard 2017-04-27 10:58:05 +03:00
Andrew Shvayka
522d392777 RPC and MQTT packet size bug fixes 2017-04-27 10:57:46 +03:00
Igor Kulikov
dcefde00f0 Improve devices attributes table. 2017-04-26 21:39:42 +03:00
Igor Kulikov
02202c217f UI: Minor fix for widgets subscription. 2017-04-25 13:34:13 +03:00
Igor Kulikov
e0c6b1464c Widget subscriptions improvements. 2017-04-25 10:51:39 +03:00
Andrew Shvayka
96d344fabd Fixed outdated tests 2017-04-24 11:29:51 +03:00
Igor Kulikov
7020e60aed Merge pull request #116 from thingsboard/feature/TB-50
TB-50: Public dashboards feature.
2017-04-23 18:08:46 +03:00
Igor Kulikov
876be70c79 TB-50: Public dashboards feature. 2017-04-23 18:04:55 +03:00
Andrew Shvayka
ac5b0f18dd Fixed bug with REST API data representation for telemetry plugin 2017-04-21 13:33:22 +03:00
Igor Kulikov
ea32b2d29e Merge pull request #112 from thingsboard/bug/TB-51
TB-51: Fix java version check procedure in windows installation script.
2017-04-18 19:18:42 +03:00
Igor Kulikov
f5e52ee488 TB-51: Fix java version check procedure in windows installation script. 2017-04-18 19:11:33 +03:00