Dev push for v0.13.0#161

Merged

bmuenzenmeyer merged 34 commits intomasterfrom

Oct 6, 2015

Commits on Sep 8, 2015

delete Thumbs.db and update .gitignore
e2tha-e
committed

Commits on Sep 20, 2015

deleting config from .gitignore entirely
e2tha-e
committed
updating mergeData() so obj2 has priority
e2tha-e
committed
reversing order of params in pseudopattern_hunter.js for variantFileData
e2tha-e
committed
unit tests
e2tha-e
committed
docblock
e2tha-e
committed
deleting whitespace
e2tha-e
committed
reversing order of find_pseudopatterns() and addPattern() in pattern_assembler
e2tha-e
committed

Commits on Sep 21, 2015

Commits on Oct 2, 2015

recursive partial include
e2tha-e
committed
unit test
e2tha-e
committed
unit test
e2tha-e
committed
reinstating builder/patternlab_gulp.js
e2tha-e
committed
better ordering of pattern variants
e2tha-e
committed
better ordering of pattern variants
e2tha-e
committed

Commits on Oct 3, 2015

keeping the data from underscore-prefixed files, but ignoring in nav
e2tha-e
committed
better rendering of navigation subdirs
e2tha-e
committed
refined test
e2tha-e
committed

Commits on Oct 5, 2015

restricting pattern assembly to correct file types
e2tha-e
committed

Commits on Oct 6, 2015