Commit Graph

9 Commits

Author SHA1 Message Date
Phil Viso 8a6e3c9f37 Merge branch 'master' of https://github.com/brentsimmons/NetNewsWire into GroupArticlesByFeed
# Conflicts:
#	Mac/MainWindow/Timeline/TimelineViewController.swift
2019-09-13 08:23:31 -05:00
Phil Viso 269364a337 Re-worked sorting logic to handle multiple feeds having the same name 2019-09-13 07:43:28 -05:00
Brent Simmons 2eccfbb90e Merge branch 'mac-release' 2019-09-08 21:44:28 -07:00
Brent Simmons 41c82eca15 Rename existingFeed(with:) to existingFeed(withFeedID:) to make it more clear. Make account.idToFeedDictionary private — callers should use existingFeed(withFeedID:). 2019-09-08 21:44:05 -07:00
Phil Viso 00e009a82c Added ability to group sorted articles by feed 2019-09-08 16:48:50 -05:00
Brent Simmons ecc8854f59 Merge mac-release. 2019-09-07 20:59:19 -07:00
Brent Simmons 5b15285e8e Make sure that article.preferredLink doesn’t return an empty string. 2019-09-07 18:27:48 -07:00
Maurice Parker 5b1c0485c5 Add NSUserActivity for reading articles 2019-08-24 14:57:51 -05:00
Brent Simmons 70312aa75c Major folder and project tree restructuring. 2019-04-13 16:18:54 -07:00