Commit Graph

2628 Commits (39439c5c50620dcfb4f0c50d87b0f8f4b09e6eff)

Author SHA1 Message Date
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