]> git.openstreetmap.org Git - osqa.git/log
osqa.git
13 years agoUpdated the PO files for all languages.
jordan [Sun, 10 Apr 2011 15:20:51 +0000 (15:20 +0000)]
Updated the PO files for all languages.

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

13 years ago#OSQA-581, resetting the answer count cache after the comment has been converted...
jordan [Sat, 9 Apr 2011 20:40:34 +0000 (20:40 +0000)]
#OSQA-581, resetting the answer count cache after the comment has been converted to answer.

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

13 years ago#OSQA-581, adding the reset cache count funtionality to the maintaindb command. Now...
jordan [Sat, 9 Apr 2011 20:25:53 +0000 (20:25 +0000)]
#OSQA-581, adding the reset cache count funtionality to the maintaindb command. Now the site administrators are able to flush the cached count data in case something gets messy.

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

13 years agoOSQA-538, fixing the IE caching issues, now we append the Nocache random number to...
jordan [Sat, 9 Apr 2011 19:29:45 +0000 (19:29 +0000)]
OSQA-538, fixing the IE caching issues, now we append the Nocache random number to the AJAX query, rather than to the whole JavaScript file. Also changed a bit the vote_post logic to ensure that the increment of the node reputation will happen only by one (in the previous implementation increment by 2 or -2 was also possible).

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

13 years agoRemoving the change done in Revision 952, the removing of the JS cache can cause...
jordan [Sat, 9 Apr 2011 18:42:22 +0000 (18:42 +0000)]
Removing the change done in Revision 952, the removing of the JS cache can cause performance issues.

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

13 years agoOSQA-583, prevent the caching of the JavaScript files. Appending a random number...
jordan [Sat, 9 Apr 2011 18:20:48 +0000 (18:20 +0000)]
OSQA-583, prevent the caching of the JavaScript files. Appending a random number to the media url. Caching used to cause some trouble with IE7/8/9.

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

13 years agoCreating a Random number template tag generator. We'll need this one in order to...
jordan [Sat, 9 Apr 2011 17:50:45 +0000 (17:50 +0000)]
Creating a Random number template tag generator. We'll need this one in order to prevent the caching of the JS files in IE8/9.

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

13 years agoOSQA-540, adding the new Spanish translation by Oscar Frias and Javier Candeira.
jordan [Sat, 9 Apr 2011 16:57:22 +0000 (16:57 +0000)]
OSQA-540, adding the new Spanish translation by Oscar Frias and Javier Candeira.

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

13 years agochanging the awarded tool user message, it used to cause trouble when running the...
jordan [Sat, 9 Apr 2011 16:55:31 +0000 (16:55 +0000)]
changing the awarded tool user message, it used to cause trouble when running the makemessages command, passing the args using a dictionary

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

13 years agoShowing the comment convert icon in the posted comment skeleton.
jordan [Sat, 9 Apr 2011 15:34:43 +0000 (15:34 +0000)]
Showing the comment convert icon in the posted comment skeleton.

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

13 years agoReverts the last commit, seems to cause some other issues.
hernani [Sat, 9 Apr 2011 02:26:46 +0000 (02:26 +0000)]
Reverts the last commit, seems to cause some other issues.

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

13 years agoUse a collation on tag and user names that allows case insensitive search.
hernani [Sat, 9 Apr 2011 02:20:55 +0000 (02:20 +0000)]
Use a collation on tag and user names that allows case insensitive search.

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

13 years agoDon't force the slug on profile urls.
hernani [Sat, 9 Apr 2011 02:13:12 +0000 (02:13 +0000)]
Don't force the slug on profile urls.

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

13 years agoDon't let reputation go 0, it may cause mysql to overflow.
hernani [Sat, 9 Apr 2011 02:07:10 +0000 (02:07 +0000)]
Don't let reputation go 0, it may cause mysql to overflow.

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

13 years agoSPLUNK-189, adding pngfix for IE6.
jordan [Thu, 7 Apr 2011 21:25:11 +0000 (21:25 +0000)]
SPLUNK-189, adding pngfix for IE6.

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

13 years agoCatching wrong error type.
hernani [Thu, 7 Apr 2011 11:27:55 +0000 (11:27 +0000)]
Catching wrong error type.

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

13 years agoDjango 1.3 fix.
hernani [Thu, 7 Apr 2011 11:26:35 +0000 (11:26 +0000)]
Django 1.3 fix.

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

13 years agoMerge cacheimp -> master
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

13 years agoSPLUNK-196, making filtration to the summary and headline properties of the Node...
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

13 years agoSPLUNK-198, Use the decorated name property for the recent badges in the sidebar.
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

13 years agoSPLUNK-198. Long usernames used to cause trouble with the UI. Every username length...
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

13 years agoStupid error.
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

13 years agoForces case insensitivity on mysql fts by forcin upper case.
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

13 years agomerging cacheimp -> trunk
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

13 years agoSPLUNK-128, adding more padding to the content container, now it shouldn't cover...
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

13 years agoReintegrate merge cacheimp -> trunk.
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

13 years ago#OSQA-574, a bit of backwards compatibility, importing the with_statements from the...
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

13 years ago#SPLUNK-122, adding hidden overflow for the editor preview container, this way the...
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

13 years ago#SPLUNK-123, changing the cursor from a pointer to a normal one, now the pointer...
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

13 years ago#SPLUNK-124, we show a confirm popup when user is trying to delete a comment.
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

13 years ago#SPLUNK-120, adding a bit top margin for the question tags container. This should...
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

13 years ago#SPLUNK-121, fixing the long titles issue, added an overflow: hidden; property to...
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

13 years ago#OSQA-602, the markdown syntax ** now doesn't interfer with the urlize extension.
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

13 years agoOSQA-178, we notify the current user with a message after a node has been deleted...
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

13 years agoOSQA-587, filtering the questions QuerySet on the tag view if there is user parameter...
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

13 years ago#OSQA-574, we make an attempt to import the with statement from the __future__ packag...
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

13 years agoOSQA-533, forgot ; for the &amp; hash
jordan [Sun, 27 Mar 2011 21:45:08 +0000 (21:45 +0000)]
OSQA-533, forgot ; for the &amp; hash

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

13 years agoOSQA-533, fixed some W3C validation errors: closing <img /> tags, removed some unnece...
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

13 years agoOSQA-621, adding a separate rss link for the question_search view.
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

13 years agoOSQA-236, modifying the flagged content daily digest, now we count only the items...
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

13 years ago#OSQA-585, adding support for plain text emails for the daily digest.
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

13 years agoChanging the statement that checks if the content has to be deleted/hidden. We should...
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

13 years agoOSQA-236, now we add a link for the administrators to flagged posts management tool...
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

13 years ago#OSQA-544, words in cyrillic should also be counted, adding the А-Я (all the letters...
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

13 years ago#SPLUNK-91, modifying the permanent link tool, adding an option to copy to the clipbo...
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

13 years ago#OSQA-388, creating a separate action for the award points for an answer functionality.
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

13 years ago#OSQA-388, changing a bit the UI of the award points for an answer tool, adding text...
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

13 years ago#OSQAAWS-69, It was not a good idea to make the filtration for the moderation module...
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

13 years agoSimple styling issue with badges.
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

13 years agoImproved lazy querysets.
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

13 years agoremoving unnecessery line causing IndentationError in the log file.
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

13 years ago#OSQA-610, the used_count of the firstly added tags is now updated properly. The...
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

13 years agoMakes tips on the ask a question page editable in the admin.
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

13 years agoAdds a way for modules to completely override a url pattern.
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

13 years ago#OSQA-603, removing the previously added in commit 857 call to the save method. It...
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

13 years ago#OSQA-603, fixing the badges count calculation error. After the update of the count...
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

13 years agoA couple small fixes in the sximporter.
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

13 years ago#OSQA-388, we check if the user has enough reputation points (if the amount of points...
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

13 years agochanging the number of the data migration on the notification-config branch from...
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

13 years agoFixes the sx importer to use the latest db schema. Also, the fake orm is created...
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

13 years agoresolving conflict in the email settings file
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

13 years agomerge notification-config -> trunk, previous commits 695, 751 (email debugging inform...
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

13 years agomerge notification-config -> trunk, previous commits 695, 751 (email debugging inform...
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

13 years agomerge notification-config -> trunk, previous commits 694, 695, 702
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

13 years agoremoving the edit_user_email_feeds_form.html file, revision 695
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

13 years agomerge notification-config -> trunk, previous revision 694, changes to the subscriptio...
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

13 years agomerging notification-config -> trunk, changes from revision 695, 696, 697, 698, 699...
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

13 years agomerging to the trunk changes in the user model, commit 694
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

13 years agoAdding migration from the notification-config branch
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

13 years ago#OSQA-388, connecting the award_points command to the BonusRepAction. We take the...
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

13 years ago#OSQA-388, showing message to the current user on submit, the username of the awarded...
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

13 years ago#OSQA-609, fix for a mailto link, removing unneeded space.
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

13 years agoFixes some weird threading problems with modules.
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

13 years agoMerging in changesets from revisions 809, 811, 812, 825, 826, and 827. These all...
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

13 years ago#OSQAAWS-79, the improved filtration of the content, now we check if the moderation...
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

13 years agolast minute fix, bad import
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

13 years agoFixes bug in openid auth consumer, and problem with modules template loader.
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

13 years agoRemoving the code that Hernani has removed in Revision 828 again. Somehow after the...
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

13 years agoreintegrate merge hernani -> trunk
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

13 years agoreintegrate merge jambazov -> trunk
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

13 years agoImproved "convert to question" routine, using the question edit form, and the same...
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

13 years agoRemoves some test code.
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

13 years agomerging jambazov > trunk
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

13 years agomerge hernani > trunk
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

13 years agoReverting the merges due to unsuccessfull conflict resolvement.
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

13 years agomerge hernani -> trunk
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

13 years agomerge jambazov -> trunk
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

13 years agosync merge jambazov -> trunk
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

13 years agoMerging jambazov --> trunk.
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

13 years agoAdds a file format option to xml backups.
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

13 years agoCleaning up a small mess.
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

13 years agoCreating my branch
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

13 years agoOSQA-516, bugfix for the Akismet Module. There was problem with the loading of the...
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

13 years agofixes a nasty bug causing a view to never return a response under certain circumstances
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

13 years agofixes OSQA-562, Mixed-up markdown mangling of simple comment text
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

13 years agoMerge of branches/jambazov to trunk. Incoporating the new convert comment to answer...
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

13 years agofixes several issues with the static pages
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

13 years agofixes OSQA 555 and OSQA 294
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

13 years agoFixes the new line problems in the OSQA exporter.
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

13 years agoMerge of jambazov branch to trunk. Adds CC license and failed sign-in referrer bug...
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