summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix configuration to match new requirementsfeature/fix-issue-265Timothy Crosley2015-04-151-1/+1
* Add tests to ensure isort correctly recognizes fcntl as a first party importTimothy Crosley2015-04-151-0/+9
* Merge pull request #257 from timothycrosley/feature/fix-issue-250Timothy Edmund Crosley2015-02-192-2/+23
|\
| * Make test more explicitTimothy Crosley2015-02-191-1/+2
| * Implement desired template variable support behaviour in accordince with test...Timothy Crosley2015-02-191-2/+3
| * Add test for desired isort behaviour when dealing with Jinja2 and other {} ba...Timothy Crosley2015-02-191-9/+13
| * Define desired behaviour when encountering jinja variables within import defi...feature/fix-issue-250Timothy Crosley2015-02-191-0/+15
|/
* Add support for formatted list separated valuesTimothy Crosley2015-02-191-2/+6
* Remove uneeded print statementTimothy Crosley2015-02-191-1/+0
* Merge pull request #256 from NorthIsUp/patch-1Timothy Edmund Crosley2015-02-192-7/+30
|\
| * it worksAdam Hitchcock2015-02-172-7/+30
* | Add @normanjaeckel to the Acknowledgements file for fixing command line argum...Timothy Crosley2015-02-191-0/+1
* | Merge pull request #255 from normanjaeckel/developTimothy Edmund Crosley2015-02-191-1/+1
|\ \ | |/ |/|
| * Fixed command line argument '--trailing-comma'Norman Jäckel2015-02-141-1/+1
|/
* Merge pull request #253 from NorthIsUp/from_wrap3Timothy Edmund Crosley2015-02-133-27/+48
|\
| * force grid wrapping regardles of line lengthAdam Hitchcock2015-02-133-27/+48
|/
* Merge pull request #251 from brutasse/fix/combine-as-switchTimothy Edmund Crosley2015-02-111-0/+2
|\
| * Add command-line switch for combining as importsBruno Renié2015-02-111-0/+2
|/
* Changing test for nowTimothy Crosley2015-02-061-1/+1
* Another attempt to fix sorting issueTimothy Crosley2015-02-061-3/+2
* Merge pull request #248 from reinout/patch-2Timothy Edmund Crosley2015-02-061-1/+1
|\
| * Accept [isort] section in ~/.isort.cfgReinout van Rees2015-02-061-1/+1
|/
* Merge tag '3.9.6' into developTimothy Crosley2015-02-053-4/+4
|\
| * Merge branch 'release/3.9.6'3.9.6Timothy Crosley2015-02-054-14/+28
| |\
| | * Fix how isort handles custom placement, in order to ensure it can be ran on i...Timothy Crosley2015-02-051-1/+1
| | * Bump release to 3.9.6Timothy Crosley2015-02-052-3/+3
| |/ |/|
* | Merge pull request #247 from timothycrosley/feature/fix-issue-246Timothy Edmund Crosley2015-02-052-8/+21
|\ \
| * | Fix issue by appending all above comments not just most recent oneTimothy Crosley2015-02-051-8/+13
| * | 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