Shabirmean
|
9cb844949c
|
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/database/AndroidSenseDM_DB.h2.db
features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/database/ArduinoDM_DB.h2.db
features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/database/DigitalDisplayDM_DB.h2.db
features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/database/DroneAnalyzerDM_DB.h2.db
features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/database/RaspberryPiDM_DB.h2.db
features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/database/VirtualFireAlarmDM_DB.h2.db
features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/database/WSO2MobileAndroid_DB.h2.db
features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/database/WSO2MobileWindows_DB.h2.db
|
9 years ago |
Shabirmean
|
1d302f4353
|
Added the p2 task to create database folder
|
9 years ago |
Ace
|
8054034526
|
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
|
b8a50eccd2
|
restructuring arduino mgt/controller api
|
9 years ago |
Shabirmean
|
b41c235505
|
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
|
93957a3ed0
|
Deleted all device-type specific databases
|
9 years ago |
Ruwan
|
9d86924068
|
Merge pull request #101 from Shabirmean/IoTS-1.0.0-M1
Deleting all active xmpp-session during server shutdown
|
9 years ago |
Menaka Madushanka
|
8430c556a0
|
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
|
cd46ef3465
|
Added feature annotation
|
9 years ago |
Shabirmean
|
2654a4c634
|
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-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay.controller.api/src/main/java/org/wso2/carbon/device/mgt/iot/digitaldisplay/api/transport/CommunicationHandler.java
components/device-mgt-iot-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay.controller.api/src/main/java/org/wso2/carbon/device/mgt/iot/digitaldisplay/api/transport/CommunicationHandlerException.java
components/device-mgt-iot-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay.controller.api/src/main/java/org/wso2/carbon/device/mgt/iot/digitaldisplay/api/transport/MQTTCommunicationHandler.java
|
9 years ago |
Shabirmean
|
2cf022ef55
|
Deleting all active xmpp-sessions during server shutdown
|
9 years ago |
charithag
|
53822eaab7
|
remove ignored files
|
9 years ago |
Ace
|
188d32e19e
|
decoupling mgt/controller functions for digital display
|
9 years ago |
Ruwan
|
bfc46c98a0
|
Merge pull request #100 from charithag/IoTS-1.0.0-M1
Update policy section
|
9 years ago |
charithag
|
d60d872599
|
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 |
charithag
|
590eae7370
|
Update policy section
|
9 years ago |
Ruwan
|
5e8e3125c6
|
Merge pull request #99 from GPrathap/IoTS-1.0.0-M1
added Raspberry Pi device-view unit
|
9 years ago |
GPrathap
|
ecf12fb9bf
|
added Raspberry Pi device-view unit
|
9 years ago |
Ruwan
|
3279c250f8
|
Merge pull request #98 from Shabirmean/IoTS-1.0.0-M1
Moved Device-Type DB Creation to feature-level and updated AdvancedAgent
|
9 years ago |
Shabirmean
|
060c2dd079
|
Changes to minor errors in the VirtualFireAlarmService
|
9 years ago |
Shabirmean
|
677e07ac36
|
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
|
f0edac96f5
|
Moved Device-Type DB Creation to feature-level and updated Advanced-Agent
|
9 years ago |
Ace
|
dd95454387
|
Changing raspberry pi to use whitelisted token scopes
|
9 years ago |
Menaka Madushanka
|
19a6a18c9f
|
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
|
ce2e3a9a05
|
Added feature annotation
|
9 years ago |
Ace
|
d3921ff91f
|
Bug fixes
|
9 years ago |
Ace
|
188e9a0b34
|
removing apim based security from v.firealarm
|
9 years ago |
Ace
|
c203e609d6
|
Decoupling control/management operations of v.firealarm
|
9 years ago |
Ruwan
|
2680196986
|
Merge pull request #97 from sajithar/IoTS-1.0.0-M1
Formatting and correcting zone name in 'iot.unit.user.register' unit
|
9 years ago |
sajithar
|
a190c13059
|
formatting
|
9 years ago |
Ruwan
|
8b8e2958ba
|
Merge pull request #95 from Shabirmean/IoTS-1.0.0-M1
Fixes to the VirtualFIreAlarmAgent
|
9 years ago |
Ruwan
|
8f49e6aaef
|
Merge pull request #96 from GPrathap/IoTS-1.0.0-M1
changed Raspberry Pi device-type view
|
9 years ago |
GPrathap
|
4e4718e391
|
changed Raspberry Pi device-type view
|
9 years ago |
Shabirmean
|
ba3d5b10ff
|
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
|
08c37717d7
|
Fixes to the VirtualFIreAlarmAgent
|
9 years ago |
Ruwan
|
77c32c84d5
|
Merge pull request #94 from Shabirmean/IoTS-1.0.0-M1
Configured a check for configs before starting XMPP or MQTT
|
9 years ago |
Shabirmean
|
eb3a5c7254
|
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-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 |
Shabirmean
|
af818c8696
|
Added logs to go into log.isDebugEnabled() blocks
|
9 years ago |
Ruwan
|
e2bbb47b59
|
Merge pull request #92 from GPrathap/IoTS-1.0.0-M1
updated Raspberry Pi agent: enable secure HTTPS communication
|
9 years ago |
Ruwan
|
4e99dee4da
|
Merge pull request #93 from menaka121/IoTS-1.0.0-M1
Add resource method change
|
9 years ago |
Menaka Madushanka
|
ec3470ee9c
|
Add resource method change
|
9 years ago |
GPrathap
|
516e44995a
|
updated Raspberry Pi agent: enable secure HTTPS communication
|
9 years ago |
Ruwan
|
a1ea3d79b6
|
Merge pull request #91 from charithag/IoTS-1.0.0-M1
Fix issue in service ep
|
9 years ago |
charithag
|
9e7e0aa845
|
Fix issue in service ep
|
9 years ago |
Shabirmean
|
bf231a4c3e
|
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-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 |
Shabirmean
|
d2afed15f0
|
Configured a check for configs before starting XMPP or MQTT
|
9 years ago |
Ruwan
|
c415361d70
|
Merge pull request #90 from charithag/IoTS-1.0.0-M1
Update annotations
|
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 |