Commit Graph

470 Commits (f93bac489f9536f27a7318c84e38ce5692f85ae7)

Author SHA1 Message Date
charitha ce5d63925a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
charitha e89b4015b6 Introduced pagination
8 years ago
Shavindri f0164b5a01 swagger annotations and definitions changes for role management, configuration management and application management(admin)
8 years ago
charitha f22d392978 Upgrade to comply with latest CDMF changes
8 years ago
charitha d1d6eefd17 Upgrading grouping backend
8 years ago
Chatura Dilan Perera c16cc4cae1 [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera ed4bca7032 [maven-release-plugin] prepare release v1.2.2
8 years ago
warunalakshitha 25ed0cf370 Fix build issue with swagger version
8 years ago
warunalakshitha 397c1daa2a Fix package import conflicts of org.wso2.carbon.device.mgt.common bundle
8 years ago
amalhub 428ce25b6f Fixing issue: https://wso2.org/jira/browse/EMM-1646
8 years ago
Ace 154a6082ce Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
8 years ago
Ace 33d8829540 Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
8 years ago
Ace 87ad1e0e71 Fixing intermittent jackson bind issue
8 years ago
Chatura Dilan Perera 50d8885f8b [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera a00d6aafd4 [maven-release-plugin] prepare release v1.2.1
8 years ago
harshanl 75df243a33 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Ace 6a8a5cbd5a Merging with master
8 years ago
harshanl 4169d3b2bd Fixed EMM-1554
8 years ago
Rasika Perera d9b25eda08 Adding deviceName into notifications
8 years ago
Chatura Dilan Perera de23a8cf27 [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera 8905fae0d9 [maven-release-plugin] prepare release v1.2.0
8 years ago
thusithakalugamage 0d02e88955 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
kamidu 878daae5c5 Permission modifications
8 years ago
Chatura Dilan Perera 2d5262e21e [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera 5ccd752404 [maven-release-plugin] prepare release v1.2.0
8 years ago
mharindu 115099c8fe Implemented permission based authorization
8 years ago
mharindu 24930b3042 Partial commit of migration
8 years ago
kamidu cd77ce692e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu abb3aea9a9 fixes for notification isses
8 years ago
harshanl a77564ac2d Added status for each device in Activity response
8 years ago
Chatura Dilan Perera 8b17cbb339 Fix conflicts
8 years ago
Chatura Dilan Perera 654e1d9938 [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera aa24821667 [maven-release-plugin] prepare release v1.1.2
8 years ago
hasuniea 6db619317c fixing app-install issue
8 years ago
mharindu 7346313d27 Modified scope management service
8 years ago
harshanl 671ba46fae Removed unnecessary properties from EnrollmentInfo object
8 years ago
hasuniea 349c3bdb63 fixing App Version not updating in portal after being initially set
9 years ago
harshanl 8fa311e119 Removed unnecessary properties from EnrollmentInfo object
9 years ago
harshanl f82ce82648 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 08ff70bb3c Refactored CertMgt component
9 years ago
mharindu eb5216091e Fixed conflicts and merged
9 years ago
madhawap d315e739e4 fix for the iOS device operations blocker
9 years ago
mharindu 564c2b280e Fixed conflicts and merged
9 years ago
Chatura Dilan 7af8ecc686 Added userstore for role listing
9 years ago
mharindu 827567733c Fixed scope update issue in API update
9 years ago
mharindu b3d309583d Fixed issues in scope service
9 years ago
mharindu 7f1e2fdf0b Implemented scope management service
9 years ago
mharindu 0f904e21d8 Fixed conflicts and merged
9 years ago
Chatura Dilan 4ec11e8c08 [maven-release-plugin] prepare for next development iteration
9 years ago
Chatura Dilan ffedcac543 [maven-release-plugin] prepare release v1.1.1
9 years ago
mharindu ac75ff1d71 Fixed conflict and merged
9 years ago
mharindu 49623a4693 Implemented scope based authorization
9 years ago
Chatura Dilan 2befefc967 Added OS build date
9 years ago
madhawap b55a164457 added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations
9 years ago
madhawap dbf938416b added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations
9 years ago
Chatura Dilan 24b462f4f4 Added is-active field to the Application
9 years ago
madhawap 88feb5a852 Add Pagination to Notification end points
9 years ago
prabathabey 3813856be8 Removing DeviceWrapper and all its associated usage, as it appeared to be a redundant element in the precense of 'Device'
9 years ago
geethkokila c07914eb36 Adding the activity count for the activty paginantion
9 years ago
geethkokila 236eb90ce2 Fixing the limit and offset for activity
9 years ago
prabathabey 8819c6e36b Adding support for 'If-Modified-Since' header and 'since' query filter
9 years ago
inoshperera d71f0c6e6d Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
inoshperera 037acbe5bb fixing platform configuration appearing twice issue.
9 years ago
prabathabey 1a29a9f58f Further fixing retrieving application list with device info
9 years ago
prabathabey d3ce96585f Fixing issues in returning application list in the device response
9 years ago
prabathabey b24250f3f2 Returning device info within the device bean itself
9 years ago
prabathabey fe22bfc125 Renaming 'recieved' to 'received'
9 years ago
hasuniea dfc673b08f Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
hasuniea 1443c7757e fixing code issues
9 years ago
prabathabey fc3d6cccbf Fixing Issues in notification management APIs
9 years ago
charitha e2c03adec4 FIx for https://wso2.org/jira/browse/IOTS-169
9 years ago
hasuniea 9c3c08b4ca fix UnAuthorizedDeviceAccessException.java
9 years ago
prabathabey 5ed982beb4 Adding more improvements to the JAX-RS APIs of CDM-F
9 years ago
prabathabey fd7a137b07 Improving jax-rs APIS of CDM-F
9 years ago
prabathabey 6e5148a374 Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services
9 years ago
inoshperera db3dc0517b adding activity status related details.
9 years ago
prabathabey 425c0e7498 Improving swagger annotations of CDM-F core APIs further
9 years ago
geethkokila 62c84319d8 Fixing the device search for application list
9 years ago
prabathabey 37aa05f79c Committing improved swagger annotated cdm-f APIs
9 years ago
geethkokila 6328d35797 Changing the device info object by adding the application list
9 years ago
prabathabey 30f6fc53b5 Merging the latest changes introduced in master
9 years ago
prabathabey ebefd60533 Renaming TenantConfiguration as PlatformConfiguration
9 years ago
geethkokila 86e564713d Adding the changes for getting activity ids which are changes after a certain time
9 years ago
geethkokila 01e3cc4987 Fixing the activity related issues
9 years ago
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
prabathabey 12c4ba10af Code cleanup
9 years ago
prabathabey 5e7985dae6 merging group-mgt implementation
9 years ago
geethkokila e9da24c9e8 Changing the snapshot versions from 1.0.4 to 1.1.0
9 years ago
geethkokila 41191d6df0 Adding the search feature to device mgt plugin
9 years ago
geethkokila 1826c9ee49 Doing a partial commit for pull
9 years ago
geethkokila be890c2e9a Doing a partial commit
9 years ago
prabathabey 3726a57d96 Making email-sender a separate component and code cleanup
9 years ago
geethkokila e0e0a57c11 [maven-release-plugin] prepare for next development iteration
9 years ago
geethkokila cebb88e712 [maven-release-plugin] prepare release v1.0.3
9 years ago
geethkokila e66d291947 [maven-release-plugin] prepare for next development iteration
9 years ago
geethkokila f416a73e75 [maven-release-plugin] prepare release v1.0.2
9 years ago
geethkokila 185a59fbd4 [maven-release-plugin] prepare for next development iteration
9 years ago
geethkokila b3580d754b [maven-release-plugin] prepare release v1.0.1
9 years ago
harshanl 9a7093a0f7 Fixed EMM-1146 issue
9 years ago
geethkokila 4e9255fbc9 [maven-release-plugin] prepare for next development iteration
9 years ago
geethkokila ceb60adb34 [maven-release-plugin] prepare release v1.0.0
9 years ago