summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add test for desired isort above commenting featurefeature/fix-issue-163Timothy Crosley2014-12-251-0/+8
* Update readmeTimothy Crosley2014-12-251-1/+0
* Update readmeTimothy Crosley2014-12-251-0/+1
* Merge tag '3.9.3' into developTimothy Crosley2014-12-252-3/+3
|\
| * Merge branch 'release/3.9.3'3.9.3Timothy Crosley2014-12-256-20/+45
| |\
| | * Bump release to 3.9.3Timothy Crosley2014-12-252-3/+3
| |/ |/|
* | Bump pies requirementTimothy Crosley2014-12-251-1/+1
* | Merge pull request #211 from timothycrosley/feature/fix-ticket-210Timothy Edmund Crosley2014-12-251-1/+3
|\ \
| * | Add line width argument to command line and mark lines argument as deprecatedTimothy Crosley2014-12-251-1/+3
|/ /
* | Add Sebastian Pipping (@hartwork) to acknowledgements fileTimothy Crosley2014-12-251-0/+1
* | Merge pull request #209 from hartwork/improve-placement-controlTimothy Edmund Crosley2014-12-252-15/+36
|\ \
| * | Improve placement control (closes #202)Sebastian Pipping2014-12-231-15/+12
| * | Add test for placement control with shared package prefixes (issue #202)Sebastian Pipping2014-12-231-0/+24
|/ /
* | Reference support for 3.4 in setup.py fileTimothy Crosley2014-12-211-0/+1
* | Merge tag '3.9.2' into developTimothy Crosley2014-12-212-3/+3
|\ \ | |/
| * Merge branch 'release/3.9.2'3.9.2Timothy Crosley2014-12-216-18/+87
| |\
| | * Bump release to 3.9.2Timothy Crosley2014-12-212-3/+3
| |/ |/|
* | Merge pull request #207 from timothycrosley/feature/fix-issue-177Timothy Edmund Crosley2014-12-212-0/+49
|\ \
| * | Add support for custom import placement to isortTimothy Crosley2014-12-211-0/+22
| * | Fix the test to correctly reflect desired outputTimothy Crosley2014-12-211-4/+3
| * | Add a test for custom import placement supportTimothy Crosley2014-12-211-0/+28
|/ /
* | Merge pull request #206 from timothycrosley/feature/fix-issue-204Timothy Edmund Crosley2014-12-212-15/+25
|\ \
| * | Add support for splitting on importTimothy Crosley2014-12-211-10/+13
| * | Update all tests to assume split on import when possibleTimothy Crosley2014-12-211-5/+5
| * | Small fix to placementTimothy Crosley2014-12-211-1/+1
| * | Add test for desired output formatTimothy Crosley2014-12-211-0/+7
|/ /
* | Merge pull request #205 from timothycrosley/feature/fix-issue-203Timothy Edmund Crosley2014-12-212-0/+9
|\ \
| * | Fix bug 203: bad formatting when tabs exist in import linesTimothy Crosley2014-12-211-0/+2
| * | Add test for tab character bugTimothy Crosley2014-12-211-0/+7
|/ /
* | Merge pull request #201 from msabramo/patch-2Timothy Edmund Crosley2014-12-181-0/+1
|\ \
| * | .travis.yml: Add 3.4Marc Abramowitz2014-12-181-0/+1
* | | Merge pull request #200 from msabramo/patch-1Timothy Edmund Crosley2014-12-181-1/+1
|\ \ \ | |/ / |/| |
| * | tox.ini: Add py34Marc Abramowitz2014-12-181-1/+1
|/ /
* | Merge tag '3.9.1' into developTimothy Crosley2014-12-181-2/+2
|\ \ | |/
| * Merge branch 'release/3.9.1'3.9.1Timothy Crosley2014-12-188-28/+91
| |\
| | * Bump release to 3.9.1Timothy Crosley2014-12-181-2/+2
| |/ |/|
* | Bump version to 3.9.1Timothy Crosley2014-12-181-1/+1
* | Merge pull request #199 from timothycrosley/feature/fix-issue-175Timothy Edmund Crosley2014-12-182-4/+9
|\ \
| * | Fix isort to correctly handle forcing . based imports to be separateTimothy Crosley2014-12-181-4/+4
| * | Add failing testTimothy Crosley2014-12-181-0/+5
|/ /
* | Merge pull request #198 from timothycrosley/feature/fix-issue-176Timothy Edmund Crosley2014-12-151-0/+2
|\ \
| * | Fix issue 176Timothy Crosley2014-12-151-0/+2
|/ /
* | Merge pull request #197 from timothycrosley/feature/fix-issue-185Timothy Edmund Crosley2014-12-151-1/+1
|\ \
| * | Change default behavior to use order_by_typeTimothy Crosley2014-12-151-1/+1
|/ /
* | Merge pull request #196 from timothycrosley/feature/fix-feature-181Timothy Edmund Crosley2014-12-152-1/+3
|\ \
| * | Fix issue 181Timothy Crosley2014-12-151-1/+1
| * | Add failing unit test for new standard import unicodedataTimothy Crosley2014-12-151-0/+2
|/ /
* | Merge pull request #194 from timothycrosley/feature/fix-issue-182Timothy Edmund Crosley2014-12-092-1/+3
|\ \
| * | Fix issue 182Timothy Crosley2014-12-092-2/+2
| * | Add test for issue #182Timothy Crosley2014-12-091-0/+2
|/ /