« back to all changes in this revision
Viewing changes to push-website
- Committer: John Arbash Meinel
- Date: 2011-03-16 11:40:05 UTC
- mfrom: (434 trunk-rich)
- mto: This revision was merged to the branch mainline in revision 435.
- Revision ID: john@arbash-meinel.com-20110316114005-1rdrmdu9hda30xak
Merge trunk to resolve text conflict in deleting setup_logging
- files added:
- COPYING.txt
- docs
- docs/_build
- docs/_static
- docs/_templates
- load_test_scripts
- 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 removed:
- .project
- homepage
- homepage/download
- loggerhead/config
- loggerhead/sqlobject-history
- turbosimpletal
- turbosimpletal/tests
- files renamed:
- README.txt => README
- loggerhead/controllers/annotate_ui.py => loggerhead/controllers/view_ui.py
- loggerhead/static/images/ico_link => loggerhead/static/images/ico_link.gif
- loggerhead/templates/annotate.pt => loggerhead/templates/view.pt
- turbosimpletal/tests/simple.pt => loggerhead/tests/simple.pt
- turbosimpletal/tests/test_zpt.py => loggerhead/tests/test_templating.py
- turbosimpletal/zptsupport.py => loggerhead/zptsupport.py
- files modified:
- .bzrignore
- setup.py *
added
removed
push-website
