Commit Graph

922 Commits (5ad8d2938e65d9ef562ce82c0beb59b54b73f560)

Author SHA1 Message Date
Kamidu Sachith c6e2c01caa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Kamidu Sachith 2d23eb86eb Improve runtime performance
9 years ago
harshanl a61fe6171a Refactored pagination code
9 years ago
Dileesha Rajapakse b25438097e Fixed issues in EnrollmentDAOImpl
9 years ago
harshanl 6441c201e5 Added search support for pagination
9 years ago
Dileesha Rajapakse eb680da572 Fixed EMM-1103
9 years ago
harshanl 91ece82eca Updated operation DAO to sort data in DESC order of timestamp.
9 years ago
harshanl d4b6ba5e36 Added pagination support for operation management apis.
9 years ago
harshanl 30e8dc885c Fixed EMM-1034
9 years ago
harshanl 73906f7cda Fixed EMM-1003
9 years ago
harshanl d95a198ad6 Fixed EMM-1001
9 years ago
Kamidu Sachith 53064516d3 Fix for the Jira Issue EMM-989
9 years ago
Kamidu Sachith 8573a284e0 Enable Domain name in the invitation main
9 years ago
manoj e1dc3d2ea3 add notify mechanisam to plugins for some operations - Ex -: IOS send push note to apns when add operation
9 years ago
manoj 99f82e4817 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl b4d17b888b fixed secondary user-store related issues & multi-tenancy issues
9 years ago
manoj a04658af14 App Manager integration
9 years ago
manoj 79c268cb41 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dileesha Rajapakse 767ea70436 Refactored CommandOperation DAO class
9 years ago
Dileesha Rajapakse 8bd9295f81 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dileesha Rajapakse f3cfb79bac Refactored Operation DAO classes
9 years ago
harshanl f0471203e7 Added logic to skip device authorization for policy operations
9 years ago
Dileesha Rajapakse 6e95451f57 Refactored Operation DAO class
9 years ago
manoj dbf8d13ced Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
manoj 20db31c2a9 Add app manager features
9 years ago
Dileesha Rajapakse 825017a492 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dileesha Rajapakse 4379232c25 Refactored Enrollment DAO class
9 years ago
harshanl a3e20367f2 Fixed issue in Policy Task when DeviceAuthorization enabled.
9 years ago
Dileesha Rajapakse 6446be100d Refactored Policy Management DAO classes
9 years ago
Dileesha Rajapakse 91d9db1ffa Refactored ApplicationMapping and ProfileOperation DAO classes
9 years ago
Dileesha Rajapakse 27254cc922 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl cb02c9da80 Fixed issues in DeviceAuthorization
9 years ago
Dileesha Rajapakse 6f0276ab2f Modified Application Mapping DAO classes
9 years ago
Dileesha Rajapakse 7b2cfd69f5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl b9ca6705ae Merged changes
9 years ago
harshanl e14f09b8a8 Added requireDeviceAuthorization support
9 years ago
manoj fdc4ad8e18 Set user level autherization is support by plugin or not
9 years ago
manoj 22c2da7fcb Set user level autherization is support by plugin or not
9 years ago
manoj dc2e41e083 Add authentication method boolean check. Android allows user level authentication. IOS and windows allow device authetication. This is a temporary fix until fix windows and IOS certifcate level user extraction
9 years ago
manoj adc3b652bf Add authentication method boolean check. Android allows user level authentication. IOS and windows allow device authetication. This is a temporary fix until fix windows and IOS certifcate level user extraction
9 years ago
Dileesha Rajapakse 786eb93bca Refactored Operation DAO classes
9 years ago
Dileesha Rajapakse 123ea228ad Refactored Enrolment DAO class
9 years ago
Dileesha Rajapakse 1975821446 Refactored Device and Application DAO classes
9 years ago
harshanl 5d107b0d56 Merged changes
9 years ago
harshanl 93e641893c Merged changes
9 years ago
harshanl 026a7c187a Fixed EMM-945, EMM-910, EMM-911, EMM-870
9 years ago
inosh-perera 4faa740c9d Fixing JIRA EMM-947 - only the registered device types are returned to UI
9 years ago
harshanl c826be9b3e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 74a3b0e346 Fixed EMM-910
9 years ago
geethkokila 30c53b7d14 Fixing the EMM-900, Ading the LB host name and port to the email url
9 years ago
geethkokila 2479be9f5a Fixing the email client issue
9 years ago
Kasun Delgolla c00b1ee713 Committing fix for JIRA- EMM-860
9 years ago
prabathabey 90240e7d3f Merging https://github.com/wso2/carbon-device-mgt/pull/40 and resolving conflicts
9 years ago
harshanl 8a1dba166a Updated FeatureMgr spec
9 years ago
harshanl 340a690995 Added sql script
9 years ago
harshanl 1d4bba9807 License issue fixed
9 years ago
harshanl 09fbf9e8a1 Fixed DAO issues
9 years ago
harshanl 89e930d530 Fixed isssues in pagination
9 years ago
harshanl 25d7459974 Pagination changes
9 years ago
harshanl 155606a326 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey a0ebec9f3d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey c74e27102f Fixing issues in adding license configs
9 years ago
harshanl 81b6770c08 Fixed oauth issue with tenants
9 years ago
harshanl 6c196d5317 Added pagination support
9 years ago
harshanl 9a68aa92bc Removed the use of web-app context in permission.xml of webapps
9 years ago
harshanl d4eab9f86e Code refactored.
9 years ago
harshanl 429b738dba Fixed issues in permission tree'
9 years ago
harshanl 77f5f466d6 Added scope validator and refactored code
9 years ago
harshanl 648d8ec209 Added OAuth scope validator & fixed DataHolders
9 years ago
harshanl 234cd47931 Added identity-extensions
9 years ago
milanperera e408d50037 Refactored permission module
9 years ago
milanperera a0187b905b Removed unneccessary imports and code segments
9 years ago
milanperera a84edd7a99 Added seperate permission tree class
9 years ago
milanperera 02ad7fb8e1 Refactored authorization module
9 years ago
milanperera ed937467cd Refactored permission authorizer module
9 years ago
milanperera 68befaae01 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
milanperera 1034eb85c6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu 0a321e279a Added null check to getLicense
9 years ago
Dilshan Edirisuriya 9ce1c2002a Null check in DAO
9 years ago
milanperera 126c2ec371 Implemented permission authorizing module
9 years ago
milanperera 47ac0b1146 Fixed conflicts and merged local changes
9 years ago
Dilshan Edirisuriya ac5a7f4ab1 Null check in JWT authenticator and fixing tenant id issue in device DAO
9 years ago
milanperera 37854a2cef Partial Commit
9 years ago
Dilshan Edirisuriya 5f2ec88300 Changes in certificate managment
9 years ago
Dilshan Edirisuriya 3907c0fba2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dilshan Edirisuriya 4a03c7abf7 certificate authentication changes
9 years ago
harshanl b8720917e1 Added Dynamic-client-registration module
9 years ago
milanperera 517039cccb Partial commit
9 years ago
mharindu 2331b61bdc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl bf0e95fa6c Fixed notification service issues
9 years ago
harshanl 330f059a09 Added App-Mgt config testcases
9 years ago
mharindu 3421663724 Fixed conflics and merged
9 years ago
geethkokila 4500aacd38 Adding the scep support for getting the device tenant id
9 years ago
mharindu 0e7ff3c0c8 Merged
9 years ago
hasuniea 581c4f013b refactored changes
9 years ago
mharindu 069c7e7c5f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl bbec523a47 Added notification mechanism
9 years ago
mharindu cbf10a8b59 Refactored addOperation method
9 years ago
hasuniea 7642112a9f code clean up
9 years ago
mharindu 0c43338f5d Added runtime exception to DCA
9 years ago
mharindu 1903b375f3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 5ee8c0f065 Fixing the cache manager issues
9 years ago
hasuniea 9d5f2af7e9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu 725894ed2c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila f2b8f978f5 Fixing the operations connection close problems
9 years ago
mharindu cd853c9ee8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila b14461a5af Fixing the datasource issue in the device magt core
9 years ago
mharindu ad5335c9f5 Fixed local conflicts and merged
9 years ago
mharindu 6385c13012 Fixed issues in DeviceDAO
9 years ago
prabathabey 2b6bf203e2 Resolving conflicts observed in policy management implementation
9 years ago
mharindu fd29deb372 Fixed conflicts of local repo and merged
9 years ago
prabathabey 892b9681f5 Fixing transaction handling issues
9 years ago
geethkokila 458618191d Fixing datasource exaust issue, Fixing the enrolmentinfo getId method, adding policy cache manager. Changing the test cases
9 years ago
geethkokila c673395ce6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 20873e7786 Added null checks
9 years ago
geethkokila c6d993e532 Fixing bugs and adding the ability to read from cdm-config.xml file for monitoring task
9 years ago
Your Name b906d43cc8 Committing tenant configuration manager service
9 years ago
geethkokila bcb2c1ddb1 Commiting the monitoring changes and test case changes
9 years ago
geethkokila 44b496d350 Partially commiting due to update
9 years ago
hasuniea 7a54838996 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu 69cf3f8939 Cleaned code and added comments
9 years ago
mharindu abc16557dc Removed unnecessary new lines in DeviceDAOImpl
9 years ago
mharindu 460fda1bb9 Removed unnecessary new lines in DeviceDAOImpl
9 years ago
harshanl aeed8b92a1 Enabled adding custom permissions to permission-tree through webapps
9 years ago
mharindu 8c748b3dfd Removed unnecessary comments
9 years ago
hasuniea 9f6dd55223 fixed issue in modify enrollment
9 years ago
harshanl 1850a76462 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 3582973f84 Code cleanup
9 years ago
prabathabey d4c5d9023e Adding necessary instructions for transaction handling
9 years ago
prabathabey de2c378214 Code cleanup
9 years ago
harshanl 423c8e2727 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey ce0cc1699f Fixing more transaction handling related issues
9 years ago
prabathabey cdbdc86f42 Fixing transactional anomalies and code cleanup
9 years ago
harshanl 076d60ec83 PermissionManager changes
9 years ago
prabathabey d7e363cef7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 00807e8295 Fixing transaction anomalies and code clean up
9 years ago
Prabath Abeysekara a5c9886c63 Merge pull request #25 from milanperera/master
9 years ago
mharindu f36c82b059 Refactored LicenseManager
9 years ago
mharindu 4709107719 Refactored LicenseManager
9 years ago
mharindu 8949992148 Fixed 204 issue in LicenseManager
9 years ago
Dilshan Edirisuriya 3c444f6102 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua 4e5a38998d Updating DAO Layer
10 years ago
dilanua df81bef812 Fixing issue in SQL Result retrieval on getOperationsByDeviceAndStatus
10 years ago
geethkokila 149b743a2e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
harshanl 58c45c92be Fixed tenant configuration persisting issue
10 years ago
geethkokila c039adf4ea Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
prabathabey c41f6c3002 Code cleanup
10 years ago
geethkokila 3fa65ae98c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
milanperera e30956b619 Fixed an issue in SQL query of getPendingOperations(CommandOp)
10 years ago
milanperera 508082808c Fixed a bug in commons.licence
10 years ago
prabathabey 84bc22f9f3 Setting default values for fields validFrom and validTo
10 years ago
prabathabey 536e13b0a7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
prabathabey 53302070e6 Code cleanup, adding file system based license manager, fixing some design issue in CommandOperationDAOImpl
10 years ago
geethkokila cb489c0174 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
Dilshan Edirisuriya 37763b7e40 Importing org.wso2.carbon.device.mgt.common
10 years ago
geethkokila b8462b02ac Fixing the conflicts
10 years ago
prabathabey c134cc7e25 Fixing license manager initialization related issues and code cleanup
10 years ago
prabathabey ca38cc9f51 Removing URL printer start-up handler from device.mgt.core
10 years ago
prabathabey c471017c40 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
prabathabey 134b4ae53c Code cleanup
10 years ago
Dilshan Edirisuriya e7f02365a8 Importing axis2.transport.mail
10 years ago
prabathabey 54cd6b80f4 Fixing merge conflicts
10 years ago
prabathabey 955c119006 Adding policy delegation
10 years ago
geethkokila dc205aa081 Fixing the conflicts
10 years ago
geethkokila 6d687364c6 Fixing the monitoring tasks
10 years ago
milanperera 256880089e Merged
10 years ago
prabathabey 1716c2c7f6 Making apimgt extensions module a separate component/feature pair
10 years ago
prabathabey 1a6526fc77 Removing API publisher lifecycle listener implementation out of device.mgt.core and making it a separate module
10 years ago
milanperera 5b2e0c8989 Merged
10 years ago
prabathabey a68ca0cfd6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
prabathabey 8394b63e0c Making license manager a util exposed as part of org.wso2.carbon.device.mgt.extensions
10 years ago
milanperera 7ec10d670c Fixed bugs in device disenrolment
10 years ago
milanperera 5a8975d7ac Partial Commit
10 years ago
milanperera 35ce4be1a1 Partial Commit
10 years ago
Prabath Abeysekara 3512e3e60a Merge pull request #20 from milanperera/master
10 years ago
milanperera 6f56e27f1d Refactored SQL queries
10 years ago
prabathabey 6c857fdc4d Removing user-api-publisher-config.xml and making JAX-RS services get auto-published as APIs depending on parameters configured in web.xml of each corresponding web applications
10 years ago
geethkokila bd75f70a24 Fixing the merge conflicts
10 years ago
geethkokila 6270dff93c Fixing priviledege carbon context issue in device-mgt component
10 years ago
prabathabey d9459b09ba Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
prabathabey fac53e4814 Upgrading tomcat version usd in carbon-devicemgt
10 years ago
prabathabey 9e5e3cf73d Enforcing proxy port to be used when configured
10 years ago
prabathabey e4fd0607e8 Removing some hack used to workaround issues that popped up while writing unit tests upon tenant-enabled code
10 years ago
prabathabey 15d56e29c3 temporarily commenting out test cases till tenancy-test bits are properly added
10 years ago
geethkokila 9dc5a1e2e5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
geethkokila aee2402d0d Fixing the get tenant id issue, added the priviledge carbon context at the test running by setting up the carbon-home
10 years ago
harshanl c2ef90d399 added class comments
10 years ago
harshanl 50640c9dfd Added tenant configuration persistance
10 years ago
prabathabey 7d089d8b09 Removing IDE warnings
10 years ago
prabathabey a461e887d1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
prabathabey 87e632866b Fixing connection leaks spotted in operation management implementation
10 years ago
harshanl 57299063b3 Added policy configuration to the cdm-config
10 years ago
manoj 4049d1a2b4 Remove properties from config operations
10 years ago
geethkokila 38939d6c7b Merge branch 'master' of https://github.com/milanperera/carbon-device-mgt into milanperera-master
10 years ago
prabathabey ff2c29a158 Registering license managment service
10 years ago
manoj ac3438e2cd Code refactor application update
10 years ago
milanperera 05fd385d49 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
manoj f8c1cbc405 change generated keys to prepared statement constant
10 years ago
manoj b0a55a55c8 code clean up
10 years ago
milanperera f14ba29d30 Merged
10 years ago
milanperera 854b7dda8d Merged
10 years ago
manoj a6cee6bae3 change update operation response to object
10 years ago
manoj 3bbbed40e6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
manoj 25a8f60d74 Retuen int for operations
10 years ago
kasundananjaya 2d1433a2f0 Merge pull request #16 from milanperera/master
10 years ago
manoj 27279426f0 code clean up
10 years ago
manoj 00819fe4b6 Unit tests, application update
10 years ago
manoj de17217303 Unit tests, application update
10 years ago
milanperera a82351f53f Refactered getDevicesByType query
10 years ago
milanperera a5a9d02dee Implemented getDeviceByStatus function
10 years ago
manoj 6daa71771c Unit tests for service layer
10 years ago
manoj 41d1408b14 Add application update and unit tests
10 years ago
manoj da61c08fac Add application update and unit tests
10 years ago
mharindu 0a671373e5 Merged with local changes
10 years ago
mharindu 9d8c52958d Refactored SQL queries and added null checks
10 years ago
prabathabey a886430005 Initializing Device Management providers
10 years ago
prabathabey fd6793a9af Fixing device management API structure
10 years ago
manoj 0e2e0fdd0e Remove package attribute form Application
10 years ago
Dilshan Edirisuriya 3908705b68 Null check
10 years ago
geethkokila 388701c3a2 Adding partial commit to add a interface for plugins to implement to notify devices for monotoring
10 years ago
prabathabey dea6d12173 Fixing more issues in SQL queries used in DeviceDAOImpl
10 years ago
prabathabey 043440eb76 Fixing an invalid table name used in getDevices() method
10 years ago
manoj 286a04dd31 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
manoj cc5dd3baa6 Move add application list, get applist methods to applicationServiceProvider
10 years ago
geethkokila 8bc7c5824a Fixing test case failures and device dao errors
10 years ago
manoj 66afd0be4b Change updateApplicationList method
10 years ago
manoj a8ae030fe7 Remove updateApplication List method from ApplicationManager interface. This is not need to implement for plugins
10 years ago
prabathabey 431c86ae0e Refactoring the implementation of app installation/uninstallation and getting EMM URL printed on the server console
10 years ago
prabathabey 7a6e947810 Making Device object return enrolment data too
10 years ago
prabathabey 974a616737 DAO refactoring
10 years ago
prabathabey 8d348a358c Committing initial version of supporting device life cycle management
10 years ago
harshanl 952db0183d Moved updateApplicationListOfDevice method to DeviceMgtService
10 years ago
Dilshan Edirisuriya 8c59d82708 Making serializable
10 years ago
harshanl 20a9d1222f Added a method to retrieve list of applications installed on a device
10 years ago
manoj d30048d94d change properties
10 years ago
manoj 65b1ea70ab Add properties to store mobile app specific meta data
10 years ago
manoj 567f78abb6 Add additional fields to load device
10 years ago
prabathabey d28de90679 Fixing an invalid database table name used in DeviceDAOImpl
10 years ago
manoj f3dd402e4b Set device status to active when poll operations
10 years ago
manoj 6263a550ff Set device enrolment status
10 years ago
manoj 65620a7389 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
manoj 83698e7a99 AppList update for device
10 years ago
manoj 1aa22b29c5 AppList update for device
10 years ago
manoj 4510a954a5 AppList update for device
10 years ago
prabathabey 1dd9134e5d Fixing poms to remove device.mgt.user.* dependencies
10 years ago
prabathabey 22bf894d45 Removing the redundant user-mgt component, which has been there as part of carbon-device-mgt repository
10 years ago
manoj 78ee8e334f Remove app list update method from app manager interface
10 years ago
manoj 6f2c51ee36 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
manoj 82cbbef83b Application list saving method and device operation response saving
10 years ago
prabathabey 60ee259b2b Fixing DeviceDAOs to associate tenant id to filter out tenant specific resources
10 years ago