Commit Graph

3344 Commits

Author SHA1 Message Date
Charitha Goonetilleke
186b3e16e4 Merge pull request #653 from ruwany/master
Merging cloud-310 branch with master
2017-04-25 11:29:04 +05:30
Ace
2564f88951 Upgrading device-mgt version 2017-04-25 11:17:15 +05:30
Ace
27095b099d Merging cherrypicked commits from cloud-310 branch 2017-04-25 09:54:11 +05:30
WSO2 Builder
72fab84bf9 [WSO2 Release] [Jenkins #2650] [Release 3.0.25] prepare for next development iteration 2017-04-24 17:57:19 +05:30
WSO2 Builder
5ff67af60a [WSO2 Release] [Jenkins #2650] [Release 3.0.25] prepare release v3.0.25 2017-04-24 17:57:03 +05:30
Chatura Dilan
95f61ea7a0 Merge pull request #652 from inoshperera/master
moving app subscription to a new thread
2017-04-24 17:40:24 +05:30
inoshperera
3fb3ebd893 moving app subscription to a new thread 2017-04-24 17:33:56 +05:30
charitha
de0cb9a5a2 Add agent 3.1.15 for cloud
(cherry picked from commit 0d6800b)
2017-04-24 11:35:25 +05:30
charitha
ab91e3a6b0 Fixed https://github.com/wso2/cdmf-agent-android/issues/33
(cherry picked from commit fadd2e6)
2017-04-24 11:35:18 +05:30
charitha
d80c25ed2b Updating UIs of agents to latest
(cherry picked from commit 90c0618)
2017-04-24 11:35:07 +05:30
Rasika Perera
a1b0298374 Updating android agent into latest
(cherry picked from commit a41436d)
2017-04-24 11:34:37 +05:30
Jasintha
ce4365f601 Removing testing values
(cherry picked from commit 31d5977)
2017-04-24 11:33:46 +05:30
Jasintha
3980899686 Fixing MQTT adpater and analytics resources for androidsense userstory
(cherry picked from commit b04b583)
2017-04-24 11:33:25 +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
WSO2 Builder
4c0e505008 [WSO2 Release] [Jenkins #2645] [Release 3.0.24] prepare for next development iteration 2017-04-21 16:28:48 +05:30
WSO2 Builder
b653b4871d [WSO2 Release] [Jenkins #2645] [Release 3.0.24] prepare release v3.0.24 2017-04-21 16:28:35 +05:30
Charitha Goonetilleke
73f9568c09 Merge pull request #647 from amalhub/master
Adding latest android-agent.apk
2017-04-21 16:22:19 +05:30
amalhub
ec75361c57 Adding latest android-agent.apk (https://github.com/wso2/cdmf-agent-android/releases/tag/v3.1.13) 2017-04-21 14:57:43 +05:30
Vishanth
0539fc4e90 settin equinox p2 type group to true 2017-04-19 13:05:58 +05:30
WSO2 Builder
7a2b64605f [WSO2 Release] [Jenkins #2640] [Release 3.0.23] prepare for next development iteration 2017-04-18 10:33:01 +05:30
WSO2 Builder
908ee841e9 [WSO2 Release] [Jenkins #2640] [Release 3.0.23] prepare release v3.0.23 2017-04-18 10:32:45 +05:30
Ruwan
7e7ceefca3 Merge pull request #640 from ayyoob/devicetype-3.1.0
added token recovery option when token refresh failed
2017-04-18 10:14:20 +05:30
ayyoob
310525d066 added token recovery option when token refresh failed 2017-04-17 17:44:38 +05:30
WSO2 Builder
84220e2c25 [WSO2 Release] [Jenkins #2627] [Release 3.0.22] prepare for next development iteration 2017-04-07 14:56:29 +05:30
WSO2 Builder
5da8bf98b8 [WSO2 Release] [Jenkins #2627] [Release 3.0.22] prepare release v3.0.22 2017-04-07 14:56:13 +05:30
kamidu
564c188b83 Merge branch 'cloud-3.1.0' 2017-04-07 14:32:13 +05:30
kamidu
bcdd78ae68 Merge branch 'master' into cloud-3.1.0 2017-04-07 14:31:11 +05:30
Ruwan
622860a5df Merge pull request #637 from Kamidu/cloud-3.1.0
Location and operation bar relate ui fixes for Cloud 3.1.0
2017-04-05 17:12:33 +05:30
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