Merge pull request #306 from Yubico/release/1.2.4

Update NEWS, version and add new images
Yubico · Oct 26, 2021 · bcb5c65 · bcb5c65
2 parents e5468fe + f5f83ba
commit bcb5c65
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 4 deletions.
diff --git a/NEWS b/NEWS
@@ -1,3 +1,7 @@
+* Version 1.2.4 (released 2021-10-26)
+ ** Update device names and images.
+ ** PIV: Fix import of certificate.
+
 * Version 1.2.3b (released 2021-08-23)
  ** Linux AppImage: Added option to run ykman CLI
 

diff --git a/requirements.txt b/requirements.txt
@@ -1 +1 @@
-yubikey-manager==4.0.3
+yubikey-manager==4.0.7
diff --git a/ykman-gui/images/skycnfc.png b/ykman-gui/images/skycnfc.png
diff --git a/ykman-gui/images/[email protected] b/ykman-gui/images/[email protected]
diff --git a/ykman-gui/images/ykbioa.png b/ykman-gui/images/ykbioa.png
diff --git a/ykman-gui/images/[email protected] b/ykman-gui/images/[email protected]
diff --git a/ykman-gui/images/ykbioc.png b/ykman-gui/images/ykbioc.png
diff --git a/ykman-gui/images/[email protected] b/ykman-gui/images/[email protected]
diff --git a/ykman-gui/qml/images.js b/ykman-gui/qml/images.js
@@ -7,6 +7,7 @@ var _images_for_name = {
  'FIDO U2F Security Key': 'sky1',
  'Security Key by Yubico': 'sky2',
  'Security Key NFC': 'sky3',
+ 'Security Key C NFC': 'skycnfc',
  'YubiKey NEO': 'neo',
  'YubiKey Standard': 'standard',
 };

diff --git a/ykman-gui/ykman-gui.pro b/ykman-gui/ykman-gui.pro
@@ -5,12 +5,12 @@ SOURCES += main.cpp
 
 # This is the internal verson number, Windows requires 4 digits.
 win32|win64 {
- VERSION = 1.2.3.0
+ VERSION = 1.2.4.0
 } else {
- VERSION = 1.2.3
+ VERSION = 1.2.4
 }
 # This is the version shown on the About page
-DEFINES += APP_VERSION=\\\"1.2.3\\\"
+DEFINES += APP_VERSION=\\\"1.2.4\\\"
 
 message(Version of this build: $$VERSION)