Commit Graph

4229 Commits (39439c5c50620dcfb4f0c50d87b0f8f4b09e6eff)
 

Author SHA1 Message Date
Milan Perera f25e82f4ec Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Milan Perera 98ea97d890 Fixed permissions adding issue
8 years ago
Imesh Chandrasiri 957224b905 Merge branch 'release-2.0.x' of https://github.com/DimalChandrasiri/carbon-device-mgt into release-2.0.x
8 years ago
Imesh Chandrasiri d686a9ea57 Updating font wso2 to version 1.2.1 - Commit 2
8 years ago
Madawa Soysa 8a7d0bb3aa IOTS-377 : Fixing VFA icon not visible issue
8 years ago
Rasika Perera 83868303dd Merge branch 'release-2.0.x' into release-2.0.x
8 years ago
Rasika Perera 8311828c5d Merge pull request #537 from ayyoob/release-2.0.x
8 years ago
Imesh Chandrasiri f1954c4f10 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
ayyoob 0d721a226b updated ui config
8 years ago
Imesh Chandrasiri 3230a4e269 Updating font wso2 to version 1.2.1
8 years ago
Rasika Perera 300de93626 Merge pull request #535 from rasika/release-2.0.x
8 years ago
Rasika Perera ef2a1b84a2 IOTS-376 : Fixing cannot delete a device
8 years ago
kamidu 4588cfbed4 Fixing the permission management issue in EMM console
8 years ago
Rasika Perera bc01e5e1e9 Merge pull request #534 from ruwany/wip
8 years ago
Ace c6d186aa1a Adding missing fix
8 years ago
Ace bd45b27cc9 Merging with upstream
8 years ago
Ace 643acd7827 Adding api for renaming devices
8 years ago
ayyoob 471e634790 merged with upstream
8 years ago
ayyoob 06977295ea merged with upstream
8 years ago
Chatura Dilan 649d38849d Merge pull request #533 from milanperera/release-2.0.x
8 years ago
Milan Perera 562631cc1d Fixed scopes related issue in SAML Granttype
8 years ago
Rasika Perera 8edde9a0f1 Merge pull request #532 from charithag/release-2.0.x
8 years ago
charitha cb7ff7f66a Change package name to lower case
8 years ago
ayyoob 819074833f added missing components
8 years ago
ayyoob 9d5061230c fixing test failures
8 years ago
charitha c909144589 Add select2 controller to select roles to share a group
8 years ago
ayyoob ac8dae7ed0 fixing test failures
8 years ago
ayyoob 505f281f9d Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
ayyoob b35e0dd2fa added missing components
8 years ago
Rasika Perera e1228b408a Removed [httpsWebURL] from config.json
8 years ago
Rasika Perera 9afffc6571 Merge pull request #530 from charithag/release-2.0.x
8 years ago
charitha 1ad9439162 Add select2 controller to select roles to share a group
8 years ago
Rasika Perera 250984f438 Merge pull request #529 from rasika/merge-master
8 years ago
Rasika Perera 0313707cb4 Merge pull request #528 from charithag/release-2.0.x
8 years ago
charitha 5caa688014 Fixed issue in populating server.ip property.
8 years ago
Rasika Perera 42ff976a41 Merge pull request #527 from ayyoob/release-2.0.x
8 years ago
Rasika Perera 0acd273ae1 Fixing merge conflicts
8 years ago
Rasika Perera 83aea1fd01 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-master
8 years ago
ayyoob c718d723c0 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
ayyoob ea31637223 added scr reference to datasource for deployer and few fixes after the changes in the plugin
8 years ago
Rasika Perera dde094ecf8 Merge pull request #526 from wso2/release-2.0.6
8 years ago
WSO2 Builder 5411d93103 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 3ea83b925a [maven-release-plugin] prepare release v2.0.6
8 years ago
Rasika Perera 1745dad5cc Merge pull request #525 from rasika/release-2.0.x
8 years ago
Rasika Perera 04951bb6ca Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Rasika Perera 5d5f76ca21 Merge pull request #524 from geethkokila/release-2.0.x
8 years ago
geethkokila 7059ad1243 Changing the package name
8 years ago
Rasika Perera 1f5de41ffa Fixing maven-javadoc-plugin issue [org.wso2.carbon.apimgt.handlers/] should be [org/wso2/carbon/apimgt/handlers/]
8 years ago
geethkokila 2881079b27 Removing two unnecessary classes from the project and adding java documentation to class
8 years ago
Rasika Perera 08ab946e88 Added doc comments
8 years ago