Andrew Shvayka
|
410d197a34
|
Fixed Implementation of DAO and services after merge
|
2017-05-30 13:14:51 +03:00 |
|
volodymyr-babak
|
d1dad3c09a
|
Added config parameter for tests to enable cassandra
|
2017-05-30 11:54:59 +03:00 |
|
volodymyr-babak
|
1b36cfb4fe
|
Merge remote-tracking branch 'upstream/dao-refactoring-vs' into dao-refactoring-vs
|
2017-05-30 09:30:43 +03:00 |
|
volodymyr-babak
|
9ff29986bf
|
Merge remote-tracking branch 'upstream/dao-refactoring' into dao-refactoring-vs
|
2017-05-30 09:30:39 +03:00 |
|
mp-loki
|
3c5b76b25d
|
Added method implementations to missing JPA Asset and Alalrm DAO methods
|
2017-05-29 23:47:45 -04:00 |
|
Andrew Shvayka
|
9772c38902
|
Merge with master
|
2017-05-29 23:08:31 +03:00 |
|
Igor Kulikov
|
3c43d039e8
|
Add relationTypeGroup to relation column family.
|
2017-05-29 17:50:33 +03:00 |
|
Andrew Shvayka
|
6b446023b1
|
Merge pull request #151 from thingsboard/asset-alarm-mgmt
Asset & Alarm management
|
2017-05-29 12:22:14 +03:00 |
|
Andrew Shvayka
|
9f3de06547
|
Merge with master
|
2017-05-29 12:21:24 +03:00 |
|
Igor Kulikov
|
e3976b319d
|
Merge branch 'master' of github.com:thingsboard/thingsboard
|
2017-05-29 11:48:01 +03:00 |
|
Igor Kulikov
|
a708509aac
|
Entity relations management.
|
2017-05-29 11:47:43 +03:00 |
|
Andrew Shvayka
|
d6ad8c9e55
|
Merge with master
|
2017-05-29 11:05:35 +03:00 |
|
Andrew Shvayka
|
1193539119
|
Merge pull request #145 from volodymyr-babak/feature/kubernetes
Kubernetes scripts
|
2017-05-29 10:54:34 +03:00 |
|
volodymyr-babak
|
2e618ee674
|
Revert changes for the config parameters
|
2017-05-29 10:33:33 +03:00 |
|
Igor Kulikov
|
90ef91e3a1
|
UI: Implement Asset/Device type management.
|
2017-05-28 18:23:05 +03:00 |
|
Igor Kulikov
|
a741a59ead
|
Implement Assets/Devices type search functionality.
|
2017-05-26 17:12:57 +03:00 |
|
mp-loki
|
e37e436978
|
Enum persistence changed to string
|
2017-05-25 22:13:03 -04:00 |
|
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
|
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 |
|