madhawap
|
429b52f037
|
resolve conflicts
|
8 years ago |
madhawap
|
3249079965
|
Seperate out task operations
|
8 years ago |
inoshperera
|
07aacbc291
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
Hasunie
|
fc10431b41
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
8 years ago |
Hasunie
|
35ba0b2a9b
|
fixing windows enrollment flow
|
8 years ago |
Hasunie
|
0fd317d027
|
adding windows operation bar
|
8 years ago |
Hasunie
|
fa6ef30d17
|
fixing windows device view issues
|
8 years ago |
Chatura Dilan
|
7dc3535af6
|
Merge branch 'release-3.0.x' of github.com:wso2/carbon-device-mgt-plugins into release-3.0.x
|
8 years ago |
Chatura Dilan
|
df20fbc0aa
|
Added COSU policy wizard
|
8 years ago |
Ace
|
326d59e7c1
|
Adding android operations-bar related changes
|
8 years ago |
Madawa Soysa
|
215fd51ffb
|
Merge pull request #426 from madawas/IOTS-296
IOTS-296: Generalizing policy UI for Android device type
|
8 years ago |
WSO2 Builder
|
4ae70fe1f1
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
42c2b04c62
|
[maven-release-plugin] prepare release v2.2.7
|
8 years ago |
Harshan Liyanage
|
3787ae1431
|
Merge pull request #431 from wso2/release-2.2.6
Updating component versions after release.
|
8 years ago |
Harshan Liyanage
|
3673e38274
|
Updated android agent apk
|
8 years ago |
WSO2 Builder
|
ab087bf934
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
072dd089ef
|
[maven-release-plugin] prepare release v2.2.6
|
8 years ago |
Hasunie
|
1038c23c98
|
adding windows qr-code scanner
|
8 years ago |
Harshan Liyanage
|
02baf19cc7
|
Added latest android agent
|
8 years ago |
Madawa Soysa
|
ea7da0724f
|
IOTS-296: Generalizing policy UI for Android device type
This commit includes moving policy flow device type specific client side logic and UI components to the android plugin.
|
8 years ago |
dilanua
|
4e001afef2
|
Changing emm device statistics menu item to work with relative path
|
8 years ago |
dilanua
|
6de9925198
|
Changing EMM device statistics menu icon
|
8 years ago |
dilanua
|
9fb5c3fd93
|
Fixes to JIRA: https://wso2.org/jira/browse/EMM-1845
|
8 years ago |
Megala
|
7b3be4294e
|
Fixing problems in displaying operation bar for ios
|
8 years ago |
WSO2 Builder
|
bfa2c5fa61
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
09d434bda9
|
[maven-release-plugin] prepare release v3.0.1
|
8 years ago |
Megala
|
6c9c4a15fd
|
Removing the sender id
|
8 years ago |
Imesh Chandrasiri
|
bc075dedf0
|
Changes for IoT build
|
8 years ago |
inoshperera
|
78232cd34c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
inoshperera
|
18c0760ba5
|
Changing gcm endpoint to fcm
|
8 years ago |
Harshan Liyanage
|
e1afb5bcdc
|
Merge branch 'master' of https://github.com/wso1/carbon-device-mgt-plugins
|
8 years ago |
inoshperera
|
3b867a533d
|
fixing http status code
|
8 years ago |
Harshan Liyanage
|
6cc3f39dd3
|
Added security filters to emm-web-agent app
|
8 years ago |
inoshperera
|
d9a449dd26
|
adding modify enrollment capability to save chnages in enrollment such as GCM token update
|
8 years ago |
inoshperera
|
b027f5dbe9
|
adding a button and connection to ios factory reset backend API
|
8 years ago |
Ace
|
f3de1cf85e
|
Adding windows-web-agent
|
8 years ago |
dilanua
|
1cce94cef9
|
Fixing operation button stuck issue
|
8 years ago |
GPrathap
|
3d971d2bb7
|
removed @API and @Permission annotations and added @SwaggerDefinition and @Authorization annotations
|
8 years ago |
dilanua
|
861c5f861e
|
Updating device statistics menu item url
|
8 years ago |
dilanua
|
dbeedf246b
|
Adding deviceStatisticsEnabled property to check visibility of device-statistics menu item
|
8 years ago |
dilanua
|
edd400bde4
|
Changing menu item names
|
8 years ago |
WSO2 Builder
|
61ca4c4900
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
4746bf0c74
|
[maven-release-plugin] prepare release v3.0.0
|
8 years ago |
Ace
|
ae33d236fa
|
Adding android device-view changes
|
8 years ago |
Ace
|
7e3df67548
|
Adding android-base-plugin
|
8 years ago |
charitha
|
1170263139
|
Update component versions for IoTS-1.0.0 release
|
8 years ago |
Megala
|
3ff394902e
|
Removing unnecessary require statements
|
8 years ago |
Megala
|
6d3fbc422f
|
Adding link for the dashboard in tenant mode
|
8 years ago |
Megala
|
57e46525f8
|
Changing the dashboard menu to be only visible for super-tenant users
|
8 years ago |
Megala
|
dec2950f6e
|
Adding additional configurations for app-conf
|
8 years ago |
Malintha Fernando
|
5722a9fbe6
|
Fixing javax.xml.parsers.import.pkg.version issue
|
8 years ago |
Ace
|
ea14e32337
|
Adding android-web-agent
|
8 years ago |
Malintha Fernando
|
09f004bfd8
|
importing javax.xml package for javax.xml.XMLConstants
|
8 years ago |
Kamidu Sachith Punchihewa
|
218e7aa58f
|
Merge pull request #406 from Malintha/master
Adding secured documentBuilder factory
|
8 years ago |
Malintha Fernando
|
13cb358153
|
Adding secured documentBuilder factory
|
8 years ago |
Ace
|
3d32ad984c
|
Adding fixes to android qr-gen code
|
8 years ago |
kamidu
|
f5c3a55aa8
|
add dashboard link to emm webapp
|
8 years ago |
Madawa Soysa
|
40907a954a
|
Adding cache prevention filter to emm-web-agent app
|
8 years ago |
Ace
|
cea96cc841
|
Merging with master
|
8 years ago |
Chatura Dilan
|
47ba440fbb
|
fixed extends
|
8 years ago |
Chatura Dilan
|
9e78b87365
|
Fixed issue in device operation bar
|
8 years ago |
Chatura Dilan
|
d6701ee04c
|
Fixed issue in device view UI
|
8 years ago |
Chatura Dilan
|
49dd83ed33
|
Adding CDMF operation bar to Android
|
8 years ago |
Chatura Dilan
|
b207e5d624
|
Added missing units
|
8 years ago |
Ace
|
7d14e23d00
|
merging with upstream
|
8 years ago |
Ace
|
daf37338c6
|
merging changes with upstream
partial
|
8 years ago |
Ace
|
46ad530735
|
adding missing files
continuation from restructuring effort.
|
8 years ago |
Ace
|
e38941e81e
|
restructuring iot-plugins
removing mobile/iot base plugins and other restructuring
|
8 years ago |
Chatura Dilan
|
3227f3f650
|
Chages to device view for Android
|
8 years ago |
Chatura Dilan
|
269376a135
|
Changes to Android operation bar
|
8 years ago |
Chatura Dilan
|
76887c4277
|
Merge branch 'IoTS-1.0.0' of github.com:wso2/carbon-device-mgt-plugins into IoTS-1.0.0
|
8 years ago |
Chatura Dilan
|
1e3d8021e9
|
Adding Android and Windows operation bars
|
8 years ago |
Megala
|
411d006f5e
|
Updating apk
|
8 years ago |
ayyoob
|
bd05fb721a
|
merged with origin IoTS-1.0.0
|
8 years ago |
sinthuja
|
96e0ef92d7
|
Adding changes related to removing DAS components.
|
8 years ago |
WSO2 Builder
|
c9861e9636
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
3e664dc304
|
[maven-release-plugin] prepare release v2.2.5
|
8 years ago |
kamidu
|
4acc2b6925
|
Fix for ios device details view
|
8 years ago |
kamidu
|
cab7a8c2d6
|
Fiz ios related numeric view
|
8 years ago |
kamidu
|
af9c525594
|
Fixing styling issues and adding new apk
|
8 years ago |
kamidu
|
a9308c3f22
|
removing the unnessary ' ' from hbs files
|
8 years ago |
Rasika Perera
|
a40ce98698
|
Make analytics and groups view disable for mobile plugins
|
8 years ago |
Megala
|
53efe7d0d6
|
changing the android-agent according to new change
|
8 years ago |
Megala
|
55efa84834
|
Fixing EMM-1792
|
8 years ago |
Harshan Liyanage
|
494b545c4b
|
Merge pull request #392 from Megala21/master
Fixing EMM-1787
|
8 years ago |
Megala
|
287d27a332
|
Fixing EMM-1787
|
8 years ago |
hasuniea
|
78e9d74031
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
hasuniea
|
afd8e16c4c
|
fixing ios LDAP issue
|
8 years ago |
Harshan Liyanage
|
242253b8f2
|
Merge pull request #391 from shavidissa/master
Added swagger annotations and refined the messages
|
8 years ago |
Shavindri
|
f6c0aeecfc
|
Added swagger annotations and refined the messages
|
8 years ago |
kamidu
|
3f39ebf757
|
Fix for EMM-1766
|
8 years ago |
kamidu
|
5b6289326b
|
Fixing ui issues in policy management
|
8 years ago |
kamidu
|
de60fa325e
|
Fix the ios- manage domain policy issue
|
8 years ago |
Kamidu Sachith Punchihewa
|
5396a4ca9e
|
Merge pull request #380 from madawas/modal-refactor
Refactoring pages to use new modal unit
|
8 years ago |
inoshperera
|
b0ccf2d27d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
inoshperera
|
87fc819364
|
fixing EMM-1788 calDAV policy validation issue
|
8 years ago |
Harshan Liyanage
|
4fdc358786
|
Merge pull request #387 from Megala21/master
Fixing EMM-1779
|
8 years ago |
Megala
|
fcdce211b7
|
Changing the required fields use css to add astriek
|
8 years ago |
Saad Sahibjan
|
91f0722b1d
|
Fix for variable declaration with single var
|
8 years ago |
Megala
|
b752dc4d90
|
Merge remote-tracking branch 'upstream/master'
|
8 years ago |
Megala
|
e23ecc5b64
|
Fixing EMM-1779
|
8 years ago |
kamidu
|
51dac16206
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
kamidu
|
8af596702b
|
Fix payload issues in manage payload policy
|
8 years ago |
Saad Sahibjan
|
eff6c9d367
|
Fix spacing issue
|
8 years ago |
Saad Sahibjan
|
2d020f611e
|
Merge conflicts
|
8 years ago |
Geeth
|
00be80eb2a
|
Merge pull request #382 from inoshperera/master
fixing EMM-1714 by removing the supervised mode only operations from …
|
8 years ago |
inoshperera
|
b554ff76e8
|
fixing EMM-1714 by removing the supervised mode only operations from the UI
|
8 years ago |
kamidu
|
0251ba2a4a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
kamidu
|
7f4e1e3da0
|
Fix the ui issues in policy view,edit and create and device view sections
|
8 years ago |
Megala
|
465ea0154d
|
Fixing EMM-1778
|
8 years ago |
Saad Sahibjan
|
5f50059d49
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
Madawa Soysa
|
a31940e9d9
|
Refactoring pages to use new modal unit
|
8 years ago |
dilanua
|
a2d9d4302c
|
Fixing feature configured icon malfunctioning issue on switch double-click
|
8 years ago |
hasuniea
|
2bc0d31af9
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
hasuniea
|
e63c2dd321
|
fixing ios email config policy issue
|
8 years ago |
WSO2 Builder
|
19e0d65db0
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
537a99d05d
|
[maven-release-plugin] prepare release v2.2.4
|
8 years ago |
kamidu
|
d460cf1370
|
Fixing wifi payload issue in ios policies
|
8 years ago |
kamidu
|
79a25f15b7
|
Fix for ui issues in policy creation
|
8 years ago |
Saad Sahibjan
|
3d90487466
|
Fix incorrect spacing - AFW COSU
|
8 years ago |
Saad Sahibjan
|
ccdc64152c
|
Fix incorrect spacing - AFW COSU
|
8 years ago |
Saad Sahibjan
|
10e0ddd8b3
|
Fix incorrect spacing - AFW COSU
|
8 years ago |
Saad Sahibjan
|
af4fdb0fdc
|
Fix incorrect spacing - AFW COSU
|
8 years ago |
dilanua
|
76827640f0
|
Fixing JIRA: https://wso2.org/jira/browse/EMM-1767
|
8 years ago |
dilanua
|
67d660ef1f
|
Fixing JIRA: EMM-1765
|
8 years ago |
Vishanth
|
b3d89e38eb
|
fixing the ios wifi payload
|
8 years ago |
Saad Sahibjan
|
6f0b7cb5b7
|
Remove blank line space - AFW COSU
|
8 years ago |
WSO2 Builder
|
b095196e65
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
d455b13e62
|
[maven-release-plugin] prepare release v2.2.3
|
8 years ago |
Kamidu Sachith Punchihewa
|
932d43f272
|
Merge pull request #371 from wso2/release-2.2.3
Release 2.2.3
|
8 years ago |
kamidu
|
86174cc1cc
|
Version uodate and ui fixes
|
8 years ago |
Kamidu Sachith Punchihewa
|
d23af95cdd
|
Merge pull request #369 from Megala21/master
Fixing count of roles
|
8 years ago |
kamidu
|
73489f3194
|
UI fixes in ios related uis
|
8 years ago |
Hasitha Amal De Silva
|
0e6b19d737
|
Revert fix on EMM1328 for revisiting later.
|
8 years ago |
kamidu
|
50e9da2d11
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
Hasitha Amal De Silva
|
29f91fbee2
|
EMM-1328 - Hide the COPE radio button and mandate the value of BYOD radio button to be true.
|
8 years ago |
kamidu
|
f6cd675a1c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
Megala
|
9a8a146d16
|
Merge remote-tracking branch 'upstream/master'
|
8 years ago |
Milan Perera
|
ea4d7bc823
|
Merge branch 'master' of https://github.com/wso22/carbon-device-mgt-plugins
|
8 years ago |
Milan Perera
|
63c40e8696
|
Fixed notification sending issue in iOS
|
8 years ago |
Megala
|
65647fafad
|
Merge remote-tracking branch 'upstream/master'
|
8 years ago |
kamidu
|
b50979a697
|
Enable ios enrollment without agent installation
|
8 years ago |
kamidu
|
f6b8847e69
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
kamidu
|
ec138be594
|
Fixing the ui issue is ios policy modification and policy view
|
8 years ago |
Kamidu Sachith Punchihewa
|
43117a2b75
|
Merge pull request #364 from DimalChandrasiri/master
Fix for the bug EMM-1719
|
8 years ago |
thusithakalugamage
|
89336bb80f
|
skip download agent link added
|
8 years ago |
Megala
|
9aa84e7b55
|
Merge remote-tracking branch 'upstream/master'
|
8 years ago |
Imesh Chandrasiri
|
cce96f26fc
|
Fix for the bug EMM-1719
|
8 years ago |
Imesh Chandrasiri
|
2dd86c80b4
|
Fix for the bug EMM-1719
|
8 years ago |
thusithakalugamage
|
c3ea6e0853
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
thusithakalugamage
|
70728a3e17
|
Fixing device detail view pannel height defect
|
8 years ago |
Megala
|
7bd78f0558
|
Merge remote-tracking branch 'upstream/master'
|
8 years ago |
Megala
|
9f0f3a8560
|
Fixing issues related with the roles of secondary user store
|
8 years ago |
harshanl
|
d3902a861c
|
updated agent to check the communication protocol before downloading apps
|
8 years ago |
kamidu
|
b16730f70d
|
Fix for EMM-1723 and Device view related ui fixes
|
8 years ago |
harshanl
|
4e5f373c9c
|
Updated agent.apk for alert size fix
|
8 years ago |
thusithakalugamage
|
47f6147857
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
thusithakalugamage
|
f3dec07a47
|
[EMM-1618] - related improvements on remaining occurences
|
8 years ago |
harshanl
|
5de9e1a57f
|
EMM-1731:Removed duplicate alert box
|
8 years ago |
harshanl
|
5db518e5a8
|
EMM-1725:Added validation for system app
|
8 years ago |
kamidu
|
1f0e39fddf
|
Fix for EMM-1601 ad EMM-1708
|
8 years ago |
Megala
|
9f75c3a9a9
|
Merge remote-tracking branch 'upstream/master'
|
8 years ago |
Megala
|
588f75cef5
|
Changing android apk with the changes for GCM
|
8 years ago |
Kamidu Sachith Punchihewa
|
cc0ae4444d
|
Merge pull request #359 from thusithak/master
EMM 2.2.0-Alpha2 theme migration and issue fixes
|
8 years ago |
kamidu
|
058c96e87c
|
Fix for EMM-1468
|
8 years ago |
thusithakalugamage
|
b2134d34d3
|
[EMM-1685] - fix and few other related improvements
|
8 years ago |
kamidu
|
7635db3167
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
kamidu
|
85e1241feb
|
Fixing type check in device view
|
8 years ago |
Kamidu Sachith Punchihewa
|
bd2197d489
|
Merge pull request #357 from thusithak/master
EMM 2.2.0-Alpha2 theme migration and issue fixes
|
8 years ago |
kamidu
|
68840eae94
|
Fix for EMM-1680
|
8 years ago |
harshanl
|
f43ba554d5
|
EMM-1678:Updated the oauth component versions
|
8 years ago |
thusithakalugamage
|
324952defc
|
policy edit button group clear fix
|
8 years ago |
Milan Perera
|
2bda72a5ce
|
Merge branch 'master' of https://github.com/wso1/carbon-device-mgt-plugins
|
8 years ago |
Milan Perera
|
72329d93f0
|
Added pulse secure payload to UI
|
8 years ago |
thusithakalugamage
|
06b2c44644
|
Header nav menu responsiveness improvements
|
8 years ago |
kamidu
|
9f558ffd0f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
kamidu
|
b3b429b664
|
Fixing EMM-1697
|
8 years ago |
kamidu
|
db581a9575
|
removing redundence loggings
|
8 years ago |
Kamidu Sachith Punchihewa
|
ffd5597828
|
Merge pull request #356 from Megala21/master
Fixing EMM-1688
|
8 years ago |
Megala
|
10372a7f4e
|
Changing the equality check
|
8 years ago |
Megala
|
51d6baf1d2
|
Reformatting code
|
8 years ago |
Megala
|
4c54ba434a
|
Fixing EMM-1688
|
8 years ago |
thusithakalugamage
|
97f3dcf4c7
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
thusithakalugamage
|
9d9e8a8195
|
[EMM-1694] - Header responsive issues fix
|
8 years ago |
kamidu
|
7431654f25
|
Fix for device view consistancy problems
|
8 years ago |
thusithakalugamage
|
3acaf47209
|
Device details view tablist container height defect fix
|
8 years ago |
kamidu
|
22ec7aa695
|
Fixes for the ui isuess in EMM 2.2.0-beta
|
8 years ago |
kamidu
|
5936884c16
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
harshanl
|
529ed17f82
|
New android agent with complaince monitoring issue fix
|
8 years ago |
thusithakalugamage
|
73a600713c
|
resolving conflicts
|
8 years ago |
kamidu
|
faf0f36683
|
Fix for EMM-1665
|
8 years ago |
thusithakalugamage
|
0cbf647854
|
resolving conflicts
|
8 years ago |
kamidu
|
19a2c1d1bd
|
Fix for Jira issue : EMM-1639
|
8 years ago |
hasuniea
|
2ad390b877
|
removing duplicate event related classes
|
8 years ago |
Chatura Dilan Perera
|
0b66649841
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
Chatura Dilan Perera
|
362003c9ab
|
[maven-release-plugin] prepare release v2.2.2
|
8 years ago |
harshanl
|
821142b78d
|
windows ui fix
|
8 years ago |
harshanl
|
5062a8dfae
|
Windows issue
|
8 years ago |
harshanl
|
fd82cfcddd
|
Added new agent with policy fix
|
8 years ago |
Rasika Perera
|
2517b7b385
|
Merge pull request #354 from rasika/iots-ga
Merge iot-ga branch
|
8 years ago |
Rasika Perera
|
9d92b71bab
|
Merge pull request #1 from warunalakshitha/master
Upgrade iot product to latest carbon versions
|
8 years ago |
Megala
|
90f509c065
|
Merge remote-tracking branch 'upstream/master'
|
8 years ago |
Megala
|
c6b12f799f
|
Adding the check on the existence of the database before creating one
|
8 years ago |
dilanua
|
0ffce8b177
|
Improving device view UI - adding ios specific device details support
|
8 years ago |
dilanua
|
0a9ba54bb7
|
Improving policy listing UI
|
8 years ago |
dilanua
|
9dfd06f95e
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1650
|
8 years ago |
hasuniea
|
54ca0cacc5
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
hasuniea
|
2cc9a50b92
|
adding permission for windows enrollment
|
8 years ago |
dilanua
|
8bb1428df8
|
Improving device view info.retrieval - UI
|
8 years ago |
charitha
|
a719c11d75
|
Update the agent application
|
8 years ago |
Harshan Liyanage
|
f8bc1ff3bf
|
Merge pull request #352 from Megala21/master
EMM-1626 : Unable to retrieve device location for an enrolled android device
|
8 years ago |
Megala
|
c55b62fdf4
|
Fixing EMM-1626
|
8 years ago |
charitha
|
ea999bc98b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
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 |
dilanua
|
69efc7ada7
|
Updating operation-mod with windows operation apis
|
8 years ago |
dilanua
|
d8ce43fe04
|
Updating windows api path lockreset-devices to lock-reset-devices
|
8 years ago |
dilanua
|
9d486a5a0a
|
Updating Device Listing - EMM UI
|
8 years ago |
dilanua
|
a4ef821dc1
|
Updating Add Device Modal - UI
|
8 years ago |
dilanua
|
2c22feec20
|
Updating Add Device Modal - UI
|
8 years ago |
dilanua
|
7911e0cce6
|
Updating EMM dashboard - UI
|
8 years ago |
dilanua
|
19b6a334ad
|
Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations
|
8 years ago |
dilanua
|
08c6ba0617
|
Correcting typo: diableScreenCapture to disableScreenCapture - Operation-mod & Policy UI
|
8 years ago |
dilanua
|
8d338a584b
|
Changing permissions - /devices/owning to /devices/owning-device
|
8 years ago |
dilanua
|
ac6d0eda84
|
Adding COSU Policy Configs - Android EMM UI
|
8 years ago |
Rasika Perera
|
a717c7effb
|
Adding deviceName into notifications
|
8 years ago |
Chatura Dilan
|
ac9f95f885
|
Merge pull request #338 from saadsahibjan/master
Added edit COSU policy configurations
|
8 years ago |
Saad Sahibjan
|
d2cdb388b0
|
Added edit COSU policy configurations
|
8 years ago |
kamidu
|
61a4d417c7
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
kamidu
|
0160bf5fee
|
Fix for EMM-1546
|
8 years ago |
Dilan U. Ariyaratne
|
72d2466f30
|
Merge pull request #336 from DimalChandrasiri/master
Adding supportive classes
|
8 years ago |
thusithakalugamage
|
d33fbc99b1
|
[EMM-1571] Add policies page wizard styling and layout defects - edit pages
|
8 years ago |
thusithakalugamage
|
9840310f02
|
[EMM-1571] Add policies page wizard styling and layout defects
|
8 years ago |
Imesh Chandrasiri
|
abf6317d19
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
Imesh Chandrasiri
|
9887016f04
|
Adding modal changes
|
8 years ago |
Rasika Perera
|
6ad54b5f01
|
Fixing EMM-1351: Issue in components refresh function in device detail page
|
8 years ago |
Rasika Perera
|
c9ec2bea01
|
Fixing EMM-1552: Policy Create view Allingment issue in final step
|
8 years ago |
Rasika Perera
|
b576e23d97
|
Improvements to notifications side pane
|
8 years ago |
Rasika Perera
|
9f258df1d2
|
Fixing EMM-1551: Notifications are flooded on side pane.
|
8 years ago |
Rasika Perera
|
9b2f73acfb
|
Fixing EMM-1557: Notifications anchor points to a wrong URL of the device.
|
8 years ago |
Rasika Perera
|
5438a421de
|
Fixing Permissions are not published for Windows through WebApp Lifecycle Listener
|
8 years ago |
Ace
|
2a0b500935
|
Updating to latest appm/apim/identity dependencies
|
8 years ago |
Rasika Perera
|
4d4b9fa8ab
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
Saad Sahibjan
|
b0ec89938e
|
Added COSU policy configurations
|
8 years ago |
charitha
|
4cdf98b1db
|
Update agent apk to latest
|
8 years ago |
kamidu
|
58fe478b3e
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
kamidu
|
a8c97563ee
|
Fix for the rendering issue in dashboard
|
8 years ago |
Rasika Perera
|
625dd1a887
|
itMerge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
Imesh Chandrasiri
|
489a7d57ae
|
Adding popup modal content
|
8 years ago |
thusithakalugamage
|
550e2a472e
|
[EMM-1549] - Heading defect fix
|
8 years ago |
thusithakalugamage
|
e9e4133ed3
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
dilanua
|
326dd9f50e
|
Fixing JIRA: https://wso2.org/jira/browse/EMM-1544
|
8 years ago |