Commit Graph

2675 Commits

Author SHA1 Message Date
Ace
d8c0d3aeeb Updating carbon-devicemgt to latest versions with active development 2016-08-24 12:44:34 +05:30
Milan Perera
cac0c3e401 Merge pull request #181 from ayyoob/das-ext
Fixed issues raised in the comments
2016-07-28 17:04:25 +05:30
ayyoob
70483aacde merged with upstream 2016-07-28 17:03:08 +05:30
ayyoob
dca55c7385 fixed formatting issues and removed storing error message 2016-07-28 15:40:55 +05:30
ayyoob
c9736707ca fixed the formatting issues. 2016-07-28 15:37:16 +05:30
ayyoob
1033dfd40e added missng log trace 2016-07-28 15:22:07 +05:30
ayyoob
f072fb260a Changed to commons logging 2016-07-28 14:43:24 +05:30
ayyoob
5991eeec58 added missing log 2016-07-28 14:32:30 +05:30
ayyoob
9c82589af2 fixed formatting issues 2016-07-28 14:28:28 +05:30
Milan Perera
aeef79b47e Merge pull request #180 from ayyoob/das-ext
few changes in real time analytics
2016-07-28 14:13:50 +05:30
ayyoob
971fd80b83 few changes in real time analytics 2016-07-27 14:45:55 +05:30
Ace
1bbaf13b5c Updating sample webapp name 2016-07-26 11:24:22 +05:30
Ruwan
03fb29016c Merge pull request #179 from charithag/master
Fix issues mentioned in PRs
2016-07-25 10:56:09 +05:30
charitha
0a61e29641 Fix issues mentioned in PR https://github.com/wso2/product-iots/pull/70 2016-07-23 11:33:23 +05:30
charitha
66470f145b Fix issues mentioned in PR https://github.com/wso2/product-iots/pull/118 2016-07-23 11:14:59 +05:30
charitha
f071ce0d84 Fix issues mentioned in PR https://github.com/wso2/product-iots/pull/83 2016-07-23 10:51:14 +05:30
Ruwan
2c97db014a Merge pull request #178 from charithag/master
Fix issues in PR https://github.com/wso2/product-iots/pull/151
2016-07-22 13:43:15 +05:30
charitha
1b42f08a01 Fix issues in PR https://github.com/wso2/product-iots/pull/151 2016-07-21 17:50:11 +05:30
charitha
35a47f81b0 Fix issues in PR https://github.com/wso2/product-iots/pull/151 2016-07-21 17:43:49 +05:30
Ruwan
54305497ed Merge pull request #177 from charithag/master
Fixes
2016-07-21 12:03:48 +05:30
charitha
258d059ddb Merge branch 'master' of https://github.com/wso2/product-iots 2016-07-21 10:47:47 +05:30
charitha
3ed272f22e Remove wso2 license text from 3rd party libraries 2016-07-21 10:47:15 +05:30
charitha
c9d51df3cb Fix issues in PR https://github.com/wso2/product-iots/pull/172 2016-07-21 10:44:57 +05:30
Ruwan
04d5c2aa6f updated device-mgt-plugins version 2016-07-18 14:46:15 +05:30
Ace
288a523c23 Updating IoTS device.mgt versions 2016-07-13 14:42:59 +05:30
charitha
c1bb8a0c6d Merge branch 'master' of https://github.com/wso2/product-iots 2016-06-30 10:36:39 +05:30
charitha
959792a09d Update agent code and analytics scripts. Fixed bugs 2016-06-30 10:36:22 +05:30
Ruwan
a779d16e9c Merge pull request #176 from GPrathap/master
adding carbon app
2016-06-30 10:32:03 +05:30
GPrathap
140e1c7571 adding carbon app 2016-06-30 00:18:54 +05:30
charitha
e642939b6c Merge branch 'master' of https://github.com/wso2/product-iots 2016-06-29 20:23:43 +05:30
charitha
3f533e2288 Update agent code and analytics scripts. Fixed bugs 2016-06-29 20:23:18 +05:30
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