Commit Graph

1404 Commits

Author SHA1 Message Date
Jeff Forcier 5aa0d401f6 Merge branch '1.11' into 1.12 2014-01-30 14:29:19 -08:00
Jeff Forcier 397cd4ce99 Merge branch '1.10' into 1.11 2014-01-30 14:29:16 -08:00
Jeff Forcier 55722240b5 Fix broken link format 2014-01-30 14:20:13 -08:00
Jeff Forcier 52183257d0 Remove blog link for now 2014-01-30 14:20:04 -08:00
Jeff Forcier 7a17770913 Merge branch '1.12' 2014-01-30 11:01:06 -08:00
Jeff Forcier 781617ab47 Merge branch '1.11' into 1.12
Conflicts:
	NEWS
2014-01-30 11:01:02 -08:00
Jeff Forcier 9035546e40 Merge branch '1.10' into 1.11
Conflicts:
	NEWS
	sites/www/changelog.rst
2014-01-30 11:00:33 -08:00
Jeff Forcier c563f06954 Nuke sphinx-changelogg'd material 2014-01-30 10:59:15 -08:00
Jeff Forcier 0d6bf1d965 Merge branch '1.12' 2014-01-30 10:57:50 -08:00
Jeff Forcier c427667928 Merge branch '1.11' into 1.12
Conflicts:
	sites/www/changelog.rst
2014-01-30 10:57:29 -08:00
Jeff Forcier 343d0492a7 Backport changelog bugfix from 1.12 2014-01-30 10:57:06 -08:00
Jeff Forcier 70bcde95c1 Backport changelog bugfix from 1.12 2014-01-30 10:56:03 -08:00
Jeff Forcier 5ba3761f21 Fix some boogs in changelog 2014-01-30 10:55:10 -08:00
Jeff Forcier 14929d6909 1.12 releases 2014-01-30 10:45:00 -08:00
Jeff Forcier 8cc9ae059f Merge branch '1.11' into 1.12 2014-01-30 10:40:35 -08:00
Jeff Forcier a83f0d3038 Add rest of 1.11 releases 2014-01-30 10:40:29 -08:00
Jeff Forcier d0d711ac78 Port 1.11.1 2014-01-29 15:20:53 -08:00
Jeff Forcier 176493823c Missed a spot w/ SnR 2014-01-29 15:16:09 -08:00
Jeff Forcier a58ee1c89a Missed a spot w/ SnR 2014-01-29 15:16:04 -08:00
Jeff Forcier 6646e36673 Add 1.11.0 to new changelog 2014-01-29 15:06:14 -08:00
Jeff Forcier 34320dfd61 Forgot to update backticks for Sphinx, derp 2014-01-29 15:06:03 -08:00
Jeff Forcier 2b64ff4cd9 Forgot to update backticks for Sphinx, derp 2014-01-29 15:05:52 -08:00
Jeff Forcier c636b273da Merge branch '1.10' into 1.11
Conflicts:
	dev-requirements.txt
	tox.ini
2014-01-29 14:38:58 -08:00
Jeff Forcier b8d1724f57 Comment out intersphinx pending #256 2014-01-29 14:24:54 -08:00
Jeff Forcier 2b0f834c16 Move API doc sister link to www site only, derp 2014-01-29 14:23:46 -08:00
Jeff Forcier b60075c7cd Prevent warning about unlinked blog page 2014-01-28 16:00:03 -08:00
Jeff Forcier d1d65b4ddd Stricter/more useful doc builds in Travis 2014-01-28 15:53:30 -08:00
Jeff Forcier fee04a39ec Add sites/docs building to Travis 2014-01-28 15:23:11 -08:00
Jeff Forcier 414fec8f27 Bump Invoke requirement to newly released version w/ better Collection.from_module 2014-01-28 15:12:33 -08:00
Jeff Forcier 7b690707dd Don't display blog for now 2014-01-28 12:50:24 -08:00
Jeff Forcier da51cd8b14 Update to new alabaster-driven nav sidebar 2014-01-28 12:50:19 -08:00
Jeff Forcier 69d40710dc Tweak logo settings (& rely on new alabaster defaults) 2014-01-28 08:46:33 -08:00
Jeff Forcier 87cd72c144 Set up Intersphinx so www can ref docs 2014-01-23 15:36:03 -08:00
Olle Lundberg 24635609dc Epydoc -> Sphinx. 2014-01-23 11:32:59 +01:00
Jeff Forcier dde21a7de0 Nuke extraneous colons, add 'major' notes 2014-01-22 14:25:18 -08:00
Jeff Forcier 03768eadca Migrate 1.10.x NEWS entries to Sphinx changelog 2014-01-22 12:55:37 -08:00
Jeff Forcier 5a1f927310 Blog only used/exists in www, don't import it in docs site 2014-01-22 10:55:39 -08:00
Jeff Forcier 2da9142520 Rename 'main' doctree to 'www'; refactor sphinx task conf 2014-01-21 16:59:21 -08:00
Jeff Forcier c224fdecf1 Use new behavior from newer Invoke 2014-01-21 16:15:30 -08:00
Jeff Forcier ccb7a6c2cd Start fleshing out two-site setup 2014-01-21 16:15:30 -08:00
Jeff Forcier 7d56ecb1a7 Meta prep work (reqs.txt, tasks.py) 2014-01-21 16:15:30 -08:00
Jeff Forcier c74ff2a16e Import paramiko.org repository @ 3ac370054ef10fb060fe75fff25fe3a70ecc02c0 2014-01-21 16:14:26 -08:00
Jeff Forcier 94580cebee Merge branch '1.12' 2014-01-21 14:00:50 -08:00
Jeff Forcier 935c55dd1f Merge branch '1.11' into 1.12 2014-01-21 14:00:46 -08:00
Jeff Forcier 473a9cdf5b Merge branch '1.10' into 1.11 2014-01-21 14:00:41 -08:00
Olle Lundberg 5c5bf6e844 Add coveralls. 2014-01-21 14:00:34 -08:00
Jeff Forcier 5bf9acb312 Merge branch 'master' of github.com:paramiko/paramiko 2014-01-21 14:00:00 -08:00
Jeff Forcier 2c7f45c293 Merge branch '1.12' 2014-01-21 13:59:49 -08:00
Jeff Forcier c8ebe05ffc Merge branch '1.11' into 1.12
Conflicts:
	NEWS
2014-01-21 13:59:45 -08:00
Jeff Forcier 2cf23bf784 Merge branch '1.10' into 1.11
Conflicts:
	NEWS
2014-01-21 13:58:44 -08:00