Commit Graph

2866 Commits

Author SHA1 Message Date
kamidu
dc0fda3925 fixing location and operation loading ui issues 2017-04-05 17:04:28 +05:30
kamidu
f91baa81df Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-04-05 17:02:50 +05:30
kamidu
eb7a83bcc8 fixing location and operation loading ui issues 2017-04-05 17:02:38 +05:30
kamidu
9d3949ea37 enabling loading for location refrsh 2017-04-05 16:35:35 +05:30
Harshan Liyanage
32489876f1 Merge pull request #636 from Kamidu/cloud-3.1.0
device status fix
2017-04-05 11:22:34 +05:30
kamidu
1d663e1b68 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-04-05 11:14:26 +05:30
kamidu
4662db6701 device status fic 2017-04-05 11:14:10 +05:30
charitha
6f3578f797 Adding agent 3.1.7 for cloud 2017-04-05 10:19:31 +05:30
Kamidu Sachith Punchihewa
f08f9fb785 Merge pull request #635 from harshanL/cloud-3.1.0
Updated device-mgt version
2017-04-04 18:27:48 +05:30
Harshan Liyanage
36946f7267 Updated device-mgt version 2017-04-04 17:27:41 +05:30
Harshan Liyanage
96c1d033eb Merge pull request #634 from Kamidu/cloud-3.1.0
android enrollment ui fixes and operation in progress animation fix
2017-04-04 17:21:31 +05:30
kamidu
9ad8cb21ae android enrollment ui fixes and operation in progress animation fix 2017-04-04 17:13:02 +05:30
Harshan Liyanage
7fa517f81b Merge pull request #633 from wso2/revert-631-cloud-3.1.0
Revert "Updated device-mgt version & interface."
2017-04-04 13:10:41 +05:30
Kamidu Sachith Punchihewa
8f169d0116 Revert "Updated device-mgt version & interface." 2017-04-04 13:10:05 +05:30
Ruwan
e08f9249b5 Merge pull request #632 from Kamidu/cloud-3.1.0
Device location refresh and COPE related policy filtering in Cloud 3.1.0
2017-04-03 18:58:21 +05:30
kamidu
2abd8823a3 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-04-03 18:28:30 +05:30
Ruwan
8863e56867 Merge pull request #631 from harshanL/cloud-3.1.0
Updated device-mgt version & interface.
2017-04-03 17:50:56 +05:30
Harshan Liyanage
ff5a1c9c5d Updated device-mgt version & interface. 2017-04-03 17:48:21 +05:30
kamidu
ee24a8baea merging upstream cloud-3.1.0 2017-04-03 17:35:44 +05:30
kamidu
ace58b6649 policy filtering and location reload for cloud 2017-04-03 17:27:23 +05:30
WSO2 Builder
2cf8496351 [WSO2 Release] [Jenkins #2617] [Release 3.0.21] prepare for next development iteration 2017-03-30 10:31:28 +05:30
WSO2 Builder
7d6def8976 [WSO2 Release] [Jenkins #2617] [Release 3.0.21] prepare release v3.0.21 2017-03-30 10:31:12 +05:30
Amal Gunatilake
a05b9fbcf6 Merge pull request #629 from charithag/master
Fix for https://github.com/wso2/product-iots/issues/332
2017-03-30 10:10:37 +05:30
charitha
6398d79760 Fix https://github.com/wso2/product-iots/issues/332
(cherry picked from commit 0e4df87)
2017-03-29 23:16:39 +05:30
charitha
0e4df87dda Fix https://github.com/wso2/product-iots/issues/332 2017-03-29 23:15:59 +05:30
charitha
110c9405b1 Update device enrollement steps
(cherry picked from commit ca8ad9f)
2017-03-29 22:28:21 +05:30
charitha
ca8ad9f528 Update device enrollement steps 2017-03-29 22:27:26 +05:30
WSO2 Builder
de5f854367 [WSO2 Release] [Jenkins #2614] [Release 3.0.20] prepare for next development iteration 2017-03-29 15:23:01 +05:30
WSO2 Builder
13cbce1e37 [WSO2 Release] [Jenkins #2614] [Release 3.0.20] prepare release v3.0.20 2017-03-29 15:22:46 +05:30
Amal Gunatilake
4fec9a2db6 Merge pull request #628 from charithag/master
UI/UX Improvements
2017-03-29 15:06:40 +05:30
charitha
179cc93c1a Downgraded android OS version to avoid ANR
(cherry picked from commit e13aa77)
2017-03-29 14:37:08 +05:30
charitha
6ea597233b Add google play store links to device enrollment page
(cherry picked from commit 243a3df)
2017-03-29 14:36:38 +05:30
charitha
572d85dbd1 Instruct mac users to restart after installing HAXM
(cherry picked from commit b53fe60)
2017-03-29 14:35:59 +05:30
charitha
e13aa77b21 Downgraded android OS version to avoid ANR 2017-03-29 14:30:12 +05:30
charitha
2d67d33eb6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-03-29 14:09:02 +05:30
charitha
243a3df89d Add google play store links to device enrollment page 2017-03-29 14:06:15 +05:30
WSO2 Builder
0f3318e353 [WSO2 Release] [Jenkins #2612] [Release 3.0.19] prepare for next development iteration 2017-03-29 11:13:40 +05:30
WSO2 Builder
41041f3f6d [WSO2 Release] [Jenkins #2612] [Release 3.0.19] prepare release v3.0.19 2017-03-29 11:13:18 +05:30
Amal Gunatilake
4fb778b7ce Merge pull request #627 from charithag/master
Instruct mac users to restart after installing HAXM
2017-03-29 10:56:42 +05:30
charitha
d8218ef221 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-03-29 09:46:07 +05:30
charitha
b53fe60807 Instruct mac users to restart after installing HAXM 2017-03-29 09:45:34 +05:30
WSO2 Builder
cf3d543fea [WSO2 Release] [Jenkins #2605] [Release 3.0.18] prepare for next development iteration 2017-03-24 15:45:48 +05:30
WSO2 Builder
59194a1286 [WSO2 Release] [Jenkins #2605] [Release 3.0.18] prepare release v3.0.18 2017-03-24 15:45:32 +05:30
Geeth
ec48c546fd Merge pull request #626 from charithag/master-fix
Fixed unzipping issue in tryit tool
2017-03-24 15:22:07 +05:30
charitha
52060c9d40 Fixed unzipping issue in tryit tool
(cherry picked from commit 01187db)
2017-03-24 14:45:19 +05:30
charitha
33342e0e97 Fix documentation links 2017-03-24 14:44:55 +05:30
charitha
01187db029 Fixed unzipping issue in tryit tool 2017-03-24 14:35:31 +05:30
WSO2 Builder
82ac8417d3 [WSO2 Release] [Jenkins #2602] [Release 3.0.17] prepare for next development iteration 2017-03-23 13:14:16 +05:30
WSO2 Builder
d0e9362ee1 [WSO2 Release] [Jenkins #2602] [Release 3.0.17] prepare release v3.0.17 2017-03-23 13:14:05 +05:30
Harshan Liyanage
78df383ea7 Merge pull request #625 from charithag/cloud-3.1.0
Adding tryit and updated the agent
2017-03-23 10:14:10 +05:30