Commit Graph

4233 Commits

Author SHA1 Message Date
Madawa Soysa
8b2a5f5157 Improve global proxy policy config UI
Improve the policy config ui to support auto config proxy using a pac file url
2019-01-29 11:08:28 +11:00
Madawa Soysa
2a959c39a7 Add Android global proxy policy UI components
Added UI components to create/edit and view global proxy settings.
2019-01-29 11:08:28 +11:00
Madawa Soysa
61210bd73e Implement new API for the global proxy policy 2019-01-29 11:08:28 +11:00
charitha
811a7348e4 Add compatible docker image for CI/CD 2019-01-26 00:27:01 +05:30
charitha
715bddca73 Fix repository configuration 2019-01-25 23:03:39 +05:30
Charitha Goonetilleke
1530ae9d77 Merge branch 'master' into 'master'
Fix mock service broken due to core changes in DeviceManagementProviderService

See merge request entgra/carbon-device-mgt-plugins!12
2019-01-25 17:29:54 +00:00
Charitha Goonetilleke
02bc4ff013 Merge branch 'windows-enterpise-app-install' into 'master'
Windows enterprise application installation feature

Closes product-iots#39

See merge request entgra/carbon-device-mgt-plugins!11
2019-01-25 17:29:27 +00:00
Saad Sahibjan
a31afaa85f Fix mock service broken due to core changes in DeviceManagementProviderService 2019-01-25 13:49:34 +05:30
Saad Sahibjan
8838286f9a Add windows enterprise app install feature 2019-01-25 11:42:37 +05:30
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
Dharmakeerthi Lasantha
8f49217954 Merge branch 'master' into 'master'
Enrollment application install feature for policy

See merge request entgra/carbon-device-mgt-plugins!8
2019-01-01 08:13:48 +00:00
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
charitha
24574baab6 Merge remote-tracking branch 'entgra/master' into entgra-master 2018-11-11 20:52:41 +05:30
charitha
27898adfba Change build image 2018-11-11 20:52:24 +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
613e556570 Prepare for 3.2.1 release 2018-11-11 19:41:12 +05:30
WSO2 Builder
1a810897fe [WSO2 Release] [Jenkins #3198] [Release 4.1.20] prepare for next development iteration 2018-10-31 06:10:10 +00:00
WSO2 Builder
8b77445a5b [WSO2 Release] [Jenkins #3198] [Release 4.1.20] prepare release v4.1.20 2018-10-31 06:09:58 +00:00
inoshperera
867793ebc2
Merge pull request #925 from charithag/master
Bump device mgt version
2018-10-31 11:28:56 +05:30
charitha
f8e9c2d474 Bump device mgt version 2018-10-31 10:44:52 +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
charitha
00e3c91d7f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into wso2-master 2018-10-30 15:47:42 +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
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
2018-10-25 14:30:49 +05:30
charitha
3eb845f759 Fix pom version 2018-10-25 14:29:43 +05:30
charitha
c5a3a919e5 Fixed issue in showing multiple devices locations in single map UI 2018-10-25 14:21:12 +05:30
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 Goonetilleke
e300619528
Merge pull request #923 from charithag/master
Update agent binaries for 3.3.1 release
2018-10-25 01:03:01 +05:30
charitha
d478ee9a3a Bump devicemgt version 2018-10-25 01:01:45 +05:30
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
Geeth
667027f62b
Merge pull request #922 from charithag/master
Fixed incorrect port issue when default ssl port is used
2018-10-24 21:52:18 +05:30
charitha
1347be2cea Fixed incorrect port issue when default ssl port is used 2018-10-24 20:10:31 +05:30
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
Hasunie
97c0b2b06d
Merge pull request #921 from charithag/master
Fixed test failure
2018-10-23 22:40:07 -07:00
charitha
6fbc4e1def Fixed test failure 2018-10-24 11:08:26 +05:30
Geeth
f81c8a1e87
Merge pull request #920 from lasanthaDLPDS/master
Improve default operations loading
2018-10-24 10:59:27 +05:30
lasanthaDLPDS
225b9a3201 Upgrade device mgt version 2018-10-24 09:58:35 +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
Geeth
c20492eb1c
Merge pull request #919 from charithag/master
Prevent all nodes from using a same app id for oauth
2018-10-23 19:00:58 +05:30
charitha
8cdf53b03f Enable FCM by default 2018-10-23 18:39:23 +05:30