Commit Graph

3575 Commits (d85339f3c6316be3bf76c4adf0ab83922529f26f)
 

Author SHA1 Message Date
Milan Perera 72a33b7930 Fixed conflicts and merged
8 years ago
Milan Perera 4dfc49474c Upgraded APIM and Identity OAuth module
8 years ago
Charitha Goonetilleke b85a7b493a Merge pull request #476 from Megala21/embed
8 years ago
Megala ec5936d013 Updating the apk file to switch between event enabling and disabling
8 years ago
Megala 5eefdfc2c0 Merge remote-tracking branch 'upstream/release-3.0.x' into embed
8 years ago
Hasunie 316362e974 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10
8 years ago
Hasunie d3bf748233 implementing windows10 devicemgt session
8 years ago
Hasunie b57573ecae Merging relese-3.0.x
8 years ago
Rasika Perera b5e220799a Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Hasunie 31ac1961e1 Merge pull request #475 from harshanL/release-3.0.x
8 years ago
Harshan Liyanage 53750eec6e Fixed maven warnings in plugin build.
8 years ago
charitha 0b0c9eef04 Prepare for next development iteration
8 years ago
charitha 48bbe8d657 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Charitha Goonetilleke 1b51074070 Merge pull request #473 from wso2/release-3.0.3
8 years ago
WSO2 Builder a398686ec7 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 3bafccc303 [maven-release-plugin] prepare release v3.0.3
8 years ago
Hasunie 359bd948d2 Fixing bst issue
8 years ago
Charitha Goonetilleke 0850126a32 Merge pull request #472 from wso2/release-3.0.x
8 years ago
Hasunie 222ef41a3f Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Chatura Dilan 2cafb5ba43 Merge pull request #471 from chaturadilan/release-3.0.x
8 years ago
Chatura Dilan 49d81766f6 fixed conflicts
8 years ago
Chatura Dilan e22d4d3530 Fixed UI issues in the policy screen
8 years ago
Megala 5b7b4124b0 Adding minor UI fixes
8 years ago
Hasunie 0e680ab26b fixing json provider issue in windows cxf
8 years ago
charitha aed31fb85b Bump carbon-device-mgt version to 2.0.3 for release
8 years ago
charitha 065c4c030b Bump carbon-device-mgt version to 2.0.3 for release
8 years ago
charitha ba4be9ebe9 Bump carbon-device-mgt version to 2.0.3 for release
8 years ago
Milan Perera 6ad6bbbdc0 Commiting permission-scope mapping improvements
8 years ago
Charitha Goonetilleke 6cea2f19fc Merge pull request #470 from hasuniea/release-3.0.x
8 years ago
charitha a49a5650c6 Fix issues
8 years ago
Hasunie 34153371d3 fixing message issue in configurationmgtservice
8 years ago
charitha 1598748a5b Merge branch 'release-3.0.x' of https://github.com/menakaj/carbon-device-mgt-plugins into release-3.0.x
8 years ago
charitha 5d7fd0d66d Merge branch 'harshanL-master' of https://github.com/harshanL/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Harshan Liyanage ce5d907801 Added operation bar.json
8 years ago
Harshan Liyanage 2f7214cd5b Resolved conflicts in device type-vies files.
8 years ago
Harshan Liyanage f55cd20a73 Resolved conflicts in device type-vies files.
8 years ago
Ruwan 82c0af1053 Merge pull request #467 from madhawap/release-3.0.x
8 years ago
Harshan Liyanage 26bbb55af5 Resolved conflicts with release-3.0.x
8 years ago
Menaka Jayawardena bad0331dc7 Added new Android Sense Agent
8 years ago
madhawap 6618b919d1 Adding separate tasks to carry out device monitoring for each device type
8 years ago
Charitha Goonetilleke 34fb3cad0b Merge pull request #459 from menakaj/release-3.0.x
8 years ago
Harshan Liyanage f3fa3511c6 Merge pull request #464 from hasuniea/release-3.0.x
8 years ago
Hasunie 68cabad5b8 deleting unused components
8 years ago
Harshan Liyanage e047e0dab8 Merge branch 'harshanL-merge-master'
8 years ago
Harshan Liyanage 559fa3fe38 Resolved conflicts
8 years ago
Menaka Jayawardena 862a14c2b5 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Menaka Jayawardena e0afb8d205 Refactoring Android Sense agent.
8 years ago
Hasunie d2d39a241e adding error handler
8 years ago
Hasunie b3eacb99cd Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Hasunie 36cbc96713 adding swagger annotations
8 years ago