Commit Graph

294 Commits

Author SHA1 Message Date
dilanua
fcd68eab59 Fixing owner undefined issue in device view 2016-08-15 18:37:51 +05:30
kamidu
3262a7d926 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-15 18:17:14 +05:30
kamidu
7cb4f51dd2 Fix the device location view isssues 2016-08-15 18:07:52 +05:30
kamidu
b8d91478d5 Device view and detail related ui fixes 2016-08-15 18:06:19 +05:30
mharindu
caf73209b9 Removed unrelevant changes 2016-08-15 15:58:58 +05:30
mharindu
695fdc1cad Fixed confusing error messages issue 2016-08-15 15:54:04 +05:30
mharindu
150f569d05 Fixed json parsing issue in android agent 2016-08-15 15:48:31 +05:30
hasuniea
8a9114dd88 removing vpn validatiion property 2016-08-15 12:36:32 +05:30
hasuniea
72dd424c09 fixing jira issue related blacklisted application 2016-08-15 12:33:04 +05:30
hasuniea
71e64ae672 fixing put configuration 2016-08-15 12:32:19 +05:30
dilanua
3cc2a8ca12 Fixing role retrieval issue in policy-mgt 2016-08-15 12:01:42 +05:30
ayyoob
9978452cca Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into com 2016-08-13 10:50:06 +05:30
ayyoob
255e6b5566 few changes to resolve after scope validation issue 2016-08-13 10:38:30 +05:30
kamidu
c5bb85e772 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-12 17:40:49 +05:30
kamidu
ad5b871a30 Fix the device view zone conflict 2016-08-12 17:40:42 +05:30
hasuniea
68f64c3ae1 adding windows devicemgt interface and impl 2016-08-12 16:31:47 +05:30
hasuniea
33bcfc62c5 removing vpn validatiion property 2016-08-12 16:30:34 +05:30
hasuniea
22ec736841 fixing log throwing issue for internal server error(500) 2016-08-12 16:14:40 +05:30
hasuniea
66813f7d40 fixing jira issue related blacklisted application 2016-08-12 16:01:49 +05:30
kamidu
f17261423f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-12 14:32:28 +05:30
kamidu
96503f8166 Fix the notification related issues in mdm.nav bar 2016-08-12 14:09:08 +05:30
ayyoob
2555a91b4d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into com 2016-08-12 14:01:09 +05:30
ayyoob
65ca57c6d5 added scope annotation 2016-08-12 12:27:03 +05:30
hasuniea
13e317e201 resolving android get config issue 2016-08-12 12:24:38 +05:30
ayyoob
38b9f017c3 merged with origin 2016-08-12 10:55:25 +05:30
ayyoob
d72297f214 resolved UI issues 2016-08-11 23:41:19 +05:30
kamidu
04d1a3912a Fix the device view related issues 2016-08-11 19:05:42 +05:30
dilanua
fe2b861932 Fixing incorrect link - policy create UI 2016-08-11 16:57:24 +05:30
dilanua
6b0aaf42f1 Adding updates to emm policy listing page 2016-08-11 15:08:32 +05:30
dilanua
ca4cb37d58 Adding emm policy listing UI 2016-08-11 11:05:25 +05:30
dilanua
bd5ef4158b Adding emm policy edit UI 2016-08-10 18:52:39 +05:30
dilanua
935b429198 Adding emm policy view UI 2016-08-10 18:34:35 +05:30
dilanua
aada09de10 Adding policy create UI updates 2016-08-10 18:06:26 +05:30
Ace
0ee28c91d2 Adding date validations when updating device enrollment 2016-08-10 14:26:39 +05:30
Ruwan
c32d9e3125 Bug fix
Adding bug fix
2016-08-10 12:59:29 +05:30
Ace
d997654011 Adding date validations when updating device enrollment 2016-08-10 12:47:02 +05:30
hasuniea
9cde2d815a refactoring windowsapi 2016-08-10 10:51:42 +05:30
Rasika Perera
5ea262947b Added emm specific policy creation unit extending cdmf.unit.policy.create 2016-08-10 08:43:00 +05:30
Rasika Perera
4c11157d4e Enrollment url by default same VM 2016-08-10 08:33:43 +05:30
mharindu
d253dd4552 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-09 19:16:20 +05:30
mharindu
141a7d0959 Added scopes to the config.json 2016-08-09 19:09:22 +05:30
hasuniea
a62544c68b refactoring windowsapi 2016-08-09 18:00:49 +05:30
Ace
a37d5dbfd9 Fixing user,device,role listing pages 2016-08-09 07:57:30 +05:30
mharindu
352574d2fe Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-08 19:29:36 +05:30
mharindu
9b43f83520 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-08 18:49:49 +05:30
mharindu
6e8f3f5db2 Modified scopes 2016-08-08 18:25:00 +05:30
hasuniea
1078b8b686 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-08 18:06:22 +05:30
hasuniea
4562b4d318 adding security fixes 2016-08-08 18:06:14 +05:30
inoshperera
0197ea964f Merge pull request #313 from charithag/master
Add missing BadRequestException to global exception wrapper
2016-08-08 10:42:36 +05:30
mharindu
ece7cb04ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-08 10:40:45 +05:30
dilanua
a71537b7bb Updating emm app name 2016-08-06 17:17:24 +05:30
charitha
8aa4f8b526 Add missing BadRequestException to global exception wrapper 2016-08-05 21:48:28 +05:30
Chatura Dilan Perera
defa494626 changed date format to ISO 8601 2016-08-05 09:06:13 +05:30
mharindu
0cf85c986a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-04 17:50:13 +05:30
mharindu
8ddee3b217 Refactored scopes 2016-08-04 17:47:26 +05:30
Chatura Dilan Perera
fedd717561 Added validations to firmware upgrade date 2016-08-04 16:53:17 +05:30
Chatura Dilan Perera
4dfa9ed732 Added validations to firmware upgrade date 2016-08-04 16:51:59 +05:30
hasuniea
16e306268f fixing javax cache issue 2016-08-04 16:35:31 +05:30
hasuniea
86056df434 fixing windows plugin relalted slf4j issue 2016-08-04 15:29:25 +05:30
ayyoob
d70c576ff0 refactored android configuration 2016-08-03 17:23:09 +05:30
mharindu
5f917e51f1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-03 12:53:36 +05:30
Rasika Perera
97eac5064e Fixed Requested resource /app/conf/reader/main.js not found 2016-08-02 23:11:42 +05:30
kamidu
8d151120df enabling policy wizard for android 2016-08-02 18:50:23 +05:30
kamidu
1f247e7faf Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-02 18:26:51 +05:30
inoshperera
a09defebfe Merge pull request #312 from charithag/master
Removed invalid property insertion.
2016-08-02 15:52:37 +05:30
Rasika Perera
3d25102d30 Adding enrollment url into view model 2016-08-02 15:49:46 +05:30
charitha
d186a48ed8 Removed invalid property insertion. 2016-08-02 15:47:46 +05:30
kamidu
bbbaac4d28 Fix for the 'Requested resource /app/conf/reader/main.js cannot be found' exception on startup 2016-08-02 15:43:44 +05:30
mharindu
a254d9efc4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-02 14:57:29 +05:30
mharindu
34ce9108a2 Added configuration modifcation permission 2016-08-02 14:57:00 +05:30
kamidu
e0d9e1659c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-02 14:14:54 +05:30
dilanua
42cfd92575 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-02 14:04:13 +05:30
dilanua
6fe83cd0ac Updating path changes to business-controllers 2016-08-02 14:03:50 +05:30
mharindu
57fb75a04b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-02 11:03:33 +05:30
kamidu
ea89c6685e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-02 10:32:44 +05:30
kamidu
6db9fc426e Fix the addd buttton 404 issue 2016-08-01 14:34:48 +05:30
hasuniea
a8102b8c42 fixing VERIFONEEMMPROF-26 2016-08-01 14:28:52 +05:30
mharindu
576bfb8236 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-01 12:27:30 +05:30
dilanua
18a9ad4b8a Updating EMM UI conf.json 2016-07-29 18:02:44 +05:30
kamidu
a38d38a86e Addting new nav bar without group management ui 2016-07-29 15:31:20 +05:30
mharindu
2b3dfa0ce2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-07-29 12:40:50 +05:30
Chatura Dilan
1fa5bdba44 Merge branch 'master' of github.com:wso2/carbon-device-mgt-plugins 2016-07-28 15:26:04 +05:30
Chatura Dilan
338d804dba Added validations for invalid device Ids 2016-07-28 15:25:29 +05:30
Ace
77bdbb5a57 Fixing QR code issue 2016-07-26 20:58:21 +05:30
mharindu
be73e9a659 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-07-26 14:16:09 +05:30
hasuniea
e4bfb6b6ef fixing deviceIdentifier validation issue 2016-07-26 09:47:37 +05:30
dilanua
01e32c86c8 Updating base ui app config reader 2016-07-25 05:54:32 +05:30
dilanua
0ef0a06d10 Updating emm config.json 2016-07-22 16:58:55 +05:30
mharindu
d2f02d128c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-07-22 16:50:37 +05:30
dilanua
f85dcc3f25 Updating emm config.json 2016-07-22 16:43:12 +05:30
Ace
c004824b81 removing console.log 2016-07-21 15:02:15 +05:30
mharindu
98d291fcd0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-07-21 14:32:43 +05:30
Ace
24624131a7 Adding EMM dashboard to mobile base UI 2016-07-21 07:43:41 +05:30
mharindu
965402a7ac Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-07-18 20:18:55 +05:30
mharindu
302f71b6d1 Fixed webapp name resolving issue and changed API context 2016-07-18 20:17:31 +05:30
Milan Perera
c1cc6f08d9 Removed device name regex pattern from bean validation 2016-07-15 19:55:40 +05:30
Ace
bff34e5030 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-07-15 12:01:42 +05:30
Ace
d802570be9 Adding app.conf for mobile base plugin 2016-07-15 12:01:31 +05:30
mharindu
1b006bc155 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-07-13 11:05:56 +05:30
Chatura Dilan
b9bc076036 Fixed issues in android permisson.xml 2016-07-12 15:14:18 +05:30