Commit Graph

669 Commits (d206148841afa2554a7a30b40e4d7bb0a6b6d785)

Author SHA1 Message Date
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
Megala e8eb0123c7 Fixing the tenant loading problem when sso is enabled
8 years ago
amalhub 8b4649b4e5 Fixing issue: EMM-1537
8 years ago
Megala a0586ca977 Adding comment
8 years ago
Megala e5870e1306 Fixing the problem of common log out
8 years ago
Megala b10c323582 Fixing the problem in login
8 years ago
Megala bacd7ccfd2 Merge remote-tracking branch 'upstream/master'
8 years ago
Megala 4af2a37d9d Fixing SSO problem
8 years ago
kamidu 5595100cc2 UI fixes in role and policy management
8 years ago
Chatura Dilan Perera c16cc4cae1 [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera ed4bca7032 [maven-release-plugin] prepare release v1.2.2
8 years ago
Rasika Perera b2eb715fb7 REsolving conflicts
8 years ago
Rasika Perera 5c8c28d28c Merge pull request #1 from warunalakshitha/master
8 years ago
Rasika Perera b2f31be1d6 Fixing iot operation bar not listing operations
8 years ago
dilanua 7596f7876d Improving device view info.retrieval - UI
8 years ago
Rasika Perera 6d4ddf7b54 Removed info log on view device
8 years ago
Rasika Perera 1bae3d2213 Fixing policy retrieve api
8 years ago
Rasika Perera 99fee36f2c Fixing error when properties is null
8 years ago
kamidu 1a9ca2d59e Fix for Jira issue: EMM-1635
8 years ago
Rasika Perera 12c8483b4b Changes to devices policy
8 years ago
kamidu 174555b387 Fix for EMM-1627
8 years ago
Rasika Perera 056f6d2f4e Adding proper error message when no device type is avaialble
8 years ago
Imesh Chandrasiri de63beaaa6 Roles listing icon resize fix
8 years ago
Imesh Chandrasiri 5e7d3a00ad Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
dilanua 8232bf7484 FIX for JIRAS: https://wso2.org/jira/browse/EMM-1633
8 years ago
Imesh Chandrasiri 5954fd9070 EMM-1595 : Fixing Icon of Users get enlarged when sorting by user name in List Mode
8 years ago
Imesh Chandrasiri 2c0df21491 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Rasika Perera 56a81e431c Removed extra license headers
8 years ago
Rasika Perera 6bfe166b5d Correcting appContext=>@app.context, self.publicUri=>@unit.publicUri/@page.publicUri, currentUser.username=>@user.username
8 years ago
Rasika Perera 54c518a4fd Making datatables-extended to get context path from global js variable
8 years ago
Rasika Perera 77720dd61a Fixing devices listing page styling issue.
8 years ago
Rasika Perera 1bef7a38ef Minor style fix for wr-hidden-operations
8 years ago
kamidu 225268bd78 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu 0ab9db2afd Fix for EMM-1575
8 years ago
dilanua 378dd4084c FIX for JIRAS: https://wso2.org/jira/browse/EMM-1591,EMM-1590,EMM-1585
8 years ago
Rasika Perera 4c4eba93d8 Returning correct representation of the device to template.
8 years ago
Rasika Perera cef865f53a Parsing deviceType configs with %https.ip% and %http.ip%
8 years ago
Rasika Perera f2af4bd078 Fixing undefined exception when device properties not available
8 years ago
Rasika Perera ccf4b6492c Fixing devices listing issue
8 years ago
Rasika Perera 3e2731a772 Fixing invoker service return nothing on httpClient requests.
8 years ago
dilanua ebead1249c Fix for jira: https://wso2.org/jira/browse/EMM-1617
8 years ago
dilanua 87a03e8312 Fix for jira: https://wso2.org/jira/browse/EMM-1617
8 years ago
dilanua 71424c4bb7 Fix for JIRA: https://wso2.org/jira/browse/EMM-1613
8 years ago
dilanua a4b39f92e5 Fix for JIRA: https://wso2.org/jira/browse/EMM-1593
8 years ago
dilanua 92aa413773 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua f7a38b2313 Fix for JIRA: https://wso2.org/jira/browse/EMM-1612
8 years ago
Rasika Perera 98ab29fe94 Fixing virtual firealarm device agent download
8 years ago
Rasika Perera eb5a36ef42 Supporting stream download on service invoker
8 years ago
Rasika Perera 4691bedbc5 Fixes to devices listing
8 years ago
Rasika Perera 1d3f5f39a7 Adding custom headers support to invoker util
8 years ago
Imesh Chandrasiri f8b08849cd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Imesh Chandrasiri 3d5b6cd89f Removing unwanted url params from datatable serverside search
8 years ago
Rasika Perera 513015c1b5 Changing context path /emm into /devicemgt on cdmf base app
8 years ago
Rasika Perera 0fb87f3aa2 Fixing device types not shown issue
8 years ago
Rasika Perera 9148c3baea Fixing dashboard styling issues
8 years ago
Chatura Dilan Perera 7395c76408 Merge branch 'master' of github.com:wso2/carbon-device-mgt
8 years ago
dilanua 81c684be50 Refactoring user-menu - UI
8 years ago
dilanua d8e057abdd Fix for JIRA: https://wso2.org/jira/browse/EMM-1582
8 years ago