2311 Commits

Author SHA1 Message Date
Jeremy Beker
97585326c8
Merge branch 'master' into google_reader_compatible_syncing
# Conflicts:
#	iOS/Settings/SettingsAddAccountView.swift
2019-06-18 15:38:59 -04:00
Jeremy Beker
76c09f5eac
Merge branch 'upstream/master' 2019-06-18 15:37:56 -04:00
Jeremy Beker
596e9c4537
Use proper google credential. 2019-06-18 15:37:39 -04:00
Maurice C Parker
231011685c Remove deprecated API use 2019-06-17 18:26:37 -05:00
Maurice C Parker
db5f487730 Update RSParser to remove simulator architecture warning. Issue #685 2019-06-17 18:20:48 -05:00
Maurice C Parker
e6b8056402 Merge remote-tracking branch 'refs/remotes/origin/master' 2019-06-17 17:49:41 -05:00
Maurice C Parker
011a93a41f Update to work with the latest SwiftUI API's 2019-06-17 17:48:32 -05:00
Maurice Parker
35866d558d Only display active accounts for OPML import on iOS 2019-06-17 15:50:17 -05:00
Maurice Parker
e5f06a4217
Update README.md
Fixed link to contributing page in README.
2019-06-17 09:08:09 -05:00
Maurice Parker
0e5169854e Update branching strategy with new tagging methodology. 2019-06-17 09:06:37 -05:00
Maurice Parker
c966d3c7ed Begin work on porting the add feed/folder dialog to SwiftUI 2019-06-17 09:03:21 -05:00
Maurice Parker
fb29d006aa Code formatting changes 2019-06-17 07:20:39 -05:00
Jeremy Beker
125ea59cd6
Wiring up iOS add account settings 2019-06-16 18:22:00 -04:00
Jeremy Beker
19395779c8
Change label from email -> login 2019-06-16 15:21:35 -04:00
Jeremy Beker
42203c0170
FIrst pass at OPML import. Broken. 2019-06-16 15:14:20 -04:00
Jeremy Beker
a6e0cae377
Merge branch 'master' into google_reader_compatible_syncing 2019-06-16 13:16:03 -04:00
Jeremy Beker
79c40ddd2d
Merge branch 'upstream/master' 2019-06-16 13:15:50 -04:00
Jeremy Beker
adf53add3a
removed unused page number function. 2019-06-16 13:15:36 -04:00
Jeremy Beker
17439c8c5e
Disbale and rename tags functional. 2019-06-16 13:14:23 -04:00
Maurice Parker
d4e2d44d8f Add OPML Export for SwiftUI 2019-06-16 11:19:15 -05:00
Maurice Parker
3af60f0edc Add Import OPML functionality 2019-06-16 10:54:18 -05:00
Maurice Parker
b8b2f23333 Move SafariView to Wrappers group since it is a reusable SwiftUI View 2019-06-16 10:21:03 -05:00
Maurice Parker
8cb46eb1d3 Merge branch 'pr/757' 2019-06-16 07:03:06 -05:00
Brent Simmons
991c148494 Update version to 5.0a4. 2019-06-15 17:02:42 -07:00
Stuart Breckenridge
2f4d1145f4 Opens Settings option in SFSafariViewController
Fixes #754
Fixes #756
2019-06-16 07:23:32 +08:00
Stuart Breckenridge
4887fb7f5e
Merge pull request #2 from brentsimmons/master
Syncing with
2019-06-16 07:19:23 +08:00
Maurice Parker
dc75737c97 Add Import/Export OPML action sheet. 2019-06-15 18:19:20 -05:00
Maurice Parker
8dcf4966fb Port Feedbin credential update too SwfitUI. 2019-06-15 16:03:41 -05:00
Jeremy Beker
41af536212
Rename feeds 2019-06-15 16:13:08 -04:00
Jeremy Beker
62afd312f0
Subscribing and loading initial articles functioning. 2019-06-15 15:46:13 -04:00
Jeremy Beker
b2bc941d2d
Move back to official submodule 2019-06-15 13:40:12 -04:00
Jeremy Beker
029bcbda96
Merge cleanup. 2019-06-15 13:30:12 -04:00
Jeremy Beker
baf14f7379
submodules 2019-06-15 12:35:04 -04:00
Jeremy Beker
f54bc3569b
Merge branch 'master' into google_reader_compatible_syncing
# Conflicts:
#	Frameworks/Account/Account.swift
#	submodules/RSWeb
2019-06-15 12:34:50 -04:00
Jeremy Beker
ce703fd947
Merge branch 'upstream/master' 2019-06-15 12:33:00 -04:00
Jeremy Beker
e5eb8df333
Add feed working on backend, thread crash inside account code. 2019-06-15 12:27:21 -04:00
Jeremy Beker
5490dac86d
Need to use rawValue to properly mark starred/read 2019-06-15 08:21:13 -04:00
Maurice Parker
83be0e5d97
Merge pull request #755 from mz2/readme-contributing
Fixes the link to CONTRIBUTING.md
2019-06-14 19:25:19 -05:00
Matias Piipari
17cbf24928
Fixes the link to CONTRIBUTING.md
The link to CONTRIBUTING.md was cased incorrectly and therefore 404'd.
2019-06-15 01:12:17 +01:00
Stuart Breckenridge
9493fe6b70
Merge pull request #1 from brentsimmons/master
Syncing with original
2019-06-15 06:55:39 +08:00
Brent Simmons
b30ab72825 Add link from README to How to Support NetNewsWire. 2019-06-14 14:27:16 -07:00
Brent Simmons
c092b91349 Merge branch 'master' of https://github.com/brentsimmons/NetNewsWire 2019-06-14 14:07:58 -07:00
Brent Simmons
3d49f4fa46 Add technote on How to Support NetNewsWire. 2019-06-14 14:07:53 -07:00
Maurice Parker
7929371120
Update README.md
Added some formatting to recently added items.
2019-06-13 15:56:44 -05:00
Maurice Parker
58459631e4 Add SwiftUI account detail view 2019-06-13 14:30:56 -05:00
Jeremy Beker
2128afd465
Refactor endpoints into an enum 2019-06-13 12:44:20 -04:00
Maurice Parker
2c3adbb04e Made the icon a little larger this time to match the README heading size 2019-06-13 10:41:27 -05:00
Maurice Parker
44ba3d9c39 Made the icon a little smaller to match the README heading size 2019-06-13 10:38:17 -05:00
Maurice Parker
c7e0f55342 adjusted icon size 2019-06-13 10:26:03 -05:00
Maurice Parker
de552a6441 Merge branch 'master' of https://github.com/brentsimmons/NetNewsWire 2019-06-13 10:23:56 -05:00