]> git.openstreetmap.org Git - osqa.git/commit
Reintegrate merge cacheimp -> trunk.
authorjordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Sat, 2 Apr 2011 12:20:13 +0000 (12:20 +0000)
committerjordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Sat, 2 Apr 2011 12:20:13 +0000 (12:20 +0000)
commit22236fb67da2f27ceb35ad138f4d534a4fd08251
treed20009f14aa3e0d7703224e5e2af2be6d91faa28
parent8e91963c85103b7b47eb6e6d39656bc938c55e0e
Reintegrate merge cacheimp -> trunk.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@924 0cfe37f9-358a-4d5e-be75-b63607b5c754
35 files changed:
forum/actions/user.py
forum/badges/base.py
forum/markdownext/mdx_auto_linker.py [new file with mode: 0644]
forum/markdownext/mdx_urlize.py [deleted file]
forum/models/action.py
forum/models/base.py
forum/models/meta.py
forum/models/node.py
forum/models/question.py
forum/models/tag.py
forum/models/user.py
forum/models/utils.py
forum/modules/ui.py
forum/modules/ui_objects.py
forum/registry.py
forum/settings/sidebar.py
forum/skins/default/media/js/osqa.ask.js
forum/skins/default/media/style/user.css
forum/skins/default/templates/paginator/page_numbers.html
forum/skins/default/templates/user.html
forum/skins/default/templates/users/questions.html
forum/startup.py
forum/templatetags/user_tags.py
forum/utils/pagination.py
forum/utils/userlinking.py
forum/views/commands.py
forum/views/meta.py
forum_modules/exporter/exporter.py
forum_modules/mysqlfulltext/__init__.py [new file with mode: 0644]
forum_modules/mysqlfulltext/fts_install.sql [new file with mode: 0644]
forum_modules/mysqlfulltext/models.py [new file with mode: 0644]
forum_modules/mysqlfulltext/settings.py [new file with mode: 0644]
forum_modules/mysqlfulltext/startup.py [new file with mode: 0644]
forum_modules/openidauth/consumer.py
forum_modules/sximporter/importer.py