Code

Bocaj Layout and Userspace Refactor#4753

Code

Merged

drashna merged 44 commits intoqmk:masterqmk/qmk_firmware:masterfrom JacobJerrell:bocaj_refactorCopy head branch name to clipboardJan 2, 2019

+896-405

Commits

Commits on Apr 10, 2018

• Bocaj Layout Revamp

  JacobJerrell

  committed
  59c6870

  Copy full SHA for 59c6870

Commits on Apr 11, 2018

• Pull in Upstream (#1)

  Show description for eeba0ce
  JacobJerrell

  authored
  eeba0ce

  Copy full SHA for eeba0ce

• Revert "Pull in Upstream (#1)"

  Show description for b17fa50
  JacobJerrell

  authored
  b17fa50

  Copy full SHA for b17fa50

• Merge pull request #2 from JacobJerrell/revert-1-master

  Show description for 0a945eb
  JacobJerrell

  authored
  0a945eb

  Copy full SHA for 0a945eb

• Merge pull request #3 from qmk/master

  Show description for 9b7e1e9
  JacobJerrell

  authored
  9b7e1e9

  Copy full SHA for 9b7e1e9

Commits on Apr 20, 2018

• Updates to Bocaj Files

  Show description for 3aaab4e
  JacobJerrell

  committed
  3aaab4e

  Copy full SHA for 3aaab4e

Commits on May 19, 2018

• Merge remote-tracking branch 'upstream/master'

  JacobJerrell

  committed
  6211b78

  Copy full SHA for 6211b78

Commits on May 31, 2018

• Merge remote-tracking branch 'upstream/master'

  JacobJerrell

  committed
  638c005

  Copy full SHA for 638c005

• Merge remote-tracking branch 'upstream/master'

  JacobJerrell

  committed
  850f7c6

  Copy full SHA for 850f7c6

Commits on Jul 10, 2018

• Updates to Bocaj

  Show description for 603f9e2
  JacobJerrell

  committed
  603f9e2

  Copy full SHA for 603f9e2

• Merge remote-tracking branch 'upstream/master'

  JacobJerrell

  committed
  10dd01f

  Copy full SHA for 10dd01f

• Removed 'secrets.h'

  JacobJerrell

  authored
  e106f84

  Copy full SHA for e106f84

• Updates to Bocaj

  Show description for b46a20e
  JacobJerrell

  committed
  b46a20e

  Copy full SHA for b46a20e

• Merge branch 'master' of https://github.com/JacobJerrell/qmk_firmware

  JacobJerrell

  committed
  b94845e

  Copy full SHA for b94845e

Commits on Jul 24, 2018

• Total revisioning of keymap and layout structure

  JacobJerrell

  committed
  cbc7673

  Copy full SHA for cbc7673

• Missed readme.md file

  JacobJerrell

  committed
  59a18c6

  Copy full SHA for 59a18c6

Commits on Jul 25, 2018

• Merge remote-tracking branch 'upstream/master'

  JacobJerrell

  committed
  cb723cc

  Copy full SHA for cb723cc

• Bocaj - Permissive Hold setting enabled

  JacobJerrell

  committed
  9414e91

  Copy full SHA for 9414e91

Commits on Aug 25, 2018

• Merge remote-tracking branch 'upstream/master'

  JacobJerrell

  committed
  23898fd

  Copy full SHA for 23898fd

• Switching from ErgoDox EZ centric configuration to the layout/user approach

  JacobJerrell

  committed
  beb30dd

  Copy full SHA for beb30dd

• Bocaj - Create Userspace and Ergodox layout

  JacobJerrell

  committed
  a4539a7

  Copy full SHA for a4539a7

Commits on Aug 27, 2018

• Update settings.json

  JacobJerrell

  authored
  90b1506

  Copy full SHA for 90b1506

Commits on Oct 29, 2018

• Pushing local updates

  JacobJerrell

  committed
  b8261d1

  Copy full SHA for b8261d1

• Merge branch 'master' of https://github.com/JacobJerrell/qmk_firmware

  JacobJerrell

  committed
  e7b52ee

  Copy full SHA for e7b52ee

• Reverting .vscode/settings.json

  JacobJerrell

  committed
  7a2f2f4

  Copy full SHA for 7a2f2f4

• Merge remote-tracking branch 'upstream/master'

  JacobJerrell

  committed
  9734427

  Copy full SHA for 9734427

• Adds pretty_osx and _win wrappers

  JacobJerrell

  committed
  4f0ba55

  Copy full SHA for 4f0ba55

• Utilize Windows and Mac Wrappers

  JacobJerrell

  committed
  de4d404

  Copy full SHA for de4d404

• Update layouts/community/ergodox/bocaj/keymap.c

  JacobJerrell

  committed
  8f99d4d

  Copy full SHA for 8f99d4d

Commits on Oct 30, 2018

• Updates to Bocaj keymap.c

  Show description for 41e6e4d
  JacobJerrell

  committed
  41e6e4d

  Copy full SHA for 41e6e4d

• Updates to Bocaj

  Show description for 8bf314e
  JacobJerrell

  committed
  8bf314e

  Copy full SHA for 8bf314e

Commits on Oct 31, 2018

• Add LShift to _Adjust layer

  JacobJerrell

  committed
  37cdbc6

  Copy full SHA for 37cdbc6

Commits on Nov 7, 2018

• Minor changes to bocaj

  Show description for c1d2a9c
  JacobJerrell

  committed
  c1d2a9c

  Copy full SHA for c1d2a9c

Commits on Dec 21, 2018

• Merge remote-tracking branch 'upstream/master' into bocaj

  JacobJerrell

  committed
  36b975a

  Copy full SHA for 36b975a

• Updates to Bocaj config & keymap; Fixed problem with process_leader.c

  Show description for 99eba51
  JacobJerrell

  committed
  99eba51

  Copy full SHA for 99eba51

Commits on Dec 24, 2018

• Bocaj - Updates to Layout and Userspace

  Show description for f5e36bf
  JacobJerrell

  committed
  f5e36bf

  Copy full SHA for f5e36bf

• Remove type_traits

  Show description for 5184a40
  JacobJerrell

  authored
  5184a40

  Copy full SHA for 5184a40

Commits on Dec 28, 2018

• Merge remote-tracking branch 'upstream/master' into bocaj

  JacobJerrell

  committed
  4d132aa

  Copy full SHA for 4d132aa

Commits on Dec 29, 2018

• Merge remote-tracking branch 'upstream/master' into bocaj_refactor

  JacobJerrell

  committed
  4d2b630

  Copy full SHA for 4d2b630

Commits on Dec 31, 2018

• refactor stage 1

  JacobJerrell

  committed
  2a08975

  Copy full SHA for 2a08975

• Bocaj Refactor Phase II

  Show description for 0ce51d0
  JacobJerrell

  committed
  0ce51d0

  Copy full SHA for 0ce51d0

Commits on Jan 2, 2019

• Updates to Bocaj

  Show description for 6220995
  JacobJerrell

  committed
  6220995

  Copy full SHA for 6220995

• Bocaj Refactor Phase 3 Part 2

  Show description for cedfa6b
  JacobJerrell

  committed
  cedfa6b

  Copy full SHA for cedfa6b

• Slight adjustment to KC_MAKE

  JacobJerrell

  committed
  be0de32

  Copy full SHA for be0de32