419 Commits (66e4d99b57313fd45d47c8afa51854de06923a22)

 

All Branches   

Search

Author	SHA1	Message	Date
Shabir Mohamed	66e4d99b57	Merge pull request #25 from Shabirmean/master ... [MERGED from Shabir] Added SCEP Implementation for VirtualFireAlarm Sample with end to end encryption	9 years ago
Shabirmean	cbdb4eaece	removed unnecessary logs from the VirtualFIreAlarmService	9 years ago
Shabirmean	ec98c99894	Added complete SCEP implementation plus end to end encryption for VirtualFireAlarm	9 years ago
Shabirmean	af3e30fbc3	synced firealarm web.xml with virtual_firealarm web.xml	9 years ago
Shabirmean	d28a2bf4b3	Changes for the FireAlarmService to work with real device and SCEP service inclusions	9 years ago
Ruwan	3c2a84a07d	Merge pull request #23 from menaka121/master ... resources.xml file	9 years ago
Menaka Madushanka	c8e85ce0db	resources.xml file added	9 years ago
Ace	f5f5356e35	Restructirng samples	9 years ago
Rasika Perera	e8db03bf60	Merge pull request #22 from rasika90/master ... carbon analytics version bump	9 years ago
Rasika Perera	166d9ab2cb	Merge branch 'master' of https://github.com/rasika90/product-iot-server	9 years ago
Rasika Perera	6bd654f1f3	carbon analytics version bump	9 years ago
Rasika Perera	07d71b834d	Merge pull request #21 from rasika90/master ... fixing invalid relative paths in pom.xml	9 years ago
Rasika Perera	29a0bf2fe2	fixing invalid relative paths in pom.xml	9 years ago
Rasika Perera	f4ef6d23d5	Merge pull request #20 from rasika90/master ... carbon-analytics version upgrading	9 years ago
Rasika Perera	44f380c8e0	changes to the resources.xml	9 years ago
Rasika Perera	f73347ac08	upgrading carbon analytics versions	9 years ago
Rasika Perera	4c07301c8c	upgrading carbon analytics versions	9 years ago
Ace	5a090d93df	Adding property to pickup application name from web.xml	9 years ago
Charitha Goonetilleke	a337fefd8d	Merge pull request #19 from charithag/master ... Add simple and advanced fire alarm agents	9 years ago
Ace	1d2d57259b	fixing some minor bugs	9 years ago
charithag	fe59fa9410	Add simple and advanced fire alarm agents	9 years ago
Charitha Goonetilleke	eeb2c2a5f8	Merge pull request #18 from charithag/master ... Fire alarm changes done by Shabir	9 years ago
charithag	e8a0ccf6e3	Fire alarm changes done by Shabir	9 years ago
ayyoob	bf9bfd40b5	few changes after testing	9 years ago
ayyoob	a0ee671515	resolved errors on sample build and few changes on android service	9 years ago
ayyoob	e39ee91518	update version and few changes on android sense service	9 years ago
Rasika Perera	33eb1b6fa8	Merge pull request #17 from rasika90/master ... refactoring	9 years ago
Rasika Perera	ec70dad7da	refactoring	9 years ago
Charitha Goonetilleke	dc7cbadcde	Merge pull request #16 from charithag/master ... Revert virtual agent pom changes to previous	9 years ago
charithag	82740dec44	Revert pom changes to previous	9 years ago
Rasika Perera	49c177af1c	Merge pull request #15 from rasika90/master ... refactoring	9 years ago
Rasika Perera	b6156af241	refactoring	9 years ago
Rasika Perera	42236f390f	Merge pull request #14 from rasika90/master ... Migrating in memory sensor manager	9 years ago
Rasika Perera	82f1f645fd	resolving conflicts	9 years ago
Rasika Perera	6fabb28b1c	migrating in memory sensor manager	9 years ago
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	9 years ago
Shabirmean	5bf09ef1ed	changed package from dao to dot	9 years ago
ayyoob	5625b83b64	added android sense service and required stream definitions	9 years ago
Rasika Perera	fb21dc8b72	Merge pull request #13 from rasika90/master ... Generalizing in memory map into any sensor reading	9 years ago
Rasika Perera	e31fda92a6	generalizing inmemory map into any sensor	9 years ago
Rasika Perera	50e90fa8de	generalizing inmemory map into any sensor	9 years ago
Charitha Goonetilleke	4ae7f221c5	Merge pull request #12 from charithag/master ... Deploy firealarm-webapp with virtual-firealarm sample	9 years ago
charithag	ae1f904082	Deploy firealarm-webapp with virtual-firealarm sample	9 years ago
charithag	16f1fc7d5e	Remove duplicate portal jaggery app	9 years ago
Charitha Goonetilleke	e88019a56c	Merge pull request #11 from charithag/master ... Add in memory hash table to hold last received temperature data	9 years ago
charithag	e9dc4c9097	Add in memory hash table to hold last received temperature data	9 years ago
Shabirmean	bf5fad5409	Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server	9 years ago
Shabirmean	e9d08faa6c	added changes to publish data received via MQTT and XMPP	9 years ago
Charitha Goonetilleke	08f4829eea	Merge pull request #10 from charithag/master ... Changes suggested by PC1 and Kernel upgrade	9 years ago
charithag	88aad8a30a	Upgrated to kernel 4.4.2 to comply with latest DAS changes	9 years ago