summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | typoAlex Gaynor2015-10-171-1/+1
| * | Document that bcrypt doesn't handle long passwordsAlex Gaynor2015-10-171-0/+15
| | * Merge branch 'master' into alex-patch-1Alex Gaynor2015-10-184-6/+4
| | |\ | |_|/ |/| |
* | | Merge pull request #53 from alex/no-py32Hynek Schlawack2015-10-184-6/+4
|\ \ \ | |/ / |/| |
| * | drop python 3.2Alex Gaynor2015-10-174-6/+4
|/ /
| * here tooAlex Gaynor2015-09-151-1/+1
| * Added python3.5Alex Gaynor2015-09-151-0/+2
|/
* Merge pull request #46 from chris-erickson/patch-1Paul Kehrer2015-06-211-1/+14
|\
| * Update badge and system package requirementsChris Erickson2015-06-211-3/+3
| * Update README to include additional install stepsChris Erickson2015-06-201-1/+14
|/
* Merge pull request #44 from dstufft/bump-version22.0.0Paul Kehrer2015-06-121-1/+1
|\
| * Bump version to 2.0.0Donald Stufft2015-06-121-1/+1
* | Merge pull request #45 from dstufft/pr/36Paul Kehrer2015-06-123-86/+107
|\ \ | |/ |/|
| * Document the adjustable prefixDonald Stufft2015-06-121-0/+8
| * Add tests for gensalt(prefix) functionalityjazzyb2015-06-121-0/+10
| * Add prefix option to gensalt() - default to "2b"jazzyb2015-06-122-86/+89
|/
* Merge pull request #43 from dstufft/cffi1.0Paul Kehrer2015-06-1126-200/+157
|\
| * Install PyPy 2.6 on TravisDonald Stufft2015-06-113-2/+30
| * Migrate to using CFFI 1.0Donald Stufft2015-06-1123-198/+127
|/
* Merge pull request #40 from reaperhulk/1.1.1-version-bumpv1.1.1Alex Gaynor2015-03-131-1/+1
|\
| * bump version to 1.1.1Paul Kehrer2015-03-131-1/+1
|/
* Merge pull request #35 from alex/docker!Donald Stufft2015-03-131-0/+2
|\
| * Try out the new travis docker infraAlex Gaynor2014-12-171-0/+2
* | Merge pull request #38 from alex/nul-bytesDonald Stufft2015-03-132-0/+8
|\ \
| * | flake8Alex Gaynor2015-03-131-0/+1
| * | Error out on NUL bytes.Alex Gaynor2015-03-132-0/+7
* | | Merge pull request #39 from alex/how-to-reportDonald Stufft2015-03-131-0/+8
|\ \ \ | |/ / |/| |
| * | fixed typoAlex Gaynor2015-03-131-3/+3
| * | Document how to report a security issueAlex Gaynor2015-03-131-0/+8
|/ /
* | Merge pull request #37 from reaperhulk/update-readme-and-ignoresAlex Gaynor2015-03-042-1/+7
|\ \ | |/ |/|
| * fix indentationPaul Kehrer2015-03-041-1/+1
| * update gitignoresPaul Kehrer2015-03-041-0/+2
| * update badge and add new badgePaul Kehrer2015-03-041-1/+5
|/
* Merge pull request #33 from dstufft/bump-versionv1.1.0Alex Gaynor2014-12-061-1/+1
|\
| * Bump version to 1.1.0Donald Stufft2014-12-061-1/+1
|/
* Merge pull request #30 from alex/increase-the-work-factorDonald Stufft2014-12-061-1/+1
|\
| * Make the example of changing the workfactor *increase* it, rather than decrea...Alex Gaynor2014-12-061-1/+1
* | Merge pull request #31 from alex/no-more-mockDonald Stufft2014-12-063-11/+3
|\ \
| * | Removed usage of mock which wasn't really doing anythingAlex Gaynor2014-12-063-11/+3
| |/
* | Merge pull request #32 from alex/simplify-testDonald Stufft2014-12-061-1/+1
|\ \ | |/ |/|
| * Simplify, very slightly, how the parameterize decorator is usedAlex Gaynor2014-12-061-1/+1
|/
* Merge pull request #29 from alex/scrap-attr-dictDonald Stufft2014-12-061-21/+8
|\
| * scrapped attribute dict in setup.py, it wasn't doing muchAlex Gaynor2014-12-051-21/+8
|/
* Merge pull request #28 from dstufft/slight-rewordAlex Gaynor2014-12-051-1/+1
|\
| * Slightly reword this not to specify every single Python versionDonald Stufft2014-12-051-1/+1
* | Merge pull request #27 from dstufft/upgrade-c-libAlex Gaynor2014-12-0521-59/+86
|\ \
| * | Disable ASM againDonald Stufft2014-12-051-1/+1
| * | Upgrade crypt_blowfish to 1.3Donald Stufft2014-12-0521-60/+87
| |/
* | Merge pull request #26 from dstufft/disable-implicit-compileAlex Gaynor2014-12-052-0/+16
|\ \ | |/ |/|
| * Disable the ability to implicitly compile the CFFI moduleDonald Stufft2014-12-052-0/+16
|/