4644 Commits (8d0e7a2086269c4792d7c9e943799d5038371895)

 

All Branches   

Search

Author	SHA1	Message	Date
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
sinthuja	bc84ff85ea	Changing the default port of publishing to 7612.	8 years ago
sinthuja	8767dd9b44	Adding missing dependency jersey core with device mgt.	8 years ago
Charitha Goonetilleke	90a5e38787	Merge pull request #409 from charithag/IoTS-1.0.0 ... Synced with master	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
Kamidu Sachith Punchihewa	23c65558db	Merge pull request #408 from wso2/release-1.2.6 ... Release 1.2.6	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
kamidu	9aaf5fc683	upgrading carbon version	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
ayyoob	8293ed43ae	added missing imports	8 years ago
ayyoob	16f6a62dca	refactored DAO handler	8 years ago
ayyoob	fbfb86c53e	refactored DAO handler	8 years ago