122 Commits

Author	SHA1	Message	Date
Chatura Dilan Perera	c16cc4cae1	[maven-release-plugin] prepare for next development iteration	2016-09-29 20:33:07 +05:30
Chatura Dilan Perera	ed4bca7032	[maven-release-plugin] prepare release v1.2.2	2016-09-29 20:32:59 +05:30
Megala	47d6268c9e	Correcting the problem related with oracle syntax	2016-09-29 01:43:33 +05:30
Megala	82be4ef5a8	Fixing oracle script issues	2016-09-28 15:15:24 +05:30
amalhub	428ce25b6f	Fixing issue: https://wso2.org/jira/browse/EMM-1646	2016-09-27 20:46:00 +05:30
Ace	6aad76eff1	Synching with master and updating jscep and bcpkix dependencies	2016-09-23 11:24:49 +05:30
Ace	154a6082ce	Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 ... # Conflicts: # features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml	2016-09-22 19:08:21 +05:30
Ace	f4d6eb6898	Upgrading jscep and other fixes	2016-09-22 08:24:58 +05:30
Ace	9548bdc263	Fixing dependency related issues	2016-09-21 12:56:40 +05:30
Ace	5f90587564	Synching with master	2016-09-20 18:13:53 +05:30
Chatura Dilan Perera	50d8885f8b	[maven-release-plugin] prepare for next development iteration	2016-09-19 18:54:48 +05:30
Chatura Dilan Perera	a00d6aafd4	[maven-release-plugin] prepare release v1.2.1	2016-09-19 18:54:38 +05:30
Ace	6a8a5cbd5a	Merging with master	2016-09-19 12:21:41 +05:30
Ace	1dfb8e22e1	Updating to latest appm/apim/identity dependencies	2016-09-14 17:23:09 +05:30
Chatura Dilan Perera	de23a8cf27	[maven-release-plugin] prepare for next development iteration	2016-09-09 20:18:25 +05:30
Chatura Dilan Perera	8905fae0d9	[maven-release-plugin] prepare release v1.2.0	2016-09-09 20:18:12 +05:30
thusithakalugamage	0d02e88955	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration	2016-09-09 18:42:46 +05:30
kamidu	878daae5c5	Permission modifications	2016-09-09 17:47:42 +05:30
Chatura Dilan Perera	2d5262e21e	[maven-release-plugin] prepare for next development iteration	2016-09-09 17:10:19 +05:30
Chatura Dilan Perera	5ccd752404	[maven-release-plugin] prepare release v1.2.0	2016-09-09 17:10:04 +05:30
mharindu	115099c8fe	Implemented permission based authorization	2016-09-09 02:56:21 +05:30
mharindu	24930b3042	Partial commit of migration	2016-09-05 16:37:09 +05:30
Chatura Dilan Perera	8b17cbb339	Fix conflicts	2016-08-19 15:00:57 +05:30
Chatura Dilan Perera	654e1d9938	[maven-release-plugin] prepare for next development iteration	2016-08-18 22:09:42 +05:30
Chatura Dilan Perera	aa24821667	[maven-release-plugin] prepare release v1.1.2	2016-08-18 22:09:33 +05:30
harshanl	f82ce82648	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-10 11:14:53 +05:30
harshanl	08ff70bb3c	Refactored CertMgt component	2016-08-10 11:14:46 +05:30
madhawap	d0d101297f	changes to removeCertificate endpoint, fix for the jira EMM-1490	2016-08-09 11:27:04 +05:30
madhawap	f12d2a5d69	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-09 11:17:01 +05:30
madhawap	324e7fd4c6	changes to removeCertificate endpoint, fix for the jira EMM-1490	2016-08-09 11:16:37 +05:30
mharindu	2e79dd290e	Modified scopes	2016-08-08 18:24:44 +05:30
mharindu	acf6d7ecd7	Fixed conflicts and merged	2016-08-08 10:42:30 +05:30
mharindu	ed4c762bfd	Refactored scopes	2016-08-04 17:46:46 +05:30
Prabath Abeysekara	cc90bef42b	Merge pull request #318 from Securepoint/master ... Minor bug fixies and code improvements	2016-08-03 14:12:24 +05:30
mharindu	84090fb16c	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl	2016-07-29 12:39:05 +05:30
prabathabey	5adfab9f8a	Improving connection handling in cert management related functionalities, adding UNIQUE key constraints to DM_DEVICE and DM_ENROLMENT tables, improving response handling of certificate management admin API	2016-07-26 23:37:42 +05:30
mharindu	564c2b280e	Fixed conflicts and merged	2016-07-26 16:38:51 +05:30
prabathabey	bd1322e801	Improving transaction handling in certificate management component and cleaning up the OperationManagerImpl	2016-07-26 11:28:31 +05:30
hasuniea	a02f7a5db1	fixing formatting issue	2016-07-26 10:21:25 +05:30
mharindu	bdec8880bb	Fixed conflicts and merged	2016-07-18 20:22:27 +05:30
mharindu	186432e1df	Fixed webapp name resolving issue	2016-07-18 20:08:51 +05:30
Ace	ca8859c80a	Fixing broken build due to new javax.xml imports	2016-07-18 09:09:29 +05:30
Timo Briddigkeit	0ea2c458e7	instanceof will return false for null references, the null check is not needed.	2016-07-15 09:39:50 +02:00
Timo Briddigkeit	ee5b077e6a	Fixed various XML External Entity (XXE) attack vulnerabilities	2016-07-13 15:02:11 +02:00
mharindu	789086a667	Changed context paths	2016-07-12 01:31:35 +05:30
mharindu	0f904e21d8	Fixed conflicts and merged	2016-07-11 22:12:15 +05:30
Chatura Dilan	4ec11e8c08	[maven-release-plugin] prepare for next development iteration	2016-07-08 19:11:40 +05:30
Chatura Dilan	ffedcac543	[maven-release-plugin] prepare release v1.1.1	2016-07-08 19:09:55 +05:30
madhawap	0b1e4ad86b	Updated permissions.xml according to new end-points	2016-07-08 14:29:29 +05:30
prabathabey	ce2a801934	Fixing https://wso2.org/jira/browse/EMM-1448 which fixes issues while persisting certificates when PostgreSQL is used as the underlying certificate management repository database	2016-07-07 14:10:03 +05:30