summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Joshua T2016-07-2697-431/+6775
|\
| * Merge pull request #558 from lindhe/masterJack Humbert2016-07-252-2/+2
| |\ | | | | | | Fix misspelled command in Norwegian helper
| | * Change Nordic ampersand code to match the EnglishAndreas Lindhé2016-07-251-1/+1
| | | | | | | | | | | | Changed from "NO_AMP" to "NO_AMPR" since the KC one is "KC_AMPR"
| | * Fix misspelled command in Norwegian helperAndreas Lindhé2016-07-251-1/+1
| | |
| * | Fixes midi functionalityJack Humbert2016-07-245-17/+17
| | |
| * | Merge pull request #554 from robertdale/music-recording-documentationJack Humbert2016-07-241-0/+11
| |\ \ | | | | | | | | Added music recording/playing doc
| | * | added music recording/playing docRobert Dale2016-07-241-0/+11
| | |/
| * | Merge pull request #552 from robertdale/music-play-fixJack Humbert2016-07-241-1/+6
| |\ \ | | | | | | | | Fixes issue #551 - ensure there's a recording to play before playing
| | * | ensure there's a recording to play before playing; also enables the LGUI ↵Robert Dale2016-07-241-1/+6
| | |/ | | | | | | | | | button to play a tone
| * | Merge pull request #550 from Darthabel/fix_bepoJack Humbert2016-07-241-2/+2
| |\ \ | | | | | | | | Fix some errors in bepo mapping
| | * | Fix some errors in bepo mappingVivien Alger2016-07-241-2/+2
| | |/
| * | Merge pull request #549 from locksmithdon/patch-1Jack Humbert2016-07-241-0/+2
| |\ \ | | | | | | | | Added LEADER_EXTERNS() call to readme.
| | * | Added LEADER_EXTERNS() call.Don Smith2016-07-241-0/+2
| | |/ | | | | | | This seems to be needed in most cases.
| * | Merge pull request #548 from CommandLineDesign/CMD-PreonicJack Humbert2016-07-243-0/+432
| |\ \ | | | | | | | | CMD keymap for Preonic
| | * | Updated ReadmeJonathan Lucas2016-07-231-1/+77
| | | |
| | * | Did a derp and forgot to set Trans on Arrow layercommandlinedesign2016-07-231-5/+5
| | | |
| | * | Arrow key fn layer shouldnt overwrite Ctrl key. Better Print Screen positioncommandlinedesign2016-07-231-4/+4
| | | |
| | * | Tested, resolved Mouse issue, resolved numpad issuecommandlinedesign2016-07-231-15/+15
| | | |
| | * | Resolved errorscommandlinedesign2016-07-231-7/+17
| | | |
| | * | Init ReadmeJonathan Lucas2016-07-231-0/+1
| | | | | | | | | | | | This needs a better description.
| | * | Create MakefileJonathan Lucas2016-07-231-0/+23
| | | | | | | | | | | | This is untested, use caution.
| | * | Create CMD-Preonic KeymapJonathan Lucas2016-07-231-0/+322
| | | | | | | | | | | | This is very Alpha-Mode, and has not been tested or even Made yet.
| | * | Merge pull request #1 from jackhumbert/masterJonathan Lucas2016-07-2361-124/+3536
| | |\| | | | | | | | | Update from parent
| * | | Merge pull request #546 from sethbc/satan-cleanupJack Humbert2016-07-247-27/+57
| |\ \ \ | | | | | | | | | | Satan cleanup
| | * | | fix typo in readme and satan.hSeth Chandler2016-07-232-2/+2
| | | | |
| | * | | cleanup default layoutSeth Chandler2016-07-233-15/+39
| | | | |
| | * | | update sethbc keymapSeth Chandler2016-07-232-10/+16
| | | |/ | | |/|
| * | | Merge pull request #534 from willwm/teckinesisErez Zukerman2016-07-2411-0/+1820
| |\ \ \ | | | | | | | | | | Teckinesis for ErgoDox EZ
| | * | | Remove images, per @ezuk request. =)Will Wolff-Myren2016-07-243-10/+0
| | | | |
| | * | | Update readme.mdWill Wolff-Myren2016-07-171-5/+7
| | | | | | | | | | | | | | | | | | | | * Markdown cleanup
| | * | | Update readme.mdWill Wolff-Myren2016-07-177-178/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Updated layout images, json from Keyboard Layout Designer * Added links to Keyboard Layout Designer templates. * Added images of TECK, Kinesis layouts.
| | * | | Update description comment.Will Wolff-Myren2016-07-171-2/+3
| | | | |
| | * | | [MEDIA]: Remove Power, Sleep, Mail, MyCompWill Wolff-Myren2016-07-171-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | I kept hitting these on accident while attempting to move the cursor or mouse. =P
| | * | | [BASE]: Meh, Hyper now have symbols on both sidesWill Wolff-Myren2016-07-171-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Left: MEH_T(KC_BSLS),ALL_T(KC_SLSH) Right: ALL_T(KC_LBRC),MEH_T(KC_RBRC)
| | * | | Update Base Layer comment to match new layout.Will Wolff-Myren2016-07-171-1/+1
| | | | |
| | * | | [BASE]: KC_MINS -> KC_GRVWill Wolff-Myren2016-07-171-1/+1
| | | | |
| | * | | RSpec: KC_EQL -> KC_MINSWill Wolff-Myren2016-07-171-2/+2
| | | | |
| | * | | LSpec: KC_GRV -> KC_EQLWill Wolff-Myren2016-07-171-2/+2
| | | | |
| | * | | Update .gitignore to include VSCode setting.Will Wolff-Myren2016-07-171-0/+1
| | | | |
| | * | | Replaced ordinary-media.{png|json} with new media layoutWill Wolff-Myren2016-07-144-27/+436
| | | | |
| | * | | Replaced ordinary-symbol.{png|json} with new base layout.Will Wolff-Myren2016-07-145-29/+430
| | | | |
| | * | | Replaced ordinary-base.{png|json} with new base layout.Will Wolff-Myren2016-07-144-27/+452
| | | | |
| | * | | Replaced readme.md with stubWill Wolff-Myren2016-07-141-92/+5
| | | | | | | | | | | | | | | | | | | | (incl. reference to original layout)
| | * | | Created "teckinesis" keymap folderWill Wolff-Myren2016-07-1310-0/+665
| | | | | | | | | | | | | | | | | | | | (Based on "ordinary" keymap by Nicholas Keene)
| * | | | Merge pull request #542 from algernon/f/hold-the-danceErez Zukerman2016-07-243-96/+87
| |\ \ \ \ | | | | | | | | | | | | Tap-dance: support for holding keys
| | * | | | readme.md: Update the tap dance docsGergely Nagy2016-07-221-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
| | * | | | readme.md: algernon is strictly lowercaseGergely Nagy2016-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
| | * | | | tap-dance: Code cleanupGergely Nagy2016-07-221-21/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes a number of duplicated code, by passing actions around instead of keycodes, so the various dance action functions do not have to look up the action, but the caller does that for them. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
| | * | | | tap-dance: Support user_data for the callbacksGergely Nagy2016-07-222-64/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored the code a little, so all callbacks now receive a `user_data` pointer, which can be anything. As an example, the key pairs from `ACTION_TAP_DANCE_DOUBLE` now use this, and custom, built-in functions. This makes it easier to extend the tap dance functionality, and also simplifies the code a little. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
| | * | | | tap-dance: Support for holding keysGergely Nagy2016-07-222-1/+12
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this change, tap dance will now store the pressed state of the tap-dance key, and allow one to make an action sooner, while the key is still held, and only unregister when the key is released. The registration must happen in the `on_dance_finished` callback, while unregistering goes to `on_reset`. The surrounding code makes sure not to call either multiple times. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>