Jeff Forcier
|
a31dcf1913
|
Merge branch '1.12'
|
2014-02-11 14:26:42 -08:00 |
|
Jeff Forcier
|
3a7b66a814
|
Merge branch '1.11' into 1.12
Conflicts:
sites/www/changelog.rst
|
2014-02-11 14:26:34 -08:00 |
|
Jeff Forcier
|
41d7339992
|
Merge branch '1.10' into 1.11
Conflicts:
sites/www/changelog.rst
|
2014-02-11 14:23:50 -08:00 |
|
Jeff Forcier
|
c142454621
|
Start reverting explicit-release stuff in favor of release-line specifiers on bugs.
|
2014-02-11 14:23:15 -08:00 |
|
Jeff Forcier
|
36b937d436
|
Merge branch '1.10' into 1.11
|
2014-02-11 09:48:00 -08:00 |
|
Jeff Forcier
|
2d3b13e917
|
Add coverage command as Invoke task
|
2014-02-11 09:31:43 -08:00 |
|
Jeff Forcier
|
675e30986e
|
Clean up a list-comp (also fixes race condition)
|
2014-02-11 08:06:14 -08:00 |
|
Jeff Forcier
|
1d87a0ceb9
|
Herp and a derp
|
2014-02-10 18:21:29 -08:00 |
|
Jeff Forcier
|
280c240685
|
Whitespace
|
2014-02-10 18:11:29 -08:00 |
|
Jeff Forcier
|
aed86f26bf
|
Future import for with: under py25
|
2014-02-10 18:10:52 -08:00 |
|
Jeff Forcier
|
9fa2cfee9d
|
Replace incorrect import of generic test runner w/ custom task
|
2014-02-10 18:03:25 -08:00 |
|
Jeff Forcier
|
1560c4ab8a
|
Merge remote-tracking branch 'ewxrjk/issue34' into sftp-reordering-34
|
2014-02-10 17:59:52 -08:00 |
|
Jeff Forcier
|
0a2887a8cc
|
Changelog re #35
|
2014-02-10 17:59:32 -08:00 |
|
Jeff Forcier
|
fe3d3beca4
|
Fix extra colon in changelog
|
2014-02-10 17:59:25 -08:00 |
|
Jeff Forcier
|
9b5a0c840d
|
Merge branch '1.12'
|
2014-02-03 14:11:03 -08:00 |
|
Jeff Forcier
|
c7090c52de
|
Merge branch '1.11' into 1.12
|
2014-02-03 14:11:00 -08:00 |
|
Jeff Forcier
|
36abefdac0
|
Merge branch '1.10' into 1.11
|
2014-02-03 14:10:58 -08:00 |
|
Jeff Forcier
|
cdf62655cb
|
Simplify www page footer.
Robey copyright remains in source code but this site is
brand new & the footer was real noisy. Eh.
|
2014-02-03 14:10:23 -08:00 |
|
Jeff Forcier
|
0f2fb26287
|
Update to new Alabaster version for footer/extension stuff
|
2014-02-03 14:09:56 -08:00 |
|
Jeff Forcier
|
04d1580962
|
Merge branch '1.12'
|
2014-01-30 14:32:26 -08:00 |
|
Jeff Forcier
|
792cfe0cf6
|
Merge branch '1.11' into 1.12
Conflicts:
sites/www/changelog.rst
|
2014-01-30 14:32:22 -08:00 |
|
Jeff Forcier
|
0a90bef4f4
|
Merge branch '1.10' into 1.11
Conflicts:
sites/www/changelog.rst
|
2014-01-30 14:32:10 -08:00 |
|
Jeff Forcier
|
4aa9668653
|
Don't preseed releases, ugh
|
2014-01-30 14:31:59 -08:00 |
|
Jeff Forcier
|
7b059ea55d
|
Merge branch '1.12'
|
2014-01-30 14:29:22 -08:00 |
|
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 |