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

Normacos update #3141

Merged
merged 26 commits into from
Jun 7, 2018
Merged

Normacos update #3141

merged 26 commits into from
Jun 7, 2018

Commits on Jan 9, 2018

  1. Cheers let's split keymap

    @jorge-porras
    jorge-porras committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    f018784 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/qmk/qmk_firmware

    @jorge-porras
    jorge-porras committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    acd034e View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2018

  1. fixed typo on norman layer of cheers keymap for let's split

    @jorge-porras
    jorge-porras committed Feb 13, 2018
    Configuration menu
    Copy the full SHA
    9f2b52f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/qmk/qmk_firmware

    @jorge-porras
    jorge-porras committed Feb 13, 2018
    Configuration menu
    Copy the full SHA
    b080986 View commit details
    Browse the repository at this point in the history

  3. fixed right handed mappings for home row

    @jorge-porras
    jorge-porras committed Feb 13, 2018
    Configuration menu
    Copy the full SHA
    7ab661a View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2018

  1. cheers keymap for let's split redefinition

    @jorge-porras
    jorge-porras committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    cab7437 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2018

  1. updated Cheers keymap for let's split

    @jorge-porras
    jorge-porras committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    b7d5eb6 View commit details
    Browse the repository at this point in the history

  2. cheers keymap for let's split updated with some terminal macros

    @jorge-porras
    jorge-porras committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    6da1dce View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2018

  1. renamed cheers let's split keymap to a more appropriate normacos

    @jorge-porras
    jorge-porras committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    5005a2d View commit details
    Browse the repository at this point in the history

  2. updated normacos keymap doc / removed non functional keys

    @jorge-porras
    jorge-porras committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    611e1ff View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master'

    @jorge-porras
    jorge-porras committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    e5065b9 View commit details
    Browse the repository at this point in the history

  4. reset let's split rules to default values

    @jorge-porras
    jorge-porras committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    bddf64e View commit details
    Browse the repository at this point in the history

  5. added more spotlight search macros

    @jorge-porras
    jorge-porras committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    6d99ac1 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1 from ArrogantBeggar/normacos 

    added more spotlight search macros
    @ArrogantBeggar
    ArrogantBeggar authored Apr 6, 2018
    Configuration menu
    Copy the full SHA
    e695155 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/qmk/qmk_firmware

    @jorge-porras
    jorge-porras committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    1180be6 View commit details
    Browse the repository at this point in the history

  8. normalized keymap comments

    @jorge-porras
    jorge-porras committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    a4383c7 View commit details
    Browse the repository at this point in the history

  9. Moved numpad on lower layer

    @ArrogantBeggar
    ArrogantBeggar committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    3f9c9db View commit details
    Browse the repository at this point in the history

  10. Merge pull request #2 from ArrogantBeggar/normacos 

    Normacos
    @ArrogantBeggar
    ArrogantBeggar authored Apr 6, 2018
    Configuration menu
    Copy the full SHA
    99b5372 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2018

  1. fixed normacos for let's split merge conflicts to use latest QMK changes

    @ArrogantBeggar
    ArrogantBeggar committed Jun 4, 2018
    Configuration menu
    Copy the full SHA
    9d9c826 View commit details
    Browse the repository at this point in the history

  2. updated normacos layout and fixed some readme typos

    @ArrogantBeggar
    ArrogantBeggar committed Jun 4, 2018
    Configuration menu
    Copy the full SHA
    b0774ad View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2018

  1. Merge branch 'master' of https://github.com/qmk/qmk_firmware

    @ArrogantBeggar
    ArrogantBeggar committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    fdd3ee9 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into normacos

    @ArrogantBeggar
    ArrogantBeggar committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    f640f77 View commit details
    Browse the repository at this point in the history

  3. removed leftover merge diff

    @ArrogantBeggar
    ArrogantBeggar committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    dc82212 View commit details
    Browse the repository at this point in the history

  4. added waits to macros that make use of SEND_STRING

    @ArrogantBeggar
    ArrogantBeggar committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    0d8bdbc View commit details
    Browse the repository at this point in the history

  5. fixed wrong waits on macros that use SEND_STRING

    @ArrogantBeggar
    ArrogantBeggar committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    1470b68 View commit details
    Browse the repository at this point in the history

  6. normalized macro comments after adding waits

    @ArrogantBeggar
    ArrogantBeggar committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    768f87a View commit details
    Browse the repository at this point in the history