Commit Graph

832 Commits (ea8f19f26df5bb4ea3cb5afd9cfac7fe849d62a3)

Author SHA1 Message Date
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
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 9a0ba9137b Fixed permissions issue on grouping
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 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 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
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 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 671d931d3e merged with origin after resolving conflicts
8 years ago
Rasika Perera 864020f20e Adding ability to add deviceType level scopes
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
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
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
Madawa Soysa a28458cf13 Refactoring policy view and edit units
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
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 06977295ea merged with upstream
8 years ago
Milan Perera 562631cc1d Fixed scopes related issue in SAML Granttype
8 years ago
charitha c909144589 Add select2 controller to select roles to share a group
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 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
Ace 6a69d8cf4b merging with upstream
8 years ago
Ace b83479b214 Fixing device listing issue
8 years ago
Rasika Perera 25a35dcf20 Changing title [WSO2 IoT] into [WSO2 IoT Server]
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
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
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
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 61d1710614 Fixed https://wso2.org/jira/browse/IOTS-341
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
charitha a625ccecf0 Fixed https://wso2.org/jira/browse/IOTS-342
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 2b1d46f45f Finalized enrollment invitations
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
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 2751d4b856 Code refactoring
8 years ago
Supun94 eb1575126f Minor refactoring on policy merging
8 years ago
Supun94 5a1c73b119 Adding cdmf effective policy unit
8 years ago
Supun94 2847ff2095 Adding cdmf effective policy page
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
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