Viewing all changes in revision 159.2.15.
- Committer: Michael Hudson
- Date: 2008-06-16 11:25:25 UTC
- mfrom: (160 trunk)
- mto: This revision was merged to the branch mainline in revision 164.
- Revision ID: michael.hudson@canonical.com-20080616112525-t1vsjh4s3knwpou3
merge trunk, rather brutally resolving conflicts
- files added:
- .project
- homepage
- homepage/download
- loggerhead/config
- loggerhead/sqlobject-history
- turbosimpletal
- turbosimpletal/tests
- files removed:
- COPYING.txt
- loggerhead/apps
- loggerhead/middleware
- loggerhead/static/javascript/yui
- loggerhead/static/javascript/yui/build
- loggerhead/static/javascript/yui/build/anim
- loggerhead/static/javascript/yui/build/attribute
- loggerhead/static/javascript/yui/build/base
- loggerhead/static/javascript/yui/build/classnamemanager
- loggerhead/static/javascript/yui/build/console
- loggerhead/static/javascript/yui/build/console/assets
- loggerhead/static/javascript/yui/build/console/assets/skins
- loggerhead/static/javascript/yui/build/console/assets/skins/sam
- loggerhead/static/javascript/yui/build/cookie
- loggerhead/static/javascript/yui/build/cssbase
- loggerhead/static/javascript/yui/build/cssfonts
- loggerhead/static/javascript/yui/build/cssgrids
- loggerhead/static/javascript/yui/build/cssreset
- loggerhead/static/javascript/yui/build/dd
- loggerhead/static/javascript/yui/build/dom
- loggerhead/static/javascript/yui/build/dump
- loggerhead/static/javascript/yui/build/event
- loggerhead/static/javascript/yui/build/get
- loggerhead/static/javascript/yui/build/io
- loggerhead/static/javascript/yui/build/json
- loggerhead/static/javascript/yui/build/loader
- loggerhead/static/javascript/yui/build/node
- loggerhead/static/javascript/yui/build/node-menunav
- loggerhead/static/javascript/yui/build/node-menunav/assets
- loggerhead/static/javascript/yui/build/node-menunav/assets/skins
- loggerhead/static/javascript/yui/build/node-menunav/assets/skins/sam
- loggerhead/static/javascript/yui/build/oop
- loggerhead/static/javascript/yui/build/overlay
- loggerhead/static/javascript/yui/build/overlay/assets
- loggerhead/static/javascript/yui/build/overlay/assets/skins
- loggerhead/static/javascript/yui/build/overlay/assets/skins/sam
- loggerhead/static/javascript/yui/build/plugin
- loggerhead/static/javascript/yui/build/profiler
- loggerhead/static/javascript/yui/build/queue
- loggerhead/static/javascript/yui/build/slider
- loggerhead/static/javascript/yui/build/slider/assets
- loggerhead/static/javascript/yui/build/slider/assets/skins
- loggerhead/static/javascript/yui/build/slider/assets/skins/sam
- loggerhead/static/javascript/yui/build/substitute
- loggerhead/static/javascript/yui/build/widget
- loggerhead/static/javascript/yui/build/widget/assets
- loggerhead/static/javascript/yui/build/widget/assets/skins
- loggerhead/static/javascript/yui/build/widget/assets/skins/sam
- loggerhead/static/javascript/yui/build/yui
- loggerhead/static/javascript/yui/build/yui-base
- loggerhead/static/javascript/yui/build/yuitest
- loggerhead/static/javascript/yui/build/yuitest/assets
- files renamed:
- loggerhead/apps/branch.py => loggerhead/wsgiapp.py
- start-loggerhead => start-loggerhead.py
- stop-loggerhead => stop-loggerhead.py
- loggerhead/tests/simple.pt => turbosimpletal/tests/simple.pt
- loggerhead/tests/test_templating.py => turbosimpletal/tests/test_zpt.py
- loggerhead/zptsupport.py => turbosimpletal/zptsupport.py
- loggerhead/apps/filesystem.py => wsgitest.py
- files modified:
- .bzrignore
expand all
collapse all
added
removed
homepage/loggerhead-background.png
homepage/loggerhead-logo-medium.png
homepage/sphere.png
loggerhead/static/images/bazaar-banner.png
loggerhead/static/images/bg_Tabs.gif
loggerhead/static/images/bg_infobox.gif
loggerhead/static/images/bg_menuTabs.gif
loggerhead/static/images/bg_search_input.gif
loggerhead/static/images/bg_submenuTabs.gif
loggerhead/static/images/deleteCode.gif
loggerhead/static/images/feed-icon-16x16.gif
loggerhead/static/images/header_inner.png
loggerhead/static/images/ico_branch.gif
loggerhead/static/images/ico_committer.gif
loggerhead/static/images/ico_description.gif
loggerhead/static/images/ico_diff.gif
loggerhead/static/images/ico_file.gif
loggerhead/static/images/ico_file_download.gif
loggerhead/static/images/ico_file_flecha.gif
loggerhead/static/images/ico_file_modify.gif
loggerhead/static/images/ico_folder.gif
loggerhead/static/images/ico_folder_up.gif
loggerhead/static/images/ico_link.gif
loggerhead/static/images/ico_mergefrom.gif
loggerhead/static/images/ico_mergeto.gif
loggerhead/static/images/ico_planilla.gif
loggerhead/static/images/ico_rss.gif
loggerhead/static/images/ico_time.gif
loggerhead/static/images/info.png
loggerhead/static/images/loggerhead-banner.png
loggerhead/static/images/nav-small-down.gif
loggerhead/static/images/nav-small-in.gif
loggerhead/static/images/nav-small-out.gif
loggerhead/static/images/nav-small-right.gif
loggerhead/static/images/newCode.gif
loggerhead/static/images/ok.png
loggerhead/static/images/spinner.gif
loggerhead/static/images/tg_under_the_hood.png
loggerhead/static/images/treeCollapsed.png
loggerhead/static/images/treeDiff.png
loggerhead/static/images/treeExpanded.png
loggerhead/static/images/under_the_hood_blue.png
loggerhead/static/javascript/yui/build/console/assets/skins/sam/bg.png
loggerhead/static/javascript/yui/build/node-menunav/assets/skins/sam/horizontal-menu-submenu-indicator.png
loggerhead/static/javascript/yui/build/node-menunav/assets/skins/sam/horizontal-menu-submenu-toggle.png
loggerhead/static/javascript/yui/build/node-menunav/assets/skins/sam/vertical-menu-submenu-indicator.png
loggerhead/static/javascript/yui/build/slider/assets/skins/sam/rail-classic-x.png
loggerhead/static/javascript/yui/build/slider/assets/skins/sam/rail-classic-y.png
loggerhead/static/javascript/yui/build/slider/assets/skins/sam/thumb-classic-x.png
loggerhead/static/javascript/yui/build/slider/assets/skins/sam/thumb-classic-y.png
