Commit Graph

4391 Commits

Author SHA1 Message Date
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
Nirothipan
5b86f692c1 resolving conflicts 2017-10-18 14:30:39 +05:30
Nirothipan
d428901b22 ui-improvements 2017-10-18 11:54:03 +05:30
Nirothipan
5aea03c66f reordering operations 2017-10-18 11:31:54 +05:30
warunalakshitha
24f680fa47 upgrade device mgt version 2017-10-15 15:26:54 +05:30
WSO2 Builder
0e9df6405e [WSO2 Release] [Jenkins #3035] [Release 4.0.88] prepare for next development iteration 2017-10-13 15:54:42 +00:00
WSO2 Builder
3e30878e4a [WSO2 Release] [Jenkins #3035] [Release 4.0.88] prepare release v4.0.88 2017-10-13 15:54:28 +00:00
sinthuja
0f9e3273e8 Merge pull request #834 from charithag/master
Add unit tests for WSO2 Carbon - Android JAX-RS API
2017-10-13 21:02:48 +05:30
charitha
b48c337d06 Refactoring the code 2017-10-13 17:37:08 +05:30
charitha
cbd90feb68 Add few more tests 2017-10-13 14:57:58 +05:30
charitha
a98a33aa86 Fixed product test failure 2017-10-13 14:16:24 +05:30
charitha
baa30d39a3 Add more test cases 2017-10-13 12:54:52 +05:30
charitha
cafdeaef48 Refactor code to be optimized 2017-10-13 12:54:11 +05:30
charitha
9532c69874 Add test cases for Android Device Management Admin Service. 2017-10-12 06:36:09 +05:30
charitha
e37e722ac6 Refactored Util methods 2017-10-12 06:32:12 +05:30
warunalakshitha
5f2fc025c3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into remote-control 2017-10-11 18:06:02 +05:30
Charitha Goonetilleke
b9d7563c93 Merge pull request #19 from Gathika94/add-emm-analytics
fixed some version issues in pom files
2017-10-11 16:58:49 +05:30
Gathika94
83faa0461c minor changes 2017-10-11 16:55:56 +05:30
Gathika94
6bfca3c3aa fixed some version issues in pom files 2017-10-11 16:39:37 +05:30
charitha
e02d336413 Fixed issue in MT 2017-10-10 12:59:47 +05:30
charitha
883cfff218 Revert device mgt version change 2017-10-09 17:56:58 +05:30
charitha
4f11cf832d Removed obsolete cApps 2017-10-09 17:56:09 +05:30
charitha
aeb80f0977 Removed obsolete cApps 2017-10-09 17:54:03 +05:30
charitha
1da9ce9187 Add oauth based event publisher 2017-10-09 17:53:33 +05:30
warunalakshitha
0ddb899b24 Fix issue with closing session which are abort by client 2017-10-09 12:35:10 +05:30
charitha
2891f4c8da Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into add-emm-analytics 2017-10-06 13:40:52 +05:30
charitha
269f2e8b7f Finalized device group extension for siddhi 2017-10-06 13:40:27 +05:30
charitha
12c9e9a7c7 Add DeviceInfo event reporting 2017-10-06 13:30:46 +05:30
WSO2 Builder
4cbcb5d2e6 [WSO2 Release] [Jenkins #3032] [Release 4.0.87] prepare for next development iteration 2017-10-04 13:15:15 +05:30
WSO2 Builder
189a0b9d6b [WSO2 Release] [Jenkins #3032] [Release 4.0.87] prepare release v4.0.87 2017-10-04 13:14:58 +05:30