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 |
|