summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix formattingfeature/fix-issue-317Timothy Crosley2015-08-311-0/+1
* Add quiet option inclusion to changelogTimothy Crosley2015-08-311-0/+1
* Add quiet optionTimothy Crosley2015-08-313-4/+7
* Merge branch 'develop' of https://github.com/timothycrosley/isort into developTimothy Crosley2015-08-311-2/+3
|\
| * Merge pull request #320 from Amwam/feature/skip-non-absolute-pathsTimothy Edmund Crosley2015-08-311-2/+3
| |\
| | * Allow files that are skipped to non-absolute pathsAmit Shah2015-08-311-2/+3
* | | Update acknowledgements, changelog, to mention @Amwam's contributionTimothy Crosley2015-08-312-2/+3
|/ /
* | Update changelog to mention fixTimothy Crosley2015-08-311-0/+3
* | Merge pull request #321 from timothycrosley/feature/fix-issue-316Timothy Edmund Crosley2015-08-312-0/+13
|\ \ | |/ |/|
| * Fix issue #316: Top of line comment ruining orderTimothy Crosley2015-08-311-0/+4
| * Add test case for issue #316Timothy Crosley2015-08-311-0/+9
|/
* Merge tag '4.1.0' into developTimothy Crosley2015-08-302-3/+3
|\
| * Merge branch 'release/4.1.0'4.1.0Timothy Crosley2015-08-3011-111/+432
| |\
| | * Bump version to 4.1.0Timothy Crosley2015-08-302-3/+3
| |/ |/|
* | Merge branch 'develop' of https://github.com/timothycrosley/isort into developTimothy Crosley2015-08-301-3/+6
|\ \
| * \ Merge pull request #315 from timothycrosley/feature/fix-issue-296Timothy Edmund Crosley2015-08-301-3/+6
| |\ \
| | * | Specify that argument must be set twice for --skipTimothy Crosley2015-08-301-3/+6
| |/ /
* | | Update changelog to mark fix of issue #296Timothy Crosley2015-08-301-0/+1
|/ /
* | Add @robcowie to acknowledgements for adding an isort pylama extensionTimothy Crosley2015-08-301-0/+1
* | Add example gifTimothy Crosley2015-08-303-5/+14
* | Merge pull request #314 from robcowie/feature/pylama-extensionTimothy Edmund Crosley2015-08-302-0/+28
|\ \
| * | Implement pylama isort extension.Rob Cowie2015-08-302-0/+28
|/ /
* | Merge pull request #313 from timothycrosley/feature/fix-issue-312/crash-on-si...Timothy Edmund Crosley2015-08-292-6/+16
|\ \
| * | Fix sorting issueTimothy Crosley2015-08-281-6/+8
| * | Add test for issue #312Timothy Crosley2015-08-271-0/+8
|/ /
* | Improve documentationTimothy Crosley2015-08-261-1/+1
* | Add initial changelogTimothy Crosley2015-08-261-0/+12
* | Merge branch 'develop' of https://github.com/timothycrosley/isort into developTimothy Crosley2015-08-251-0/+14
|\ \
| * \ Merge pull request #311 from timothycrosley/feature/fix-issue-260Timothy Edmund Crosley2015-08-241-0/+14
| |\ \
| | * | Ensure that issue 260 is fixedfeature/fix-issue-260Timothy Crosley2015-08-241-0/+14
| |/ /
* | | Improve documentation, noting that check requires correctly formatted imports...Timothy Crosley2015-08-251-1/+1
|/ /
* | Merge pull request #310 from timothycrosley/feature/fix-issue-303Timothy Edmund Crosley2015-08-242-6/+17
|\ \
| * | 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