summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #729 from joarau/masterErez Zukerman2016-09-066-0/+420
|\
| * norwegian programmer-friendly layoutjoar2016-09-066-0/+420
|/
* Merge pull request #728 from fitzsim/yoruianErez Zukerman2016-09-066-0/+277
|\
| * Fix ergodox_yoruian XKB namingThomas Fitzsimmons2016-09-062-2/+2
| * Add new ErgoDox EZ keymap, YORUIANThomas Fitzsimmons2016-09-056-0/+277
* | Merge pull request #686 from coderkun/coderkun_neo2Erez Zukerman2016-09-052-7/+19
|\ \
| * | Add box-drawing Unicode characters to keymap “coderkun_neo2”coderkun2016-08-261-6/+6
| * | Set Unicode input mode and override unicode_input_start() method to keymap ...coderkun2016-08-261-2/+14
| * | Disable debugging for Ergodox keymap “coderkun_neo2”coderkun2016-08-262-1/+1
* | | Merge pull request #678 from algernon/ergodox-ez/algernonErez Zukerman2016-09-058-523/+552
|\ \ \ | |_|/ |/| |
| * | ergodox: Update algernon's keymap to v1.6Gergely Nagy2016-08-248-523/+552
* | | Merge pull request #724 from sgoodwin/masterJack Humbert2016-09-053-0/+268
|\ \ \
| * | | Add my keymap.Samuel Ryan Goodwin2016-09-053-0/+268
* | | | Merge pull request #722 from fredizzimo/fix_always_linkingJack Humbert2016-09-051-2/+4
|\ \ \ \
| * | | | Fix the ldflags.txt and obj.txt checksFred Sundvik2016-09-041-2/+4
* | | | | Merge pull request #719 from IBNobody/masterJack Humbert2016-09-053-221/+319
|\ \ \ \ \
| * \ \ \ \ Merge pull request #4 from IBNobody/update_atomic_planck_pvc_keymapsIBNobody2016-09-042-199/+238
| |\ \ \ \ \
| | * | | | | Added diagonal mice macros, breathing ala AtomicIBNobody2016-09-042-199/+238
| |/ / / / /
| * | | | | Moved breathing backlighting section in readme.mdIBNobody2016-09-031-60/+60
| * | | | | Updated doc to contain breathing information.IBNobody2016-09-031-29/+144
| * | | | | Updated readme to have better backlight breathing info.IBNobody2016-09-031-160/+104
| * | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-09-0310-22/+443
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-08-28238-10423/+14343
| |\ \ \ \ \ | | | |/ / / | | |/| | |
* | | | | | Merge pull request #716 from MajorKoos/masterJack Humbert2016-09-057-0/+474
|\ \ \ \ \ \
| * | | | | | Add rules.mk fileMajor Koos2016-09-021-0/+69
| * | | | | | Add support for JD40 MKII PCBMajor Koos2016-09-026-0/+405
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #711 from hot-leaf-juice/masterJack Humbert2016-09-052-19/+27
|\ \ \ \ \ \
| * | | | | | fixed incorrect key combination for locking screen on macOSCallum Oakley2016-09-022-5/+5
| * | | | | | changed some of the wording in the readmeCallum Oakley2016-09-011-4/+4
| * | | | | | changed order of modifiers after experimentation, updated readmeCallum Oakley2016-09-012-12/+7
| * | | | | | Merge remote-tracking branch 'upstream/master'Callum Oakley2016-09-01441-13735/+31253
| |\| | | | |
| * | | | | | added a lock screen keyCallum Oakley2016-08-121-3/+16
| * | | | | | Merge remote-tracking branch 'upstream/master'Callum Oakley2016-08-09274-2508/+5133
| |\ \ \ \ \ \
| * | | | | | | updated readme.md to reflect keymap changesCallum Oakley2016-08-091-2/+2
| * | | | | | | changed order of bottom row of symbol layer to ease acess to bracketsCallum Oakley2016-08-091-2/+2
* | | | | | | | Merge pull request #710 from algernon/h/tap-dance/keyup-seq-start-fixJack Humbert2016-09-051-2/+3
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | tap-dance: Do not start a sequence on keyupGergely Nagy2016-09-011-2/+3
|/ / / / / / /
* | | | | | | Merge pull request #707 from algernon/f/unicode/get-modeJack Humbert2016-08-312-0/+5
|\ \ \ \ \ \ \
| * | | | | | | process_unicode: Add get_unicode_input_mode()Gergely Nagy2016-08-312-0/+5
|/ / / / / / /
* | | | | | | Merge pull request #705 from VoodaGod/bone2planckJack Humbert2016-08-303-22/+44
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master'Jason Janse van Rensburg2016-08-30694-13851/+35464
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #703 from jhenahan/feature/jhenahan-keymapJack Humbert2016-08-294-0/+389
|\ \ \ \ \ \ \ \
| * | | | | | | | Update READMEJack Henahan2016-08-291-3/+9
| * | | | | | | | jhenahan layoutJack Henahan2016-08-294-0/+383
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #700 from algernon/h/ucis/enable-fixJack Humbert2016-08-291-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | build_keyboard.mk: Restore UCIS_ENABLE supportGergely Nagy2016-08-291-0/+5
|/ / / / / / /
* | | | | | | Merge pull request #697 from fredizzimo/fix_gh_token_problemJack Humbert2016-08-271-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix the .travis.yml so that GH_TOKEN works properlyFred Sundvik2016-08-281-3/+3
* | | | | | | | Merge pull request #696 from fredizzimo/community_boardsJack Humbert2016-08-271-19/+28
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Update list of community keyboardsFred Sundvik2016-08-281-19/+28