Commit Graph

826 Commits (5d55413e02660904d1668a65daf7f3e0b8de4bd6)

Author SHA1 Message Date
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
Rasika Perera 42930fe8c4 Revert "[WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4"
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
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
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 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
Madawa Soysa ea1371a008 Fixing generic policy payload
8 years ago
charitha 312098b1de Fix issues in generic policy editor
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
charitha 4b5c69d2d7 Update the way we are checking existence of policy operations.
8 years ago
Imesh Chandrasiri da2fd787c4 Fix for datatable icon not showing issue
8 years ago
Ruwan 4bda6d89cb Merge pull request #469 from menakaj/release-2.0.x
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
Megala ed325ee576 Adding dashboard feature
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
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 3fe18ba4bb Refactoring group sharing modal
8 years ago
Imesh Chandrasiri 5525c42eae Removed Unneccsary title and added padding
8 years ago
ayyoob ec3dbd37dd fixed commit comments
8 years ago
ayyoob fede8ec409 few changes after testing with authoriser
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
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 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
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 9d90411189 Merge pull request #402 from madawas/EMM-1298
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
sameera910409 41f367abfa add group listing and group device listing fixes
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
Madawa Soysa 774eaadb71 EMM-1298: Extracting serial number from the certificate itself when adding a certificate
8 years ago
kamidu 65ed6c2f6e include owner for the operations api
8 years ago
Madawa Soysa f6ee6aeb8d Refactoring pages to use new modal unit
8 years ago
Megala 35d6d311a7 Fixing EMM-1763
8 years ago
WSO2 Builder 27a2c9b979 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder eae935f91c [maven-release-plugin] prepare release v1.2.5
8 years ago
Kamidu Sachith Punchihewa fa7c8e85ce Merge pull request #393 from thusithak/master
8 years ago
Kamidu Sachith Punchihewa 7666bbfd05 Merge pull request #395 from Megala21/master
8 years ago
WSO2 Builder 6a55e1be83 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 11c2e59f61 [maven-release-plugin] prepare release v1.2.4
8 years ago
Megala 3416ae78c4 Fixing the problems in displaying user list when the user names has special chracters
8 years ago
Megala 1ff86289fd Fixing the problems that happend when we have special chracters in roles
8 years ago
Megala 4ec6883ec8 Merge remote-tracking branch 'upstream/master'
8 years ago
Megala 4a71be850c Refactoring code
8 years ago
Rasika Perera b8f623e04a Supporting custom contentTypes for service invoker
8 years ago
Megala d9ec203727 Fixing EMM-1755
8 years ago
thusithakalugamage 521a30c260 Fixing modal dialog markup defects in unit
8 years ago
Megala d90d51d412 Merge remote-tracking branch 'upstream/master'
8 years ago
Megala e55b3a6d5f Fixes related to having special characters in role name
8 years ago
kamidu 39bc2e6747 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu 1af8184889 positioning modal content
8 years ago
thusithakalugamage 3aae81d9e4 resolving conflicts - removing deprecated modal related methods
8 years ago
thusithakalugamage 47ca8942b6 resolving conflicts - removing deprecated modal related methods
8 years ago
thusithakalugamage 308eeb6cf8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Megala a04f91cddb Fixing issues related to mapping users and roles from different user stores
8 years ago
Megala 87150f5074 Fixing secondary role deletion
8 years ago
Megala 2195a164e5 Merge remote-tracking branch 'upstream/master'
8 years ago
kamidu 6886233bb9 removing unnecessary   and improving styling in modal unit
8 years ago
thusithakalugamage 6667a41378 resolving conflicts
8 years ago
Megala 0756294724 Merge remote-tracking branch 'upstream/master'
8 years ago
Megala d8555c34ab Fixing issues related with roles of secondary user store
8 years ago
kamidu ed70cb02b6 Sample implimentation using the new cdmf.ui.modal unit
8 years ago
kamidu 2ea21a6fdc renaming public js to match the unit structure
8 years ago
kamidu bfc04a7f16 Fixing EMM-EMM-1753
8 years ago
Rasika Perera 790ca36443 Removed unnecessary debug log
8 years ago
Rasika Perera 135b6e8881 Fixing device view page
8 years ago
kamidu c4a0ac4bf3 Enable centralized modal handling unit for cdmf
8 years ago
kamidu 43b1a9f278 Fix for EMM-1651
8 years ago
thusithakalugamage fa3db47400 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
thusithakalugamage 48337ee16c [EMM-1618] - related improvements on remaining occurences
8 years ago
Rasika Perera 2340611a9b Removing mdm specific dependencies from CDMF
8 years ago
Milan Perera da4a558d87 Merge pull request #387 from ayyoob/st2
8 years ago
ayyoob 2f58e0ba15 added gateway mode to decide to which oauth app to use.
8 years ago
Hasitha Amal De Silva 4555819211 EMM-1726 - disable apply changes button if the priority has changed without pressing save priority button.
8 years ago
charitha e53b0c3860 Fix group count listing in dashboard
8 years ago
kamidu 8c94e83431 Fix for Jira : EMM-1682 and EMM-1653
8 years ago
kamidu 3223e29df9 Fix for EMM-1185 , EMM- 1619
8 years ago
Imesh Chandrasiri 125b827f4f Fix for modal popup overlay bug
8 years ago
Kamidu Sachith Punchihewa a8e7396589 Merge pull request #377 from DimalChandrasiri/master
8 years ago
thusithakalugamage 84a7d5517f EMM-1685] - fix and few other related improvements
8 years ago
Imesh Chandrasiri bce1d9e060 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Imesh Chandrasiri 3e4c1f9121 Parametarized datatable sorting function
8 years ago
Kamidu Sachith Punchihewa 5e6d8e667d Merge pull request #376 from thusithak/master
8 years ago
kamidu 131bcd48f9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu cc6922bfad Fix for EMM-1680
8 years ago
harshanl 4bcf350236 EMM-1678:Updated the oauth component versions
8 years ago
thusithakalugamage 1a1f79b1b4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
thusithakalugamage ac27349dae Header nav menu responsiveness improvements
8 years ago
kamidu fc902ba602 fix database extended issue
8 years ago
thusithakalugamage 909e7836ca Header nav menu responsiveness improvements
8 years ago
kamidu fc50b851bc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu 4bbb378d26 conicting solving
8 years ago
kamidu e2ee797462 Fix for EMM-1700
8 years ago
thusithakalugamage 2ae60cc415 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
thusithakalugamage 88ec5246ec [EMM-1694] - Header responsive issues fix
8 years ago
kamidu 1fe74905f2 Fix for the redirection and ui related issues
8 years ago
Imesh Chandrasiri ebad678bab Datatables serverside paging redirection bug fix
8 years ago
kamidu 8c98accd18 Fixing conflitcs
8 years ago
kamidu c6fffb0b3a Fixies for the ui issues in EMM -beta
8 years ago
Megala 0642cc10d7 Reformatting code
8 years ago
Megala f9204add08 Merge remote-tracking branch 'upstream/master'
8 years ago
Megala 42a9ba92a6 Fixing EMM-1683
8 years ago
Megala b7990b9146 Fixing problems in retriveing data from secondary user store
8 years ago
Kamidu Sachith Punchihewa c7bd0de033 Merge pull request #369 from thusithak/master
8 years ago
Dilan U. Ariyaratne 2d7506d9b8 Merge pull request #368 from amalhub/master
8 years ago
thusithakalugamage f664749c1f platform configuration style defect fixes
8 years ago
kamidu f32caf1833 UI fixes in 2.2.0-beta
8 years ago
kamidu 7898a7475c UI fixes in 2.2.0-beta
8 years ago
amalhub c87c5a8322 Fixing issue: EMM-1537
8 years ago
Rasika Perera 35c23174be Fixing android sense download issue
8 years ago
Rasika Perera 0290c710e1 Fixing enrollment url for device types
8 years ago
Megala 359bd8f317 Fixing tenant loading problem
8 years ago