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 menu on change keyboard language issue #4345 #4623

Merged
merged 2 commits into from Sep 7, 2017

Conversation

@MurzNN
Copy link
Contributor

MurzNN commented Jul 18, 2017

Fix activating menu when changing keyboard language / layout via Alt-Shift, Alt-Ctrl, Alt-CapsLock, and Alt-Space on issue #4345

Fix activating menu when changing keyboard language / layout  via Alt-Shift, Alt-Ctrl, Alt-CapsLock, and Alt-Space
@t3chguy

This comment has been minimized.

Copy link
Collaborator

t3chguy commented Jul 18, 2017

  1. Needs sign off
  2. Please merge develop back into this, the branch is too old and has old testing stuff which is making it fail

Apart from that and testing, looks good :)

@MurzNN MurzNN changed the base branch from master to develop Jul 18, 2017
@MurzNN

This comment has been minimized.

Copy link
Contributor Author

MurzNN commented Jul 18, 2017

I change base to develop, this is my first pull request in Github :) hope now I do all right.

@t3chguy

This comment has been minimized.

Copy link
Collaborator

t3chguy commented Jul 18, 2017

you need to clone it locally,

git remote add upstream https://github.com/vector-im/riot-web
git fetch upstream
git checkout patch-1
git pull upstream develop
git push

You also need to look at https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.rst#sign-off

@lukebarnard1

This comment has been minimized.

Copy link
Contributor

lukebarnard1 commented Aug 10, 2017

@MurzNN please read the contributing readme and do a sign-off. Also, this PR might not fix the issue entirely according to #4345 (comment)

@MurzNN

This comment has been minimized.

Copy link
Contributor Author

MurzNN commented Aug 24, 2017

Signed-off-by: Alexey Korepov MurzNN@gmail.com
this comment is enough for sign-off?

About #4345 (comment) - it is local problem, not in Riot side.

Sorry for stupid questions, but I can't understand how to do git checkout patch-1

error: pathspec 'patch-1' did not match any file(s) known to git.

After git fetch upstream I see that my patch is already applied to source in my local copy, but I don't see that it is applied in develop branch.

@t3chguy

This comment has been minimized.

Copy link
Collaborator

t3chguy commented Aug 24, 2017

I guess I'll do it...

@dbkr

This comment has been minimized.

Copy link
Member

dbkr commented Sep 7, 2017

What this actually does is add accelerators to the menus, although beyond it being a Windows convention, the only reference I've found to it being a thing in electron is electron/electron#9584

Anyway, I'm happy for our menus to have accelerators on them and it also fixes a bug for reasons we don't understand, great...

@dbkr dbkr merged commit 941f925 into vector-im:develop Sep 7, 2017
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.