summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge in latest changes from developcustom-sectionsTimothy Crosley2015-07-128-17/+620
|\
| * Merge pull request #264 from mvantellingen/feature/use-parenthesesTimothy Edmund Crosley2015-07-123-2/+18
| |\
| | * Implement `use_parentheses`.Michael van Tellingen2015-03-313-2/+18
| * | Merge pull request #281 from patrickyevsukov/bug-fix/import-splittingTimothy Edmund Crosley2015-07-123-3/+16
| |\ \
| | * | Fix Import Line Splitting BugPatrick Yevsukov2015-06-103-3/+16
| * | | Merge pull request #276 from cmeeren/patch-1Timothy Edmund Crosley2015-07-121-1/+1
| |\ \ \
| | * | | add "io" as known standard libraryChrister van der Meeren2015-06-041-1/+1
| | |/ /
| * | | Merge pull request #285 from timothycrosley/feature/no-depsTimothy Edmund Crosley2015-07-127-11/+583
| |\ \ \ | | |/ / | |/| |
| | * | Switch to using pie_slice, removing all dependenciesTimothy Crosley2015-07-126-7/+532
| | * | Remove natsorted as dependency replace with built in solution.Timothy Crosley2015-07-123-5/+52
| |/ /
* | | Modules in known_first_party or know_third_party will override ones in stdlib.Derrick Petzold2015-05-312-1/+22
* | | Custom section ordering and support.Derrick Petzold2015-05-316-25/+98
* | | Ignore .eggs.Derrick Petzold2015-05-301-0/+1
* | | Added flake8 configuration.Derrick Petzold2015-05-301-0/+4
|/ /
* | Merge pull request #269 from jdunck/print_skip_countTimothy Edmund Crosley2015-05-072-1/+9
|\ \
| * | Print the number of skipped files, if anyJeremy Dunck2015-05-012-1/+9
| |/
* | Merge pull request #262 from benjaminabel/setuptools-integrationTimothy Edmund Crosley2015-05-076-16/+127
|\ \
| * | Add Setuptools integration issue #261Benjamin ABEL2015-03-026-16/+127
| |/
* | Merge pull request #266 from timothycrosley/feature/fix-issue-265Timothy Edmund Crosley2015-05-072-1/+10
|\ \
| * | 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 #268 from timonwong/patch-1Timothy Edmund Crosley2015-05-071-1/+1
|\ \ | |/ |/|
| * Fix [Error 22] under Windows reading .editorconfigTimon Wong/NHNCN2015-04-231-1/+1
|/
* 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
|/ /