Menaka Madushanka
|
ec3470ee9c
|
Add resource method change
|
9 years ago |
charithag
|
9e7e0aa845
|
Fix issue in service ep
|
9 years ago |
charithag
|
5f8a94f4c6
|
Merge branch 'IoTS-1.0.0-M1' of https://github.com/wso2/carbon-device-mgt-plugins into IoTS-1.0.0-M1
# Conflicts:
# components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/ArduinoService.java
# components/device-mgt-iot-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay.api/src/main/java/org/wso2/carbon/device/mgt/iot/digitaldisplay/api/DigitalDisplayControllerService.java
# components/device-mgt-iot-droneanalyzer/org.wso2.carbon.device.mgt.iot.droneanalyzer.api/src/main/java/org/wso2/carbon/device/mgt/iot/droneanalyzer/service/DroneService.java
# components/device-mgt-iot-virtualfirealarm/org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/VirtualFireAlarmService.java
|
9 years ago |
charithag
|
99a4b522ad
|
Merge branch 'IoTS-1.0.0-M1' of https://github.com/wso2/carbon-device-mgt-plugins into IoTS-1.0.0-M1
# Conflicts:
# components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/ArduinoService.java
# components/device-mgt-iot-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay.api/src/main/java/org/wso2/carbon/device/mgt/iot/digitaldisplay/api/DigitalDisplayControllerService.java
# components/device-mgt-iot-droneanalyzer/org.wso2.carbon.device.mgt.iot.droneanalyzer.api/src/main/java/org/wso2/carbon/device/mgt/iot/droneanalyzer/service/DroneService.java
# components/device-mgt-iot-virtualfirealarm/org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/VirtualFireAlarmService.java
|
9 years ago |
charithag
|
b93caca8fa
|
Update annotations
|
9 years ago |
charithag
|
2f2205abc7
|
Update annotations
|
9 years ago |
Menaka Madushanka
|
9cf953c0a2
|
Feature annotation completed
|
9 years ago |
Shabirmean
|
5f8751cd95
|
Fixes to the VirtualFireAlarmMQTTConnector
|
9 years ago |
Shabirmean
|
23fc39c60a
|
Merge branch 'IoTS-1.0.0-M1' of https://github.com/wso2/carbon-device-mgt-plugins into IoTS-1.0.0-M1
|
9 years ago |
Shabirmean
|
6fd475658a
|
Refactoring XMPP and MQTT Connectors for VirtualFireAlarm
|
9 years ago |
Ace
|
b27bb1da71
|
Adding key generation capability when agent download is triggered
|
9 years ago |
Ruwan
|
5ee53f0b06
|
Merge pull request #84 from Shabirmean/IoTS-1.0.0-M1
Fixes to the VirtualFireAlarmMQTTSubscriber related to SCEP encryption
|
9 years ago |
Ace
|
e2b43822ce
|
Automating key generation capability for virtual_firealarm
|
9 years ago |
Shabirmean
|
fa22cc8c3f
|
Merge branch 'IoTS-1.0.0-M1' of https://github.com/wso2/carbon-device-mgt-plugins into IoTS-1.0.0-M1
Conflicts:
features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/private/conf/device-type.json
|
9 years ago |
Shabirmean
|
9801102057
|
Fixes to the VirtualFireAlarmMQTTSubscriber related to SCEP encryption
|
9 years ago |
Ruwan
|
df2082295a
|
Merge pull request #81 from GPrathap/IoTS-1.0.0-M1
added a raspberrypi api annotation
|
9 years ago |
GPrathap
|
640f81cd41
|
added a raspberrypi api annotation
|
9 years ago |
Menaka Madushanka
|
d31b91df28
|
matadata typo fixed
|
9 years ago |
Menaka Madushanka
|
eeb6a9a35d
|
Fixed light, proximity and pressure problem.
|
9 years ago |
Menaka Madushanka
|
897b914522
|
Fixed light, proximity and pressure problem.
|
9 years ago |
Shabirmean
|
1f10298819
|
Copied the device-type datasources.xml files directly to the conf/datasources path
|
9 years ago |
charithag
|
afcabb7fbc
|
Update operation features with endpoints
|
9 years ago |
Shabirmean
|
720711b0e4
|
Merge branch 'IoTS-1.0.0-M1' of https://github.com/wso2/carbon-device-mgt-plugins into IoTS-1.0.0-M1
|
9 years ago |
Shabirmean
|
f29c66e24d
|
Changes to the VIrtualFireAlarm agent and added "server-name" to the configs file
|
9 years ago |
Ace
|
30f555a329
|
Adding feature/api annotations to drone service
|
9 years ago |
Shabirmean
|
9dbb9cdfa1
|
Merge branch 'IoTS-1.0.0-M1' of https://github.com/wso2/carbon-device-mgt-plugins into IoTS-1.0.0-M1
|
9 years ago |
Ace
|
4c95ac6e59
|
Documenting digital display
|
9 years ago |
Shabirmean
|
ece41c90c5
|
Handling xmpp recipients with invalid JIDs
|
9 years ago |
Ace
|
b78d19ec04
|
Adding annotations for API and Features
|
9 years ago |
Menaka Madushanka
|
58f87962fa
|
Unnecessary lines removed
|
9 years ago |
Menaka Madushanka
|
7dfa8f61e7
|
Merge branch 'IoTS-1.0.0-M1' of https://github.com/wso2/carbon-device-mgt-plugins into IoTS-1.0.0-M1
|
9 years ago |
Menaka Madushanka
|
cc50b8afd9
|
Scripts changes
|
9 years ago |
Menaka Madushanka
|
542724dedc
|
Sensor streams corrected and code restructured
|
9 years ago |
GPrathap
|
0362e66908
|
changed class name
|
9 years ago |
GPrathap
|
32ef0867ba
|
Merge branch 'IoTS-1.0.0-M1' of https://github.com/GPrathap/carbon-device-mgt-plugins into IoTS-1.0.0-M1
|
9 years ago |
GPrathap
|
386c04497f
|
changed class name
|
9 years ago |
GPrathap
|
fb56dca446
|
updated
|
9 years ago |
Ruwan
|
0ae8bb200c
|
Merge pull request #61 from charithag/IoTS-1.0.0-M1
Nuwan's digital display related changes
|
9 years ago |
Shabirmean
|
855c81aa26
|
Merge branch 'IoTS-1.0.0-M1' of https://github.com/wso2/carbon-device-mgt-plugins into IoTS-1.0.0-M1
|
9 years ago |
Shabirmean
|
4228dce6d6
|
Added complete RaspberryPi Component and Feature
|
9 years ago |
Ruwan
|
0406e6044f
|
Merge pull request #59 from menaka121/IoTS-1.0.0-M1
Android sense download
|
9 years ago |
Menaka Madushanka
|
0ebde81990
|
Merge branch 'IoTS-1.0.0-M1' of https://github.com/wso2/carbon-device-mgt-plugins into IoTS-1.0.0-M1
|
9 years ago |
NuwanSameera
|
0730ce7052
|
Merge remote-tracking branch 'upstream/IoTS-1.0.0-M1' into IoTS-1.0.0-M1
|
9 years ago |
Shabirmean
|
fad1d8c732
|
changed mediative of download file to "application/zip"
|
9 years ago |
NuwanSameera
|
beb83ebc06
|
upstream changes
|
9 years ago |
Menaka Madushanka
|
8c821d7a73
|
Merge branch 'IoTS-1.0.0-M1' of https://github.com/wso2/carbon-device-mgt-plugins into IoTS-1.0.0-M1
Conflicts:
features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs
|
9 years ago |
NuwanSameera
|
bfeb8e5500
|
change digital display files
|
9 years ago |
Menaka Madushanka
|
fb0818f963
|
Android Sense device view changes and agent download
|
9 years ago |
Shabirmean
|
be564ca0ff
|
Setting the content-type of the response in for the agent download method
|
9 years ago |
Menaka Madushanka
|
8afb2db30e
|
Merge branch 'IoTS-1.0.0-M1' of https://github.com/charithag/carbon-device-mgt-plugins into IoTS-1.0.0-M1
|
9 years ago |