Diffusion WriteFreely SwiftUI 555756665740

PostListView
555756665740
Actions

Description

Fix merge conflict in Shared/PostList/PostListView

Details

Provenance

Authored on Jan 11 2021, 3:52 PM

Parents

rWFSUIac98cd20301b: Merge pull request #162 from writeas/add-review-link
rWFSUIa1b3ece29406: Move bottom bar back to PostListView

Branches

Unknown

Tags

Unknown

Event Timeline

angelo committed rWFSUI555756665740: Fix merge conflict in Shared/PostList/PostListView (authored by angelo).Jan 11 2021, 3:52 PM

Merged Changes

ac98cd20301b Merge pull request #162 from writeas/add-review-link
Author
angelo
Browse Repository
No Builds
No Audits
e3ddefa769df Merge pull request #160 from writeas/add-button-accessibility-hints
Author
angelo
Browse Repository
No Builds
No Audits
86dc41c0bc3e Correct Mac version number and add beta verbiage
Author
angelo
Browse Repository
No Builds
No Audits
5a34019d4c8a Bump version and build number for Mac app
Author
angelo
Browse Repository
No Builds
No Audits
34dfc1d7e105 Merge pull request #163 from writeas/integrate-sparkle-via-spm
Author
angelo
Browse Repository
No Builds
No Audits
86d10887f48a Add troubleshooting/deploy details to technote
Author
angelo
Browse Repository
No Builds
No Audits
9f1e125a18e0 Add Sparkle to the credits doc
Author
angelo
Browse Repository
No Builds
No Audits
2b826e02236c Remove sandboxing for Sparkle compatibility
Author
angelo
Browse Repository
No Builds
No Audits
749d5235e28d Update feed URL
Author
angelo
Browse Repository
No Builds
No Audits
d08daa95af23 Add Sparkle feed URL and public key
Author
angelo
Browse Repository
No Builds
No Audits
724478a80afe Add link to write a review in the App Store
Author
angelo
Browse Repository
No Builds
No Audits
e68030ec717d Improve a11y labels on post editor menu
Author
angelo
Browse Repository
No Builds
No Audits
34c2cd181e7a Add a11y features to post editor context menu
Author
angelo
Browse Repository
No Builds
No Audits
69cd86c1da81 Prevent VO from reading the placeholder-text views
Author
angelo
Browse Repository
No Builds
No Audits
608c66e54301 Add a11y labels/hints to post editor textviews
Author
angelo
Browse Repository
No Builds
No Audits
7d99c8afc46a Add “does.not.exist” 1x1 transparent image
Author
angelo
Browse Repository
No Builds
No Audits
f9cce6c9016f Fix button-image sizing and tap target/a11y frame
Author
angelo
Browse Repository
No Builds
No Audits
555b98828290 Add a11y label/hint to remote-change prompt on macOS
Author
angelo
Browse Repository
No Builds
No Audits
03a568cfdc91 Add a11y labels/hints to post list and settings
Author
angelo
Browse Repository
No Builds
No Audits
30b3a446d7d1 Initialize Sparkle based on UserDefaults
Author
angelo
Browse Repository
No Builds
No Audits
a169265707ab Remove SUFeedURL key from Info.plist
Author
angelo
Browse Repository
No Builds
No Audits
70dfda7ea06e Improve layout of Updates/Preferences window
Author
angelo
Browse Repository
No Builds
No Audits
b05938b49732 Create an updates view for the Preferences window
Author
angelo
Browse Repository
No Builds
No Audits
fb13b9e8ab36 Add “Check For Updates” entry to app menu
Author
angelo
Browse Repository
No Builds
No Audits
4eb5d269aa16 Add dummy appcast URL to Info.plist
Author
angelo
Browse Repository
No Builds
No Audits
a9eea94d4eec Stub out basic checking for updates in AppDelegate
Author
angelo
Browse Repository
No Builds
No Audits
03df62a48cb3 Add AppDelegate stub
Author
angelo
Browse Repository
No Builds
No Audits
016e10d6b7fa Add technote on usage of Sparkle
Author
angelo
Browse Repository
No Builds
No Audits
5c50110d4e65 Add WriteFreely fork of Sparkle framework via SPM
Author
angelo
Browse Repository
No Builds
No Audits

Changes (24)

Path

Size

Shared/

Assets.xcassets/

does.not.exist.imageset/

Contents.json

does.not.exist.png

does.not.exist@2x.png

does.not.exist@3x.png

Models/

WriteFreelyModel.swift

PostEditor/

PostEditorStatusToolbarView.swift

PostList/

PostListView.swift

Resources/

Licenses/

Sparkle-License.txt

WriteFreely_MultiPlatformApp.swift

Technotes/

MacSoftwareUpdater.md

WriteFreely-MultiPlatform.xcodeproj/

project.pbxproj

xcuserdata/

angelo.xcuserdatad/

xcschemes/

xcschememanagement.plist

iOS/

PostEditor/

PostEditorView.swift

PostTextEditingView.swift

RemoteChangePromptView.swift

Settings/

SettingsHeaderView.swift

macOS/

Settings/

	macOS/	macOS.entitlements/
	WriteFreely-MultiPlatform.xcodeproj/	project.xcworkspace/	xcshareddata/


	IDEWorkspaceChecks.plist

rWFSUI555756665740

View Options

Shared/Assets.xcassets/does.not.exist.imageset/Contents.json

View Options

Shared/Assets.xcassets/does.not.exist.imageset/does.not.exist.png

View Options

Shared/Assets.xcassets/does.not.exist.imageset/does.not.exist@2x.png

View Options

Shared/Assets.xcassets/does.not.exist.imageset/does.not.exist@3x.png

View Options

Shared/Models/WriteFreelyModel.swift

View Options

Shared/PostEditor/PostEditorStatusToolbarView.swift

View Options

Shared/PostList/PostListView.swift

View Options

Shared/Resources/Licenses/Sparkle-License.txt

View Options

Shared/WriteFreely_MultiPlatformApp.swift

View Options

Technotes/MacSoftwareUpdater.md

View Options

WriteFreely-MultiPlatform.xcodeproj/project.pbxproj

View Options

WriteFreely-MultiPlatform.xcodeproj/xcuserdata/angelo.xcuserdatad/xcschemes/xcschememanagement.plist

View Options

iOS/PostEditor/PostEditorView.swift

View Options

iOS/PostEditor/PostTextEditingView.swift

View Options

iOS/PostEditor/RemoteChangePromptView.swift

View Options

iOS/Settings/SettingsHeaderView.swift

View Options

iOS/Settings/SettingsView.swift

View Options

macOS/AppDelegate.swift

View Options

macOS/Credits.rtf

View Options

macOS/Info.plist

View Options

macOS/Settings/MacAccountView.swift

View Options

macOS/Settings/MacUpdatesView.swift

View Options

Fix merge conflict in Shared/PostList/PostListView555756665740Actions

Description

Details

Event Timeline

Merged Changes

Changes (24)

rWFSUI555756665740

Shared/Assets.xcassets/does.not.exist.imageset/Contents.json

Shared/Assets.xcassets/does.not.exist.imageset/does.not.exist.png

Shared/Assets.xcassets/does.not.exist.imageset/does.not.exist@2x.png

Shared/Assets.xcassets/does.not.exist.imageset/does.not.exist@3x.png

Shared/Models/WriteFreelyModel.swift

Shared/PostEditor/PostEditorStatusToolbarView.swift

Shared/PostList/PostListView.swift

Shared/Resources/Licenses/Sparkle-License.txt

Shared/WriteFreely_MultiPlatformApp.swift

Technotes/MacSoftwareUpdater.md

WriteFreely-MultiPlatform.xcodeproj/project.pbxproj

WriteFreely-MultiPlatform.xcodeproj/xcuserdata/angelo.xcuserdatad/xcschemes/xcschememanagement.plist

iOS/PostEditor/PostEditorView.swift

iOS/PostEditor/PostTextEditingView.swift

iOS/PostEditor/RemoteChangePromptView.swift

iOS/Settings/SettingsHeaderView.swift

iOS/Settings/SettingsView.swift

macOS/AppDelegate.swift

macOS/Credits.rtf

macOS/Info.plist

macOS/Settings/MacAccountView.swift

macOS/Settings/MacUpdatesView.swift

macOS/macOS.entitlements

Fix merge conflict in Shared/PostList/PostListView
555756665740
Actions