| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | di0ib | 2016-08-07 | 356 | -2789/+13709 | |
| | | |\ | |_|/ |/| | | ||||||
| * | | | Merge pull request #605 from kuel/master | Jack Humbert | 2016-08-03 | 1 | -0/+161 | |
| |\| | | | | | | | | Add keymap_cyrillic.h, lots of cyrillic characters | |||||
| | * | | Add keymap_cyrillic.h, lots of cyrillic characters | kuel | 2016-08-02 | 1 | -0/+161 | |
| | | | | ||||||
| * | | | Merge pull request #599 from Depariel/master | Jack Humbert | 2016-08-03 | 6 | -154/+196 | |
| |\ \ \ | | | | | | | | | Fixed compiling errors and updated keymaps for infinity_chibios | |||||
| | * | | | added support for Infinity 1.1a (4th drop) matrix, no LED support yet | Depariel | 2016-07-31 | 2 | -5/+50 | |
| | | | | | ||||||
| | * | | | fixed typo in hasu/keymap.c | Depariel | 2016-07-31 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | fixed compiling bugs in infinity_chibios.h, updated keymaps, added depariel ↵ | Depariel | 2016-07-31 | 5 | -149/+146 | |
| | | | | | | | | | | | | | | | | | keymap | |||||
| * | | | | Merge pull request #561 from 0xdec/patch-1 | Jack Humbert | 2016-08-03 | 1 | -357/+378 | |
| |\ \ \ \ | |_|/ / |/| | | | Clean up formatting & tiny refactor in rgblight.c | |||||
| | * | | | Simplify HSV->RGB calculation | Jordi Orlando | 2016-07-26 | 1 | -14/+12 | |
| | | | | | | | | | | | | | De-dupe repeated code | |||||
| | * | | | Increament -> increment | Jordi Orlando | 2016-07-26 | 1 | -9/+9 | |
| | | | | | ||||||
| | * | | | Clean up rgblight.c | Jordi Orlando | 2016-07-26 | 1 | -354/+377 | |
| | | | | | | | | | | | | | Fix formatting issues, clarify comments | |||||
| * | | | | Merge pull request #592 from sethbc/ez-sethbc | Erez Zukerman | 2016-08-02 | 3 | -0/+119 | |
| |\ \ \ \ | | | | | | | | | | | Ez sethbc | |||||
| | * | | | | rebase | Seth Chandler | 2016-07-30 | 3 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | update makefile | Seth Chandler | 2016-07-30 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | initial commit of sethbc keymap | Seth Chandler | 2016-07-30 | 3 | -0/+119 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #593 from J3RN/master | Erez Zukerman | 2016-08-02 | 2 | -22/+26 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Updated the J3RN ErgoDox keymap | |||||
| | * | | | | | Updated readme with recent changes | Jonathan Arnett | 2016-07-30 | 1 | -3/+6 | |
| | | | | | | | ||||||
| | * | | | | | Updated my keymap | Jack Humbert | 2016-07-30 | 8 | -28/+29 | |
| | |\ \ \ \ \ | ||||||
| * | \ \ \ \ \ | Merge pull request #600 from adiabatic/master | Erez Zukerman | 2016-08-02 | 4 | -14/+1167 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | zweihander-osx: add left-hand-thumb tab key | |||||
| | * | | | | | | | Thumb ⌫ into ⇥, numpad & into :, yank home/end | Nathan Sharfi | 2016-07-31 | 3 | -13/+1166 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: add (back?) in the light-shine disabler | |||||
| | * | | | | | | | Remove /keyboard/* files | Nathan Sharfi | 2016-07-31 | 3 | -1394/+0 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmware | Nathan Sharfi | 2016-07-31 | 6362 | -2418080/+66593 | |
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c # keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex | |||||
| | * | | | | | | | zweihander-osx: Use power instead of eject | Nathan Sharfi | 2016-05-31 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KC_EJCT isn't the OS X Eject key and won't restart your computer. | |||||
| | * | | | | | | | zweihander-osx: use eject instead of power | Nathan Sharfi | 2016-05-31 | 2 | -1110/+1097 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://support.apple.com/en-us/HT201236 says that ⌃⌘⏏ will quit all apps and then restart your Mac; ⌃⌘-power will shut things down in an…ungraceful fashion. I reboot into Windows fairly frequently; I'd rather have the nice behavior at my fingertips, not the rude one. | |||||
| | * | | | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmware | Nathan Sharfi | 2016-05-31 | 2 | -4/+9 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' of github.com:jackhumbert/qmk_firmware | Nathan Sharfi | 2016-05-30 | 36 | -96/+3634 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | zweihander: Add :, disable sleep LED waves | Nathan Sharfi | 2016-05-30 | 2 | -1/+3 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | zweihander-osx: Add =, :, juggle Home/End | Nathan Sharfi | 2016-05-27 | 1 | -8/+8 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | zweihander-osx: Bump ALFRED_LEAD_TIME to 250ms | Nathan Sharfi | 2016-05-26 | 2 | -5/+5 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | correct file name | Jack Humbert | 2016-08-01 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | fix mkdir cmd | Jack Humbert | 2016-08-01 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Updates ErgoDox readme | Erez Zukerman | 2016-08-01 | 1 | -9/+6 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | automatically forward ergodox ez | Jack Humbert | 2016-08-01 | 2 | -0/+3 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #597 from Jiehong/feature/basic_keyboard_doc | Jack Humbert | 2016-08-01 | 1 | -0/+96 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | feature: add basic doc about how a keyboard works on USB | |||||
| | * | | | | | | | | | | feature: add basic doc about how a keyboard works on USB | Jiehong Ma | 2016-07-31 | 1 | -0/+96 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This comes from the discussion on #520 | |||||
| * | | | | | | | | | | | Merge pull request #596 from fredizzimo/rid_of_quick | Jack Humbert | 2016-08-01 | 10 | -56/+87 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | Fix the makefile dependencies and remove quick targets | |||||
| | * | | | | | | | | | | Travis calls the normal build target, instead of quick | Fred Sundvik | 2016-07-31 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Fix the readme for the removed quick target | Fred Sundvik | 2016-07-31 | 1 | -4/+3 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Remove the quick commands and add proper clean | Fred Sundvik | 2016-07-31 | 1 | -26/+5 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Also depend on the gcc version | Fred Sundvik | 2016-07-31 | 1 | -3/+5 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Generate version information to version.h | Fred Sundvik | 2016-07-31 | 7 | -2/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that only the files that really needs a version are recompiled. | |||||
| | * | | | | | | | | | | Force compilation and linking when options changes | Fred Sundvik | 2016-07-31 | 1 | -9/+28 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | More reliable .d file generation | Fred Sundvik | 2016-07-31 | 1 | -8/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also generated inside the obj dir instead of separate deps folder. | |||||
| | * | | | | | | | | | | Put the build output inside the root/.build directory | Fred Sundvik | 2016-07-31 | 1 | -1/+2 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Enable vpath seraching for source files only | Fred Sundvik | 2016-07-31 | 1 | -1/+11 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Better "include guards" for the makefiles | Fred Sundvik | 2016-07-31 | 1 | -9/+14 | |
| | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checking for ARCH is not good enough, since some subprojects define it. Ergodox Ez for example. The leads to running the make from keyboards/ergodox/ez failing. The keyboard makefile will not be included in that case, and therefore not the CUSTOM_MATRIX either. Furthermore the output files are read from many different .build directories, so it doesn't fail deterministically. For example on the Travis CI the compilation passes, since there's no outdated objects that needs recompilation. | |||||
| * | | | | | | | | | | Merge pull request #594 from jeebak/jeebak | Jack Humbert | 2016-07-31 | 3 | -0/+496 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Jeebak's keymap for planck | |||||
| | * | | | | | | | | | | Update readme.md | JeeBak Kim | 2016-07-30 | 1 | ||
 |
index : qmk_firmware | |
| [no description] |
| summaryrefslogtreecommitdiffstats |