Commit Graph

3048 Commits (dce0a3e302cdec6682fc1ac1ca867fd10552a0d9)

Author SHA1 Message Date
WSO2 Builder 3f8f8b3ab9 [WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare for next development iteration
8 years ago
WSO2 Builder 6a9a5ba9c8 [WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare release v2.0.35
8 years ago
amalhub c65f9c6dcb Fixing issue: https://github.com/wso2/product-iots/issues/314
8 years ago
kamidu 3b9ae200e7 fixing posible null pointer excep
8 years ago
kamidu a85b5688a9 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
kamidu 0b94a284ad new role filtering related fixes
8 years ago
kamidu 8c17418198 fixing the null pointer exception
8 years ago
kamidu 530e603fb5 enable role filtering and role count in device cloud
8 years ago
kamidu cda0dd417f fixing the role filtering api issues
8 years ago
Harshan Liyanage d468ac07d0 Revert "Allowing configuration management in cloud environment"
8 years ago
Madawa Soysa da69bc9fe5 Allowing configuration management in cloud environment
8 years ago
charitha 6656f9e6f0 Add support for hybrid device types which has emulation/virtual capabilities
8 years ago
kamidu e205fd97cd fix the user view related issues and device location out dated issue
8 years ago
kamidu 1f572998f8 enable role filtering in device cloud
8 years ago
kamidu 73ab0a38bf adding get location api witch was missing from previous emm versions
8 years ago
kamidu a6f5c002a9 adding get location api witch was missing from previous emm versions
8 years ago
kamidu a77794f81a adding role filtering for device cloud via api
8 years ago
kamidu fc6c8e0290 adding get location api witch was missing from previous emm versions
8 years ago
Susinda Perera 643be65cf9 Merge pull request #662 from amalhub/master
8 years ago
amalhub 4c6781d6b6 Fixing issue: https://github.com/wso2/carbon-device-mgt/issues/645 , Once the password is changed - Curent user should be immediately logout
8 years ago
WSO2 Builder e8ee33e7a4 [WSO2 Release] [Jenkins #2177] [Release 2.0.34] prepare for next development iteration
8 years ago
WSO2 Builder 6cc898d2ab [WSO2 Release] [Jenkins #2177] [Release 2.0.34] prepare release v2.0.34
8 years ago
Geeth c0a474f6fc Merge pull request #661 from charithag/master
8 years ago
charitha 78b7037aa9 Add support for hybrid device types which has emulation/virtual capabilities
8 years ago
WSO2 Builder a26a4bb539 [WSO2 Release] [Jenkins #2175] [Release 2.0.33] prepare for next development iteration
8 years ago
WSO2 Builder 000601911f [WSO2 Release] [Jenkins #2175] [Release 2.0.33] prepare release v2.0.33
8 years ago
amalhub af4ab19132 Fixing issue: https://github.com/wso2/carbon-device-mgt/issues/647
8 years ago
WSO2 Builder 50c9eb9ba4 [WSO2 Release] [Jenkins #2172] [Release 2.0.32] prepare for next development iteration
8 years ago
WSO2 Builder ca79804c5c [WSO2 Release] [Jenkins #2172] [Release 2.0.32] prepare release v2.0.32
8 years ago
sinthuja 54888b6727 Adding back the webscoket credential method invocation, as it's needed by the pugins.
8 years ago
charitha 5ff3ba3fcc Fix issue in showing dynamic icons
8 years ago
kamidu bf1548c062 title app name changed
8 years ago
WSO2 Builder a35205c480 [WSO2 Release] [Jenkins #2169] [Release 2.0.31] prepare for next development iteration
8 years ago
WSO2 Builder ac379c9bf9 [WSO2 Release] [Jenkins #2169] [Release 2.0.31] prepare release v2.0.31
8 years ago
Harshan Liyanage df6d8d4496 Merge pull request #656 from Kamidu/cloud-3.1.0
8 years ago
kamidu fef7a58ad4 title app name changed
8 years ago
Susinda 5d10575de8 Merge remote-tracking branch 'upstream/master'
8 years ago
Susinda dc0606f207 Fixing typo in above commit
8 years ago
Susinda 96d45d006d Fixing #645 , when password is changed redirect to logout
8 years ago
WSO2 Builder de25f3afe3 [WSO2 Release] [Jenkins #2163] [Release 2.0.30] prepare for next development iteration
8 years ago
WSO2 Builder 55ecafe7f4 [WSO2 Release] [Jenkins #2163] [Release 2.0.30] prepare release v2.0.30
8 years ago
Amal Gunatilake f93bac489f Merge pull request #654 from susinda/master
8 years ago
Susinda 226db9a230 Fixing #644
8 years ago
Amal Gunatilake 5ef2d9d121 Merge pull request #653 from susinda/master
8 years ago
Susinda b3295ca2ef Typo Fxed
8 years ago
WSO2 Builder 15d57f71ad [WSO2 Release] [Jenkins #2161] [Release 2.0.29] prepare for next development iteration
8 years ago
WSO2 Builder 3af9e1729a [WSO2 Release] [Jenkins #2161] [Release 2.0.29] prepare release v2.0.29
8 years ago
Amal Gunatilake dbf657fae8 Merge pull request #640 from susinda/master
8 years ago
WSO2 Builder 322f39596e [WSO2 Release] [Jenkins #2158] [Release 2.0.28] prepare for next development iteration
8 years ago
WSO2 Builder 18244d6c96 [WSO2 Release] [Jenkins #2158] [Release 2.0.28] prepare release v2.0.28
8 years ago
WSO2 Builder 12f21868dc [WSO2 Release] [Jenkins #2157] [Release 2.0.27] prepare for next development iteration
8 years ago
WSO2 Builder 4328c3c39d [WSO2 Release] [Jenkins #2157] [Release 2.0.27] prepare release v2.0.27
8 years ago
Kamidu Sachith Punchihewa 14d517e89d Merge pull request #641 from wso2/cloud-3.1.0
8 years ago
kamidu 42f2691962 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
kamidu e30a5910f1 change the device cloud documentation link
8 years ago
kamidu f3a61cb8f3 enhasing toplink
8 years ago
Susinda cd4902f8ab phoneNumber -> PhoneNumber
8 years ago
WSO2 Builder c6bb8e0128 [WSO2 Release] [Jenkins #2154] [Release 2.0.26] prepare for next development iteration
8 years ago
WSO2 Builder da9002ba9f [WSO2 Release] [Jenkins #2154] [Release 2.0.26] prepare release v2.0.26
8 years ago
Susinda a539775583 Fixing carbon-device-mgt/issues/639
8 years ago
amalhub 541f5440ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
amalhub 2c0ac79dce Fixing issue: https://github.com/wso2/carbon-device-mgt/issues/637
8 years ago
Hasunie 1ee313ea77 Merge pull request #636 from harshanL/cloud-3.1.0
8 years ago
WSO2 Builder 6114f4b2d5 [WSO2 Release] [Jenkins #2152] [Release 2.0.25] prepare for next development iteration
8 years ago
WSO2 Builder ea8f19f26d [WSO2 Release] [Jenkins #2152] [Release 2.0.25] prepare release v2.0.25
8 years ago
kamidu 6fe7470af5 re enabling device renaming
8 years ago
Harshan Liyanage 06ccbe28cc Fixed Device renaming issue.
8 years ago
WSO2 Builder d433525145 [WSO2 Release] [Jenkins #2150] [Release 2.0.24] prepare for next development iteration
8 years ago
WSO2 Builder 35ee3eca3a [WSO2 Release] [Jenkins #2150] [Release 2.0.24] prepare release v2.0.24
8 years ago
kamidu 3ff2c9894f role filtering for device cloud is enabled
8 years ago
Harshan Liyanage 75486b3bb8 Fixed Device renaming issue.
8 years ago
WSO2 Builder 4e0afb7d39 [WSO2 Release] [Jenkins #2146] [Release 2.0.23] prepare for next development iteration
8 years ago
WSO2 Builder 33f1448c82 [WSO2 Release] [Jenkins #2146] [Release 2.0.23] prepare release v2.0.23
8 years ago
Kamidu Punchihewa e063fd0da9 code cleanup results
8 years ago
Kamidu Punchihewa e6333438b9 ading role filtering and ui fixes
8 years ago
WSO2 Builder e95e96f06c [WSO2 Release] [Jenkins #2141] [Release 2.0.22] prepare for next development iteration
8 years ago
WSO2 Builder 5d55413e02 [WSO2 Release] [Jenkins #2141] [Release 2.0.22] prepare release v2.0.22
8 years ago
Susinda e23aaa6647 Adding Hasunie's fix on initialOperations implementation
8 years ago
Susinda Perera bd7d6939e5 Merge pull request #628 from susinda/master
8 years ago
WSO2 Builder ae3300afde [WSO2 Release] [Jenkins #2134] [Release 2.0.21] prepare for next development iteration
8 years ago
WSO2 Builder 6646c0c56f [WSO2 Release] [Jenkins #2134] [Release 2.0.21] prepare release v2.0.21
8 years ago
Susinda Perera 7c9659ed29 Merge pull request #1 from susinda/cloud-3.1.0
8 years ago
WSO2 Builder 21cdcdd21a [WSO2 Release] [Jenkins #2133] [Release 2.0.20] prepare for next development iteration
8 years ago
WSO2 Builder 23be60ebd0 [WSO2 Release] [Jenkins #2133] [Release 2.0.20] prepare release v2.0.20
8 years ago
kamidu 0fade6aa9f remove the cloud related config from config.jason
8 years ago
kamidu dd26f366df Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
kamidu f9a03133fa device cloude related ui improvements
8 years ago
ayyoob 5e4b0564b7 added permission fix for operation and synchronised application creation to avoid duplicate subscription
8 years ago
ayyoob 6a0c0cb299 added default permissions
8 years ago
Megala a2d0c59e17 Revert 2988357eb9
8 years ago
Megala 4fdeec89cc Revert f3f7635d3b
8 years ago
ayyoob d66e439f49 added carbon local ip as config
8 years ago
ayyoob c088a9bc93 fixed api subscribe issue for device specific app creation
8 years ago
WSO2 Builder 7f98d37835 [WSO2 Release] [Jenkins #2122] [Release 2.0.19] prepare for next development iteration
8 years ago
WSO2 Builder b03936ca49 [WSO2 Release] [Jenkins #2122] [Release 2.0.19] prepare release v2.0.19
8 years ago
charitha 14dfc1b538 Fix minor issues found with jmeter tests
8 years ago
madhawap f1b761d987 Minor code formating
8 years ago
Kamidu Sachith Punchihewa 8e530b0523 adding the removed tenant based token handlers
8 years ago
WSO2 Builder 82888e1d20 [WSO2 Release] [Jenkins #2109] [Release 2.0.18] prepare for next development iteration
8 years ago
WSO2 Builder b11c2e451b [WSO2 Release] [Jenkins #2109] [Release 2.0.18] prepare release v2.0.18
8 years ago
WSO2 Builder 67a091ff5a [WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare for next development iteration
8 years ago
WSO2 Builder dcc2088455 [WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare release v2.0.17
8 years ago
lakshani eb12e5b9f1 Adding commit 'added java doc comments'
8 years ago
lakshani 9e5574dccc Adding commit 'added change device status to device view page'
8 years ago
lakshani 3f90b403c0 Adding lakshani's commit 'updated device status button'
8 years ago
WSO2 Builder 927b2d451d [WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare for next development iteration
8 years ago
WSO2 Builder dfe9b1ff9c [WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare release v2.0.16
8 years ago
charitha 7374a0825d Fix https://wso2.org/jira/browse/IOTS-436
8 years ago
charitha d2991585aa Applying charithas commit on IOTS-436
8 years ago
geethkokila e90dc8b6c1 Fixing the compile error
8 years ago
geethkokila d8303356cd Fixing the conflicts
8 years ago
kamidu b7e3b28722 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
kamidu 4e16e29b1c removing group sharing
8 years ago
Imesh Chandrasiri 3c90f8ad49 temporary removal of view analytics
8 years ago
Imesh Chandrasiri 8cf92e8a5b Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
Imesh Chandrasiri a938d57a65 Removing analytics link from groups listing
8 years ago
Kamidu Sachith Punchihewa 587c798f09 Merge pull request #613 from Kamidu/cloud-3.1.0
8 years ago
Kamidu Sachith Punchihewa 4a5c99af78 remove tennent related token handlers
8 years ago
Imesh Chandrasiri 5097416d69 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
Imesh Chandrasiri 368647f176 Temporary advance search removal commit
8 years ago
Kamidu Sachith Punchihewa 112efda8d5 Merge pull request #611 from Kamidu/cloud-3.1.0
8 years ago
Kamidu Sachith Punchihewa 0da8847787 removing device edit option
8 years ago
Imesh Chandrasiri f5e5dce872 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
Imesh Chandrasiri ee209064e3 Tooltip css fix
8 years ago
Kamidu Sachith Punchihewa 367dc1a30b resolving return type issue in group mgt
8 years ago
Kamidu Sachith Punchihewa 527b844ee3 Error handled on the user session invalidation
8 years ago
Kamidu Sachith Punchihewa 318fbf9215 role loading issues
8 years ago
Kamidu Sachith Punchihewa 282801c814 updating cloud dashboard
8 years ago
kamidu 7480ccaa15 fixing datatable issues
8 years ago
kamidu 3e061f6e8b Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
kamidu 6a67f251ac cloud related ui fixs
8 years ago
Hasunie 8bb75d291c Avoiding package exporting org.wso2.carbon.device.mgt.core.internal
8 years ago
Hasunie 2a9027a15e Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
Imesh Chandrasiri 3786ef2636 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
Imesh Chandrasiri 0cddd896d4 Tooltip fix
8 years ago
kamidu 4725eb3c3b chenge the group creating steps
8 years ago
kamidu 486e02fd71 adding ui changes to the cloud related uis
8 years ago
Hasunie 315be0a3c7 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
Rasika Perera 9ca552584a Merge pull request #602 from rasika/cloud-3.1.0
8 years ago
Rasika Perera b8a1b945bb Adding tooltips
8 years ago
Imesh Chandrasiri 9d80fcfd54 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
Imesh Chandrasiri 7bc5d35746 data table padding fix
8 years ago
Kamidu Sachith Punchihewa 4d02f9971e Merge pull request #591 from Kamidu/cloud-3.1.0
8 years ago
Hasunie 476e439fe2 Fixing the task to get the only device registered tenants
8 years ago
Rasika Perera d92c52b89b Adding cloud error pages for jaggery.conf
8 years ago
Rasika Perera 8931478a55 Moving error into common logic page. If in cloud mode; change "default": "uuf.page.error" into "default": "cdmf.page.error" in config.json
8 years ago
kamidu aba4ceaf76 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
kamidu 587f847934 ui improvements to device cloud
8 years ago
Imesh Chandrasiri c26d7fd15d Changed device loading icon for device loading page
8 years ago
Imesh Chandrasiri dcb29b7792 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
Imesh Chandrasiri 5a7fa99e0a Fix data table icon padding issue
8 years ago
Rasika Perera fbae181f07 Fixing footer getting cluttered on /devicemgt/devices/search page
8 years ago
Rasika Perera dd645a9fda Fixing footer getting cluttered on /devicemgt/devices/search page
8 years ago
Imesh Chandrasiri b579870672 Data table icon cursor added
8 years ago
Imesh Chandrasiri 23edb1de7a Model Popup title space issue fix
8 years ago
Imesh Chandrasiri 8bbb612de6 Fixing cloud header height issue and theme color
8 years ago
geethkokila f3f7635d3b Fixing the task to get the only the device enrolled tenants
8 years ago
kamidu 8a07639d6b Fix responsive issue in clud header
8 years ago
kamidu 6e19ec31e3 fix url issues in the config.json
8 years ago
kamidu b946eeae74 fix url issues in the config.json
8 years ago
kamidu f772b35769 enable cloud related configurations to the devicemgt application
8 years ago
kamidu 4eaf2b41c8 enable cloud related configurations to the devicemgt application
8 years ago
ayyoob 018b230b5a Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
ayyoob 87910bc92b transferred mutual authenticator to jwt authenticator
8 years ago
kamidu ddef86e226 stylish issues
8 years ago
kamidu 9cba33a6dc Modification to the header panel
8 years ago
WSO2 Builder b051bd108b [WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare for next development iteration
8 years ago
WSO2 Builder ce78ac277e [WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare release v2.0.17
8 years ago
lakshani 18cb2b3e1f added java doc comments
8 years ago
lakshani a2679fde4c added change device status to device view page
8 years ago
kamidu fd3ff5496c cloud relatd ui fixes
8 years ago
lakshani 2d83033b26 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicestatus
8 years ago
lakshani a9a6883adc updated device status button
8 years ago
WSO2 Builder c954731870 [WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare for next development iteration
8 years ago
WSO2 Builder e68c3d170b [WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare release v2.0.16
8 years ago
Kamidu Sachith Punchihewa 681c320542 Update user-menu.hbs
8 years ago
Kamidu Sachith Punchihewa 00b1f982c6 Update user-menu.hbs
8 years ago
ayyoob b7566f4e4a added artifact deployment support through UI
8 years ago
ayyoob 0999bb70a0 exposed artefact deployment through api
8 years ago
ayyoob 274d3e9aeb used jwt grant type instead of saml
8 years ago
Kamidu Sachith Punchihewa 559fe98cc9 Merge pull request #585 from wso2/master
8 years ago
WSO2 Builder 54a278a1bc [WSO2 Release] [Jenkins #2086] [Release 2.0.15] prepare for next development iteration
8 years ago
WSO2 Builder 3bc46c4d2d [WSO2 Release] [Jenkins #2086] [Release 2.0.15] prepare release v2.0.15
8 years ago
kamidu befa75af9a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu 6af09cdd31 Remove the defaut black color for icons
8 years ago
WSO2 Builder 1bc8f5c28d [WSO2 Release] [Jenkins #2083] [Release 2.0.14] prepare for next development iteration
8 years ago
WSO2 Builder 1483503790 [WSO2 Release] [Jenkins #2083] [Release 2.0.14] prepare release v2.0.14
8 years ago
Hasunie 54d0d7a5ee Merge pull request #582 from charithag/master-update-swagger-docs
8 years ago
kamidu 41fd402619 DIABLE CLOUD UI IN THE MASTER
8 years ago
kamidu 43b0d1f1ce Enable appstore and app publisher
8 years ago
Milan Perera a5f41ef734 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud
8 years ago
ayyoob 4ec7762a5c made it use the default saml grant type
8 years ago
kamidu 4b396cf321 enable location without das
8 years ago
charitha 8e01a98ded Removed unused Dashboard API
8 years ago
charitha 423879bee7 Updated swagger docs
8 years ago
charitha 3cf797fba6 Removed hardcoded device types in swagger docs
8 years ago
WSO2 Builder 5dc55bb5b5 [WSO2 Release] [Jenkins #2076] [Release 2.0.13] prepare for next development iteration
8 years ago
WSO2 Builder c7fe9c3a20 [WSO2 Release] [Jenkins #2076] [Release 2.0.13] prepare release v2.0.13
8 years ago
lakshani 3b32635cf9 removed unwanted new lines
8 years ago
lakshani bbcdf7aeda removed unwanted new line
8 years ago
lakshani 26f2e2d2ae added role query param to getdevices restapis
8 years ago
WSO2 Builder c17bead1fc [WSO2 Release] [Jenkins #2069] [Release 2.0.12] prepare for next development iteration
8 years ago
WSO2 Builder 14100d3cc8 [WSO2 Release] [Jenkins #2069] [Release 2.0.12] prepare release v2.0.12
8 years ago
GPrathap 9cdcb58103 uncommenting required fields
8 years ago
GPrathap e7e8cb62b6 fixing permission issue when viewing device analytics dashboard
8 years ago
GPrathap 47e6f6d292 adding username as parameter
8 years ago
Milan Perera 2b4a3cde61 Fixed conflicts and merged
8 years ago
Milan Perera 21d8d14b7e Fixed multy tenancy issues related to android device type
8 years ago
geethkokila 713ddbf416 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
geethkokila 2988357eb9 Changing the task to run for all the tenants
8 years ago
ayyoob b42505c1fe Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into release-2.0.y
8 years ago
ayyoob 1a7a215441 added missing license headers
8 years ago
WSO2 Builder cd7e0feaa6 [WSO2 Release] [Jenkins #2062] [Release 2.0.11] prepare for next development iteration
8 years ago
WSO2 Builder abb150d9bd [WSO2 Release] [Jenkins #2062] [Release 2.0.11] prepare release v2.0.11
8 years ago
ayyoob 3423ef025d merged with upstream
8 years ago
ayyoob e74b4e23c4 removed apim dependency from cdmf
8 years ago
WSO2 Builder 002fb8719b [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 04f32902fd [maven-release-plugin] prepare release v2.0.10
8 years ago
Rasika Perera 704680d68d Fixing null pointer when roles are not specified on creating new user
8 years ago
Rasika Perera 9a0ba9137b Fixed permissions issue on grouping
8 years ago
Rasika Perera d723e22a8c Fixed roleUpdate issue
8 years ago
WSO2 Builder 5c207897ad [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 233d14edbd [maven-release-plugin] prepare release v2.0.9
8 years ago
Rasika Perera 8e6855a203 Adding DEFAULT_DEVICE_USER on adding user
8 years ago
Rasika Perera 5ce413012e Adding DEFAULT_DEVICE_USER and DEFAULT_DEVICE_ADMIN
8 years ago
Rasika Perera 5aa8776bfe Fixing iot.analytics.host%:%iot.analytics.https.host => iot.analytics.host%:%iot.analytics.https.port
8 years ago
Rasika Perera 42816101bb Merge pull request #566 from wso2/release-2.0.8
8 years ago
Imesh Chandrasiri 3983780f7f Fix for multiple advance search element
8 years ago
Imesh Chandrasiri a5d1f70c93 git status
8 years ago
Imesh Chandrasiri ef80d62307 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Imesh Chandrasiri 9f262c1afb Message container markup fix for advance search
8 years ago
WSO2 Builder eedecf00ed [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder ef57fc463b [maven-release-plugin] prepare release v2.0.8
8 years ago
Ayyoob Hamza 96f0c633d9 Merge pull request #563 from madhawap/release-2.0.x
8 years ago
madhawap 348b349a37 parameterizing sso config
8 years ago
Rasika Perera 212cc52eb2 Merge pull request #562 from Kamidu/release-2.0.x
8 years ago
kamidu eb17093747 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
kamidu bf38ad5f70 adding location history to map view
8 years ago
Rasika Perera fb1f7771c4 Fixing "process" not found on devicemgt
8 years ago
Rasika Perera b39caade98 Adding system params picking up for app-conf.json
8 years ago
Rasika Perera ff2cd32bce Merge pull request #561 from geethkokila/release-2.0.x
8 years ago
geethkokila 2743bf9458 Fixing the security issue due to not using prepared statement
8 years ago
geethkokila 7359b4c536 Fixing the security issue due to not using prepared statement
8 years ago
kamidu bd75b789c2 Enable location histry for android sense
8 years ago
Imesh Chandrasiri bc59ac6819 Adding action buttons to listing views
8 years ago
Imesh Chandrasiri ba23e5cfd9 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Imesh Chandrasiri 9533bc9ac8 Adding advance search to devices page
8 years ago
Rasika Perera e86776eb0b Fixing "process" not found issues
8 years ago
Rasika Perera 3ff4e37937 Merge pull request #557 from DimalChandrasiri/release-2.0.x
8 years ago
Rasika Perera 6733190760 Merge pull request #556 from Kamidu/release-2.0.x
8 years ago
Rasika Perera 15a919b8a7 Added parameters for configs
8 years ago
Rasika Perera 252eb78124 Now UI configs supports system parameters with eg. %iot.core.host%
8 years ago
Imesh Chandrasiri 75f2015f5a Group detail view responsive issue fix
8 years ago
kamidu fb89476e16 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
kamidu 5f5d19fc1e Enable location history
8 years ago
Rasika Perera 27e953cda3 API subscription permission added to [devicemgt-user] role
8 years ago
inoshperera 346fd28814 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
inoshperera 0bb04789a6 adding permissions necessery for iOS to config.json
8 years ago
Milan Perera f8de4869d9 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Milan Perera e9c3a0c3e8 Fixed token expiration issue
8 years ago
sameera910409 1bec5e5186 fixed user password reset failure issue in iot console
8 years ago
Maninda 1f5448c2a0 Corrected the caching filter pattern
8 years ago
Imesh Chandrasiri bdfb816ffc Fix for issue where list item operations getting fired even after cancelling list item selection
8 years ago
kamidu bb8985781e removing duplicate methoads
8 years ago
kamidu 7698c12d80 removing duplicate methoads
8 years ago
kamidu 7b3db2bdd6 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Rasika Perera 51bd2b5bb6 UI improvement: Fixing buttons styles
8 years ago
Rasika Perera 60ac0522d8 Fixes for XSS attacks
8 years ago
kamidu 5de2a233d7 Recomended security fixes for data tables
8 years ago
Rasika Perera 2b46691405 Fixing user menu not showing issue
8 years ago
ayyoob 4128e2d355 pointed to gateway node
8 years ago
Imesh Chandrasiri ba506183b1 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Imesh Chandrasiri 34aac48071 Notification bar scroll and trigger issue fix
8 years ago
Rasika Perera 68ad05fde2 Merge pull request #546 from DimalChandrasiri/release-2.0.x
8 years ago
ayyoob 8a883ccd41 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
ayyoob 2a538ff959 fixed multi tenant login issue
8 years ago
Maninda 8aed7c67a9 Added devicemgt web app configs to secure web app
8 years ago
Maninda 4fbab80782 Added security filters to jaggery.conf
8 years ago
Rasika Perera 2206e258d1 Fixing permissions for [devicemgt-user] and [devicemgt-admin] roles
8 years ago
Imesh Chandrasiri 153e3bb719 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Imesh Chandrasiri 6e1e801ea0 Fix for multiple popup issue
8 years ago
WSO2 Builder 585b9bde4d [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder d206148841 [maven-release-plugin] prepare release v2.0.7
8 years ago
Rasika Perera b9c1141f79 Added missing utility module import
8 years ago
Rasika Perera 0227d5ccbb Fixing https://wso2.org/jira/browse/IOTS-381
8 years ago
Rasika Perera 4549a34083 changed [fw-ok] with [fw-success]
8 years ago
ayyoob 44d09e09ea few changes after testing the gateway
8 years ago
ayyoob 671d931d3e merged with origin after resolving conflicts
8 years ago
ayyoob 5b3a8091ec fixed Null pointer exception
8 years ago
Rasika Perera 864020f20e Adding ability to add deviceType level scopes
8 years ago
Rasika Perera f57de670ea Adding devices:update into /devices scopes list
8 years ago
Rasika Perera e11d2244f5 Fixing scope annotation /enrollment-invite
8 years ago
Rasika Perera 63cb0e1fde Adding swagger annotations and scope for /effective-policy
8 years ago
Rasika Perera 09aae93fc1 Adding perm:admin:certificates:verify scope
8 years ago
ayyoob d4ec0705e7 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
ayyoob cdd144237f removed unused parameter
8 years ago
Milan Perera 311fe7810f Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Milan Perera 21c50c9a55 Fixed NPE occurred due to scope mapping
8 years ago
ayyoob 2fbaf31b93 fixed permission and assigned environment variables for url context
8 years ago
ayyoob 93ae646c50 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
ayyoob de957bec29 few changes after testing the cluster
8 years ago
Rasika Perera e05600607a Merge pull request #540 from madawas/release-2.0.x
8 years ago
Rasika Perera c7d489cf2c Merge pull request #538 from madawas/IOTS-377
8 years ago
Rasika Perera 9bd409e502 Merge pull request #536 from DimalChandrasiri/release-2.0.x
8 years ago
Madawa Soysa a28458cf13 Refactoring policy view and edit units
8 years ago
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 ef2a1b84a2 IOTS-376 : Fixing cannot delete a device
8 years ago
kamidu 4588cfbed4 Fixing the permission management issue in EMM console
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
Milan Perera 562631cc1d Fixed scopes related issue in SAML Granttype
8 years ago
charitha cb7ff7f66a Change package name to lower case
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
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
charitha 5caa688014 Fixed issue in populating server.ip property.
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
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 ebdba19041 IOTS-120 : Fixing firstName and lastName cannot contain whitespaces
8 years ago
Rasika Perera b4ed33bcd0 IOTS-171 : Register form validation message corrected
8 years ago
Rasika Perera 4de481e501 Merge pull request #521 from rasika/release-2.0.x
8 years ago
Rasika Perera d826ba81d0 UI improvement for Datatables
8 years ago
Rasika Perera 8397b688e9 Merge branch 'release-2.0.x' into mutual_ssl_feature
8 years ago
Rasika Perera b4a649bdfa Merge pull request #516 from milanperera/release-2.0.x
8 years ago
geethkokila 739a8bdb69 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
Rasika Perera 1c1da1f5cd Merge pull request #517 from rasika/release-2.0.x
8 years ago
Rasika Perera ab28d596e7 Fixing CDMF version in footer
8 years ago
Milan Perera d51ee711fc Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Rasika Perera 79e98a592b Merge pull request #515 from rasika/release-2.0.x
8 years ago
Milan Perera 228848075c Fixed conflicts and merged
8 years ago
Rasika Perera e501724c3c Replaced [EMM] with [IoT Server]
8 years ago
Rasika Perera 7af63522f2 Fixed quick startup guide doc url
8 years ago
Milan Perera 42a587904f Fixed issues in permission-scope mapping
8 years ago
geethkokila 9200adebed Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
charitha d65557e03e Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
charitha e6e39532b7 Fixed https://wso2.org/jira/browse/IOTS-103 and UI improvements
8 years ago
Rasika Perera 3472090d1b Merge pull request #513 from ruwany/wip
8 years ago
Ace 6a69d8cf4b merging with upstream
8 years ago
Ace b83479b214 Fixing device listing issue
8 years ago
Milan Perera 637c014866 Refactored scope strings
8 years ago
Milan Perera 157ef998a6 Resolved conflicts and merged
8 years ago
Milan Perera e0ee2fc1e5 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
ayyoob b20a2e0997 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Chatura Dilan e0627bf748 Merge pull request #509 from rasika/release-2.0.x
8 years ago
GPrathap 5d1435c7bc renamed permission string
8 years ago
Rasika Perera 25a35dcf20 Changing title [WSO2 IoT] into [WSO2 IoT Server]
8 years ago
Rasika Perera 7612f064fe Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Maninda 00a5a07373 Fixed some security issues found after running FindBugs security scan.
8 years ago
Milan Perera f3409adc21 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Milan Perera 2a4a636eb4 Resolved conflicts and merged
8 years ago
Milan Perera d13dadff08 Renamed prefix of scopes
8 years ago
GPrathap 0bd7b90e9a added scope annotation
8 years ago
ayyoob db2ddc7bed policy manager refactored to support tenancy
8 years ago
Milan Perera 7b8a7c0b52 Merge pull request #1 from GPrathap/release-2.0.x
8 years ago
Maninda 0fb5a577b8 Fixed some issues found in FindBugs security analysis.
8 years ago
Rasika Perera 235b41c9df config.json [usernameLength] moved to [userValidationConfig][usernameLength]
8 years ago
Rasika Perera 2a7e62f857 config.json [apimgt-gateway] renamed to [gatewayEnabled]
8 years ago
Rasika Perera e5062abcc2 Removed unneccesary configs
8 years ago
charitha f6f99ed06a Fixed following issues:
8 years ago
Milan Perera b860be0150 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
geethkokila 65cb12b5ac Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
charitha 295921b289 Fixed following issues:
8 years ago
Milan Perera 02d75b757c Fixed conflicts and merged
8 years ago
GPrathap 4c9578ebe2 resized buffer size to 0 for each scope
8 years ago
WSO2 Builder 6aea6195e9 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 3db5b289ac [maven-release-plugin] prepare release v2.0.5
8 years ago
Rasika Perera acb2c38799 Fixing user is not authorized to view devices
8 years ago
WSO2 Builder ed47094964 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 8d409a7248 [maven-release-plugin] prepare release v2.0.4
8 years ago
charitha 1a93868424 Fixed https://wso2.org/jira/browse/IOTS-335
8 years ago
charitha 61d1710614 Fixed https://wso2.org/jira/browse/IOTS-341
8 years ago
Ace 674048ab27 Coorecting version import ranges
8 years ago
Rasika Perera d001cf2ee1 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Rasika Perera fea128d29e Fixing grid-view cropped on group view
8 years ago
Ayyoob Hamza 4960fd0d05 Merge pull request #499 from charithag/release-2.0.x-IOTS-342
8 years ago
charitha a625ccecf0 Fixed https://wso2.org/jira/browse/IOTS-342
8 years ago
Ruwan 46c3b015fa Merge pull request #498 from charithag/release-2.0.x-email-invites
8 years ago
charitha 58a9ea80c7 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Charitha Goonetilleke 5318601df0 Add license header
8 years ago
charitha 2b1d46f45f Finalized enrollment invitations
8 years ago
Charitha Goonetilleke af8902f392 Merge pull request #497 from rasika/release-2.0.x
8 years ago
Rasika Perera b0d32a140e Adding context for anchor links
8 years ago
Rasika Perera ad92a5278e Adding on-image anchor links instead of separate btn for device-view
8 years ago
Rasika Perera 6f7d87a590 Merge pull request #496 from madhawap/release-2.0.x
8 years ago
madhawap d486ad14fd Task operation config related changes
8 years ago
Ace 64da9479a1 Bumping identity dependencies
8 years ago
Ace 1d2a5dc9ef Updating identity/auth-saml dependencies to latest
8 years ago
charitha 795ccb740c Add backend support for enrollment invitations
8 years ago
geethkokila 1b4857b7fd Fixing conflicts
8 years ago
Supun94 a831dc6a9a Changing cdm-config file
8 years ago
Supun94 3d6f5ee64d Changing policy compliance view
8 years ago
Supun94 09572a9977 Removed redundant classes
8 years ago
Supun94 2751d4b856 Code refactoring
8 years ago
Supun94 eb1575126f Minor refactoring on policy merging
8 years ago
Supun94 35f3fcc8f9 Changed policy evaluation point
8 years ago
Supun94 936e71a743 Adding configurations for different policy evaluation service components
8 years ago
Supun94 5a1c73b119 Adding cdmf effective policy unit
8 years ago
Supun94 2847ff2095 Adding cdmf effective policy page
8 years ago
Supun94 33b79dcbba Adding effective policy service
8 years ago
charitha 7acbc5cd0b Moved qr modal to device mgt core
8 years ago
Charitha Goonetilleke f4b3313ad7 Merge pull request #491 from DimalChandrasiri/release-2.0.x
8 years ago
Charitha Goonetilleke 8216ea3a79 Merge pull request #488 from madawas/IOTS-296
8 years ago
Rasika Perera 1465c56822 Revert "[WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4"
8 years ago
Ace 47d8baccf7 upgrading to latest version of identity
8 years ago
Imesh Chandrasiri 765f97f5a0 email invite sender changes
8 years ago
Imesh Chandrasiri e696b5bd0c Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
WSO2 Builder f9b6939cb7 [WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4
8 years ago
Rasika Perera 42930fe8c4 Revert "[WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4"
8 years ago
Harshan Liyanage a2a03a523e Refactored RoleMgtServiceImpl.
8 years ago
Harshan Liyanage de2f85de2e IOTS-337:Fixed permission remove issue when updating role permissions.
8 years ago
WSO2 Builder 78b9052c37 [WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4
8 years ago
Imesh Chandrasiri f70be13bf2 Common unit for email invite modal for devices screens
8 years ago
Madawa Soysa 5b1a68280c Moving codemirror to a lib unit
8 years ago
Madawa Soysa 0f291d5d04 Fixing generic policy saving issues
8 years ago
Milan Perera bcbf61a886 Fixed conflicts
8 years ago
Milan Perera 36ee55f493 Implemented permission-scope mapping for IoTs
8 years ago
Rasika Perera 9f615916d0 Fixing analyticsEnabled and groupingEnabled not working
8 years ago
Rasika Perera 1bee155d9a Fixing formatting issue
8 years ago
Rasika Perera 91437ff81c Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Rasika Perera c284732192 Displaying SSO auth failure messages
8 years ago
Rasika Perera 9fd6145605 Fixing SSO issue
8 years ago
Milan Perera dd353e1bfb Commiting permission-scope mapping improvements
8 years ago
WSO2 Builder a59edee410 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 8f9b21b41b [maven-release-plugin] prepare release v2.0.3
8 years ago
charitha d8881244fd Fix issue in task operation
8 years ago
charitha 0a7f8ac22c Update error pages and CsrfGuard property file.
8 years ago
charitha 78dfddbbed Merge branch 'merge-master' of https://github.com/geethkokila/carbon-device-mgt into release-2.0.x
8 years ago
madhawap fa171ef079 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
madhawap d62a9c8b83 resolving conflicts
8 years ago
Madawa Soysa ea1371a008 Fixing generic policy payload
8 years ago
madhawap b889f6e384 adding separate tasks for each device type
8 years ago
charitha 0b3183e3be Merge remote-tracking branch 'upstream/release-2.0.x' into release-2.0.x
8 years ago
charitha 312098b1de Fix issues in generic policy editor
8 years ago
Hasunie 9a1c12d730 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Hasunie 60d1281949 fixing windows device name issue
8 years ago
geethkokila 87b2fb3603 Fixing the login issue
8 years ago
geethkokila 9def8aa609 Fixing the login issue
8 years ago
geethkokila a0615d3d63 Merge branch 'release-2.0.x' into merge-master
8 years ago
geethkokila d911281ad1 Merging master branch with release-2.0.x
8 years ago
Madawa Soysa 630a1105a9 IOTS-296: Refactoring generic policy unit code
8 years ago
Ruwan a0c842c6c6 Merge pull request #473 from charithag/release-2.0.x
8 years ago
Rasika Perera 6edbb8330f Merge pull request #472 from rasika/release-2.0.x
8 years ago
charitha 4b5c69d2d7 Update the way we are checking existence of policy operations.
8 years ago
Rasika Perera 641cc58bbf Fixing enrollment broken issue
8 years ago
Imesh Chandrasiri da2fd787c4 Fix for datatable icon not showing issue
8 years ago
Ruwan f2f304ccc4 Merge pull request #470 from rasika/release-2.0.x
8 years ago
Rasika Perera 289987db8e Throwing exception on getDevice when device is not found
8 years ago
Hasunie 40d8488466 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Ruwan 4bda6d89cb Merge pull request #469 from menakaj/release-2.0.x
8 years ago
Hasunie b9e0b099a1 fixing device update issue
8 years ago
charitha 7368b2cf64 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
charitha 8348002f66 Merge branch 'release-2.0.x' of https://github.com/ruwany/carbon-device-mgt into release-2.0.x
8 years ago
Charitha Goonetilleke e137644677 Merge pull request #467 from madawas/IOTS-296
8 years ago
charitha 161fe62a08 Fix for https://wso2.org/jira/browse/IOTS-323
8 years ago
Ace 34225bd9da fixing operations loading spinner and other ui issues
8 years ago
Menaka Jayawardena 84a0b398fe Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Menaka Jayawardena ca2a79a001 Added entries for portal app in config files.
8 years ago
Madawa Soysa de95c99ea7 IOTS-296: Genaralizing policy view UI
8 years ago
Hasunie 631ea6e80f Merge pull request #465 from harshanL/release-2.0.x
8 years ago
Harshan Liyanage 24c0966dce Merge pull request #462 from madawas/IOTS-322
8 years ago
Harshan Liyanage b4eb86e985 Added security filters to devicemgt jaggery app
8 years ago
Rasika Perera e8d8373d46 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Rasika Perera 4c1fb558d3 Fixing sso infinite redirection
8 years ago
Madawa Soysa 1d1f399477 IOTS-322: Infroming users when device types are not installed
8 years ago
Imesh Chandrasiri f8d03e992e Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Imesh Chandrasiri 09fa48c4c2 Removed fade-edge class from template markups for better listing readability
8 years ago
Charitha Goonetilleke 22990087a0 Merge pull request #459 from GPrathap/release-2.0.x
8 years ago
charitha 78d0172d5d Merge remote-tracking branch 'upstream/release-2.0.x' into release-2.0.x
8 years ago
charitha ee5459dc79 Fix for https://wso2.org/jira/browse/IOTS-321
8 years ago
Rasika Perera 2cfff85ee2 Merge pull request #458 from ruwany/release-2.0.x
8 years ago
Ace 7eaee141e0 Adding content-type to descriptor
8 years ago
GPrathap 6e69fc8e84 changed application creation endpoint
8 years ago
Madawa Soysa 5c356914e8 IOTS-296: Commenting and refactoring
8 years ago
WSO2 Builder 228b24ca79 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 5dbb258f55 [maven-release-plugin] prepare release v2.0.2
8 years ago
Charitha Goonetilleke 67a73189e1 Merge pull request #456 from rasika/IoTS-1.0.0
8 years ago
Rasika Perera bec0f58e38 Adding semi-colon on context variable on service invoker Js
8 years ago
Rasika Perera 884bbe66b5 Adding iOS enrollment path into config.json
8 years ago
Rasika Perera 098ae372f7 Adding new css class for device type view image
8 years ago
charitha 3b97b3296e Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Megala ed325ee576 Adding dashboard feature
8 years ago
Chatura Dilan 82d865b104 Merge pull request #453 from madhawap/release-2.0.x
8 years ago
madhawap 2b00645779 refactored code
8 years ago
charitha e718ab5504 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
charitha cad686b43c Bug fixes & UI/UX improvements
8 years ago
madhawap bec4ae681d Seperate out task operations
8 years ago
Madawa Soysa b2650e439c Fix issue with policy wrapper group select
8 years ago
Madawa Soysa 345fdc0ced IOTS-296: Removing ownership selection when policy creation
8 years ago
charitha d9b670ef19 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
charitha 564cece94b Bug fixes
8 years ago
Charitha Goonetilleke e1d2d8a73f Merge pull request #447 from ruwany/release-2.0.x
8 years ago
Ace 6126776fcf Adding android operations bar related changes
8 years ago
Madawa Soysa 8cdc8cfb24 IOTS-296: Refactoring Policy create/edit units
8 years ago
Charitha Goonetilleke d9763ff5b7 Merge pull request #445 from GPrathap/release-2.0.x
8 years ago
GPrathap 64ce41f571 added creating an application for WebSocket
8 years ago
Charitha Goonetilleke bf48f57f84 Merge pull request #442 from DimalChandrasiri/release-2.0.x
8 years ago
Charitha Goonetilleke c84d7fd13d Merge pull request #440 from DimalChandrasiri/IoTS-1.0.0
8 years ago
Madawa Soysa c61cd484a0 IOTS-296: Adding group selection capability when adding a policy
8 years ago
Imesh Chandrasiri a56b953fcb Validation error fix
8 years ago
Madawa Soysa a4ca74c6c0 IOTS-296: Generalizing policy UI for policy edit
8 years ago
Madawa Soysa 7aada58472 IOTS-296: Fixing issue with device type icon
8 years ago
Madawa Soysa 0dfde40b7c IOTS-296: Generalizing policy UI for policy create wizard
8 years ago
Imesh Chandrasiri d90c9ab68a Data table fix when list view
8 years ago
WSO2 Builder 8431b30ddc [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder ae2e283f14 [maven-release-plugin] prepare release v2.0.1
8 years ago
Rasika Perera 4789aafd28 Minor ui changes to the group listing
8 years ago
Charitha Goonetilleke 027498895a Merge pull request #436 from DimalChandrasiri/IoTS-1.0.0
8 years ago
Imesh Chandrasiri 54bb91d428 IoT Build UI Fixes
8 years ago
Rasika Perera 03f965adf6 Decrease group listing page loading time with lazy roles listing
8 years ago
Imesh Chandrasiri 07a0dee2d9 Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
8 years ago
Rasika Perera 05453e7379 Removed 'role' suffix from roles listing page
8 years ago
Rasika Perera ce4b389df0 Merge branch 'IoTS-1.0.0' of https://github.com/charithag/carbon-device-mgt into IoTS-1.0.0
8 years ago
Rasika Perera aaade2363c Adding new api to create combined roles
8 years ago
Rasika Perera 3fe18ba4bb Refactoring group sharing modal
8 years ago
charitha ca5d96df67 Add test cases to verify DAO functionality
8 years ago
Rasika Perera 54211bc3cc Fixing minor issues on GroupDAO
8 years ago
Imesh Chandrasiri 5525c42eae Removed Unneccsary title and added padding
8 years ago
charitha a2db592d69 Updated group management APIs and service
8 years ago
charitha 726bbcd35d Merged with upstream
8 years ago
Madawa Soysa 55bc5042bb Merge pull request #422 from madawas/grouping-policy
8 years ago
charitha c07d77b85d Updated group sharing model
8 years ago
ayyoob ec3dbd37dd fixed commit comments
8 years ago
Madawa Soysa 2f431504fe creating groups from ownership and changing group owner
8 years ago
ayyoob e3849ef21e removed feature lifecycle implementation
8 years ago
ayyoob 3fb42ef32e Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
8 years ago
ayyoob fede8ec409 few changes after testing with authoriser
8 years ago
Madawa Soysa 8ab73ce07d fixing issue with javadocs
8 years ago
Madawa Soysa 2164a30f88 changing group owner to super user
8 years ago
Madawa Soysa c29bf24a75 Adding mobile devices to default groupes based on device ownership
8 years ago
GPrathap 6efc5bc1ed removed @API and @Permission annotations
8 years ago
ayyoob fe263efe60 changed device access verification approach
8 years ago
ayyoob 28faf53802 Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
8 years ago
ayyoob 59e2a33e4a exposed device access authorisation as a service
8 years ago
ayyoob 20e7dd9e86 picked icon from features config
8 years ago
ayyoob 8a6af051dc Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
8 years ago
ayyoob a0c8aeb159 few changes after testing feature manager implementation
8 years ago
WSO2 Builder 19c1b3566d [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder cff6e242c8 [maven-release-plugin] prepare release v2.0.0
8 years ago
Ace 16d2a062da Adding android device-view changes
8 years ago
Ace a0616cf9a2 Adding config changes
8 years ago
charitha a6064d2561 Update component versions for IoTS-1.0.0 release
8 years ago
charitha 40c59c2f16 Fix issues in policy UI
8 years ago
charitha 589ba9c40b Add missing units
8 years ago
charitha b8d8b35847 Merge branch 'IoTS-1.0.0' of https://github.com/sameeragunarathne/carbon-device-mgt into IoTS-1.0.0
8 years ago
sameera910409 02eec1033e add group sharing role create functionality
8 years ago
sinthuja 2f59f1566c Changing the port to the default port of the analytics pack.
8 years ago
ayyoob 44ac6b13b5 changes in UI after refactoring
8 years ago
Ace 5eaca0b1b1 merging with upstream
8 years ago
Ace 2aa1c98d0b bringing common features to cdmf
8 years ago
charitha bb60acd105 Fix device listing issue
8 years ago
ayyoob 33bb9b5a14 merged with IoTS-1.0.0 branch
8 years ago
sinthuja a5212213cf Changing the default wbsocket URL to DAS endpoint.
8 years ago
charitha d1a6353195 Synced with changes in master
8 years ago
charitha 4a115e5d3f Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
8 years ago
Charitha Goonetilleke e1a1f710a0 Merge pull request #406 from sameeragunarathne/IoTS-1.0.0
8 years ago
charitha ac30e7eb3e Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0
8 years ago
WSO2 Builder 9517a3d30f [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder a8568299b9 [maven-release-plugin] prepare release v1.2.6
8 years ago
kamidu 0867b3d075 updating the footer
8 years ago
Rasika Perera fbe423b824 Using permissionsUtil.hasPermission for clientside permission check
8 years ago
Rasika Perera b1b6b94570 Adding permissionsUtil
8 years ago
sameera910409 f8f7dd08cd fixed share groups and group analytics in device grouping
8 years ago
Harshan Liyanage 261e8c510c Fixed syntax issue in device.js file
8 years ago
Charitha Goonetilleke 353707c9c7 Merge pull request #404 from sameeragunarathne/IoTS-1.0.0
8 years ago
charitha 1bfba25c5e Remove user list and role list attributes from group object
8 years ago
kamidu 12e609c737 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu 0c70c87406 fix for EMM-1673
8 years ago
Kamidu Sachith Punchihewa 02d3adf51e Merge pull request #401 from madawas/modal-refactor
8 years ago
Kamidu Sachith Punchihewa 33874f95b6 Merge pull request #399 from saadsahibjan/master
8 years ago
Kamidu Sachith Punchihewa 9d90411189 Merge pull request #402 from madawas/EMM-1298
8 years ago
Kamidu Sachith Punchihewa a295c88dc0 Merge pull request #405 from Megala21/master
8 years ago
sameera910409 204a0ed943 fixes for the comments of the PR#404
8 years ago
Megala a088392b2f Adding css for required fields
8 years ago
sameera910409 fef7c07cb2 add device group deleting and updating fixes
8 years ago
Harshan Liyanage 72522ad759 Fixed SQL syntax issue
8 years ago
Harshan Liyanage 9bf5ca94fb Fixed SQL syntax issue
8 years ago
sameera910409 41f367abfa add group listing and group device listing fixes
8 years ago
kamidu 1c2d339fed Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu 7212e969d8 Fix for SQL query issue in mysql
8 years ago
Ruwan 072119d7df Merge pull request #403 from ayyoob/commit-fixes
8 years ago
charitha 5f68953b11 Merge branch 'master' into IoTS-1.0.0
8 years ago
Harshan Liyanage 1ba2e2f768 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago