alvierahman90/qmk_firmware
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2025-01-28. You can view files and clone it, but cannot push or open issues or pull requests.
qmk_firmware/layouts/community/ergodox
History
James Young 7bec943043
Merge remote-tracking branch 'upstream/master' into develop 
Fixes merge conflicts in:

- keyboards/bm40hsrgb/config.h
  - Conflict from PR 13132:
    - RGB_DISABLE_WHEN_USB_SUSPENDED signature updated in develop branch, unmodified in master branch
    - updated file with changes from master branch

- keyboards/keebio/iris/keymaps/nstickney/keymap.c
  - Conflict from PR 11456:
    - layer_state_set_user() updated in develop branch, removed in master branch
    - updated file with changes from master branch
2021-08-09 12:14:22 -07:00
..
333fred
Remove QMK_KEYBOARD_CONFIG_H (#11576)
2021-01-22 19:32:10 +00:00
ab
map reset key to the correct location (#11037)
2020-11-30 05:04:52 +11:00
absenth
Remove KC_DELT alias in favor of KC_DEL (#6327)
2019-08-30 15:01:52 -07:00
adam
Remove QMK_KEYBOARD_CONFIG_H (#11576)
2021-01-22 19:32:10 +00:00
adnw_k_o_y
keymap_extras: Remove deprecated defines (#12949)
2021-07-06 09:05:11 +10:00
adnw_p_u_q
keymap_extras: Remove deprecated defines (#12949)
2021-07-06 09:05:11 +10:00
albert
Remove QMK_KEYBOARD_CONFIG_H (#11576)
2021-01-22 19:32:10 +00:00
alexjj
Remove KC_DELT alias in favor of KC_DEL (#6327)
2019-08-30 15:01:52 -07:00
algernon
Remove Full Bootmagic (#13846)
2021-08-06 23:59:56 -07:00
andrew_osx
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
belak
Remove redundant KC_TRNS and KC_NO fillers in layouts (#5142)
2019-02-16 08:11:15 -08:00
bepo
keymap_extras: Remove deprecated defines (#12949)
2021-07-06 09:05:11 +10:00
bepo_alt
keymap_extras: Remove deprecated defines (#12949)
2021-07-06 09:05:11 +10:00
bepo_csa
keymap_extras: Remove deprecated defines (#12949)
2021-07-06 09:05:11 +10:00
berfarah
Remove Full Bootmagic (#13846)
2021-08-06 23:59:56 -07:00
bocaj
Remove Full Bootmagic (#13846)
2021-08-06 23:59:56 -07:00
bryan
Remove KC_DELT alias in favor of KC_DEL (#6327)
2019-08-30 15:01:52 -07:00
choromanski
Added choromanski keymap (#2528)
2018-03-16 16:35:44 -04:00
coderkun_neo2
Migrate more fn_actions stuff (#13502)
2021-07-15 03:52:45 +10:00
colemak
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
colemak_code_friendly
Remove Full Bootmagic (#13846)
2021-08-06 23:59:56 -07:00
colemak_osx_pc_no
Migrate more fn_actions stuff (#13502)
2021-07-15 03:52:45 +10:00
colemak_programmer
…
common_nighthawk
Migrate ACTION_LAYER_TAP_TOGGLEs to TT()
2019-02-18 08:52:51 -08:00
csharp_dev
Migrate ACTION_LAYER_TAP_TOGGLEs to TT()
2019-02-18 08:52:51 -08:00
dave
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
deadcyclo
Migrate more fn_actions stuff (#13502)
2021-07-15 03:52:45 +10:00
dragon788
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
drashna
Remove backwards compatibility of debounce names (#13877)
2021-08-09 19:46:18 +01:00
dvorak
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
dvorak_emacs
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
dvorak_emacs_software
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
dvorak_intl_squisher
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
dvorak_plover
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
dvorak_programmer
Remove Full Bootmagic (#13846)
2021-08-06 23:59:56 -07:00
dvorak_programmer_swe
keymap_extras: Remove deprecated defines (#12949)
2021-07-06 09:05:11 +10:00
dvorak_spanish
Fixing dead links (#5503)
2019-03-29 06:20:25 -07:00
dvorak_svorak_a5
keymap_extras: Remove deprecated defines (#12949)
2021-07-06 09:05:11 +10:00
emacs_osx_dk
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
french_hacker
keymap_extras: Remove deprecated defines (#12949)
2021-07-06 09:05:11 +10:00
galson
Migrate ACTION_LAYER_TAP_TOGGLEs to TT()
2019-02-18 08:52:51 -08:00
german
keymap_extras: Remove deprecated defines (#12949)
2021-07-06 09:05:11 +10:00
german-kinergo
keymap_extras: Remove deprecated defines (#12949)
2021-07-06 09:05:11 +10:00
german-lukas
keymap_extras: Remove deprecated defines (#12949)
2021-07-06 09:05:11 +10:00
german-manuneo
keymap_extras: Remove deprecated defines (#12949)
2021-07-06 09:05:11 +10:00
guni
Migrate more fn_actions stuff (#13502)
2021-07-15 03:52:45 +10:00
haegin
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
ishigoya-jp
keymap_extras: Remove deprecated defines (#12949)
2021-07-06 09:05:11 +10:00
issmirnov
[Bug] Develop - Change uint32_t to layer_state_t (#13596)
2021-07-19 09:50:55 -07:00
italian
Migrate ACTION_LAYER_TAP_TOGGLEs to TT()
2019-02-18 08:52:51 -08:00
j3rn
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
jackhumbert
Remove QMK_KEYBOARD_CONFIG_H (#11576)
2021-01-22 19:32:10 +00:00
jacobono
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
jafo
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
jgarr
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
josh
Migrate ACTION_LAYER_TAP_TOGGLEs to TT()
2019-02-18 08:52:51 -08:00
kastyle
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
kejadlen
Remove Full Bootmagic (#13846)
2021-08-06 23:59:56 -07:00
kines-ish
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
kristian
keymap_extras: Remove deprecated defines (#12949)
2021-07-06 09:05:11 +10:00
manna-harbour_miryoku
[Keymap] Update Miryoku (#13307)
2021-07-03 09:09:02 -07:00
maz
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
mclennon_osx
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
meagerfindings
Remove DESCRIPTION, W-Z (#11633)
2021-01-20 12:41:34 +11:00
mpiechotka
2020 May 30 Breaking Changes Update (#9215)
2020-05-30 13:14:59 -07:00
msc
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
naps62
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
neo2_on_qwertz_hardware
keymap_extras: Remove deprecated defines (#12949)
2021-07-06 09:05:11 +10:00
norwegian_programmer_osx_pc
Migrate more fn_actions stuff (#13502)
2021-07-15 03:52:45 +10:00
norwegian_programmer_osx_pc_colemak
Migrate more fn_actions stuff (#13502)
2021-07-15 03:52:45 +10:00
ordinary
Fixed dead links (#2451)
2018-03-01 07:45:47 -08:00
ordinary_osx
Add a slightly modified ordinary layout for OSX
2017-12-08 16:08:50 -05:00
osx_de
keymap_extras: Remove deprecated defines (#12949)
2021-07-06 09:05:11 +10:00
osx_de_adnw_koy
keymap_extras: Remove deprecated defines (#12949)
2021-07-06 09:05:11 +10:00
osx_de_experimental
keymap_extras: Remove deprecated defines (#12949)
2021-07-06 09:05:11 +10:00
osx_fr
keymap_extras: Remove deprecated defines (#12949)
2021-07-06 09:05:11 +10:00
osx_kinesis_pnut
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
osx_neo2
[osx_neo2] Bugfixes and improvements to Ergodox macOS Neo2 keymap (#8154)
2020-02-14 03:30:32 +00:00
osx_whiskey_tango_foxtrot_capslock
Migrate more fn_actions stuff (#13502)
2021-07-15 03:52:45 +10:00
phoenix
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
plover
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
plums
…
qwerty_code_friendly
[Bug] Develop - Change uint32_t to layer_state_t (#13596)
2021-07-19 09:50:55 -07:00
replicaJunction
Keymap: Revamp replicaJunction keymaps (#3589)
2018-08-15 15:38:41 -07:00
reset_eeprom
Remove/migrate action_get_macro()s from default keymaps (#5625)
2019-07-15 23:04:02 -07:00
robot_test_layout
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
romanzolotarev-norman-osx
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
romanzolotarev-norman-plover-osx
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
romanzolotarev-norman-plover-osx-hjkl
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
romanzolotarev-norman-qwerty-osx
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
sethbc
Remove empty fn_actions[]
2019-01-11 18:32:43 -08:00
siroken3
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
sneako
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
software_neo2
keymap_extras: Remove deprecated defines (#12949)
2021-07-06 09:05:11 +10:00
supercoder
Remove Full Bootmagic (#13846)
2021-08-06 23:59:56 -07:00
swedish
keymap_extras: Remove deprecated defines (#12949)
2021-07-06 09:05:11 +10:00
swedish-lindhe
keymap_extras: Remove deprecated defines (#12949)
2021-07-06 09:05:11 +10:00
swissgerman
Remove KC_DELT alias in favor of KC_DEL (#6327)
2019-08-30 15:01:52 -07:00
techtomas
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
teckinesis
Fixing dead links (#5503)
2019-03-29 06:20:25 -07:00
tkuichooseyou
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
tm2030
Remove KC_DELT alias in favor of KC_DEL (#6327)
2019-08-30 15:01:52 -07:00
tonyabra_osx
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
townk_osx
Remove Full Bootmagic (#13846)
2021-08-06 23:59:56 -07:00
twentylives_dvorak_with_hebrew
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
twey
Remove KC_DELT alias in favor of KC_DEL (#6327)
2019-08-30 15:01:52 -07:00
videck
Remove QMK_KEYBOARD_CONFIG_H (#11576)
2021-01-22 19:32:10 +00:00
win10_writers-block
Remove QMK_KEYBOARD_CONFIG_H (#11576)
2021-01-22 19:32:10 +00:00
workman_osx_mdw
Migrate more fn_actions stuff (#13502)
2021-07-15 03:52:45 +10:00
xyverz
Changes to my Ergodox & Planck keymaps (#8622)
2020-04-02 00:03:52 +01:00
yoruian
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
zweihander-macos
Remove unused action_get_macro() usages in user files (#11165)
2021-01-11 01:25:45 -08:00
layout.json
…
readme.md
…

readme.md

ergodox

LAYOUT_ergodox