summaryrefslogtreecommitdiffhomepage
path: root/sites
AgeCommit message (Collapse)Author
2014-03-26Merge branch 'master' into gssapi-py3-supportSebastian Deiss
Conflicts: .gitignore README demos/demo_simple.py dev-requirements.txt paramiko/__init__.py paramiko/_winapi.py paramiko/agent.py paramiko/auth_handler.py paramiko/ber.py paramiko/buffered_pipe.py paramiko/channel.py paramiko/client.py paramiko/common.py paramiko/dsskey.py paramiko/ecdsakey.py paramiko/file.py paramiko/hostkeys.py paramiko/kex_gex.py paramiko/kex_group1.py paramiko/message.py paramiko/packet.py paramiko/pkey.py paramiko/primes.py paramiko/proxy.py paramiko/py3compat.py paramiko/server.py paramiko/sftp_client.py paramiko/transport.py paramiko/util.py paramiko/win_pageant.py setup.py sites/shared_conf.py sites/www/changelog.rst sites/www/conf.py sites/www/index.rst sites/www/installing.rst test.py tests/loop.py tests/stub_sftp.py tests/test_auth.py tests/test_client.py tests/test_file.py tests/test_hostkeys.py tests/test_kex.py tests/test_message.py tests/test_packetizer.py tests/test_pkey.py tests/test_sftp.py tests/test_sftp_big.py tests/test_transport.py tests/test_util.py
2014-03-22Merge branch '1.13'Jeff Forcier
2014-03-22Expand changelog to include #292Jeff Forcier
2014-03-22Revert "Revert "Changelog fixes #290""Jeff Forcier
This reverts commit bd81c94825747f082c9c066abab8136d9831a3f2.
2014-03-22Merge branch '1.12' into 1.13Jeff Forcier
2014-03-22Merge branch '1.11' into 1.12Jeff Forcier
2014-03-22Revert "Changelog fixes #290"Jeff Forcier
This reverts commit 270dacaf33279bed2ae599d718183cec541e032d.
2014-03-22Merge branch '1.13'Jeff Forcier
2014-03-22Merge branch '1.12' into 1.13Jeff Forcier
2014-03-22Merge branch '1.11' into 1.12Jeff Forcier
2014-03-22Changelog fixes #290Jeff Forcier
2014-03-21Real title too large for sidebarJeff Forcier
2014-03-21Merge branch '1.12' into 1.13Jeff Forcier
2014-03-21Merge branch '1.11' into 1.12Jeff Forcier
2014-03-21Merge branch '1.10' into 1.11Jeff Forcier
2014-03-21Uggh how did this slip inJeff Forcier
2014-03-21Uggh how did this slip inJeff Forcier
2014-03-21Start an FAQ and answer it with a new install sectionJeff Forcier
2014-03-21Merge branch '1.13'Jeff Forcier
2014-03-21Merge branch '1.12' into 1.13Jeff Forcier
2014-03-21Merge branch '1.11' into 1.12Jeff Forcier
2014-03-21Changelog re #284Jeff Forcier
2014-03-15Merge branch 'python3'Jeff Forcier
2014-03-13Merge branch '1.12' into 1.13Jeff Forcier
Conflicts: paramiko/file.py paramiko/server.py paramiko/sftp_client.py sites/www/changelog.rst
2014-03-13Merge branch '1.11' into 1.12Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-03-13Improve string type testing in Python 2.x versionsJeff Forcier
2014-03-13Changelog for 1.13.0Jeff Forcier
2014-03-13Merge branch '1.12' into 1.13Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-03-13Changelog for 1.12.3Jeff Forcier
2014-03-13Merge branch '1.11' into 1.12Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-03-13Changelog for 1.11.5Jeff Forcier
2014-03-13Merge branch '1.10' into 1.11.Jeff Forcier
Also bump versions like a dummy. Conflicts: paramiko/__init__.py setup.py
2014-03-13Cut 1.10.7Jeff Forcier
2014-03-13Update docs to reflect Python 2.6+, 3.3+ compatJeff Forcier
2014-03-13Fix accidental Markdown formatting miss for an older entryJeff Forcier
2014-03-13Add changelog re #16Jeff Forcier
2014-03-07Attempt to fix docs for py3Jeff Forcier
2014-03-04Testing out intersphinx in changelogJeff Forcier
2014-03-04Merge branch '1.12'Jeff Forcier
2014-03-04Merge branch '1.11' into 1.12Jeff Forcier
2014-03-04Merge branch '1.10' into 1.11Jeff Forcier
2014-03-04Note Sphinx docs issue was backportedJeff Forcier
2014-03-04Merge branch '1.12'Jeff Forcier
2014-03-04Merge branch '1.11' into 1.12Jeff Forcier
2014-03-04Merge branch '1.10' into 1.11Jeff Forcier
2014-03-04Semi no-op fix to test RTD hooksJeff Forcier
2014-03-04Merge branch '1.12'Jeff Forcier
2014-03-04Merge branch '1.11' into 1.12Jeff Forcier
Conflicts: paramiko/hostkeys.py
2014-03-03Merge branch '1.10' into 1.11Jeff Forcier
Conflicts: fabfile.py paramiko/__init__.py
2014-03-03Re-enable Intersphinx from www -> docsJeff Forcier