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 |
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 |
Ruwan
|
d40aa73cab
|
Merge pull request #89 from menaka121/IoTS-1.0.0-M1
Feature annotation completed
|
9 years ago |
Menaka Madushanka
|
9cf953c0a2
|
Feature annotation completed
|
9 years ago |
Ruwan
|
c82ad8734e
|
Merge pull request #88 from Shabirmean/IoTS-1.0.0-M1
Refactoring XMPP and MQTT Connectors for VirtualFireAlarm
|
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 |
Ruwan
|
1d9624782d
|
Merge pull request #85 from dakshika/ui-updates
remove unused handlebar template files
|
9 years ago |
Ace
|
e2b43822ce
|
Automating key generation capability for virtual_firealarm
|
9 years ago |
Dakshika Jayathilaka
|
b9e1c6496a
|
remove unused handlebar template files
|
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
|
d5f1fedc0a
|
Merge pull request #83 from dakshika/ui-updates
Clean up markup on device types
|
9 years ago |
Dakshika Jayathilaka
|
873b4fbc28
|
clean markup issues
|
9 years ago |
Dakshika Jayathilaka
|
45042c9ffe
|
clean markup issues
|
9 years ago |
Dakshika Jayathilaka
|
1e84b13592
|
clean markup issues
|
9 years ago |
Ruwan
|
df2082295a
|
Merge pull request #81 from GPrathap/IoTS-1.0.0-M1
added a raspberrypi api annotation
|
9 years ago |
Ruwan
|
09edb1420f
|
Merge pull request #82 from charithag/IoTS-1.0.0-M1
Add custom operation icons
|
9 years ago |
Dakshika Jayathilaka
|
a65afd2a00
|
clean markup issues
|
9 years ago |
Dakshika Jayathilaka
|
d7fd1137de
|
cleanup markup
|
9 years ago |
charithag
|
8ab41c4e20
|
Add custom operation icons
|
9 years ago |
Dakshika Jayathilaka
|
60a9b95e26
|
cleanup markup
|
9 years ago |
Dakshika Jayathilaka
|
7b55e128c9
|
cleanup markup on devices
|
9 years ago |
GPrathap
|
640f81cd41
|
added a raspberrypi api annotation
|
9 years ago |
Dakshika Jayathilaka
|
6f73e6abc8
|
cleanup markup
|
9 years ago |
Ruwan
|
6d59d930c3
|
Merge pull request #80 from menaka121/IoTS-1.0.0-M1
Fixed light proximity and pressure data sending problem
|
9 years ago |
Dakshika Jayathilaka
|
8103583e6c
|
add bootstrap cols and resize list icons
|
9 years ago |
Dakshika Jayathilaka
|
c1649cabed
|
clean up markup
|
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 |
Dakshika Jayathilaka
|
f105eb3d54
|
fix android device type col issue
|
9 years ago |
charithag
|
545c132ef0
|
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
|
ef792b0a3d
|
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-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.type-view/private/conf/device-type.json
|
9 years ago |
Ruwan
|
6c3b60998a
|
Merge pull request #78 from charithag/IoTS-1.0.0-M1
Update device operations
|
9 years ago |
Shabirmean
|
1f10298819
|
Copied the device-type datasources.xml files directly to the conf/datasources path
|
9 years ago |