Commit Graph

1502 Commits

Author SHA1 Message Date
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
Dileesha Rajapakse
fca2e515b0 Refactored oracle DB script 2015-11-03 16:00:30 +05:30
harshanl
2b9239d208 Optimized the authenticator framework 2015-11-03 14:29:38 +05:30
Dileesha Rajapakse
473c06f347 Refactored oracle DB script 2015-11-03 13:56:02 +05:30
Dileesha Rajapakse
ee9a1b7ae2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-03 11:36:48 +05:30
harshanl
fa92aecf58 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-03 11:34:32 +05:30
Kasun Delgolla
44837af014 Merge pull request #38 from Kamidu/master
Merging
2015-11-03 11:22:03 +05:30
Kamidu Sachith
51441b0ff9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-03 11:07:22 +05:30
Kamidu Sachith
e2072e1b18 Version bump for carbon deployment 2015-11-03 11:06:38 +05:30
hasuniea
49c67a074b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-03 11:05:16 +05:30
Dileesha Rajapakse
67ecf0daa0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-03 09:52:24 +05:30
harshanl
520c07693d Added support for non-secured endpoints within a security enabled webapp 2015-11-02 20:45:43 +05:30
geethkokila
feab85796f Fixing the EMM-896 which restrict deleting the policy once applied due to a contraint violation 2015-11-02 19:44:52 +05:30
geethkokila
2479be9f5a Fixing the email client issue 2015-11-02 19:37:21 +05:30
hasuniea
c96e088888 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-02 12:38:17 +05:30
Kamidu Sachith
cdfc224dde Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-02 10:47:12 +05:30
Dileesha Rajapakse
a54fc4a254 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-02 10:00:40 +05:30
harshanl
14923d0d99 Merge branch 'hasuniea-master' 2015-10-30 18:34:52 +05:30
harshanl
6ebfbc4136 Merge branch 'master' of https://github.com/hasuniea/carbon-device-mgt into hasuniea-master 2015-10-30 18:34:16 +05:30
harshanl
c9ffedbac5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-30 18:29:53 +05:30
harshanl
8f982722fb Added oauth response messages 2015-10-30 18:29:32 +05:30
geethkokila
4ed5599ba8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-30 17:48:35 +05:30
geethkokila
20122b3f1e Fixing the roles and users adding issue 2015-10-30 17:48:30 +05:30
Dileesha Rajapakse
d6a30daac1 Resolved merge conflicts 2015-10-30 12:29:57 +05:30
mharindu
d2b8224f31 Changed the VARCHAR size of application identifier 2015-10-30 11:28:57 +05:30
Kasun Delgolla
c00b1ee713 Committing fix for JIRA- EMM-860 2015-10-29 20:46:48 +05:30
Kasun Delgolla
6f2d1ad065 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-10-29 20:45:29 +05:30
harshanl
7cdd262b91 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-29 17:53:18 +05:30
harshanl
7c0996270f Fixed EMM-887 2015-10-29 17:53:09 +05:30
Kasun Delgolla
f519b7c029 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-10-29 15:46:41 +05:30
prabathabey
5d0c706bca Resolving more conflicts 2015-10-29 14:20:55 +05:30
prabathabey
27f293b09f Fixing merge conflicts 2015-10-29 14:19:47 +05:30