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
5a0038d93f
[WSO2 Release] [Jenkins #3196 ] [Release 4.1.19] prepare for next development iteration
6 years ago
ec5680b43f
[WSO2 Release] [Jenkins #3196 ] [Release 4.1.19] prepare release v4.1.19
6 years ago
42dd0afe43
[WSO2 Release] [Jenkins #3194 ] [Release 4.1.18] prepare for next development iteration
6 years ago
cdb0beb525
[WSO2 Release] [Jenkins #3194 ] [Release 4.1.18] prepare release v4.1.18
6 years ago
8d5f78dfc7
[WSO2 Release] [Jenkins #3192 ] [Release 4.1.17] prepare for next development iteration
6 years ago
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
e2424266eb
[WSO2 Release] [Jenkins #3190 ] [Release 4.1.16] prepare for next development iteration
6 years ago
d06b8c52f7
[WSO2 Release] [Jenkins #3190 ] [Release 4.1.16] prepare release v4.1.16
6 years ago
d16e71e943
[WSO2 Release] [Jenkins #3186 ] [Release 4.1.15] prepare for next development iteration
6 years ago
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
e8c589e4b0
[WSO2 Release] [Jenkins #3184 ] [Release 4.1.14] prepare for next development iteration
6 years ago
94924ce5e7
[WSO2 Release] [Jenkins #3184 ] [Release 4.1.14] prepare release v4.1.14
6 years ago
688b4fb6b1
[WSO2 Release] [Jenkins #3182 ] [Release 4.1.13] prepare for next development iteration
6 years ago
e3b2261acf
[WSO2 Release] [Jenkins #3182 ] [Release 4.1.13] prepare release v4.1.13
6 years ago
705e7d717b
[WSO2 Release] [Jenkins #3180 ] [Release 4.1.12] prepare for next development iteration
6 years ago
9fcd43f0bf
[WSO2 Release] [Jenkins #3180 ] [Release 4.1.12] prepare release v4.1.12
6 years ago
41fc701009
Fix incorrect logic
...
(cherry picked from commit 2a1bcab
6 years ago
2a1bcab648
Fix incorrect logic
6 years ago
08d18789a8
Fix issue in remote connect token handling
...
(cherry picked from commit 4f1b807
6 years ago
4f1b807064
Fix issue in remote connect token handling
6 years ago
54887f967f
[maven-release-plugin] prepare for next development iteration
6 years ago
a24b78a7a0
[maven-release-plugin] prepare release v4.2.0
6 years ago
f9f3c85545
[WSO2 Release] [Jenkins #3178 ] [Release 4.1.11] prepare for next development iteration
6 years ago
b8c503241d
[WSO2 Release] [Jenkins #3178 ] [Release 4.1.11] prepare release v4.1.11
6 years ago
5c3d062b9d
version bump from 4.1.9 to 4.1.11
6 years ago
b1625f93dd
reformat code
6 years ago
374c54fa70
make remote control feature mutual ssl compatible
...
Introduced a new UUID to recognized the authenticated device's call back to establish the websocket connetion. When the UI requested to establish a screen sharing session with the device, a new UUID and will be created and stored in the database with the operation REMOTE_CONNECT's payload. Once the device polls the operation, it receives the UUID. Then device will call back the server with that same UUID to establish the websocket connection.
6 years ago
21967c1865
[maven-release-plugin] prepare for next development iteration
6 years ago
063fd7e8d1
[maven-release-plugin] prepare release v4.1.8
6 years ago
f274f652da
[maven-release-plugin] prepare for next development iteration
6 years ago
389489dd8c
[maven-release-plugin] prepare release v4.1.7
6 years ago
095d908aae
[WSO2 Release] [Jenkins #3159 ] [Release 4.1.6] prepare for next development iteration
7 years ago
9e68a65c1e
[WSO2 Release] [Jenkins #3159 ] [Release 4.1.6] prepare release v4.1.6
7 years ago
b9e5f195ef
[WSO2 Release] [Jenkins #3154 ] [Release 4.1.5] prepare for next development iteration
7 years ago
3b4d3ccb5c
[WSO2 Release] [Jenkins #3154 ] [Release 4.1.5] prepare release v4.1.5
7 years ago
f73c6f0cd3
[WSO2 Release] [Jenkins #3152 ] [Release 4.1.4] prepare for next development iteration
7 years ago
b8b852bf00
[WSO2 Release] [Jenkins #3152 ] [Release 4.1.4] prepare release v4.1.4
7 years ago
3c82f123ed
[WSO2 Release] [Jenkins #3150 ] [Release 4.1.3] prepare for next development iteration
7 years ago
22087b62ea
[WSO2 Release] [Jenkins #3150 ] [Release 4.1.3] prepare release v4.1.3
7 years ago
5ed15df3f8
[WSO2 Release] [Jenkins #3148 ] [Release 4.1.2] prepare for next development iteration
7 years ago
61cf484c64
[WSO2 Release] [Jenkins #3148 ] [Release 4.1.2] prepare release v4.1.2
7 years ago
353926b3bb
[WSO2 Release] [Jenkins #3146 ] [Release 4.1.1] prepare for next development iteration
7 years ago
be150194ba
[WSO2 Release] [Jenkins #3146 ] [Release 4.1.1] prepare release v4.1.1
7 years ago
2c9a5feac8
[WSO2 Release] [Jenkins #3144 ] [Release 4.1.0] prepare for next development iteration
7 years ago
dab0caadb9
[WSO2 Release] [Jenkins #3144 ] [Release 4.1.0] prepare release v4.1.0
7 years ago
fa7c261018
Updating the version to 4.1.0
7 years ago
eb5e174dbd
[WSO2 Release] [Jenkins #3142 ] [Release 4.0.136] prepare for next development iteration
7 years ago
Charitha Goonetilleke
WSO2 Builder
charitha
mharindu
Madhawa Perera
geethkokila