community/product-iots
1
0
Fork 0
mirror of https://repository.entgra.net/community/product-iots.git synced 2025-09-16 23:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,894 Commits 10 Branches 83 Tags 214 MiB
c69f74ad2b
Commit Graph

1382 Commits

Author SHA1 Message Date
mharindu
870009915f Removed api-publisher 2016-05-19 01:14:58 +05:30
mharindu
401a07540e Merge branch 'master' of https://github.com/wso2/product-iots into apim 2016-05-19 00:56:41 +05:30
sumedharubasinghe
e50ee7edad Merge pull request #141 from ayyoob/das-ext 
removing mdm archtype
 2016-05-19 00:40:47 +05:30
prabathabey
cba9d8baaa Adding virtual-fire-alarm-config.xml 2016-05-19 00:22:45 +05:30
ayyoob
99c693bcae few fixes after testing 2016-05-18 19:34:07 +05:30
GPrathap
8e71da6c15 appended tenant domain to username 2016-05-18 10:17:21 +05:30
GPrathap
c2d1879483 fix typo 2016-05-17 22:51:51 +05:30
GPrathap
3b819cab1d add mssql and oracle db scripts 2016-05-17 22:50:17 +05:30
GPrathap
2b68b48f4c removed copy link section from UI 2016-05-17 22:49:26 +05:30
ayyoob
9e8181c226 removing mdm archtype 2016-05-17 21:15:48 +05:30
ayyoob
0a2860d0d4 cleaning datasources 2016-05-17 21:14:53 +05:30
GPrathap
2a59c23a55 added touch points to unconfigure installed device plugin 2016-05-17 19:04:46 +05:30
GPrathap
8a013279a4 merged controller and manager apis 2016-05-17 18:55:45 +05:30
GPrathap
7ab6046d31 did some UI changes 2016-05-17 18:52:52 +05:30
GPrathap
f92f3f9692 added mqtt configuration and mqtt output adapter listener 2016-05-17 18:47:43 +05:30
GPrathap
470778fb48 added mqtt event receiver and updated existing analytics scripts 2016-05-17 18:45:01 +05:30
GPrathap
e8e648ce76 renamed table name and graph axes labels 2016-05-17 18:42:27 +05:30
GPrathap
3e561a6ccf updated event stream payload 2016-05-17 18:39:13 +05:30
GPrathap
92378287af updated event stream payload 2016-05-17 18:37:16 +05:30
GPrathap
1ee6231b75 added output event adapter dependencies 2016-05-17 18:31:10 +05:30
GPrathap
cb37583a3c added some file filers to process selected *.js and *.car file types 2016-05-17 18:28:31 +05:30
mharindu
bc72c16647 Merge branch 'master' of https://github.com/wso2/product-iots into apim 2016-05-17 12:25:41 +05:30
mharindu
46c054d567 Removed analytics from APIM fault sequence 2016-05-17 09:01:23 +05:30
Ruwan
b7040ca5c2 Merge pull request #118 from charithag/master 
Update analytics and configs in connectedcup
 2016-05-16 16:24:52 +05:30
charitha
c320148a10 Update analytics and configs in connectedcup 2016-05-16 16:18:19 +05:30
mharindu
b69a539aee Added new logs 2016-05-16 14:16:24 +05:30
mharindu
9307bf1f0b Fixed conflicts 2016-05-16 12:09:08 +05:30
mharindu
d239a5efb7 Merge branch 'master' of https://github.com/wso2/product-iots 2016-05-16 12:08:16 +05:30
mharindu
d2e914e275 Added new configuration for the webapp publisher and scope validator 2016-05-16 12:07:57 +05:30
ayyoob
b6882f8fbe fixed https://wso2.org/jira/browse/IOTS-153 2016-05-15 21:29:07 +05:30
ayyoob
a92eb8bd34 refactored connected cup apis 2016-05-15 17:46:30 +05:30
Ace
19775a7c99 Adding comments to config file 2016-05-15 01:35:08 +05:30
Ace
01ab2a5ce4 Adding device type deployment location property 2016-05-15 01:18:13 +05:30
ayyoob
d2f223da90 few fixes after testing the device type with the refactoring 2016-05-14 20:43:27 +05:30
ayyoob
d19da2357b added missing license headers 2016-05-14 11:29:17 +05:30
ayyoob
0b893ad64c refactored connected cup analytics scripts 2016-05-14 11:11:50 +05:30
ayyoob
d0183deb2a few changes in event recievers and remove type and method from feature 2016-05-13 02:54:21 +05:30
mharindu
5a3bdb599f Added new log4j.properties 2016-05-12 23:00:33 +05:30
mharindu
b777fa9764 Merge branch 'master' of https://github.com/wso2/product-iots 2016-05-12 22:05:07 +05:30
mharindu
566c5e5fb5 fixed issues in API publishing 2016-05-12 22:02:47 +05:30
ayyoob
e5d5afa9a0 added remote app manager config 2016-05-12 19:18:20 +05:30
ayyoob
a5be8acd45 Merge branch 'master' of https://github.com/wso2/product-iots into das-ext 2016-05-12 13:45:39 +05:30
ayyoob
14ead035d7 few changed mqtt authoriser 2016-05-12 13:39:44 +05:30
ayyoob
787178ddff added mqtt and xmpp.properties 2016-05-12 02:43:10 +05:30
prabathabey
cacd5bf5ae Adding APILifeCycle.xml 2016-05-11 16:56:40 +05:30
prabathabey
18c3f1dfd5 Removing api-mgt startup publisher feature and other redundant feature definitions 2016-05-10 22:44:49 +05:30
prabathabey
ab32e91501 Removing try-it and Siddhi try-it features 2016-05-10 22:42:17 +05:30
prabathabey
1e3454dc46 Removing jaggery-test dependency 2016-05-10 22:29:28 +05:30
prabathabey
125e398dab Removing all mobile related dependencies 2016-05-10 22:21:56 +05:30
prabathabey
9548b88dad Removing app-mgt dependencies 2016-05-10 22:12:25 +05:30
prabathabey
a98849b20f Removing API-mgt publisher feature 2016-05-10 21:30:15 +05:30
ayyoob
8bc2b482fe update on log4j.properties 2016-05-09 01:06:09 +05:30
ayyoob
44662c625b create mb extension for authorisation 2016-05-09 01:05:55 +05:30
ayyoob
02851637b3 removed das input adapters 2016-05-08 02:50:40 +05:30
GPrathap
ee304f1724 added SAML2 Web SSO federated authenticator 2016-05-06 21:01:20 +05:30
GPrathap
384c1f35b3 removed unused code 2016-05-05 22:24:16 +05:30
GPrathap
b40e5b4bb1 corrected subscribe topic format 2016-05-05 22:23:26 +05:30
ayyoob
046e646e8f Merge branch 'master' of https://github.com/wso2/product-iots into das-ext 2016-05-04 05:00:19 +05:30
ayyoob
652545b49a added release note 2016-05-04 04:45:50 +05:30
GPrathap
5f38afa77c change group id 2016-05-04 04:12:44 +05:30
sumedharubasinghe
71b13f0dcc Merge pull request #129 from GPrathap/master 
refactoring cdmf-device type-archetype
 2016-05-04 03:38:05 +05:30
GPrathap
fb0e089518 refactoring cdmf-device type-archetype 2016-05-04 03:18:47 +05:30
sumedharubasinghe
9fb543ff6d Merge pull request #128 from ayyoob/das-ext 
Added few changes after testing
 2016-05-04 03:17:12 +05:30
ayyoob
a43048679d added device-analytics-config 2016-05-04 03:01:27 +05:30
ayyoob
740afcac2a few changes after testing 2016-05-04 01:13:54 +05:30
Rasika Perera
a6e1cda740 Merge branch 'master' of https://github.com/wso2/product-iots 2016-05-04 00:52:08 +05:30
Rasika Perera
29aca290a4 Adding group permission checking 2016-05-04 00:49:06 +05:30
ayyoob
751b2f8dae removed unused sample device types 2016-05-03 18:40:31 +05:30
ayyoob
586aaa5f1e Fixed https://wso2.org/jira/browse/IOTS-64 2016-05-03 18:40:15 +05:30
ayyoob
ad237ffd34 resolved issues in connected cup sample 2016-05-03 13:44:08 +05:30
ayyoob
720a57f5df updated IDP config 2016-04-29 17:41:05 +05:30
Shabirmean
5527e82bab Removed custom keystores and included only the 'wso2certs.jks' file with CA and RA certs for SCEP 2016-04-29 16:42:25 +05:30
ayyoob
2a6e42b646 resolve server shutdown issues 2016-04-24 02:16:27 +05:30
NuwanSameera
2f2c23105a Move digital display and drone analyzer to samples. 2016-04-22 15:58:12 +05:30
ayyoob
568bb7d09f Merge branch 'master' of https://github.com/wso2/product-iots into das-ext 2016-04-20 00:00:48 +05:30
ayyoob
b336c05625 few fixes after testing 2016-04-19 23:35:43 +05:30
NuwanSameera
4f28e803af Remove monitor operations from controoler api. 2016-04-19 17:21:09 +05:30
Prabath Abeysekara
2fadbc10a6 Merge pull request #116 from charithag/master 
Add devicemgt_admin jax-rs and removed mdm-admin jax-rs
 2016-04-19 13:36:58 +05:30
Prabath Abeysekara
a6e2b235c9 Merge pull request #117 from ayyoob/das-ext 
Added DAS extensions features and upgraded analytics versions
 2016-04-18 17:32:31 +05:30
ayyoob
394f57d729 Added DAS Extensions features 2016-04-18 17:17:14 +05:30
charithag
4d76f89b87 Merge branch 'master' of https://github.com/wso2/product-iots 2016-04-18 17:10:49 +05:30
charithag
49466b2953 Add devicemgt_admin jax-rs and removed mdm-admin jax-rs 2016-04-18 16:42:53 +05:30
NuwanSameera
ab7ee2dbb8 Merge remote-tracking branch 'origin/master' 
Conflicts:
	modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/transport/ConnectedCupMQTTConnector.java
	modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/util/ConnectedCupServiceUtils.java
	modules/samples/connectedcup/component/controller/src/main/java/org/coffeeking/controller/service/ConnectedCupControllerService.java
	modules/samples/connectedcup/component/manager/src/main/java/org/coffeeking/manager/service/ConnectedCupManagerService.java
	modules/samples/connectedcup/component/manager/src/main/webapp/WEB-INF/cxf-servlet.xml
	modules/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/util/CurrentSensorServiceUtils.java
	modules/samples/currentsensor/component/controller/src/main/java/org/homeautomation/currentsensor/manager/api/CurrentSensorControllerService.java
	modules/samples/currentsensor/component/manager/src/main/java/org/homeautomation/currentsensor/manager/api/CurrentSensorManagerService.java
	modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/constants/CurrentSensorConstants.java
	modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManager.java
	modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManagerService.java
	modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/CurrentSensorDAOUtil.java
	modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/impl/CurrentSensorDeviceDAOImpl.java
	modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/util/CurrentSensorUtils.java
	modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/internal/ServiceComponent.java
	modules/samples/firealarm/component/controller/src/main/java/org.homeautomation/firealarm/controller/api/ControllerService.java
 2016-04-18 11:49:18 +05:30
NuwanSameera
c7c2222e4b Add Uninstall feature to sample device types. 2016-04-18 11:47:47 +05:30
ayyoob
e9f2062362 added files related to activate synapse as a gateway 2016-04-18 02:58:55 +05:30
ayyoob
f2648c2c28 few changes after testing with the apim 2016-04-17 12:21:17 +05:30
ayyoob
a80a493506 few changes after testing 2016-04-15 23:11:11 +05:30
ayyoob
f91b566425 version update and added das extension feature 2016-04-14 19:57:13 +05:30
ayyoob
4d2c63eff7 disabled jwt grant type 2016-04-01 21:13:56 +05:30
ayyoob
7e51653b36 removed snapshot version from dependencies 2016-04-01 21:03:48 +05:30
Ruwan
94ba3ff6c2 Merge pull request #112 from rasika90/master 
Removing uuf template app feature from iots
 2016-04-01 19:29:31 +05:30
Rasika Perera
0fc75151f6 Removing uuf template app feature 2016-04-01 15:08:34 +05:30
charithag
85a00afe85 Merge branch 'master' of https://github.com/wso2/product-iot-server 
# Conflicts:
#	modules/distribution/src/assembly/bin.xml
#	modules/features/org.wso2.iot.styles.feature/pom.xml
#	modules/features/pom.xml
#	modules/p2-profile-gen/pom.xml
 2016-03-31 23:41:07 +05:30
ayyoob
0b6cd88b78 Changed analytics to released version and temporally disabled mobile features until impl is released from base feature. 2016-03-31 05:58:09 +05:30
charithag
4cfa5f60ea Disabled IoT device types based features temporally. 2016-03-30 02:07:35 +05:30
charithag
17e9dd9127 Fix for https://wso2.org/jira/browse/IOTS-99 2016-03-25 15:29:40 +05:30
Ruwan
155867b334 Merge pull request #109 from ayyoob/master 
Added JWT grant type and upgraded the APIM version
 2016-03-24 08:45:03 +05:30
ayyoob
69740cc2f2 updated APIM version 2016-03-23 03:23:13 +05:30
GPrathap
65b4dec1d7 adding a new gadget: Data Range Picker 2016-03-21 05:55:00 +05:30
GPrathap
824503c0d7 adding new theme to dashboard portal application 2016-03-20 23:58:47 +05:30
Charitha Goonetilleke
9afcfc6ee6 Merge pull request #107 from charithag/master 
Refactoring
 2016-03-18 12:49:52 +05:30
charithag
e5c11b9fa5 Refactoring 2016-03-18 12:47:14 +05:30
NuwanSameera
e0b9524168 Remove policy based jaggery apps from samples. 2016-03-17 15:00:43 +05:30
NuwanSameera
77b4a51add Resolve conflicts. 2016-03-17 14:57:25 +05:30
NuwanSameera
0ab149d392 Remove policy based jagerry apps from samples. 2016-03-17 14:44:20 +05:30
charithag
16a8e63497 Merge branch 'master' of https://github.com/charithag/product-iot-server 
# Conflicts:
#	modules/samples/doormanager/component/pom.xml
 2016-03-15 13:58:16 +05:30
charithag
a2c016efcc Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-03-15 11:53:14 +05:30
charithag
dc3540f2ef Merge branch 'master' of https://github.com/charithag/product-iot-server 
# Conflicts:
#	modules/samples/doormanager/component/pom.xml
 2016-03-15 11:52:59 +05:30
GPrathap
d9fd45e5ab removed file separator when creating mqtt subscriber topic 2016-03-15 11:49:28 +05:30
NuwanSameera
1ac7f55435 Add permissions.xml to current sensor device type. 2016-03-15 10:50:03 +05:30
Charitha Goonetilleke
6029428336 Bump json version 2016-03-14 23:58:07 +05:30
Charitha Goonetilleke
f48b35b494 Bump json version 2016-03-14 23:38:14 +05:30
Charitha Goonetilleke
a7221a04b6 Bump json version 2016-03-14 23:37:30 +05:30
Charitha Goonetilleke
fbe6ebe9df Fix json library version 2016-03-14 23:36:14 +05:30
Menaka Madushanka
130cad34ee Changes suggested in the Code review. 2016-03-14 19:50:50 +05:30
Menaka Madushanka
f7cf6fe56e Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-03-14 17:59:10 +05:30
Menaka Madushanka
0333007b1f Changes suggested in the Code review. 2016-03-14 17:41:23 +05:30
NuwanSameera
0e01164874 Merge branch 'master' of https://github.com/ayyoob/product-iot-server 2016-03-14 12:44:57 +05:30
Menaka Madushanka
eb77b572e7 Fixes 2016-03-14 12:28:03 +05:30
Menaka Madushanka
d7565e7fe7 Minor fixes 2016-03-14 11:18:47 +05:30
NuwanSameera
aeb3ef20ac Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-03-14 10:14:02 +05:30
Menaka Madushanka
d71b00d925 Added constants. 2016-03-14 10:04:42 +05:30
GPrathap
24fe930727 refactoring code 2016-03-13 22:02:09 +05:30
GPrathap
9b38eddd09 relocated ui component 2016-03-13 22:01:28 +05:30
GPrathap
87c4bbff85 removing and adding relevant images 2016-03-13 21:59:15 +05:30
GPrathap
39af0a9f57 removing and adding required images 2016-03-13 21:57:37 +05:30
GPrathap
5deac3cca1 adding claims definitions 2016-03-13 21:56:01 +05:30
GPrathap
3416a191c0 adding agent source code 2016-03-13 21:54:13 +05:30
GPrathap
5dd57a157e changing source code according to new API changes 2016-03-13 21:51:16 +05:30
GPrathap
e2ce28767e added analytics scripts 2016-03-13 21:45:29 +05:30
GPrathap
fa112b28e5 removed unnecessary module: agent 2016-03-13 21:41:57 +05:30
GPrathap
bd856c0b75 refactoring code 2016-03-13 21:28:12 +05:30
GPrathap
70fcea507d changed source code according to new API changes 2016-03-13 21:27:28 +05:30
GPrathap
4f6ab8f6f6 changed group id cdmf.devicetype into org.wso2.cdmf.devicetype 2016-03-13 21:06:27 +05:30
Menaka Madushanka
e3f8956d29 package refactoring 2016-03-12 14:44:10 +05:30
NuwanSameera
ee250d25c5 Add permissions.xml to connected-cup device type. 2016-03-11 19:16:09 +05:30
Menaka Madushanka
0ac1c73efe License headers added. 2016-03-11 11:39:06 +05:30
Menaka Madushanka
eac16a5d14 Code formatting 2016-03-11 11:31:51 +05:30
Menaka Madushanka
4cf1d77311 Added javadoc comments 2016-03-11 10:59:43 +05:30
Menaka Madushanka
ef9c3dfe70 Added comments and code restructured. 2016-03-10 20:19:37 +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
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
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
charithag
6c7041dcda Add ESP8266 based fire alarm sample 2016-03-04 10:59:33 +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
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
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
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
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
Ace
fca3016181 Bug fixes 2016-02-17 01:39:15 +05:30
Ace
bb1216c6bf logic to send event to CEP 2016-02-17 01:19:03 +05:30
Ace
8f8209db08 Adding method to check if user exists 2016-02-17 00:31:11 +05:30
charithag
ae08246052 fix issues 2016-02-16 23:07:20 +05:30
charithag
09fbbad7d7 Merge remote-tracking branch 'upstream/master' 2016-02-16 19:37:09 +05:30
GPrathap
1d698a73fd added new devicetype: doormanager 2016-02-16 19:32:21 +05:30
charithag
9e9627f37f upstream merge 2016-02-16 19:26:06 +05:30
charithag
81117d00c4 Change water dispensor category 2016-02-16 19:21:43 +05:30
NuwanSameera
cc5cf0e09e Current sensor display name changed to Samrt Meeter 2016-02-15 13:17:21 +05:30
NuwanSameera
aa6d02f25c Merge remote-tracking branch 'upstream/master' 2016-02-15 09:50:26 +05:30
NuwanSameera
335632769f Current Sensor controller changes 2016-02-15 09:49:51 +05:30
Menaka Madushanka
cb1c30ec43 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-02-14 01:48:17 +05:30
Menaka Madushanka
c7adb5530d Added comments and code cleanup 2016-02-12 10:39:25 +05:30
Menaka Madushanka
c086968e24 Added comments and code cleanup 2016-02-12 10:23:18 +05:30
charithag
fc702b96b9 Bump carbon device mgt plugins version 2016-02-11 15:33:10 +05:30
Shabirmean
8f4093b20f Removed already installed features from the "repository/components/features" folder 2016-02-10 17:32:25 +05:30
Menaka Madushanka
d9799fa3c0 License headers 2016-02-10 14:18:11 +05:30
Menaka Madushanka
0ee834fc16 License headers added 2016-02-10 14:15:39 +05:30
Menaka Madushanka
f91f4a3555 Integration tests for IOT server 2016-02-10 12:40:18 +05:30
NuwanSameera
8ca2614a08 Change Current Sensor display name to Water Dispensor 2016-02-08 17:42:40 +05:30
NuwanSameera
e64bed8b50 Add flow sensor to currentsensor device type and modify device view page 2016-02-08 16:07:32 +05:30
charithag
463fb50b8f Updated current sensor component structure 2016-02-02 21:27:23 +05:30
NuwanSameera
d9624efc80 Add current sensor device type sample 2016-02-02 16:13:46 +05:30
NuwanSameera
aff032c66d Add current sensor device type sample 2016-02-02 16:13:10 +05:30
charithag
90dcc43ed1 Updated connected cup component structure 2016-02-02 16:02:25 +05:30
charithag
74c04dc49b Merged with CDM master 2016-01-28 17:44:10 +05:30
Charitha Goonetilleke
0c2318c425 Merge pull request #83 from charithag/master 
Update coffee cup UI
 2016-01-27 15:14:21 +05:30
charithag
d0c7cddfd0 Update coffee cup UI 2016-01-27 15:13:20 +05:30
Ace
279c4a1c7a Adding fix for startup error when MB features are not yet up 2016-01-27 14:25:50 +05:30
Ace
1aef1d10c3 Bug fixes 2016-01-27 13:08:57 +05:30
Ace
f9be9a8c0e Improving connected cup UI 2016-01-27 12:09:34 +05:30
Ace
a3fd8d5134 Fixing issues with connected cup sample 2016-01-26 09:25:56 +05:30
Ruwan
347b27acf9 Merge pull request #78 from NuwanSameera/master 
Connected cup feature pom changes requested by menaka
 2016-01-26 08:42:49 +05:30
Ace
94f1b87ce3 Removing patches and upgrading DAS and MB 2016-01-25 10:47:31 +05:30
Shabirmean
fd0f149c61 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-01-22 18:49:44 +05:30
Shabirmean
9ef829536e Upgraded Paho-MQTT version to latest v1.0.2 2016-01-22 18:49:33 +05:30
GPrathap
7bd44f4499 removed auto generated device-deployer.xml 2016-01-22 14:40:46 +05:30
Shabirmean
390bda1b3a Fixing wrong parent-groupId in the tools module 2016-01-20 11:44:06 +05:30
GPrathap
17db3bc651 created auto generated device-deployer.xml file 2016-01-20 09:40:14 +05:30
GPrathap
84dc857811 facilitated to create a feature of given device type dynamically 2016-01-19 23:28:53 +05:30
GPrathap
a9750a2680 added a new maven archetype to generate sample structure of cdmf device type 2016-01-19 14:11:00 +05:30
NuwanSameera
ede2489b38 Connected cup feature pom changes 2016-01-19 12:45:46 +05:30
Charitha Goonetilleke
8aa804bb92 Merge pull request #76 from menaka121/master 
Connected cup start agent url generation fixed
 2016-01-18 09:50:52 +05:30
Shabirmean
7b5496d4db added the sample connected-cup project as a module into the device-deployer.xml 2016-01-14 16:56:04 +05:30
Menaka Madushanka
41bfb96fe2 Connected cup issues with url generation fixed 2016-01-14 15:59:11 +05:30
Menaka Madushanka
5770ecab2f fixed to get the server ip when starting the agent 2016-01-14 15:04:56 +05:30
Menaka Madushanka
f1a22397a3 connected cup agent added 2016-01-14 14:39:56 +05:30
Shabirmean
5f8c04243b Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-01-13 19:01:04 +05:30
ayyoob
3f9e279188 Merge pull request #75 from ayyoob/configConnectedCup 
few changes in connected cup to remove the dependent with the configu…
 2016-01-13 18:43:54 +05:30
ayyoob
31c745e8f2 few changes in connected cup to remove the dependent with the configuration file 2016-01-13 17:41:05 +05:30
charithag
0ce0c246da Fix minor bugs 2016-01-13 16:49:38 +05:30
charithag
a689182eac Fix minor bugs 2016-01-13 16:39:46 +05:30
Shabirmean
b769a4ac71 removed duplicate version entry 2016-01-13 16:02:05 +05:30
Ruwan
25fd183278 Merge pull request #72 from NuwanSameera/master 
connected-cup-agent modified
 2016-01-13 15:35:01 +05:30
NuwanSameera
06aecec053 connected-cup-agent modified 2016-01-13 15:34:00 +05:30
Ruwan
fe2ae62d56 Merge pull request #71 from menaka121/master 
publishedToDAS method changed
 2016-01-13 15:33:31 +05:30
Menaka Madushanka
37f22da494 publishedToDAS method changed 2016-01-13 15:30:50 +05:30
charithag
4a971476fb Fix minor bugs 2016-01-13 15:20:53 +05:30
Menaka Madushanka
1ac2dc9307 Issues fixed 2016-01-13 15:17:36 +05:30
Ruwan
54792872ef Merge pull request #69 from menaka121/master 
Issues fixed
 2016-01-13 15:17:25 +05:30
NuwanSameera
568199b507 connected cup agent added to samples 2016-01-13 14:45:28 +05:30
Shabirmean
ece55e1016 Small changes to the sample CoffeeCup sample 2016-01-13 11:35:33 +05:30
Menaka Madushanka
6179298d9f Connected cup device added 2016-01-13 11:11:55 +05:30
Menaka Madushanka
bc84be58ea Connected cup device added 2016-01-13 11:09:38 +05:30
Shabir Mohamed
10087d78c6 Revert "Updated the sample device-type "ConnectedCup"" 2016-01-12 22:46:45 +05:30
Shabirmean
5381fe3e6a Updated the sample device-type ""ConnectedCup 2016-01-12 22:32:27 +05:30
charithag
d29fce31b4 Use dependencies from P2 2016-01-12 14:11:03 +05:30
charithag
3201b2e112 Change zip archive name to wso2iots 2016-01-12 12:40:53 +05:30
charithag
d67ff8cd98 Removed IOS Mobile Plugin Management schema 2016-01-12 11:25:39 +05:30
ayyoob
2a30023d81 Merge pull request #61 from wso2-incubator/IoTS-1.0.0-M1 
added start up script
 2016-01-08 23:10:35 +05:30
ayyoob
754891e39a added start up script 2016-01-08 20:56:21 +05:30
Ace
03a05472c4 Adding andes patch 2016-01-08 12:05:42 +05:30
Ace
fad444510c Adding log fixes to spark core 2016-01-07 22:28:33 +05:30
Ace
a8ca6887f8 Adding fixes for DAS components to co-exist with MB components 2016-01-07 19:07:04 +05:30
Ace
82c0c226f9 Including mb features in pack 2016-01-06 10:51:21 +05:30
Ace
4752b12545 Integrating mb features to IotServer 2016-01-05 19:13:23 +05:30
Shabirmean
f29fa5e89e Force add the temporary jars relevant to DAS fix patches 2016-01-05 11:00:53 +05:30
Ruwan
337bdb3929 Merge pull request #59 from charithag/master 
Add device-types to configs
 2016-01-04 20:53:22 +05:30
charithag
b899f5c3a2 Add device-types to configs 2016-01-04 20:18:50 +05:30
Shabirmean
e01a7fe2d8 Moved DB Creation for Android and Windows to feature from product pom 2016-01-04 18:48:17 +05:30
Ace
94dcaa82d8 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-23 11:57:43 +05:30
Ace
ddf04e867e Changing gateway ports to http/https ports 2015-12-23 11:57:13 +05:30
Shabirmean
8bdf2910f9 removed duplicated copy tasks 2015-12-23 11:51:07 +05:30
Shabirmean
078c14f746 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-23 11:00:56 +05:30
Shabirmean
fea8e23da0 Removed device-DB creation from distribution pom and moved to bin.xml copy task 2015-12-23 11:00:44 +05:30
Ace
424dd7979f Adding white listed tag to apim config 2015-12-23 03:41:58 +05:30
Shabir Mohamed
b0f70a9b1b Revert "Added mb feature" 2015-12-22 16:29:25 +05:30
Shabirmean
f8e9356504 Revert "Merge pull request #55 from sdkottegoda/embed-messaging-feature" 
This reverts commit fd09122872, reversing
changes made to e340d88608.
 2015-12-22 16:27:56 +05:30
ayyoob
fd09122872 Merge pull request #55 from sdkottegoda/embed-messaging-feature 
Added mb feature
 2015-12-22 14:34:16 +05:30
sdkottegoda
1ee42cc94e Added mb feature 2015-12-22 14:27:13 +05:30
Shabirmean
98b6cfc487 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-22 12:30:43 +05:30
Shabirmean
d37d73fe36 Copying custom sequences directory from distribution 2015-12-22 12:30:33 +05:30
Sumedha Rubasinghe
15fe50a774 including copying pom.xml 2015-12-22 11:53:16 +05:30
Sumedha Rubasinghe
d4e66e9a93 initial version of connectedcup device type 2015-12-22 08:27:05 +05:30
Shabirmean
7681a7f6be Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-21 16:44:22 +05:30
charithag
eb88f7c1c6 Fix path error 2015-12-21 13:18:59 +05:30
charithag
959d275dca Override server startup script to overcome out of memory error 2015-12-21 13:17:36 +05:30
Shabirmean
40ea51d3bf Changed the source of the device-type datasources to copy from. 2015-12-21 11:54:31 +05:30
Shabirmean
19d0d2a116 Added device-type deployer xml to the pack 2015-12-18 14:29:28 +05:30
Shabirmean
e02a31f6ee Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-18 11:13:31 +05:30
Shabirmean
dc475b3542 Adding updated keystone file with default "RA" and "CA" certs 2015-12-18 11:13:18 +05:30
Ace
35b3cf8d35 Adding additional listener to read features 2015-12-17 19:52:45 +05:30
Shabirmean
b94f3b6bfa Added featureDefs and DBCreation for RPi and Arduino 2015-12-17 12:46:04 +05:30
GPrathap
7234544212 changed datasource name 2015-12-16 12:47:50 +05:30
GPrathap
ca47bf9844 added datasource description 2015-12-16 12:35:20 +05:30
Ace
75cdffb651 Adding device cloud grant type 2015-12-15 20:13:23 +05:30
Charitha Goonetilleke
e91b80cd16 Merge pull request #43 from NuwanSameera/master 
rename digitaldisplay to digital_display
 2015-12-15 17:00:48 +05:30
NuwanSameera
727ea9d5c1 rename digitaldisplay to digital_display 2015-12-15 12:22:57 +05:30
charithag
2a37c07ffa Fix h2 script path 2015-12-15 11:23:49 +05:30
Ace
2fd99fa85d Adding fix for API Store/Publisher login 2015-12-15 11:22:22 +05:30
Shabirmean
86675ecf92 removing virtual_firealarm datasource info from master-datasources xml 2015-12-14 19:37:21 +05:30
NuwanSameera
d9fc247bf4 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	modules/distribution/pom.xml
 2015-12-14 18:39:32 +05:30
NuwanSameera
72fef2a2cc Merge remote-tracking branch 'upstream/master' 
Conflicts:
	modules/distribution/pom.xml
 2015-12-14 18:35:09 +05:30
charithag
71a19d05c4 Fix api-store loggin issue 2015-12-14 18:26:05 +05:30
Charitha Goonetilleke
1b003a65c1 Merge pull request #39 from charithag/master 
Add db create script
 2015-12-14 17:50:58 +05:30
charithag
3a16839855 Add db create script 2015-12-14 17:09:51 +05:30
Shabirmean
727e6358d1 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-14 17:03:11 +05:30
Shabirmean
631d907613 Adding separate jaggery module "apimstore" to evade conflicts with the module used by APPM 2015-12-14 17:02:14 +05:30
sajithar
a9bc546253 changed bin.xml to exclude 'app-conf.json' from UUF and CDMF apps. 2015-12-14 15:33:26 +05:30
charithag
99b123bf74 Add jaggery conf from cdmf 2015-12-14 13:54:30 +05:30
NuwanSameera
8b0d0ad8b5 digital display database configurations 2015-12-14 13:00:25 +05:30
NuwanSameera
7416404307 pom file changes 2015-12-14 12:51:59 +05:30
charithag
c32caa6067 Copy cdmf related uuf contents from devicemgt-cdmf 2015-12-14 12:25:57 +05:30
Ace
5e7bbd6cb6 Fixing api manager store/publisher login issue 2015-12-14 10:25:08 +05:30
Shabirmean
e7c7ab0e50 Adding execution to rename api store and publisher context in site.son 2015-12-12 15:01:33 +05:30
Ace
7e0d384dc9 Copying api publisher/store feature to pack 2015-12-12 12:19:52 +05:30
charithag
a9dcd8cd21 Moved analytics toCDMF coomponents 2015-12-11 22:54:17 +05:30
Menaka Madushanka
9857e2f2b4 spark script for pressure 2015-12-11 15:30:34 +05:30
Menaka Madushanka
454b24db1f spark scripts for the other sensors + build.xml edited 2015-12-11 14:47:50 +05:30
Menaka Madushanka
88a09c8cab spark scripts for the other sensors + build.xml edited 2015-12-11 14:41:04 +05:30
Menaka Madushanka
194843c91a spark scripts for the other sensors 2015-12-11 14:27:40 +05:30
charithag
de857cfc6e Fix issue in script 2015-12-11 12:12:42 +05:30
menaka
b7661d286b DB schema for android sense and script change 2015-12-11 11:15:00 +05:30
menaka
3b9fe436c3 Merge remote-tracking branch 'origin/master' 
Conflicts:
	modules/distribution/pom.xml
 2015-12-11 11:13:48 +05:30
charithag
4dcd064f8b Use custom carbon xml and Add DAS portal jaggery app 2015-12-11 11:06:37 +05:30
menaka
75d4344f6c DB schema for android sense and script change 2015-12-11 11:02:20 +05:30
charithag
4b8662f58f Add required changes for android sense 2015-12-11 08:52:51 +05:30
menaka
47c4c17012 Android sense db added 2015-12-10 21:10:18 +05:30
charithag
f876abf3e4 Add carbonapps to deployment 2015-12-10 20:24:03 +05:30
Charitha Goonetilleke
0021029913 Merge pull request #1 from menaka121/master 
Changes for the android sense: Spark scripts and p2 profile changes
 2015-12-10 19:03:16 +05:30
charithag
c08aa706e6 Removed oltu patch since it is included in identity 5.0.3 2015-12-10 18:56:20 +05:30
charithag
ccf1af3ea4 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-10 18:45:36 +05:30
Menaka Madushanka
0076709626 Android sense feature added. 2015-12-10 16:54:23 +05:30
menaka
594bd03b84 Merge remote-tracking branch 'origin/master' 2015-12-10 15:04:14 +05:30
Ace
8cc653a788 bumping identity to 5.0.3 and other fixes 2015-12-10 14:31:01 +05:30
charithag
5b7fee6043 Excluded jaggery.conf in uuf-base app 2015-12-10 13:43:47 +05:30
NuwanSameera
e13ce2dc8a pom.xml modification for digital display 2015-12-10 12:37:12 +05:30
menaka
a91f75a34d Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-09 15:50:25 +05:30
Charitha Goonetilleke
6632cfc272 Merge pull request #27 from charithag/master 
Update console logo and removed asm-all_4.1.0.wso2v1.jar
 2015-12-08 23:21:39 +05:30
charithag
4f6dfac0fa Removed asm-all_4.1.0.wso2v1.jar from distribution and include mdm based app mgt feature from plugins 2015-12-08 23:19:39 +05:30
Shabirmean
865372f9e8 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-08 23:02:16 +05:30
Shabirmean
910b52db75 adding social dbscripts to product 2015-12-08 23:02:02 +05:30
charithag
c494db99e7 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-08 22:49:36 +05:30
Ace
1250743458 Adding changes to identity.xml to fix logging issue 2015-12-08 21:46:46 +05:30
Shabirmean
9ae9bcfb31 Removing duplicate analytics version, switched "data-bridge-config.xml' to be copied from feature 2015-12-08 15:02:43 +05:30
Shabirmean
63dcd1e04e Addidng SocialDB to distribution pom 2015-12-08 12:02:58 +05:30
Menaka Madushanka
309d38de72 Added the accelerometer script 2015-12-08 10:59:05 +05:30
menaka
1c0242fe7e Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-08 10:55:08 +05:30
Menaka Madushanka
efe53204c8 Added the accelerometer script 2015-12-08 10:54:05 +05:30
Shabirmean
85bc5bd201 Adding SocialDB creation execution to distribution pom 2015-12-07 23:46:44 +05:30
Shabirmean
d09128f482 excluding "appmoauth2.war" from the build 2015-12-07 18:53:32 +05:30
charithag
584ba63494 Update logo 2015-12-07 13:44:59 +05:30
Shabirmean
808771056c removing the common-api feature from the build 2015-12-07 13:41:45 +05:30
charithag
2c1efd1af0 Migrated to EMM based product 2015-12-05 14:05:35 +05:30
ayyoob
098547efaa removing unnecessary es store files 2015-11-30 00:28:47 +05:30
ayyoob
320f754356 resolved few started errors 2015-11-28 01:27:40 +05:30
charithag
247dfa9820 Migrated to CDMF with Generic UI 2015-11-27 11:10:37 +05:30
Shabirmean
cbdb4eaece removed unnecessary logs from the VirtualFIreAlarmService 2015-11-20 19:48:27 +05:30
Shabirmean
ec98c99894 Added complete SCEP implementation plus end to end encryption for VirtualFireAlarm 2015-11-20 19:04:28 +05:30
Shabirmean
af3e30fbc3 synced firealarm web.xml with virtual_firealarm web.xml 2015-11-17 13:34:39 +05:30
Shabirmean
d28a2bf4b3 Changes for the FireAlarmService to work with real device and SCEP service inclusions 2015-11-14 18:23:48 +05:30
Menaka Madushanka
c8e85ce0db resources.xml file added 2015-11-11 10:08:03 +05:30
Ace
f5f5356e35 Restructirng samples 2015-11-10 12:35:45 +05:30
Rasika Perera
29a0bf2fe2 fixing invalid relative paths in pom.xml 2015-11-03 11:38:14 +05:30
Rasika Perera
44f380c8e0 changes to the resources.xml 2015-11-03 11:30:00 +05:30
Rasika Perera
4c07301c8c upgrading carbon analytics versions 2015-11-03 11:23:38 +05:30
Ace
5a090d93df Adding property to pickup application name from web.xml 2015-10-31 15:12:43 +05:30
Charitha Goonetilleke
a337fefd8d Merge pull request #19 from charithag/master 
Add simple and advanced fire alarm agents
 2015-10-30 20:59:09 +05:30
Ace
1d2d57259b fixing some minor bugs 2015-10-30 19:43:13 +05:30
charithag
fe59fa9410 Add simple and advanced fire alarm agents 2015-10-30 14:23:51 +05:30
charithag
e8a0ccf6e3 Fire alarm changes done by Shabir 2015-10-25 22:49:49 +05:30
ayyoob
bf9bfd40b5 few changes after testing 2015-10-25 20:17:51 +05:30
ayyoob
a0ee671515 resolved errors on sample build and few changes on android service 2015-10-25 02:32:19 +05:30
ayyoob
e39ee91518 update version and few changes on android sense service 2015-10-24 21:20:56 +05:30
Rasika Perera
ec70dad7da refactoring 2015-10-23 12:34:19 +05:30
charithag
82740dec44 Revert pom changes to previous 2015-10-23 12:29:38 +05:30
Rasika Perera
b6156af241 refactoring 2015-10-23 11:16:32 +05:30
Rasika Perera
82f1f645fd resolving conflicts 2015-10-23 11:02:12 +05:30
Rasika Perera
6fabb28b1c migrating in memory sensor manager 2015-10-23 10:50:51 +05:30
Shabirmean
7664f73b4e Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 
Conflicts:
	modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/VirtualFireAlarmService.java
	modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/dao/DeviceRecord.java
	modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/dao/TemperatureRecord.java
	modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/dto/TemperatureRecord.java
	modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/util/DataHolder.java
 2015-10-23 10:30:36 +05:30
Shabirmean
5bf09ef1ed changed package from dao to dot 2015-10-23 10:21:24 +05:30
ayyoob
5625b83b64 added android sense service and required stream definitions 2015-10-23 07:42:29 +05:30
Rasika Perera
fb21dc8b72 Merge pull request #13 from rasika90/master 
Generalizing in memory map into any sensor reading
 2015-10-23 01:11:11 +05:30
Rasika Perera
e31fda92a6 generalizing inmemory map into any sensor 2015-10-23 01:04:55 +05:30
Rasika Perera
50e90fa8de generalizing inmemory map into any sensor 2015-10-23 01:04:32 +05:30
charithag
ae1f904082 Deploy firealarm-webapp with virtual-firealarm sample 2015-10-22 21:20:17 +05:30
charithag
16f1fc7d5e Remove duplicate portal jaggery app 2015-10-22 19:11:08 +05:30
charithag
e9dc4c9097 Add in memory hash table to hold last received temperature data 2015-10-22 17:49:10 +05:30
Shabirmean
bf5fad5409 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-10-22 12:31:37 +05:30
Shabirmean
e9d08faa6c added changes to publish data received via MQTT and XMPP 2015-10-22 12:31:28 +05:30
charithag
928dd66ae3 License updated 2015-10-22 07:52:19 +05:30
charithag
36bf7a529a Redirect user to the login page upon successful registration 2015-10-22 06:51:53 +05:30
charithag
306646c51d Change virtual device "Download" button text to "Create a Device". 2015-10-22 06:50:55 +05:30
charithag
08d2d9d6a7 Removed un used cdm dbscripts 2015-10-22 06:48:00 +05:30
Shabirmean
75b4e5ff27 changes to the VirtualFireAlarm service to send and receive XMPP,MQTT messages 2015-10-20 20:21:02 +05:30
ayyoob
ec47429127 few changes after testing 2015-10-16 18:30:19 +05:30
ayyoob
aa001675b3 Merge branch 'master' of https://github.com/wso2-incubator/product-device-cloud 2015-10-16 16:58:58 +05:30
ayyoob
2d2ab1cdf3 update the bin file 2015-10-16 16:58:51 +05:30
ayyoob
fd2e7c3ed2 DAS update 2015-10-16 16:58:39 +05:30
Shabirmean
ae05b84c79 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-10-16 16:27:49 +05:30
Shabirmean
a5df23b565 changed the terminal print text in the startup script of virtual_firealarm 2015-10-16 16:27:42 +05:30
charithag
e4f0cd3059 Fix sample deployment issue for samples except virtual fire alarm 2015-10-16 15:40:50 +05:30
ayyoob
cfd1497ecc Merge branch 'master' of https://github.com/wso2-incubator/product-device-cloud 2015-10-15 20:36:44 +05:30
Shabirmean
c37a97d7b4 removed hardcoded deviceName 2015-10-15 12:25:53 +05:30
Shabirmean
9070110818 added changes to receive customDeviceName from user and register device using this value 2015-10-15 12:21:04 +05:30
Shabirmean
38457554a5 changes to take in both https and http server endpoints 2015-10-14 23:50:50 +05:30
Shabir Mohamed
695571011c changed button label from "Download" to "Download Agent" 2015-10-14 23:28:15 +05:30
ayyoob
d4fc698b4f Merge branch 'master' of https://github.com/wso2-incubator/product-device-cloud 2015-10-14 22:38:25 +05:30
ayyoob
0cde75e8a1 changed DAS to SNAPSHOT version 2015-10-14 22:38:18 +05:30
Shabir Mohamed
90ad9802bc Merge branch 'build-pack' 2015-10-14 22:04:43 +05:30
charithag
f9dff1b0ed Virtual firealarm icon updated 2015-10-14 20:28:31 +05:30
Shabir Mohamed
69dcf064f9 merged conflicts with the changes of combining the device controller 
and the manager together
 2015-10-13 15:33:32 +05:30
Shabir Mohamed
c13e5ac620 Added MQTT-Subscriber and XMPP-Connector for the virtual_firealarm 
deviceType
 2015-10-13 13:28:26 +05:30
charithag
76de89bd05 Add components necessory to work with internal APIM 2015-10-13 00:46:26 +05:30
ayyoob
ecd8c75660 few changes to resolve the error on matt 2015-10-12 19:42:50 +05:30
ayyoob
183d53eea6 Merge branch 'build-pack' of https://github.com/wso2-incubator/product-device-cloud into build-pack 2015-10-12 13:13:20 +05:30
charithag
4d5b6d8bff Fix certificate issue in FireAlarmVirtualAgent for mac 2015-10-12 13:04:31 +05:30
ayyoob
388af5f248 merged with upstream 2015-10-12 11:56:22 +05:30
ayyoob
08c518c0c2 added api managed on virtual fire alarm and few changes on internal api 2015-10-12 11:37:24 +05:30
charithag
454a403a22 Merge remote-tracking branch 'upstream/build-pack' into build-pack 2015-10-12 11:12:20 +05:30
Shabir Mohamed
85ed06e12a merge conflicts with build-pack branch 2015-10-12 11:01:37 +05:30
Shabir Mohamed
45c0d9bc03 added XMPPClient and MQTTClient for receiving incoming messages 2015-10-12 10:46:04 +05:30
Rasika Perera
d384942f69 adding policy monitor service for firealarm 2015-10-12 08:12:52 +05:30
charithag
cfcc69b6fc Fix issue with cnnecting remote APIM 2015-10-12 01:18:30 +05:30
charithag
b63c062eb8 Include virtual agent to pack by default 2015-10-11 20:33:04 +05:30
charithag
a73cf7213d Set to build firealarm virtual agent from source in git 2015-10-11 20:32:47 +05:30
Shabir Mohamed
f8dca4dd8f changed firealarm thumbnail 2015-10-11 18:14:13 +05:30
Shabir Mohamed
a47232c8e1 changed deviceType to “firealarm” to obtain APIMToken and updated Agent 
jar/startup script
 2015-10-11 17:29:54 +05:30
Shabir Mohamed
13792a56a4 added new deviceType VirtualAgent 2015-10-11 16:09:58 +05:30
Shabir Mohamed
5d0f0c9a42 small corrections with firealarm sample 2015-10-11 15:37:03 +05:30
Shabir Mohamed
e7bf722c48 removing unnecessary util code 2015-10-10 09:59:54 +05:30
Shabir Mohamed
5d17940da4 added changes for the firealarmagent download 2015-10-09 19:41:20 +05:30
Ace
9e010dacba Fixing issue when building samples inside the pack 2015-10-09 14:05:30 +05:30
charithag
4c64456b36 Add ES themed login page 2015-10-08 14:19:56 +05:30
Ace
933b01a4f8 Adding fix for MT issue and missing config files 2015-10-08 11:47:40 +05:30
Ace
57da4fb9c4 changing bin.xml to fix duplicate files in pack 2015-10-07 12:21:16 +05:30
charithag
b4e9b84536 Fix build issue in samples 2015-10-06 11:20:19 +05:30
charithag
3045bc068a Fix enrolling exception in raspberry pi device type 2015-10-05 15:29:36 +05:30
charithag
b525895ac2 Fix sso-idp-config issue 2015-10-05 12:01:28 +05:30
ayyoob
b7daf92ada Integrated DAS for stat 2015-10-05 03:13:54 +05:30
charithag
20b5469e2a Fixed raspberry icon 2015-10-04 21:27:41 +05:30
charithag
864ee63807 Fix sso issue and copy sso-idp-configs.xml from src/repository to pack 2015-10-04 19:55:28 +05:30
ayyoob
a2ffaf170d updated jaggery version and added ES IDP configs 2015-10-04 01:50:27 +05:30
ayyoob
e6d9cb82af merged with upstream 2015-10-01 16:47:37 +05:30
ayyoob
ca11c630ad APIM, Store, DAS features merged to one pack 2015-10-01 16:10:10 +05:30
ayyoob
09285aea5e resolved build issues 2015-09-24 12:07:25 +05:30
Rasika Perera
6d856ae975 fixing samples images not showing issue 2015-09-24 11:21:18 +05:30
charithag
4631df2770 Merge remote-tracking branch 'origin/master' 2015-09-23 11:58:55 +05:30
charithag
8797dc4e1b Temporary fix for build break due to analytics lite feature dependency until Ayyob commits his changes 2015-09-23 11:58:41 +05:30
ayyoob
d08d7cb048 added analytics commons data publisher and used dal layer to capture the data 2015-09-22 19:23:06 +05:30
Shabir Mohamed
a47776405b samples’ names changed to match with that of CDMF-types 2015-09-22 13:23:59 +05:30
Shabir Mohamed
4ccc8b58c5 changes to enable default samples with the new deviceType txt 2015-09-22 11:24:28 +05:30
Rasika Perera
83d8acffe8 removing excludes on jaggery app copy 2015-09-16 18:36:42 +05:30
Rasika Perera
034d1993fc moving jaggery apps to device-cloud 2015-09-16 16:57:44 +05:30
Rasika Perera
b4b279bf13 moving jaggery apps to device-cloud 2015-09-16 16:56:15 +05:30
Rasika Perera
375731422c moving jaggery apps to device-cloud 2015-09-16 16:40:57 +05:30
charithag
3766bbec06 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	modules/distribution/src/assembly/bin.xml
 2015-09-16 16:09:44 +05:30
charithag
220b25a4ef Update with device-cloud changes 2015-09-16 16:08:39 +05:30
Rasika Perera
af259ef021 adding deviceType.rxt and adding few extensions 2015-09-16 14:06:03 +05:30
charithag
115f4ce0ea Move publisher to jaggeryapps 2015-09-15 14:01:20 +05:30
charithag
9ecf406252 Update poms with CDMF upstream merge 2015-09-15 13:35:01 +05:30
ayyoob
e10ce13532 Merge branch 'master' of https://github.com/ayyoob/product-device-cloud 2015-09-13 19:32:20 +05:30
ayyoob
d9701885b9 added das features 2015-09-13 19:30:52 +05:30
charithag
6ff453e213 Secure stats-api and analytics page 2015-09-12 02:22:29 +05:30
charithag
2fe3f14b55 Fix for new exception occured with latest CDMF changes 2015-09-12 02:21:14 +05:30
Shabir Mohamed
a9ee964a07 Added changes required to initialise sample devices 2015-09-11 16:17:13 +05:30
charithag
077e7925eb Add analytics components to store 2015-09-10 16:06:39 +05:30
charithag
6732d7b642 Update carbon store version 2015-09-09 11:37:17 +05:30
charithag
c06d7184ca Merge remote-tracking branch 'origin/es-integration' into es-integration 2015-09-08 18:15:18 +05:30
charithag
dcf8816b2e Add enterprise store feature 2015-09-08 18:15:07 +05:30
ayyoob
19d28606b8 Added analytics config files 2015-09-08 16:41:09 +05:30
charithag
31d337126f Bump carbon store version and made other version changes accordingly 2015-09-08 15:13:07 +05:30
ayyoob
8597299bba Added files to cater apim component activation 2015-09-08 12:08:45 +05:30
ayyoob
f3c807d5e2 few changes on apim features 2015-09-07 11:16:19 +05:30
charithag
888bdb8873 Update sample distributions to add datasource definitions directly to master-datasources.xml 2015-09-02 17:00:45 +05:30
charithag
6893ea0d0d Add ES features to pack. 
Known issue: apim dependencies are not satisfying. Waiting for apim fix
 2015-09-02 16:59:40 +05:30
charithag
45881b32ee Add sample build verification to integration testing 2015-09-01 14:13:38 +05:30
charithag
d7b18057df Remove target folders from integration 2015-09-01 11:47:22 +05:30
charithag
4daca74038 Removed custom launch configurations to fix oauth2 class not found issue. Copied launch configurations from carbon kernel 2015-08-26 17:29:56 +05:30
charithag
0ed24f4c88 Add app context path to urls 2015-08-24 11:01:14 +05:30
charithag
11a4966f1b Fix sample build brake 2015-08-24 11:00:24 +05:30
ayyoob
f26423bec3 added multi-tenancy features 2015-08-22 22:19:54 +05:30
ayyoob
1796db2807 few changes after tenant changes 2015-08-21 18:10:57 +05:30
charithag
61af9dc01f Merge remote-tracking branch 'origin/master' 2015-08-20 19:35:19 +05:30
charithag
1eb60aa8c5 Change to comply with JAX-RS update 2015-08-20 19:35:09 +05:30
ayyoob
35f8db90e1 DAS capp - Analytics 2015-08-20 17:34:05 +05:30
Shabir Mohamed
0c6bc2e400 changes to implement XMPP communication 2015-08-20 15:05:27 +05:30
charithag
570a8ba0ba Change paths to comply with JAX-RS update 2015-08-20 12:20:25 +05:30
charithag
0a99923d4a Modify permission resource ids for groups 2015-08-19 19:16:03 +05:30
Shabir Mohamed
89081a9a64 added changes to the xmppServer.py in the zip 2015-08-19 15:51:34 +05:30
Shabir Mohamed
43d46cfcdd changes to the xmpp_client.py 2015-08-19 12:57:41 +05:30
Shabir Mohamed
7915836dd0 Added Server-EP to deviceConfigs.cfg 2015-08-19 11:56:28 +05:30
charithag
c63257785b Change with Rich group object 2015-08-15 13:30:07 +05:30
charithag
d92205db42 Move device pages to samples 2015-08-14 13:48:19 +05:30
charithag
d0b041af99 Move device pages to samples 2015-08-14 13:48:01 +05:30
charithag
25e27cc6ca Convert add group option to separate page. 2015-08-14 12:30:53 +05:30
charithag
b404c29a98 Fix name of sensebot db 2015-08-14 11:07:01 +05:30
ayyoob
b9c340eb30 removed tmp files 2015-08-14 09:41:18 +05:30
ayyoob
78e4545ced removed dependencies 2015-08-14 04:13:30 +05:30
ayyoob
ba1c6f5c88 renamed to IoT Server 2015-08-14 02:43:35 +05:30
ayyoob
2b34b7e7af update on dependencies 2015-08-14 02:38:10 +05:30
charithag
d1db123a3f Update build scripts for samples 2015-08-13 15:54:04 +05:30
ayyoob
81507dc231 Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud 
add sample poms
 2015-08-13 14:57:02 +05:30
ayyoob
a71c74fe12 added sample pons 2015-08-13 14:51:38 +05:30
charithag
e642a2634e Add sample src build 2015-08-13 13:48:22 +05:30
ayyoob
9ee4a09057 added sample pom with relative system path 2015-08-13 12:32:26 +05:30
charithag
af6c8b0a25 Add xmltask.jar 2015-08-13 12:04:18 +05:30
ayyoob
e5972d1a03 refactored package and removed unused dependency 2015-08-13 01:50:42 +05:30
charithag
7d44f2ae19 Disable arduino and raspberry build files in samples 2015-08-12 18:08:45 +05:30
charithag
e7db5a1d82 Set to deploy arduino and raspberrypi samples automatically to distribution 2015-08-12 17:44:42 +05:30
charithag
b6bc365bc5 Commented out exclude instruction for pom files 2015-08-12 16:11:50 +05:30
charithag
fea2d5756e Add iot-configs from samples 2015-08-12 15:31:08 +05:30
charithag
1dab745cfe Merge remote-tracking branch 'origin/master' 2015-08-12 12:31:06 +05:30
charithag
786cb19eb3 Add db creation from sql script for samples 2015-08-12 12:30:53 +05:30
ayyoob
feab815ad8 added cdmf extension features 2015-08-12 11:19:06 +05:30
ayyoob
e444d60d1c added samples source 2015-08-12 01:06:48 +05:30
charithag
5384c8ef0a Convert existing device types to samples 2015-08-11 18:34:33 +05:30
charithag
7e11475bb5 Change icons 2015-08-11 10:51:23 +05:30
charithag
807e16d6b3 Fix bug in stats listing 2015-08-07 20:43:49 +05:30
charithag
9cdba70f72 Merge remote-tracking branch 'origin/master' 2015-08-07 19:50:22 +05:30
charithag
1b64596953 Fix scaling bug 2015-08-07 19:50:07 +05:30
ayyoob
554e146be6 remove tmp files 2015-08-07 18:57:39 +05:30
Rasika Perera
86bf7cf31d Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud 2015-08-07 18:41:24 +05:30
Rasika Perera
ade05d7cda fixing events stats 2015-08-07 18:41:12 +05:30
Ace
e16bf62019 Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud 2015-08-07 18:35:26 +05:30
Ace
b47af54057 Adding script to persist bulb status data 2015-08-07 18:34:52 +05:30
Rasika Perera
cdf1fa4d20 changes to dashboard 2015-08-07 15:55:25 +05:30
Rasika Perera
dfed7671bf refactoring events api 2015-08-07 15:49:22 +05:30
Rasika Perera
42a04c2660 fixing issues in events api 2015-08-07 15:41:41 +05:30
charithag
91ab732dba Set trigger to display add group popup 2015-08-07 15:20:23 +05:30
charithag
9f99e6e4da Add data simulation as comment 2015-08-07 15:06:11 +05:30
Rasika Perera
6b613034bd Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud 2015-08-07 15:04:19 +05:30
Rasika Perera
d29d63a915 few changes 2015-08-07 15:04:14 +05:30
charithag
f4b974ea52 Add data simulation 2015-08-07 15:02:49 +05:30
charithag
edc4b1766f Few fixes 2015-08-07 15:00:23 +05:30
Rasika Perera
08e30b1efb moving events into page 2015-08-07 14:49:54 +05:30
charithag
fbaa9a2e2f Complete device event stream client side 2015-08-07 13:43:17 +05:30
charithag
919f9b40e9 Merge remote-tracking branch 'origin/master' 2015-08-07 13:12:08 +05:30
charithag
c9b9270407 Add skeletons for device data stream 2015-08-07 13:11:22 +05:30
Rasika Perera
27fe846189 fixing group links 2015-08-07 13:02:14 +05:30
Rasika Perera
76883bc065 changing footer url 2015-08-07 13:01:59 +05:30
Rasika Perera
29a96847b9 minor ui changes 2015-08-07 12:31:00 +05:30
Rasika Perera
2cec2aba3f Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud 2015-08-07 12:30:33 +05:30
Rasika Perera
7ac755a33f adding group tile 2015-08-07 12:30:20 +05:30
Shabir Mohamed
b341abb707 added changes to the agent 2015-08-07 12:03:03 +05:30
charithag
9a49bd4786 Merge remote-tracking branch 'origin/master' 2015-08-07 11:30:38 +05:30
charithag
b074589587 Fix divice listing issue 2015-08-07 11:30:22 +05:30
Rasika Perera
29001aca93 minor ui changes 2015-08-07 11:17:42 +05:30
Rasika Perera
864ee109a5 adding policy owner parameter 2015-08-07 11:17:25 +05:30
Shabir Mohamed
74958fd4bc committed working device set 2015-08-06 18:59:27 +05:30
charithag
40e3234d5b Change analytics icon 2015-08-06 18:59:03 +05:30
charithag
995732bd5f Add commented stats emulation to test analytics 2015-08-06 18:48:20 +05:30
charithag
8f2c5aa9e7 Improve UI 2015-08-06 18:44:09 +05:30
charithag
7bf94fab00 Add grouping functionality to device listing 2015-08-06 18:15:38 +05:30
Rasika Perera
684d66f3f7 Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud 2015-08-06 18:09:26 +05:30
Rasika Perera
84d65380cf changing dashboard icon 2015-08-06 18:09:11 +05:30
Shabir Mohamed
90a5e0ca5b changes to the RaspberryStats agent 2015-08-06 17:47:13 +05:30
charithag
ec9e54a3b3 Show group or device name in analytics 2015-08-06 17:02:20 +05:30
charithag
7481505342 Complete dashboard functionality 2015-08-06 16:40:08 +05:30
charithag
d46e52c256 Remove unnecessary libraries 2015-08-06 15:29:22 +05:30
charithag
a7104d6437 Set grid view option to be selected 2015-08-06 12:35:21 +05:30
charithag
2be17aaa8d Add navigation options to groups and devices. Fix navigation UX issues in appbar 2015-08-06 12:09:35 +05:30
charithag
b7780e1742 Add groups in device list 2015-08-05 19:47:50 +05:30
charithag
dbe107e538 Fix log issue in RaspberryAgent 2015-08-05 19:47:23 +05:30
charithag
f5976c3fb2 Fix UX issue in group buttons 2015-08-05 14:39:05 +05:30
charithag
ee443c8ef4 Set y axis to auto scale 2015-08-05 14:38:17 +05:30
charithag
5e32ffaec4 Fix bug in bar graph 2015-08-05 13:34:26 +05:30
charithag
5061d0e7c8 Remove unnecessary css from analytics unit 2015-08-05 12:56:37 +05:30
charithag
f617f3c57b Add data summerization and reduce maximum stats range to 48 hours 2015-08-05 12:55:50 +05:30
charithag
26032a4aa2 Fix malfunction in graph slider 2015-08-04 18:09:12 +05:30
charithag
e9f0527ccf Fix time value issue in x axis 2015-08-04 17:51:56 +05:30
charithag
f278ac3266 Fix script bug in stats display 2015-08-04 16:51:33 +05:30
charithag
10a0881bf9 Update FireAlarm agent 2015-08-04 15:23:30 +05:30
Shabir Mohamed
a9610a0d46 added latest startupscript 2015-08-04 14:53:48 +05:30
Shabir Mohamed
128791af39 added the raspi-alarm scripts 2015-08-04 14:16:58 +05:30
charithag
aac8923fa2 Add graph legend 2015-08-03 18:42:09 +05:30
charithag
b631810d79 Display statistics for grouped devices 2015-08-03 17:34:23 +05:30
Rasika Perera
e86d6e43ab updating mqtt client 2015-07-27 18:55:57 +05:30
Rasika Perera
d01a099736 changing mqtt server ip 2015-07-27 18:26:43 +05:30
Rasika Perera
cc18fb9285 removing unneccessary logs 2015-07-27 17:37:26 +05:30
Rasika Perera
6ea6551ada fixing adding new policy not shown error 2015-07-27 17:29:52 +05:30
Rasika Perera
dadf913a83 Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud 2015-07-27 17:02:11 +05:30
Rasika Perera
d6abb3fdd7 fixing policy errors 2015-07-27 16:57:33 +05:30
Rasika Perera
43a756d851 adding policies 2015-07-27 16:48:26 +05:30
charithag
117ed175c3 Fix issue in navigating to group details page 2015-07-27 15:59:29 +05:30
Rasika Perera
2b9ebf1e2f changing policy holder values in login form 2015-07-27 15:25:26 +05:30
charithag
f04cb206b6 Add policies to extended search 2015-07-27 12:21:41 +05:30
charithag
9419c935ca Add policies to extended search 2015-07-27 12:20:56 +05:30
charithag
055ae43007 Add policies to extended search 2015-07-27 12:19:55 +05:30
charithag
d7c6c083a0 Add Sonar graph to analytics. Fix undefined content issue in device details 2015-07-27 11:59:50 +05:30
Rasika Perera
019f077ea4 fixing jaggery app performance issue 2015-07-27 11:46:27 +05:30
Rasika Perera
68ced07235 Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud 2015-07-27 10:42:40 +05:30
Rasika Perera
c7b3161231 adding policies 2015-07-27 10:42:23 +05:30
Rasika Perera
987c35fecc adding temporary mqtt client jar deployment 2015-07-27 10:31:15 +05:30
charithag
751dfb1bcf Avoid page reloading 2015-07-27 10:21:52 +05:30
charithag
ef3b196674 Completed device association with groups 2015-07-26 11:08:02 +05:30
charithag
91c2c8d959 Merge remote-tracking branch 'upstream/master' 2015-07-26 11:07:14 +05:30
Rasika Perera
59df602f6b adding policy creation 2015-07-26 09:21:34 +05:30
charithag
665e88acfb Completed group sharing 2015-07-26 09:05:21 +05:30
charithag
2f6e195f95 Merge remote-tracking branch 'upstream/master' 2015-07-26 06:49:14 +05:30
Rasika Perera
f64ff853d0 improve user listing method 2015-07-26 04:13:40 +05:30
Rasika Perera
a726beb345 Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud 2015-07-26 04:06:33 +05:30
Rasika Perera
65fda67af1 fixing error in policy listing module 2015-07-26 04:06:12 +05:30
Rasika Perera
11da6b4c28 fixing error in get users 2015-07-26 04:04:20 +05:30
ayyoob
81cd1f9ece user api conflict resolved 2015-07-26 02:18:32 +05:30
charithag
3bdbb2d9b1 Merge remote-tracking branch 'upstream/master' 2015-07-25 21:38:19 +05:30
charithag
e473946547 Add group details page 2015-07-25 21:37:43 +05:30
Rasika Perera
166236f46a removing cdmf user core dependencies 2015-07-25 20:51:03 +05:30
Rasika Perera
daeccc4410 removing manual dropins 2015-07-25 20:50:22 +05:30
charithag
70dd0203b5 Merge remote-tracking branch 'upstream/master' 2015-07-25 10:51:25 +05:30
Rasika Perera
ecacf33c69 improving performance and re-adding cdmf.user.core 2015-07-25 10:50:22 +05:30
charithag
09a6f99c89 Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	modules/distribution/src/repository/jaggeryapps/iotserver/api/user-api.jag
 2015-07-25 10:27:54 +05:30
charithag
b59a2e22de Group module completed without sharing 2015-07-25 10:25:52 +05:30
Rasika Perera
c478db455f restoring previous errornous jaggery app 2015-07-25 09:33:52 +05:30
Rasika Perera
77eb089e2a changes 2015-07-25 01:37:03 +05:30
Rasika Perera
554d5a1acb merged conflicts 2015-07-25 01:34:14 +05:30
Rasika Perera
bfab890abd adding old jaggery app 2015-07-25 01:31:43 +05:30
charithag
00122dc921 Merge remote-tracking branch 'upstream/master' 2015-07-24 23:07:55 +05:30
charithag
e27279a83b Fix bugs in unified framework 2015-07-24 23:07:04 +05:30
charithag
35aaffd7e0 Commit before unified framework changes [Unstable] 2015-07-24 22:59:29 +05:30
ayyoob
8d5451c589 added roles 2015-07-24 16:35:26 +05:30
charithag
4ee7427ec1 Merge remote-tracking branch 'upstream/master' 2015-07-24 15:58:32 +05:30
Rasika Perera
0b5c1b3bc6 adding policies 2015-07-24 15:43:26 +05:30
charithag
1a91687e06 Merge remote-tracking branch 'upstream/master' 2015-07-23 22:43:24 +05:30
Rasika Perera
f3648800bc Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud 2015-07-23 22:42:47 +05:30
Rasika Perera
ca0cf8d6cd fixing user management issue 2015-07-23 22:36:29 +05:30
charithag
92bcaef0fc Add permissions required to grouping 2015-07-23 22:33:44 +05:30
charithag
f507be159c Merge remote-tracking branch 'upstream/master' 2015-07-23 22:14:43 +05:30
Shabir Mohamed
9ee807d783 Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud 2015-07-23 19:46:27 +05:30
Shabir Mohamed
ced4a6fbdf added xmpp and mqtt configs to file 2015-07-23 19:46:15 +05:30
Rasika Perera
954341a90a adding xmpp script 2015-07-23 17:01:46 +05:30
Rasika Perera
201ff62664 fixing getowner() according to cdmf device object refactoring 2015-07-23 16:01:07 +05:30
charithag
52e0b66b58 Merge remote-tracking branch 'upstream/master' 2015-07-23 15:35:08 +05:30
ayyoob
e055e79ea4 api publisher config removed 2015-07-23 15:13:55 +05:30
Rasika Perera
47a06249bf fix changes for usermanager osgi service retrieve 2015-07-23 13:00:59 +05:30
charithag
30df14b284 Add permissions required to grouping 2015-07-23 12:36:58 +05:30
charithag
54a4bc4961 Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	modules/p2-profile-gen/pom.xml
 2015-07-23 10:09:17 +05:30
ayyoob
1d45022ec6 removed user.core.manager 2015-07-23 00:24:42 +05:30
charithag
c32d4a97df Merge remote-tracking branch 'upstream/master' 2015-07-22 18:43:33 +05:30
ayyoob
15d2b01c01 few changes 2015-07-22 18:40:34 +05:30
Shabir Mohamed
04e4be51a2 added mqtt support for sending device controls 2015-07-22 17:59:35 +05:30
ayyoob
5b5df161fc few changes after test 2015-07-22 11:10:37 +05:30
Rasika Perera
3740712d96 Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud 2015-07-21 16:53:09 +05:30
Rasika Perera
1b58491680 fixing fuse.jag issue on windows 2015-07-21 16:46:40 +05:30
charithag
2e752c61d9 Graph time will automatically set to current time when user tried to change graph duration 2015-07-21 16:29:43 +05:30
charithag
796bbdf7f5 Add CPU temperature graph to analysis 2015-07-21 13:36:02 +05:30
Rasika Perera
eae80dd834 changes to jaggery app, sketch 2015-07-21 12:37:53 +05:30
ayyoob
813f67c44a changed analytics 2015-07-21 06:09:06 +05:30
charithag
b2eb1f9b44 Fixed issue with bundle export 2015-07-20 15:26:59 +05:30
ayyoob
5886952eb5 removed iot 2015-07-17 17:34:23 +05:30
Rasika Perera
669e1d0599 fixing jaggery app performance issue 2015-07-17 17:31:23 +05:30
ayyoob
5fd7fbb273 added schema validator 2015-07-12 22:05:22 +05:30
ayyoob
a91dd73b90 bam and analytics corrections 2015-07-12 04:10:59 +05:30
charithag
64b1d81da7 Merge branch 'master' of https://github.com/wso1-dev/product-device-cloud 2015-07-06 17:54:41 +05:30
charithag
e336c4f9f2 Add sensor types for CPU Load and RAM Usage 2015-07-06 17:53:47 +05:30
Rasika
15534b789f adding changes 2015-07-06 17:43:18 +05:30
Rasika
f435d6d1b4 fixing errors 2015-07-06 13:58:41 +05:30
charithag
d04f8a22b7 Filter analytics according to device types 2015-07-06 13:18:39 +05:30
charithag
4bd39ed385 Fix analytics js and css issue 2015-07-06 12:41:52 +05:30
Rasika
db8d7985bc adding iotserver 2015-07-06 11:41:38 +05:30
Rasika
0da2c1dd74 Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud 2015-07-06 11:39:32 +05:30
Rasika
21e10c2bb2 adding iotserver 2015-07-06 11:39:19 +05:30
ayyoob
f45a8500ab few changes 2015-07-06 04:53:29 +05:30
Rasika
7388502ac2 fixing sketch property file issue 2015-07-06 00:13:40 +05:30
ayyoob
202c6b61f9 few fixes 2015-07-06 00:03:46 +05:30
ayyoob
4eef5c0a3e added access & refresh token generation 2015-07-05 06:21:25 +05:30
charithag
e2eafa1320 Add statistic selection options with updated date range picker 2015-07-03 20:40:31 +05:30
charithag
62467ac564 Add graph capability to resize according to window size. 2015-07-03 18:02:35 +05:30
charithag
9af5baef1b Updated device statistic graphs 2015-07-03 17:31:55 +05:30
ayyoob
0b9e14ddb3 login redirection resolved 2015-07-02 17:09:21 +05:30
ayyoob
c50c7b36dc Few changes on Android Sense 2015-06-29 13:35:23 +05:30
Rasika
98dde99da1 Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud 2015-06-23 16:24:37 +05:30
Rasika
9cd77d88a0 adding organized units 2015-06-23 16:24:17 +05:30
ayyoob
f8d7d9796e few changes 2015-06-22 12:13:17 +05:30
ayyoob
cc4098adbb few changes 2015-06-22 11:26:07 +05:30
ayyoob
ee3d545b9d android device type added 2015-06-21 22:43:13 +05:30
ayyoob
add5a8cfd9 Few changes 2015-06-21 00:38:44 +05:30
ayyoob
bbd09ae509 Few tweaks on fire alarm, arduino and sensebot after testing 2015-06-21 00:38:28 +05:30
Shabir Mohamed
92358c4135 added new firealarm sketch 2015-06-18 17:26:17 +05:30
ayyoob
3ceed63107 Few changes for graph display 2015-06-17 18:12:48 +05:30
ayyoob
07bae69062 Android Device Type Updated 2015-06-17 00:59:26 +05:30
ayyoob
be5e12deb9 change on arduino jaggery 2015-06-16 23:05:14 +05:30
Shabir Mohamed
c4bd0ec88d re-enabled watch-dog timer reset in sensebot code 2015-06-15 10:47:45 +05:30
Shabir Mohamed
036bec9888 commented out the watch_dog library stuff 2015-06-12 00:48:19 +05:30
Shabir Mohamed
3e43767efe increased content length to enable APIM support 2015-06-11 10:53:07 +05:30
ayyoob
8a8b9e6ae1 update 2015-06-11 01:46:49 +05:30
ayyoob
7ea36598c5 db update 2015-06-11 01:30:54 +05:30
ayyoob
635161d8f5 added arduino device type 2015-06-10 22:29:59 +05:30
ayyoob
a39e79fe96 sketch corrections 2015-06-10 06:04:55 +05:30
Shabir Mohamed
5e94332a50 added agent for device type sensebot 2015-06-10 00:49:03 +05:30
Rasika
dd138ebad5 change user api 2015-06-10 00:02:21 +05:30
Rasika
8454bb2ea7 changing user api 2015-06-09 23:41:46 +05:30
Rasika
142b5b4a4b adding statistics to any device 2015-06-09 21:30:42 +05:30
ayyoob
f1bc4007d2 API manager roles added 2015-06-09 20:35:55 +05:30
Rasika
7b03db48ed jaggery app changes 2015-06-09 20:21:48 +05:30
Rasika
a1b80d0b3c removing sensebot jaggery app 2015-06-09 16:02:00 +05:30
ayyoob
2ca214975c few changes to resolve the error on bam config 2015-06-09 12:20:37 +05:30
ayyoob
468d3284c8 change digital display db name 2015-06-08 22:50:51 +05:30
ayyoob
a51990351e Added device types - Digital Display, Sensebot, Raspberrypi 2015-06-08 01:42:55 +05:30
ayyoob
e857a7aa5d Refactor 2015-06-07 19:37:25 +05:30
Rasika
06f21466de adding changes 2015-06-06 22:50:51 +05:30
Rasika
ae3a134f87 service api changes 2015-06-06 22:44:25 +05:30
ayyoob
52200f68e0 Refactor product device cloud 2015-06-06 00:30:57 +05:30
ayyoob
bf6b4bcb31 refactored 2015-06-05 19:06:29 +05:30
Rasika
2b2ce0f35b fixing hanging on list all devices 2015-06-03 18:19:24 +05:30
Rasika
1b5e29a5a5 removing unneccessary files 2015-06-03 18:17:31 +05:30
Rasika
3b4b2969ca adding zipfilename to sketch property file 2015-06-03 13:01:18 +05:30
Rasika
7cbcf3892e removing sample devices 2015-06-03 12:27:50 +05:30
Rasika
16590ba5b0 chaging default text 2015-06-02 14:33:16 +05:30
Rasika
0fb4af8a42 commenting out LDR grapghs 2015-06-01 18:52:30 +05:30
Rasika
b009287929 adding sensebot app 2015-06-01 18:13:17 +05:30