2818 Commits (1f5de41ffaaf568944da78e161d90e1d52e382ca)

Author	SHA1	Message	Date
amalhub	d00817268e	IOTS-292: Adding the api-mgt handler for gateway change	8 years ago
amalhub	fe2b6b5993	IOTS-292: Adding verification services needed for gataway handler	8 years ago
Milan Perera	bcbf61a886	Fixed conflicts	8 years ago
Milan Perera	36ee55f493	Implemented permission-scope mapping for IoTs	8 years ago
Rasika Perera	9f615916d0	Fixing analyticsEnabled and groupingEnabled not working	8 years ago
Rasika Perera	1bee155d9a	Fixing formatting issue	8 years ago
Rasika Perera	91437ff81c	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
Rasika Perera	c284732192	Displaying SSO auth failure messages	8 years ago
Rasika Perera	9fd6145605	Fixing SSO issue	8 years ago
Milan Perera	dd353e1bfb	Commiting permission-scope mapping improvements	8 years ago
WSO2 Builder	a59edee410	[maven-release-plugin] prepare for next development iteration	8 years ago
WSO2 Builder	8f9b21b41b	[maven-release-plugin] prepare release v2.0.3	8 years ago
charitha	d8881244fd	Fix issue in task operation	8 years ago
charitha	0a7f8ac22c	Update error pages and CsrfGuard property file.	8 years ago
charitha	78dfddbbed	Merge branch 'merge-master' of https://github.com/geethkokila/carbon-device-mgt into release-2.0.x	8 years ago
madhawap	fa171ef079	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
madhawap	d62a9c8b83	resolving conflicts	8 years ago
Madawa Soysa	ea1371a008	Fixing generic policy payload	8 years ago
madhawap	b889f6e384	adding separate tasks for each device type	8 years ago
charitha	0b3183e3be	Merge remote-tracking branch 'upstream/release-2.0.x' into release-2.0.x	8 years ago
charitha	312098b1de	Fix issues in generic policy editor	8 years ago
Hasunie	9a1c12d730	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
Hasunie	60d1281949	fixing windows device name issue	8 years ago
geethkokila	b9d104e9b2	Fixing the certificate mgt issue	8 years ago
geethkokila	87b2fb3603	Fixing the login issue	8 years ago
geethkokila	9def8aa609	Fixing the login issue	8 years ago
geethkokila	a0615d3d63	Merge branch 'release-2.0.x' into merge-master	8 years ago
geethkokila	d911281ad1	Merging master branch with release-2.0.x	8 years ago
Madawa Soysa	630a1105a9	IOTS-296: Refactoring generic policy unit code ... This code is refactored to use the device type specific operation mod functions (payload generation etc.) in the device type plugins.	8 years ago
Ruwan	a0c842c6c6	Merge pull request #473 from charithag/release-2.0.x ... Update the way we are checking existence of policy operations.	8 years ago
Rasika Perera	6edbb8330f	Merge pull request #472 from rasika/release-2.0.x ... Fixing enrollment broken issue	8 years ago
charitha	4b5c69d2d7	Update the way we are checking existence of policy operations.	8 years ago
Rasika Perera	641cc58bbf	Fixing enrollment broken issue	8 years ago
Imesh Chandrasiri	da2fd787c4	Fix for datatable icon not showing issue	8 years ago
Ruwan	f2f304ccc4	Merge pull request #470 from rasika/release-2.0.x ... Fixing device identifier is null and Throwing exception when device not found	8 years ago
Rasika Perera	4e0730f50c	Fixing device identifier is null issue	8 years ago
Rasika Perera	289987db8e	Throwing exception on getDevice when device is not found	8 years ago
Hasunie	40d8488466	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
Ruwan	4bda6d89cb	Merge pull request #469 from menakaj/release-2.0.x ... Android sense stabilization	8 years ago
Hasunie	b9e0b099a1	fixing device update issue	8 years ago
charitha	7368b2cf64	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
charitha	8348002f66	Merge branch 'release-2.0.x' of https://github.com/ruwany/carbon-device-mgt into release-2.0.x	8 years ago
Charitha Goonetilleke	e137644677	Merge pull request #467 from madawas/IOTS-296 ... IOTS-296: Genaralizing policy view UI	8 years ago
charitha	161fe62a08	Fix for https://wso2.org/jira/browse/IOTS-323	8 years ago
Ace	34225bd9da	fixing operations loading spinner and other ui issues	8 years ago
Menaka Jayawardena	84a0b398fe	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
Menaka Jayawardena	ca2a79a001	Added entries for portal app in config files.	8 years ago
Ace	872bd88c6e	Merging with upstream	8 years ago
Ace	8cc0ba56c1	Adding changes to descriptor	8 years ago
Madawa Soysa	de95c99ea7	IOTS-296: Genaralizing policy view UI ... This commit inclued the generic policy view UI unit	8 years ago
Hasunie	631ea6e80f	Merge pull request #465 from harshanL/release-2.0.x ... Added security filters to devicemgt jaggery app	8 years ago
Harshan Liyanage	24c0966dce	Merge pull request #462 from madawas/IOTS-322 ... IOTS-322: Infroming users when device types are not installed	8 years ago
Harshan Liyanage	b4eb86e985	Added security filters to devicemgt jaggery app	8 years ago
Rasika Perera	e8d8373d46	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
Rasika Perera	4c1fb558d3	Fixing sso infinite redirection	8 years ago
Madawa Soysa	1d1f399477	IOTS-322: Infroming users when device types are not installed ... Currently policy platfom selection page is empty if no device types are installed. This will add an meaningful message to user if no device types are added. This commit resolves IOTS-322	8 years ago
Imesh Chandrasiri	f8d03e992e	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
Imesh Chandrasiri	09fa48c4c2	Removed fade-edge class from template markups for better listing readability	8 years ago
Charitha Goonetilleke	22990087a0	Merge pull request #459 from GPrathap/release-2.0.x ... removed hardcoded validity period while creating application in APIM	8 years ago
charitha	78d0172d5d	Merge remote-tracking branch 'upstream/release-2.0.x' into release-2.0.x	8 years ago
charitha	ee5459dc79	Fix for https://wso2.org/jira/browse/IOTS-321	8 years ago
Rasika Perera	2cfff85ee2	Merge pull request #458 from ruwany/release-2.0.x ... Adding content-type to descriptor	8 years ago
Ace	7eaee141e0	Adding content-type to descriptor	8 years ago
GPrathap	7807ed77da	removed hardcoded validity period while creating application in APIM	8 years ago
GPrathap	6e69fc8e84	changed application creation endpoint	8 years ago
Madawa Soysa	5c356914e8	IOTS-296: Commenting and refactoring	8 years ago
WSO2 Builder	228b24ca79	[maven-release-plugin] prepare for next development iteration	8 years ago
WSO2 Builder	5dbb258f55	[maven-release-plugin] prepare release v2.0.2	8 years ago
charitha	a8fff3736a	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
charitha	1c8e4b8de7	Merge branch 'portal' of https://github.com/Megala21/carbon-device-mgt into release-2.0.x ... # Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs	8 years ago
Charitha Goonetilleke	67a73189e1	Merge pull request #456 from rasika/IoTS-1.0.0 ... Fixing iOS UI issues	8 years ago
Rasika Perera	bec0f58e38	Adding semi-colon on context variable on service invoker Js	8 years ago
Rasika Perera	884bbe66b5	Adding iOS enrollment path into config.json	8 years ago
Rasika Perera	098ae372f7	Adding new css class for device type view image	8 years ago
charitha	3b97b3296e	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
Megala	ed325ee576	Adding dashboard feature	8 years ago
Chatura Dilan	82d865b104	Merge pull request #453 from madhawap/release-2.0.x ... Seperate out task operations	8 years ago
geethkokila	fbfbed7060	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
geethkokila	20ca76640d	Adding changes for the grouping and ownership changes	8 years ago
madhawap	2b00645779	refactored code	8 years ago
charitha	e718ab5504	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
charitha	cad686b43c	Bug fixes & UI/UX improvements	8 years ago
madhawap	bec4ae681d	Seperate out task operations	8 years ago
Madawa Soysa	b2650e439c	Fix issue with policy wrapper group select	8 years ago
Madawa Soysa	345fdc0ced	IOTS-296: Removing ownership selection when policy creation ... Removes ownership selection when creating and editing policies. Ownership management is done by the groups.	8 years ago
Hasunie	1d6bf23d67	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
Hasunie	529bde822c	fixing property string mapper issue	8 years ago
Hasunie	1b5bae3e46	adding required authorization property	8 years ago
charitha	efb2695286	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
geethkokila	0879a75f7b	Fixing the serializing issue of device groups.	8 years ago
charitha	d9b670ef19	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
charitha	564cece94b	Bug fixes	8 years ago
Charitha Goonetilleke	e1d2d8a73f	Merge pull request #447 from ruwany/release-2.0.x ... Adding android operations bar related changes	8 years ago
Ace	6126776fcf	Adding android operations bar related changes	8 years ago
Madawa Soysa	8cdc8cfb24	IOTS-296: Refactoring Policy create/edit units	8 years ago
charitha	3cb13e18a5	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
Charitha Goonetilleke	d9763ff5b7	Merge pull request #445 from GPrathap/release-2.0.x ... added creating an application for WebSocket	8 years ago
GPrathap	64ce41f571	added creating an application for WebSocket	8 years ago
GPrathap	c969013ca2	added new property : validity Period	8 years ago
charitha	a8e4a5f6fc	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
Charitha Goonetilleke	bf48f57f84	Merge pull request #442 from DimalChandrasiri/release-2.0.x ... Validation error fix	8 years ago
Charitha Goonetilleke	c84d7fd13d	Merge pull request #440 from DimalChandrasiri/IoTS-1.0.0 ... Data table fix when list view	8 years ago
charitha	4c60c90537	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
Madawa Soysa	c61cd484a0	IOTS-296: Adding group selection capability when adding a policy ... This commit introduces the device group select capabilty and saving the policy when creating and editing policies.	8 years ago
Imesh Chandrasiri	a56b953fcb	Validation error fix	8 years ago
Madawa Soysa	a4ca74c6c0	IOTS-296: Generalizing policy UI for policy edit ... This commit removes device type specific client side logic and UI components from the `cdmf.unit.policy.edit` unit.	8 years ago
Madawa Soysa	7aada58472	IOTS-296: Fixing issue with device type icon ... This commit fixes an issue which is unable to load device type icons in the policy listing page.	8 years ago
Madawa Soysa	0dfde40b7c	IOTS-296: Generalizing policy UI for policy create wizard ... This commit is done to seperate policy related client side logic and UIs from device type specific logics. This is a part of creating self contained plugins for device types. This commit generalizes the policy creation wizard in the CDMF core and removes device type specific UIs and client side logic from the core. Also, this introduces a generic policy configuration UI in a new unit.	8 years ago
Imesh Chandrasiri	d90c9ab68a	Data table fix when list view	8 years ago
charitha	431ce58c65	Merge with release-2.0.x branch	8 years ago
charitha	1bcea7cc1b	Move components with org.wso2.mdm group id to org.wso2.carbon.devicemgt group	8 years ago
WSO2 Builder	8431b30ddc	[maven-release-plugin] prepare for next development iteration	8 years ago
WSO2 Builder	ae2e283f14	[maven-release-plugin] prepare release v2.0.1	8 years ago
Rasika Perera	4789aafd28	Minor ui changes to the group listing	8 years ago
Charitha Goonetilleke	027498895a	Merge pull request #436 from DimalChandrasiri/IoTS-1.0.0 ... Merging UI fixes	8 years ago
Imesh Chandrasiri	54bb91d428	IoT Build UI Fixes	8 years ago
Rasika Perera	03f965adf6	Decrease group listing page loading time with lazy roles listing	8 years ago
Imesh Chandrasiri	07a0dee2d9	Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0	8 years ago
Rasika Perera	05453e7379	Removed 'role' suffix from roles listing page	8 years ago
Rasika Perera	ce4b389df0	Merge branch 'IoTS-1.0.0' of https://github.com/charithag/carbon-device-mgt into IoTS-1.0.0	8 years ago
Rasika Perera	aaade2363c	Adding new api to create combined roles	8 years ago
Rasika Perera	3fe18ba4bb	Refactoring group sharing modal	8 years ago
charitha	ca5d96df67	Add test cases to verify DAO functionality	8 years ago
Rasika Perera	54211bc3cc	Fixing minor issues on GroupDAO	8 years ago
Imesh Chandrasiri	5525c42eae	Removed Unneccsary title and added padding	8 years ago
charitha	a2db592d69	Updated group management APIs and service	8 years ago
charitha	726bbcd35d	Merged with upstream	8 years ago
Madawa Soysa	55bc5042bb	Merge pull request #422 from madawas/grouping-policy ... Generalize Policy Implementation - Creating system groups based on ownership	8 years ago
charitha	c07d77b85d	Updated group sharing model	8 years ago
ayyoob	ec3dbd37dd	fixed commit comments	8 years ago
Madawa Soysa	2f431504fe	creating groups from ownership and changing group owner ... This commit includes following changes, Creating groups using the device ownership Changing the default system group owner to wso2.system.user	8 years ago
ayyoob	e3849ef21e	removed feature lifecycle implementation	8 years ago
ayyoob	3fb42ef32e	Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0	8 years ago
ayyoob	fede8ec409	few changes after testing with authoriser	8 years ago
Madawa Soysa	8ab73ce07d	fixing issue with javadocs	8 years ago
Madawa Soysa	2164a30f88	changing group owner to super user ... Changing the owner of the default system generated groups from the group creator to the super user of the system.	8 years ago
Madawa Soysa	c29bf24a75	Adding mobile devices to default groupes based on device ownership ... Adding mobile devices to default system generated groups based on the device ownership (BYOD, COPE)	8 years ago
GPrathap	6efc5bc1ed	removed @API and @Permission annotations	8 years ago
ayyoob	fe263efe60	changed device access verification approach	8 years ago
ayyoob	28faf53802	Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0	8 years ago
ayyoob	59e2a33e4a	exposed device access authorisation as a service	8 years ago
ayyoob	20e7dd9e86	picked icon from features config	8 years ago
ayyoob	8a6af051dc	Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0	8 years ago
ayyoob	a0c8aeb159	few changes after testing feature manager implementation	8 years ago
WSO2 Builder	19c1b3566d	[maven-release-plugin] prepare for next development iteration	8 years ago
WSO2 Builder	cff6e242c8	[maven-release-plugin] prepare release v2.0.0	8 years ago
Ace	16d2a062da	Adding android device-view changes	8 years ago
Ace	a0616cf9a2	Adding config changes	8 years ago
charitha	a6064d2561	Update component versions for IoTS-1.0.0 release	8 years ago
charitha	40c59c2f16	Fix issues in policy UI	8 years ago
charitha	589ba9c40b	Add missing units	8 years ago
charitha	b8d8b35847	Merge branch 'IoTS-1.0.0' of https://github.com/sameeragunarathne/carbon-device-mgt into IoTS-1.0.0	8 years ago
sameera910409	02eec1033e	add group sharing role create functionality	8 years ago
sinthuja	2f59f1566c	Changing the port to the default port of the analytics pack.	8 years ago
ayyoob	415fae8007	fixed update issue	8 years ago
ayyoob	0f66c90660	preload db queries	8 years ago
ayyoob	44ac6b13b5	changes in UI after refactoring	8 years ago
ayyoob	4292442aa5	refactored device type deployer	8 years ago
Ace	5eaca0b1b1	merging with upstream	8 years ago
Ace	2aa1c98d0b	bringing common features to cdmf	8 years ago
charitha	bb60acd105	Fix device listing issue	8 years ago
ayyoob	202e0d5619	merged with origin	8 years ago
ayyoob	33bb9b5a14	merged with IoTS-1.0.0 branch	8 years ago
sinthuja	a5212213cf	Changing the default wbsocket URL to DAS endpoint.	8 years ago
charitha	d1a6353195	Synced with changes in master	8 years ago
charitha	4a115e5d3f	Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0	8 years ago
Charitha Goonetilleke	e1a1f710a0	Merge pull request #406 from sameeragunarathne/IoTS-1.0.0 ... fixed share groups and group analytics in device grouping	8 years ago
charitha	ac30e7eb3e	Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0 ... # Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs # components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js	8 years ago
WSO2 Builder	9517a3d30f	[maven-release-plugin] prepare for next development iteration	8 years ago
WSO2 Builder	a8568299b9	[maven-release-plugin] prepare release v1.2.6	8 years ago
kamidu	0867b3d075	updating the footer	8 years ago
Rasika Perera	fbe423b824	Using permissionsUtil.hasPermission for clientside permission check	8 years ago
Rasika Perera	b1b6b94570	Adding permissionsUtil	8 years ago
sameera910409	f8f7dd08cd	fixed share groups and group analytics in device grouping	8 years ago
Harshan Liyanage	261e8c510c	Fixed syntax issue in device.js file	8 years ago
Charitha Goonetilleke	353707c9c7	Merge pull request #404 from sameeragunarathne/IoTS-1.0.0 ... add group listing and group device listing fixes	8 years ago
charitha	1bfba25c5e	Remove user list and role list attributes from group object ... Move group components to same devicemgt package levels	8 years ago
kamidu	12e609c737	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	8 years ago
kamidu	0c70c87406	fix for EMM-1673	8 years ago
Kamidu Sachith Punchihewa	02d3adf51e	Merge pull request #401 from madawas/modal-refactor ... Refactoring pages to use new modal unit	8 years ago
Kamidu Sachith Punchihewa	33874f95b6	Merge pull request #399 from saadsahibjan/master ... Fix incorrect spacing	8 years ago
Kamidu Sachith Punchihewa	9d90411189	Merge pull request #402 from madawas/EMM-1298 ... Fix for EMM-1298	8 years ago
Kamidu Sachith Punchihewa	a295c88dc0	Merge pull request #405 from Megala21/master ... Refactoring code	8 years ago
sameera910409	204a0ed943	fixes for the comments of the PR#404	8 years ago
Megala	a088392b2f	Adding css for required fields	8 years ago
sameera910409	fef7c07cb2	add device group deleting and updating fixes	8 years ago
Harshan Liyanage	72522ad759	Fixed SQL syntax issue	8 years ago
Harshan Liyanage	9bf5ca94fb	Fixed SQL syntax issue	8 years ago
sameera910409	41f367abfa	add group listing and group device listing fixes	8 years ago
kamidu	1c2d339fed	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	8 years ago
kamidu	7212e969d8	Fix for SQL query issue in mysql	8 years ago
Ruwan	072119d7df	Merge pull request #403 from ayyoob/commit-fixes ... Commit fixes	8 years ago
charitha	5f68953b11	Merge branch 'master' into IoTS-1.0.0 ... # Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java # components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/GroupManagementAdminService.java # components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java # components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/GroupManagementAdminServiceImpl.java # components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml	8 years ago
ayyoob	3140c36f7b	added missing license headers	8 years ago
Harshan Liyanage	1ba2e2f768	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	8 years ago
Harshan Liyanage	f961b57f9f	EMM-1775:Fixed opleration log issue when multiple enrollments are there for a single device.	8 years ago
Madawa Soysa	774eaadb71	EMM-1298: Extracting serial number from the certificate itself when adding a certificate	8 years ago
kamidu	65ed6c2f6e	include owner for the operations api	8 years ago
sinthuja	a6203845c9	Fixing the empty methods for resources in the synapse configuration issue when auto publishing the apis for the REST service.	8 years ago
sinthuja	00e57bd800	Fixing the empty methods for resources in the synapse configuration issue when auto publishing the apis for the REST service.	8 years ago