Commit Graph

3713 Commits (54d0d7a5eeae2536cf1acc1b4d8ada8b6d3cda83)
 

Author SHA1 Message Date
mharindu afbfaf4c1d Fixed for EMM-1305
9 years ago
mharindu a3741bda7e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu a2a1e8115d Fixed conflicts and merged
9 years ago
mharindu 72591eff44 Fixed modify enrollment bug
9 years ago
inosh-perera f0fd86fcf7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
inosh-perera 7cd1722829 making certificates searchable
9 years ago
geethkokila 7318502697 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila e60a383f4d Adding fixes to the device search
9 years ago
charithag f6d224a623 Refactor group management
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
ayyoob 733884cba7 added web app tenant authorisation for tenant for non managed api scenario
9 years ago
ayyoob 3a3e9cc649 changed analytics components to released version
9 years ago
ayyoob 1b4a9227d8 merged web app publisher code and refactored jwt client extension to adhere to new artefact name
9 years ago
ayyoob 576509e50f Merge branch 'merge-latest' of https://github.com/ayyoob/carbon-device-mgt into merge-latest
9 years ago
ayyoob 562ced1be7 Added api application extension feature
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 83057acd9a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-latest
9 years ago
ayyoob 7632d4e929 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-latest
9 years ago
inosh-perera 41ba2f4f0a adding database changes
9 years ago
ayyoob b3360e1c58 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-latest
9 years ago
geethkokila fbc7c0807c Skipping the validation of task operations
9 years ago
ayyoob fc725fa767 removed analytics
9 years ago
ayyoob 81ae512f13 Merge pull request #6 from ayyoob/merge-devicetype
9 years ago
ayyoob 026d4ef018 removed analytics
9 years ago
charithag e8b94ed96d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
inoshperera ff56ecb32c Merge pull request #203 from charithag/master
9 years ago
charithag f4e6c44067 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charithag 40f863fd57 Fix bundle imports for java 8
9 years ago
inoshperera 145fefe1c6 Merge pull request #202 from charithag/master
9 years ago
charithag bc0595a187 Change analytics version to 5.0.11
9 years ago
Ruwan 51e27b8dc5 Merge pull request #201 from charithag/master
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
charithag 2f0a3388a6 Implemented missing methods in group management.
9 years ago
geethkokila aa63b5f592 Fixing the application memory usage and adding location based search
9 years ago
charithag 3fd141acdf Add missing parts and test to group management.
9 years ago
charithag d1ee1fd578 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charithag fa2f61f48a Add missing parts in group management
9 years ago
ayyoob 284a6645f0 import required packages
9 years ago
ayyoob 4554aadd82 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
ayyoob c45895685b Added device type multi tenancy capability.
9 years ago
Milan Perera 20a1f81a57 Merge pull request #200 from ayyoob/startup-emm
9 years ago
ayyoob 021378df3b added org.wso2.carbon import package
9 years ago
Milan Perera dfe9cde8c3 Merge pull request #199 from ayyoob/startup-emm
9 years ago
ayyoob e06565728e removed duplicate imports and improper imports
9 years ago
charithag 062a843ca2 Fix for https://wso2.org/jira/browse/IOTS-99
9 years ago
prabathabey 501fefc2d2 Added version/version range properties for nimbus and httpclient
9 years ago