Commit Graph

1565 Commits (4fe79be5f8c205c3274de780fcb10ed38209f170)

Author SHA1 Message Date
Rasika Perera b8bf855378 Calculating enrollment url when generalConfig.host config exists
8 years ago
inoshperera 2e8df6a16a Merge pull request #322 from charithag/master
8 years ago
charitha efcd5272d2 Fix issues in sql statements
8 years ago
harshanl 01e2408ece Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
mharindu 34f1d9ee38 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
8 years ago
kamidu 9510554f67 Fix the notification view internal server error issue
8 years ago
dilanua c7f4bba8bf Deprecating operation.js module from UI
8 years ago
dilanua e125871de0 Adding business-controllers to UI Modules
8 years ago
harshanl 06f72c014e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
harshanl 6cc1bb088c Fixed EMM-1447, EMM-1424
8 years ago
dilanua ec7f8ccd1f disabling testing info logs at token-protected-service-invokers.js
8 years ago
dilanua 89cebcdb9e Updating UI oauth module with suppressed warnings for verified, but unresolved variables and functions
8 years ago
dilanua 39b14c9bc5 Adding conf-reader to UI modules
8 years ago
dilanua bbff93adcc Updating token-handler-utils with suppressed warnings for java packg imports
8 years ago
mharindu ccdcea0109 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
8 years ago
dilanua 303f16e747 Deprecating obsolete UI functions - device.js
8 years ago
dilanua bc4192280c Updating OAuth UI Module
8 years ago
dilanua 020f35cb4e Updating OAuth UI Module
8 years ago
dilanua 7017f6e32b Updating OAuth module dependants
8 years ago
dilanua 032b5d129a Adding OAUTH module to UI
8 years ago
dilanua b86be8375c Refactoring OAuth utilities at UI Layer
8 years ago
dilanua 70074e2f3e Refactoring OAuth utilities at UI Layer
8 years ago
dilanua a4c5aa5951 Refactoring OAuth utilities at UI Layer
8 years ago
dilanua f7509f698d Removing obsolete UI modules
8 years ago
dilanua 2efdc30177 Refactoring OAuth utilities at UI Layer
8 years ago
mharindu 84090fb16c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
8 years ago
Milan Perera c49dc435e1 Merge pull request #319 from ayyoob/transport
9 years ago
dilanua 4b39a877ad Updating oauth token handlers
9 years ago
dilanua 1172e759ca Deprecating serverAdress.js
9 years ago
prabathabey 5ed3174a28 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 5adfab9f8a Improving connection handling in cert management related functionalities, adding UNIQUE key constraints to DM_DEVICE and DM_ENROLMENT tables, improving response handling of certificate management admin API
9 years ago
Ace 07b12fe4ea Bug fixes
9 years ago
Ace 0d94a293a4 Adding notification and fixing QR code
9 years ago
prabathabey c63818b78f Avoiding multiple device data getting retrieved upon the same id
9 years ago
prabathabey e27905792f Code cleanup
9 years ago
prabathabey 5bc7cf7c30 Simplifying operation management related implementations
9 years ago
dilanua 8550bcb145 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua d2ec81b12b Refactoring oauth token handling functions and dependants
9 years ago
Ace 1ed0481ec3 Changing nav-bar base-unit implementation
9 years ago
mharindu 6e742ee6ac Added scope beans
9 years ago
mharindu 564c2b280e Fixed conflicts and merged
9 years ago
Chatura Dilan 046cd6586c Merge branch 'master' of github.com:wso2/carbon-device-mgt
9 years ago
Chatura Dilan 7af8ecc686 Added userstore for role listing
9 years ago
dilanua 34edbce1a0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua c228f03481 Refactoring oauth token handling functions and dependants
9 years ago
prabathabey 89634a9c38 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey bd1322e801 Improving transaction handling in certificate management component and cleaning up the OperationManagerImpl
9 years ago
dilanua b72d099641 Refactoring oauth token handling functions
9 years ago
dilanua d05c6e2170 Deprecating /api/token.jag (unused)
9 years ago
mharindu 3457bba4a3 Adding Annotation reading fix for device-mgt-extensions
9 years ago
dilanua 87dbb5f9e1 Refactoring ui token handling functions
9 years ago
dilanua 7facff4b58 Updating ui init logic
9 years ago
dilanua c57c75945c Deprecating invoker-request-wrapper (unused)
9 years ago
dilanua 00f98f5cce Updating base ui app config reader
9 years ago
dilanua d04cb54ae8 Refactoring base ui app config reader
9 years ago
dilanua c12630e65c Refactoring base ui app config reader
9 years ago
dilanua 1916c4df5f Refactoring cdmf product page layout
9 years ago
dilanua 7d9cde3cfb Refactoring Navigation Bar
9 years ago
dilanua 99aca9b90a Updating user-listing
9 years ago
dilanua bbce1a3d8a Refactoring user-listing front-end logic
9 years ago
dilanua 8f81f2bb01 Refactoring data-tables-invoker-api
9 years ago
dilanua 225b1ddc45 Refactoring device-mgt-props
9 years ago
mharindu 3331604699 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
9 years ago
mharindu 827567733c Fixed scope update issue in API update
9 years ago
dilanua 7e7549437b Refactoring user module
9 years ago
dilanua 24d846a328 Refactoring user-create page and related modules
9 years ago
dilanua b636738be3 Fixing issue: user-list not getting updated upon user-removal
9 years ago
ayyoob 250ce1f77c added device mgt grant types
9 years ago
mharindu b3d309583d Fixed issues in scope service
9 years ago
dilanua da6ff6e7fa Refactoring user-listing page
9 years ago
dilanua 177b7cf3df Refactoring data-tables-extended-unit
9 years ago
Ace c8b37207fc Fixing context issue in service-invoker
9 years ago
mharindu b8f2457046 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
9 years ago
dilanua 31b62e6336 Adding jaggery.conf url mapping for data-tables-invoker-api
9 years ago
mharindu 7f1e2fdf0b Implemented scope management service
9 years ago
Ace b8635db485 Adding changes to common modules to accomodate ui restructuring
9 years ago
mharindu bdec8880bb Fixed conflicts and merged
9 years ago
mharindu 186432e1df Fixed webapp name resolving issue
9 years ago
Dulitha Wijewantha 03f323d6e2 Fixed a bug where getBoolean wasn't used
9 years ago
Ace ca8859c80a Fixing broken build due to new javax.xml imports
9 years ago
Timo Briddigkeit ed07774552 Fixed literal string comparison.
9 years ago
mharindu 80f737822e Fixed enrollment device mapping issue
9 years ago
Prabath Abeysekara fbb09a7f58 Merge pull request #316 from xenobyte/master
9 years ago
Timo Briddigkeit 90910518d6 Fixed null pointer dereferences
9 years ago
Ace 15ae91d1c5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Ace ca10ad53bb Adding emm apis as common modules
9 years ago
prabathabey 40b43a8b97 DAO exceptions thrown while retrieving advance details of devices appears to have been swallowen at the REST API implementation that exposes the aforementioned functionality. This particular fix resolves it
9 years ago
Timo Briddigkeit b674304087 Made constants real constant using final
9 years ago
Timo Briddigkeit ee5b077e6a Fixed various XML External Entity (XXE) attack vulnerabilities
9 years ago
Timo Briddigkeit 09020ccb9f Fixed predictable pseudorandom number generator
9 years ago
mharindu 99664b23c5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
9 years ago
Dilan U. Ariyaratne ab5aa3e31c Merge pull request #315 from madhawap/master
9 years ago
madhawap 0b338a1d25 Added missing end-point to the permissions.xml
9 years ago
mharindu 789086a667 Changed context paths
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 79a6da82f2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu c7eef634ac Added send-invitation endpoint
9 years ago
dilanua c61ef1c98e Fixing issues of GET /compliance-data API
9 years ago
Ace 58666bc4b0 Adding device name url param for device search
9 years ago
madhawap c3cbc5b4fb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
madhawap 0b1e4ad86b Updated permissions.xml according to new end-points
9 years ago
Ace d58fb57f4e Enabling device search for multiple params
9 years ago
madhawap e52fed0b2d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
madhawap 34354c032e Added end-point to get devices enrolled under a specific user
9 years ago
prabathabey 6edfad5fb7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 9aa54f2ead Improving policy management functionalities to use deviceType in place of deviceTypeId for persisting policy information
9 years ago
Dilan U. Ariyaratne 73551590b9 Merge pull request #313 from madhawap/master
9 years ago
madhawap 09e2d2ecaf Removing the internal status code added to the compliance data wrapper
9 years ago
madhawap 68b7d304a0 Added end point to get Compliance Data Of a Device
9 years ago
prabathabey 0125310440 Prepending the url template configured for updating notifications with a '/'
9 years ago
prabathabey 78057b2992 Adding an API to return the list of device types registered in the underlying device management platform
9 years ago
mharindu cc5f677165 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
9 years ago
mharindu aa6085ac8c Added scopes to APIs
9 years ago
hasuniea 282ac72249 adding SCEPManagerService to scep manager compenent
9 years ago
mharindu ff82accb48 added scopes to notification API
9 years ago
mharindu 60659ce15b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
9 years ago
mharindu fe28bc25f1 Refactored scopes
9 years ago
madhawap c17dda082d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
madhawap 2136ebbeee changes to 'updateNotificationStatus' swagger annotations
9 years ago
hasuniea 54498f41cd modifying scep utils
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
prabathabey be7e63c390 merging rest-api-improvements branch to master
9 years ago
prabathabey ed5d611c35 Code cleanup
9 years ago
prabathabey f33ac36bfa Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
prabathabey 37852051ff Improving Device and Policy Management APIs and cleaning up code of Role and User Management APIs
9 years ago
Chatura Dilan 24b462f4f4 Added is-active field to the Application
9 years ago
Ace cf887a2e93 Merging emm module changes to devicemgt iot app
9 years ago
Chatura Dilan f100853031 Merge branch 'master' of github.com:wso2/carbon-device-mgt
9 years ago
dilanua d34f29ab46 Fixing device types not retrieving issue
9 years ago
Chatura Dilan bb6d2f2012 Fixed user search
9 years ago
madhawap d9b35c29cd swagger annotation fix to policy 'apply-changes' end point
9 years ago
madhawap 88feb5a852 Add Pagination to Notification end points
9 years ago
prabathabey 624e7df688 Improving HTTP status code handling and the resource implementations
9 years ago
prabathabey a23f44e682 Improving AcitivityManagement API implementation with proper error handling, etc
9 years ago
prabathabey ad6b95ff62 Code cleanup
9 years ago
prabathabey a46bd9194b Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
prabathabey 4236744d39 Improving UserManagement and RoleManagement API implementations to return proper error codes when no role/user exists, etc
9 years ago
Dilan U. Ariyaratne a278b788d6 Merge pull request #308 from madhawap/rest-api-improvements
9 years ago
madhawap b50e007897 added /priorities end-point to PolicyManagement
9 years ago
madhawap 9c215c4ac9 added /priorities end-point to PolicyManagement
9 years ago
Ruwan 6ce7f8c65a Merge pull request #307 from ayyoob/transport
9 years ago
ayyoob ba6e202442 Few changes added after testing with the cluster
9 years ago
inoshperera 50009c7ac5 adding apply policy end point
9 years ago
madhawap ee11bde8b0 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
madhawap 235d690f1e Implemented 'offset' and 'limit' parameters to the 'operation' api
9 years ago
prabathabey 0c54753b34 Cleaning up UserManagementService API implementation
9 years ago
prabathabey f1eca17991 Code cleanup
9 years ago
prabathabey 9a7286a84b Removing DeviceWrapper and all its associated usage, as it appeared to be a redundant element in the precense of 'Device'
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
prabathabey aeb4ad3295 Merging rest-api-improvements branch to master
9 years ago
geethkokila c07914eb36 Adding the activity count for the activty paginantion
9 years ago
geethkokila a67f432993 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
geethkokila 236eb90ce2 Fixing the limit and offset for activity
9 years ago
madhawap f2ab923df5 fix related to http status code in 'getDevices' endpoint
9 years ago
ayyoob ebebca8573 Added support for push notification for xmpp, mqtt and few changes to the after testing
9 years ago
madhawap ea56d4ced3 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
madhawap 015ca0575e added 'updatedTimeStamp' to the Activity get response
9 years ago
ayyoob 1373e995fb added support to load device type configuration in base ui
9 years ago
dilanua 1513c6cf8a Adding isActive property to PolicyWrapper
9 years ago
madhawap 7cdb7dcee1 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
dilanua 0eed97e84c Adding API for getting device types
9 years ago
madhawap b3f95d19c1 add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
9 years ago
inoshperera 96eb71314b Merge pull request #297 from madhawap/rest-api-improvements
9 years ago
madhawap d7b860b955 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
madhawap 59119f9167 add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
9 years ago
ayyoob 7b2c04152f changed the UI calls from tomcat to apimgt gateway
9 years ago
Ace 7b62d2769e Changing response code returned when adding user
9 years ago
madhawap 3d416da6fe add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
9 years ago
geethkokila 626142a59b Fixing the isssue in retrieving the device info
9 years ago
Ace 016414c076 Bug fixes for role search
9 years ago
geethkokila d6501cbf8c Fixing the device search issues
9 years ago
Sahan Kariyawasam 35f43a60e7 Added Dashboard server url property
9 years ago
mharindu de72cc21c6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
mharindu 3858920d72 Changed HTTPS Url
9 years ago
ayyoob bb051deebc added https url for jaggery app deployment server
9 years ago
mharindu a80ca2d696 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
GPrathap efb71d472a changing sso default state
9 years ago
GPrathap e23044d59d fixing jira:IOTS-195
9 years ago
mharindu f7c653b61c Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
mharindu 9eb2f5df86 Fixed foriegn key violation issue when getting pending operations
9 years ago
madhawap f80603a365 Fixes to if-modified-since in activity provider
9 years ago
Ace 4609888ad1 Fixes to ifmodified-since in activity provider
9 years ago
ayyoob 23ee3e25e7 updated the timestamp
9 years ago
geethkokila 42ce71da2c Fixing the spelling mistake
9 years ago
geethkokila 6aea69ae44 Fixing the duplicate issue
9 years ago
geethkokila efa74030b4 Fixing response duplicate issue
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 3c21583db6 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
prabathabey 1a29a9f58f Further fixing retrieving application list with device info
9 years ago
geethkokila ae887d6842 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
geethkokila a04300b3b6 Fixing the activity Id issue
9 years ago
prabathabey d3ce96585f Fixing issues in returning application list in the device response
9 years ago
geethkokila cc6883d955 Changing the if to a while loop, fixing the activity id issue
9 years ago
prabathabey 67c9ee0e70 Fixing commit conflict
9 years ago
prabathabey b24250f3f2 Returning device info within the device bean itself
9 years ago
hasuniea dc72fd1553 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
hasuniea e2cebcd430 removed If-Modified-Since header param
9 years ago
inoshperera ee948abc9d fixing conflicts and improving swagger annotations and validations
9 years ago
inoshperera 5620e38681 adding proper error messages for APIs
9 years ago
prabathabey fe22bfc125 Renaming 'recieved' to 'received'
9 years ago
prabathabey d32cd96a74 Fixing merge conflicts
9 years ago
prabathabey 9ebf705323 Re-enabling retrieval of device info
9 years ago
prabathabey e002ffb54a Re-enabling retrieval of device info
9 years ago
dilanua dada719486 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
dilanua 0bd2a46690 Adding H2/MSSQL/ORACLE/POSTGRESQL support for GET /admin/devices API
9 years ago
ayyoob aa6298b5e7 updated device management admin api permission
9 years ago
ayyoob d926bdaa34 removed unused permission from permission.xml
9 years ago
dilanua 07a4a65c7c Fixing permission issues with GET /devices/*/*/features API
9 years ago
dilanua 25e45dc9f1 Fixing issues in GET /operations and /admin/devices APIs
9 years ago
mharindu 7a029743ba Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
mharindu 81aa298740 Fixed RoleManagementService API issues
9 years ago
prabathabey 3cb9b5bae2 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
prabathabey 61beca5048 Fixing getDevice method to support status, ownership, etc as query param filters
9 years ago
ayyoob 9f1de717c5 updated permissions in the permission.xml
9 years ago
mharindu 7aa37ff4d5 Fixed issues in RoleManagementService
9 years ago
mharindu 63ea40eb27 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
mharindu ce557266ec Fixed issues in RoleManagementService
9 years ago
ayyoob d9c15b62e7 few changes after testing user management api
9 years ago
Prabath Abeysekara 14322d4ba5 Merge pull request #283 from ayyoob/rest-api-improvements
9 years ago
ayyoob 5b8b15f69b fixed api issues in policy
9 years ago
prabathabey c9a2dc4399 Improving user management API implementation
9 years ago
prabathabey 627d99e913 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
prabathabey 00a16ea2bc Improving Role management API implementation
9 years ago
dilanua 4a74ea8100 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
dilanua 374d509881 Updating DeviceManagementAdminServiceImpl
9 years ago
prabathabey 3e21c6d50d Improving ceritificate management webapp impl
9 years ago
Ace ddfd678b2a Adding user management API bug fixes and improvements
9 years ago
Ace d13368d144 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
Ace bfe215deac Adding changes and bug fixes to UserMgtService
9 years ago
Milan Perera 289fef040b Merge pull request #282 from ayyoob/rest-api-improvements
9 years ago
ayyoob d63e5e876b added password validation error msg
9 years ago
mharindu cfe24229fc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
prabathabey 1d4d0b7ae2 Improving certificate management webapp implementation
9 years ago
ayyoob 74a96015a7 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
ayyoob cf1e808cbd refactored after testing UserAdminManangmentService
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 9f48145614 Improving device admin service impl
9 years ago
prabathabey 697c727801 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
prabathabey fc3d6cccbf Fixing Issues in notification management APIs
9 years ago
hasuniea 57d445237a add certificateMgtService
9 years ago
charitha 92a732cd41 Moved redundant texts to constants
9 years ago