summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add test for issue 246feature/fix-issue-246Timothy Crosley2015-02-051-0/+8
* Merge pull request #245 from timothycrosley/feature/fix-issue-223Timothy Edmund Crosley2015-02-052-3/+4
|\
| * Attempt 3 to fix inconsitencuyTimothy Crosley2015-02-051-9/+4
| * Enforce consistencyTimothy Crosley2015-02-052-3/+9
|/
* Changing test temporarily to keep from failing statusTimothy Crosley2015-02-051-1/+1
* Merge tag '3.9.5' into developTimothy Crosley2015-02-053-5/+12
|\
| * Merge branch 'release/3.9.5'3.9.5Timothy Crosley2015-02-0510-134/+421
| |\
| | * Bump release to 3.9.4Timothy Crosley2015-02-052-3/+3
| |/ |/|
* | Merge pull request #243 from timothycrosley/feature/fix-issue-223Timothy Edmund Crosley2015-02-051-0/+6
|\ \
| * | Add test to ensure consistency even when not ordering by typeTimothy Crosley2015-02-051-0/+6
|/ /
* | Merge pull request #242 from timothycrosley/feature/fix-issue-226Timothy Edmund Crosley2015-02-051-0/+8
|\ \
| * | Add test cases from issue 226 thanks to @spookylukeyfeature/fix-issue-226Timothy Crosley2015-02-051-0/+8
* | | Smarter virtualenv behaviour inspired by feedback from @spookylukeyTimothy Crosley2015-02-051-1/+8
|/ /
* | Merge pull request #241 from timothycrosley/feature/fix-issue-225Timothy Edmund Crosley2015-02-054-3/+30
|\ \
| * | Pass wrap_length setting from console applicationTimothy Crosley2015-02-051-1/+3
| * | Honor wrap_length settingTimothy Crosley2015-02-051-2/+2
| * | Add wrap_length settingTimothy Crosley2015-02-051-0/+1
| * | Add test for wrap length supportTimothy Crosley2015-02-051-0/+24
|/ /
* | Merge pull request #240 from timothycrosley/feature/fix-issue-238Timothy Edmund Crosley2015-02-052-2/+17
|\ \
| * | Fix isort to pass additional testTimothy Crosley2015-02-051-4/+2
| * | Add additional testTimothy Crosley2015-02-051-0/+5
| * | Fix issue #238Timothy Crosley2015-02-051-2/+6
| * | Add test for top comments, thanks to @timgrahamTimothy Crosley2015-02-051-0/+8
|/ /
* | Merge pull request #239 from timothycrosley/feature/fix-issue-234Timothy Edmund Crosley2015-02-054-114/+134
|\ \
| * | Enable forcing from imports to come firstTimothy Crosley2015-02-051-114/+124
| * | Update test to specify from imports come firstTimothy Crosley2015-02-051-1/+1
| * | Add a test for desired from_first behaviourfeature/fix-issue-234Timothy Crosley2015-02-041-0/+7
| * | statusTimothy Crosley2015-02-042-0/+3
|/ /
* | Merge branch 'develop' of https://github.com/timothycrosley/isort into developTimothy Crosley2015-02-043-1/+20
|\ \
| * \ Merge pull request #236 from timothycrosley/timgraham-224Timothy Edmund Crosley2015-02-043-1/+20
| |\ \
| | * \ Merge latest from developTimothy Crosley2015-02-043-1/+20
| | |\ \ | |/ / /
| | * | Fix mangling of imports that end in "import" or "from".Tim Graham2015-02-043-1/+21
* | | | Add @NorthIsUp to acknowledegments for work allowing from imports to always wrapTimothy Crosley2015-02-041-0/+1
|/ / /
* | | Add Tim Graham (@timgraham) to acknowledgement file for implementing trailing...Timothy Crosley2015-02-041-0/+2
|/ /
* | Merge pull request #232 from timgraham/221Timothy Edmund Crosley2015-02-045-4/+87
|\ \
| * | Fix #221 -- Add include_trailing_comma setting.Tim Graham2015-02-035-4/+87
* | | Merge pull request #235 from timothycrosley/feature/fixed-readmeTimothy Edmund Crosley2015-02-042-1/+14
|\ \ \ | |/ / |/| |
| * | Add people who contributed to the isort documentationTimothy Crosley2015-02-041-0/+7
| * | Another attempt at fixing the readmeTimothy Crosley2015-02-041-2/+3
| * | Attempt twoTimothy Crosley2015-02-041-0/+1
| * | Small change to readmeTimothy Crosley2015-02-041-1/+5
|/ /
* | undertake variables don't need to be nested within 'settings'Timothy Crosley2015-01-191-1/+0
* | Add support for undertakeTimothy Crosley2015-01-171-0/+5
* | Merge pull request #219 from helenst/isorting-isortTimothy Edmund Crosley2015-01-171-2/+2
|\ \
| * | Prevent line containing isort:import tripping up over itselfHelen Sherwood-Taylor2015-01-151-2/+2
* | | Merge pull request #218 from helenst/git-hookTimothy Edmund Crosley2015-01-174-1/+103
|\ \ \
| * | | Added git hook and documentationHelen Sherwood-Taylor2015-01-154-1/+103
| |/ /
* | | Fix copyright noticeTimothy Crosley2015-01-071-0/+2
* | | Merge tag '3.9.4' into developTimothy Crosley2014-12-292-3/+3
|\ \ \ | |/ /
| | * Merge pull request #237 from NorthIsUp/unified_diffTimothy Edmund Crosley2015-02-051-2/+9
| | |\
View Lorry Controller Status