Commit Graph

249 Commits

Author SHA1 Message Date
lasantha
48fdda4e38 adding latest android agent and fixing test failures 2017-12-24 21:44:04 +05:30
Ace
d57cb4a3a1 Bumping cdmf version and updating unit tests 2017-11-30 10:52:30 +05:30
Gathika94
6b6b82e639 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-11-23 14:43:13 +05:30
charitha
82c7eefd2e Fix for https://github.com/wso2/product-iots/issues/1496 2017-11-23 14:39:08 +05:30
Gathika94
6bcbf4e5dd minor changes 2017-11-22 21:44:51 +05:30
charitha
6828d0ae41 Bumping device-mgt-core to latest release 2017-10-30 15:50:45 +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
Nirothipan
1f484e6a53 resolving conflicts 2017-10-18 14:31:12 +05:30
Nirothipan
5b86f692c1 resolving conflicts 2017-10-18 14:30:39 +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
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
charitha
1da9ce9187 Add oauth based event publisher 2017-10-09 17:53:33 +05:30
charitha
269f2e8b7f Finalized device group extension for siddhi 2017-10-06 13:40:27 +05:30
Nirothipan
ca2cf5382f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into fileTransfer 2017-10-03 14:26:59 +05:30
Nirothipan
d217a72851 adding userName parameter to API 2017-10-03 13:53:01 +05:30
charitha
609857f624 Fix for https://github.com/wso2/product-iots/issues/1423 2017-09-22 10:53:57 +05:30
Nirothipan
cff69459be code formatting and updating comments, descriptions 2017-09-21 17:18:57 +05:30
Nirothipan
2ddfbed6db changing variable names 2017-09-21 14:05:30 +05:30
Nirothipan
a79580b8ac code formatting 2017-09-19 18:59:51 +05:30
megala21
c73d1da8f2 Fixing https://github.com/wso2/product-iots/issues/1388 2017-09-15 14:59:38 +05:30
Nirothipan
79447cbaf7 changing operation names 2017-09-12 17:05:08 +05:30
Nirothipan
c9bac2c860 fileTransferfeature, uploading files from device to ftp server 2017-09-11 13:10:42 +05:30
Nirothipan
80941b8d2b making error messages more meaningful 2017-09-07 12:29:59 +05:30
Nirothipan
85752584bb modifying messages 2017-09-07 12:09:54 +05:30
Nirothipan
118587ae6e file transfer feature 2017-09-06 13:39:51 +05:30
sameera910409
b275f5aead fixes https://github.com/wso2/product-iots/issues/364 2017-08-30 09:35:46 +05:30
Nirothipan
939a770c29 replacing with single imports 2017-08-24 15:57:32 +05:30
Nirothipan
a90658b5e7 code formatting 2017-08-24 15:47:54 +05:30
Nirothipan
8ce3b6a8c3 code formatting 2017-08-24 15:47:46 +05:30
Nirothipan
989248e711 adding file Name parameter 2017-08-24 15:47:14 +05:30
Nirothipan
9432e498e9 adding file Name parameter 2017-08-24 15:46:58 +05:30
Nirothipan
ac834fbe59 adding file Name parameter 2017-08-24 15:46:49 +05:30
Nirothipan
56384bcc53 modifying form parameters 2017-08-24 15:46:37 +05:30
Nirothipan
7ed6552a57 adding form parameters 2017-08-24 15:46:18 +05:30
Nirothipan
704f511964 Adding initial file transfer feature 2017-08-24 15:44:19 +05:30
lasantha
b035321def fixes wso2/product-iots/#1266 2017-08-05 07:24:15 +05:30
Harshan Liyanage
2b671443fa Merge pull request #714 from hasuniea/master
Windows enrollment issue was resolved from wso2/product-iots#1029
2017-06-23 10:31:01 +05:30
Hasunie
2dc23d0574 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-19 18:17:48 +05:30
ayyoob
d1500dcd6d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0 2017-06-17 19:31:22 +05:30
Rasika Perera
13d777ff71 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into geo-fencing 2017-06-16 15:50:57 +05:30
Hasunie
592d6e7085 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-14 17:56:36 +05:30
ayyoob
fd369d55de Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0 2017-06-14 13:19:26 +05:30
Harshan Liyanage
ed28a72483 Prevented getDevice calls from loading uncessary device-info. 2017-06-13 17:12:40 +05:30
Rasika Perera
dcbf9f30b0 Removed publishing into org.wso2.android.agent.Stream 2017-06-05 10:18:14 +05:30
Hasunie
30eb8ca91d adding debug logs to GlobalThrowableMapper 2017-06-02 12:44:48 +05:30
ayyoob
8381070bf6 Implemented Pull Notification Support 2017-06-01 17:21:23 +05:30