[Buildbot-commits] [djmitche/buildbot] e55f63: First step on using Jinja template engine: the abo...

Sat Jan 2 23:34:56 UTC 2010

Branch: refs/heads/master
Home:   http://github.com/djmitche/buildbot

Commit: e55f63b4e57a4f5db585e2cbf8005e02939da746
    http://github.com/djmitche/buildbot/commit/e55f63b4e57a4f5db585e2cbf8005e02939da746
Author: marcusl <macke at yar.nu>
Date:   2009-05-07 (Thu, 07 May 2009)

Changed paths:
  M buildbot/status/web/about.py
  M buildbot/status/web/base.py
  A buildbot/status/web/templates/about.html

Log Message:
-----------
First step on using Jinja template engine: the about page

Commit: ed64fd0b5f08368d11e2479f9894a9ed6178a1ba
    http://github.com/djmitche/buildbot/commit/ed64fd0b5f08368d11e2479f9894a9ed6178a1ba
Author: marcusl <macke at yar.nu>
Date:   2009-05-07 (Thu, 07 May 2009)

Changed paths:
  M buildbot/status/web/about.py
  M buildbot/status/web/base.py
  M buildbot/status/web/templates/about.html
  A buildbot/status/web/templates/footer.html

Log Message:
-----------
Made footer into template + minor cleanup

Commit: 132bdfc260ab434be4c0cd6651aee7b6564ccf8d
    http://github.com/djmitche/buildbot/commit/132bdfc260ab434be4c0cd6651aee7b6564ccf8d
Author: marcusl <macke at yar.nu>
Date:   2009-05-07 (Thu, 07 May 2009)

Changed paths:
  M buildbot/status/web/base.py
  M buildbot/status/web/baseweb.py
  M buildbot/status/web/build.py
  M buildbot/status/web/builder.py
  M buildbot/status/web/changes.py
  M buildbot/status/web/grid.py
  M buildbot/status/web/slaves.py
  A buildbot/status/web/templates/change_sources.html
  M buildbot/status/web/templates/footer.html
  M buildbot/status/web/waterfall.py

Log Message:
-----------
ChangeSources now templated + added common footer to most views

Commit: 16d25ecbe47d2823891e8fa79c974d1f1057de12
    http://github.com/djmitche/buildbot/commit/16d25ecbe47d2823891e8fa79c974d1f1057de12
Author: marcusl <macke at yar.nu>
Date:   2009-05-15 (Fri, 15 May 2009)

Changed paths:
  M buildbot/status/web/slaves.py

Log Message:
-----------
Changed BuildSlaves page into jinja template

Commit: fc524235ca3610abf4f34a6c53b859dfff8a69c4
    http://github.com/djmitche/buildbot/commit/fc524235ca3610abf4f34a6c53b859dfff8a69c4
Author: marcusl <macke at yar.nu>
Date:   2009-05-15 (Fri, 15 May 2009)

Changed paths:
  M buildbot/status/web/slaves.py
  A buildbot/status/web/templates/buildslaves.html

Log Message:
-----------
Moved BuildSlaves page to Jinja template + remove double footer on Slave page

Commit: 9d437fc280e3e311500b2139700b66671e8823ef
    http://github.com/djmitche/buildbot/commit/9d437fc280e3e311500b2139700b66671e8823ef
Author: marcusl <macke at yar.nu>
Date:   2009-05-15 (Fri, 15 May 2009)

Log Message:
-----------
Merge branch 'jinja' of git at github.com:marcusl/buildbot into jinja

Commit: 6a26fe2bfe00943022586690c64e74362e5a083b
    http://github.com/djmitche/buildbot/commit/6a26fe2bfe00943022586690c64e74362e5a083b
Author: marcusl <macke at yar.nu>
Date:   2009-05-15 (Fri, 15 May 2009)

Changed paths:
  M buildbot/status/web/slaves.py
  A buildbot/status/web/templates/buildslave.html

Log Message:
-----------
Converted buildslave page to Jinja template

Commit: 82447f06cbbe1a180f27cf8ddfbd7fdfab9a072d
    http://github.com/djmitche/buildbot/commit/82447f06cbbe1a180f27cf8ddfbd7fdfab9a072d
Author: marcusl <macke at yar.nu>
Date:   2009-05-16 (Sat, 16 May 2009)

Changed paths:
  M buildbot/master.py
  M buildbot/process/builder.py
  M buildbot/status/mail.py
  A buildbot/test/test_ordering.py
  M contrib/bzr_buildbot.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge branch 'master' into jinja

Commit: 5904e83f6239b7a10ffe6ea030b86a42d7626880
    http://github.com/djmitche/buildbot/commit/5904e83f6239b7a10ffe6ea030b86a42d7626880
Author: marcusl <macke at yar.nu>
Date:   2009-05-16 (Sat, 16 May 2009)

Changed paths:
  M buildbot/status/web/base.py
  M buildbot/status/web/step.py
  A buildbot/status/web/templates/buildstep.html

Log Message:
-----------
Changed BuildStep view into Jinja template

Commit: 84ddfce9c02d9853b2144d22ad9797a11250926b
    http://github.com/djmitche/buildbot/commit/84ddfce9c02d9853b2144d22ad9797a11250926b
Author: marcusl <macke at yar.nu>
Date:   2009-05-16 (Sat, 16 May 2009)

Changed paths:
  M buildbot/status/web/builder.py
  A buildbot/status/web/templates/builders.html

Log Message:
-----------
Moved Builders list into Jinja template

Commit: 23303b2863d295ae3584b2b8fdb71114a462f574
    http://github.com/djmitche/buildbot/commit/23303b2863d295ae3584b2b8fdb71114a462f574
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-07-23 (Thu, 23 Jul 2009)

Changed paths:
  M buildbot/status/web/build.py
  A buildbot/status/web/templates/base.html
  A buildbot/status/web/templates/build.html
  M buildbot/status/web/templates/buildstep.html
  M buildbot/status/web/templates/footer.html

Log Message:
-----------
Rewrote 'build' page as jinja template

Commit: 63a750382486fa86e32521620e067fbc959dd0ba
    http://github.com/djmitche/buildbot/commit/63a750382486fa86e32521620e067fbc959dd0ba
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-07-23 (Thu, 23 Jul 2009)

Changed paths:
  M buildbot/status/web/build.py
  M buildbot/status/web/builder.py
  A buildbot/status/web/templates/builder.html

Log Message:
-----------
Rewrote builder page as jinja template (+ fix for build page)

Commit: d3a0ff28ad1402724329dfcf9706c58ef5dbc167
    http://github.com/djmitche/buildbot/commit/d3a0ff28ad1402724329dfcf9706c58ef5dbc167
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-07-24 (Fri, 24 Jul 2009)

Changed paths:
  M buildbot/status/web/baseweb.py
  M buildbot/status/web/builder.py
  A buildbot/status/web/templates/oneboxperbuilder.html

Log Message:
-----------
Oneboxperbuilder -> jinja

Commit: e2c7d39b140af4cc3a67685bf13e5ce9aec80f63
    http://github.com/djmitche/buildbot/commit/e2c7d39b140af4cc3a67685bf13e5ce9aec80f63
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-10-10 (Sat, 10 Oct 2009)

Changed paths:
  M buildbot/status/web/about.py
  A buildbot/status/web/buildstatus.py
  A buildbot/status/web/templates/waterfall.html
  A buildbot/status/web/templates/waterfallhelp.html
  M buildbot/status/web/waterfall.py

Log Message:
-----------
waterfall & waterfall help partially converted to jinja

Commit: d260f4b76536c4c8c8337f0b9f21b34d30b361ea
    http://github.com/djmitche/buildbot/commit/d260f4b76536c4c8c8337f0b9f21b34d30b361ea
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-10-10 (Sat, 10 Oct 2009)

Changed paths:
  R buildbot/status/web/buildstatus.py

Log Message:
-----------
Removed accidentally commited buildstatus.py from aborted merge

Commit: fbfdc89dd821f652148b14b775bf4afdae01d7d5
    http://github.com/djmitche/buildbot/commit/fbfdc89dd821f652148b14b775bf4afdae01d7d5
Author: stefan <stefan at quasimodo.(none)>
Date:   2009-10-28 (Wed, 28 Oct 2009)

Changed paths:
  M buildbot/status/web/waterfall.py

Log Message:
-----------
Fix minor issue in waterfall display.

Commit: f9c7b8a1c8695ae760ee91fa1adb5957be87554c
    http://github.com/djmitche/buildbot/commit/f9c7b8a1c8695ae760ee91fa1adb5957be87554c
Author: stefan <stefan at quasimodo.(none)>
Date:   2009-10-28 (Wed, 28 Oct 2009)

Changed paths:
  M setup.py

Log Message:
-----------
Install templates.

Commit: a520a4b1045a03fc8e9fb24bfbc19bde15205784
    http://github.com/djmitche/buildbot/commit/a520a4b1045a03fc8e9fb24bfbc19bde15205784
Author: stefan <stefan at quasimodo.(none)>
Date:   2009-10-28 (Wed, 28 Oct 2009)

Changed paths:
  M buildbot/status/web/about.py
  M buildbot/status/web/base.py
  M buildbot/status/web/baseweb.py
  M buildbot/status/web/build.py
  M buildbot/status/web/builder.py
  M buildbot/status/web/changes.py
  M buildbot/status/web/slaves.py
  M buildbot/status/web/step.py
  M buildbot/status/web/waterfall.py

Log Message:
-----------
* Allow template overrides in buildbot instance directory.
* Access templates through HtmlResource base class.

Commit: 3b156b536ac059e1958d0d20baf30cb2c6f56e2f
    http://github.com/djmitche/buildbot/commit/3b156b536ac059e1958d0d20baf30cb2c6f56e2f
Author: stefan <stefan at quasimodo.(none)>
Date:   2009-10-28 (Wed, 28 Oct 2009)

Changed paths:
  M buildbot/status/web/base.py
  A buildbot/status/web/templates/layout.html
  M buildbot/status/web/templates/waterfallhelp.html
  M buildbot/status/web/waterfall.py

Log Message:
-----------
* Initialize jinja globally, not once per HtmlResource instance.
* Introduce layout template for others to extend.
* Let WaterfallHelp use the new content() method.

Commit: 82e2d4081155b9391969f6d363e16e6e48440e55
    http://github.com/djmitche/buildbot/commit/82e2d4081155b9391969f6d363e16e6e48440e55
Author: stefan <stefan at quasimodo.(none)>
Date:   2009-10-30 (Fri, 30 Oct 2009)

Changed paths:
  M buildbot/status/web/base.py
  M buildbot/status/web/baseweb.py
  M buildbot/status/web/waterfall.py

Log Message:
-----------
Move the jinja environment into the WebStatus object.

Commit: 58697a66c8a0509c5c881d8add959b99137ebc90
    http://github.com/djmitche/buildbot/commit/58697a66c8a0509c5c881d8add959b99137ebc90
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-11-01 (Sun, 01 Nov 2009)

Changed paths:
  M buildbot/status/web/base.py
  M buildbot/status/web/baseweb.py

Log Message:
-----------
Jinja use i18n and trim_blocks, plus get_template fix for footer

Commit: 4b2fe88471ee4ac4cc0ec85bbf2fbcd887b0c581
    http://github.com/djmitche/buildbot/commit/4b2fe88471ee4ac4cc0ec85bbf2fbcd887b0c581
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-11-01 (Sun, 01 Nov 2009)

Changed paths:
  M buildbot/status/web/grid.py
  A buildbot/status/web/templates/grid.html
  A buildbot/status/web/templates/grid_macros.html
  A buildbot/status/web/templates/grid_transposed.html

Log Message:
-----------
webstatus.grid/tgrid -> jinja

Commit: e337fdd1eae64db23be303dc244f1e644b6f9590
    http://github.com/djmitche/buildbot/commit/e337fdd1eae64db23be303dc244f1e644b6f9590
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-11-01 (Sun, 01 Nov 2009)

Changed paths:
  M .gitignore

Log Message:
-----------
Adding Eclipse files to .gitignore

Commit: 5717340605e9a7560a0bb9522a1663f071db88fd
    http://github.com/djmitche/buildbot/commit/5717340605e9a7560a0bb9522a1663f071db88fd
Author: stefan <stefan at quasimodo.(none)>
Date:   2009-11-01 (Sun, 01 Nov 2009)

Changed paths:
  M buildbot/status/web/base.py
  M buildbot/status/web/waterfall.py

Log Message:
-----------
Fix the way the jinja templates are accessed in HTMLResource

Commit: ec6cf851033690d8beed510fdd6dcb96ea633697
    http://github.com/djmitche/buildbot/commit/ec6cf851033690d8beed510fdd6dcb96ea633697
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-11-08 (Sun, 08 Nov 2009)

Changed paths:
  M buildbot/status/web/waterfall.py

Log Message:
-----------
Merge branch 'jinja' of http://github.com/stefans/buildbot into jinja

Commit: 6b272d3ea31cdd196d1b5c0852ba15ee5bfc9e33
    http://github.com/djmitche/buildbot/commit/6b272d3ea31cdd196d1b5c0852ba15ee5bfc9e33
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-11-08 (Sun, 08 Nov 2009)

Changed paths:
  R buildbot/status/web/tests.py

Log Message:
-----------
Removed status.web.tests (old code that wasn't used)

Commit: 0f82bf441d99a2b523b6b2daa711f0ddbed8be94
    http://github.com/djmitche/buildbot/commit/0f82bf441d99a2b523b6b2daa711f0ddbed8be94
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-11-08 (Sun, 08 Nov 2009)

Changed paths:
  M buildbot/status/web/auth.py
  A buildbot/status/web/templates/authfail.html

Log Message:
-----------
authfail -> jinja

Commit: 365050628aaed0d9f21ba3fbeae3cae4750959c3
    http://github.com/djmitche/buildbot/commit/365050628aaed0d9f21ba3fbeae3cae4750959c3
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-11-08 (Sun, 08 Nov 2009)

Changed paths:
  M buildbot/status/web/build.py

Log Message:
-----------
fix build page error (added missing string conversion)

Commit: 526407e743b3da161dbb9414538df27963d1f809
    http://github.com/djmitche/buildbot/commit/526407e743b3da161dbb9414538df27963d1f809
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-11-08 (Sun, 08 Nov 2009)

Changed paths:
  M buildbot/status/web/build.py

Log Message:
-----------
removed remaining references to status.web.tests module

Commit: a64abcd514f84ec4fdf6e340b240445a3262bc86
    http://github.com/djmitche/buildbot/commit/a64abcd514f84ec4fdf6e340b240445a3262bc86
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-11-08 (Sun, 08 Nov 2009)

Changed paths:
  M buildbot/status/web/about.py
  M buildbot/status/web/baseweb.py
  M buildbot/status/web/build.py
  M buildbot/status/web/builder.py
  M buildbot/status/web/changes.py
  M buildbot/status/web/slaves.py
  M buildbot/status/web/step.py

Log Message:
-----------
fix jinja template access in all html resources (via req.site.buildbot_service)

Commit: a9ed5647422d87b77037e2e64c03529cb0d62b6b
    http://github.com/djmitche/buildbot/commit/a9ed5647422d87b77037e2e64c03529cb0d62b6b
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-11-08 (Sun, 08 Nov 2009)

Changed paths:
  M buildbot/status/web/baseweb.py

Log Message:
-----------
removed /tests/ url from docstring

Commit: 48dd4e6e99197c3b1a0b61e07b35ce3ef80d13ea
    http://github.com/djmitche/buildbot/commit/48dd4e6e99197c3b1a0b61e07b35ce3ef80d13ea
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-11-08 (Sun, 08 Nov 2009)

Changed paths:
  M buildbot/status/web/feeds.py
  A buildbot/status/web/templates/feed_description.html
  A buildbot/status/web/templates/feed_rss20_footer.xml
  A buildbot/status/web/templates/feed_rss20_header.xml
  A buildbot/status/web/templates/feed_rss20_item.xml

Log Message:
-----------
feeds/rss -> jinja + fixes

Commit: f9565fd4afa2c0b426326e95b078de6705bc8eb9
    http://github.com/djmitche/buildbot/commit/f9565fd4afa2c0b426326e95b078de6705bc8eb9
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-11-08 (Sun, 08 Nov 2009)

Changed paths:
  M buildbot/status/web/feeds.py
  A buildbot/status/web/templates/feed_atom10_footer.xml
  A buildbot/status/web/templates/feed_atom10_header.xml
  A buildbot/status/web/templates/feed_atom10_item.xml

Log Message:
-----------
feeds/atom -> jinja

Commit: 55cd4068cdd4abbcf528eb0cbe84d7233f6f1736
    http://github.com/djmitche/buildbot/commit/55cd4068cdd4abbcf528eb0cbe84d7233f6f1736
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-11-08 (Sun, 08 Nov 2009)

Changed paths:
  M buildbot/status/web/templates/feed_atom10_header.xml
  M buildbot/status/web/templates/feed_atom10_item.xml
  M buildbot/status/web/templates/feed_rss20_footer.xml
  M buildbot/status/web/templates/feed_rss20_header.xml

Log Message:
-----------
feeds xml cleanup

Commit: f11fa04a5cb2164ba3f880d967bd6d9eed182774
    http://github.com/djmitche/buildbot/commit/f11fa04a5cb2164ba3f880d967bd6d9eed182774
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-11-08 (Sun, 08 Nov 2009)

Changed paths:
  M buildbot/status/web/feeds.py

Log Message:
-----------
Unify feeds content generation (via template selection)

Commit: 39680f7e644fed8676550eb27ae9bb960e381786
    http://github.com/djmitche/buildbot/commit/39680f7e644fed8676550eb27ae9bb960e381786
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-11-08 (Sun, 08 Nov 2009)

Changed paths:
  M buildbot/status/web/feeds.py
  A buildbot/status/web/templates/feed_atom10.xml
  R buildbot/status/web/templates/feed_atom10_footer.xml
  R buildbot/status/web/templates/feed_atom10_header.xml
  R buildbot/status/web/templates/feed_atom10_item.xml
  M buildbot/status/web/templates/feed_description.html
  A buildbot/status/web/templates/feed_rss20.xml
  R buildbot/status/web/templates/feed_rss20_footer.xml
  R buildbot/status/web/templates/feed_rss20_header.xml
  R buildbot/status/web/templates/feed_rss20_item.xml

Log Message:
-----------
Cleanup feed code (use single xml per format, simplify FeedResource significantly)

Commit: 71d1c5701fe66aa64e5e212928a2a8849fe864c8
    http://github.com/djmitche/buildbot/commit/71d1c5701fe66aa64e5e212928a2a8849fe864c8
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-11-08 (Sun, 08 Nov 2009)

Changed paths:
  M buildbot/status/web/templates/feed_atom10.xml
  M buildbot/status/web/templates/feed_rss20.xml

Log Message:
-----------
No need to replace \n with <br/> when wrapped in <pre>

Commit: b00283879bfa693e1908d9f0f186f7c2c9ec262f
    http://github.com/djmitche/buildbot/commit/b00283879bfa693e1908d9f0f186f7c2c9ec262f
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-11-08 (Sun, 08 Nov 2009)

Changed paths:
  M buildbot/status/web/base.py
  M buildbot/status/web/baseweb.py
  M buildbot/status/web/builder.py
  A buildbot/status/web/templates/build_line.html
  M buildbot/status/web/templates/builder.html
  A buildbot/status/web/templates/onelineperbuild.html
  A buildbot/status/web/templates/onelineperbuildonebuilder.html

Log Message:
-----------
onelineperbuild & onelinemixin -> jinja

Commit: 06543914eb1fb84d979942f0b2f055da76e6ecbf
    http://github.com/djmitche/buildbot/commit/06543914eb1fb84d979942f0b2f055da76e6ecbf
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-11-08 (Sun, 08 Nov 2009)

Changed paths:
  M buildbot/status/web/base.py
  M buildbot/status/web/baseweb.py
  M buildbot/status/web/build.py
  M buildbot/status/web/builder.py
  M buildbot/status/web/slaves.py
  M buildbot/status/web/templates/build.html
  M buildbot/status/web/templates/builder.html
  M buildbot/status/web/templates/buildslave.html
  A buildbot/status/web/templates/forms.html
  M buildbot/status/web/templates/oneboxperbuilder.html
  M buildbot/status/web/templates/onelineperbuild.html

Log Message:
-----------
forms -> jinja + minor slave page fix

Commit: 444b836095b72896a7ae296023c931bf6c5ac077
    http://github.com/djmitche/buildbot/commit/444b836095b72896a7ae296023c931bf6c5ac077
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-11-08 (Sun, 08 Nov 2009)

Changed paths:
  M buildbot/status/web/templates/build_line.html
  M buildbot/status/web/templates/buildslave.html

Log Message:
-----------
buildslave.html should use build_line() macro

Commit: a9db33a346c2aa9ed40205e7c37343ebf7844253
    http://github.com/djmitche/buildbot/commit/a9db33a346c2aa9ed40205e7c37343ebf7844253
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-11-08 (Sun, 08 Nov 2009)

Changed paths:
  M buildbot/status/web/base.py
  M buildbot/status/web/baseweb.py
  M buildbot/status/web/builder.py
  M buildbot/status/web/slaves.py

Log Message:
-----------
Rename OneLineMixin -> BuildLineMixin

Commit: 5e3bb94710a3c314edef317be0b90cab0f170834
    http://github.com/djmitche/buildbot/commit/5e3bb94710a3c314edef317be0b90cab0f170834
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-11-08 (Sun, 08 Nov 2009)

Changed paths:
  M buildbot/status/web/baseweb.py
  A buildbot/status/web/root.py
  M buildbot/status/web/templates/base.html
  A buildbot/status/web/templates/root.html

Log Message:
-----------
started on root page, not enabled yet

Commit: c1da6e8b460522f35399e39ee22570bca9a69230
    http://github.com/djmitche/buildbot/commit/c1da6e8b460522f35399e39ee22570bca9a69230
Author: stefan <stefan at quasimodo.(none)>
Date:   2009-11-16 (Mon, 16 Nov 2009)

Changed paths:
  M buildbot/status/web/base.py
  M buildbot/status/web/baseweb.py
  A buildbot/status/web/templates/directory.html

Log Message:
-----------
Add template support for directory views.

Commit: 3d345e43d1e40f2f706ab6af5a9441c5dd74e315
    http://github.com/djmitche/buildbot/commit/3d345e43d1e40f2f706ab6af5a9441c5dd74e315
Author: stefan <stefan at quasimodo.(none)>
Date:   2009-11-16 (Mon, 16 Nov 2009)

Changed paths:
  M buildbot/status/web/templates/layout.html
  M buildbot/status/web/templates/waterfall.html
  M buildbot/status/web/waterfall.py

Log Message:
-----------
Use layout.html for waterfall template.

Commit: 6c246d34acd3126a7e2a65cdef11e59fac81ab78
    http://github.com/djmitche/buildbot/commit/6c246d34acd3126a7e2a65cdef11e59fac81ab78
Author: stefan <stefan at quasimodo.(none)>
Date:   2009-11-16 (Mon, 16 Nov 2009)

Changed paths:
  M buildbot/status/web/slaves.py
  M buildbot/status/web/templates/buildslave.html
  M buildbot/status/web/templates/buildslaves.html

Log Message:
-----------
Use layout.html for slaves views.

Commit: 4fd4bcc0895d8cdab0acab04adb7b75c5daea176
    http://github.com/djmitche/buildbot/commit/4fd4bcc0895d8cdab0acab04adb7b75c5daea176
Author: stefan <stefan at quasimodo.(none)>
Date:   2009-11-16 (Mon, 16 Nov 2009)

Changed paths:
  M buildbot/status/web/builder.py
  M buildbot/status/web/templates/builder.html
  M buildbot/status/web/templates/builders.html

Log Message:
-----------
Use layout.html for builder views.

Commit: 27c77efa01708858e77bc7b95065496106b5a003
    http://github.com/djmitche/buildbot/commit/27c77efa01708858e77bc7b95065496106b5a003
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-11-16 (Mon, 16 Nov 2009)

Changed paths:
  M buildbot/status/web/base.py
  M buildbot/status/web/baseweb.py
  M buildbot/status/web/builder.py
  M buildbot/status/web/slaves.py
  M buildbot/status/web/templates/builder.html
  M buildbot/status/web/templates/builders.html
  M buildbot/status/web/templates/buildslave.html
  M buildbot/status/web/templates/buildslaves.html
  A buildbot/status/web/templates/directory.html
  M buildbot/status/web/templates/layout.html
  M buildbot/status/web/templates/waterfall.html
  M buildbot/status/web/waterfall.py

Log Message:
-----------
Merge branch 'jinja' of http://github.com/stefans/buildbot into jinja

Conflicts:
	buildbot/status/web/baseweb.py
	buildbot/status/web/builder.py
	buildbot/status/web/slaves.py
	buildbot/status/web/templates/builder.html
	buildbot/status/web/templates/buildslave.html

Commit: bff41bf5eb2dd4aa55f4cb9b2c7740684427fd43
    http://github.com/djmitche/buildbot/commit/bff41bf5eb2dd4aa55f4cb9b2c7740684427fd43
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-12 (Sat, 12 Dec 2009)

Changed paths:
  M buildbot/status/web/base.py
  M buildbot/status/web/templates/layout.html
  M buildbot/test/test_web.py

Log Message:
-----------
Fixed minor issues causing web tests to fail

Commit: 9bb88575edb1c94b4e5329f35c5b051c64b066b3
    http://github.com/djmitche/buildbot/commit/9bb88575edb1c94b4e5329f35c5b051c64b066b3
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-12 (Sat, 12 Dec 2009)

Changed paths:
  M MANIFEST.in
  M buildbot/changes/mail.py
  M buildbot/interfaces.py
  M buildbot/master.py
  M buildbot/process/builder.py
  M buildbot/slave/commands.py
  M buildbot/sourcestamp.py
  M buildbot/status/mail.py
  M buildbot/status/web/build.py
  M buildbot/status/web/templates/build.html
  M buildbot/status/web/xmlrpc.py
  M buildbot/steps/shell.py
  M buildbot/steps/source.py
  M buildbot/test/test_mailparse.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge commit '6cd1fc4528c562ea7c0a542c8f3fe029acb9b88' into jinja

Conflicts:
	buildbot/status/web/build.py

Commit: 4730a52328558d36e65f9569f1125d2231aafad9
    http://github.com/djmitche/buildbot/commit/4730a52328558d36e65f9569f1125d2231aafad9
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-12 (Sat, 12 Dec 2009)

Changed paths:
  M .gitignore
  M buildbot/status/web/builder.py

Log Message:
-----------
Add builder name to make webparts test pass + add _trial_temp* to .gitignore

Commit: f1e32c18ced9c7ae9e3c7a8adf61b6021af93dee
    http://github.com/djmitche/buildbot/commit/f1e32c18ced9c7ae9e3c7a8adf61b6021af93dee
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-12 (Sat, 12 Dec 2009)

Changed paths:
  M .gitignore
  M buildbot/slave/commands.py
  M buildbot/status/mail.py
  M buildbot/status/web/builder.py
  M buildbot/status/web/templates/builder.html
  M buildbot/steps/transfer.py
  A buildbot/test/mail/launchpad.1
  A buildbot/test/mail/launchpad.2
  A buildbot/test/mail/launchpad.3
  A buildbot/test/mail/launchpad.4
  A buildbot/test/mail/launchpad.5
  A buildbot/test/mail/launchpad.6
  M buildbot/test/test_status.py
  M buildbot/test/test_transfer.py
  M buildbot/util.py
  A contrib/github_buildbot.py

Log Message:
-----------
Merge commit 'e8f292ba89fba6fb1731a1bb33aa5fb62e6ac829' into jinja

Also restored builder.py file-endings to unix-style
(bad endings introduced in 9bb88575edb1c94b4e5329f35c5b051c64b066b3)

Conflicts:
	.gitignore
	buildbot/status/web/builder.py

Commit: ea7725eb6c59a263a6039d0edf75ee614e701282
    http://github.com/djmitche/buildbot/commit/ea7725eb6c59a263a6039d0edf75ee614e701282
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-12 (Sat, 12 Dec 2009)

Changed paths:
  M buildbot/status/web/templates/build.html
  M buildbot/status/web/templates/builder.html
  M buildbot/status/web/templates/forms.html
  M docs/buildbot.texinfo

Log Message:
-----------
Merge commit 'b9cf37ec576a54e0611958b363bda2c4cdd168c1' into jinja

Only needed to change html templates.

Conflicts:
	buildbot/status/web/base.py
	buildbot/status/web/build.py
	buildbot/status/web/builder.py

Commit: bcdbfafb5957eaf369069ac1509d9dda4b02a12b
    http://github.com/djmitche/buildbot/commit/bcdbfafb5957eaf369069ac1509d9dda4b02a12b
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-12 (Sat, 12 Dec 2009)

Changed paths:
  M buildbot/changes/changes.py
  M buildbot/changes/mail.py
  M buildbot/changes/svnpoller.py
  M buildbot/master.py
  M buildbot/scripts/runner.py
  M buildbot/status/web/slaves.py
  M buildbot/status/web/templates/buildslave.html
  M buildbot/test/test_mailparse.py
  M buildbot/test/test_scheduler.py
  M contrib/github_buildbot.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge commit 'f857fdb82ba9af3d095d4acd3c95c7f629464fb0' into jinja

Conflicts:
	buildbot/status/web/builder.py
	buildbot/status/web/slaves.py

Commit: 175e230e275bdf38275de50f548b1bce858aaa8a
    http://github.com/djmitche/buildbot/commit/175e230e275bdf38275de50f548b1bce858aaa8a
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-12 (Sat, 12 Dec 2009)

Changed paths:
  M buildbot/status/web/build.py
  M buildbot/status/web/builder.py
  M buildbot/status/web/slaves.py
  M buildbot/status/web/templates/builder.html
  M buildbot/status/web/templates/buildslave.html

Log Message:
-----------
Merge commit 'a5dbadf03862d2f399b654a8309acecdc68df3a2' into jinja

Also some minor fixups to builder page.

Conflicts:
	buildbot/status/web/build.py
	buildbot/status/web/builder.py
	buildbot/status/web/slaves.py

Commit: c14589accdb30f2907af85dc565e14e0ce30d323
    http://github.com/djmitche/buildbot/commit/c14589accdb30f2907af85dc565e14e0ce30d323
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-12 (Sat, 12 Dec 2009)

Changed paths:
  M buildbot/status/web/build.py
  M buildbot/status/web/step.py
  M buildbot/status/web/templates/build.html
  M buildbot/status/web/templates/buildstep.html

Log Message:
-----------
Merge commit '6acb528c1ca5a3aa44a5b5e2b7c130f865a88063' into jinja

Conflicts:
	buildbot/status/web/build.py
	buildbot/status/web/step.py

Commit: 2a5233fa07b0c9da2c2cbe3a6fccdab54062009c
    http://github.com/djmitche/buildbot/commit/2a5233fa07b0c9da2c2cbe3a6fccdab54062009c
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-12 (Sat, 12 Dec 2009)

Changed paths:
  M buildbot/process/builder.py
  M buildbot/status/web/builder.py
  M buildbot/status/web/templates/builder.html

Log Message:
-----------
Merge commit 'd4da984c0cb18adebee5e52624b4dcce3b7c316e' into jinja

Conflicts:
	buildbot/status/web/builder.py

Commit: fff85dce3f8cea5fb9ca3ee63f72d4342376eda7
    http://github.com/djmitche/buildbot/commit/fff85dce3f8cea5fb9ca3ee63f72d4342376eda7
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-13 (Sun, 13 Dec 2009)

Changed paths:
  M buildbot/status/web/base.py
  M buildbot/status/web/builder.py
  M buildbot/status/web/templates/builder.html

Log Message:
-----------
Merge commit 'cd93b20f3dbf847de08d06bd2ddf0b071a4d54ba' into jinja

Conflicts:
	buildbot/status/web/builder.py

Commit: ba2519758ce80bbacda65e9b635790efc09ee5c2
    http://github.com/djmitche/buildbot/commit/ba2519758ce80bbacda65e9b635790efc09ee5c2
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-13 (Sun, 13 Dec 2009)

Changed paths:
  M buildbot/process/builder.py

Log Message:
-----------
Merge commit '0dffaf24e05429b18dce168e83ff9b716a08b259' into jinja

Commit: e80ccd61a8f17d8389912dd37daf09576860edf5
    http://github.com/djmitche/buildbot/commit/e80ccd61a8f17d8389912dd37daf09576860edf5
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-13 (Sun, 13 Dec 2009)

Changed paths:
  M buildbot/status/web/builder.py
  M buildbot/status/web/slaves.py

Log Message:
-----------
Merge commit 'ab7716e4387e116eaecd5c39b1309f756607943d' into jinja

Conflicts:
	buildbot/status/web/slaves.py

Commit: 56f7b89927bb6df173bb21b642c4e99f7899eae7
    http://github.com/djmitche/buildbot/commit/56f7b89927bb6df173bb21b642c4e99f7899eae7
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-13 (Sun, 13 Dec 2009)

Changed paths:
  M buildbot/status/web/base.py
  M buildbot/status/web/baseweb.py

Log Message:
-----------
Merge commit '2f44d5d3129070aa212feea0aca24636405f9478' into jinja

Conflicts:
	buildbot/status/web/baseweb.py

Commit: 320f1e297606a879439cd926e11ad6c9055d3416
    http://github.com/djmitche/buildbot/commit/320f1e297606a879439cd926e11ad6c9055d3416
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-13 (Sun, 13 Dec 2009)

Changed paths:
  M buildbot/status/web/builder.py
  M buildbot/status/web/templates/builder.html

Log Message:
-----------
Merge commit 'b9d93c391369d24f6bb36b3d17075c80dd45bb97' into jinja

Conflicts:
	buildbot/status/web/builder.py

Commit: 2c803c335e9f7c87f3a4e73442e1c80ffa9fca85
    http://github.com/djmitche/buildbot/commit/2c803c335e9f7c87f3a4e73442e1c80ffa9fca85
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-13 (Sun, 13 Dec 2009)

Changed paths:
  M buildbot/status/web/slaves.py

Log Message:
-----------
Merge commit '76f4ebd3dbafb9231cc435fb93b962c862aa7922' into jinja

Commit: e06139fb73ecac82e3b2b9b98f0d302202347be3
    http://github.com/djmitche/buildbot/commit/e06139fb73ecac82e3b2b9b98f0d302202347be3
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-13 (Sun, 13 Dec 2009)

Changed paths:
  M buildbot/interfaces.py
  M buildbot/process/builder.py
  M buildbot/status/base.py
  M buildbot/status/builder.py

Log Message:
-----------
Merge commit 'c462bf85fc86c1710c23026231f56deb90b317f3' into jinja

Commit: 442c6f8fed2197f4cb664d6737e4103d19406065
    http://github.com/djmitche/buildbot/commit/442c6f8fed2197f4cb664d6737e4103d19406065
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-13 (Sun, 13 Dec 2009)

Changed paths:
  M buildbot/ec2buildslave.py
  M buildbot/process/builder.py
  M buildbot/slave/commands.py
  M buildbot/steps/source.py
  M buildbot/test/test_vc.py
  M contrib/github_buildbot.py

Log Message:
-----------
Merge commit '9fb4486a4f74085122a6a15b482d66dceb0b9ff9' into jinja

Commit: 9c5e471e3751fcd558e147a26dfd655980d47156
    http://github.com/djmitche/buildbot/commit/9c5e471e3751fcd558e147a26dfd655980d47156
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-13 (Sun, 13 Dec 2009)

Changed paths:
  M buildbot/process/base.py
  M buildbot/process/builder.py
  M buildbot/status/web/base.py
  M buildbot/status/web/baseweb.py
  M buildbot/status/web/builder.py
  M buildbot/status/web/slaves.py
  M buildbot/status/web/templates/builder.html
  M buildbot/status/web/templates/footer.html
  M buildbot/status/web/templates/grid_macros.html
  M buildbot/status/web/templates/layout.html
  M buildbot/status/web/templates/waterfall.html
  M buildbot/status/web/waterfall.py
  M buildbot/status/words.py
  M buildbot/steps/python_twisted.py
  M buildbot/test/test_svnpoller.py
  M buildbot/test/test_transfer.py

Log Message:
-----------
Make use-of-undefined-var-in-jinja2-template as errors and fix all issues + minor improvs + TODO cleanup

 * Added HTMLResource.getContext() to use same context in content/body/footer (remove later)
 * Change TODO items to that text appear on same line (i.e. all TODO/FIXME now readable in Eclipse tasks window)

Commit: 14bbe0f543e6b3009dad9ac200ede0f14a7d7cb2
    http://github.com/djmitche/buildbot/commit/14bbe0f543e6b3009dad9ac200ede0f14a7d7cb2
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-13 (Sun, 13 Dec 2009)

Changed paths:
  M buildbot/changes/changes.py
  M buildbot/master.py
  M buildbot/status/builder.py
  M buildbot/status/web/waterfall.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge commit '6b184718ee9576c0577c4fd9fb8dda7a2edf8754' into jinja

Commit: e987ecdb86052f998019bb75532d3f02563354af
    http://github.com/djmitche/buildbot/commit/e987ecdb86052f998019bb75532d3f02563354af
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-13 (Sun, 13 Dec 2009)

Changed paths:
  M CREDITS
  M buildbot/changes/changes.py
  M buildbot/master.py
  M buildbot/slave/commands.py
  M buildbot/status/mail.py
  M buildbot/status/web/baseweb.py
  A buildbot/status/web/buildstatus.py
  M buildbot/status/words.py
  M buildbot/steps/transfer.py
  A buildbot/test/test_changemaster.py
  M buildbot/test/test_config.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge commit '4c4df020732a9acb19451bfa3cff5a4d34f8e241' into jinja

Commit: ca45b27af177a637e485f2709115c207baa594a5
    http://github.com/djmitche/buildbot/commit/ca45b27af177a637e485f2709115c207baa594a5
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-13 (Sun, 13 Dec 2009)

Changed paths:
  M buildbot/status/web/buildstatus.py
  A buildbot/status/web/templates/buildstatus.html

Log Message:
-----------
buildstatus -> jinja

Commit: 64a06f10bc7c73ea6e750bf67ec6e9e3c4d70988
    http://github.com/djmitche/buildbot/commit/64a06f10bc7c73ea6e750bf67ec6e9e3c4d70988
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-13 (Sun, 13 Dec 2009)

Changed paths:
  M buildbot/status/web/templates/waterfall.html
  M buildbot/status/web/templates/waterfallhelp.html
  M buildbot/status/web/waterfall.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge commit 'bf4ef54b4bf47e576953c40b14cb282937c4c3e0' into jinja

WaterfallResource.isSuccess() doesn't seem to be working, but I haven't touched that. :-|

Conflicts:
	buildbot/status/web/waterfall.py

Commit: ce3e242d024cd73723ac434ec3771015907610f9
    http://github.com/djmitche/buildbot/commit/ce3e242d024cd73723ac434ec3771015907610f9
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-13 (Sun, 13 Dec 2009)

Changed paths:
  M buildbot/status/web/xmlrpc.py

Log Message:
-----------
Merge commit '0fc76a1fca3603a1ac91d5c62eb4ab01a96b6126' into jinja

Commit: 4903d31ef69a8da6fa9df7c98f7bcc94882f8dc3
    http://github.com/djmitche/buildbot/commit/4903d31ef69a8da6fa9df7c98f7bcc94882f8dc3
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-13 (Sun, 13 Dec 2009)

Changed paths:
  M buildbot/master.py
  M buildbot/scripts/sample.cfg
  M buildbot/slave/commands.py
  M buildbot/status/web/feeds.py
  M buildbot/status/web/xmlrpc.py
  M buildbot/steps/source.py
  M buildbot/util.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge commit '02c2d2468842ef6802f41c39bb5b609e0c8ccc20' into jinja

Commit: d3eba2dbbb7b8bf9a0122c224de826dbfbdc8b39
    http://github.com/djmitche/buildbot/commit/d3eba2dbbb7b8bf9a0122c224de826dbfbdc8b39
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-13 (Sun, 13 Dec 2009)

Changed paths:
  M buildbot/buildslave.py
  M buildbot/ec2buildslave.py
  M buildbot/status/mail.py
  M buildbot/test/runutils.py
  M buildbot/test/test_changes.py
  M buildbot/test/test_mailparse.py
  M buildbot/test/test_status.py

Log Message:
-----------
Merge commit 'c4de4851668847e9235a363f706a2634489e6f28' into jinja

All forms in tempalte-html already converted to method='post'

Conflicts:
	buildbot/status/web/slaves.py

Commit: c1e811455dea11261cb4e57ddf3a98fe831f8696
    http://github.com/djmitche/buildbot/commit/c1e811455dea11261cb4e57ddf3a98fe831f8696
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-13 (Sun, 13 Dec 2009)

Changed paths:
  M buildbot/changes/changes.py
  M buildbot/interfaces.py
  M buildbot/scheduler.py
  M buildbot/slave/commands.py
  M buildbot/status/builder.py
  M buildbot/status/client.py
  M buildbot/status/web/waterfall.py
  M buildbot/test/runutils.py
  M contrib/git_buildbot.py

Log Message:
-----------
Merge commit '6979e585b1df13d3227160e8ac0c963fa319a135' into jinja

Commit: 5477e35be467c28fbc1b2eb121ba0ef4944fdcdd
    http://github.com/djmitche/buildbot/commit/5477e35be467c28fbc1b2eb121ba0ef4944fdcdd
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-13 (Sun, 13 Dec 2009)

Changed paths:
  A buildbot/status/web/extended.css

Log Message:
-----------
Merge commit '577f99813b8a249323b2e62b5c56b53c1f3c04c9' into jinja

Commit: ee5aa839f55534d81aec51c68b518e2164961348
    http://github.com/djmitche/buildbot/commit/ee5aa839f55534d81aec51c68b518e2164961348
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-13 (Sun, 13 Dec 2009)

Changed paths:
  M buildbot/__init__.py
  M buildbot/process/buildstep.py
  M buildbot/slave/commands.py
  M buildbot/status/builder.py
  M buildbot/test/test_steps.py
  M buildbot/test/test_web.py
  M contrib/bzr_buildbot.py
  A contrib/webhook_status.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge commit 'dd9f28106f6621b47523c2dd8286a4c41c72d8bc' into jinja

Commit: 9e7f185913ce615f34e6521c6b22671a776417f8
    http://github.com/djmitche/buildbot/commit/9e7f185913ce615f34e6521c6b22671a776417f8
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-13 (Sun, 13 Dec 2009)

Changed paths:
  M buildbot/status/web/waterfall.py
  M contrib/webhook_status.py

Log Message:
-----------
Merge commit 'b51cef36a8d3fa4aececae8bb55ef63f6f69a797' into jinja

Commit: 4997d290751c8df267d8eba65b40270e3a8659d4
    http://github.com/djmitche/buildbot/commit/4997d290751c8df267d8eba65b40270e3a8659d4
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/status/web/templates/waterfallhelp.html
  M buildbot/status/web/waterfall.py

Log Message:
-----------
Merge commit '43c720c778acaec59eacf51abdd0c97902d73e2b' into jinja

Conflicts:
	buildbot/status/web/waterfall.py

Commit: 2f55cdea5a7e42c8ae136144044dfcfdc73e801b
    http://github.com/djmitche/buildbot/commit/2f55cdea5a7e42c8ae136144044dfcfdc73e801b
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  A ChangeLog-0.7.11
  M NEWS
  M buildbot/__init__.py
  M buildbot/changes/bonsaipoller.py
  M buildbot/changes/changes.py
  M buildbot/changes/svnpoller.py
  M buildbot/ec2buildslave.py
  M buildbot/scheduler.py
  M buildbot/scripts/runner.py
  M buildbot/slave/commands.py
  M buildbot/status/builder.py
  M buildbot/status/words.py
  M buildbot/steps/shell.py
  M buildbot/steps/transfer.py
  M buildbot/steps/trigger.py
  M buildbot/test/test_locks.py
  M buildbot/test/test_transfer.py
  M buildbot/test/test_vc.py
  M contrib/github_buildbot.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge commit '64773c1a0d77eaf675e8eb25c7f0d2bc60f605cd' into jinja

Conflicts:
	buildbot/status/web/base.py

Commit: d26cbced9b1212e407442e7ac79b3f8cb4a4a120
    http://github.com/djmitche/buildbot/commit/d26cbced9b1212e407442e7ac79b3f8cb4a4a120
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/status/web/templates/waterfallhelp.html

Log Message:
-----------
Add missing change to waterfallhelp.html

Commit: 5ff1332e293532d4376cd211104664fad79d0155
    http://github.com/djmitche/buildbot/commit/5ff1332e293532d4376cd211104664fad79d0155
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Log Message:
-----------
Merge commit '28b86b7719658b24f806fb8bd5b483f819fca9a6' into jinja

(Already fixed in jinja)

Conflicts:
	buildbot/status/web/builder.py

Commit: e12d0c52ddb327c43383a7b639f7ddd20650c5ee
    http://github.com/djmitche/buildbot/commit/e12d0c52ddb327c43383a7b639f7ddd20650c5ee
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/scheduler.py
  M buildbot/status/web/feeds.py
  M buildbot/status/web/templates/feed_atom10.xml
  M buildbot/status/web/templates/feed_description.html
  M buildbot/status/web/templates/feed_rss20.xml
  M buildbot/test/test_scheduler.py

Log Message:
-----------
Merge commit '7d71ae0f2c167e90c79e6bafa6150568c2a22624' into jinja

Conflicts:
	buildbot/status/web/feeds.py

Commit: 4fa4cfac0266ff4649e9bed947fdeb3401884963
    http://github.com/djmitche/buildbot/commit/4fa4cfac0266ff4649e9bed947fdeb3401884963
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/status/builder.py
  M buildbot/status/web/feeds.py

Log Message:
-----------
Merge commit '4dcda7197e346f8dba56978f670cddca34cca340' into jinja

Conflicts:
	buildbot/status/web/feeds.py

Commit: 43fd7d77f92b1ced52672ca8d5567d20302a17e4
    http://github.com/djmitche/buildbot/commit/43fd7d77f92b1ced52672ca8d5567d20302a17e4
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/changes/changes.py
  M buildbot/process/buildstep.py
  M buildbot/status/builder.py
  M buildbot/status/web/index.html
  M buildbot/steps/master.py
  M buildbot/test/test_locks.py
  M buildbot/test/test_status.py
  M buildbot/test/test_steps.py
  M buildbot/test/test_vc.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge commit '198220f9a7c68aa11dce96be96aaef88c36f8d35' into jinja

Commit: 2b2bf41e063ef24406874bd90fad16f25e7964eb
    http://github.com/djmitche/buildbot/commit/2b2bf41e063ef24406874bd90fad16f25e7964eb
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/status/builder.py
  M buildbot/status/web/build.py

Log Message:
-----------
Merge commit '15bd807777ad2f998589b8463abb40642513be20' into jinja

Conflicts:
	buildbot/status/web/build.py

Commit: 97974d31604f0269b6fb20dacfc2d47c29e6960a
    http://github.com/djmitche/buildbot/commit/97974d31604f0269b6fb20dacfc2d47c29e6960a
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/status/web/templates/build.html

Log Message:
-----------
Add missing change to build.html

Commit: f91d1bcd4e16e5f140982a284a012896172ef5df
    http://github.com/djmitche/buildbot/commit/f91d1bcd4e16e5f140982a284a012896172ef5df
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Log Message:
-----------
Merge commit 'f15ebee1c64a549a01c508783784f889325501ef' into jinja

Conflicts:
	buildbot/status/web/build.py

Commit: 3c44da98912a4795e7b6246f7d9d18b0cc280c21
    http://github.com/djmitche/buildbot/commit/3c44da98912a4795e7b6246f7d9d18b0cc280c21
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M NEWS
  M buildbot/changes/svnpoller.py
  M buildbot/process/buildstep.py
  A buildbot/process/mtrlogobserver.py
  M buildbot/slave/commands.py
  M buildbot/status/web/waterfall.py
  M buildbot/steps/shell.py
  M buildbot/steps/source.py
  M buildbot/test/test_buildstep.py
  M buildbot/test/test_config.py
  M buildbot/test/test_steps.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge commit 'ad13a16bbdec535c8edebdbba4f77ae39b19c84c' into jinja

Commit: c4cc4ffc81307119221db5bfc4ccd98dc6a8e5e9
    http://github.com/djmitche/buildbot/commit/c4cc4ffc81307119221db5bfc4ccd98dc6a8e5e9
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/status/web/templates/waterfallhelp.html
  M buildbot/status/web/waterfall.py

Log Message:
-----------
Merge commit '71740dd877b5aaa46cc7425f55c9c8ad4da5162f' into jinja

Conflicts:
	buildbot/status/web/waterfall.py

Commit: 1be55c63663ec1a118669da4d218bd36823f7157
    http://github.com/djmitche/buildbot/commit/1be55c63663ec1a118669da4d218bd36823f7157
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/status/web/baseweb.py
  M buildbot/status/web/build.py
  M buildbot/status/web/builder.py
  M buildbot/status/web/buildstatus.py
  M buildbot/status/web/grid.py
  M buildbot/status/web/templates/grid_macros.html
  M buildbot/status/web/templates/oneboxperbuilder.html
  M buildbot/status/web/templates/onelineperbuild.html
  M buildbot/status/web/templates/onelineperbuildonebuilder.html
  M buildbot/status/web/templates/waterfallhelp.html
  M buildbot/status/web/waterfall.py

Log Message:
-----------
Merge commit '9c57635edf6f8678f9b28472baa7cfef2d278712' into jinja

Conflicts:
	buildbot/status/web/baseweb.py
	buildbot/status/web/builder.py
	buildbot/status/web/grid.py
	buildbot/status/web/waterfall.py

Commit: 25ea925317e248599c66dffbcfd80c1076fddd5c
    http://github.com/djmitche/buildbot/commit/25ea925317e248599c66dffbcfd80c1076fddd5c
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Log Message:
-----------
Merge commit '5a240f967bc22d58f29d090a42a0071b699375b4' into jinja

Conflicts:
	buildbot/status/web/baseweb.py

Commit: 87623a337d22397418beba133658522e87fe8356
    http://github.com/djmitche/buildbot/commit/87623a337d22397418beba133658522e87fe8356
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/status/web/grid.py
  M buildbot/status/web/slaves.py
  M buildbot/status/web/templates/buildslave.html

Log Message:
-----------
Merge commit 'e7424607fec8e9528add2d0aeffb2f18402bd6b2' into jinja

Conflicts:
	buildbot/status/web/slaves.py

Commit: 014b63a158b295614fe2ac20775f7f6e2e4f9f4a
    http://github.com/djmitche/buildbot/commit/014b63a158b295614fe2ac20775f7f6e2e4f9f4a
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Log Message:
-----------
Merge commit 'efc31f82990b385be67c37a704fe523a0d7d4a61' into jinja

web/tests.py removed from jinja branch earlier. Ignoring edits.

Conflicts:
	buildbot/status/web/tests.py

Commit: 51376574651baacea8adb6d2cb3fc8c8b0f684b4
    http://github.com/djmitche/buildbot/commit/51376574651baacea8adb6d2cb3fc8c8b0f684b4
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/status/web/templates/waterfallhelp.html

Log Message:
-----------
Merge commit '98578726636b4b401724fde0a553596e6064724c' into jinja

Conflicts:
	buildbot/status/web/waterfall.py

Commit: 64c4b598a1636325e4d037e62ef77cfe0daaadc1
    http://github.com/djmitche/buildbot/commit/64c4b598a1636325e4d037e62ef77cfe0daaadc1
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M NEWS
  M buildbot/__init__.py
  M buildbot/changes/changes.py
  M buildbot/changes/pb.py
  M buildbot/clients/sendchange.py
  M buildbot/process/base.py
  M buildbot/scripts/runner.py
  M buildbot/scripts/tryclient.py
  M buildbot/status/web/builder.py
  M buildbot/status/web/templates/forms.html
  M buildbot/steps/shell.py
  M buildbot/test/test_run.py
  M buildbot/test/test_steps.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge commit 'bcd04d730f38cd9303e7e22efce7e21778b2c35b' into jinja

Conflicts:
	buildbot/status/web/base.py
	buildbot/status/web/builder.py

Commit: 0f191a6a2c0f6967e19cf12e23cd2fc9f6755686
    http://github.com/djmitche/buildbot/commit/0f191a6a2c0f6967e19cf12e23cd2fc9f6755686
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/changes/changes.py
  M buildbot/scripts/runner.py
  M buildbot/scripts/tryclient.py
  M buildbot/slave/commands.py
  M buildbot/sourcestamp.py
  M buildbot/status/web/baseweb.py
  A buildbot/status/web/console.py
  A buildbot/status/web/console_html.py
  A buildbot/status/web/console_js.py
  M buildbot/status/web/extended.css
  M buildbot/test/test_locks.py
  M buildbot/test/test_vc.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge commit 'baed1a3ee0627b80756cf1ab8f25840c23f4f193' into jinja

Commit: cd8481249db38b1f8045732c411f1b8163e3b101
    http://github.com/djmitche/buildbot/commit/cd8481249db38b1f8045732c411f1b8163e3b101
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/status/web/console.py

Log Message:
-----------
Quick fix to console view when revision is None

Commit: a8b7921a12ceda7e3d70157ddec2bcd6c1198040
    http://github.com/djmitche/buildbot/commit/a8b7921a12ceda7e3d70157ddec2bcd6c1198040
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  A buildbot/test/test_console.py

Log Message:
-----------
Merge commit '29eb918e2e32f0ec03f405cbb9b57741f0f1dcbf' into jinja

Commit: 124f26663f30a3b7c6e950d3d6090f5371a9389d
    http://github.com/djmitche/buildbot/commit/124f26663f30a3b7c6e950d3d6090f5371a9389d
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/changes/changes.py
  M buildbot/master.py
  M buildbot/slave/commands.py
  M buildbot/status/builder.py
  M buildbot/status/words.py
  M buildbot/test/test_limitlogs.py
  M buildbot/test/test_status.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge commit 'e177c92e706ef2e27022ccd86174041a26ff051f' into jinja

Conflicts:
	buildbot/status/web/grid.py

Commit: d534d3da8405291cbb8235fa9d6149d92ea6b224
    http://github.com/djmitche/buildbot/commit/d534d3da8405291cbb8235fa9d6149d92ea6b224
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/status/web/templates/forms.html

Log Message:
-----------
Merge commit '51149daa8af82b1ffa2c4a6bca41929bab5bdef1' into jinja

Conflicts:
	buildbot/status/web/base.py
	buildbot/status/web/build.py

Commit: 0b92cfffefa89a00d996566e12bcf148ff6adfe5
    http://github.com/djmitche/buildbot/commit/0b92cfffefa89a00d996566e12bcf148ff6adfe5
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/buildslave.py
  M buildbot/slave/bot.py
  M buildbot/status/builder.py
  M buildbot/status/web/slaves.py
  M buildbot/status/web/templates/buildslaves.html

Log Message:
-----------
Merge commit 'b4e332c9268c293343b0de1ed3c4d80cd1b8c3d9' into jinja

Conflicts:
	buildbot/status/web/slaves.py

Commit: 30af01d2d3388017c6158bc06db4e057b2ac95ed
    http://github.com/djmitche/buildbot/commit/30af01d2d3388017c6158bc06db4e057b2ac95ed
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/buildset.py
  M buildbot/changes/pb.py
  M buildbot/process/builder.py
  M buildbot/process/buildstep.py
  M buildbot/process/mtrlogobserver.py
  M buildbot/status/builder.py
  M buildbot/steps/shell.py
  M contrib/github_buildbot.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge commit 'bfe60159e63288cc68e3ee0ee05ff0c4a54edaba' into jinja

Commit: ed1c2ff96a3a7af3338d854e8cb5d823bace2f07
    http://github.com/djmitche/buildbot/commit/ed1c2ff96a3a7af3338d854e8cb5d823bace2f07
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/master.py
  M buildbot/pbutil.py
  M buildbot/process/base.py
  M buildbot/process/builder.py
  M buildbot/process/buildstep.py
  M buildbot/process/step_twisted2.py
  M buildbot/slave/commands.py
  A contrib/bitbucket_buildbot.py
  M contrib/svn_buildbot.py

Log Message:
-----------
Merge commit 'be1431f727129133ce86ed61021469f387dc9644' into jinja

Conflicts:
	buildbot/status/web/build.py

Commit: caff706d3dcab8712a959aaf5a96131c6e6f8cd4
    http://github.com/djmitche/buildbot/commit/caff706d3dcab8712a959aaf5a96131c6e6f8cd4
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/status/web/slaves.py

Log Message:
-----------
Fix syntax error in slave view

Commit: e88bf73e9ff8015cf6d9860cc0676e2e973dcd67
    http://github.com/djmitche/buildbot/commit/e88bf73e9ff8015cf6d9860cc0676e2e973dcd67
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/process/builder.py
  M buildbot/process/mtrlogobserver.py
  M buildbot/scheduler.py
  M buildbot/slave/commands.py
  M buildbot/status/web/base.py
  M buildbot/steps/source.py
  M buildbot/test/test_vc.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge commit '514823b5bc23547c7f456a6b8fce81332fda161f' into jinja

Conflicts:
	buildbot/process/builder.py

Commit: c4ce498d510b783386c0defc2073a4547519860b
    http://github.com/djmitche/buildbot/commit/c4ce498d510b783386c0defc2073a4547519860b
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M CREDITS
  M buildbot/process/factory.py
  A buildbot/process/subunitlogobserver.py
  M buildbot/status/words.py
  M buildbot/steps/source.py
  M buildbot/test/test_buildstep.py
  M buildbot/test/test_config.py
  M buildbot/test/test_status.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge commit '6785c245689c8cdfe7d5341b9bc1677a2207ce5f' into jinja

Commit: 8276d4bdac61fedb1c1402fcd717e574b84c1aca
    http://github.com/djmitche/buildbot/commit/8276d4bdac61fedb1c1402fcd717e574b84c1aca
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/buildslave.py
  M buildbot/master.py
  M buildbot/process/builder.py
  M buildbot/status/mail.py
  M buildbot/status/web/grid.py
  M buildbot/test/runutils.py
  M buildbot/test/test_run.py
  M buildbot/test/test_status.py
  M buildbot/test/test_steps.py
  M contrib/github_buildbot.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge commit '138c831f1bc4340b7043dd74b3081d201abdef18' into jinja

(not applicable to jinja)

Conflicts:
	buildbot/status/web/grid.py

Commit: 89a5852abab400f4d54da996132fe8c66f062c27
    http://github.com/djmitche/buildbot/commit/89a5852abab400f4d54da996132fe8c66f062c27
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/status/web/grid.py
  M buildbot/status/web/templates/grid_macros.html
  M buildbot/status/web/templates/grid_transposed.html

Log Message:
-----------
Merge commit '0fc8eade38879945b0f2193e37a08a061b8569e0' into jinja

Conflicts:
	buildbot/status/web/grid.py

Commit: 94f207042a055ced6879baa9b3eae65e4217e698
    http://github.com/djmitche/buildbot/commit/94f207042a055ced6879baa9b3eae65e4217e698
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/status/web/templates/builder.html

Log Message:
-----------
Fix 'view in waterfall' link on builder page

Commit: 204e6d3f645dbb3e3b9348213b7ce6c218d173e7
    http://github.com/djmitche/buildbot/commit/204e6d3f645dbb3e3b9348213b7ce6c218d173e7
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/slave/commands.py
  M buildbot/status/web/step.py
  M buildbot/status/web/templates/buildstep.html

Log Message:
-----------
Merge commit 'd8fddfa5b0250204a0fa0820d6864e14f09e1bed' into jinja

Conflicts:
	buildbot/status/web/step.py

Commit: 2817dab4757d35401b8a7f3bef18e60bb4661d9d
    http://github.com/djmitche/buildbot/commit/2817dab4757d35401b8a7f3bef18e60bb4661d9d
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/slave/commands.py
  M buildbot/status/web/baseweb.py
  M buildbot/status/web/waterfall.py

Log Message:
-----------
Merge commit 'dfa162c82060b6d2b169ec892e397ba8702ed5b8' into jinja

Commit: e123630ffe294a64ad4cc6eecfebcd7750a1f383
    http://github.com/djmitche/buildbot/commit/e123630ffe294a64ad4cc6eecfebcd7750a1f383
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/status/web/baseweb.py

Log Message:
-----------
Merge commit 'df5a96f1963f302c601a30f2e5b3771b2b2096f3' into jinja

Commit: 163a4c30c67c53cbd06cdb87e78cc9ae7c3227fa
    http://github.com/djmitche/buildbot/commit/163a4c30c67c53cbd06cdb87e78cc9ae7c3227fa
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/master.py
  M buildbot/slave/commands.py
  M buildbot/status/builder.py
  M buildbot/status/web/templates/builder.html
  M buildbot/steps/source.py
  M buildbot/test/test_buildstep.py
  M buildbot/test/test_vc.py
  M docs/buildbot.texinfo
  M docs/epyrun
  M docs/gen-reference

Log Message:
-----------
Merge commit '5746904b70556eefee3636b5e6081b972f3332df' into jinja

Conflicts:
	buildbot/status/web/builder.py

Commit: 76b61c96b3839e6298424e31e168b479c70708ae
    http://github.com/djmitche/buildbot/commit/76b61c96b3839e6298424e31e168b479c70708ae
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/buildslave.py
  M buildbot/scripts/runner.py
  M buildbot/status/builder.py
  M buildbot/status/web/slaves.py
  M buildbot/status/web/templates/buildslave.html
  M docs/buildbot.texinfo

Log Message:
-----------
Merge commit '34c1935c9e69392c1c5e0935173b027832a076e1' into jinja

Conflicts:
	buildbot/status/web/slaves.py

Commit: 581c7fdcb0e027042eabb99fecd428072babea2f
    http://github.com/djmitche/buildbot/commit/581c7fdcb0e027042eabb99fecd428072babea2f
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/master.py
  M buildbot/status/builder.py
  M buildbot/status/web/logs.py
  M buildbot/test/test_vc.py
  M buildbot/test/test_web.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge commit 'cc174f0c20ca2a91c85f71328ca1cbd46f3110c9' into jinja

Commit: 5d9cfb3d037260e725e90c280735a89e09eaf176
    http://github.com/djmitche/buildbot/commit/5d9cfb3d037260e725e90c280735a89e09eaf176
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/slave/commands.py
  M buildbot/status/web/step.py
  M buildbot/status/web/templates/buildstep.html

Log Message:
-----------
Merge commit 'dcbf829e332577709d7b426fa411e746845943f4' into jinja

Conflicts:
	buildbot/status/web/step.py

Commit: 2dbb84af5e9459afc982a71fa6fb6f6c24483d97
    http://github.com/djmitche/buildbot/commit/2dbb84af5e9459afc982a71fa6fb6f6c24483d97
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/process/builder.py
  M buildbot/status/builder.py
  M buildbot/status/mail.py
  M buildbot/status/web/base.py
  M buildbot/status/web/build.py
  M buildbot/status/web/builder.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge commit '10e051422660c9d0b873991cb0890ebf55cfdc80' into jinja

Conflicts:
	buildbot/status/web/base.py
	buildbot/status/web/build.py
	buildbot/status/web/builder.py

Commit: 96413549e4c58b0ef48ba361d35fc12f032be58d
    http://github.com/djmitche/buildbot/commit/96413549e4c58b0ef48ba361d35fc12f032be58d
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/status/web/grid.py

Log Message:
-----------
Merge commit 'acb279a3bbb484d1120f37e97ab7b69d8240cf04' into jinja

Commit: 1cbd3ea4eed6b030d8e279ef794beb409d20c6f5
    http://github.com/djmitche/buildbot/commit/1cbd3ea4eed6b030d8e279ef794beb409d20c6f5
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/status/web/build.py
  M buildbot/status/web/builder.py

Log Message:
-----------
Fix syntax errors in import

Commit: 101db858cf7ca519e87a5299a98f30e43fb0cf96
    http://github.com/djmitche/buildbot/commit/101db858cf7ca519e87a5299a98f30e43fb0cf96
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Log Message:
-----------
CRLF dummy commit

Commit: 1542ae5be1b99cb295e054ac3ad824cddc2ec846
    http://github.com/djmitche/buildbot/commit/1542ae5be1b99cb295e054ac3ad824cddc2ec846
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/changes/p4poller.py
  M buildbot/scripts/runner.py
  M buildbot/slave/commands.py
  A buildbot/status/web/bg_gradient.jpg
  A buildbot/status/web/default.css
  M buildbot/steps/source.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge commit 'ea17f9cf8c95867da1eb015ed07b7037b2232b3b' into jinja

Commit: b9a6faeb714af3a6d705c9b2dc2d1a2c9aa0e9bc
    http://github.com/djmitche/buildbot/commit/b9a6faeb714af3a6d705c9b2dc2d1a2c9aa0e9bc
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/buildslave.py
  M buildbot/changes/changes.py
  M buildbot/process/builder.py
  M buildbot/status/builder.py
  M buildbot/status/web/default.css
  M buildbot/status/web/grid.py
  M buildbot/status/web/slaves.py
  M buildbot/status/web/templates/builder.html
  M buildbot/steps/transfer.py

Log Message:
-----------
Merge commit '676b0c38115deb2edb19ade9dc02c406e310d4b3' into jinja

(Ignored these changes, as footer should be in jinja template / layout.html.
 We still need to adapt all templates to that.)

Conflicts:
	buildbot/status/web/build.py
	buildbot/status/web/grid.py
	buildbot/status/web/slaves.py
	buildbot/status/web/waterfall.py

Commit: 0c23a778623e226d70fccf18a55ce4f2cffb770c
    http://github.com/djmitche/buildbot/commit/0c23a778623e226d70fccf18a55ce4f2cffb770c
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/slave/bot.py
  M buildbot/slave/commands.py
  M buildbot/status/mail.py
  M buildbot/status/words.py
  M contrib/git_buildbot.py

Log Message:
-----------
Merge commit 'fb70a1dd799ff16ef9b3002707ed3613c5780c0d' into jinja

Commit: 3694085c4f0bb8db6450dd9b4cf6e08147acaa30
    http://github.com/djmitche/buildbot/commit/3694085c4f0bb8db6450dd9b4cf6e08147acaa30
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/scripts/runner.py
  M buildbot/status/web/base.py
  M buildbot/status/web/baseweb.py
  M buildbot/status/web/console_html.py
  R buildbot/status/web/templates/base.html
  M buildbot/status/web/templates/layout.html
  M buildbot/status/web/templates/root.html
  M contrib/windows/setup.py
  M setup.py

Log Message:
-----------
Replace index.html root with jinja template (fixes #656) + use new default.css everywhere

Commit: 8077a44fd1ea0e0da9881e25994c58fb83846157
    http://github.com/djmitche/buildbot/commit/8077a44fd1ea0e0da9881e25994c58fb83846157
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-19 (Sat, 19 Dec 2009)

Changed paths:
  M buildbot/status/web/default.css
  M buildbot/status/web/logs.py
  A buildbot/status/web/templates/logs.html

Log Message:
-----------
Attempt to jinjaify HTML log. Not working yet

Commit: 0b9e9616e38ba46156c2c584648098c4bdc129ee
    http://github.com/djmitche/buildbot/commit/0b9e9616e38ba46156c2c584648098c4bdc129ee
Author: Dustin J. Mitchell <dustin at zmanda.com>
Date:   2009-12-20 (Sun, 20 Dec 2009)

Changed paths:
  M setup.py

Log Message:
-----------
(fixes #662) add Jinja2 to setup.py

Commit: b132ea785094cca47c8dccc6a142b566097f42b6
    http://github.com/djmitche/buildbot/commit/b132ea785094cca47c8dccc6a142b566097f42b6
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-20 (Sun, 20 Dec 2009)

Changed paths:
  M NEWS
  M buildbot/status/mail.py
  M buildbot/status/words.py
  M buildbot/test/test_status.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge remote branch 'djmitche/master' into jinja

Commit: 39ed241c68832786ca81b620c64f26100612d603
    http://github.com/djmitche/buildbot/commit/39ed241c68832786ca81b620c64f26100612d603
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-22 (Tue, 22 Dec 2009)

Changed paths:
  M buildbot/locks.py
  M buildbot/process/builder.py
  M buildbot/status/words.py

Log Message:
-----------
Merge remote branch 'djmitche/master' into jinja

Commit: 5e8de8e6496f62fe1e5723f27481c10b44884458
    http://github.com/djmitche/buildbot/commit/5e8de8e6496f62fe1e5723f27481c10b44884458
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-25 (Fri, 25 Dec 2009)

Changed paths:
  M buildbot/status/web/baseweb.py
  M buildbot/status/web/console.py
  M buildbot/status/web/templates/root.html
  M buildbot/test/test_console.py

Log Message:
-----------
Merge branch 'master' of github.com:djmitche/buildbot into jinja

Conflicts:
	buildbot/status/web/console.py

Commit: 70a6bb6dbf1a7b806de315e3a1144cbf23fbdd7a
    http://github.com/djmitche/buildbot/commit/70a6bb6dbf1a7b806de315e3a1144cbf23fbdd7a
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-25 (Fri, 25 Dec 2009)

Changed paths:
  M buildbot/status/web/base.py
  M buildbot/status/web/grid.py
  A buildbot/status/web/templates/box_macros.html
  M buildbot/status/web/templates/buildstatus.html
  M buildbot/status/web/templates/oneboxperbuilder.html
  M buildbot/status/web/templates/waterfall.html
  M buildbot/status/web/waterfall.py
  M buildbot/test/test_web.py

Log Message:
-----------
IBox HTML -> jinja macro (fixes #652) + use path_to_build(er) in grid

Commit: 921994f8cca64b7bba1d7be780bd5b99dd861643
    http://github.com/djmitche/buildbot/commit/921994f8cca64b7bba1d7be780bd5b99dd861643
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-25 (Fri, 25 Dec 2009)

Changed paths:
  M buildbot/status/web/about.py
  M buildbot/status/web/auth.py
  M buildbot/status/web/baseweb.py
  M buildbot/status/web/build.py
  M buildbot/status/web/changes.py
  M buildbot/status/web/grid.py
  M buildbot/status/web/step.py
  M buildbot/status/web/templates/about.html
  M buildbot/status/web/templates/authfail.html
  M buildbot/status/web/templates/build.html
  M buildbot/status/web/templates/builder.html
  M buildbot/status/web/templates/builders.html
  M buildbot/status/web/templates/buildslaves.html
  M buildbot/status/web/templates/buildstatus.html
  M buildbot/status/web/templates/buildstep.html
  M buildbot/status/web/templates/change_sources.html
  M buildbot/status/web/templates/grid.html
  M buildbot/status/web/templates/grid_transposed.html
  M buildbot/status/web/templates/layout.html
  M buildbot/status/web/templates/oneboxperbuilder.html
  M buildbot/status/web/templates/onelineperbuild.html
  M buildbot/status/web/templates/onelineperbuildonebuilder.html
  M buildbot/status/web/templates/root.html
  M buildbot/status/web/templates/waterfall.html

Log Message:
-----------
All templates now inherits layout.html (Fixes #655)

Commit: 217697e392329632738482e8b99c46649d59a026
    http://github.com/djmitche/buildbot/commit/217697e392329632738482e8b99c46649d59a026
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-25 (Fri, 25 Dec 2009)

Changed paths:
  M buildbot/status/web/base.py
  M buildbot/status/web/baseweb.py
  A buildbot/status/web/templates/empty.html

Log Message:
-----------
Convert StaticHTML and LastBuild to use jinja

Commit: cb87ffb3f5b323cf25176133eed6f581f1545e2e
    http://github.com/djmitche/buildbot/commit/cb87ffb3f5b323cf25176133eed6f581f1545e2e
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-25 (Fri, 25 Dec 2009)

Changed paths:
  M NEWS
  M buildbot/locks.py
  M buildbot/process/builder.py
  M buildbot/status/mail.py
  M buildbot/status/web/about.py
  M buildbot/status/web/auth.py
  M buildbot/status/web/base.py
  M buildbot/status/web/baseweb.py
  M buildbot/status/web/build.py
  M buildbot/status/web/changes.py
  M buildbot/status/web/console.py
  M buildbot/status/web/grid.py
  M buildbot/status/web/step.py
  M buildbot/status/web/templates/about.html
  M buildbot/status/web/templates/authfail.html
  A buildbot/status/web/templates/box_macros.html
  M buildbot/status/web/templates/build.html
  M buildbot/status/web/templates/builder.html
  M buildbot/status/web/templates/builders.html
  M buildbot/status/web/templates/buildslaves.html
  M buildbot/status/web/templates/buildstatus.html
  M buildbot/status/web/templates/buildstep.html
  M buildbot/status/web/templates/change_sources.html
  A buildbot/status/web/templates/empty.html
  M buildbot/status/web/templates/grid.html
  M buildbot/status/web/templates/grid_transposed.html
  M buildbot/status/web/templates/layout.html
  M buildbot/status/web/templates/oneboxperbuilder.html
  M buildbot/status/web/templates/onelineperbuild.html
  M buildbot/status/web/templates/onelineperbuildonebuilder.html
  M buildbot/status/web/templates/root.html
  M buildbot/status/web/templates/waterfall.html
  M buildbot/status/web/waterfall.py
  M buildbot/status/words.py
  M buildbot/test/test_console.py
  M buildbot/test/test_status.py
  M buildbot/test/test_web.py
  M docs/buildbot.texinfo
  M setup.py

Log Message:
-----------
Merge branch 'jinja' into jinja-htmllog

Commit: c4ef6e7d941e7a3f94f8c241200efe732eb0e6d4
    http://github.com/djmitche/buildbot/commit/c4ef6e7d941e7a3f94f8c241200efe732eb0e6d4
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-25 (Fri, 25 Dec 2009)

Changed paths:
  M buildbot/status/web/logs.py
  M buildbot/status/web/templates/logs.html

Log Message:
-----------
utf-8 encode all log output. Fixes #653

Commit: 19d66a0a7f8b0bf1c62353bf66ad637693dbd059
    http://github.com/djmitche/buildbot/commit/19d66a0a7f8b0bf1c62353bf66ad637693dbd059
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-25 (Fri, 25 Dec 2009)

Changed paths:
  M buildbot/changes/changes.py
  M buildbot/status/web/changes.py
  A buildbot/status/web/templates/change.html
  M buildbot/test/test_status.py

Log Message:
-----------
Changes HTML -> jinja (fixes #654)

(The mailnotifier doesn't use asHTML as wrongly noted in ticket)

Commit: 355786c47676817f47d8e183a2dadf6264ad8f84
    http://github.com/djmitche/buildbot/commit/355786c47676817f47d8e183a2dadf6264ad8f84
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-25 (Fri, 25 Dec 2009)

Changed paths:
  R buildbot/status/web/index.html

Log Message:
-----------
Remove unused index.html (superceded by templates/root.html)

Commit: 953105d29f126b660312720dd3fc40a16ccf5bfb
    http://github.com/djmitche/buildbot/commit/953105d29f126b660312720dd3fc40a16ccf5bfb
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-25 (Fri, 25 Dec 2009)

Changed paths:
  M buildbot/status/web/console.py
  M buildbot/status/web/feeds.py
  M buildbot/test/test_vc.py

Log Message:
-----------
Fixed some indentation (keep at multiples of 4)

Commit: 281a00d94944a3a75f11bfc74459978f5bb2cf71
    http://github.com/djmitche/buildbot/commit/281a00d94944a3a75f11bfc74459978f5bb2cf71
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-25 (Fri, 25 Dec 2009)

Changed paths:
  M buildbot/scripts/runner.py

Log Message:
-----------
Move public_html/index.html to templates/root.html on 'upgrade-master' (fixes #663)

Commit: a2898d9286fe054cc3e2a649dc68e94c5501b561
    http://github.com/djmitche/buildbot/commit/a2898d9286fe054cc3e2a649dc68e94c5501b561
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-25 (Fri, 25 Dec 2009)

Changed paths:
  M buildbot/status/web/logs.py

Log Message:
-----------
Decode log contents to unicode from utf-8, not ascii

Commit: ca08c45cfbb773fabe4d49ce060bb6f96583b480
    http://github.com/djmitche/buildbot/commit/ca08c45cfbb773fabe4d49ce060bb6f96583b480
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-25 (Fri, 25 Dec 2009)

Changed paths:
  M buildbot/ec2buildslave.py
  M buildbot/process/builder.py
  M buildbot/scripts/checkconfig.py
  M buildbot/slave/commands.py
  M buildbot/status/mail.py
  M buildbot/status/web/base.py
  M buildbot/status/web/baseweb.py
  M buildbot/status/web/build.py
  M buildbot/status/web/builder.py
  M buildbot/status/web/buildstatus.py
  M buildbot/status/web/feeds.py
  M buildbot/status/web/grid.py
  M buildbot/status/web/logs.py
  M buildbot/status/web/root.py
  M buildbot/status/web/slaves.py
  M buildbot/status/web/waterfall.py
  M buildbot/steps/master.py
  M buildbot/steps/package/rpm/rpmbuild.py
  M buildbot/steps/package/rpm/rpmspec.py
  M buildbot/steps/source.py
  M buildbot/steps/transfer.py
  M buildbot/test/test_buildstep.py
  M buildbot/test/test_changemaster.py
  M buildbot/test/test_ec2buildslave.py
  M buildbot/test/test_limitlogs.py
  M buildbot/test/test_mergerequests.py
  M buildbot/test/test_ordering.py
  M buildbot/test/test_status.py
  M buildbot/test/test_steps.py
  M buildbot/test/test_vc.py
  M contrib/git_buildbot.py
  M contrib/github_buildbot.py
  M contrib/svnpoller.py
  M contrib/trac/bbwatcher/api.py
  M contrib/trac/bbwatcher/web_ui.py
  M contrib/viewcvspoll.py
  M contrib/webhook_status.py
  M contrib/windows/setup.py
  M setup.py

Log Message:
-----------
Cleanup all unused imports and tag the rest as ok (for Eclipse/PyDev)

Commit: b7dfaf20f2dfd9e69eae6375b8519d5c7c512f1f
    http://github.com/djmitche/buildbot/commit/b7dfaf20f2dfd9e69eae6375b8519d5c7c512f1f
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-25 (Fri, 25 Dec 2009)

Changed paths:
  M buildbot/steps/transfer.py
  M buildbot/test/test_transfer.py

Log Message:
-----------
Transfer files in strict binary mode & close tarfile fd

Commit: e33c80774499d03294e0577954fc4e9da7bb58c4
    http://github.com/djmitche/buildbot/commit/e33c80774499d03294e0577954fc4e9da7bb58c4
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-25 (Fri, 25 Dec 2009)

Changed paths:
  M buildbot/util.py

Log Message:
-----------
Convert list contents to strings before hashing (fixes test_locks on win32)

Commit: d77606ce5c709335eee761ada8fdb918d47202b2
    http://github.com/djmitche/buildbot/commit/d77606ce5c709335eee761ada8fdb918d47202b2
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-25 (Fri, 25 Dec 2009)

Changed paths:
  M buildbot/test/test_ec2buildslave.py

Log Message:
-----------
test_ec2: Fix bad change in ca08c45cfbb773fabe4d49ce060bb6f96583b480 and allow for win32 USERPROFILE env

Commit: 1214db0620611bbd027ce0857b5725ac86c76066
    http://github.com/djmitche/buildbot/commit/1214db0620611bbd027ce0857b5725ac86c76066
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-25 (Fri, 25 Dec 2009)

Changed paths:
  M buildbot/changes/hgbuildbot.py
  M buildbot/clients/debug.py
  M buildbot/clients/gtkPanes.py
  M buildbot/interfaces.py
  M buildbot/status/web/auth.py
  M buildbot/test/test_status.py
  M contrib/bb_applet.py

Log Message:
-----------
More warning silencing

Commit: 7ef927159109651e4ff3555f5be1bfeb993619e4
    http://github.com/djmitche/buildbot/commit/7ef927159109651e4ff3555f5be1bfeb993619e4
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-25 (Fri, 25 Dec 2009)

Changed paths:
  M buildbot/test/test_limitlogs.py

Log Message:
-----------
test_limitlogs: don't assume we can run scripts directly

Commit: 3b60099023b4590965069c2237ddca939f74a5c7
    http://github.com/djmitche/buildbot/commit/3b60099023b4590965069c2237ddca939f74a5c7
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-27 (Sun, 27 Dec 2009)

Changed paths:
  M buildbot/status/web/console.py
  M buildbot/status/web/console_html.py
  R buildbot/status/web/console_js.py
  A buildbot/status/web/templates/console.html
  M buildbot/status/web/templates/layout.html

Log Message:
-----------
Console view -> jinja (superficial parts only) (see #651)

Commit: 6f87f8949e08ddde813536607240bd99a01c8747
    http://github.com/djmitche/buildbot/commit/6f87f8949e08ddde813536607240bd99a01c8747
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-27 (Sun, 27 Dec 2009)

Changed paths:
  M buildbot/status/web/base.py
  M buildbot/status/web/build.py
  M buildbot/status/web/builder.py
  M buildbot/status/web/buildstatus.py
  M buildbot/status/web/changes.py
  M buildbot/status/web/grid.py
  M buildbot/status/web/slaves.py
  M buildbot/status/web/templates/box_macros.html
  M buildbot/status/web/templates/buildstep.html
  M buildbot/status/web/templates/change.html
  A buildbot/status/web/templates/change_macros.html
  M buildbot/status/web/templates/layout.html
  M buildbot/status/web/waterfall.py

Log Message:
-----------
Web status cleanups (fix #665) + more

 * Extract macros from change.html into change_macros.html (fixed bad bug in waterfall)
 * More HTML -> template (waterfall boxes with links)
 * remove head(), body(), footer (fixes #665)
 * title is now escaped in template (remove escaping from python)
 * actually use HtmlReource.getTitle() when building context
 * Change meta-refresh heads() to just set 'refresh' in context
 * Allow box text to be both string and list-of-string (as it was pre-jinja)
 * use waterfall's lastDate when showing waterfall page creation time (regression)

Commit: fe4efb855a6381e313791998cae01a8ffe5797ba
    http://github.com/djmitche/buildbot/commit/fe4efb855a6381e313791998cae01a8ffe5797ba
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-27 (Sun, 27 Dec 2009)

Changed paths:
  M buildbot/status/web/build.py
  M buildbot/test/test_web.py

Log Message:
-----------
Fix some failing web tests

Commit: 394c64f532ef121ef3fd5ad880a3d5edfa7618b4
    http://github.com/djmitche/buildbot/commit/394c64f532ef121ef3fd5ad880a3d5edfa7618b4
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-27 (Sun, 27 Dec 2009)

Changed paths:
  A buildbot/config.py
  M buildbot/master.py
  M buildbot/test/test_config.py
  M buildbot/test/test_console.py
  M buildbot/test/test_control.py
  M buildbot/test/test_dependencies.py
  M buildbot/test/test_ec2buildslave.py
  M buildbot/test/test_limitlogs.py
  M buildbot/test/test_locks.py
  M buildbot/test/test_mergerequests.py
  M buildbot/test/test_ordering.py
  M buildbot/test/test_properties.py
  M buildbot/test/test_reconfig.py
  M buildbot/test/test_run.py
  M buildbot/test/test_slaves.py
  M buildbot/test/test_status.py
  M buildbot/test/test_steps.py
  M buildbot/test/test_vc.py
  M buildbot/test/test_web.py
  M buildbot/util.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge branch 'master' into jinja

Commit: 57fbdee5b2b3fdbc7ef1291ca8e0f32ad11301bf
    http://github.com/djmitche/buildbot/commit/57fbdee5b2b3fdbc7ef1291ca8e0f32ad11301bf
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-29 (Tue, 29 Dec 2009)

Changed paths:
  M buildbot/locks.py
  M buildbot/scripts/logwatcher.py
  M buildbot/scripts/runner.py
  M buildbot/slave/commands.py
  M buildbot/test/test_util.py
  M buildbot/util.py

Log Message:
-----------
Merge branch 'master' into jinja

Commit: 4994045fb87cce5825df169c70c2ae828db011f4
    http://github.com/djmitche/buildbot/commit/4994045fb87cce5825df169c70c2ae828db011f4
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-30 (Wed, 30 Dec 2009)

Changed paths:
  M NEWS
  M buildbot/interfaces.py
  M buildbot/locks.py
  M buildbot/process/builder.py
  M buildbot/scripts/logwatcher.py
  M buildbot/scripts/runner.py
  M buildbot/scripts/tryclient.py
  M buildbot/slave/commands.py
  M buildbot/test/runutils.py
  M buildbot/test/test_locks.py
  M buildbot/test/test_run.py
  M buildbot/test/test_runner.py
  M buildbot/test/test_slaves.py
  M buildbot/test/test_util.py
  M buildbot/util.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge branch 'master' into jinja

Commit: 12b5bffbacbd448090eefeeda27299138528909c
    http://github.com/djmitche/buildbot/commit/12b5bffbacbd448090eefeeda27299138528909c
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-30 (Wed, 30 Dec 2009)

Log Message:
-----------
Merge remote branch 'origin/jinja' into jinja

Commit: 464b6eacadf72417429d5a690fc35afaec93b14f
    http://github.com/djmitche/buildbot/commit/464b6eacadf72417429d5a690fc35afaec93b14f
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-30 (Wed, 30 Dec 2009)

Changed paths:
  M buildbot/status/web/console.py
  M buildbot/status/web/console_html.py
  M buildbot/status/web/templates/console.html
  M buildbot/status/web/templates/grid.html
  M buildbot/status/web/templates/grid_transposed.html
  M buildbot/status/web/templates/waterfall.html
  M buildbot/test/test_webparts.py

Log Message:
-----------
Console -> jinja (complete) (fixes #651) + cleanups

 * Added console, grid & tgrid to test_webparts
 * Added page title (<h1>) to grid/console/waterfall (similar to other pages)

Commit: 7736d5c942a1a9806e19c12a97606fb8327440d9
    http://github.com/djmitche/buildbot/commit/7736d5c942a1a9806e19c12a97606fb8327440d9
Author: Marcus Lindblom <macke at yar.nu>
Date:   2009-12-30 (Wed, 30 Dec 2009)

Changed paths:
  M buildbot/status/web/templates/build.html
  M buildbot/status/web/templates/builder.html
  M buildbot/status/web/templates/buildslave.html
  M buildbot/status/web/templates/buildslaves.html
  M buildbot/status/web/templates/buildstep.html
  M buildbot/status/web/templates/change_sources.html
  M buildbot/status/web/templates/layout.html
  M buildbot/status/web/templates/root.html

Log Message:
-----------
Add top menu to layout template + minor html cleanups

Commit: 3ca63ce7a02ce85eff59d53a83d38001c17b09ca
    http://github.com/djmitche/buildbot/commit/3ca63ce7a02ce85eff59d53a83d38001c17b09ca
Author: Marcus Lindblom <macke at yar.nu>
Date:   2010-01-02 (Sat, 02 Jan 2010)

Changed paths:
  A ChangeLog-0.7.12
  R ChangeLog-0.7.8.bz2
  R ChangeLog-0.7.9
  M NEWS
  M README
  M buildbot/slave/commands.py
  M buildbot/test/test_vc.py
  M buildbot/test/test_web.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge branch 'master' into jinja

Commit: 45b51d84dfbce22e14cf094f0a594e266d95322b
    http://github.com/djmitche/buildbot/commit/45b51d84dfbce22e14cf094f0a594e266d95322b
Author: Marcus Lindblom <macke at yar.nu>
Date:   2010-01-02 (Sat, 02 Jan 2010)

Changed paths:
  M buildbot/status/web/console.py
  R buildbot/status/web/console_html.py

Log Message:
-----------
Remove leftover console_html.py (console is fully jinjaified)