git.openstreetmap.org Git

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

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

commit | commitdiff | tree

hernani [Mon, 3 Jan 2011 05:50:14 +0000 (05:50 +0000)]

Removes a unused import statement, causing the sximporter not to load under some django versions.

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

commit | commitdiff | tree

jordan [Sat, 1 Jan 2011 20:38:01 +0000 (20:38 +0000)]

Commit for OSQA Jira 501. Minor change in syntax of Akismet can_bypass_spam_check function.

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

commit | commitdiff | tree

hernani [Sat, 1 Jan 2011 18:56:21 +0000 (18:56 +0000)]

Should auto link old stuff in the node cache migration.

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

commit | commitdiff | tree

hernani [Sat, 1 Jan 2011 18:36:59 +0000 (18:36 +0000)]

Fixes comment edit, which was being performed against already parsed markdown.

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

commit | commitdiff | tree

hernani [Sat, 1 Jan 2011 16:26:20 +0000 (16:26 +0000)]

Fixes a bug with feeds some people have reported at meta.
http://meta.osqa.net/questions/6332/why-does-my-rss-feed-return-a-500-error

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

commit | commitdiff | tree

rick [Fri, 31 Dec 2010 15:00:28 +0000 (15:00 +0000)]

Local hidden directory for settings committed by mistake.

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

commit | commitdiff | tree

jordan [Wed, 29 Dec 2010 23:28:38 +0000 (23:28 +0000)]

Adding some more accurate Unicode support, modified to » some special characters, changed the way the media is being served. Work on issue OSQA-489 in Jira. The patch given by Justin Grant couldn't be applied, because some changes on the listed filed have already been done, but it was very useful. Thanks. :)

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

commit | commitdiff | tree

jordan [Wed, 29 Dec 2010 22:57:16 +0000 (22:57 +0000)]

Bugfix for javascript upload OSQA-487

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

commit | commitdiff | tree

jordan [Wed, 29 Dec 2010 22:04:00 +0000 (22:04 +0000)]

We exclude the deleted comments from the queryset when redirecting to the newly added answer.

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

commit | commitdiff | tree

jordan [Wed, 29 Dec 2010 21:39:09 +0000 (21:39 +0000)]

Bugfix for OSQA-479 in the question_retag.html template.

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

commit | commitdiff | tree

jordan [Wed, 29 Dec 2010 20:27:36 +0000 (20:27 +0000)]

Jira OSQA-490 Banner placeholders.

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

commit | commitdiff | tree

jordan [Wed, 29 Dec 2010 20:26:44 +0000 (20:26 +0000)]

Adding full width and site width banner placeholders. Might be useful while creating more specific layout structure.

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

commit | commitdiff | tree

jordan [Wed, 29 Dec 2010 20:12:18 +0000 (20:12 +0000)]

Working on the @username convention. We can call user even if using only the first part of his username, for example, we can call "Jordan Jambazov" only using @Jordan. The supplied module forum.utils.userlinking deals with the active users (the one that took part in the discussion writing question, comment or answer).

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

commit | commitdiff | tree

jordan [Tue, 28 Dec 2010 15:26:24 +0000 (15:26 +0000)]

Fixing a translation bug (made by me... :)

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

commit | commitdiff | tree

jordan [Tue, 28 Dec 2010 15:08:54 +0000 (15:08 +0000)]

Localizing the diff_date filter in extra_tags.py

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

commit | commitdiff | tree

jordan [Tue, 28 Dec 2010 14:12:32 +0000 (14:12 +0000)]

AJAX dialogs position check update.

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

commit | commitdiff | tree

jordan [Tue, 28 Dec 2010 13:39:32 +0000 (13:39 +0000)]

We check if the AJAX dialogs get into the browser viewport. If not, we change their position.

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

commit | commitdiff | tree

jordan [Tue, 28 Dec 2010 12:12:21 +0000 (12:12 +0000)]

Anonymous users cannot convert answers to question, special method added to the AnonymousUser class.

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

commit | commitdiff | tree

jordan [Tue, 28 Dec 2010 12:10:35 +0000 (12:10 +0000)]

Anonymous users cannot convert comments to answers, special method for the AnonymousUser class has been added.

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

commit | commitdiff | tree

jordan [Tue, 28 Dec 2010 03:28:34 +0000 (03:28 +0000)]

Bugfix in the activate_revision method.

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

commit | commitdiff | tree

jordan [Tue, 28 Dec 2010 03:23:41 +0000 (03:23 +0000)]

Bugfix for Jira-471

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

commit | commitdiff | tree

jordan [Tue, 28 Dec 2010 03:07:01 +0000 (03:07 +0000)]

Fixing some minor spelling mistakes, Jira-495.

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

commit | commitdiff | tree

jordan [Tue, 28 Dec 2010 02:35:26 +0000 (02:35 +0000)]

We update "karma" to "reputation", as in the translation file.

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

commit | commitdiff | tree

jordan [Tue, 28 Dec 2010 02:29:26 +0000 (02:29 +0000)]

Jira-485 Bugfix, sort order should not be hardcoded in digest.html

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

commit | commitdiff | tree

jordan [Tue, 28 Dec 2010 02:23:27 +0000 (02:23 +0000)]

Fixing bug Jira-478, the admin navigation should be the same in Django view mode and OSQA style administration.

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

commit | commitdiff | tree

jordan [Tue, 28 Dec 2010 02:21:03 +0000 (02:21 +0000)]

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

commit | commitdiff | tree

jordan [Tue, 28 Dec 2010 01:34:37 +0000 (01:34 +0000)]

We created a sitemap index and a separate view forum.sitemap.index, not using the Sitemap framework, but the settings.APP_URL

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

commit | commitdiff | tree

jordan [Mon, 27 Dec 2010 21:54:14 +0000 (21:54 +0000)]

Adding autolinking functionality, using mdx_urlize markdown extension.

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

commit | commitdiff | tree

jordan [Mon, 27 Dec 2010 20:39:21 +0000 (20:39 +0000)]

Show template except the 404 error.

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

commit | commitdiff | tree

jordan [Mon, 27 Dec 2010 18:26:21 +0000 (18:26 +0000)]

Jira 504 patch, adding local variable to debug more easily when using IDE.

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

commit | commitdiff | tree

jordan [Mon, 27 Dec 2010 18:14:22 +0000 (18:14 +0000)]

Adding method that checks if the user has the ability (permission) to convert comments to answers.

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

commit | commitdiff | tree

jordan [Mon, 27 Dec 2010 17:42:19 +0000 (17:42 +0000)]

Adding ability to convert comments to answers.

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

commit | commitdiff | tree

jordan [Mon, 27 Dec 2010 01:05:49 +0000 (01:05 +0000)]

Fixing bug 482 in a way we escape all passed from URL parameters.

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

commit | commitdiff | tree

jordan [Thu, 23 Dec 2010 01:51:21 +0000 (01:51 +0000)]

Changing the charset of osqa.main.js to UTF-8, it might be useful.

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

commit | commitdiff | tree

jordan [Thu, 23 Dec 2010 01:37:35 +0000 (01:37 +0000)]

Tags name is included into their classname. Just like on stackoverflow. Jira OSQA-488.

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

commit | commitdiff | tree

jordan [Thu, 23 Dec 2010 01:30:21 +0000 (01:30 +0000)]

Fixing the decorate_int filter in way it can work with string, round properly and show decimal place for numbers between 10.0-99.0k

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

OSQA

RSS Atom