← Back to branch summary

~canonical-ca-hackers/ubuntu-webcatalog/production

~canonical-ca-hackers/ubuntu-webcatalog/production

Viewing all changes in revision 149.

Committer: Anthony Lenton
Date: 2013-03-01 17:56:41 UTC
mfrom: (127.1.51 trunk)
Revision ID: anthony.lenton@canonical.com-20130301175641-53bjprdz63n444nv

Merged in latest changes from trunk (rev. 178)

files added:
src/webcatalog/management/commands/runserver.py

files modified:
.bzrignore

django_project/config/main.cfg

django_project/urls.py

fabtasks/bootstrap.py

setup.py

src/webcatalog/admin.py

src/webcatalog/management/commands/cleanup.py

src/webcatalog/schema.py

src/webcatalog/static/js/screenshots.js

src/webcatalog/tasks.py

src/webcatalog/templates/500.html

src/webcatalog/templates/webcatalog/screenshot_widget.html

src/webcatalog/templatetags/webcatalog.py

src/webcatalog/tests/test_commands.py

src/webcatalog/tests/test_oops_wsgi_config.py

src/webcatalog/tests/test_templatetags.py

src/webcatalog/tests/test_views.py

src/webcatalog/urls.py

src/webcatalog/views.py

src/webcatalog/wsgi.py

Show diffs side-by-side

added added

removed removed

django_project/config/main.cfg

django_project/urls.py

fabtasks/bootstrap.py

src/webcatalog/admin.py

src/webcatalog/management/commands/cleanup.py

src/webcatalog/management/commands/runserver.py

src/webcatalog/schema.py

src/webcatalog/static/js/screenshots.js

src/webcatalog/tasks.py

src/webcatalog/templates/500.html

src/webcatalog/templates/webcatalog/screenshot_widget.html

src/webcatalog/templatetags/webcatalog.py

src/webcatalog/tests/test_commands.py

src/webcatalog/tests/test_oops_wsgi_config.py

src/webcatalog/tests/test_templatetags.py

src/webcatalog/tests/test_views.py

src/webcatalog/urls.py

src/webcatalog/views.py

src/webcatalog/wsgi.py

Older »