summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #257 from timothycrosley/feature/fix-issue-250Timothy Edmund Crosley2015-02-192-2/+23
|\ \ | | | | | | Feature/fix issue 250
| * | Make test more explicitTimothy Crosley2015-02-191-1/+2
| | |
| * | Implement desired template variable support behaviour in accordince with ↵Timothy Crosley2015-02-191-2/+3
| | | | | | | | | | | | test specification
| * | Add test for desired isort behaviour when dealing with Jinja2 and other {} ↵Timothy Crosley2015-02-191-9/+13
| | | | | | | | | | | | based template systems
| * | Define desired behaviour when encountering jinja variables within import ↵feature/fix-issue-250Timothy Crosley2015-02-191-0/+15
|/ / | | | | | | definitions
* | 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
|\ \ | | | | | | force_grid_wrap code and setting had different names
| * | it worksAdam Hitchcock2015-02-172-7/+30
| | |
* | | Add @normanjaeckel to the Acknowledgements file for fixing command line ↵Timothy Crosley2015-02-191-0/+1
| | | | | | | | | | | | argument issue
* | | Merge pull request #255 from normanjaeckel/developTimothy Edmund Crosley2015-02-191-1/+1
|\ \ \ | |/ / |/| | Fixed command line argument '--trailing-comma'
| * | 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 length
| * | 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 imports
| * | 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.cfg
| * | Accept [isort] section in ~/.isort.cfgReinout van Rees2015-02-061-1/+1
|/ / | | | | | | | | It is a bit weird to have an `[isort]` section in a `setup.cfg` file, but to require a `[settings]` section if it is in `~/.isort.cfg`. At least, I had to look at the isort source code to figure out why it wasn't picking up my settings :-)
* | Merge tag '3.9.6' into developTimothy Crosley2015-02-053-4/+4
|\ \ | |/ | | | | 3.9.6
| * 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 ↵Timothy Crosley2015-02-051-1/+1
| | | | | | | | | | | | itself
| | * 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
|\ \ | | | | | | Feature/fix issue 246
| * | 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
|/ /
* | Merge pull request #245 from timothycrosley/feature/fix-issue-223Timothy Edmund Crosley2015-02-052-3/+4
|\ \ | | | | | | Enforce consistency
| * | Attempt 3 to fix inconsitencuyTimothy Crosley2015-02-051-9/+4
| | |
| * | Enforce consistencyTimothy Crosley2015-02-052-3/+9
|/ /
* | Changing test temporarily to keep from failing statusTimothy Crosley2015-02-051-1/+1
| |
* | Merge tag '3.9.5' into developTimothy Crosley2015-02-053-5/+12
|\ \ | |/ | | | | 3.9.5
| * Merge branch 'release/3.9.5'3.9.5Timothy Crosley2015-02-0510-134/+421
| |\
| | * Bump release to 3.9.4Timothy Crosley2015-02-052-3/+3
| |/ |/|
* | Merge pull request #243 from timothycrosley/feature/fix-issue-223Timothy Edmund Crosley2015-02-051-0/+6
|\ \ | | | | | | Add test to ensure consistency even when not ordering by type
| * | Add test to ensure consistency even when not ordering by typeTimothy Crosley2015-02-051-0/+6
|/ /
* | Merge pull request #242 from timothycrosley/feature/fix-issue-226Timothy Edmund Crosley2015-02-051-0/+8
|\ \ | | | | | | Add test cases from issue 226 thanks to @spookylukey
| * | Add test cases from issue 226 thanks to @spookylukeyfeature/fix-issue-226Timothy Crosley2015-02-051-0/+8
| | |
* | | Smarter virtualenv behaviour inspired by feedback from @spookylukeyTimothy Crosley2015-02-051-1/+8
|/ /
* | Merge pull request #241 from timothycrosley/feature/fix-issue-225Timothy Edmund Crosley2015-02-054-3/+30
|\ \ | | | | | | Feature/fix issue 225
| * | Pass wrap_length setting from console applicationTimothy Crosley2015-02-051-1/+3
| | |
| * | Honor wrap_length settingTimothy Crosley2015-02-051-2/+2
| | |
| * | Add wrap_length settingTimothy Crosley2015-02-051-0/+1
| | |
| * | Add test for wrap length supportTimothy Crosley2015-02-051-0/+24
|/ /
* | Merge pull request #240 from timothycrosley/feature/fix-issue-238Timothy Edmund Crosley2015-02-052-2/+17
|\ \ | | | | | | Feature/fix issue 238
| * | Fix isort to pass additional testTimothy Crosley2015-02-051-4/+2
| | |
| * | Add additional testTimothy Crosley2015-02-051-0/+5
| | |
| * | Fix issue #238Timothy Crosley2015-02-051-2/+6
| | |
| * | Add test for top comments, thanks to @timgrahamTimothy Crosley2015-02-051-0/+8
|/ /
* | Merge pull request #239 from timothycrosley/feature/fix-issue-234Timothy Edmund Crosley2015-02-054-114/+134
|\ \ | | | | | | Feature/fix issue 234
View Lorry Controller Status