Merge changes from upstream - #1

Open

draity wants to merge 47 commits into

draity:masterfrom

donnemartin:master

Commits on Feb 23, 2016

ignore .idea
pahaz
committed
04b05da
4 space config for *.py files (pep8)
pahaz
committed
4ee08e0
Update .gitignore
pahaz
committed
616c507
Update .editorconfig
pahaz
committed
281111c
.editorconfig for Makefile
pahaz
committed
7237975

Commits on Apr 9, 2016

Merge pull request #20 from pahaz/python-indent-config
donnemartin
committed
d527092

Commits on Apr 19, 2016

Fix typo in README.md
royassaly
committed
219c539
Merge pull request #22 from royassaly/royassaly-patch-1
donnemartin
committed
3855e31

Commits on May 28, 2016

Commits on Jun 1, 2016

Merge pull request #24 from dportabella/fix_pydata
donnemartin
committed
4cfd0e6

Commits on Jun 11, 2016

Enable Sublime Text hot exit
donnemartin
committed
3193c3c
Set Sublime Text theme to Soda Dark
donnemartin
committed
bc40d96
Merge pull request #26 from donnemartin/develop
donnemartin
authored
822a638
Rework iTerm2 guide
donnemartin
committed
26dcbb9
Add note about testing on OS X 10.11
donnemartin
committed
b43a49c
Add Sublime Text instructions to tweak the Monokai theme
donnemartin
committed
863c103
Merge pull request #27 from donnemartin/develop
donnemartin
authored
93f42c4
Set default screenshots loc to Pictures/Screenshots
donnemartin
committed
2789cbb
Merge pull request #28 from donnemartin/develop
donnemartin
authored
63728cc
Fix intellij-idea-ce brew install
donnemartin
committed
4e7e730
Merge pull request #29 from donnemartin/develop
donnemartin
authored
5994ffb
Fix #16: Enable web.sh from .dots
donnemartin
committed
cad55ce
Merge pull request #30 from donnemartin/develop
donnemartin
authored
cee6dc7
Remove duplicate install of heroku-toolbelt from brew.sh
donnemartin
committed
df12030
Add 1password install to brew.sh
donnemartin
committed
4083adc
Tap caskroom/versions to properly install Sublime Text 3 in brew.sh
donnemartin
committed
d5b86d8
Update formula loc for xpdf in brew.sh
donnemartin
committed
206ea67
Merge pull request #31 from donnemartin/develop
donnemartin
authored
416bdd4

Commits on Jul 1, 2016

Update contact info (#35)
donnemartin
authored
6fcd12a

Commits on Jul 24, 2016

Add hub to brew.sh (#37)
donnemartin
authored
1e8354c

Commits on Aug 10, 2016

Remove duplicate word in README.md (#38)

Oscar Tanner
authored and
donnemartin
committed
8d4d6c2

Commits on Oct 17, 2016

remove alfred link step which is no longer support, and change sublime-text3 to be sublime-text to reflect renaming (#43)

hronik1
authored and
donnemartin
committed
dd1f2d0

Commits on Oct 28, 2016

Set TextEdit tab width to 4 instead of the default 8 (#48)
donnemartin
authored
194bd9d

Commits on Nov 27, 2016

Change webdev.sh to web.sh in .dots (#52)

Mike Urich
authored and
donnemartin
committed
79a0930

Commits on Dec 10, 2016

Set SublimeText always_show_minimap_viewport to true (#54)
donnemartin
authored
3061091

Commits on May 12, 2017

Add license disclaimer (#69)
donnemartin
authored
423e609
Fix LICENSE line wrapping (#70)
donnemartin
authored
ce4424e

Commits on Oct 25, 2017

Set blazingly fast keyboard repeat rate (#76)

Thor
authored and
donnemartin
committed
bb3c6f1

Commits on Mar 18, 2018

Remove redundant cask install from brew.sh (#74)

Thor
authored and
donnemartin
committed
cfd1e62
Remove redundant cask install from android.sh (#75)

Thor
authored and
donnemartin
committed
7f81c58

Commits on Feb 10, 2019

Replace betterzipql with betterzip (#92)

errrrk
authored and
donnemartin
committed
4193cf9
Install Heroku CLI from heroku/brew/heroku (#93)

errrrk
authored and
donnemartin
committed
52df4ed
Update list of Quick Look plugins (#77)

odysseus0
authored and
donnemartin
committed
16d4f1c
Fix #84: Update softwareupdate verbose flag (#90)

allanice001
authored and
donnemartin
committed
4bc1e95

Commits on Feb 12, 2019

Fix grammar in .dots script (#87)

jlmoody
authored and
donnemartin
committed
1878427

Commits on Apr 13, 2019

Remove deprecated brew commands (#98)

estyxx
authored and
donnemartin
committed
d86102d