Commit Graph

1934 Commits

Author SHA1 Message Date
Charitha Goonetilleke
6c6cde7df0 Merge pull request #623 from sameeragunarathne/master
fix android apk install operation issue by checking resource access s…
2017-03-22 20:06:50 +05:30
sinthuja
09033aef51 Fixing the issue in feature installation. 2017-03-22 19:04:47 +05:30
sameera910409
d907f1bc51 fix https://wso2.org/jira/browse/EMM-1880 2017-03-22 19:02:47 +05:30
sinthuja
b1af6eeaf4 Moving the cdmf-analytics repo components to device-mgt-iot-plugins. 2017-03-22 18:19:17 +05:30
WSO2 Builder
2049e44319 [WSO2 Release] [Jenkins #2596] [Release 3.0.16] prepare for next development iteration 2017-03-22 15:53:43 +05:30
WSO2 Builder
d15dc25c13 [WSO2 Release] [Jenkins #2596] [Release 3.0.16] prepare release v3.0.16 2017-03-22 15:53:34 +05:30
Geeth
bc7b77e07a Merge pull request #622 from charithag/master-androidtryit
Adding Android-tryit tool
2017-03-22 15:32:54 +05:30
charitha
c3e241e1d5 Adding Android-tryit tool 2017-03-22 15:29:37 +05:30
WSO2 Builder
8df6e56f40 [WSO2 Release] [Jenkins #2593] [Release 3.0.15] prepare for next development iteration 2017-03-21 20:11:47 +05:30
WSO2 Builder
2e8f5a63d2 [WSO2 Release] [Jenkins #2593] [Release 3.0.15] prepare release v3.0.15 2017-03-21 20:11:33 +05:30
Ayyoob Hamza
632547447c Merge pull request #621 from sinthuja/master
Changes to adhere to the new directory structure.
2017-03-21 19:56:07 +05:30
megala21
c8f25a0b77 Updating json version 2017-03-16 21:42:44 +05:30
Harshan Liyanage
893eccd817 Merge pull request #618 from hasuniea/master
resolved #616
2017-03-16 15:55:27 +05:30
Harshan Liyanage
bd2ded8563 Removed unnecessary braces. 2017-03-16 15:54:39 +05:30
Susinda
1c13f1b97d Cloud and general doc links issue fixed 2017-03-16 14:42:09 +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
42cc311f00 Fixing NPE in AndroidAPIUtils
resolved #616
2017-03-16 12:57:04 +05:30
Hasunie
143569b83b Fixing null property in AndriodAPIUtils 2017-03-16 12:26:37 +05:30
Hasunie
a30fbfdbec Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-03-16 12:04:24 +05:30
WSO2 Builder
c49b33bb4a [WSO2 Release] [Jenkins #2584] [Release 3.0.14] prepare for next development iteration 2017-03-15 18:08:34 +05:30
WSO2 Builder
e1064dca07 [WSO2 Release] [Jenkins #2584] [Release 3.0.14] prepare release v3.0.14 2017-03-15 18:08:26 +05:30
Kamidu Sachith Punchihewa
95f64b0a15 Merge pull request #615 from wso2/cloud-3.1.0
Cloud related fixes
2017-03-15 17:47:31 +05:30
WSO2 Builder
68f329cbda [WSO2 Release] [Jenkins #2581] [Release 3.0.13] prepare for next development iteration 2017-03-14 16:48:21 +05:30
WSO2 Builder
8669d1b44e [WSO2 Release] [Jenkins #2581] [Release 3.0.13] prepare release v3.0.13 2017-03-14 16:48:11 +05:30
Harshan Liyanage
2753deb365 Merge pull request #602 from sameeragunarathne/master
refactor code for firebase cloud messaging
2017-03-14 16:41:19 +05:30
sinthuja
2f20502d81 Merge branch 'wso2-master' 2017-03-14 00:45:59 +05:30
sinthuja
5c79504529 Resolving the startup issue in the broker profile. 2017-03-13 21:51:52 +05:30
Harshan Liyanage
1882171824 Merge pull request #611 from Kamidu/cloud-3.1.0
android view related ui fixes
2017-03-13 17:47:10 +05:30
WSO2 Builder
18d3518236 [WSO2 Release] [Jenkins #2576] [Release 3.0.12] prepare for next development iteration 2017-03-13 17:43:20 +05:30
WSO2 Builder
867790d3cb [WSO2 Release] [Jenkins #2576] [Release 3.0.12] prepare release v3.0.12 2017-03-13 17:43:10 +05:30
kamidu
c97dfb4080 android view related ui fixes : MACOS :: Git config auto genarated for sachithp@wso2's-MacBook-Pro.local 2017-03-13 17:40:26 +05:30
sameera910409
078209347a refactor code for firebase cloud messaging 2017-03-13 14:30:27 +05:30
Susinda
1ebc84450f revert the implementation 'agent download from github release' 2017-03-13 14:15:03 +05:30
Susinda
286d293ddd revert the implementation 'agent download from github release' 2017-03-13 13:55:42 +05:30
Susinda
7c3d94cf77 Added README file to avoid git ignoring empty dirs 2017-03-10 12:43:31 +05:30
Susinda
f96389e671 Android agent downloadded from github relese location, Hasuni's fix on initial operations added 2017-03-10 12:00: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
kamidu
d2d56651cc fix for leaflet tile not loading issues
(cherry picked from commit 6604c23257)
2017-03-07 15:25:24 +05:30
ayyoob
2dd7f53489 added log support for server to server communication 2017-03-07 02:04:26 +05:30
Harshan Liyanage
b82a59c828 Merge branch 'cloud-3.1.0' of https://github.com/hasuniea/carbon-device-mgt-plugins into hasuniea-cloud-3.1.0 2017-03-03 17:45:26 +05:30
Hasunie
7fcf4e9a3b Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-03-03 17:38:39 +05:30
Hasunie
3e50f0b737 adding initial operations 2017-03-03 17:37:55 +05:30
Harshan Liyanage
dc054e6ed5 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-03-03 17:10:17 +05:30
Harshan Liyanage
f2761e9b0a Removed info operation addition upon page load 2017-03-03 17:10:02 +05:30
ayyoob
a10eb7cb14 removed feature 2017-03-03 17:03:57 +05:30
ayyoob
77ec1c4107 fixed operation bar permission rendering issue 2017-03-02 20:27:46 +05:30
Milan Perera
360a58dce6 Merge pull request #596 from Kamidu/cloud-3.1.0
fix for leaflet tile not loading issues
2017-03-02 15:23:48 +05:30
kamidu
6604c23257 fix for leaflet tile not loading issues 2017-03-02 15:20:27 +05:30
ayyoob
eda4710211 resolved device type download issue in windows OS and added log support for service clients. 2017-03-02 00:32:39 +05:30
susinda
5ad6dc1f1d Fxing PhoneNumber Serach for android 2017-02-28 20:28:48 +05:30
lakshani
3505cc8abc Adding (cherry-pick) lakshani's commit on 'Fixed the issue in server startu' 2017-02-28 20:28:43 +05:30
Susinda Perera
6f9ea52218 Merge pull request #593 from wso2/cloud-3.1.0
Merging to 3.1.0-test from Cloud 3.1.0 - Till Feb-28
2017-02-28 19:25:12 +05:30
ayyoob
384ab40f5b added ssl context 2017-02-27 16:44:26 +05:30
Hasunie
17c017379c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-02-21 11:50:12 +05:30
lakshani
ffee269a0e Fixed the issue in server startup- removed error logs 2017-02-20 14:01:56 +05:30
lakshani
964e2aade7 Fixed the issue in server startup error logs 2017-02-20 13:53:18 +05:30
Kamidu Sachith Punchihewa
740bb976fa adding location operation to device view page 2017-02-19 19:10:20 +05:30
kamidu
afaa75d3a9 adding screen shots 2017-02-17 20:46:09 +05:30
kamidu
463d8a9dff wording sugessions for cloud 2017-02-16 00:23:58 +05:30
Imesh Chandrasiri
20bd1b399b Removed conflict markings 2017-02-15 11:16:41 +05:30
Imesh Chandrasiri
a890d9fb89 Device enrollment page revamp 2017-02-15 11:14:07 +05:30
Imesh Chandrasiri
bccc47ebd2 Conflict fix 2017-02-15 10:46:07 +05:30
Imesh Chandrasiri
4b7637a426 Device enrollment page revampl 2017-02-15 10:43:47 +05:30
Imesh Chandrasiri
37b032d710 Merge branch 'cloud-3.1.0' into cloud-3.1.0 2017-02-15 10:20:21 +05:30
Imesh Chandrasiri
67313882ed Device enrollment page changes for cloud 2017-02-14 22:39:17 +05:30
kamidu
71c93eec29 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-02-14 19:27:11 +05:30
kamidu
305df1c2bd enhansing the device cloud ui 2017-02-14 19:27:02 +05:30
kamidu
9d733d6cc1 Fixing android location issue 2017-02-14 12:58:13 +05:30
Susinda Perera
8a9affc4b8 Merge pull request #582 from ayyoob/210releasepatch
added device management api to be default
2017-02-14 12:06:48 +05:30
Imesh Chandrasiri
f10e26f0a9 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-02-14 10:27:20 +05:30
Imesh Chandrasiri
2fcd5ca020 Model Popup title space issue fix 2017-02-14 10:26:56 +05:30
Hasunie
0c87c32094 Merging changes 2017-02-14 10:18:57 +05:30
lakshani
f5d71d917e Added change device status feature to mobile plugings 2017-02-09 14:14:44 +05:30
ayyoob
a294c20a2a added device management api to be default 2017-02-09 09:59:24 +05:30
lakshani
3c349a71e6 removed unwanted repositories from restconnector 2017-02-07 10:42:28 +05:30
lakshani
edb8e71ac2 Added change device status feature to mobile plugings 2017-02-07 10:38:12 +05:30
ayyoob
e66311b844 fixed few multi tenant issues 2017-02-06 03:47:54 +05:30
ayyoob
00feadac97 fixed validation url property 2017-02-05 21:49:37 +05:30
ayyoob
dd3017578a added artefact deployment support for device types 2017-02-05 17:52:52 +05:30
kamidu
fe338aa412 removing the module vfa plugin 2017-02-03 17:20:25 +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
kamidu
bd715b7aac resolving branch conflicts 2017-02-03 16:51:25 +05:30
kamidu
53840dcc37 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-02-03 13:01:21 +05:30
ayyoob
56de095599 resolved app connector build slowness issue 2017-02-03 05:00:57 +05:30
WSO2 Builder
d7e4580e77 [WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare for next development iteration 2017-02-02 16:06:06 +05:30
WSO2 Builder
1737eaaa79 [WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare release v3.0.11 2017-02-02 16:05:58 +05:30
Hasunie
3b98e0f754 Merge pull request #572 from charithag/master-update-swagger-docs
Update swagger docs
2017-02-02 14:58:11 +05:30
ayyoob
e0f6e9579d fixed multi tenant issues after testing 2017-02-02 03:17:19 +05:30
ayyoob
2cfc4540f4 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-02-02 01:59:53 +05:30
ayyoob
50d8aedade fixed analytics multi tenant issues 2017-02-02 01:59:48 +05:30
charitha
9bf38af4f7 Fix issues in swagger docs 2017-02-01 15:03:10 +05:30
Milan Perera
99782e6360 Resolved conflicts and merged 2017-02-01 14:13:01 +05:30
Hasunie
1ab1def2b6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-02-01 12:04:18 +05:30
Hasunie
fb28a4042f fixing windows config issues 2017-02-01 12:02:50 +05:30
Milan Perera
cc8066896b Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud 2017-02-01 11:31:42 +05:30
Milan Perera
e1a419425e Added cloud agent to the download page 2017-02-01 11:31:15 +05:30
ayyoob
73eb590a7c renamed grant type to default 2017-02-01 00:08:32 +05:30
Kamidu Sachith Punchihewa
64cb8b5223 Update load-map.js 2017-01-31 14:10:29 +05:30
kamidu
55489d5e52 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-01-31 13:44:12 +05:30