Commit Graph

909 Commits

Author SHA1 Message Date
Charitha Goonetilleke
a52c1af457 Merge pull request #101 from charithag/master
Fix for https://wso2.org/jira/browse/IOTS-77
2016-03-10 19:33:58 +05:30
charithag
706002b4d5 Fix for https://wso2.org/jira/browse/IOTS-77 2016-03-10 19:25:50 +05:30
Menaka Madushanka
0ce1d75c61 Class name changed 2016-03-10 18:30:09 +05:30
Menaka Madushanka
6858fb8a85 Code cleanup and refactoring : Check alert is displayed 2016-03-10 16:31:43 +05:30
Menaka Madushanka
b930301819 Merge remote-tracking branch 'origin/master' 2016-03-10 15:06:04 +05:30
Menaka Madushanka
a1b94d5415 Code cleanup and refactoring 2016-03-10 15:05:44 +05:30
Menaka Madushanka
ead5b6e2bb Completed the sample test cases. 2016-03-10 15:04:50 +05:30
ayyoob
7a9b5547bd added feature extraction lifecycle listener 2016-03-08 23:58:54 +05:30
ayyoob
35300ac32a Merge pull request #100 from ayyoob/master
removed conflicting jars that exports same version of packages
2016-03-08 16:09:56 +05:30
ayyoob
2a03111a5a merged with upstream 2016-03-08 16:08:16 +05:30
ayyoob
dd3bfd4ffb merged with upstream 2016-03-08 15:53:17 +05:30
ayyoob
03be540d99 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-03-08 15:52:44 +05:30
ayyoob
66971e4860 removed conflicting jars that exports same packages 2016-03-08 15:52:09 +05:30
Charitha Goonetilleke
febdc36cba Removed commented code and reformat 2016-03-08 13:44:47 +05:30
Shabir Mohamed
55353859b6 Merge pull request #99 from Shabirmean/master
Adding IoTServer specific Gadgets to the portal app
2016-03-07 09:32:32 +05:30
Shabirmean
d7de0f0607 Adding copy tasks for the portal app specific modifications in the bin.xml 2016-03-07 09:31:12 +05:30
Shabirmean
8206dc0f92 Added the doormanager-icon.png 2016-03-07 09:11:35 +05:30
Shabirmean
745d2369d3 Added portal app specific analytics changes and IoT-Gadget samples 2016-03-07 09:09:02 +05:30
Menaka Madushanka
adfa5762c9 Sample Enrollment and verification 2016-03-04 11:22:48 +05:30
Charitha Goonetilleke
e77271a2c3 Merge pull request #98 from charithag/master
Add ESP8266 based fire alarm sample
2016-03-04 11:10:01 +05:30
charithag
6c7041dcda Add ESP8266 based fire alarm sample 2016-03-04 10:59:33 +05:30
Charitha Goonetilleke
77a2419bc4 Merge pull request #97 from charithag/master
Bump event processing version to comply with analytics
2016-03-03 16:05:42 +05:30
charithag
f087baaa49 Bump event processing version to comply with analytics 2016-03-03 16:03:58 +05:30
charithag
4427f53044 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-03-01 15:00:42 +05:30
Menaka Madushanka
b99001ae8d Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-02-29 18:31:37 +05:30
Menaka Madushanka
28879b416f Sample installation and verification 2016-02-29 18:31:28 +05:30
Charitha Goonetilleke
bfb844800b Merge pull request #96 from GPrathap/master
Fix for JIRA IOTS-80
2016-02-29 09:06:09 +05:30
charithag
6dba086760 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-02-26 11:12:28 +05:30
Geesara Prathap
0a29e01356 Update README.md 2016-02-25 23:57:26 +05:30
GPrathap
4c2eeb4b2a Fix for JIRA IOTS-80 2016-02-25 23:52:21 +05:30
Ruwan
4ee0cf0bcc Merge pull request #95 from GPrathap/master
Fix for JIRA IOTS-79
2016-02-25 22:34:34 +05:30
GPrathap
d9f48423e3 Fix for JIRA IOTS-79 2016-02-25 19:25:06 +05:30
charithag
62d795232e Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-02-25 16:52:46 +05:30
Menaka Madushanka
890209e3de License header updated 2016-02-25 14:33:50 +05:30
Menaka Madushanka
98c222ed5e removed the unwanted build.xml file 2016-02-25 14:23:18 +05:30
Menaka Madushanka
34951b5395 Testng.xml changes 2016-02-25 14:22:02 +05:30
Menaka Madushanka
57f91949a3 Code formatting and fixes 2016-02-25 14:21:24 +05:30
Menaka Madushanka
fcd5669361 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-02-25 11:21:38 +05:30
Menaka Madushanka
9a0f0f2187 restart 2016-02-25 11:21:18 +05:30
Ruwan
bcbbcc418a Merge pull request #94 from GPrathap/master
added mqtt dependency to sample agent application
2016-02-25 10:35:29 +05:30
Ace
be7812722e Upgrading commons version 2016-02-25 10:30:13 +05:30
GPrathap
a4695dfb2c added mqtt dependency to sample agent application 2016-02-25 08:29:15 +05:30
Ace
7b51e4f36b bumping dependencies to latest versions 2016-02-24 16:33:56 +05:30
Ruwan
ccd6d0bf6e Merge pull request #93 from GPrathap/master
added deployable sample  application
2016-02-24 12:22:32 +05:30
GPrathap
953b15342f updated README.md 2016-02-24 12:17:19 +05:30
GPrathap
d59f7bc089 added deployable sample application 2016-02-24 11:34:00 +05:30
Menaka Madushanka
67cb3df652 Code formatting 2016-02-23 18:44:11 +05:30
Menaka Madushanka
7cf8fcf4ac Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-02-23 11:13:39 +05:30
charithag
c556a9a7b0 Geesara's changes 2016-02-17 16:35:47 +05:30
charithag
a503433572 Merge remote-tracking branch 'upstream/master' 2016-02-17 16:29:55 +05:30