summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Ensure a commant can't accidentily get added twicefeature/fix-issue-303Timothy Crosley2015-08-241-6/+6
* Add test to ensure comments don't get duplicatedTimothy Crosley2015-08-231-0/+11
* Add code coverage badgeTimothy Crosley2015-08-221-0/+5
* Clean up imagesTimothy Crosley2015-08-211-3/+3
* Clean up imagesTimothy Crosley2015-08-211-1/+5
* Clean up imagesTimothy Crosley2015-08-211-3/+0
* Clean up imagesTimothy Crosley2015-08-211-4/+3
* Clean up images, add gitterTimothy Crosley2015-08-211-15/+6
* Merge pull request #309 from gitter-badger/gitter-badgeTimothy Edmund Crosley2015-08-211-0/+5
|\
| * Added Gitter badgeThe Gitter Badger2015-08-221-0/+5
|/
* Merge pull request #306 from dchanm/globbingTimothy Edmund Crosley2015-08-213-2/+12
|\
| * Add globbing support, fixes timothycrosley/isort#292David Chan2015-07-243-2/+12
* | Merge pull request #294 from gforcada/no-sectionsTimothy Edmund Crosley2015-08-213-1/+60
|\ \
| * | Sort all imports alphabeticallyGil Forcada2015-08-073-1/+60
| |/
* | Merge pull request #307 from adamchainz/readme_rstTimothy Edmund Crosley2015-08-212-77/+180
|\ \
| * | Convert README to rstAdam Chainz2015-08-212-77/+180
| |/
* | Merge pull request #308 from timothycrosley/feature/ascii-artTimothy Edmund Crosley2015-08-211-0/+26
|\ \
| * | Make consistent, remove unnecarry importfeature/ascii-artTimothy Crosley2015-08-211-4/+3
| * | Add ascii art on running isortTimothy Crosley2015-08-211-0/+27
* | | Add @danbaragan to contributor list thanks to his bug fix contributionTimothy Crosley2015-08-211-0/+1
|/ /
* | Merge pull request #293 from danbaragan/developTimothy Edmund Crosley2015-08-211-4/+8
|\ \ | |/ |/|
| * Fix order of sections when loading them from config fileDaniel Mihai Bărăgan2015-08-041-4/+8
|/
* Merge pull request #291 from timothycrosley/feature/260Timothy Edmund Crosley2015-07-151-0/+4
|\
| * Add test for issue 260feature/260Timothy Crosley2015-07-151-0/+4
|/
* Merge pull request #290 from timothycrosley/feature/fix-issue-284Timothy Edmund Crosley2015-07-152-8/+32
|\
| * Fix isort to match test specifications and correctly handle top of file commentsTimothy Crosley2015-07-152-8/+24
| * Add failing test to define how top of file / first comments should behave, th...feature/fix-issue-284Timothy Crosley2015-07-141-0/+8
|/
* Sort isortTimothy Crosley2015-07-134-5/+5
* Merge tag '4.0.0' into developTimothy Crosley2015-07-123-3/+10
|\
| * Merge branch 'release/4.0.0'4.0.0Timothy Crosley2015-07-1216-105/+1052
| |\
| | * Add ContributorsTimothy Crosley2015-07-121-0/+7
| | * Bump version to 4.0.0Timothy Crosley2015-07-122-3/+3
| |/ |/|
* | Merge pull request #288 from timothycrosley/feature/python35-supportTimothy Edmund Crosley2015-07-122-4/+4
|\ \
| * | Fix README to note 3.5 supportTimothy Crosley2015-07-121-1/+1
| * | Add python3.5 to toxTimothy Crosley2015-07-121-3/+3
|/ /
* | Merge pull request #287 from timothycrosley/feature/respect-coding-declerationTimothy Edmund Crosley2015-07-123-4/+44
|\ \
| * | Fix testTimothy Crosley2015-07-121-1/+1
| * | Merge in latest changesTimothy Crosley2015-07-123-4/+44
| |\ \ |/ / /
| * | minor fixwim glenn2015-06-051-1/+1
| * | why not just use utf8 in the source directly, actuallywim glenn2015-06-051-1/+2
| * | py2/py3 compatwim glenn2015-06-052-5/+26
| * | ignore gen .eggs dirwim glenn2015-06-051-0/+1
| * | fix typowim glenn2015-06-051-1/+1
| * | test gnarly encodingswim glenn2015-06-051-0/+17
* | | Merge pull request #286 from timothycrosley/custom-sectionsTimothy Edmund Crosley2015-07-128-25/+126
|\ \ \
| * \ \ 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
| | |_|/ / | |/| | |