summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Build importmagic index on first use of isortfeature/magic-import-supportTimothy Crosley2014-04-271-2/+9
* Explicitly import indexTimothy Crosley2014-04-271-0/+1
* Make magic_add and magic_remove settings changable via the commandlineTimothy Crosley2014-04-271-1/+6
* Add magic_add and magic_remove settings in preperation for importmagic supportTimothy Crosley2014-04-271-1/+3
* Add docstring to _importmagic.py moduleTimothy Crosley2014-04-271-0/+22
* Add importmagic module that can be imported throughout isort code wether or n...Timothy Crosley2014-04-271-0/+5
* Merge tag '3.7.1' into developTimothy Crosley2014-04-252-3/+3
|\
| * Merge branch 'release/3.7.1'3.7.1Timothy Crosley2014-04-255-7/+16
| |\
| | * Bump release to 3.7.1Timothy Crosley2014-04-252-3/+3
| |/ |/|
* | Add George Hickman (@ghickman) to aknowledgementsTimothy Crosley2014-04-251-0/+1
* | Fix spellingTimothy Crosley2014-04-251-1/+1
* | Add test for pull request #150Timothy Crosley2014-04-251-0/+9
* | Merge pull request #150 from ghickman/developTimothy Edmund Crosley2014-04-251-4/+3
|\ \
| * | Avoid truncating module names without a periodGeorge Hickman2014-04-251-4/+3
|/ /
* | Merge tag '3.7.0' into developTimothy Crosley2014-04-172-3/+3
|\ \ | |/
| * Merge branch 'release/3.7.0'3.7.0Timothy Crosley2014-04-179-90/+199
| |\
| | * Bump version to 3.7.0Timothy Crosley2014-04-172-3/+3
| |/ |/|
* | Add command line option for not skipping filesTimothy Crosley2014-04-172-1/+2
* | Small grammer fixesTimothy Crosley2014-04-171-1/+1
* | Merge pull request #149 from timothycrosley/feature/fix-issue-145Timothy Edmund Crosley2014-04-174-5/+27
|\ \
| * | Update isort to more appropriatly handle star importsTimothy Crosley2014-04-171-4/+13
| * | Add combine-star settingTimothy Crosley2014-04-172-1/+4
| * | Add test for desired import * behavior going forwardTimothy Crosley2014-04-171-0/+10
|/ /
* | Merge pull request #148 from timothycrosley/feature/fix-issue-141Timothy Edmund Crosley2014-04-171-2/+10
|\ \
| * | Strip top file comments before checking syntax to avoid issue #141Timothy Crosley2014-04-171-2/+10
|/ /
* | Merge pull request #147 from timothycrosley/feature/fix-issue-139Timothy Edmund Crosley2014-04-165-33/+54
|\ \
| * | Fix isort to match text expectations for force_addTimothy Crosley2014-04-161-1/+1
| * | Add test to assert force_adds flag works as expectedTimothy Crosley2014-04-161-0/+10
| * | Make force-adds flag operationalTimothy Crosley2014-04-162-2/+2
| * | Add force add capability to handle case where users want to force adds to tak...Timothy Crosley2014-04-161-0/+2
| * | Only add imports if file contents existsTimothy Crosley2014-04-161-2/+3
| * | Remove uneeded print statementTimothy Crosley2014-04-161-1/+0
| * | Change isort config to explicitly parse __init__.pyTimothy Crosley2014-04-161-1/+2
| * | Add support for not_ settings when dealing with any list based settingTimothy Crosley2014-04-161-29/+37
|/ /
* | Merge pull request #146 from timothycrosley/feature/fix-issue-137Timothy Edmund Crosley2014-04-132-25/+86
|\ \
| * | Fix isort behavior when dealing with long style comments directly after impor...Timothy Crosley2014-04-131-2/+3
| * | Small fix to testTimothy Crosley2014-04-131-2/+2
| * | Add test to ensure long style comments get passed over as wellTimothy Crosley2014-04-131-0/+16
| * | Fix issue #137 - reusing comment parsing logic from main parserTimothy Crosley2014-04-131-25/+37
| * | Add test to ensure issue #137 is handled correctlyTimothy Crosley2014-04-131-0/+32
|/ /
* | Merge pull request #142 from wimglenn/patch-1Timothy Edmund Crosley2014-04-031-1/+1
|\ \
| * | Update ACKNOWLEDGEMENTS.mdwimglenn2014-04-031-1/+1
|/ /
* | Merge pull request #140 from stj/developTimothy Edmund Crosley2014-03-312-1/+12
|\ \
| * | Fix line split for as imports.Stefan Tjarks2014-03-312-1/+12
|/ /
* | Fix link syntaxTimothy Crosley2014-03-081-2/+2
* | Update readme to link to the isort wikiTimothy Crosley2014-03-081-21/+6
* | Merge tag '3.6.2' into developTimothy Crosley2014-03-072-3/+3
|\ \ | |/
| * Merge branch 'release/3.6.2'3.6.2Timothy Crosley2014-03-078-27/+111
| |\
| | * Bump release to 3.6.2Timothy Crosley2014-03-072-3/+3
| |/ |/|
* | Merge pull request #136 from timothycrosley/feature/fix-issue-134Timothy Edmund Crosley2014-03-073-22/+93
|\ \