Skip to content
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.

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

fix(ui): password dialog labels #153

Merged
merged 18 commits into from
May 24, 2023
Merged

Conversation

Sjmarf
Copy link
Contributor

@Sjmarf Sjmarf commented May 17, 2023

Fix the change password issue

Before:
image

After:

Screenshot 2023-05-17 at 16 49 48

No, I don't know why there's an extra 17 empty commits and I can't get rid of them lol.

Sjmarf and others added 18 commits May 13, 2023 16:04
Co-authored-by: CryptoAlgo <64193267+cryptoAlgorithm@users.noreply.github.com>
Co-authored-by: CryptoAlgo <64193267+cryptoAlgorithm@users.noreply.github.com>
Co-authored-by: CryptoAlgo <64193267+cryptoAlgorithm@users.noreply.github.com>
Co-authored-by: CryptoAlgo <64193267+cryptoAlgorithm@users.noreply.github.com>
Co-authored-by: CryptoAlgo <64193267+cryptoAlgorithm@users.noreply.github.com>
Conflicts:
	Swiftcord/Views/Message/MessageStickerView.swift
Conflicts:
	Swiftcord.xcodeproj/project.pbxproj
@cryptoAlgorithm
Copy link
Member

Nice, thanks! I'd think that you'll need to rebase your password-fix branch onto the upstream's main branch as your fork is probably outdated. Anyways, the erroneous commits aren't an issue (as this will be squash-merged anyways), I'll be merging this PR, thanks!

@cryptoAlgorithm cryptoAlgorithm changed the title Password fix fix(ui): password dialog labels May 24, 2023
@cryptoAlgorithm cryptoAlgorithm added this pull request to the merge queue May 24, 2023
Merged via the queue into SwiftcordApp:main with commit d7cb20f May 24, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants