Merge branch 'master' into group-feature

2026-04-26 02:35:25 +02:00 · 2020-01-24 10:47:35 +01:00
parent 36f227aae1 12b5b057f3
commit 1dd9f45f06
26 changed files with 803 additions and 47 deletions
--- a/res/app/device-list/column/device-column-service.js
+++ b/res/app/device-list/column/device-column-service.js
@@ -229,6 +229,12 @@ module.exports = function DeviceColumnService($filter, gettext, SettingsService,
        return device.manufacturer || ''
      }
    })
+  , marketName: TextCell({
+    title: gettext('Market name')
+    , value: function(device) {
+      return device.marketName || ''
+    }
+  })
  , sdk: NumberCell({
      title: gettext('SDK')
    , defaultOrder: 'desc'