]> git.openstreetmap.org Git - osqa.git/commit
Merging jambazov --> trunk.
authorjordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Mon, 7 Mar 2011 22:10:47 +0000 (22:10 +0000)
committerjordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Mon, 7 Mar 2011 22:10:47 +0000 (22:10 +0000)
commitc6c168511f18d8984901b2c828a47310a2d54d64
treea9efb9ebf66808012cbe1da613cc40c0b90e8918
parent6e4c911e9bfed3ecd83427f5329ed024be9c62c6
Merging jambazov --> trunk.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@796 0cfe37f9-358a-4d5e-be75-b63607b5c754
24 files changed:
forum/actions/node.py
forum/actions/user.py
forum/forms/qanda.py
forum/management/commands/maintaindb.py [new file with mode: 0644]
forum/middleware/admin_messages.py [new file with mode: 0644]
forum/migrations/0045_auto__add_openidassociation__add_openidnonce__add_field_tag_created_at.py [new file with mode: 0644]
forum/migrations/0046_set_tag_dates.py [new file with mode: 0644]
forum/models/node.py
forum/models/tag.py
forum/settings/email.py
forum/settings/forms.py
forum/settings/repgain.py
forum/settings/view.py
forum/skins/default/media/js/osqa.admin.js
forum/skins/default/media/style/djstyle_admin.css
forum/skins/default/templates/node/reviser_info.html
forum/skins/default/templates/osqaadmin/mail_test.html [new file with mode: 0644]
forum/skins/default/templates/osqaadmin/test_email_settings.html [new file with mode: 0644]
forum/urls.py
forum/views/admin.py
forum/views/auth.py
forum/views/readers.py
forum_modules/sximporter/importer.py
settings.py