Commit Graph

294 Commits

Author SHA1 Message Date
geethkokila
f551a88d2e Fixing the error in event publishing
This is error occurrs when the event publishing cause and error, it does not print any log.
2018-01-29 10:12:51 +05:30
Rasika Perera
c56bdd5d6b Fixing https://github.com/wso2/product-iots/issues/1611 2018-01-23 14:00:42 +05:30
charitha
82c7eefd2e Fix for https://github.com/wso2/product-iots/issues/1496 2017-11-23 14:39:08 +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
cafdeaef48 Refactor code to be optimized 2017-10-13 12:54:11 +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
ayyoob
94d626ca3c changed event definition 2017-05-30 00:31:04 +05:30
kamidu
103b795a86 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-11 21:36:52 +05:30
kamidu
0c1ff01697 chaning the notification msg 2017-05-11 21:36:40 +05:30
Rasika Perera
51a613f167 Resolving #642 : Improve UX on location updates for Android
(cherry picked from commit 64b1b33)
2017-04-24 11:24:26 +05:30
sameera910409
d907f1bc51 fix https://wso2.org/jira/browse/EMM-1880 2017-03-22 19:02:47 +05:30
Harshan Liyanage
bd2ded8563 Removed unnecessary braces. 2017-03-16 15:54:39 +05:30
Hasunie
809a30fc7a fixing code format issue 2017-03-16 14:22:24 +05:30
Hasunie
7de234c164 resolved #616 2017-03-16 14:14:32 +05:30
Hasunie
143569b83b Fixing null property in AndriodAPIUtils 2017-03-16 12:26:37 +05:30
sameera910409
078209347a refactor code for firebase cloud messaging 2017-03-13 14:30:27 +05:30
Susinda Perera
fb6cfb6699 Merge pull request #1 from susinda/cloud-3.1.0
Merging from Cloud 3.1.0
2017-03-09 12:45:44 +05:30
Hasunie
3e50f0b737 adding initial operations 2017-03-03 17:37:55 +05:30
susinda
5ad6dc1f1d Fxing PhoneNumber Serach for android 2017-02-28 20:28:48 +05:30
ayyoob
a294c20a2a added device management api to be default 2017-02-09 09:59:24 +05:30
Kamidu Sachith Punchihewa
68b36babe6 Merge pull request #575 from wso2/master
UI fixes for device cloud
2017-02-03 16:53:19 +05:30
charitha
9bf38af4f7 Fix issues in swagger docs 2017-02-01 15:03:10 +05:30
ayyoob
9d64fd0d4b fixed multi tenant login issue 2017-01-16 16:08:07 +05:30
ayyoob
466c2b1151 moved to gateway mode 2017-01-12 19:29:59 +05:30
Milan Perera
2eb18e304a Change scope of android configuration 2017-01-10 11:39:09 +05:30
Milan Perera
77d1e684f6 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-06 16:48:02 +05:30
Rasika Perera
81c62b3a13 Merge pull request #501 from ayyoob/release-3.0.x
made policy manager to be part of device mgt service
2017-01-06 14:15:23 +05:30
inoshperera
7da5ae239b Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-06 11:38:41 +05:30
inoshperera
22a58121d2 changing the Andrid API tag to standerdise 2017-01-06 11:38:09 +05:30
Milan Perera
86aac810ce Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-06 10:11:16 +05:30
Milan Perera
d2d912fb6d Refactored scopes strings 2017-01-06 10:10:45 +05:30
ayyoob
f603f58fd1 moved compliance payload generation code to api impl 2017-01-05 22:06:37 +05:30
Maninda
0c7f1adcba Fixed some issues reported with FindBugs while security plugin is enabled. 2017-01-05 19:36:52 +05:30
ayyoob
54011d2197 removed provider tenant domain and user from the web.xml 2017-01-05 17:57:04 +05:30
ayyoob
3fa679a3e9 made policy manager to be part of device type mgt service 2017-01-05 14:37:27 +05:30
Madawa Soysa
1b56ebb831 Improving scope annotations in android plugin 2017-01-05 14:26:43 +05:30
charitha
a4841d87ba Add custom email template for android 2016-12-22 18:31:05 +05:30
charitha
0c2465d03e Add enrollment invitations API EP for android 2016-12-20 23:48:21 +05:30
Harshan Liyanage
559fa3fe38 Resolved conflicts 2016-12-08 16:40:18 +05:30
inoshperera
3b867a533d fixing http status code 2016-11-24 12:46:33 +05:30
inoshperera
d9a449dd26 adding modify enrollment capability to save chnages in enrollment such as GCM token update 2016-11-23 12:36:05 +05:30
Harshan Liyanage
242253b8f2 Merge pull request #391 from shavidissa/master
Added swagger annotations and refined the messages
2016-10-27 12:21:26 +05:30
Shavindri
f6c0aeecfc Added swagger annotations and refined the messages 2016-10-27 12:05:17 +05:30
Megala
e23ecc5b64 Fixing EMM-1779 2016-10-25 17:34:53 +05:30
hasuniea
2ad390b877 removing duplicate event related classes 2016-09-30 13:40:17 +05:30
harshanl
fd82cfcddd Added new agent with policy fix 2016-09-29 18:51:31 +05:30
charitha
975fb078b5 (cherry picked from commit d68c4c8) 2016-09-27 15:24:18 +05:30
charitha
9886e2e75f Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt-plugins into carbon-kernel-4.4.3
# Conflicts:
#	components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ApplicationInstallation.java
(cherry picked from commit 257d6cd)
2016-09-26 18:01:46 +05:30
charitha
ba2acb5e75 Refactor code
(cherry picked from commit 01f2a91)
2016-09-26 18:01:12 +05:30
harshanl
212dcae8e7 Added scheduled time to App-install operation 2016-09-22 18:26:13 +05:30
dilanua
215093b9a8 Updating android operation failure notification message format 2016-09-22 13:00:31 +05:30
Chatura Dilan Perera
7174945f21 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-21 13:51:44 +05:30
Chatura Dilan Perera
ae99d189e7 Fixed logcat and events get APIs 2016-09-21 13:51:29 +05:30
dilanua
b99529d9d0 Fixing JIRA: https://wso2.org/jira/browse/EMM-1588 2016-09-21 11:21:35 +05:30
dilanua
13d784009c Updating android operation failure notification message 2016-09-20 19:04:15 +05:30
dilanua
4a78cd6ece Updating android permissions 2016-09-19 14:09:39 +05:30
dilanua
19b6a334ad Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations 2016-09-18 07:34:44 +05:30
dilanua
8d338a584b Changing permissions - /devices/owning to /devices/owning-device 2016-09-17 17:23:21 +05:30
kamidu
05f540abf1 permission modifications 2016-09-09 17:48:26 +05:30
mharindu
cbae4e207d Implemented permission based authorization 2016-09-09 03:00:11 +05:30
charitha
bfba008218 Removed url from application uninstall
(cherry picked from commit 45a582e)
2016-09-08 10:21:44 +05:30