Commit Graph

1894 Commits

Author SHA1 Message Date
Ruwan
98b79cc3da Merge pull request #175 from GPrathap/master
adding real-time analytics view
2016-06-29 20:08:21 +05:30
GPrathap
db60cb9690 adding real-time analytics view 2016-06-29 19:48:21 +05:30
GPrathap
e44b6ca710 adding real-time analytics view 2016-06-29 19:47:17 +05:30
inoshperera
11c5056b99 Merge pull request #174 from charithag/master
Update agent code and analytics scripts. Fixed bugs
2016-06-29 12:00:23 +05:30
charitha
8478f1ebf0 Update agent code and analytics scripts. Fixed bugs 2016-06-29 11:45:53 +05:30
Ruwan
f5bb1b5a78 Merge pull request #173 from sahan-kariyawasam/master
Adding ui functionality for doormanager application
2016-06-27 17:39:26 +05:30
Ruwan
cb39eb665c Merge pull request #170 from GPrathap/master
adding new device type: geolocationTracker
2016-06-27 17:39:18 +05:30
Sahan Kariyawasam
67a7271299 Adding ui functionality for doormanager application 2016-06-27 17:15:58 +05:30
Ruwan
f062ec27a7 Merge pull request #172 from charithag/master
Add Smart Water Tank device type
2016-06-27 10:04:04 +05:30
charitha
d5a56c4620 Add Smart Water Tank device type 2016-06-27 09:55:37 +05:30
Ruwan
44a0a61a85 Merge pull request #171 from ayyoob/das-ext
few changes added after testing with the cluster
2016-06-27 05:51:56 +05:30
ayyoob
2df0515585 few changes added after testing with the cluster 2016-06-27 00:13:34 +05:30
GPrathap
fab8e8f738 adding new device type: geolocationTracker 2016-06-26 18:23:42 +05:30
Ruwan
74e5583e34 Merge pull request #169 from GPrathap/master
adding new device type: door manager
2016-06-22 21:04:27 +05:30
GPrathap
1f06c08f0d adding new device type: door manager 2016-06-22 18:54:20 +05:30
GPrathap
6193a0421a removing older sample: doormanager 2016-06-22 18:43:11 +05:30
Ruwan
62a602848f Merge pull request #168 from ayyoob/das-ext
Added device scope based authorisation for mqtt
2016-06-20 05:48:45 +05:30
ayyoob
97bf77f16c removed xmpp and mqtt properties 2016-06-20 02:58:46 +05:30
ayyoob
1dd689e8d4 Added device scope based authorisation for mqtt 2016-06-20 02:35:26 +05:30
Ruwan
3af6b875f1 Merge pull request #167 from ayyoob/das-ext
added a configuration ui to connected cup
2016-06-17 18:09:44 +05:30
ayyoob
599ad73a72 added a configuration ui to connected cup 2016-06-17 17:22:04 +05:30
Ruwan
6e2838bdbf Merge pull request #166 from GPrathap/master
code refactoring
2016-06-13 09:42:07 +05:30
Ruwan
112fe34019 Merge pull request #165 from ayyoob/das-ext
added libthrift 0.8
2016-06-13 09:41:50 +05:30
GPrathap
4a7beac606 code refactoring 2016-06-12 21:05:17 +05:30
ayyoob
521f3b478a add removed libthrift 0.8 2016-06-10 15:35:09 +05:30
ayyoob
4bd9fd3a56 Merge branch 'master' of https://github.com/wso2/product-iots into das-ext 2016-06-09 17:12:33 +05:30
Ruwan
d712d07c80 Merge pull request #164 from sahan-kariyawasam/master
Embedded gadget dashboard page in connectedcup analytics page
2016-06-09 13:30:47 +05:30
Ruwan
94cafd0346 Merge pull request #163 from sidias/master
Error Handling
2016-06-09 13:30:40 +05:30
Ruwan
67d0b9ab72 Merge pull request #162 from sidias/patch-1
UI issues fixed
2016-06-09 13:30:31 +05:30
Ruwan
b6c0ddc856 Merge pull request #161 from GPrathap/master
overriding default designer.json which is coming from portal app
2016-06-09 13:30:17 +05:30
Sahan Kariyawasam
b6cc3147fe Embedded gadget dashboard page in connectedcup analytics page 2016-06-09 13:12:33 +05:30
buddhi nipun mihara
5df1d474ea Update type-view.hbs 2016-06-09 13:07:11 +05:30
GPrathap
93a9f90277 overriding default designer.json which is coming from portal app 2016-06-09 13:05:35 +05:30
buddhi nipun mihara
7407298ca4 Update PushSystemUsage.java 2016-06-09 13:03:48 +05:30
buddhi nipun mihara
52712e1b2e Update JavaApp.java 2016-06-09 13:00:27 +05:30
Ruwan
580421048d Merge pull request #159 from sidias/master
Mac OS X script update
2016-06-09 06:01:44 +05:30
Ruwan
14a6cf46b3 Merge pull request #160 from ayyoob/das-ext
Added profiles
2016-06-08 23:00:14 +05:30
ayyoob
89edd2130a Merge branch 'master' of https://github.com/wso2/product-iots into das-ext 2016-06-08 22:39:44 +05:30
ayyoob
5933702725 added http-gateway, mqtt-gateway, devicetype-publisher, devicetype-worker and device-key-manager profiles 2016-06-08 22:36:53 +05:30
buddhinipun
a45bbf67b5 add fix for bashrunner 2016-06-08 18:40:01 +05:30
buddhinipun
9d0af60be7 bug fix for summary table name 2016-06-08 18:17:10 +05:30
buddhinipun
c68df4d3a2 adding ui changes 2016-06-08 18:06:06 +05:30
buddhinipun
c092542b8e changes to mac device 2016-06-08 17:46:19 +05:30
buddhinipun
e02f9bf4a5 adding macosx device agent implementation 2016-06-08 16:43:56 +05:30
Ruwan
0ebfe2b8c0 Merge pull request #158 from sidias/master
resolving pom issues
2016-06-08 12:25:24 +05:30
buddhinipun
c1f3a670b5 resolving pom issues 2016-06-08 12:21:32 +05:30
Ruwan
3d87a4652c Merge pull request #157 from GPrathap/master
fixing IOTS-201
2016-06-08 09:45:08 +05:30
GPrathap
d1a404da6d fixing IOTS-201 2016-06-08 09:27:53 +05:30
Ruwan
1b27d61e38 Merge pull request #156 from sidias/master
adding connectedlap device sample
2016-06-07 23:42:35 +05:30
buddhinipun
e22089ef59 adding connectedlap device sample 2016-06-07 20:14:52 +05:30