charitha
|
975fb078b5
|
(cherry picked from commit d68c4c8)
|
8 years ago |
Megala
|
e51231fd66
|
Merge remote-tracking branch 'upstream/master'
|
8 years ago |
Megala
|
135019f987
|
Fixing EMM-1626
|
8 years ago |
dilanua
|
074abf3053
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1640
|
8 years ago |
charitha
|
c0feb96590
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
Chatura Dilan Perera
|
0cdde82c1b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
Chatura Dilan Perera
|
f6de82bb77
|
Fixed android agent
|
8 years ago |
Kamidu Sachith Punchihewa
|
47e6909f8d
|
Merge pull request #349 from saadsahibjan/master
Fix for https://wso2.org/jira/browse/EMM-1584
|
8 years ago |
Saad Sahibjan
|
d05280cdf5
|
Fix for https://wso2.org/jira/browse/EMM-1584
|
8 years ago |
Kamidu Sachith Punchihewa
|
f6c77e9b9e
|
Merge pull request #348 from saadsahibjan/master
Fix for https://wso2.org/jira/browse/EMM-1634
|
8 years ago |
Saad Sahibjan
|
41865d07eb
|
Fix for https://wso2.org/jira/browse/EMM-1634
|
8 years ago |
Kamidu Sachith Punchihewa
|
3944c5489e
|
Merge pull request #347 from saadsahibjan/master
Update the description of system update policy and whitelist applications - Android UI
|
8 years ago |
dilanua
|
77836d80d9
|
Updating bulk operations info message
|
8 years ago |
dilanua
|
17e7b92b23
|
FIX for JIRAS: https://wso2.org/jira/browse/EMM-1633
|
8 years ago |
Rasika Perera
|
3f9bcd50ea
|
Correcting appContext=>@app.context, self.publicUri=>@unit.publicUri/@page.publicUri, currentUser.username=>@user.username
|
8 years ago |
Saad Sahibjan
|
e4741c0b73
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
Saad Sahibjan
|
891d9601ba
|
Update the description of system update policy and whitelist applications - Android UI
|
8 years ago |
Rasika Perera
|
d8d69f3092
|
Updating modal name element
|
8 years ago |
kamidu
|
e3a08d824a
|
Resolve conflicts with master
|
8 years ago |
kamidu
|
e4cc0f0c0c
|
Fix for EMM-1329, EMM-1479
|
8 years ago |
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)
|
8 years ago |
charitha
|
ba2acb5e75
|
Refactor code
(cherry picked from commit 01f2a91)
|
8 years ago |
dilanua
|
9d35017744
|
FIX for JIRAS: https://wso2.org/jira/browse/EMM-1591,EMM-1590,EMM-1585
|
8 years ago |
Rasika Perera
|
17dd96aa10
|
Returning correct representation of the device to template.
|
8 years ago |
Rasika Perera
|
52dfcecb62
|
Updating devicemgt_admin into /api/device-mgt/v1.0.
|
8 years ago |
hasuniea
|
fb6eded30c
|
fixed device lock issue
|
8 years ago |
hasuniea
|
fc61128b8b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
hasuniea
|
ece43f53bd
|
fixing windows issues
|
8 years ago |
dilanua
|
bdd7703465
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1602
|
8 years ago |
dilanua
|
7697c3ca39
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
dilanua
|
ddea023fc2
|
Fixing the alignment issue of policy compliance listing of device view page
|
8 years ago |
Ruwan
|
3d7dfa741b
|
Merge pull request #346 from ruwany/carbon-kernel-4.4.7
Migrating kernel/apim/appm/identity to latest versions
|
8 years ago |
dilanua
|
0d8da5f63f
|
Fix for jira: https://wso2.org/jira/browse/EMM-1621
|
8 years ago |
dilanua
|
f85e28c902
|
Fix for jira: https://wso2.org/jira/browse/EMM-1622
|
8 years ago |
dilanua
|
8bd20911fe
|
Refactoring application list view for improper text placement issues
|
8 years ago |
dilanua
|
a92070f16e
|
Fix for jira: https://wso2.org/jira/browse/EMM-1617
|
8 years ago |
dilanua
|
4947664b4b
|
Fix for jira: https://wso2.org/jira/browse/EMM-1617
|
8 years ago |
dilanua
|
3a7dbb81ea
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1616
|
8 years ago |
dilanua
|
36eb2e2b16
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1615
|
8 years ago |
dilanua
|
f47a1cdc55
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1614
|
8 years ago |
dilanua
|
f5d95f0695
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1613
|
8 years ago |
dilanua
|
2a4757539a
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1593
|
8 years ago |
dilanua
|
bff3b3ee12
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1610
|
8 years ago |
Ace
|
0cb99be949
|
Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
|
8 years ago |
dilanua
|
1cca664e96
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
dilanua
|
36d4c7dfcb
|
Updating emm device listing - UI
|
8 years ago |
harshanl
|
212dcae8e7
|
Added scheduled time to App-install operation
|
8 years ago |
dilanua
|
13aedbc6c6
|
Updating notifications side bar - UI
|
8 years ago |
dilanua
|
1efbc15cdb
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
dilanua
|
d7872782cc
|
https://wso2.org/jira/browse/EMM-1608
|
8 years ago |
Rasika Perera
|
71784e6609
|
Fixing modal popups
|
8 years ago |
Chatura Dilan
|
e0499a5d86
|
Merge pull request #345 from saadsahibjan/master
Remove unused COSU tab-Android EMM UI
|
8 years ago |
Saad Sahibjan
|
9ac367cf8a
|
Remove unused COSU tab-Android EMM UI
|
8 years ago |
dilanua
|
b6a150da23
|
Fixing JIRA: https://wso2.org/jira/browse/EMM-1603
|
8 years ago |
dilanua
|
6665ac2642
|
Improvements to notifications side bar - UI
|
8 years ago |
dilanua
|
215093b9a8
|
Updating android operation failure notification message format
|
8 years ago |
Chatura Dilan
|
6bd25a4aad
|
Merge pull request #343 from saadsahibjan/master
Added validations for COSU create and edit configurations - Android E…
|
8 years ago |
Chatura Dilan Perera
|
7174945f21
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
Chatura Dilan Perera
|
ae99d189e7
|
Fixed logcat and events get APIs
|
8 years ago |
Ace
|
282fe25b47
|
Fixing dependency related issues
|
8 years ago |
dilanua
|
b99529d9d0
|
Fixing JIRA: https://wso2.org/jira/browse/EMM-1588
|
8 years ago |
thusithakalugamage
|
706894cd89
|
resolving conflicts
|
8 years ago |
dilanua
|
c4c2df3723
|
Updating device listing UI - EMM
|
8 years ago |
dilanua
|
d25779e335
|
Updating notification side-bar message format
|
8 years ago |
dilanua
|
87d8c75682
|
Updating notification side-bar message format
|
8 years ago |
dilanua
|
ab14f9516c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
dilanua
|
13d784009c
|
Updating android operation failure notification message
|
8 years ago |
Chatura Dilan Perera
|
eaaadfae32
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
Ace
|
6c3ba5e688
|
Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
|
8 years ago |
Saad Sahibjan
|
f5009d8406
|
Added validations for COSU create and edit configurations - Android EMM UI
|
8 years ago |
kamidu
|
3bb8bcb79e
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
kamidu
|
6144d9eea2
|
Fic for EMM-1581
|
8 years ago |
dilanua
|
cd7f63502a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
dilanua
|
afea5fcfc6
|
Refactoring notifications side-pane - EMM UI
|
8 years ago |
Chatura Dilan
|
a8319c6770
|
Merge pull request #342 from saadsahibjan/master
Adding COSU policy view configurations - Android EMM UI
|
8 years ago |
Saad Sahibjan
|
31b9c0c3dd
|
Adding COSU policy view configurations - Android EMM UI
|
8 years ago |
dilanua
|
712f62aa43
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
dilanua
|
00448814e8
|
Refactoring notifications side-pane - EMM UI
|
8 years ago |
Saad Sahibjan
|
d18b9a4082
|
Adding COSU policy edit configurations - Android EMM UI
|
8 years ago |
Ace
|
03c0108db5
|
Removing unwanted dependencies from windows api
|
8 years ago |
Chatura Dilan Perera
|
bf72d212f7
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
Chatura Dilan Perera
|
18780e5274
|
[maven-release-plugin] prepare release v2.2.1
|
8 years ago |
Chatura Dilan Perera
|
93cecb0ded
|
Merge branch 'master' into release-2.2.1
|
8 years ago |
dilanua
|
b65e99a4a7
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
dilanua
|
9add795fe4
|
Adding date picker to oper.bar - EMM
|
8 years ago |
Chatura Dilan Perera
|
42b50b642a
|
Merge branch 'master' into release-2.2.1
|
8 years ago |
hasuniea
|
8c877b3071
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
hasuniea
|
9ecbd4e1b4
|
fixing windows operation issue
|
8 years ago |
Chatura Dilan Perera
|
4088c736eb
|
Changes to android agent
|
8 years ago |
dilanua
|
ed5af90c46
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
dilanua
|
4c8094be4f
|
Adding date-picker unit - EMM
|
8 years ago |
hasuniea
|
29c1b055d9
|
fixing code conflicts
|
8 years ago |
hasuniea
|
18e577a84a
|
adding windowsplugin changes
|
8 years ago |
Rasika Perera
|
245ea2b0d6
|
Fixing incorrect text formatting
|
8 years ago |
dilanua
|
4e9b19f3a5
|
Updating android permissions - operation-bar
|
8 years ago |
dilanua
|
4a78cd6ece
|
Updating android permissions
|
8 years ago |
Ace
|
a05dad6f4d
|
Merging with master
|
8 years ago |
Rasika Perera
|
35d9678075
|
Updating permissions on operation bar for windows and iOS
|
8 years ago |
dilanua
|
42a5493a89
|
Fixing JIRA: https://wso2.org/jira/browse/EMM-1577
|
8 years ago |
dilanua
|
9925a20964
|
Fixing JIRA: https://wso2.org/jira/browse/EMM-1576
|
8 years ago |