Commit Graph

4270 Commits

Author SHA1 Message Date
WSO2 Builder
a78086f002 [WSO2 Release] [Jenkins #3056] [Release 4.0.95] prepare for next development iteration 2017-11-17 09:44:11 +00:00
WSO2 Builder
02aa1191ee [WSO2 Release] [Jenkins #3056] [Release 4.0.95] prepare release v4.0.95 2017-11-17 09:43:56 +00:00
WSO2 Builder
9525104ac2 Merge commit '73737377305a5e2638a5ea9e12061c980c387bd2' into b9b84dc3-0b3c-4158-94b7-1cdb578dd6ad 2017-11-17 09:16:05 +00:00
WSO2 Builder
7373737730 [WSO2 Release] [Jenkins #3055] [Release 4.0.94] prepare for next development iteration 2017-11-17 09:07:21 +00:00
WSO2 Builder
8acea1f50e [WSO2 Release] [Jenkins #3055] [Release 4.0.94] prepare release v4.0.94 2017-11-17 09:07:04 +00:00
Charitha Goonetilleke
c79836fc11
Merge pull request #838 from menakaj/master
Fixing code formatting issues.
2017-11-17 14:30:00 +05:30
Ruwan
0b7f2364ed
Merge pull request #845 from charithag/master
Expose device management core APIs as siddhi extensions
2017-11-17 14:12:16 +05:30
charitha
f790b13baa Bump device mgt version latest 2017-11-17 13:39:33 +05:30
charitha
3d71b3fd15 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
# Conflicts:
#	components/extensions/siddhi-extensions/org.wso2.extension.siddhi.device/pom.xml
2017-11-17 12:58:35 +05:30
charitha
5f4bada92a Add improvments to oauth-http publisher to work with url templates 2017-11-17 12:56:27 +05:30
charitha
69b1102ee2 Add siddhi extensions to reflect get methods in device management core service 2017-11-17 12:55:14 +05:30
WSO2 Builder
92565a4aa4 [WSO2 Release] [Jenkins #3053] [Release 4.0.93] prepare for next development iteration 2017-11-16 15:59:16 +00:00
WSO2 Builder
4639708db5 [WSO2 Release] [Jenkins #3053] [Release 4.0.93] prepare release v4.0.93 2017-11-16 15:59:00 +00:00
charitha
69afdb3533 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
# Conflicts:
#	components/extensions/siddhi-extensions/org.wso2.extension.siddhi.device/pom.xml
2017-11-16 21:13:22 +05:30
charitha
a2a46a3439 Add siddhi extensions to reflect get methods in device management core service 2017-11-16 21:10:28 +05:30
Kamidu Sachith Punchihewa
e69bb0da8b
Merge pull request #844 from madhawap/master
Updating devicemgt core dependency version
2017-11-16 21:00:27 +05:30
madhawap
014ad4c441 Updating devicemgt core dependency version 2017-11-16 20:53:20 +05:30
WSO2 Builder
2f18ecef0a [WSO2 Release] [Jenkins #3051] [Release 4.0.92] prepare for next development iteration 2017-11-02 11:56:51 +00:00
WSO2 Builder
fcbf997078 [WSO2 Release] [Jenkins #3051] [Release 4.0.92] prepare release v4.0.92 2017-11-02 11:56:35 +00:00
Madhawa Perera
b089d4c0a2
Merge pull request #843 from madawas/master
Increasing carbon device mgt version
2017-11-02 17:02:18 +05:30
Madawa Soysa
905aa8637c Increasing carbon device mgt version 2017-11-02 16:57:38 +05:30
WSO2 Builder
344dba991a [WSO2 Release] [Jenkins #3049] [Release 4.0.91] prepare for next development iteration 2017-10-31 07:46:40 +00:00
WSO2 Builder
a572cf6fe1 [WSO2 Release] [Jenkins #3049] [Release 4.0.91] prepare release v4.0.91 2017-10-31 07:46:26 +00:00
Madhawa Perera
475e9a2571
Merge pull request #842 from charithag/master
Set carbon.devicemgt.plugins.version to 4.0.91-SNAPSHOT
2017-10-31 12:55:25 +05:30
charitha
8c27f9a3ad Set carbon.devicemgt.plugins.version to 4.0.91-SNAPSHOT 2017-10-31 12:52:57 +05:30
lasantha
76197af8cc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-10-31 10:33:08 +05:30
lasantha
520cb8216b fixed build errors 2017-10-31 10:29:57 +05:30
lasantha
23cf965975 resolved build failure 2017-10-31 10:15:00 +05:30
Geeth
7a4090351d
Merge pull request #841 from charithag/add-emm-analytics
Fix root pom version mismatch
2017-10-31 10:12:37 +05:30
charitha
5816f15968 Fix root pom version mismatch 2017-10-31 10:07:15 +05:30
lasantha
aebc6b3443 resolve merge conflicts and merge with upstream 2017-10-31 09:51:26 +05:30
Charitha Goonetilleke
10fc099c66
Merge pull request #840 from charithag/add-emm-analytics
Add emm analytics
2017-10-30 18:06:20 +05:30
charitha
30314639d9 Fix license year and formatting issues 2017-10-30 17:52:52 +05:30
charitha
6828d0ae41 Bumping device-mgt-core to latest release 2017-10-30 15:50:45 +05:30
lasantha
978449581d Updated carbon device mgt plugins version 2017-10-30 15:44:52 +05:30
charitha
94097dd0c0 Merge branch 'master' into add-emm-analytics
# Conflicts:
#	components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/EventReceiverServiceImpl.java
#	components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidAPIUtils.java
#	pom.xml
2017-10-30 10:20:16 +05:30
Menaka Jayawardena
4bed9cb1ff Code formatting and refactoring for Permission Update Listeners of device types. 2017-10-26 00:24:40 +05:30
Menaka Jayawardena
82e8ad026f Code formatting and refactoring for device-mgt-plugins siddhi extension. 2017-10-24 10:41:55 +05:30
Menaka Jayawardena
19ad2093f5 Code formatting for android sense agent. 2017-10-24 10:41:04 +05:30
Menaka Jayawardena
8271728c10 Added missing licence headers for android-sense analytics scripts. 2017-10-23 15:22:57 +05:30
Menaka Jayawardena
59d2cbb0e3 Fixed code formatting issue in windows-policy-edit.js 2017-10-23 15:06:00 +05:30
Menaka Jayawardena
18f08b6ac8 Fixing code formatting issues. 2017-10-23 15:06:00 +05:30
WSO2 Builder
4e8090ae5c [WSO2 Release] [Jenkins #3039] [Release 4.0.90] prepare for next development iteration 2017-10-18 11:37:05 +00:00
WSO2 Builder
952d6ba91c [WSO2 Release] [Jenkins #3039] [Release 4.0.90] prepare release v4.0.90 2017-10-18 11:36:51 +00:00
Charitha Goonetilleke
3b18779775 Merge pull request #837 from Nirothipan/fileTransfer
Minor change in display dialog.
2017-10-18 16:41:25 +05:30
Nirothipan
673d47191e removing unecessary + 2017-10-18 16:15:49 +05:30
WSO2 Builder
90f3717544 [WSO2 Release] [Jenkins #3037] [Release 4.0.89] prepare for next development iteration 2017-10-18 09:35:08 +00:00
WSO2 Builder
0bfd80c63e [WSO2 Release] [Jenkins #3037] [Release 4.0.89] prepare release v4.0.89 2017-10-18 09:34:54 +00:00
Charitha Goonetilleke
1ce74f47c9 Merge pull request #814 from Nirothipan/fileTransfer
File transfer Feature
2017-10-18 14:40:25 +05:30
Nirothipan
1f484e6a53 resolving conflicts 2017-10-18 14:31:12 +05:30