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.

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

[WIP] #106 changed redo from ctrl+y to ctrl+shift+z #111

Merged
merged 3 commits into from
Jun 10, 2022
Merged

[WIP] #106 changed redo from ctrl+y to ctrl+shift+z #111

merged 3 commits into from
Jun 10, 2022

Conversation

deShortOne
Copy link
Contributor

Don't have access to mac so WIP and will need to be tested

@deShortOne deShortOne marked this pull request as ready for review June 5, 2022 14:14
@charlestian23
Copy link
Collaborator

Does this change also update instances of text stating the shortcut in the menus? For example, here:
image

@deShortOne
Copy link
Contributor Author

Hi, yes it does change it.
image

@Chase-Grajeda
Copy link
Collaborator

Chase-Grajeda commented Jun 6, 2022 •
edited
Loading

Closing pull request. I've tested the changes and they work, however this merge is going straight into master. Please create a new branch under dev, make the same edits, then request another merge from new branch -> dev

On creating new branches and making merge requests, please see the corresponding sections in the attached wiki
https://github.com/Bram-Hub/Legup/wiki/Programming-Principles

@deShortOne
Copy link
Contributor Author

Sorry about merging it incorrectly, if possible, could you put it in a contributing.md for future people?

@charlestian23
Copy link
Collaborator

Sorry about merging it incorrectly, if possible, could you put it in a contributing.md for future people?

Will do, I'll make one tomorrow.

@charlestian23 charlestian23 mentioned this pull request Jun 6, 2022
Closed
@charlestian23 charlestian23 reopened this Jun 10, 2022
@charlestian23 charlestian23 changed the base branch from master to dev June 10, 2022 04:52
@charlestian23 charlestian23 self-requested a review June 10, 2022 04:53
@charlestian23 charlestian23 self-assigned this Jun 10, 2022
@charlestian23 charlestian23 merged commit 765ef0a into Bram-Hub:dev Jun 10, 2022
RPIFisherman added a commit that referenced this pull request Jun 10, 2022
@RPIFisherman
Revert "Merge pull request #111 from deShortOne/master"
15ea671 
This reverts commit 765ef0a, reversing
changes made to 91c88c6.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@charlestian23 charlestian23 charlestian23 approved these changes

@Chase-Grajeda Chase-Grajeda Awaiting requested review from Chase-Grajeda

Assignees

@charlestian23 charlestian23

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@deShortOne @charlestian23 @Chase-Grajeda