self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

macOS: Allow copy and paste from config and encryption screen

Browse Source
This commit is contained in:
Laurent Cozic 2018-02-15 18:19:00 +00:00
parent cdbb7c4b0d
commit a37b599a6b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ElectronClient/app/app.js
View File

@ -239,17 +239,17 @@ class Application extends BaseApplication {
label: _('Edit'), label: _('Edit'),
submenu: [{ submenu: [{
label: _('Copy'), label: _('Copy'),
screens: ['Main', 'OneDriveLogin'], screens: ['Main', 'OneDriveLogin', 'Config', 'EncryptionConfig'],
role: 'copy', role: 'copy',
accelerator: 'CommandOrControl+C', accelerator: 'CommandOrControl+C',
}, { }, {
label: _('Cut'), label: _('Cut'),
screens: ['Main', 'OneDriveLogin'], screens: ['Main', 'OneDriveLogin', 'Config', 'EncryptionConfig'],
role: 'cut', role: 'cut',
accelerator: 'CommandOrControl+X', accelerator: 'CommandOrControl+X',
}, { }, {
label: _('Paste'), label: _('Paste'),
screens: ['Main', 'OneDriveLogin'], screens: ['Main', 'OneDriveLogin', 'Config', 'EncryptionConfig'],
role: 'paste', role: 'paste',
accelerator: 'CommandOrControl+V', accelerator: 'CommandOrControl+V',
}, { }, {

4
ReactNativeClient/ios/Joplin/Info.plist
View File

@ -17,11 +17,11 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.0.11</string> <string>1.0.12</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>11</string> <string>12</string>
<key>LSRequiresIPhoneOS</key> <key>LSRequiresIPhoneOS</key>
<true/> <true/>
<key>NSAppTransportSecurity</key> <key>NSAppTransportSecurity</key>