Skip to content

Merge changes from upstream #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
draity wants to merge 47 commits into
base: master
Choose a base branch
from
Open

Merge changes from upstream #1

draity wants to merge 47 commits into from

Conversation

@draity
Copy link
Owner

@draity draity commented Nov 29, 2021

No description provided.

pahaz and others added 30 commits February 23, 2016 15:04
@pahaz
ignore .idea
04b05da
@pahaz
4 space config for *.py files (pep8)
4ee08e0
@pahaz
Update .gitignore
616c507
@pahaz
Update .editorconfig
281111c
@pahaz
.editorconfig for Makefile
7237975
@donnemartin
Merge pull request #20 from pahaz/python-indent-config
d527092 
Python indent config
@royassaly
Fix typo in README.md
219c539 
In the iTerm2 section
(https://github.com/donnemartin/dev-setup#iterm2), where it says:

$ curl -O
https://raw.githubusercontent.com/donnemartin/mac-dev-setup/master/.alia
ses

should be:

$ curl -O
https://raw.githubusercontent.com/donnemartin/dev-setup/master/.aliases
@donnemartin
Merge pull request #22 from royassaly/royassaly-patch-1
3855e31 
Fix aliases link typo in README.md
@dportabella
fix pydata.sh. pip install virtualenv failed if PIP_REQUIRE_VIRTUALEN…
457317d 
…V was true
@dportabella
fix pydata.sh. create ~/.ipython directory if it does not exist
3af5ef6
@donnemartin
Merge pull request #24 from dportabella/fix_pydata
4cfd0e6 
pip install virtualenv failed if PIP_REQUIRE_VIRTUALENV was true
@donnemartin
Enable Sublime Text hot exit
3193c3c
@donnemartin
Set Sublime Text theme to Soda Dark
bc40d96
@donnemartin
Merge pull request #26 from donnemartin/develop
822a638 
Update Sublime Text prefs
@donnemartin
Rework iTerm2 guide
26dcbb9 
Most of the described manual changes are done automatically through the setup scripts
@donnemartin
Add note about testing on OS X 10.11
b43a49c
@donnemartin
Add Sublime Text instructions to tweak the Monokai theme
863c103
@donnemartin
Merge pull request #27 from donnemartin/develop
93f42c4 
Update README
@donnemartin
Set default screenshots loc to Pictures/Screenshots
2789cbb
@donnemartin
Merge pull request #28 from donnemartin/develop
63728cc 
Set default screenshots loc to Pictures/Screenshots
@donnemartin
Fix intellij-idea-ce brew install
4e7e730 
This formula was moved to caskroom/versions
@donnemartin
Merge pull request #29 from donnemartin/develop
5994ffb 
Fix intellij-idea-ce brew install
@donnemartin
Fix #16: Enable web.sh from .dots
cad55ce
@donnemartin
Merge pull request #30 from donnemartin/develop
cee6dc7 
Fix #16: Enable web.sh from .dots
@donnemartin
Remove duplicate install of heroku-toolbelt from brew.sh
df12030 
It's already installed earlier in the process.
@donnemartin
Add 1password install to brew.sh
4083adc
@donnemartin
Tap caskroom/versions to properly install Sublime Text 3 in brew.sh
d5b86d8
@donnemartin
Update formula loc for xpdf in brew.sh
206ea67
@donnemartin
Merge pull request #31 from donnemartin/develop
416bdd4 
Update brew.sh formulas
@donnemartin
Update contact info (#35)
6fcd12a
donnemartin and others added 17 commits July 24, 2016 07:45
@donnemartin
Add hub to brew.sh (#37)
1e8354c
@donnemartin
Remove duplicate word in README.md (#38)
8d4d6c2
@hronik1 @donnemartin
remove alfred link step which is no longer support, and change sublim…
dd1f2d0 
…e-text3 to be sublime-text to reflect renaming (#43)
@donnemartin
Set TextEdit tab width to 4 instead of the default 8 (#48)
194bd9d
@donnemartin
Change webdev.sh to web.sh in .dots (#52)
79a0930 
Fixes #51.
@donnemartin
Set SublimeText always_show_minimap_viewport to true (#54)
3061091
@donnemartin
Add license disclaimer (#69)
423e609 
Clearly denote the repository license is from me, not my employer (Facebook).
@donnemartin
Fix LICENSE line wrapping (#70)
ce4424e
@donnemartin
Set blazingly fast keyboard repeat rate (#76)
bb3c6f1
@donnemartin
Remove redundant cask install from brew.sh (#74)
cfd1e62
@donnemartin
Remove redundant cask install from android.sh (#75)
7f81c58
@errrrk @donnemartin
Replace betterzipql with betterzip (#92)
4193cf9 
The BetterZipQL plugin was integrated with BetterZip.
@errrrk @donnemartin
Install Heroku CLI from heroku/brew/heroku (#93)
52df4ed
@odysseus0 @donnemartin
Update list of Quick Look plugins (#77)
16d4f1c
@allanice001 @donnemartin
Fix #84: Update softwareupdate verbose flag (#90)
4bc1e95
@jlmoody @donnemartin
Fix grammar in .dots script (#87)
1878427
@estyxx @donnemartin
Remove deprecated brew commands (#98)
d86102d 
@estyxx thank you!
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.