summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into feature/fix-issue-907feature/fix-issue-907Timothy Edmund Crosley2019-03-233-2/+11
|\
| * Merge pull request #900 from timothycrosley/feature/fix-issue-778Timothy Edmund Crosley2019-03-233-2/+11
* | Fix issue #907, adding minimal appdirs requirement versionTimothy Crosley2019-03-232-1/+2
|/
* Merge pull request #911 from timothycrosley/feature/fix-issue-909Timothy Edmund Crosley2019-03-233-3/+38
|\
| * Fix config errorTimothy Crosley2019-03-231-1/+1
| * Update changelogTimothy Crosley2019-03-231-0/+3
| * Add both cases to testTimothy Crosley2019-03-231-0/+2
| * Update main.py to take into account the provided settings path (if there is one)Timothy Crosley2019-03-231-1/+2
| * Sort test_isort.py's importsTimothy Crosley2019-03-231-3/+4
| * Add test case for issue #909 - settings path skip files ignoredTimothy Crosley2019-03-231-0/+28
|/
* Bump version4.3.15Timothy Crosley2019-03-102-2/+2
* Merge branch 'master' of https://github.com/timothycrosley/isortTimothy Crosley2019-03-103-2/+17
|\
| * Merge pull request #898 from timothycrosley/feature/fix-issue-811Timothy Edmund Crosley2019-03-103-2/+17
| |\
| | * Fix handling of whitespace characterTimothy Crosley2019-03-103-2/+17
| |/
* | Enable autodeployTimothy Crosley2019-03-101-32/+40
|/
* Merge pull request #897 from timothycrosley/feature/better-help-docTimothy Edmund Crosley2019-03-101-1/+3
|\
| * Improve help documentationfeature/better-help-docTimothy Crosley2019-03-101-1/+3
* | Merge pull request #896 from timothycrosley/feature/fix-issue-895Timothy Edmund Crosley2019-03-102-2/+9
|\ \ | |/
| * Update changelogfeature/fix-issue-895Timothy Crosley2019-03-101-0/+3
| * Fix issue 895Timothy Crosley2019-03-101-2/+6
|/
* Bump versionTimothy Crosley2019-03-092-2/+2
* Update changelog to include latest changeTimothy Crosley2019-03-091-0/+3
* Merge pull request #894 from timothycrosley/feature/fix-skip-of-star-dir-globTimothy Edmund Crosley2019-03-092-2/+3
|\
| * Fix issue with */ style glob testsfeature/fix-skip-of-star-dir-globTimothy Crosley2019-03-081-1/+1
| * Add addition test to ensure */directory/*.py glob pattern works as expectedTimothy Crosley2019-03-081-1/+2
|/
* Bump release4.3.13Timothy Crosley2019-03-082-2/+2
* Merge pull request #883 from bcroq/file-encodingTimothy Edmund Crosley2019-03-082-15/+38
|\
| * Update isort.pyTimothy Edmund Crosley2019-03-081-2/+2
| * Update isort.pyTimothy Edmund Crosley2019-03-081-1/+0
| * Merge branch 'master' into file-encodingTimothy Edmund Crosley2019-03-088-30/+127
| |\
| * | work on file encoding detectionBertrand Croq2019-03-062-15/+38
* | | Update changelogTimothy Crosley2019-03-081-1/+3
* | | Merge pull request #893 from timothycrosley/feature/fix-issue-889Timothy Edmund Crosley2019-03-083-2/+11
|\ \ \ | |_|/ |/| |
| * | Fix issue #889: Isort should not add blank lines to beginning of fileTimothy Crosley2019-03-083-2/+11
* | | Merge pull request #892 from timothycrosley/feature/fix-issue-890Timothy Edmund Crosley2019-03-085-2/+28
|\ \ \ | |/ /
| * | Remove extra new line at end of test filefeature/fix-issue-890Timothy Crosley2019-03-081-1/+0
| * | Fix issue #890Timothy Crosley2019-03-075-2/+29
|/ /
* | Merge pull request #891 from timothycrosley/feature/fix-issue-885Timothy Edmund Crosley2019-03-074-15/+44
|\ \
| * | Fix logic error in skip checkTimothy Crosley2019-03-071-1/+1
| * | Fix file skipping in particular with globsTimothy Crosley2019-03-074-13/+35
| * | Add first additional test casefeature/fix-issue-885Timothy Crosley2019-03-071-1/+8
|/ /
* | Merge pull request #886 from timothycrosley/feature/anaconda-supportTimothy Edmund Crosley2019-03-063-7/+27
|\ \
| * | Update changelog to inclde notice about 4.3.13 releasefeature/anaconda-supportTimothy Crosley2019-03-061-0/+4
| * | Implement conda environment supportTimothy Crosley2019-03-062-7/+23
|/ /
* | Merge in fix for quiet modeEmil Melnikov2019-03-062-1/+18
* | Prepare changelog for 4.3.12 release4.3.12Timothy Crosley2019-03-064-3/+7
|/
* Bump version4.3.11Timothy Crosley2019-03-062-2/+2
* Fix newline argumentTimothy Crosley2019-03-061-1/+1
* Allow fallback to OS encodingTimothy Crosley2019-03-061-6/+18
* Update changelogTimothy Crosley2019-03-061-1/+2
View Lorry Controller Status