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 |
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 |
Ace
|
188d32e19e
|
decoupling mgt/controller functions for digital display
|
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 |
Shabirmean
|
08c37717d7
|
Fixes to the VirtualFIreAlarmAgent
|
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 |
Menaka Madushanka
|
ec3470ee9c
|
Add resource method change
|
9 years ago |
GPrathap
|
516e44995a
|
updated Raspberry Pi agent: enable secure HTTPS communication
|
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 |
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 |
Shabirmean
|
a392dd799b
|
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 |
charithag
|
2f2205abc7
|
Update annotations
|
9 years ago |
Shabirmean
|
d13c3f8dde
|
Added XMPP modification to encrypt payload
|
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 |
Shabirmean
|
9cf61009ff
|
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-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicetype-config.xml
|
9 years ago |
GPrathap
|
22a8b57bc0
|
change the label name of the device-type.json
|
9 years ago |
Shabirmean
|
fc6056c47d
|
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
|
eca52912cc
|
Added RPi plugin component and feature def
|
9 years ago |
GPrathap
|
d1be3cf1a4
|
added license headers
|
9 years ago |
GPrathap
|
dc59f11802
|
updated UI design
|
9 years ago |
Ruwan
|
d736479c0b
|
Merge pull request #51 from charithag/IoTS-1.0.0-M1
Update devicemgt app and adding apimgt staging repo
|
9 years ago |
NuwanSameera
|
65da5afe80
|
upade all jax-rs params to Query Params
|
9 years ago |
Shabirmean
|
dc39656dac
|
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
|
af477ee83a
|
Added UI bits for the ArduinoDeviceType and merged manager/controller APIs into one class
|
9 years ago |
charithag
|
eda0c2ddd0
|
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 |
Charitha Goonetilleke
|
2220d2f851
|
Merge pull request #11 from NuwanSameera/IoTS-1.0.0-M1
digital display modifications
|
9 years ago |
Ace
|
a64e78f6a0
|
Reverting previous commit
|
9 years ago |
Ace
|
e34c942146
|
upgrading apim version to 4.3.1
|
9 years ago |
NuwanSameera
|
62ed697e84
|
digital display modifications
|
9 years ago |
Ace
|
6435ce3527
|
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
|
3156b92700
|
Fixing issue with agent download
|
9 years ago |
Ruwan
|
f86ce24675
|
Merge pull request #49 from charithag/IoTS-1.0.0-M1
Update group with pagination and link fixes
|
9 years ago |
charithag
|
ea821f94f7
|
Update group with pagination
|
9 years ago |
Shabirmean
|
a9ba8ff252
|
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
|
aa3151c6de
|
Adding deviceType Plugin for Arduino
|
9 years ago |
Menaka Madushanka
|
27e06249e2
|
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
|
7a715c2ac8
|
Android Sense device view changes and agent download
|
9 years ago |