Skip to content

Merge release 4.32 into trunk #1169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 107 commits into from
Feb 25, 2021
Merged

Merge release 4.32 into trunk #1169

merged 107 commits into from
Feb 25, 2021

Conversation

mokagio
Copy link
Contributor

@mokagio mokagio commented Feb 23, 2021 •
edited
Loading

Leaving this as a draft till we actually release it. Still, I'd appreciate a review anyway.

Thanks 🙇‍♂️ .

charliescheer and others added 30 commits January 21, 2021 15:54
@charliescheer
Removed italic styling from Title label in SubtitleTableViewCell
8829c89
@charliescheer
Added Document localized label constant
878e24c
@charliescheer
Hid informationView title and dismiss button on iPhone
bf95f91
@charliescheer
Added reference count to note information sheet
08f275e
@charliescheer
Change information sheet title to Document
39e6627
@charliescheer
Removed the edge line at for the last children in information VC
173d90e
@charliescheer
Added drag bar to Information sheet
479f3cb
@charliescheer
Changed dragBar to not appear if device is iPad
1168451
@eshurakov
Navigation helpers for table view
d2b389b
@eshurakov
Add UIKeyCommand helper
47603b0
@eshurakov
Add keyboard navigation to note list
684eda5
@eshurakov
Add new note shortcut to note list
04031fb
@eshurakov
Keyboard support for sidebar
ec0ebd5
@eshurakov
Move search and new note shortcuts to sidebar container
0263080
@eshurakov
Remove unused code
9b714fe
@eshurakov
Add shortcuts to the note editor
1b5d69b
@charliescheer
Created SPDragBar class and file
9aebae8
@charliescheer
Changed creation of drag bar in the info sheet to use SPDragBar class
51e2724
@charliescheer
Updated drag bar in info sheet to be inserted into the stackview
d4808da
@charliescheer
added SPDragbar to xcode project
f565f50
@charliescheer
add drag bar to XIB for information sheet
0b8fc6a
@charliescheer
Changed configureDragBar setup info sheet drag bar if not in a popover
bf611d3
@charliescheer
Add localization to singular/plural references in interlink list
711c52b
@charliescheer
Removed localization for string Information
a0025b8
@charliescheer
Removed headStackView on Information VC when viewed on iPad
0a1b67d
@charliescheer
Added localization to interlink references
790e289
@eshurakov
Create note editor only from note list
a7bb3a2
@loremattei
Merge pull request #1112 from Automattic/release/4.31
8eb734e 
Merge release 4.31 beta 1 into develop
@eshurakov
Save selection on note list when using keyboard
37f69d9
@eshurakov
Support RTL for keyboard navigation
2c37538
jkmassel and others added 18 commits February 16, 2021 12:14
@jkmassel
Merge pull request #1156 from Automattic/fix/4.32-release-branch
ddf340a 
Fix bundler on the 4.32 release branch
@eshurakov
Merge pull request #1153 from Automattic/issue/1151-fix-kbd-nav-in-se…
4d7bbde 
…arch-bar

Fix keyboard navigation in search bar
@mokagio
Updates translation
b67540f
@mokagio
Updates metadata translation
ecf3ebf
@mokagio
Bump version number
a53846a
@mokagio
Update secrets
ed379bb 
Done via `bundle exec fastlane run configure_update`.
@mokagio
Update secrets (#1162)
736fc12
@mokagio
Update encoded SPCredentials
f66532d 
Internal reference p2XJRt-2L0#comment-5211.

Done via `bundle exec fastlane run configure_update`.
@mokagio
Update encoded SPCredentials (#1166)
ec19a0d
@mokagio
Update Entitlement name (template_name) for Simplenote App Store
b8329dc 
After regenerating the keys and/or updating Fastlane, the existing name
which didn't include the "(Distribution)" suffix appearing on the App
Store didn't work anymore.
@mokagio
Updates translation
79145a5
@mokagio
Updates metadata translation
27195e7
@mokagio
Updates translation
225f368
@mokagio
Bump version number
8d55d81
@mokagio
Trim ar-SA keywords to comply with the 100 characters ASC limit
c40da17
@mokagio
Update secrets
7a53279 
Internal ref paaHJt-1Qj
@mokagio
Update secrets
e19746b 
Done via `bundle exec fastlane run cofigure_update`.

Internal ref paaHJt-1Qj.
@mokagio
Merge branch 'release/4.32'
5ab6d6b
@peril-automattic
Copy link

peril-automattic bot commented Feb 23, 2021 •
edited
Loading

Messages
📖 This PR has the 'Releases' label: some checks will be skipped.

Generated by 🚫 dangerJS

@mokagio mokagio requested a review from a team February 23, 2021 10:23
@mokagio mokagio self-assigned this Feb 23, 2021
@mokagio mokagio marked this pull request as ready for review February 23, 2021 12:00
jkmassel
jkmassel reviewed Feb 23, 2021
View reviewed changes
Copy link
Contributor

@jkmassel jkmassel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also looks fine but it seems odd that the release build isn't running / being reported?

@loremattei
Copy link
Contributor

TBH, it seems odd that the release build job is listed here 🤔
The HEAD of the branch is not on the tag (which is on 8d55d81), but on the merge commit, so I expected that the release build job was not listed 🤷‍♂️

jleandroperez
jleandroperez approved these changes Feb 24, 2021
View reviewed changes
Copy link
Contributor

@jleandroperez jleandroperez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure what's going on with the CI, buuut the changes look good!!

:shipit:

@mokagio
Copy link
Contributor Author

mokagio commented Feb 25, 2021 •
edited
Loading

@jkmassel @loremattei I think Lore's spot on. Thanks Lore, I've been thinking about this for a few releases, never understood what was going on but never seemed important enough to spend time digging into it.

My guess is that I had a brain fart when creating the branch rule during the master -> main -> trunk migration and picked the release build CI job from the list of checks as a required one

image

I've removed it now.

@mokagio
Copy link
Contributor Author

mokagio commented Feb 25, 2021

This has now been published on the Store: Marking it "Ready for Review" and merging it.

@mokagio mokagio merged commit f5deea2 into trunk Feb 25, 2021
@mokagio mokagio deleted the merge/release-4.32-into-trunk branch February 25, 2021 04:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jkmassel jkmassel jkmassel left review comments

@jleandroperez jleandroperez jleandroperez approved these changes

Assignees

@mokagio mokagio

Labels
Releases
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@mokagio @loremattei @jkmassel @jleandroperez @charliescheer @eshurakov @AliSoftware