Commit Graph

286 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
prabathabey a375252a94 Adding pluggable push notification framework
9 years ago
ayyoob 51d46213c2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport
9 years ago
Madhawa Perera 43648e4692 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Madhawa Perera b5741b420c Adding swagger annotations to beans
9 years ago
prabathabey a0dbb25824 Fixing code conflicts and improving swagger annotations
9 years ago
ayyoob 48912a05bb merged with upstream
9 years ago
inosh-perera 0cf0ec6e77 adding swagger annotations to APIs
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 3bec779e0b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 362cf40d85 Fixing the operation activity id issues
9 years ago
inosh-perera 797c7a02d0 adding swagger annotation to beans
9 years ago
Madhawa 07c5362104 Adding swagger annotations to beans and some modifications to api interfaces
9 years ago
inosh-perera c945d63038 fixing issues in swagger dependancy
9 years ago
ayyoob ec7727e8bf removed method and type from features
9 years ago
hasuniea e633d28013 added annotation for ConfigurationEntry
9 years ago
hasuniea e4dfe63548 code conflicts
9 years ago
hasuniea 1267db52ce added swagger annotations for TenantConfiguration
9 years ago
inosh-perera 5597c752ac Adding sawgger annotations to admin Jax-rs apis.
9 years ago
Rasika Perera 938eda7c46 Adding group permissions checking
9 years ago
Rasika Perera 9cb24d8cec Adding enum to hold default role to default permissions mapping
9 years ago
Rasika Perera 4eb588ac60 Group Constants moved to common
9 years ago
Rasika Perera 38cdd94f3c Adding group permission checking for Device Access Authorizations
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 6f9851413e Adding the changes for operation activity id
9 years ago
geethkokila 4029c86da4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 2fb42518b6 Adding the changes for the device group with policy.
9 years ago
prabathabey 52b81dd3eb Fixing compilation failures
9 years ago
prabathabey f5f177a858 Wrapping all device provisioning related info in ProvisioningConfig
9 years ago
prabathabey aef892fece Code cleanup
9 years ago
prabathabey a10a693507 Fixing find bugs reported issues
9 years ago
prabathabey 47572d08f5 Removing obsolete dependencies to ApplicationManager interface from DeviceManagementService SPI
9 years ago
Lakshman 551aaf172b formatting change
9 years ago
Lakshman 7174d000e0 override hash and equals function in Device to avoid duplicates in collections
9 years ago
charithag d22570dadb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charithag bf58342d81 Refactor group management
9 years ago
Prabath Abeysekara f1081f7029 Merge pull request #204 from ayyoob/merge-latest
9 years ago
geethkokila 73a82f743f Adding the changes for device Info bean to stop returing null values and changes done for Device search unit classes
9 years ago
ayyoob 81ae512f13 Merge pull request #6 from ayyoob/merge-devicetype
9 years ago
charithag 0a8e00fd1e Merged with upstream and resolved conflicts.
9 years ago
charithag 3e4ccf6337 Add missing features and component from IoTS-1.0.0-M4
9 years ago
geethkokila 888971ae39 Fixing the oracl and postgres sql datasources and removing the start and end from the search context
9 years ago
geethkokila aa63b5f592 Fixing the application memory usage and adding location based search
9 years ago
charithag fa2f61f48a Add missing parts in group management
9 years ago
ayyoob c45895685b Added device type multi tenancy capability.
9 years ago