summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix isort skipping codefeature/fix-issue-337Timothy Crosley2015-09-181-2/+1
* Update main to correctly skip filesTimothy Crosley2015-09-181-10/+9
* Update editor config to skip toxTimothy Crosley2015-09-181-1/+1
* Update terminal isort client to proactively skip filesTimothy Crosley2015-09-181-5/+23
* Update isort to use moved skip commandTimothy Crosley2015-09-181-19/+1
* Use moved skipping logic for isortTimothy Crosley2015-09-181-7/+10
* Move and consilidate skipping code into setting moduleTimothy Crosley2015-09-181-0/+19
* Add Lee Packham (@leepa)Timothy Crosley2015-09-161-0/+1
* Merge pull request #335 from leepa/developTimothy Edmund Crosley2015-09-161-2/+2
|\
| * Fix compatibility with Python 3.5Lee Packham2015-09-161-2/+2
|/
* Merge pull request #334 from timothycrosley/feature/fix-issue-325Timothy Edmund Crosley2015-09-151-3/+11
|\
| * Get rid of isort banner except for versionfeature/fix-issue-325Timothy Crosley2015-09-151-3/+11
|/
* Merge pull request #333 from timothycrosley/feature/fix-issue-328Timothy Edmund Crosley2015-09-152-66/+70
|\
| * Fix alphabetic only sortTimothy Crosley2015-09-151-66/+53
| * Fix test caseTimothy Crosley2015-09-151-1/+1
| * Fix test case to conform to standard formatTimothy Crosley2015-09-151-1/+1
| * Fix test case to conform to standard formatTimothy Crosley2015-09-151-3/+2
| * Add tests cases for fixing issue 328Timothy Crosley2015-09-151-0/+18
|/
* Add Ankur Dedania (@AbsoluteMSTR)Timothy Crosley2015-09-151-0/+1
* Add David Stensland (@terite)Timothy Crosley2015-09-151-0/+1
* Add @dein0sTimothy Crosley2015-09-151-0/+1
* Add Patrick Gerken @do3ccTimothy Crosley2015-09-151-0/+1
* Merge pull request #332 from AbsoluteMSTR/patch-1Timothy Edmund Crosley2015-09-151-1/+1
|\
| * Point pylama extension to the correct entry point.Ankur Dedania2015-09-151-1/+1
|/
* Merge pull request #330 from terite/skip-with-contentsTimothy Edmund Crosley2015-09-142-2/+12
|\
| * skip files even when file_contents is providedDavid Stensland2015-09-082-2/+12
* | Merge pull request #329 from dein0s/feature/fix_custom_sections_parseTimothy Edmund Crosley2015-09-142-3/+48
|\ \
| * | Fix due to the https://travis-ci.org/timothycrosley/isort/jobs/78886967dein0s2015-09-051-14/+16
| * | Fixed custom sections parsing from config file (unicode string -> list).dein0s2015-09-052-3/+46
| |/
* | Merge pull request #326 from do3cc/NOQATimothy Edmund Crosley2015-09-145-2/+52
|\ \ | |/ |/|
| * Find more edge casesPatrick Gerken2015-09-042-1/+4
| * Catch case where NOQA already existsPatrick Gerken2015-09-042-5/+15
| * Adding NOQA OptionPatrick Gerken2015-09-045-2/+39
|/
* Merge tag '4.1.2' into developTimothy Crosley2015-09-012-3/+3
|\
| * Merge branch 'release/4.1.2'4.1.2Timothy Crosley2015-09-014-4/+7
| |\
| | * Bump version to 4.1.2Timothy Crosley2015-09-012-3/+3
| |/ |/|
* | Update changelogTimothy Crosley2015-09-011-0/+3
* | Merge pull request #324 from timothycrosley/feature/fix-issue-323Timothy Edmund Crosley2015-09-011-1/+1
|\ \
| * | Fix accidental changeTimothy Crosley2015-09-011-1/+1
|/ /
* | Merge tag '4.1.1' into developTimothy Crosley2015-08-312-3/+3
|\ \ | |/
| * Merge branch 'release/4.1.1'4.1.1Timothy Crosley2015-08-318-8/+31
| |\
| | * Bump release to 4.1.1Timothy Crosley2015-08-312-3/+3
| |/ |/|
* | Merge pull request #322 from timothycrosley/feature/fix-issue-317Timothy Edmund Crosley2015-08-315-4/+9
|\ \
| * | 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
|/ / /