Commit Graph

8083 Commits

Author SHA1 Message Date
geethkokila
0f146e83fa Fixing the issue which cause policy not bieng applied to device which were enrolled before the adding the policy to the system 2015-11-16 17:17:15 +05:30
geethkokila
813f9072d8 Fixing the database issue which causes the deviceids slelect did not work 2015-11-16 17:15:16 +05:30
harshanl
26e3183abe Merge branch 'dilee-master' 2015-11-16 17:13:12 +05:30
Dileesha Rajapakse
f8a2117911 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-16 16:52:43 +05:30
Dileesha Rajapakse
6446be100d Refactored Policy Management DAO classes 2015-11-16 16:49:35 +05:30
Dileesha Rajapakse
91d9db1ffa Refactored ApplicationMapping and ProfileOperation DAO classes 2015-11-16 14:15:54 +05:30
Dilshan Edirisuriya
7023537fcd Setting owner in authentication info 2015-11-16 13:49:02 +05:30
hasuniea
2159244e9f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-16 12:46:46 +05:30
Dileesha Rajapakse
27254cc922 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-16 11:45:29 +05:30
harshanl
cb02c9da80 Fixed issues in DeviceAuthorization 2015-11-16 11:43:52 +05:30
Dileesha Rajapakse
6f0276ab2f Modified Application Mapping DAO classes 2015-11-16 11:39:52 +05:30
hasuniea
7c41b50203 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-16 10:27:11 +05:30
Dileesha Rajapakse
7b2cfd69f5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-16 09:49:37 +05:30
harshanl
b9ca6705ae Merged changes 2015-11-13 21:57:05 +05:30
harshanl
e14f09b8a8 Added requireDeviceAuthorization support 2015-11-13 21:33:33 +05:30
manoj
fdc4ad8e18 Set user level autherization is support by plugin or not 2015-11-13 21:29:47 +05:30
manoj
22c2da7fcb Set user level autherization is support by plugin or not 2015-11-13 21:22:38 +05:30
manoj
dc2e41e083 Add authentication method boolean check. Android allows user level authentication. IOS and windows allow device authetication. This is a temporary fix until fix windows and IOS certifcate level user extraction 2015-11-13 19:02:55 +05:30
manoj
adc3b652bf Add authentication method boolean check. Android allows user level authentication. IOS and windows allow device authetication. This is a temporary fix until fix windows and IOS certifcate level user extraction 2015-11-13 18:57:45 +05:30
Dileesha Rajapakse
b8f41fd1b2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-13 15:16:06 +05:30
geethkokila
49cbac0a8c Changing the apim version 2015-11-13 15:12:34 +05:30
Dileesha Rajapakse
786eb93bca Refactored Operation DAO classes 2015-11-13 14:15:05 +05:30
hasuniea
b17cc43476 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-13 11:45:47 +05:30
Dileesha Rajapakse
8c1d418e44 Refactored oracle DB script 2015-11-12 19:16:21 +05:30
Dileesha Rajapakse
123ea228ad Refactored Enrolment DAO class 2015-11-12 10:30:45 +05:30
Dileesha Rajapakse
72ffe4e4a4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-12 09:04:56 +05:30
harshanl
5af6f314d0 Fixed EMM-939 2015-11-11 20:58:47 +05:30
Dileesha Rajapakse
1975821446 Refactored Device and Application DAO classes 2015-11-11 18:47:02 +05:30
Geeth
5fd9e87dc8 Merge pull request #44 from Kamidu/master
change the formatter
2015-11-10 20:35:58 +05:30
Kamidu Sachith
8953a61cc4 Enable Owneship type editing in policy 2015-11-10 20:17:59 +05:30
harshanl
5d107b0d56 Merged changes 2015-11-10 18:46:26 +05:30
harshanl
93e641893c Merged changes 2015-11-10 18:31:02 +05:30
harshanl
026a7c187a Fixed EMM-945, EMM-910, EMM-911, EMM-870 2015-11-10 18:17:34 +05:30
geethkokila
ae3d5564ff Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-10 18:09:06 +05:30
geethkokila
2fd0101ed3 Fixing the identity version and kernel version 2015-11-10 18:08:57 +05:30
inosh-perera
4faa740c9d Fixing JIRA EMM-947 - only the registered device types are returned to UI 2015-11-10 17:36:30 +05:30
Kamidu Sachith
8853b403e7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-10 14:51:48 +05:30
Kamidu Sachith
d7c942f395 Enable ownership editing on the policy 2015-11-10 14:51:10 +05:30
Dileesha Rajapakse
5b4b176187 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-09 10:09:10 +05:30
hasuniea
d216041af1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-09 10:02:38 +05:30
prabathabey
3608df2981 Updating carbon-device-mgt to the most recently released dependencies 2015-11-06 18:40:09 +05:30
Dileesha Rajapakse
b7e4e90358 Refactored mssql DB script 2015-11-05 10:42:11 +05:30
Dileesha Rajapakse
11c6b94368 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-05 10:11:12 +05:30
Kamidu Sachith
4590de6a76 chenge the formatter 2015-11-04 15:12:23 +05:30
hasuniea
d8e40fb8d6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-04 10:50:13 +05:30
harshanl
c826be9b3e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-03 18:59:26 +05:30
harshanl
74a3b0e346 Fixed EMM-910 2015-11-03 18:58:52 +05:30
hasuniea
5595e14b33 '^^^^^XMerge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-03 17:49:52 +05:30
geethkokila
30c53b7d14 Fixing the EMM-900, Ading the LB host name and port to the email url 2015-11-03 16:24:49 +05:30
Lakshitha Harshan
b7edc80c0e Merge pull request #42 from dilee/master
Refactored oracle DB script
2015-11-03 16:08:06 +05:30