Commit Graph

714 Commits (e7bf0c7658e5b60b9c886a8cdff788c2fa8d5b71)

Author SHA1 Message Date
prabathabey 8b9cf0da85 Resolving conflicts caused by merging with the updates in master
9 years ago
geethkokila c64a6e0ec5 Changing apis to return activity when an operation is added
9 years ago
mharindu 3e291c5b13 [maven-release-plugin] prepare for next development iteration
9 years ago
mharindu 9549ac446b [maven-release-plugin] prepare release v1.1.0
9 years ago
mharindu 968cb00f35 Fixed conflicts and merged
9 years ago
prabathabey a375252a94 Adding pluggable push notification framework
9 years ago
mharindu bca1b4b059 Fixed conflicts
9 years ago
geethkokila c7dd386c94 Adding new apis for device informations
9 years ago
mharindu 89026c2b7f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
charitha 6dc0a9dd38 Fix for https://wso2.org/jira/browse/IOTS-110 multitenanted scenario
9 years ago
mharindu 5ccc480ddb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
charitha e0fc7c4018 Fix for https://wso2.org/jira/browse/IOTS-110
9 years ago
mharindu 83ec18c38d Removed external dependancies from webapp publisher component
9 years ago
mharindu c68b92c7b4 Fixed conflicts
9 years ago
mharindu 9a4b904702 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
Ace cbc505c459 changing profile name
9 years ago
Ace 4517a7f1aa Making API publish destination configurable and other changes
9 years ago
Ace 6d9f2f92a4 Making API publish destination configurable
9 years ago
Madhawa Perera 26c10f84ec Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Madhawa Perera 66c12a8b1c Adding swagger annotations to beans
9 years ago
geethkokila 362cf40d85 Fixing the operation activity id issues
9 years ago
mharindu ed1eb217ea Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
inosh-perera c945d63038 fixing issues in swagger dependancy
9 years ago
Madhawa fffc7f3205 Adding swagger annotations to beans
9 years ago
mharindu 1f21144668 Renamed EMM permission to CDMF
9 years ago
Madhawa 707da02c7e Adding swagger annotations to beans
9 years ago
dilanua 0534cd0a7e Adding h2, mysql, postgre-sql and oracle support to dashboard analytics feature
9 years ago
Rasika Perera 18edc21a04 Adding group permissions validation for operations
9 years ago
Rasika Perera 5c680b3f65 Fixing issue on group permission validating
9 years ago
Charitha Goonetilleke 8c62d9d64c Add authorization check for shared devices in groups
9 years ago
Charitha Goonetilleke 92784120bd Add group sharing UI functionality
9 years ago
Charitha Goonetilleke b705352fb7 Merge branch 'master' of https://github.com/rasika90/carbon-device-mgt
9 years ago
Charitha Goonetilleke f74a5b7a59 Merge remote-tracking branch 'rasika/master'
9 years ago
Rasika Perera 938eda7c46 Adding group permissions checking
9 years ago
Rasika Perera 142ab10eea Code refactoring
9 years ago
geethkokila d32e822055 Fixing the shutdown errors
9 years ago
Rasika Perera 38cdd94f3c Adding group permission checking for Device Access Authorizations
9 years ago
geethkokila e2d67fc92c Adding the changes for device search
9 years ago
geethkokila f2128762f0 Adding the changes for removing repeated operations from pending operations, if same operation is added twice, are making them repeated, Device will not recieve them
9 years ago
geethkokila 3396a5066d Adding changes for the updated time of device info and device location
9 years ago
geethkokila d4f2a95972 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charithag fd531555a3 Fix bugs
9 years ago
charithag 68361f01ed Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 3dd830c7d0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 6f9851413e Adding the changes for operation activity id
9 years ago
mharindu 6f8bb64e1c Fixed merge conflicts
9 years ago
mharindu ffc7542d4d Modified authorization to support API gateway
9 years ago
charithag 25ea00f26f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charithag b1683c1ccb Add capability to assign device in to a group and bug fixes
9 years ago
geethkokila 4029c86da4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago