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
947 Commits 10 Branches 83 Tags 214 MiB
c68df4d3a2
Commit Graph

204 Commits

Author SHA1 Message Date
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
NuwanSameera
ee250d25c5 Add permissions.xml to connected-cup device type. 2016-03-11 19:16:09 +05:30
charithag
706002b4d5 Fix for https://wso2.org/jira/browse/IOTS-77 2016-03-10 19:25:50 +05:30
Menaka Madushanka
b930301819 Merge remote-tracking branch 'origin/master' 2016-03-10 15:06:04 +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
Shabirmean
8206dc0f92 Added the doormanager-icon.png 2016-03-07 09:11:35 +05:30
charithag
6c7041dcda Add ESP8266 based fire alarm sample 2016-03-04 10:59:33 +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
GPrathap
4c2eeb4b2a Fix for JIRA IOTS-80 2016-02-25 23:52:21 +05:30
Menaka Madushanka
57f91949a3 Code formatting and fixes 2016-02-25 14:21:24 +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
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
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
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
Shabirmean
9ef829536e Upgraded Paho-MQTT version to latest v1.0.2 2016-01-22 18:49:33 +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
Sumedha Rubasinghe
d4e66e9a93 initial version of connectedcup device type 2015-12-22 08:27:05 +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
charithag
2c1efd1af0 Migrated to EMM based product 2015-12-05 14:05:35 +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
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