Merge branch 'mac-candidate' of https://github.com/Ranchero-Software/NetNewsWire into mac-candidate

This commit is contained in:
Maurice Parker 2020-09-12 18:09:54 -05:00
commit 2879baf7ed
6 changed files with 18 additions and 15 deletions

View File

@ -19,6 +19,6 @@
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2019 Ranchero Software. All rights reserved.</string>
<string>Copyright © 2019-2020 Brent Simmons. All rights reserved.</string>
</dict>
</plist>

View File

@ -1,4 +1,4 @@
{\rtf1\ansi\ansicpg1252\cocoartf2511
{\rtf1\ansi\ansicpg1252\cocoartf2513
\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 LucidaGrande-Bold;\f1\fnil\fcharset0 LucidaGrande;}
{\colortbl;\red255\green255\blue255;\red0\green0\blue0;}
{\*\expandedcolortbl;;\cssrgb\c0\c0\c0\cname textColor;}
@ -18,10 +18,13 @@ By Brent Simmons\
\f0\b \cf2 Credits:
\f1\b0 \
\pard\pardeftab720\li360\sa60\partightenfactor0
\cf2 App icon and most other icons: {\field{\*\fldinst{HYPERLINK "https://twitter.com/BradEllis"}}{\fldrslt Brad Ellis}}\
Major code contributors: {\field{\*\fldinst{HYPERLINK "https://github.com/olofhellman"}}{\fldrslt Olof Hellman}}, {\field{\*\fldinst{HYPERLINK "https://github.com/vincode-io"}}{\fldrslt Maurice Parker}}, and {\field{\*\fldinst{HYPERLINK "https://github.com/danielpunkass"}}{\fldrslt Daniel Jalkut\
}}Help book by {\field{\*\fldinst{HYPERLINK "https://nostodnayr.net/"}}{\fldrslt Ryan Dotson}}\
Difficult infrastructure by {\field{\*\fldinst{HYPERLINK "https://rhonabwy.com/"}}{\fldrslt Joe Heck}}\
\cf2 Lead developer: {\field{\*\fldinst{HYPERLINK "https://github.com/vincode-io"}}{\fldrslt Maurice Parker}}\
App icon and most other icons: {\field{\*\fldinst{HYPERLINK "https://twitter.com/BradEllis"}}{\fldrslt Brad Ellis}}\
Feedly syncing: {\field{\*\fldinst{HYPERLINK "https://twitter.com/kielgillard"}}{\fldrslt Kiel Gillard}}\
Under-the-hood magic and CSS stylin\'92s: {\field{\*\fldinst{HYPERLINK "https://github.com/wevah"}}{\fldrslt Nate Weaver}}\
Newsfoot (JS footnote displayer): {\field{\*\fldinst{HYPERLINK "https://github.com/brehaut/"}}{\fldrslt Andrew Brehaut}}\
Help book: {\field{\*\fldinst{HYPERLINK "https://nostodnayr.net/"}}{\fldrslt Ryan Dotson}}\
And featuring contributions from {\field{\*\fldinst{HYPERLINK "https://github.com/danielpunkass"}}{\fldrslt Daniel Jalkut}}, {\field{\*\fldinst{HYPERLINK "https://rhonabwy.com/"}}{\fldrslt Joe Heck}}, {\field{\*\fldinst{HYPERLINK "https://github.com/olofhellman"}}{\fldrslt Olof Hellman}}, {\field{\*\fldinst{HYPERLINK "https://blog.rizwan.dev/"}}{\fldrslt Rizwan Mohamed Ibrahim}}, {\field{\*\fldinst{HYPERLINK "https://stuartbreckenridge.com/"}}{\fldrslt Stuart Breckenridge}}, {\field{\*\fldinst{HYPERLINK "https://twitter.com/philviso"}}{\fldrslt Phil Viso}}, and {\field{\*\fldinst{HYPERLINK "https://github.com/Ranchero-Software/NetNewsWire/graphs/contributors"}}{\fldrslt many more}}!\
\
\pard\pardeftab720\sa60\partightenfactor0
@ -44,5 +47,5 @@ Difficult infrastructure by {\field{\*\fldinst{HYPERLINK "https://rhonabwy.com/"
\f0\b \cf2 Dedication:\
\pard\pardeftab720\li360\sa60\partightenfactor0
\f1\b0 \cf2 NetNewsWire 5.0 is dedicated to Aaron Swartz, Derek Miller, and Alex King, who helped with earlier versions of NetNewsWire, who I miss.\
\f1\b0 \cf2 NetNewsWire 5.1 is dedicated to everyone working to save democracy around the world.\
}

View File

@ -52,7 +52,7 @@
<key>NSAppleScriptEnabled</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2002-2019 Brent Simmons. All rights reserved.</string>
<string>Copyright © 2002-2020 Brent Simmons. All rights reserved.</string>
<key>NSMainStoryboardFile</key>
<string>Main</string>
<key>NSPrincipalClass</key>
@ -60,9 +60,9 @@
<key>OSAScriptingDefinition</key>
<string>NetNewsWire.sdef</string>
<key>SUFeedURL</key>
<string>https://ranchero.com/downloads/netnewswire-5.1-beta.xml</string>
<string>https://ranchero.com/downloads/netnewswire-release.xml</string>
<key>FeedURLForTestBuilds</key>
<string>https://ranchero.com/downloads/netnewswire-5.1-beta.xml</string>
<string>https://ranchero.com/downloads/netnewswire-beta.xml</string>
<key>UserAgent</key>
<string>NetNewsWire (RSS Reader; https://ranchero.com/netnewswire/)</string>
<key>OrganizationIdentifier</key>

View File

@ -57,7 +57,7 @@
</dict>
</dict>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2019 Ranchero Software. All rights reserved.</string>
<string>Copyright © 2019-2020 Brent Simmons. All rights reserved.</string>
<key>NSHumanReadableDescription</key>
<string>This extension adds a Safari toolbar button for easily subscribing to the syndication feed for the current page.</string>
</dict>

View File

@ -50,8 +50,8 @@
</dict>
</array>
<key>SUFeedURL</key>
<string>https://ranchero.com/downloads/netnewswire-5.1-beta.xml</string>
<string>https://ranchero.com/downloads/netnewswire-release.xml</string>
<key>FeedURLForTestBuilds</key>
<string>https://ranchero.com/downloads/netnewswire-5.1-beta.xml</string>
<string>https://ranchero.com/downloads/netnewswire-beta.xml</string>
</dict>
</plist>

View File

@ -1,6 +1,6 @@
// High Level Settings common to both the Mac application and any extensions we bundle with it
MARKETING_VERSION = 5.1a2
CURRENT_PROJECT_VERSION = 3004
MARKETING_VERSION = 5.1b1
CURRENT_PROJECT_VERSION = 3005
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon