← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

~loggerhead-team/loggerhead/trunk-rich

Viewing all changes in revision 423.

Committer: John Arbash Meinel
Date: 2011-02-10 13:11:53 UTC
mfrom: (422.1.5 merge_pqm_updates)
Revision ID: john@arbash-meinel.com-20110210131153-wxbw9wddbr0rpvql

Merge the PQM tip into trunk, fixing tests and updating the menus a bit.

files added:
loggerhead/controllers/annotate_ui.py

files renamed:
loggerhead/controllers/annotate_ui.py => loggerhead/controllers/view_ui.py

loggerhead/static/css/annotate.css => loggerhead/static/css/view.css

loggerhead/templates/annotate.pt => loggerhead/templates/view.pt

files modified:
NEWS

info.py

loggerhead/apps/branch.py

loggerhead/controllers/__init__.py

loggerhead/highlight.py

loggerhead/static/css/global.css

loggerhead/static/images/bg_Tabs.gif

loggerhead/static/images/bg_menuTabs.gif

loggerhead/static/images/bg_submenuTabs.gif

loggerhead/templatefunctions.py

loggerhead/templates/inventory.pt

loggerhead/templates/macros.pt

loggerhead/templates/revision.pt

loggerhead/tests/test_controllers.py

Show diffs side-by-side

added added

removed removed

loggerhead/apps/branch.py

loggerhead/controllers/__init__.py

loggerhead/controllers/annotate_ui.py

loggerhead/controllers/view_ui.py

loggerhead/highlight.py

loggerhead/static/css/global.css

loggerhead/static/css/view.css

loggerhead/static/images/bg_Tabs.gif

loggerhead/static/images/bg_menuTabs.gif

loggerhead/static/images/bg_submenuTabs.gif

loggerhead/templatefunctions.py

loggerhead/templates/inventory.pt

loggerhead/templates/macros.pt

loggerhead/templates/revision.pt

loggerhead/templates/view.pt

loggerhead/tests/test_controllers.py

Older »