1324 Commits

Author	SHA1	Message	Date
mharindu	6e742ee6ac	Added scope beans	2016-07-26 16:40:04 +05:30
mharindu	564c2b280e	Fixed conflicts and merged	2016-07-26 16:38:51 +05:30
Chatura Dilan	046cd6586c	Merge branch 'master' of github.com:wso2/carbon-device-mgt	2016-07-26 12:00:17 +05:30
Chatura Dilan	7af8ecc686	Added userstore for role listing	2016-07-26 11:59:10 +05:30
dilanua	34edbce1a0	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-07-26 11:35:17 +05:30
dilanua	c228f03481	Refactoring oauth token handling functions and dependants	2016-07-26 11:34:52 +05:30
prabathabey	89634a9c38	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-07-26 11:28:43 +05:30
prabathabey	bd1322e801	Improving transaction handling in certificate management component and cleaning up the OperationManagerImpl	2016-07-26 11:28:31 +05:30
dilanua	b72d099641	Refactoring oauth token handling functions	2016-07-26 11:14:46 +05:30
dilanua	d05c6e2170	Deprecating /api/token.jag (unused)	2016-07-25 22:23:22 +05:30
mharindu	3457bba4a3	Adding Annotation reading fix for device-mgt-extensions	2016-07-25 19:21:08 +05:30
dilanua	87dbb5f9e1	Refactoring ui token handling functions	2016-07-25 15:32:39 +05:30
dilanua	7facff4b58	Updating ui init logic	2016-07-25 15:28:41 +05:30
dilanua	c57c75945c	Deprecating invoker-request-wrapper (unused)	2016-07-25 10:11:39 +05:30
dilanua	00f98f5cce	Updating base ui app config reader	2016-07-25 05:50:49 +05:30
dilanua	d04cb54ae8	Refactoring base ui app config reader	2016-07-24 21:34:22 +05:30
dilanua	c12630e65c	Refactoring base ui app config reader	2016-07-24 21:20:51 +05:30
dilanua	1916c4df5f	Refactoring cdmf product page layout	2016-07-24 20:35:52 +05:30
dilanua	7d9cde3cfb	Refactoring Navigation Bar	2016-07-24 12:46:40 +05:30
dilanua	99aca9b90a	Updating user-listing	2016-07-23 20:23:21 +05:30
dilanua	bbce1a3d8a	Refactoring user-listing front-end logic	2016-07-22 19:07:33 +05:30
dilanua	8f81f2bb01	Refactoring data-tables-invoker-api	2016-07-22 18:23:02 +05:30
dilanua	225b1ddc45	Refactoring device-mgt-props	2016-07-22 17:08:55 +05:30
mharindu	3331604699	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl	2016-07-22 16:42:00 +05:30
mharindu	827567733c	Fixed scope update issue in API update	2016-07-22 16:41:40 +05:30
dilanua	7e7549437b	Refactoring user module	2016-07-22 15:31:00 +05:30
dilanua	24d846a328	Refactoring user-create page and related modules	2016-07-22 15:25:33 +05:30
dilanua	b636738be3	Fixing issue: user-list not getting updated upon user-removal	2016-07-22 11:54:35 +05:30
mharindu	b3d309583d	Fixed issues in scope service	2016-07-21 20:13:38 +05:30
dilanua	da6ff6e7fa	Refactoring user-listing page	2016-07-21 18:04:51 +05:30
dilanua	177b7cf3df	Refactoring data-tables-extended-unit	2016-07-21 17:58:59 +05:30
Ace	c8b37207fc	Fixing context issue in service-invoker	2016-07-21 15:03:17 +05:30
mharindu	b8f2457046	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl	2016-07-21 14:32:26 +05:30
dilanua	31b62e6336	Adding jaggery.conf url mapping for data-tables-invoker-api	2016-07-21 12:54:39 +05:30
mharindu	7f1e2fdf0b	Implemented scope management service	2016-07-21 12:43:21 +05:30
Ace	b8635db485	Adding changes to common modules to accomodate ui restructuring	2016-07-21 07:42:20 +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
Dulitha Wijewantha	03f323d6e2	Fixed a bug where getBoolean wasn't used	2016-07-18 12:29:58 +05:30
Ace	ca8859c80a	Fixing broken build due to new javax.xml imports	2016-07-18 09:09:29 +05:30
mharindu	80f737822e	Fixed enrollment device mapping issue	2016-07-15 19:45:04 +05:30
Prabath Abeysekara	fbb09a7f58	Merge pull request #316 from xenobyte/master ... Fixed predictable pseudorandom number generator	2016-07-15 13:17:23 +05:30
Timo Briddigkeit	90910518d6	Fixed null pointer dereferences	2016-07-15 09:26:27 +02:00
Ace	15ae91d1c5	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-07-15 11:59:42 +05:30
Ace	ca10ad53bb	Adding emm apis as common modules	2016-07-15 11:59:15 +05:30
prabathabey	40b43a8b97	DAO exceptions thrown while retrieving advance details of devices appears to have been swallowen at the REST API implementation that exposes the aforementioned functionality. This particular fix resolves it	2016-07-14 01:24:00 +05:30
Timo Briddigkeit	b674304087	Made constants real constant using final	2016-07-13 15:57:12 +02:00
Timo Briddigkeit	ee5b077e6a	Fixed various XML External Entity (XXE) attack vulnerabilities	2016-07-13 15:02:11 +02:00
Timo Briddigkeit	09020ccb9f	Fixed predictable pseudorandom number generator	2016-07-13 14:35:55 +02:00
mharindu	99664b23c5	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl	2016-07-13 11:05:35 +05:30