Igor Kulikov
|
ffc7a57e59
|
UI: Improve dashboard toolbar. Implement entity copy function.
|
2017-05-25 15:52:28 +03:00 |
|
Volodymyr Babak
|
8e4d704b84
|
Fixed cassandra labels
|
2017-05-25 14:11:13 +03:00 |
|
Andrew Shvayka
|
2435ca5d0f
|
Merge remote-tracking branch 'origin/master' into asset-alarm-mgmt
|
2017-05-25 13:46:45 +03:00 |
|
Volodymyr Babak
|
1f5aa83006
|
Updates to proper namings
|
2017-05-25 12:49:19 +03:00 |
|
Volodymyr Babak
|
e5d664b42e
|
Merge remote-tracking branch 'upstream/master' into feature/mqtt-plugin
|
2017-05-25 09:27:23 +03:00 |
|
Volodymyr Babak
|
9a6d984441
|
Fixed cassandra schema instance name
|
2017-05-24 16:49:27 +03:00 |
|
Volodymyr Babak
|
d850f92c7b
|
Fixed version
|
2017-05-24 16:40:19 +03:00 |
|
Igor Kulikov
|
34c6c30e06
|
UI: Implement different units support for different attrs/series. Multi-axis support for flot charts.
|
2017-05-24 16:37:34 +03:00 |
|
Volodymyr Babak
|
8ed9cf8620
|
Removed cassandra custom image
|
2017-05-24 16:37:20 +03:00 |
|
Volodymyr Babak
|
868f5d3ca1
|
Renaming + refactoring
|
2017-05-24 16:17:23 +03:00 |
|
VoBa
|
08e5feea9c
|
Merge pull request #4 from volodymyr-babak/feature/docker-improve
Feature/docker improve
|
2017-05-24 15:35:14 +03:00 |
|
Volodymyr Babak
|
5690e4e848
|
Merge branch 'feature/kubernetes' into feature/docker-improve
|
2017-05-24 15:34:29 +03:00 |
|
Volodymyr Babak
|
a9426676b7
|
Merge branch 'master' into feature/docker-improve
|
2017-05-24 15:33:10 +03:00 |
|
Volodymyr Babak
|
9c29deba73
|
Revert to default values
|
2017-05-24 15:31:37 +03:00 |
|
VoBa
|
a3f85df1a7
|
Merge pull request #3 from volodymyr-babak/feature/docker-ssl
Feature/docker ssl
|
2017-05-24 15:28:30 +03:00 |
|
Volodymyr Babak
|
0758b6643c
|
Merge branch 'master' into feature/kubernetes
|
2017-05-24 15:26:56 +03:00 |
|
Volodymyr Babak
|
5da5a1a134
|
removed unnecessary config options
|
2017-05-24 15:24:48 +03:00 |
|
Andrew Shvayka
|
10d39d2094
|
Alarm REST API
|
2017-05-24 13:58:49 +03:00 |
|
Andrew Shvayka
|
3143c706dc
|
Alarm Service implementation
|
2017-05-24 12:48:32 +03:00 |
|
Volodymyr Babak
|
431e5781b0
|
Merge branch 'master' into feature/docker-ssl
|
2017-05-24 12:23:43 +03:00 |
|
Igor Kulikov
|
750c4750c4
|
UI version set to 1.3.0
|
2017-05-24 11:19:17 +03:00 |
|
Igor Kulikov
|
e38290ec7b
|
Version set to 1.3.0-SNAPSHOT
|
2017-05-24 11:16:11 +03:00 |
|
Andrew Shvayka
|
f336cb6430
|
Merge with master
|
2017-05-24 10:51:26 +03:00 |
|
Andrew Shvayka
|
0f85e16446
|
Asset and Relations management, Dashboard states and layouts management
|
2017-05-24 10:39:33 +03:00 |
|
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 |
|
Volodymyr Babak
|
8c50c63ca9
|
Docker SSL support
|
2017-05-23 09:25:31 +03:00 |
|
mp-loki
|
60e44725c3
|
JPA Alarm and Asset Dao added
|
2017-05-22 21:09:03 -04: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 |
|
Volodymyr Babak
|
2b18ed7a92
|
Misc improvements
|
2017-05-19 11:46:15 +03:00 |
|
mp-loki
|
8604afad38
|
Merge errors fixed
|
2017-05-18 22:49:00 -04:00 |
|
mp-loki
|
0661de2392
|
Merge remote-tracking branch 'origin/asset-alarm-mgmt' into dao-refactoring-vs
|
2017-05-18 22:11:36 -04:00 |
|
Volodymyr Babak
|
7120d61f59
|
Misc fixes after performance testing
|
2017-05-18 21:09:54 +03:00 |
|
Andrew Shvayka
|
96dad362c3
|
Few minor fixes to license files
|
2017-05-18 13:13:36 +03:00 |
|
Volodymyr Babak
|
6584b0bdfd
|
Merge branch 'master' into feature/kubernetes
|
2017-05-18 10:05:04 +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 |
|
volodymyr-babak
|
aaf3c5d439
|
small docker makefiles fixes
|
2017-05-17 13:17:36 +03:00 |
|
volodymyr-babak
|
2f5c9ecba5
|
improved docker makefiles
|
2017-05-17 12:08:10 +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 |
|
volodymyr-babak
|
1623c21021
|
text fixed
|
2017-05-15 16:33:10 +03:00 |
|