Commit Graph

1303 Commits (b17cc4347642f6d9df7de43e5134fde5f6b214d4)
 

Author SHA1 Message Date
hasuniea b17cc43476 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 5af6f314d0 Fixed EMM-939
9 years ago
Geeth 5fd9e87dc8 Merge pull request #44 from Kamidu/master
9 years ago
Kamidu Sachith 8953a61cc4 Enable Owneship type editing in policy
9 years ago
harshanl 5d107b0d56 Merged changes
9 years ago
harshanl 93e641893c Merged changes
9 years ago
harshanl 026a7c187a Fixed EMM-945, EMM-910, EMM-911, EMM-870
9 years ago
geethkokila ae3d5564ff Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 2fd0101ed3 Fixing the identity version and kernel version
9 years ago
inosh-perera 4faa740c9d Fixing JIRA EMM-947 - only the registered device types are returned to UI
9 years ago
Kamidu Sachith 8853b403e7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Kamidu Sachith d7c942f395 Enable ownership editing on the policy
9 years ago
hasuniea d216041af1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 3608df2981 Updating carbon-device-mgt to the most recently released dependencies
9 years ago
Kamidu Sachith 4590de6a76 chenge the formatter
9 years ago
hasuniea d8e40fb8d6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl c826be9b3e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 74a3b0e346 Fixed EMM-910
9 years ago
hasuniea 5595e14b33 '^^^^^XMerge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 30c53b7d14 Fixing the EMM-900, Ading the LB host name and port to the email url
9 years ago
Lakshitha Harshan b7edc80c0e Merge pull request #42 from dilee/master
9 years ago
harshanl 2b9239d208 Optimized the authenticator framework
9 years ago
Dileesha Rajapakse 473c06f347 Refactored oracle DB script
9 years ago
Dileesha Rajapakse ee9a1b7ae2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl fa92aecf58 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Kasun Delgolla 44837af014 Merge pull request #38 from Kamidu/master
9 years ago
Kamidu Sachith 51441b0ff9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Kamidu Sachith e2072e1b18 Version bump for carbon deployment
9 years ago
hasuniea 49c67a074b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dileesha Rajapakse 67ecf0daa0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 520c07693d Added support for non-secured endpoints within a security enabled webapp
9 years ago
geethkokila feab85796f Fixing the EMM-896 which restrict deleting the policy once applied due to a contraint violation
9 years ago
geethkokila 2479be9f5a Fixing the email client issue
9 years ago
hasuniea c96e088888 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Kamidu Sachith cdfc224dde Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dileesha Rajapakse a54fc4a254 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 14923d0d99 Merge branch 'hasuniea-master'
9 years ago
harshanl 6ebfbc4136 Merge branch 'master' of https://github.com/hasuniea/carbon-device-mgt into hasuniea-master
9 years ago
harshanl c9ffedbac5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 8f982722fb Added oauth response messages
9 years ago
geethkokila 4ed5599ba8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 20122b3f1e Fixing the roles and users adding issue
9 years ago
Dileesha Rajapakse d6a30daac1 Resolved merge conflicts
9 years ago
mharindu d2b8224f31 Changed the VARCHAR size of application identifier
9 years ago
Kasun Delgolla c00b1ee713 Committing fix for JIRA- EMM-860
9 years ago
Kasun Delgolla 6f2d1ad065 Merge branch 'master' of github.com:wso2/carbon-device-mgt
9 years ago
harshanl 7cdd262b91 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 7c0996270f Fixed EMM-887
9 years ago
Kasun Delgolla f519b7c029 Merge branch 'master' of github.com:wso2/carbon-device-mgt
9 years ago
prabathabey 5d0c706bca Resolving more conflicts
9 years ago