Commit Graph

1787 Commits

Author SHA1 Message Date
charitha
ab40b7b6b8 Merge remote-tracking branch 'entgra/master' into entgra-master 2019-01-14 16:48:50 +05:30
charitha
6fdbfe2497 Update devicemgt core version to latest 2019-01-14 16:48:42 +05:30
Saad Sahibjan
8355861083 Enrollment application install feature for policy 2019-01-01 08:13:48 +00:00
charitha
f7cb8e50b1 Update tryit 2018-12-31 09:23:22 +05:30
Entgra Builder
0489bc6619 [maven-release-plugin]prepare for next development iteration 2018-11-11 14:50:16 +00:00
Entgra Builder
84dacabd27 [maven-release-plugin]prepare release v4.2.1 2018-11-11 14:50:10 +00:00
charitha
aa7e0d726b Prepare for 3.2.1 release 2018-11-11 19:41:56 +05:30
charitha
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
2018-10-30 15:55:38 +05:30
WSO2 Builder
5a0038d93f [WSO2 Release] [Jenkins #3196] [Release 4.1.19] prepare for next development iteration 2018-10-25 09:10:46 +00:00
WSO2 Builder
ec5680b43f [WSO2 Release] [Jenkins #3196] [Release 4.1.19] prepare release v4.1.19 2018-10-25 09:10:34 +00:00
WSO2 Builder
42dd0afe43 [WSO2 Release] [Jenkins #3194] [Release 4.1.18] prepare for next development iteration 2018-10-24 19:46:42 +00:00
WSO2 Builder
cdb0beb525 [WSO2 Release] [Jenkins #3194] [Release 4.1.18] prepare release v4.1.18 2018-10-24 19:46:29 +00:00
charitha
5fe2acb479 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into wso2-master 2018-10-25 01:00:45 +05:30
charitha
728b5e35f5 Update agent binaries for 3.3.1 release 2018-10-25 00:50:37 +05:30
WSO2 Builder
8d5f78dfc7 [WSO2 Release] [Jenkins #3192] [Release 4.1.17] prepare for next development iteration 2018-10-24 16:31:03 +00:00
WSO2 Builder
a4f835187b [WSO2 Release] [Jenkins #3192] [Release 4.1.17] prepare release v4.1.17 2018-10-24 16:30:51 +00:00
WSO2 Builder
e2424266eb [WSO2 Release] [Jenkins #3190] [Release 4.1.16] prepare for next development iteration 2018-10-24 05:47:27 +00:00
WSO2 Builder
d06b8c52f7 [WSO2 Release] [Jenkins #3190] [Release 4.1.16] prepare release v4.1.16 2018-10-24 05:47:15 +00:00
charitha
6fbc4e1def Fixed test failure 2018-10-24 11:08:26 +05:30
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
2018-10-24 08:42:52 +05:30
WSO2 Builder
d16e71e943 [WSO2 Release] [Jenkins #3186] [Release 4.1.15] prepare for next development iteration 2018-10-23 06:40:28 +00:00
WSO2 Builder
432fe7dd98 [WSO2 Release] [Jenkins #3186] [Release 4.1.15] prepare release v4.1.15 2018-10-23 06:40:17 +00:00
charitha
917fcc8ea3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into wso2-master 2018-10-21 13:43:01 +05:30
charitha
f69c1ba0c7 Bump devicemgt version 2018-10-19 23:30:11 +05:30
WSO2 Builder
e8c589e4b0 [WSO2 Release] [Jenkins #3184] [Release 4.1.14] prepare for next development iteration 2018-10-19 17:58:26 +00:00
WSO2 Builder
94924ce5e7 [WSO2 Release] [Jenkins #3184] [Release 4.1.14] prepare release v4.1.14 2018-10-19 17:58:14 +00:00
lasanthaDLPDS
4e30859563 Fix device type deploying issue 2018-10-17 18:27:00 +05:30
WSO2 Builder
688b4fb6b1 [WSO2 Release] [Jenkins #3182] [Release 4.1.13] prepare for next development iteration 2018-10-10 13:04:53 +00:00
WSO2 Builder
e3b2261acf [WSO2 Release] [Jenkins #3182] [Release 4.1.13] prepare release v4.1.13 2018-10-10 13:04:41 +00:00
Madawa Soysa
e27feab177 Update android screenshots
Fixes entgra/product-iots#1
2018-10-10 22:16:44 +11:00
charitha
5bbb45ce84 Fixed issue in device type config operation
- Device type config operation throws invalid device identifieres exception when changing configurations without having active devices
2018-10-08 23:19:52 +05:30
charitha
9f15dc9922 Add HTTPS support for file upload/download 2018-10-08 23:19:39 +05:30
Madawa Soysa
615810226b Merge branch 'master' into 'master'
Fix android device png

See merge request entgra/carbon-device-mgt-plugins!5
2018-10-08 10:56:40 +00:00
Madawa Soysa
f9bf052680 Fix android device png 2018-10-08 16:25:50 +05:30
Madawa Soysa
2d2536d3ec Merge branch 'master' into 'master'
Fix document links

See merge request entgra/carbon-device-mgt-plugins!4
2018-10-08 10:48:37 +00:00
Madawa Soysa
e7b9198997 Fix document links 2018-10-08 15:10:52 +05:30
charitha
03391ae6c2 Update tryit emulator ID 2018-10-08 13:54:33 +05:30
charitha
7b69e44695 Add latest android agent apk 2018-10-08 13:48:49 +05:30
charitha
2cacc3b322 Merge remote-tracking branch 'entgra/master' into entgra-master 2018-10-08 13:45:44 +05:30
charitha
211391fb02 Fixed issue in device type config operation
- Device type config operation throws invalid device identifieres exception when changing configurations without having active devices
2018-10-08 13:31:25 +05:30
charitha
750dcc71c6 Add HTTPS support for file upload/download 2018-10-08 13:29:54 +05:30
Madawa Soysa
d3d1415d03 Update screen shots of android enrollment page 2018-10-08 13:24:52 +05:30
WSO2 Builder
705e7d717b [WSO2 Release] [Jenkins #3180] [Release 4.1.12] prepare for next development iteration 2018-10-08 05:27:38 +00:00
WSO2 Builder
9fcd43f0bf [WSO2 Release] [Jenkins #3180] [Release 4.1.12] prepare release v4.1.12 2018-10-08 05:27:27 +00:00
mharindu
54887f967f [maven-release-plugin] prepare for next development iteration 2018-09-28 17:52:22 +00:00
mharindu
a24b78a7a0 [maven-release-plugin] prepare release v4.2.0 2018-09-28 17:52:00 +00:00
Charitha Goonetilleke
5996ddb5e1 Merge branch 'master' into 'master'
Whitelabel device types

See merge request entgra/carbon-device-mgt-plugins!2
2018-09-27 13:18:33 +00:00
charitha
a113b4bdba Updated device-mgt version 2018-09-27 12:12:32 +05:30
Milan Perera
3b57b9a9fb Whitelabel devic types 2018-09-27 11:25:37 +05:30
inoshperera
44228ba37c fixing build brake 2018-09-22 11:29:28 +05:30