git.openstreetmap.org Git

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

projects / osqa.git / log

commit | commitdiff | tree

hernani [Thu, 7 Apr 2011 11:22:50 +0000 (11:22 +0000)]

Merge cacheimp -> master

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

commit | commitdiff | tree

jordan [Wed, 6 Apr 2011 16:51:31 +0000 (16:51 +0000)]

SPLUNK-196, making filtration to the summary and headline properties of the Node model, removing multiple spaces and new lines breaks, we don't need them and they cause trouble to the title attribute of the <a> tag.

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

commit | commitdiff | tree

jordan [Wed, 6 Apr 2011 15:14:49 +0000 (15:14 +0000)]

SPLUNK-198, Use the decorated name property for the recent badges in the sidebar.

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

commit | commitdiff | tree

jordan [Wed, 6 Apr 2011 14:53:34 +0000 (14:53 +0000)]

SPLUNK-198. Long usernames used to cause trouble with the UI. Every username length should be reasonable, but some users use radiculously long usernames. For such cases two new settings have been added to the Users Set. TRUNCATE_LONG_USERNAMES and TRUNCATE_USERNAMES_LONGER_THAN. This way we provide an easy interface that lets the admins specify whether the long usernames should be truncated and after which character that should happen.

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

commit | commitdiff | tree

hernani [Tue, 5 Apr 2011 17:26:48 +0000 (17:26 +0000)]

Stupid error.

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

commit | commitdiff | tree

hernani [Tue, 5 Apr 2011 17:07:16 +0000 (17:07 +0000)]

Forces case insensitivity on mysql fts by forcin upper case.

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

commit | commitdiff | tree

hernani [Tue, 5 Apr 2011 15:47:25 +0000 (15:47 +0000)]

merging cacheimp -> trunk

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

commit | commitdiff | tree

jordan [Mon, 4 Apr 2011 16:12:02 +0000 (16:12 +0000)]

SPLUNK-128, adding more padding to the content container, now it shouldn't cover the Ok button if the text goes to the second line.

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

commit | commitdiff | tree

jordan [Sat, 2 Apr 2011 12:20:13 +0000 (12:20 +0000)]

Reintegrate merge cacheimp -> trunk.

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

commit | commitdiff | tree

jordan [Mon, 28 Mar 2011 21:35:11 +0000 (21:35 +0000)]

#OSQA-574, a bit of backwards compatibility, importing the with_statements from the __future__ package on the top of the files. It used to cause a bit of trouble when in a try-except block.

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

commit | commitdiff | tree

jordan [Mon, 28 Mar 2011 18:52:15 +0000 (18:52 +0000)]

#SPLUNK-122, adding hidden overflow for the editor preview container, this way the there is no chance for the text to get out of the box.

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

commit | commitdiff | tree

jordan [Mon, 28 Mar 2011 18:23:07 +0000 (18:23 +0000)]

#SPLUNK-123, changing the cursor from a pointer to a normal one, now the pointer is only on the arrow icon.

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

commit | commitdiff | tree

jordan [Mon, 28 Mar 2011 16:34:07 +0000 (16:34 +0000)]

#SPLUNK-124, we show a confirm popup when user is trying to delete a comment.

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

commit | commitdiff | tree

jordan [Mon, 28 Mar 2011 16:02:59 +0000 (16:02 +0000)]

#SPLUNK-120, adding a bit top margin for the question tags container. This should fix the issue with the tags overlapping the scrollbar.

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

commit | commitdiff | tree

jordan [Mon, 28 Mar 2011 15:27:41 +0000 (15:27 +0000)]

#SPLUNK-121, fixing the long titles issue, added an overflow: hidden; property to the H1 style. Now the long titles cannot get out of the main container. Tested under Chrome and Firefox.

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

commit | commitdiff | tree

jordan [Sun, 27 Mar 2011 22:38:38 +0000 (22:38 +0000)]

#OSQA-602, the markdown syntax ** now doesn't interfer with the urlize extension.

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

commit | commitdiff | tree

jordan [Sun, 27 Mar 2011 22:32:03 +0000 (22:32 +0000)]

OSQA-178, we notify the current user with a message after a node has been deleted him.

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

commit | commitdiff | tree

jordan [Sun, 27 Mar 2011 22:12:51 +0000 (22:12 +0000)]

OSQA-587, filtering the questions QuerySet on the tag view if there is user parameter passed. We raise Http404 error if the user doesn't exist.

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

commit | commitdiff | tree

jordan [Sun, 27 Mar 2011 21:51:52 +0000 (21:51 +0000)]

#OSQA-574, we make an attempt to import the with statement from the __future__ package in case the users are using Python 2.5

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

commit | commitdiff | tree

jordan [Sun, 27 Mar 2011 21:45:08 +0000 (21:45 +0000)]

OSQA-533, forgot ; for the & hash

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

commit | commitdiff | tree

jordan [Sun, 27 Mar 2011 21:10:14 +0000 (21:10 +0000)]

OSQA-533, fixed some W3C validation errors: closing <img /> tags, removed some unnecessary characters from the By-SA license image, closing the <meta /> tags, etc. There is still one validation error with the autocomplete attribute.

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

commit | commitdiff | tree

jordan [Sun, 27 Mar 2011 20:34:16 +0000 (20:34 +0000)]

OSQA-621, adding a separate rss link for the question_search view.

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

commit | commitdiff | tree

jordan [Sun, 27 Mar 2011 19:51:36 +0000 (19:51 +0000)]

OSQA-236, modifying the flagged content daily digest, now we count only the items that have been flagged for the last 24 hours.

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

commit | commitdiff | tree

jordan [Sun, 27 Mar 2011 19:02:33 +0000 (19:02 +0000)]

#OSQA-585, adding support for plain text emails for the daily digest.

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

commit | commitdiff | tree

jordan [Sun, 27 Mar 2011 16:25:04 +0000 (16:25 +0000)]

Changing the statement that checks if the content has to be deleted/hidden. We should use >= instead of ==. Let's imagine that firstly the admin configured OSQA to delete Answers that have been flagged 10 times, the answer has been flagged 8 times and then the admin changes that setting to 5 times. What happens with the answer that has been flagged 8 times? It will never be automatically deleted by the system.

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

commit | commitdiff | tree

jordan [Sun, 27 Mar 2011 16:19:03 +0000 (16:19 +0000)]

OSQA-236, now we add a link for the administrators to flagged posts management tool in the daily digest. The number of the flagged items is shown too.

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

commit | commitdiff | tree

jordan [Sun, 27 Mar 2011 11:33:52 +0000 (11:33 +0000)]

#OSQA-544, words in cyrillic should also be counted, adding the А-Я (all the letters from the cyrillic alphabet) intervals into the regular expression.

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

commit | commitdiff | tree

jordan [Thu, 24 Mar 2011 13:59:14 +0000 (13:59 +0000)]

#SPLUNK-91, modifying the permanent link tool, adding an option to copy to the clipboard if the users clicks the Ok button and just closing the AJAX popup if the user is clicking the Cancel button.

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

commit | commitdiff | tree

jordan [Wed, 23 Mar 2011 23:34:06 +0000 (23:34 +0000)]

#OSQA-388, creating a separate action for the award points for an answer functionality.

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

commit | commitdiff | tree

jordan [Wed, 23 Mar 2011 23:24:20 +0000 (23:24 +0000)]

#OSQA-388, changing a bit the UI of the award points for an answer tool, adding text field for the input and a bit more text information about the purpose of the tool.

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

commit | commitdiff | tree

jordan [Sat, 19 Mar 2011 09:14:34 +0000 (09:14 +0000)]

#OSQAAWS-69, It was not a good idea to make the filtration for the moderation module directly from the Node and Tag managers. This way the moderation module depends on the Modules API and becomes unstable.

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

commit | commitdiff | tree

hernani [Fri, 18 Mar 2011 22:42:13 +0000 (22:42 +0000)]

Simple styling issue with badges.

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

commit | commitdiff | tree

hernani [Fri, 18 Mar 2011 22:10:59 +0000 (22:10 +0000)]

Improved lazy querysets.

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

commit | commitdiff | tree

jordan [Fri, 18 Mar 2011 20:10:27 +0000 (20:10 +0000)]

removing unnecessery line causing IndentationError in the log file.

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

commit | commitdiff | tree

jordan [Fri, 18 Mar 2011 18:09:35 +0000 (18:09 +0000)]

#OSQA-610, the used_count of the firstly added tags is now updated properly. The problem was the Tag ActiveManager which had been set as both objects and active manager. Now the objects Manager is using the standart Django Model Manager. Also data migration has been added in order to fix the used_count for previously added tags.

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

commit | commitdiff | tree

hernani [Thu, 17 Mar 2011 00:32:04 +0000 (00:32 +0000)]

Makes tips on the ask a question page editable in the admin.

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

commit | commitdiff | tree

hernani [Wed, 16 Mar 2011 23:29:56 +0000 (23:29 +0000)]

Adds a way for modules to completely override a url pattern.

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

commit | commitdiff | tree

jordan [Wed, 16 Mar 2011 20:30:26 +0000 (20:30 +0000)]

#OSQA-603, removing the previously added in commit 857 call to the save method. It turned out that the issue is more cache related and the badge calculation works fine.

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

commit | commitdiff | tree

jordan [Wed, 16 Mar 2011 19:21:27 +0000 (19:21 +0000)]

#OSQA-603, fixing the badges count calculation error. After the update of the count field we have to save the model.

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

commit | commitdiff | tree

hernani [Wed, 16 Mar 2011 17:15:02 +0000 (17:15 +0000)]

A couple small fixes in the sximporter.

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

commit | commitdiff | tree

jordan [Wed, 16 Mar 2011 15:51:06 +0000 (15:51 +0000)]

#OSQA-388, we check if the user has enough reputation points (if the amount of points the user is trying to give is less than the user's reputation).

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

commit | commitdiff | tree

jordan [Wed, 16 Mar 2011 00:36:23 +0000 (00:36 +0000)]

changing the number of the data migration on the notification-config branch from 0045 to 0047, this number should be unique

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

commit | commitdiff | tree

hernani [Wed, 16 Mar 2011 00:31:38 +0000 (00:31 +0000)]

Fixes the sx importer to use the latest db schema. Also, the fake orm is created based on the latest migration, to simplify future updates.

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

commit | commitdiff | tree

jordan [Wed, 16 Mar 2011 00:27:31 +0000 (00:27 +0000)]

resolving conflict in the email settings file

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

commit | commitdiff | tree

jordan [Wed, 16 Mar 2011 00:24:29 +0000 (00:24 +0000)]

merge notification-config -> trunk, previous commits 695, 751 (email debugging information)

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

commit | commitdiff | tree

jordan [Wed, 16 Mar 2011 00:23:29 +0000 (00:23 +0000)]

merge notification-config -> trunk, previous commits 695, 751 (email debugging information)

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

commit | commitdiff | tree

jordan [Wed, 16 Mar 2011 00:16:40 +0000 (00:16 +0000)]

merge notification-config -> trunk, previous commits 694, 695, 702

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

commit | commitdiff | tree

jordan [Wed, 16 Mar 2011 00:09:18 +0000 (00:09 +0000)]

removing the edit_user_email_feeds_form.html file, revision 695

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

commit | commitdiff | tree

jordan [Tue, 15 Mar 2011 23:53:57 +0000 (23:53 +0000)]

merge notification-config -> trunk, previous revision 694, changes to the subscription hooks

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

commit | commitdiff | tree

jordan [Tue, 15 Mar 2011 23:50:48 +0000 (23:50 +0000)]

merging notification-config -> trunk, changes from revision 695, 696, 697, 698, 699, 702

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

commit | commitdiff | tree

jordan [Tue, 15 Mar 2011 21:51:06 +0000 (21:51 +0000)]

merging to the trunk changes in the user model, commit 694

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

commit | commitdiff | tree

jordan [Tue, 15 Mar 2011 21:25:12 +0000 (21:25 +0000)]

Adding migration from the notification-config branch

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

commit | commitdiff | tree

jordan [Tue, 15 Mar 2011 14:38:14 +0000 (14:38 +0000)]

#OSQA-388, connecting the award_points command to the BonusRepAction. We take the points from the current user and give them to the awarded one.

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

commit | commitdiff | tree

jordan [Tue, 15 Mar 2011 14:20:17 +0000 (14:20 +0000)]

#OSQA-388, showing message to the current user on submit, the username of the awarded user and the number of points that had been given.

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

commit | commitdiff | tree

jordan [Tue, 15 Mar 2011 11:08:37 +0000 (11:08 +0000)]

#OSQA-609, fix for a mailto link, removing unneeded space.

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

commit | commitdiff | tree

hernani [Tue, 15 Mar 2011 02:12:27 +0000 (02:12 +0000)]

Fixes some weird threading problems with modules.

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

commit | commitdiff | tree

claycarpenter [Mon, 14 Mar 2011 23:02:05 +0000 (23:02 +0000)]

Merging in changesets from revisions 809, 811, 812, 825, 826, and 827. These all come from the notification-config branch.

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

commit | commitdiff | tree

jordan [Mon, 14 Mar 2011 22:14:37 +0000 (22:14 +0000)]

#OSQAAWS-79, the improved filtration of the content, now we check if the moderation module has been enabled or not.

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

commit | commitdiff | tree

hernani [Mon, 14 Mar 2011 18:23:43 +0000 (18:23 +0000)]

last minute fix, bad import

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

commit | commitdiff | tree

hernani [Mon, 14 Mar 2011 18:09:41 +0000 (18:09 +0000)]

Fixes bug in openid auth consumer, and problem with modules template loader.

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

commit | commitdiff | tree

jordan [Mon, 14 Mar 2011 15:03:33 +0000 (15:03 +0000)]

Removing the code that Hernani has removed in Revision 828 again. Somehow after the merges I succeded to get the code back in.

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

commit | commitdiff | tree

jordan [Sun, 13 Mar 2011 13:33:31 +0000 (13:33 +0000)]

reintegrate merge hernani -> trunk

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

commit | commitdiff | tree

jordan [Sun, 13 Mar 2011 13:30:44 +0000 (13:30 +0000)]

reintegrate merge jambazov -> trunk

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

commit | commitdiff | tree

hernani [Sun, 13 Mar 2011 01:29:36 +0000 (01:29 +0000)]

Improved "convert to question" routine, using the question edit form, and the same validation used to edit questions,

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

commit | commitdiff | tree

hernani [Sun, 13 Mar 2011 00:06:52 +0000 (00:06 +0000)]

Removes some test code.

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

commit | commitdiff | tree

hernani [Fri, 11 Mar 2011 20:01:26 +0000 (20:01 +0000)]

merging jambazov > trunk

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

commit | commitdiff | tree

hernani [Fri, 11 Mar 2011 19:50:09 +0000 (19:50 +0000)]

merge hernani > trunk

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

commit | commitdiff | tree

jordan [Thu, 10 Mar 2011 22:36:25 +0000 (22:36 +0000)]

Reverting the merges due to unsuccessfull conflict resolvement.

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

commit | commitdiff | tree

jordan [Thu, 10 Mar 2011 22:22:06 +0000 (22:22 +0000)]

merge hernani -> trunk

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

commit | commitdiff | tree

jordan [Thu, 10 Mar 2011 22:15:51 +0000 (22:15 +0000)]

merge jambazov -> trunk

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

commit | commitdiff | tree

jordan [Thu, 10 Mar 2011 02:17:56 +0000 (02:17 +0000)]

sync merge jambazov -> trunk

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

commit | commitdiff | tree

jordan [Mon, 7 Mar 2011 22:10:47 +0000 (22:10 +0000)]

Merging jambazov --> trunk.

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

commit | commitdiff | tree

hernani [Thu, 24 Feb 2011 18:21:55 +0000 (18:21 +0000)]

Adds a file format option to xml backups.

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

commit | commitdiff | tree

hernani [Mon, 21 Feb 2011 17:45:19 +0000 (17:45 +0000)]

Cleaning up a small mess.

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

commit | commitdiff | tree

hernani [Mon, 21 Feb 2011 17:38:02 +0000 (17:38 +0000)]

Creating my branch

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

commit | commitdiff | tree

jordan [Tue, 15 Feb 2011 17:38:22 +0000 (17:38 +0000)]

OSQA-516, bugfix for the Akismet Module. There was problem with the loading of the ReCaptcha settings if the ReCaptcha module has been disabled. Now we added a try-except block that fixes the problem. Some improvements made. Better found-spam message: now we hide the Submit button of the found-spam message in case there is no recaptcha field -- we just don't need it. fields={} has been added to the SimpleCaptchaForm. It fixes the error @Nigel mentioned about.

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

commit | commitdiff | tree

hernani [Tue, 15 Feb 2011 12:23:16 +0000 (12:23 +0000)]

fixes a nasty bug causing a view to never return a response under certain circumstances

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

commit | commitdiff | tree

hernani [Wed, 9 Feb 2011 11:44:46 +0000 (11:44 +0000)]

fixes OSQA-562, Mixed-up markdown mangling of simple comment text

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

commit | commitdiff | tree

claycarpenter [Fri, 4 Feb 2011 18:37:34 +0000 (18:37 +0000)]

Merge of branches/jambazov to trunk. Incoporating the new convert comment to answer icon.

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

commit | commitdiff | tree

hernani [Fri, 4 Feb 2011 17:59:52 +0000 (17:59 +0000)]

fixes several issues with the static pages

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

commit | commitdiff | tree

hernani [Fri, 4 Feb 2011 17:47:40 +0000 (17:47 +0000)]

fixes OSQA 555 and OSQA 294

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

commit | commitdiff | tree

hernani [Fri, 4 Feb 2011 00:37:54 +0000 (00:37 +0000)]

Fixes the new line problems in the OSQA exporter.

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

commit | commitdiff | tree

claycarpenter [Wed, 2 Feb 2011 23:34:44 +0000 (23:34 +0000)]

Merge of jambazov branch to trunk. Adds CC license and failed sign-in referrer bug fixes.

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

commit | commitdiff | tree

claycarpenter [Tue, 1 Feb 2011 16:27:23 +0000 (16:27 +0000)]

Accepting merge (branches/carpenter->trunk). Incorporates update svn ignore property to ignore osqa.wsgi files.

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

commit | commitdiff | tree

claycarpenter [Tue, 1 Feb 2011 16:18:44 +0000 (16:18 +0000)]

Accepting incoming merge (branches/carpenter->trunk). Incorporates fixes to the importer component.

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

commit | commitdiff | tree

claycarpenter [Mon, 31 Jan 2011 23:22:59 +0000 (23:22 +0000)]

Accepting incoming merge; receiving new svn:ignore property to ignore test import files.

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

commit | commitdiff | tree

claycarpenter [Mon, 31 Jan 2011 23:12:04 +0000 (23:12 +0000)]

Updating svn:ignore properties to ignore IDEA project files, logs within the log directory.

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

commit | commitdiff | tree

claycarpenter [Mon, 31 Jan 2011 23:08:32 +0000 (23:08 +0000)]

Accepting incoming merge of the jambazov feature branch. Mostly includes new bug fixes.

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

commit | commitdiff | tree

hernani [Fri, 7 Jan 2011 16:25:01 +0000 (16:25 +0000)]

Previous feature addition commit introduced errors; rolling back to previous revision while the feature code is reviewed. -CAC

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

commit | commitdiff | tree

hernani [Fri, 7 Jan 2011 15:58:01 +0000 (15:58 +0000)]

Importing from stuff defined in module is not a good idea.

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

commit | commitdiff | tree

hernani [Fri, 7 Jan 2011 15:56:27 +0000 (15:56 +0000)]

Should fix the problems some users where having with rosetta.

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

commit | commitdiff | tree

hernani [Fri, 7 Jan 2011 15:52:59 +0000 (15:52 +0000)]

Disables the recaptcha feature for a while. It was causing some nasty bugs.

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

commit | commitdiff | tree

jordan [Wed, 5 Jan 2011 17:20:57 +0000 (17:20 +0000)]

Work on issue #OSQA-510. Added support for ReCaptcha for users with low reputation. Added an option should be the upper limit for showing ReCaptcha when adding/editing questions and answers, called CAPTCHA_IF_REP_LESS_THAN in the Minimum reputation set.

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

commit | commitdiff | tree

hernani [Tue, 4 Jan 2011 22:50:31 +0000 (22:50 +0000)]

Fixes a couple of bad imports in the sitemap code.

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

commit | commitdiff | tree

jordan [Tue, 4 Jan 2011 19:52:51 +0000 (19:52 +0000)]

#OSQA-385, fixing the links of sitemaps when site is running using SCRIPT_ALIAS.

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

commit | commitdiff | tree

jordan [Tue, 4 Jan 2011 11:43:52 +0000 (11:43 +0000)]

Added an option to allow users with higher reputation vote more than the users with a lower one. The user reputation is added to the MAX_VOTES_PER_DAY option. This option can be moderated from the OSQA administration.

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

commit | commitdiff | tree

jordan [Tue, 4 Jan 2011 09:28:27 +0000 (09:28 +0000)]

Fix local variable name of the captcha check form

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

commit | commitdiff | tree

jordan [Tue, 4 Jan 2011 09:21:42 +0000 (09:21 +0000)]

Added reCaptcha image in case the Akismet module returns spam while checking

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

commit | commitdiff | tree

jordan [Tue, 4 Jan 2011 05:40:54 +0000 (05:40 +0000)]

Removing local settings file made by Eclipse.

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

commit | commitdiff | tree

jordan [Mon, 3 Jan 2011 19:28:37 +0000 (19:28 +0000)]

Making the default email subscription option on the register page configurable from administration on the Email settings page. Jira OSQA #139.

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

OSQA

RSS Atom