Charitha Goonetilleke
618cc1b854
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into entgra-master
...
# Conflicts:
# components/analytics/iot-analytics/org.wso2.carbon.device.mgt.cdmf.analytics/pom.xml
# components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/pom.xml
# components/analytics/iot-analytics/org.wso2.carbon.iot.device.statistics.dashboard/pom.xml
# components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml
# components/analytics/iot-analytics/pom.xml
# components/analytics/pom.xml
# components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/pom.xml
# components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/pom.xml
# components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/pom.xml
# components/device-types/androidsense-plugin/pom.xml
# components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.analytics/pom.xml
# components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.api/pom.xml
# components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/pom.xml
# components/device-types/arduino-plugin/pom.xml
# components/device-types/pom.xml
# components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/pom.xml
# components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/pom.xml
# components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/pom.xml
# components/device-types/raspberrypi-plugin/pom.xml
# components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/pom.xml
# components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics/pom.xml
# components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/pom.xml
# components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/pom.xml
# components/device-types/virtual-fire-alarm-plugin/pom.xml
# components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.osgiconnector/pom.xml
# components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.restconnector/pom.xml
# components/extensions/appm-connector/pom.xml
# components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.extension/pom.xml
# components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.http/pom.xml
# components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/pom.xml
# components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.thrift/pom.xml
# components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.xmpp/pom.xml
# components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.http/pom.xml
# components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.mqtt/pom.xml
# components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint/pom.xml
# components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/pom.xml
# components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.xmpp/pom.xml
# components/extensions/cdmf-transport-adapters/pom.xml
# components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml
# components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/pom.xml
# components/extensions/mb-extensions/pom.xml
# components/extensions/pom.xml
# components/extensions/pull-notification-listeners/org.wso2.carbon.device.mgt.mqtt.notification.listener/pom.xml
# components/extensions/pull-notification-listeners/pom.xml
# components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session.endpoint/pom.xml
# components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session/pom.xml
# components/extensions/remote-session-extension/pom.xml
# components/extensions/siddhi-extensions/org.wso2.extension.siddhi.device/pom.xml
# components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/pom.xml
# components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/pom.xml
# components/extensions/siddhi-extensions/pom.xml
# components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/pom.xml
# components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java
# components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/pom.xml
# components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/pom.xml
# components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/assets/android-agent.apk
# components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/pom.xml
# components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java
# components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/pom.xml
# components/mobile-plugins/android-plugin/pom.xml
# components/mobile-plugins/pom.xml
# components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
# components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/pom.xml
# components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/pom.xml
# components/mobile-plugins/windows-plugin/pom.xml
# components/test-coverage/pom.xml
# features/analytics-feature/org.wso2.carbon.device.mgt.cdmf.analytics.feature/pom.xml
# features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/pom.xml
# features/analytics-feature/org.wso2.carbon.iot.device.statistics.dashboard.feature/pom.xml
# features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/pom.xml
# features/analytics-feature/pom.xml
# features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature/pom.xml
# features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.backend.feature/pom.xml
# features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.ui.feature/pom.xml
# features/device-types-feature/androidsense-plugin-feature/pom.xml
# features/device-types-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics.feature/pom.xml
# features/device-types-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.backend.feature/pom.xml
# features/device-types-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.ui.feature/pom.xml
# features/device-types-feature/arduino-plugin-feature/pom.xml
# features/device-types-feature/pom.xml
# features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/pom.xml
# features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/pom.xml
# features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.ui.feature/pom.xml
# features/device-types-feature/raspberrypi-plugin-feature/pom.xml
# features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature/pom.xml
# features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/pom.xml
# features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/pom.xml
# features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml
# features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.api.feature/pom.xml
# features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml
# features/extensions-feature/org.wso2.carbon.appmgt.mdm.osgiconnector.feature/pom.xml
# features/extensions-feature/org.wso2.carbon.appmgt.mdm.restconnector.feature/pom.xml
# features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/pom.xml
# features/extensions-feature/org.wso2.carbon.device.mgt.notification.listener.feature/pom.xml
# features/extensions-feature/org.wso2.carbon.device.mgt.remote.session.feature/pom.xml
# features/extensions-feature/org.wso2.extension.siddhi.device.feature/pom.xml
# features/extensions-feature/org.wso2.extension.siddhi.execution.json.feature/pom.xml
# features/extensions-feature/org.wso2.gpl.siddhi.extension.geo.script.feature/pom.xml
# features/extensions-feature/pom.xml
# features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/pom.xml
# features/mobile-plugins-feature/android-plugin-feature/pom.xml
# features/mobile-plugins-feature/pom.xml
# features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml
# features/mobile-plugins-feature/windows-plugin-feature/pom.xml
# pom.xml
6 years ago
WSO2 Builder
5a0038d93f
[WSO2 Release] [Jenkins #3196 ] [Release 4.1.19] prepare for next development iteration
6 years ago
WSO2 Builder
ec5680b43f
[WSO2 Release] [Jenkins #3196 ] [Release 4.1.19] prepare release v4.1.19
6 years ago
Charitha Goonetilleke
c59e8f2eab
Fixed issue in showing multiple devices locations in single map UI ( #924 )
...
* Fixed issue in showing multiple devices locations in single map UI
6 years ago
WSO2 Builder
42dd0afe43
[WSO2 Release] [Jenkins #3194 ] [Release 4.1.18] prepare for next development iteration
6 years ago
WSO2 Builder
cdb0beb525
[WSO2 Release] [Jenkins #3194 ] [Release 4.1.18] prepare release v4.1.18
6 years ago
Charitha Goonetilleke
5fe2acb479
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into wso2-master
6 years ago
Charitha Goonetilleke
728b5e35f5
Update agent binaries for 3.3.1 release
6 years ago
WSO2 Builder
8d5f78dfc7
[WSO2 Release] [Jenkins #3192 ] [Release 4.1.17] prepare for next development iteration
6 years ago
WSO2 Builder
a4f835187b
[WSO2 Release] [Jenkins #3192 ] [Release 4.1.17] prepare release v4.1.17
6 years ago
Charitha Goonetilleke
1347be2cea
Fixed incorrect port issue when default ssl port is used
6 years ago
WSO2 Builder
e2424266eb
[WSO2 Release] [Jenkins #3190 ] [Release 4.1.16] prepare for next development iteration
6 years ago
WSO2 Builder
d06b8c52f7
[WSO2 Release] [Jenkins #3190 ] [Release 4.1.16] prepare release v4.1.16
6 years ago
Charitha Goonetilleke
6fbc4e1def
Fixed test failure
6 years ago
lasanthaDLPDS
fdd1ef9ba1
Configure default operations loading
...
When loading device details page, default operatios are loaded always. With this improvement, default operations will be loaded if API paths are defined in the config.json
6 years ago
Charitha Goonetilleke
80cd4063a8
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into wso2-master
6 years ago
Charitha Goonetilleke
c1fa49aa2b
Prevent all nodes using a same app id for oauth
6 years ago
WSO2 Builder
d16e71e943
[WSO2 Release] [Jenkins #3186 ] [Release 4.1.15] prepare for next development iteration
6 years ago
WSO2 Builder
432fe7dd98
[WSO2 Release] [Jenkins #3186 ] [Release 4.1.15] prepare release v4.1.15
6 years ago
Charitha Goonetilleke
896443620f
Fix twisted username and password fields in remote session
6 years ago
Charitha Goonetilleke
917fcc8ea3
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into wso2-master
6 years ago
Charitha Goonetilleke
f69c1ba0c7
Bump devicemgt version
6 years ago
WSO2 Builder
e8c589e4b0
[WSO2 Release] [Jenkins #3184 ] [Release 4.1.14] prepare for next development iteration
6 years ago
WSO2 Builder
94924ce5e7
[WSO2 Release] [Jenkins #3184 ] [Release 4.1.14] prepare release v4.1.14
6 years ago
Charitha Goonetilleke
ddd6b7ed8e
Fix twisted username and password fields
6 years ago
lasanthaDLPDS
4e30859563
Fix device type deploying issue
6 years ago
Charitha Goonetilleke
5b813b2487
Merge remote-tracking branch 'entgra/master' into entgra-master
6 years ago
Charitha Goonetilleke
484420c9a6
Fix NPE issue in showing relatime analytics on Sample device types
6 years ago
WSO2 Builder
688b4fb6b1
[WSO2 Release] [Jenkins #3182 ] [Release 4.1.13] prepare for next development iteration
6 years ago
WSO2 Builder
e3b2261acf
[WSO2 Release] [Jenkins #3182 ] [Release 4.1.13] prepare release v4.1.13
6 years ago
Madawa Soysa
e27feab177
Update android screenshots
...
Fixes entgra/product-iots#1
6 years ago
Charitha Goonetilleke
5bbb45ce84
Fixed issue in device type config operation
...
- Device type config operation throws invalid device identifieres exception when changing configurations without having active devices
6 years ago
Charitha Goonetilleke
9f15dc9922
Add HTTPS support for file upload/download
6 years ago
Madawa Soysa
615810226b
Merge branch 'master' into 'master'
...
Fix android device png
See merge request entgra/carbon-device-mgt-plugins!5
6 years ago
Madawa Soysa
f9bf052680
Fix android device png
6 years ago
Madawa Soysa
2d2536d3ec
Merge branch 'master' into 'master'
...
Fix document links
See merge request entgra/carbon-device-mgt-plugins!4
6 years ago
Madawa Soysa
e7b9198997
Fix document links
6 years ago
Charitha Goonetilleke
03391ae6c2
Update tryit emulator ID
6 years ago
Charitha Goonetilleke
7b69e44695
Add latest android agent apk
6 years ago
Charitha Goonetilleke
2cacc3b322
Merge remote-tracking branch 'entgra/master' into entgra-master
6 years ago
Charitha Goonetilleke
211391fb02
Fixed issue in device type config operation
...
- Device type config operation throws invalid device identifieres exception when changing configurations without having active devices
6 years ago
Charitha Goonetilleke
750dcc71c6
Add HTTPS support for file upload/download
6 years ago
Madawa Soysa
d3d1415d03
Update screen shots of android enrollment page
6 years ago
WSO2 Builder
705e7d717b
[WSO2 Release] [Jenkins #3180 ] [Release 4.1.12] prepare for next development iteration
6 years ago
WSO2 Builder
9fcd43f0bf
[WSO2 Release] [Jenkins #3180 ] [Release 4.1.12] prepare release v4.1.12
6 years ago
charitha
41fc701009
Fix incorrect logic
...
(cherry picked from commit 2a1bcab
)
6 years ago
charitha
2a1bcab648
Fix incorrect logic
6 years ago
charitha
08d18789a8
Fix issue in remote connect token handling
...
(cherry picked from commit 4f1b807
)
6 years ago
charitha
4f1b807064
Fix issue in remote connect token handling
6 years ago
mharindu
54887f967f
[maven-release-plugin] prepare for next development iteration
6 years ago