Commit Graph

466 Commits (4fb778b7cef2b3796c0cd3ebe3e9c2898cd7d341)

Author SHA1 Message Date
Imesh Chandrasiri 20bd1b399b Removed conflict markings
8 years ago
Imesh Chandrasiri a890d9fb89 Device enrollment page revamp
8 years ago
Imesh Chandrasiri bccc47ebd2 Conflict fix
8 years ago
Imesh Chandrasiri 4b7637a426 Device enrollment page revampl
8 years ago
Imesh Chandrasiri 37b032d710 Merge branch 'cloud-3.1.0' into cloud-3.1.0
8 years ago
Imesh Chandrasiri 67313882ed Device enrollment page changes for cloud
8 years ago
kamidu 71c93eec29 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
8 years ago
kamidu 305df1c2bd enhansing the device cloud ui
8 years ago
kamidu 9d733d6cc1 Fixing android location issue
8 years ago
Susinda Perera 8a9affc4b8 Merge pull request #582 from ayyoob/210releasepatch
8 years ago
lakshani f5d71d917e Added change device status feature to mobile plugings
8 years ago
ayyoob a294c20a2a added device management api to be default
8 years ago
ayyoob dd3017578a added artefact deployment support for device types
8 years ago
Kamidu Sachith Punchihewa 68b36babe6 Merge pull request #575 from wso2/master
8 years ago
kamidu 53840dcc37 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
WSO2 Builder d7e4580e77 [WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare for next development iteration
8 years ago
WSO2 Builder 1737eaaa79 [WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare release v3.0.11
8 years ago
Hasunie 3b98e0f754 Merge pull request #572 from charithag/master-update-swagger-docs
8 years ago
charitha 9bf38af4f7 Fix issues in swagger docs
8 years ago
Milan Perera 99782e6360 Resolved conflicts and merged
8 years ago
Milan Perera cc8066896b Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud
8 years ago
Milan Perera e1a419425e Added cloud agent to the download page
8 years ago
ayyoob 73eb590a7c renamed grant type to default
8 years ago
Kamidu Sachith Punchihewa 64cb8b5223 Update load-map.js
8 years ago
kamidu 55489d5e52 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
kamidu 192e1c3edc adding missing classes in hbs
8 years ago
WSO2 Builder 7034dae2b5 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder a2224f96ff [maven-release-plugin] prepare release v3.0.10
8 years ago
WSO2 Builder 4554d8929d [WSO2 Release] [Jenkins #2500] [Release 3.0.9] prepare for next development iteration
8 years ago
WSO2 Builder da7c040224 [WSO2 Release] [Jenkins #2500] [Release 3.0.9] prepare release v3.0.9
8 years ago
ayyoob 3021947f30 updated saml grant type config name
8 years ago
ayyoob 4f1f1a3e7e Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
WSO2 Builder e64fe695ab [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 5fbd40c579 [maven-release-plugin] prepare release v3.0.8
8 years ago
kamidu 0679aab11d adding missing classes in hbs
8 years ago
WSO2 Builder 9687362258 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder ee063a1a43 [maven-release-plugin] prepare release v3.0.7
8 years ago
Chatura Dilan 57d6fb12ce updating android agent
8 years ago
kamidu c6d0c4ba44 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
kamidu 50a2c3d89a Enable opasity variation with time on location records
8 years ago
Chatura Dilan b2ff6c4181 Merge branch 'release-3.0.x' of github.com:wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Chatura Dilan 57cdf8e1a5 updating android agent
8 years ago
kamidu eb9c789b51 Enable opasity variation with time on location records
8 years ago
Rasika Perera 737d1da07b Changed webapps title [EMM] into [IoT Server]
8 years ago
Rasika Perera 3b7257c93f Fixing "process" not found issues
8 years ago
Rasika Perera fe6c35ebca Cleaned android-web-agent config.json
8 years ago
Rasika Perera 0bc380c7d0 Merge pull request #538 from Kamidu/release-3.0.x
8 years ago
Rasika Perera 1d10dbee88 Now UI configs supports system parameters with eg. %iot.core.host%
8 years ago
kamidu c522809bd5 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
kamidu 234157b6f5 adding location history to map view
8 years ago
Megala 574a106977 Adding fixes to path
8 years ago
Chatura Dilan 6db0885eb9 remove cosu whitelisting apps
8 years ago
Rasika Perera bf9d93476c Updated title [EMM] into [IoT Server]
8 years ago
Rasika Perera d68f2607f2 Updated android APK
8 years ago
Rasika Perera 1d0753ab8d Merge pull request #529 from DimalChandrasiri/release-3.0.x
8 years ago
Rasika Perera c74e9de2f5 Merge pull request #527 from dunithd/release-3.0.x
8 years ago
Imesh Chandrasiri 62ba568e05 Fixed android type view notification pane message inconsistancy issue
8 years ago
Rasika Perera 05e2cb7bb8 Changed [EMM] title into [IoT Server]
8 years ago
Dunith Dhanushka 54b08f9b7a Adding the JSON formatted anchor text
8 years ago
Dunith Dhanushka 6634dded55 Building the anchor text
8 years ago
Rasika Perera 0b983855cf Merge pull request #522 from DimalChandrasiri/release-3.0.x
8 years ago
ayyoob dad3a34a27 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Dunith Dhanushka b4f876d961 Updating the label text for Geo fencing link
8 years ago
ayyoob 9d64fd0d4b fixed multi tenant login issue
8 years ago
Imesh Chandrasiri 8eb95c3695 Fix for multiple popup issue
8 years ago
Imesh Chandrasiri d918e32d59 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Imesh Chandrasiri e112371d8e Fix for multiple popup issue
8 years ago
WSO2 Builder 3f1b7a6005 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 91a0edb0a0 [maven-release-plugin] prepare release v3.0.6
8 years ago
Rasika Perera 3ae9fba143 Updating IoTS doc links
8 years ago
Rasika Perera a3e97b4356 Merge pull request #521 from dunithd/release-3.0.x
8 years ago
Dunith Dhanushka a097482b91 Passing deviceId and deviceType into view
8 years ago
Dunith Dhanushka 33e57efc3d Replacing JSON object with comma separated values
8 years ago
Chatura Dilan d55e0f21b7 Merge branch 'release-3.0.x' of github.com:wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Chatura Dilan 809d292c95 Added Android scopes
8 years ago
Rasika Perera f84e3526f5 changed [fw-ok] with [fw-success]
8 years ago
ayyoob 09f7fb3a5f moved the traffic through the gateway
8 years ago
ayyoob 466c2b1151 moved to gateway mode
8 years ago
Imesh Chandrasiri fc3d15887e Updating font wso2 to version 1.2.1
8 years ago
Milan Perera 2eb18e304a Change scope of android configuration
8 years ago
charitha b812b6af2e Fixed issue in showing android device location map
8 years ago
WSO2 Builder b10579950b [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder b7a5454c2f [maven-release-plugin] prepare release v3.0.5
8 years ago
Rasika Perera 82a1839fe9 Merge pull request #508 from dunithd/release-3.0.x
8 years ago
dunithd 8c36f31030 Adding Geo fencing link to Android device
8 years ago
Milan Perera 77d1e684f6 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Rasika Perera 2c9c02dc00 Replaced [EMM] with [IoT Server]
8 years ago
Rasika Perera 81c62b3a13 Merge pull request #501 from ayyoob/release-3.0.x
8 years ago
inoshperera 7da5ae239b Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
inoshperera 22a58121d2 changing the Andrid API tag to standerdise
8 years ago
Milan Perera 86aac810ce Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Milan Perera d2d912fb6d Refactored scopes strings
8 years ago
ayyoob f603f58fd1 moved compliance payload generation code to api impl
8 years ago
Maninda 0c7f1adcba Fixed some issues reported with FindBugs while security plugin is enabled.
8 years ago
ayyoob 54011d2197 removed provider tenant domain and user from the web.xml
8 years ago
ayyoob 55d200514b Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
ayyoob 3fa679a3e9 made policy manager to be part of device type mgt service
8 years ago
Madawa Soysa 1b56ebb831 Improving scope annotations in android plugin
8 years ago
Rasika Perera f3588c7951 config.json [usernameLength] moved to [userValidationConfig][usernameLength]
8 years ago
Rasika Perera 838223c67a Removed unneccesary configs
8 years ago