git.openstreetmap.org Git - osqa.git/commit

]> git.openstreetmap.org Git - osqa.git/commit

author	hernani <hernani@0cfe37f9-358a-4d5e-be75-b63607b5c754>
	Fri, 7 May 2010 01:15:39 +0000 (01:15 +0000)
committer	hernani <hernani@0cfe37f9-358a-4d5e-be75-b63607b5c754>
	Fri, 7 May 2010 01:15:39 +0000 (01:15 +0000)
commit	410bfa05ee36ed1d99356c443a5f3f6aa3ee9578
tree	55ad58c766e52ba45765b210f2ef7bb8daa57512	tree \| snapshot
parent	0cfa31f684a8d64a65b8a16f18bb79be49f13701	commit \| diff

Merging the experimental branch back to trunk.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@156 0cfe37f9-358a-4d5e-be75-b63607b5c754

123 files changed:

forum/actions/__init__.py	[new file with mode: 0644]	blob
forum/actions/meta.py	[new file with mode: 0644]	blob
forum/actions/node.py	[new file with mode: 0644]	blob
forum/actions/user.py	[new file with mode: 0644]	blob
forum/activity.py	[deleted file]	blob \| history
forum/admin.py		diff \| blob \| history
forum/akismet.py		diff \| blob \| history
forum/authentication/__init__.py		diff \| blob \| history
forum/badges/__init__.py		diff \| blob \| history
forum/badges/base.py		diff \| blob \| history
forum/feed.py		diff \| blob \| history
forum/forms.py		diff \| blob \| history
forum/management/__init__.py		diff \| blob \| history
forum/migrations/0014_auto__add_field_question_accepted_answer.py		diff \| blob \| history
forum/migrations/0022_auto__add_actionrepute__add_action__add_favoritenode__del_field_node_v.py	[new file with mode: 0644]	blob
forum/migrations/0023_flaten_node_inheritance_create_actions.py	[new file with mode: 0644]	blob
forum/migrations/0024_auto__del_repute__del_vote__del_answer__del_flaggeditem__del_anonymous.py	[new file with mode: 0644]	blob
forum/migrations/0025_auto__add_field_node_extra_action__add_field_node_deleted__add_field_n.py	[new file with mode: 0644]	blob
forum/migrations/0026_reset_deleted_and_lastedited_flags.py	[new file with mode: 0644]	blob
forum/migrations/0027_auto__del_activity.py	[new file with mode: 0644]	blob
forum/migrations/0028_auto__add_field_action_canceled_ip__add_field_actionrepute_date.py	[new file with mode: 0644]	blob
forum/migrations/0029_repute_dates.py	[new file with mode: 0644]	blob
forum/migrations/0030_auto__chg_field_action_extra__chg_field_keyvalue_value.py	[new file with mode: 0644]	blob
forum/migrations/0031_alter_pickle_storage.py	[new file with mode: 0644]	blob
forum/migrations/0032_auto__del_field_user_hide_ignored_questions__del_field_user_questions_.py	[new file with mode: 0644]	blob
forum/migrations/0033_auto__add_flag__add_vote__add_field_badge_cls__del_unique_badge_type_n.py	[new file with mode: 0644]	blob
forum/migrations/0034_new_badge_and_award.py	[new file with mode: 0644]	blob
forum/migrations/0035_auto__del_field_award_object_id__del_field_award_content_type__add_uni.py	[new file with mode: 0644]	blob
forum/models/__init__.py		diff \| blob \| history
forum/models/action.py	[new file with mode: 0644]	blob
forum/models/answer.py		diff \| blob \| history
forum/models/base.py		diff \| blob \| history
forum/models/comment.py		diff \| blob \| history
forum/models/meta.py		diff \| blob \| history
forum/models/node.py		diff \| blob \| history
forum/models/question.py		diff \| blob \| history
forum/models/repute.py	[deleted file]	blob \| history
forum/models/tag.py		diff \| blob \| history
forum/models/user.py		diff \| blob \| history
forum/models/utils.py		diff \| blob \| history
forum/modules/__init__.py	[moved from forum/modules.py with 97% similarity]	diff \| blob \| history
forum/modules/decorators.py	[new file with mode: 0644]	blob
forum/reputation.py	[deleted file]	blob \| history
forum/settings/__init__.py		diff \| blob \| history
forum/settings/base.py		diff \| blob \| history
forum/settings/basic.py		diff \| blob \| history
forum/settings/email.py		diff \| blob \| history
forum/settings/extkeys.py		diff \| blob \| history
forum/settings/form.py		diff \| blob \| history
forum/settings/forms.py		diff \| blob \| history
forum/settings/moderation.py	[new file with mode: 0644]	blob
forum/skins/default/media/images/openid/aol.gif		diff \| blob \| history
forum/skins/default/media/images/openid/blogger.png	[new file with mode: 0644]	blob
forum/skins/default/media/images/openid/claimid.png	[new file with mode: 0644]	blob
forum/skins/default/media/images/openid/facebook.gif		diff \| blob \| history
forum/skins/default/media/images/openid/flickr.png	[new file with mode: 0644]	blob
forum/skins/default/media/images/openid/google.gif		diff \| blob \| history
forum/skins/default/media/images/openid/livejournal.png	[new file with mode: 0644]	blob
forum/skins/default/media/images/openid/myopenid.png	[new file with mode: 0644]	blob
forum/skins/default/media/images/openid/technorati.png	[new file with mode: 0644]	blob
forum/skins/default/media/images/openid/twitter.png		diff \| blob \| history
forum/skins/default/media/images/openid/verisign.png	[new file with mode: 0644]	blob
forum/skins/default/media/images/openid/wordpress.png	[new file with mode: 0644]	blob
forum/skins/default/media/images/openid/yahoo.gif		diff \| blob \| history
forum/skins/default/media/js/jquery.openid.js		diff \| blob \| history
forum/skins/default/media/js/osqa.admin.js	[new file with mode: 0644]	blob
forum/skins/default/media/js/osqa.main.js		diff \| blob \| history
forum/skins/default/media/style/admin.css		diff \| blob \| history
forum/skins/default/media/style/auth.css		diff \| blob \| history
forum/skins/default/media/style/style.css		diff \| blob \| history
forum/skins/default/templates/ask.html		diff \| blob \| history
forum/skins/default/templates/auth/signin.html		diff \| blob \| history
forum/skins/default/templates/badge.html		diff \| blob \| history
forum/skins/default/templates/faq.html		diff \| blob \| history
forum/skins/default/templates/node/comments.html		diff \| blob \| history
forum/skins/default/templates/node/post_controls.html		diff \| blob \| history
forum/skins/default/templates/node/report.html	[new file with mode: 0644]	blob
forum/skins/default/templates/osqaadmin/base.html		diff \| blob \| history
forum/skins/default/templates/osqaadmin/index.html		diff \| blob \| history
forum/skins/default/templates/post_contributor_info.html		diff \| blob \| history
forum/skins/default/templates/question.html		diff \| blob \| history
forum/skins/default/templates/question_list/tag_selector.html		diff \| blob \| history
forum/skins/default/templates/question_retag.html		diff \| blob \| history
forum/skins/default/templates/question_summary_list_roll.html		diff \| blob \| history
forum/skins/default/templates/reopen.html		diff \| blob \| history
forum/skins/default/templates/sidebar/recent_awards.html		diff \| blob \| history
forum/skins/default/templates/users/activity.html		diff \| blob \| history
forum/skins/default/templates/users/edit.html		diff \| blob \| history
forum/skins/default/templates/users/info.html		diff \| blob \| history
forum/skins/default/templates/users/moderation.html	[new file with mode: 0644]	blob
forum/skins/default/templates/users/questions.html		diff \| blob \| history
forum/skins/default/templates/users/recent.html		diff \| blob \| history
forum/skins/default/templates/users/reputation.html		diff \| blob \| history
forum/skins/default/templates/users/stats.html		diff \| blob \| history
forum/skins/default/templates/users/votes.html		diff \| blob \| history
forum/startup.py		diff \| blob \| history
forum/subscriptions.py		diff \| blob \| history
forum/templatetags/extra_tags.py		diff \| blob \| history
forum/templatetags/general_sidebar_tags.py		diff \| blob \| history
forum/templatetags/node_tags.py		diff \| blob \| history
forum/templatetags/user_tags.py		diff \| blob \| history
forum/urls.py		diff \| blob \| history
forum/views/admin.py		diff \| blob \| history
forum/views/auth.py		diff \| blob \| history
forum/views/commands.py		diff \| blob \| history
forum/views/decorators.py		diff \| blob \| history
forum/views/meta.py		diff \| blob \| history
forum/views/readers.py		diff \| blob \| history
forum/views/users.py		diff \| blob \| history
forum/views/writers.py		diff \| blob \| history
forum_modules/default_badges/badges.py		diff \| blob \| history
forum_modules/localauth/templates/loginform.html		diff \| blob \| history
forum_modules/localauth/views.py		diff \| blob \| history
forum_modules/openidauth/authentication.py		diff \| blob \| history
forum_modules/openidauth/templates/openidurl.html		diff \| blob \| history
forum_modules/pgfulltext/handlers.py		diff \| blob \| history
forum_modules/pgfulltext/pg_fts_install.sql		diff \| blob \| history
forum_modules/pgfulltext/settings.py	[new file with mode: 0644]	blob
forum_modules/pgfulltext/startup.py		diff \| blob \| history
forum_modules/project_badges/badges.py		diff \| blob \| history
mdx_limitedsyntax.py	[new file with mode: 0644]	blob
settings.py		diff \| blob \| history
settings_local.py.dist		diff \| blob \| history

OSQA

RSS Atom