Commit Graph

336 Commits (b646dc680118b2d4734e552d7676da69bb4ac0f6)

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 305df1c2bd enhansing the device cloud ui
8 years ago
kamidu 9d733d6cc1 Fixing android location issue
8 years ago
lakshani f5d71d917e Added change device status feature to mobile plugings
8 years ago
lakshani edb8e71ac2 Added change device status feature to mobile plugings
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
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
Imesh Chandrasiri fc3d15887e Updating font wso2 to version 1.2.1
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
Rasika Perera 2c9c02dc00 Replaced [EMM] with [IoT Server]
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
WSO2 Builder 227d4685c9 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 6c38ce6385 [maven-release-plugin] prepare release v3.0.4
8 years ago
Rasika Perera 5465cea76d Fixing QR modal unit not found issue
8 years ago
Geeth b8472666ad Merge pull request #488 from Supun94/release-3.0.x
8 years ago
Rasika Perera 27e066e92a IOTS-336: Fixing android and windows mobile agents title
8 years ago
charitha 2211ad2a59 Update device type detail pages and moved QR modal to device mgt core
8 years ago
Imesh Chandrasiri 48461af2c3 Adding email sender changes
8 years ago
Imesh Chandrasiri 6464fcb615 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Supun94 57f0ea7ce4 Changing policy compliance view
8 years ago
Imesh Chandrasiri da4eb14144 Device view changes for email invite and agent download
8 years ago
Rasika Perera a08e58a574 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 fe195ca8f7 UI Fixes
8 years ago
Megala 0b1acaa990 Updating the agent apk file
8 years ago
Megala ec5936d013 Updating the apk file to switch between event enabling and disabling
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
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
Chatura Dilan 49d81766f6 fixed conflicts
8 years ago
Chatura Dilan e22d4d3530 Fixed UI issues in the policy screen
8 years ago
Harshan Liyanage ce5d907801 Added operation bar.json
8 years ago
Harshan Liyanage 26bbb55af5 Resolved conflicts with release-3.0.x
8 years ago
Harshan Liyanage 559fa3fe38 Resolved conflicts
8 years ago
Madawa Soysa 548213d601 Fixing issue with COSU policy configuration
8 years ago
Madawa Soysa 0b8db53b91 IOTS-296: Moving android operation-mod to android plugin
8 years ago
Rasika Perera c722dfa779 Adding ui permissions to the operations on android
8 years ago
Charitha Goonetilleke 7fa0a4b11f Merge pull request #454 from madawas/IOTS-296
8 years ago
charitha 5fc3e82d35 Fix agent download issue
8 years ago
Ace 3d21f84a76 merging with upstream
8 years ago
Ace 3dd59ed250 Adding changes to descriptor and ui changes
8 years ago
Madawa Soysa cb44d9a824 IOTS-296: Genaralizing policy view UI for windows and android
8 years ago
Imesh Chandrasiri ba0eea6344 Fixing text overlapping and UX issues in device pages
8 years ago
Imesh Chandrasiri b55c64d551 Layout changes for device enrollment views
8 years ago
Ace 749f680dad Adding missed configurations
8 years ago
Ace 8a96aa204c Adding generalizations to android-operations bar
8 years ago
Madawa Soysa 37f0bc396d IOTS-296: Moving policy profile generation to android plugin
8 years ago
WSO2 Builder 619dab548e [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 4a0aa3be8e [maven-release-plugin] prepare release v3.0.2
8 years ago
charitha ee496d93fe removed unnecessary logs
8 years ago
madhawap 429b52f037 resolve conflicts
8 years ago
madhawap 3249079965 Seperate out task operations
8 years ago
WSO2 Builder 4ae70fe1f1 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 42c2b04c62 [maven-release-plugin] prepare release v2.2.7
8 years ago
WSO2 Builder ab087bf934 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 072dd089ef [maven-release-plugin] prepare release v2.2.6
8 years ago
WSO2 Builder bfa2c5fa61 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 09d434bda9 [maven-release-plugin] prepare release v3.0.1
8 years ago
Megala 6c9c4a15fd Removing the sender id
8 years ago
Imesh Chandrasiri bc075dedf0 Changes for IoT build
8 years ago
WSO2 Builder 61ca4c4900 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 4746bf0c74 [maven-release-plugin] prepare release v3.0.0
8 years ago
Ace ae33d236fa Adding android device-view changes
8 years ago
Ace 7e3df67548 Adding android-base-plugin
8 years ago
charitha 1170263139 Update component versions for IoTS-1.0.0 release
8 years ago
Ace ea14e32337 Adding android-web-agent
8 years ago
Ace 3d32ad984c Adding fixes to android qr-gen code
8 years ago
Ace cea96cc841 Merging with master
8 years ago
Chatura Dilan 9e78b87365 Fixed issue in device operation bar
8 years ago
Chatura Dilan d6701ee04c Fixed issue in device view UI
8 years ago
Chatura Dilan 49dd83ed33 Adding CDMF operation bar to Android
8 years ago
Chatura Dilan b207e5d624 Added missing units
8 years ago
Chatura Dilan 3227f3f650 Chages to device view for Android
8 years ago
Chatura Dilan 269376a135 Changes to Android operation bar
8 years ago
Chatura Dilan 76887c4277 Merge branch 'IoTS-1.0.0' of github.com:wso2/carbon-device-mgt-plugins into IoTS-1.0.0
8 years ago
Chatura Dilan 1e3d8021e9 Adding Android and Windows operation bars
8 years ago
ayyoob bd05fb721a merged with origin IoTS-1.0.0
8 years ago
WSO2 Builder c9861e9636 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 3e664dc304 [maven-release-plugin] prepare release v2.2.5
8 years ago
kamidu a9308c3f22 removing the unnessary ' ' from hbs files
8 years ago
Rasika Perera a40ce98698 Make analytics and groups view disable for mobile plugins
8 years ago
WSO2 Builder 19e0d65db0 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 537a99d05d [maven-release-plugin] prepare release v2.2.4
8 years ago
WSO2 Builder b095196e65 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder d455b13e62 [maven-release-plugin] prepare release v2.2.3
8 years ago
kamidu 22ec7aa695 Fixes for the ui isuess in EMM 2.2.0-beta
8 years ago
Chatura Dilan Perera 0b66649841 [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera 362003c9ab [maven-release-plugin] prepare release v2.2.2
8 years ago
Rasika Perera 17dd96aa10 Returning correct representation of the device to template.
8 years ago
Rasika Perera 52dfcecb62 Updating devicemgt_admin into /api/device-mgt/v1.0.
8 years ago
Chatura Dilan Perera bf72d212f7 [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera 18780e5274 [maven-release-plugin] prepare release v2.2.1
8 years ago
charitha 4cdf98b1db Update agent apk to latest
8 years ago
Chatura Dilan Perera 89621ddfcb [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera 28898a85e9 [maven-release-plugin] prepare release v2.2.0
8 years ago
Chatura Dilan Perera ca2e631076 Fix conflicts
8 years ago
Chatura Dilan Perera 7ff9204646 [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera 5e43c5bef9 [maven-release-plugin] prepare release v2.1.2
8 years ago
ayyoob 38b9f017c3 merged with origin
9 years ago
ayyoob d72297f214 resolved UI issues
9 years ago
ayyoob d70c576ff0 refactored android configuration
9 years ago
kamidu 8d151120df enabling policy wizard for android
9 years ago
kamidu bbbaac4d28 Fix for the 'Requested resource /app/conf/reader/main.js cannot be found' exception on startup
9 years ago
dilanua 6fe83cd0ac Updating path changes to business-controllers
9 years ago
dilanua 01e32c86c8 Updating base ui app config reader
9 years ago
Chatura Dilan 0818ae6860 [maven-release-plugin] prepare for next development iteration
9 years ago
Chatura Dilan 62c16e07ce [maven-release-plugin] prepare release v2.1.1
9 years ago
Rasika Perera 91cc0baaf5 Moved CSS into separate file
9 years ago
mharindu f3730c64ae [maven-release-plugin] prepare for next development iteration
9 years ago
mharindu 7a982093a1 [maven-release-plugin] prepare release v2.1.0
9 years ago
mharindu be4078cf38 [maven-release-plugin] rollback the release of v2.1.0
9 years ago
mharindu a2d2f26123 [maven-release-plugin] prepare for next development iteration
9 years ago
mharindu 3af112898d [maven-release-plugin] prepare release v2.1.0
9 years ago
charitha ffcbea8421 Fixed https://wso2.org/jira/browse/IOTS-104
9 years ago
ayyoob 6f000cbc64 refactoring version tags
9 years ago
charithag f74a8ddf0d Add device type plugins and features related to emm with IoTS base feature.
9 years ago