Changeset [4b882e1941cf6b932d9e0264c720ff0d91c2caa3] by Myles Braithwaite

January 24th, 2013 @ 11:31 AM

Merge branch 'feature/class-based-views' into develop

Conflicts:
blog/templates/blog/archive.html blog/templates/blog/author/list.html blog/templates/blog/category_detail.html blog/templates/blog/index.html blog/templates/blog/tag/list.html manage.py https://github.com/asgardproject/asgard-blog/commit/4b882e1941cf6b9...

Committed by Myles Braithwaite

  • A README.rst
  • A blog/templates/blog/archive/archive.html
  • A blog/templates/blog/archive/day.html
  • A blog/templates/blog/archive/month.html
  • A blog/templates/blog/archive/updated.html
  • A blog/templates/blog/archive/week.html
  • A blog/templates/blog/archive/year.html
  • A blog/templates/blog/author/detail.html
  • A blog/templates/blog/author/list.html
  • A blog/templates/blog/category/detail.html
  • A blog/templates/blog/category/list.html
  • A blog/templates/blog/tag/detail.html
  • A blog/templates/blog/tag/list.html
  • A blog/views/__init__.py
  • A blog/views/archive.py
  • A blog/views/author.py
  • A blog/views/category.py
  • A blog/views/old.py
  • A blog/views/search.py
  • A blog/views/tag.py
  • R README
  • R blog/templates/blog/archive_day.html
  • R blog/templates/blog/archive_month.html
  • R blog/templates/blog/updated.html
  • R blog/templates/blog/archive_year.html
  • R blog/templates/blog/author_detail.html
  • R blog/templates/blog/author_list.html
  • R blog/templates/blog/category_list.html
  • R blog/templates/blog/tag_detail.html
  • R blog/templates/blog/tag_list.html
  • R blog/views.py
  • M blog/admin.py
  • M blog/feeds.py
  • M blog/managers.py
  • M blog/templates/blog/index.html
  • M blog/templates/blog/search.html
  • M blog/tests.py
  • M blog/urls.py
  • M manage.py
  • M setup.py
New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป

Shared Ticket Bins