Shabirmean
|
9ae9bcfb31
|
Removing duplicate analytics version, switched "data-bridge-config.xml' to be copied from feature
|
9 years ago |
|
Shabirmean
|
63dcd1e04e
|
Addidng SocialDB to distribution pom
|
9 years ago |
Menaka Madushanka
|
309d38de72
|
Added the accelerometer script
|
9 years ago |
menaka
|
1c0242fe7e
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
9 years ago |
|
Menaka Madushanka
|
efe53204c8
|
Added the accelerometer script
|
9 years ago |
|
Shabirmean
|
85bc5bd201
|
Adding SocialDB creation execution to distribution pom
|
9 years ago |
|
Shabirmean
|
d09128f482
|
excluding "appmoauth2.war" from the build
|
9 years ago |
charithag
|
584ba63494
|
Update logo
|
9 years ago |
|
Shabirmean
|
808771056c
|
removing the common-api feature from the build
|
9 years ago |
Charitha Goonetilleke
|
c8739494c8
|
Merge pull request #26 from charithag/IoTS-1.0.0-M1
Iots 1.0.0 m1 branch merge from product-mdm
|
9 years ago |
|
charithag
|
2c1efd1af0
|
Migrated to EMM based product
|
9 years ago |
ayyoob
|
098547efaa
|
removing unnecessary es store files
|
9 years ago |
|
ayyoob
|
320f754356
|
resolved few started errors
|
9 years ago |
|
charithag
|
247dfa9820
|
Migrated to CDMF with Generic UI
|
9 years ago |
|
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 |
