Commit Graph

6756 Commits

Author SHA1 Message Date
WSO2 Builder
51c2897e8b [WSO2 Release] [Jenkins #3198] [Release 4.1.20] prepare release v4.1.20 2018-10-31 06:09:58 +00:00
WSO2 Builder
ca1a245257 [WSO2 Release] [Jenkins #3198] [Release 4.1.20] prepare release v4.1.20 2018-10-31 06:09:58 +00:00
WSO2 Builder
18b69085ee [WSO2 Release] [Jenkins #3198] [Release 4.1.20] prepare release v4.1.20 2018-10-31 06:09:58 +00:00
WSO2 Builder
fc987e61ee [WSO2 Release] [Jenkins #3198] [Release 4.1.20] prepare release v4.1.20 2018-10-31 06:09:58 +00:00
WSO2 Builder
e195eb776c [WSO2 Release] [Jenkins #3198] [Release 4.1.20] prepare release v4.1.20 2018-10-31 06:09:58 +00:00
WSO2 Builder
c4d091367d [WSO2 Release] [Jenkins #3198] [Release 4.1.20] prepare release v4.1.20 2018-10-31 06:09:58 +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
cc778819d3 [WSO2 Release] [Jenkins #3196] [Release 4.1.19] prepare for next development iteration 2018-10-25 09:10:46 +00:00
WSO2 Builder
f2238404d5 [WSO2 Release] [Jenkins #3196] [Release 4.1.19] prepare for next development iteration 2018-10-25 09:10:46 +00:00
WSO2 Builder
6c2e08309d [WSO2 Release] [Jenkins #3196] [Release 4.1.19] prepare for next development iteration 2018-10-25 09:10:46 +00:00
WSO2 Builder
b2f492ba1a [WSO2 Release] [Jenkins #3196] [Release 4.1.19] prepare for next development iteration 2018-10-25 09:10:46 +00:00
WSO2 Builder
da28677aa9 [WSO2 Release] [Jenkins #3196] [Release 4.1.19] prepare for next development iteration 2018-10-25 09:10:46 +00:00
WSO2 Builder
9f2cc275f0 [WSO2 Release] [Jenkins #3196] [Release 4.1.19] prepare for next development iteration 2018-10-25 09:10:46 +00:00
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
66dd0d7746 [WSO2 Release] [Jenkins #3196] [Release 4.1.19] prepare release v4.1.19 2018-10-25 09:10:34 +00:00
WSO2 Builder
94f5376858 [WSO2 Release] [Jenkins #3196] [Release 4.1.19] prepare release v4.1.19 2018-10-25 09:10:34 +00:00
WSO2 Builder
0d4c4fb0a8 [WSO2 Release] [Jenkins #3196] [Release 4.1.19] prepare release v4.1.19 2018-10-25 09:10:34 +00:00
WSO2 Builder
bd3eccd4d8 [WSO2 Release] [Jenkins #3196] [Release 4.1.19] prepare release v4.1.19 2018-10-25 09:10:34 +00:00
WSO2 Builder
51024a8df2 [WSO2 Release] [Jenkins #3196] [Release 4.1.19] prepare release v4.1.19 2018-10-25 09:10:34 +00:00
WSO2 Builder
58802f5e9f [WSO2 Release] [Jenkins #3196] [Release 4.1.19] prepare release v4.1.19 2018-10-25 09:10:34 +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
176d58d82e [WSO2 Release] [Jenkins #3194] [Release 4.1.18] prepare for next development iteration 2018-10-24 19:46:42 +00:00
WSO2 Builder
e704511d01 [WSO2 Release] [Jenkins #3194] [Release 4.1.18] prepare for next development iteration 2018-10-24 19:46:42 +00:00
WSO2 Builder
6af667c175 [WSO2 Release] [Jenkins #3194] [Release 4.1.18] prepare for next development iteration 2018-10-24 19:46:42 +00:00
WSO2 Builder
4359a49931 [WSO2 Release] [Jenkins #3194] [Release 4.1.18] prepare for next development iteration 2018-10-24 19:46:42 +00:00
WSO2 Builder
8e80199872 [WSO2 Release] [Jenkins #3194] [Release 4.1.18] prepare for next development iteration 2018-10-24 19:46:42 +00:00
WSO2 Builder
f134794bc9 [WSO2 Release] [Jenkins #3194] [Release 4.1.18] prepare for next development iteration 2018-10-24 19:46:42 +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
18aedc8fad [WSO2 Release] [Jenkins #3194] [Release 4.1.18] prepare release v4.1.18 2018-10-24 19:46:29 +00:00
WSO2 Builder
4786462f09 [WSO2 Release] [Jenkins #3194] [Release 4.1.18] prepare release v4.1.18 2018-10-24 19:46:29 +00:00
WSO2 Builder
158b860118 [WSO2 Release] [Jenkins #3194] [Release 4.1.18] prepare release v4.1.18 2018-10-24 19:46:29 +00:00
WSO2 Builder
335fea4507 [WSO2 Release] [Jenkins #3194] [Release 4.1.18] prepare release v4.1.18 2018-10-24 19:46:29 +00:00
WSO2 Builder
d97db3765e [WSO2 Release] [Jenkins #3194] [Release 4.1.18] prepare release v4.1.18 2018-10-24 19:46:29 +00:00
WSO2 Builder
40b8f62739 [WSO2 Release] [Jenkins #3194] [Release 4.1.18] prepare release v4.1.18 2018-10-24 19:46:29 +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
82a1af1df4 [WSO2 Release] [Jenkins #3192] [Release 4.1.17] prepare for next development iteration 2018-10-24 16:31:03 +00:00
WSO2 Builder
160a4d8dd1 [WSO2 Release] [Jenkins #3192] [Release 4.1.17] prepare for next development iteration 2018-10-24 16:31:03 +00:00
WSO2 Builder
1660bea91d [WSO2 Release] [Jenkins #3192] [Release 4.1.17] prepare for next development iteration 2018-10-24 16:31:03 +00:00
WSO2 Builder
8dac3930fb [WSO2 Release] [Jenkins #3192] [Release 4.1.17] prepare for next development iteration 2018-10-24 16:31:03 +00:00