harshanl
|
4e5f373c9c
|
Updated agent.apk for alert size fix
|
2016-10-12 17:28:50 +05:30 |
|
thusithakalugamage
|
47f6147857
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-10-11 18:37:00 +05:30 |
|
thusithakalugamage
|
f3dec07a47
|
[EMM-1618] - related improvements on remaining occurences
|
2016-10-11 18:36:09 +05:30 |
|
harshanl
|
5de9e1a57f
|
EMM-1731:Removed duplicate alert box
|
2016-10-11 16:48:16 +05:30 |
|
harshanl
|
5db518e5a8
|
EMM-1725:Added validation for system app
|
2016-10-10 16:50:46 +05:30 |
|
kamidu
|
1f0e39fddf
|
Fix for EMM-1601 ad EMM-1708
|
2016-10-10 14:16:29 +05:30 |
|
Megala
|
9f75c3a9a9
|
Merge remote-tracking branch 'upstream/master'
|
2016-10-07 16:46:26 +05:30 |
|
Megala
|
588f75cef5
|
Changing android apk with the changes for GCM
|
2016-10-07 16:39:24 +05:30 |
|
Kamidu Sachith Punchihewa
|
cc0ae4444d
|
Merge pull request #359 from thusithak/master
EMM 2.2.0-Alpha2 theme migration and issue fixes
|
2016-10-07 14:38:22 +05:30 |
|
kamidu
|
058c96e87c
|
Fix for EMM-1468
|
2016-10-07 13:08:29 +05:30 |
|
thusithakalugamage
|
b2134d34d3
|
[EMM-1685] - fix and few other related improvements
|
2016-10-07 12:31:05 +05:30 |
|
kamidu
|
7635db3167
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-10-07 10:04:31 +05:30 |
|
kamidu
|
85e1241feb
|
Fixing type check in device view
|
2016-10-07 10:04:25 +05:30 |
|
Kamidu Sachith Punchihewa
|
bd2197d489
|
Merge pull request #357 from thusithak/master
EMM 2.2.0-Alpha2 theme migration and issue fixes
|
2016-10-06 22:47:21 +05:30 |
|
kamidu
|
68840eae94
|
Fix for EMM-1680
|
2016-10-06 22:38:47 +05:30 |
|
harshanl
|
f43ba554d5
|
EMM-1678:Updated the oauth component versions
|
2016-10-06 19:44:47 +05:30 |
|
thusithakalugamage
|
324952defc
|
policy edit button group clear fix
|
2016-10-06 18:57:49 +05:30 |
|
Milan Perera
|
2bda72a5ce
|
Merge branch 'master' of https://github.com/wso1/carbon-device-mgt-plugins
|
2016-10-06 17:39:42 +05:30 |
|
Milan Perera
|
72329d93f0
|
Added pulse secure payload to UI
|
2016-10-06 17:36:13 +05:30 |
|
thusithakalugamage
|
06b2c44644
|
Header nav menu responsiveness improvements
|
2016-10-06 16:41:52 +05:30 |
|
kamidu
|
9f558ffd0f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-10-06 15:08:43 +05:30 |
|
kamidu
|
b3b429b664
|
Fixing EMM-1697
|
2016-10-06 15:00:01 +05:30 |
|
kamidu
|
db581a9575
|
removing redundence loggings
|
2016-10-06 12:20:52 +05:30 |
|
Kamidu Sachith Punchihewa
|
ffd5597828
|
Merge pull request #356 from Megala21/master
Fixing EMM-1688
|
2016-10-06 12:07:20 +05:30 |
|
Megala
|
10372a7f4e
|
Changing the equality check
|
2016-10-06 11:50:57 +05:30 |
|
Megala
|
51d6baf1d2
|
Reformatting code
|
2016-10-06 11:48:23 +05:30 |
|
Megala
|
4c54ba434a
|
Fixing EMM-1688
|
2016-10-06 11:31:45 +05:30 |
|
thusithakalugamage
|
97f3dcf4c7
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-10-05 19:18:16 +05:30 |
|
thusithakalugamage
|
9d9e8a8195
|
[EMM-1694] - Header responsive issues fix
|
2016-10-05 19:18:06 +05:30 |
|
kamidu
|
7431654f25
|
Fix for device view consistancy problems
|
2016-10-05 18:15:11 +05:30 |
|
thusithakalugamage
|
3acaf47209
|
Device details view tablist container height defect fix
|
2016-10-05 12:50:47 +05:30 |
|
kamidu
|
22ec7aa695
|
Fixes for the ui isuess in EMM 2.2.0-beta
|
2016-10-05 12:25:37 +05:30 |
|
kamidu
|
5936884c16
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-10-05 12:23:04 +05:30 |
|
harshanl
|
529ed17f82
|
New android agent with complaince monitoring issue fix
|
2016-10-04 20:03:03 +05:30 |
|
thusithakalugamage
|
73a600713c
|
resolving conflicts
|
2016-10-04 15:13:04 +05:30 |
|
kamidu
|
faf0f36683
|
Fix for EMM-1665
|
2016-10-04 13:27:21 +05:30 |
|
thusithakalugamage
|
0cbf647854
|
resolving conflicts
|
2016-10-03 11:56:57 +05:30 |
|
kamidu
|
19a2c1d1bd
|
Fix for Jira issue : EMM-1639
|
2016-10-03 11:50:57 +05:30 |
|
hasuniea
|
2ad390b877
|
removing duplicate event related classes
|
2016-09-30 13:40:17 +05:30 |
|
Chatura Dilan Perera
|
0b66649841
|
[maven-release-plugin] prepare for next development iteration
|
2016-09-29 21:47:43 +05:30 |
|
Chatura Dilan Perera
|
362003c9ab
|
[maven-release-plugin] prepare release v2.2.2
|
2016-09-29 21:47:34 +05:30 |
|
harshanl
|
821142b78d
|
windows ui fix
|
2016-09-29 21:29:51 +05:30 |
|
harshanl
|
5062a8dfae
|
Windows issue
|
2016-09-29 20:08:25 +05:30 |
|
harshanl
|
fd82cfcddd
|
Added new agent with policy fix
|
2016-09-29 18:51:31 +05:30 |
|
Rasika Perera
|
2517b7b385
|
Merge pull request #354 from rasika/iots-ga
Merge iot-ga branch
|
2016-09-29 15:20:18 +05:30 |
|
Rasika Perera
|
9d92b71bab
|
Merge pull request #1 from warunalakshitha/master
Upgrade iot product to latest carbon versions
|
2016-09-29 11:24:25 +05:30 |
|
Megala
|
90f509c065
|
Merge remote-tracking branch 'upstream/master'
|
2016-09-29 09:09:47 +05:30 |
|
Megala
|
c6b12f799f
|
Adding the check on the existence of the database before creating one
|
2016-09-29 01:42:11 +05:30 |
|
dilanua
|
0ffce8b177
|
Improving device view UI - adding ios specific device details support
|
2016-09-28 21:28:04 +05:30 |
|
dilanua
|
0a9ba54bb7
|
Improving policy listing UI
|
2016-09-28 20:58:07 +05:30 |
|
dilanua
|
9dfd06f95e
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1650
|
2016-09-28 15:44:32 +05:30 |
|
hasuniea
|
54ca0cacc5
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-09-28 14:27:49 +05:30 |
|
hasuniea
|
2cc9a50b92
|
adding permission for windows enrollment
|
2016-09-28 14:27:16 +05:30 |
|
dilanua
|
8bb1428df8
|
Improving device view info.retrieval - UI
|
2016-09-28 14:11:25 +05:30 |
|
charitha
|
a719c11d75
|
Update the agent application
|
2016-09-27 23:56:43 +05:30 |
|
Harshan Liyanage
|
f8bc1ff3bf
|
Merge pull request #352 from Megala21/master
EMM-1626 : Unable to retrieve device location for an enrolled android device
|
2016-09-27 17:59:01 +05:30 |
|
Megala
|
c55b62fdf4
|
Fixing EMM-1626
|
2016-09-27 17:40:29 +05:30 |
|
charitha
|
ea999bc98b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-09-27 15:24:36 +05:30 |
|
charitha
|
975fb078b5
|
(cherry picked from commit d68c4c8)
|
2016-09-27 15:24:18 +05:30 |
|
Megala
|
e51231fd66
|
Merge remote-tracking branch 'upstream/master'
|
2016-09-27 13:37:40 +05:30 |
|
Megala
|
135019f987
|
Fixing EMM-1626
|
2016-09-27 13:33:12 +05:30 |
|
dilanua
|
074abf3053
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1640
|
2016-09-27 12:46:50 +05:30 |
|
charitha
|
c0feb96590
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-09-27 11:22:19 +05:30 |
|
Chatura Dilan Perera
|
0cdde82c1b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-09-26 22:10:20 +05:30 |
|
Chatura Dilan Perera
|
f6de82bb77
|
Fixed android agent
|
2016-09-26 22:10:00 +05:30 |
|
Kamidu Sachith Punchihewa
|
47e6909f8d
|
Merge pull request #349 from saadsahibjan/master
Fix for https://wso2.org/jira/browse/EMM-1584
|
2016-09-26 22:02:41 +05:30 |
|
Saad Sahibjan
|
d05280cdf5
|
Fix for https://wso2.org/jira/browse/EMM-1584
|
2016-09-26 21:59:38 +05:30 |
|
Kamidu Sachith Punchihewa
|
f6c77e9b9e
|
Merge pull request #348 from saadsahibjan/master
Fix for https://wso2.org/jira/browse/EMM-1634
|
2016-09-26 20:24:23 +05:30 |
|
Saad Sahibjan
|
41865d07eb
|
Fix for https://wso2.org/jira/browse/EMM-1634
|
2016-09-26 20:19:20 +05:30 |
|
Kamidu Sachith Punchihewa
|
3944c5489e
|
Merge pull request #347 from saadsahibjan/master
Update the description of system update policy and whitelist applications - Android UI
|
2016-09-26 20:10:23 +05:30 |
|
dilanua
|
77836d80d9
|
Updating bulk operations info message
|
2016-09-26 20:07:16 +05:30 |
|
dilanua
|
17e7b92b23
|
FIX for JIRAS: https://wso2.org/jira/browse/EMM-1633
|
2016-09-26 19:52:54 +05:30 |
|
Rasika Perera
|
3f9bcd50ea
|
Correcting appContext=>@app.context, self.publicUri=>@unit.publicUri/@page.publicUri, currentUser.username=>@user.username
|
2016-09-26 19:17:05 +05:30 |
|
Saad Sahibjan
|
e4741c0b73
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-09-26 19:14:12 +05:30 |
|
Saad Sahibjan
|
891d9601ba
|
Update the description of system update policy and whitelist applications - Android UI
|
2016-09-26 19:03:23 +05:30 |
|
Rasika Perera
|
d8d69f3092
|
Updating modal name element
|
2016-09-26 18:52:52 +05:30 |
|
kamidu
|
e3a08d824a
|
Resolve conflicts with master
|
2016-09-26 18:12:53 +05:30 |
|
kamidu
|
e4cc0f0c0c
|
Fix for EMM-1329, EMM-1479
|
2016-09-26 18:06:45 +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 |
|
dilanua
|
9d35017744
|
FIX for JIRAS: https://wso2.org/jira/browse/EMM-1591,EMM-1590,EMM-1585
|
2016-09-26 17:28:22 +05:30 |
|
Rasika Perera
|
17dd96aa10
|
Returning correct representation of the device to template.
|
2016-09-26 17:15:12 +05:30 |
|
Rasika Perera
|
52dfcecb62
|
Updating devicemgt_admin into /api/device-mgt/v1.0.
|
2016-09-26 15:58:00 +05:30 |
|
hasuniea
|
fb6eded30c
|
fixed device lock issue
|
2016-09-23 22:27:34 +05:30 |
|
hasuniea
|
fc61128b8b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-09-23 22:06:49 +05:30 |
|
hasuniea
|
ece43f53bd
|
fixing windows issues
|
2016-09-23 22:06:14 +05:30 |
|
dilanua
|
bdd7703465
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1602
|
2016-09-23 20:33:02 +05:30 |
|
dilanua
|
7697c3ca39
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-09-23 19:47:12 +05:30 |
|
dilanua
|
ddea023fc2
|
Fixing the alignment issue of policy compliance listing of device view page
|
2016-09-23 19:46:48 +05:30 |
|
Ruwan
|
3d7dfa741b
|
Merge pull request #346 from ruwany/carbon-kernel-4.4.7
Migrating kernel/apim/appm/identity to latest versions
|
2016-09-23 17:04:26 +05:30 |
|
dilanua
|
0d8da5f63f
|
Fix for jira: https://wso2.org/jira/browse/EMM-1621
|
2016-09-23 16:02:53 +05:30 |
|
dilanua
|
f85e28c902
|
Fix for jira: https://wso2.org/jira/browse/EMM-1622
|
2016-09-23 15:57:04 +05:30 |
|
dilanua
|
8bd20911fe
|
Refactoring application list view for improper text placement issues
|
2016-09-23 12:28:15 +05:30 |
|
dilanua
|
a92070f16e
|
Fix for jira: https://wso2.org/jira/browse/EMM-1617
|
2016-09-23 11:45:13 +05:30 |
|
dilanua
|
4947664b4b
|
Fix for jira: https://wso2.org/jira/browse/EMM-1617
|
2016-09-23 11:15:45 +05:30 |
|
dilanua
|
3a7dbb81ea
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1616
|
2016-09-23 06:59:12 +05:30 |
|
dilanua
|
36eb2e2b16
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1615
|
2016-09-23 06:37:24 +05:30 |
|
dilanua
|
f47a1cdc55
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1614
|
2016-09-22 22:59:42 +05:30 |
|
dilanua
|
f5d95f0695
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1613
|
2016-09-22 22:45:28 +05:30 |
|
dilanua
|
2a4757539a
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1593
|
2016-09-22 22:12:46 +05:30 |
|
dilanua
|
bff3b3ee12
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1610
|
2016-09-22 19:45:29 +05:30 |
|
Ace
|
0cb99be949
|
Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
|
2016-09-22 19:09:26 +05:30 |
|
dilanua
|
1cca664e96
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-09-22 18:35:30 +05:30 |
|
dilanua
|
36d4c7dfcb
|
Updating emm device listing - UI
|
2016-09-22 18:35:13 +05:30 |
|
harshanl
|
212dcae8e7
|
Added scheduled time to App-install operation
|
2016-09-22 18:26:13 +05:30 |
|
dilanua
|
13aedbc6c6
|
Updating notifications side bar - UI
|
2016-09-22 18:19:28 +05:30 |
|
dilanua
|
1efbc15cdb
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-09-22 15:58:31 +05:30 |
|
dilanua
|
d7872782cc
|
https://wso2.org/jira/browse/EMM-1608
|
2016-09-22 15:58:13 +05:30 |
|
Rasika Perera
|
71784e6609
|
Fixing modal popups
|
2016-09-22 15:24:59 +05:30 |
|
Chatura Dilan
|
e0499a5d86
|
Merge pull request #345 from saadsahibjan/master
Remove unused COSU tab-Android EMM UI
|
2016-09-22 14:05:36 +05:30 |
|
Saad Sahibjan
|
9ac367cf8a
|
Remove unused COSU tab-Android EMM UI
|
2016-09-22 14:04:06 +05:30 |
|
dilanua
|
b6a150da23
|
Fixing JIRA: https://wso2.org/jira/browse/EMM-1603
|
2016-09-22 13:59:06 +05:30 |
|
dilanua
|
6665ac2642
|
Improvements to notifications side bar - UI
|
2016-09-22 13:14:45 +05:30 |
|
dilanua
|
215093b9a8
|
Updating android operation failure notification message format
|
2016-09-22 13:00:31 +05:30 |
|
Chatura Dilan
|
6bd25a4aad
|
Merge pull request #343 from saadsahibjan/master
Added validations for COSU create and edit configurations - Android E…
|
2016-09-21 16:00:18 +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 |
|
Ace
|
282fe25b47
|
Fixing dependency related issues
|
2016-09-21 12:57:03 +05:30 |
|
dilanua
|
b99529d9d0
|
Fixing JIRA: https://wso2.org/jira/browse/EMM-1588
|
2016-09-21 11:21:35 +05:30 |
|
thusithakalugamage
|
706894cd89
|
resolving conflicts
|
2016-09-21 10:59:36 +05:30 |
|
dilanua
|
c4c2df3723
|
Updating device listing UI - EMM
|
2016-09-20 22:21:45 +05:30 |
|
dilanua
|
d25779e335
|
Updating notification side-bar message format
|
2016-09-20 20:21:37 +05:30 |
|
dilanua
|
87d8c75682
|
Updating notification side-bar message format
|
2016-09-20 19:15:24 +05:30 |
|
dilanua
|
ab14f9516c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-09-20 19:04:36 +05:30 |
|
dilanua
|
13d784009c
|
Updating android operation failure notification message
|
2016-09-20 19:04:15 +05:30 |
|
Chatura Dilan Perera
|
eaaadfae32
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-09-20 18:02:56 +05:30 |
|
Ace
|
6c3ba5e688
|
Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
|
2016-09-20 18:02:42 +05:30 |
|
Saad Sahibjan
|
f5009d8406
|
Added validations for COSU create and edit configurations - Android EMM UI
|
2016-09-20 16:29:36 +05:30 |
|
kamidu
|
3bb8bcb79e
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-09-20 14:46:52 +05:30 |
|
kamidu
|
6144d9eea2
|
Fic for EMM-1581
|
2016-09-20 14:46:08 +05:30 |
|
dilanua
|
cd7f63502a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-09-20 14:21:58 +05:30 |
|
dilanua
|
afea5fcfc6
|
Refactoring notifications side-pane - EMM UI
|
2016-09-20 14:21:40 +05:30 |
|
Chatura Dilan
|
a8319c6770
|
Merge pull request #342 from saadsahibjan/master
Adding COSU policy view configurations - Android EMM UI
|
2016-09-20 13:53:37 +05:30 |
|
Saad Sahibjan
|
31b9c0c3dd
|
Adding COSU policy view configurations - Android EMM UI
|
2016-09-20 12:57:49 +05:30 |
|
dilanua
|
712f62aa43
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-09-20 12:50:44 +05:30 |
|
dilanua
|
00448814e8
|
Refactoring notifications side-pane - EMM UI
|
2016-09-20 12:50:18 +05:30 |
|
Saad Sahibjan
|
d18b9a4082
|
Adding COSU policy edit configurations - Android EMM UI
|
2016-09-20 12:39:10 +05:30 |
|
Ace
|
03c0108db5
|
Removing unwanted dependencies from windows api
|
2016-09-20 10:39:34 +05:30 |
|
Chatura Dilan Perera
|
bf72d212f7
|
[maven-release-plugin] prepare for next development iteration
|
2016-09-19 19:53:27 +05:30 |
|
Chatura Dilan Perera
|
18780e5274
|
[maven-release-plugin] prepare release v2.2.1
|
2016-09-19 19:52:58 +05:30 |
|
Chatura Dilan Perera
|
93cecb0ded
|
Merge branch 'master' into release-2.2.1
|
2016-09-19 18:37:57 +05:30 |
|
dilanua
|
b65e99a4a7
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-09-19 18:36:31 +05:30 |
|
dilanua
|
9add795fe4
|
Adding date picker to oper.bar - EMM
|
2016-09-19 18:35:34 +05:30 |
|
Chatura Dilan Perera
|
42b50b642a
|
Merge branch 'master' into release-2.2.1
|
2016-09-19 18:01:54 +05:30 |
|
hasuniea
|
8c877b3071
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-09-19 17:57:27 +05:30 |
|
hasuniea
|
9ecbd4e1b4
|
fixing windows operation issue
|
2016-09-19 17:54:58 +05:30 |
|
Chatura Dilan Perera
|
4088c736eb
|
Changes to android agent
|
2016-09-19 17:17:42 +05:30 |
|
dilanua
|
ed5af90c46
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-09-19 17:13:26 +05:30 |
|
dilanua
|
4c8094be4f
|
Adding date-picker unit - EMM
|
2016-09-19 17:13:02 +05:30 |
|
hasuniea
|
29c1b055d9
|
fixing code conflicts
|
2016-09-19 16:29:04 +05:30 |
|