8242 Commits

Author SHA1 Message Date
Volodymyr Babak
4e45d24fd1 Fixed IE issue with redirect. 308 return code doesn't work. 303 does. All other browsers are verified agains 303 code as well. 2017-06-22 11:43:28 +03:00
Igor Kulikov
849f53ca4c Fix: don't fetch name of deleted alarm originator. Add ability to create dynamic subscriptions for alarms. 2017-06-21 19:21:51 +03:00
Volodymyr Babak
f806c392b2 Merge remote-tracking branch 'upstream/master' into dao-refactoring-vs 2017-06-15 21:43:17 +03:00
Volodymyr Babak
1141a26a17 Changed blobd type to json text
Added JPA support for service test
2017-06-15 21:42:52 +03:00
Igor Kulikov
87683218b5 TB-63: Find highest alarm severity for specified entity. 2017-06-15 20:13:47 +03:00
Volodymyr Babak
4486d07f6d Get rid of cassandra specific classes in timeseries dao and timeseries service interfaces 2017-06-14 11:58:45 +03:00
Volodymyr Babak
44c28b5b0f Merge remote-tracking branch 'upstream/master' into dao-refactoring-vs 2017-06-13 16:29:00 +03:00
Igor Kulikov
3e0ef11678 TB-63: Add new 'Alarms' tab in entity details. 2017-06-13 12:33:34 +03:00
Igor Kulikov
351684a6cd TB-63: Update Alarms search query with AlarmSearchStatus parameter. 2017-06-12 18:30:46 +03:00
Igor Kulikov
9cdfe4ef54 TB-61: Implemented new alias filters. 2017-06-12 12:59:51 +03:00
Volodymyr Babak
7458df8aab Merge remote-tracking branch 'upstream/master' into dao-refactoring-vs 2017-06-12 10:01:55 +03:00
Andrew Shvayka
0bc4252f97 Fixed unit tests after TTL feature 2017-06-11 09:01:36 +03:00
Volodymyr Babak
0fa24abc24 Minor renaming and refactoring 2017-06-09 19:57:12 +03:00
Volodymyr Babak
79623fbd3d Refactored attributes dao 2017-06-09 19:07:30 +03:00
Volodymyr Babak
11a2844072 Merge remote-tracking branch 'upstream/master' into dao-refactoring-vs 2017-06-09 14:16:07 +03:00
Andrew Shvayka
89e9d27baf TTL Rule Implementation 2017-06-08 21:13:57 +03:00
Igor Kulikov
1b469df40c Fix permissions for Rules and Plugins details 2017-06-08 12:20:41 +03:00
Volodymyr Babak
3534684588 Refactored first and next dao methods
Fixed NULL_UUID
Added support for running cassandra and postgres application versions
2017-06-07 20:11:41 +03:00
Volodymyr Babak
776737519d Merge remote-tracking branch 'upstream/master' into dao-refactoring-vs 2017-06-07 19:42:57 +03:00
Volodymyr Babak
9f38981b9d Merge remote-tracking branch 'upstream/master' into feature/mqtt-plugin 2017-06-05 11:57:57 +03:00
volodymyr-babak
b33d0e78be Added Jpa Relation and Device Dao implementations 2017-06-02 19:05:54 +03:00
volodymyr-babak
613ebc9065 Fixed header and tests 2017-06-01 16:50:37 +03:00
volodymyr-babak
533a5d004d Added system and demo data
Added docker file for postgres db  schema
2017-05-31 18:55:59 +03:00
volodymyr-babak
0e31cd4cb4 Added postgres docker contrainer
Fixed build to run with sql enabled true
2017-05-31 12:48:35 +03:00
Igor Kulikov
438c3e67ec UI: Add alarm service. 2017-05-31 11:31:58 +03:00
volodymyr-babak
7d514d8cad Fixed js builds
Disabled autoconfiguration for hibernate
2017-05-30 21:02:14 +03:00
volodymyr-babak
6a62b64953 Fixed controller tests 2017-05-30 20:37:53 +03:00
volodymyr-babak
2f79950178 Merge remote-tracking branch 'upstream/master' into dao-refactoring-vs 2017-05-30 19:45:58 +03:00
Igor Kulikov
ecb5c50d61 UI: Implement Entity relations management. 2017-05-30 10:53:50 +03: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
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
a741a59ead Implement Assets/Devices type search functionality. 2017-05-26 17:12:57 +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
e5d664b42e Merge remote-tracking branch 'upstream/master' into feature/mqtt-plugin 2017-05-25 09:27:23 +03:00
Volodymyr Babak
9c29deba73 Revert to default values 2017-05-24 15:31:37 +03:00
Andrew Shvayka
10d39d2094 Alarm REST API 2017-05-24 13:58:49 +03:00
Volodymyr Babak
431e5781b0 Merge branch 'master' into feature/docker-ssl 2017-05-24 12:23:43 +03:00
Igor Kulikov
e38290ec7b Version set to 1.3.0-SNAPSHOT 2017-05-24 11:16:11 +03:00
Andrew Shvayka
0f85e16446 Asset and Relations management, Dashboard states and layouts management 2017-05-24 10:39:33 +03:00
Volodymyr Babak
8c50c63ca9 Docker SSL support 2017-05-23 09:25:31 +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
Andrew Shvayka
bee943baab Initial implementation of Asset, Relation and Alarm services 2017-05-17 18:43:55 +03:00
volodymyr-babak
cd4940ce6d Added MQTT plugin 2017-05-15 15:52:17 +03:00