]>
git.openstreetmap.org Git - osqa.git/log
Tom Hughes [Fri, 29 Aug 2014 17:40:08 +0000 (18:40 +0100)]
Replace deprecated mimetype with content_type
Tom Hughes [Tue, 26 Aug 2014 13:49:47 +0000 (14:49 +0100)]
Remove some attempts to add messages to users
Tom Hughes [Wed, 20 Aug 2014 12:55:40 +0000 (13:55 +0100)]
Add an OSM authentication provider
Tom Hughes [Wed, 20 Aug 2014 12:53:16 +0000 (13:53 +0100)]
Changing the global socket timeout is evil
Tom Hughes [Wed, 20 Aug 2014 12:53:06 +0000 (13:53 +0100)]
Use https for various URLs
Tom Hughes [Wed, 20 Aug 2014 12:52:43 +0000 (13:52 +0100)]
Stick with CC-BY-SA 2.0
Javyer DerDerian [Mon, 23 Feb 2015 18:22:14 +0000 (15:22 -0300)]
fix breach in award points that allows user to award infinite points / extra fix
Javyer DerDerian [Mon, 23 Feb 2015 18:10:52 +0000 (15:10 -0300)]
fix breach in award points that allows user to award infinite points
Javyer DerDerian [Mon, 15 Dec 2014 18:51:42 +0000 (13:51 -0500)]
Updated stats module
Javyer Der Derian [Thu, 17 Apr 2014 22:00:16 +0000 (19:00 -0300)]
Merge pull request #49 from udacity/login_logout_links
Simplify registry logic
Javyer Der Derian [Thu, 17 Apr 2014 21:59:54 +0000 (18:59 -0300)]
Merge pull request #5 from lra/french
Added french locales
Javyer Der Derian [Thu, 17 Apr 2014 21:59:05 +0000 (18:59 -0300)]
Merge pull request #46 from udacity/subfolder_fixes
Fix OSQA-819: Link to profile in message is wrong if OSQA is installed in a subfolder
Javyer Der Derian [Thu, 17 Apr 2014 21:58:38 +0000 (18:58 -0300)]
Merge pull request #45 from udacity/sort_modes
Pagination updates
Javyer Der Derian [Thu, 17 Apr 2014 21:58:12 +0000 (18:58 -0300)]
Merge pull request #40 from jasimmk/master
Making requirements to Django 1.6
Javyer Der Derian [Thu, 17 Apr 2014 21:57:23 +0000 (18:57 -0300)]
Merge pull request #26 from udacity/remove_dj_version
Remove DJANGO_VERSION from the recommended settings
Javyer Der Derian [Thu, 17 Apr 2014 21:57:03 +0000 (18:57 -0300)]
Merge pull request #44 from udacity/merge_small_prs
Merge small prs
Javyer Der Derian [Thu, 17 Apr 2014 21:55:43 +0000 (18:55 -0300)]
Merge pull request #65 from geraldcombs/patch-1
Serve up robots.txt as plain text.
Gerald Combs [Mon, 7 Apr 2014 22:27:09 +0000 (15:27 -0700)]
Serve up robots.txt as plain text.
Attila-Mihaly Balazs [Thu, 27 Mar 2014 15:41:11 +0000 (17:41 +0200)]
Correct text
Attila-Mihaly Balazs [Tue, 25 Mar 2014 12:35:26 +0000 (14:35 +0200)]
Further fixes for subfolder hosting
Attila-Mihaly Balazs [Tue, 25 Mar 2014 11:07:53 +0000 (13:07 +0200)]
Further fixes for subfolder hosting
Attila-Mihaly Balazs [Tue, 25 Mar 2014 10:41:00 +0000 (12:41 +0200)]
Simplify registry logic
Attila-Mihaly Balazs [Tue, 25 Mar 2014 09:24:04 +0000 (11:24 +0200)]
Fix OSQA-819: Link to profile in message is wrong if OSQA is installed in a subfolder
Fixes http://jira.osqa.net/browse/OSQA-819
Attila-Mihaly Balazs [Mon, 24 Mar 2014 11:39:36 +0000 (13:39 +0200)]
Pagination updates
- Optimize "hottest" DB query
- Add "unanswered question" sort order
- Add "active" sort order for comments/answers
Attila-Mihaly Balazs [Mon, 24 Mar 2014 11:07:33 +0000 (13:07 +0200)]
Allow for missing content types
Attila-Mihaly Balazs [Mon, 24 Mar 2014 11:05:18 +0000 (13:05 +0200)]
Remove unused (and incorrectly spelled) import
Attila-Mihaly Balazs [Mon, 24 Mar 2014 11:04:15 +0000 (13:04 +0200)]
Merge commit '
9bea91a ' into merge_small_prs
Javyer Der Derian [Sat, 15 Mar 2014 00:07:39 +0000 (22:07 -0200)]
Merge pull request #42 from aniketschneider/validation-email-template
Validation email template bugfix
Aniket Schneider [Thu, 13 Mar 2014 22:14:10 +0000 (18:14 -0400)]
Fix more fullurl errors
Aniket Schneider [Thu, 13 Mar 2014 21:02:02 +0000 (17:02 -0400)]
Validation email template bugfix
jasimmk [Wed, 12 Mar 2014 19:28:56 +0000 (00:58 +0530)]
Making requirements to Django 1.6
Haibin [Sun, 9 Feb 2014 13:04:13 +0000 (21:04 +0800)]
Update readers.py
Suggest adding:
from django.utils.http import urlquote
Javyer Der Derian [Mon, 20 Jan 2014 19:38:44 +0000 (11:38 -0800)]
Merge pull request #2 from udacity/update_django
Migrate to Django 1.6
Attila-Mihaly Balazs [Mon, 20 Jan 2014 09:35:47 +0000 (11:35 +0200)]
Remove DJANGO_VERSION from the recommended settings
- It adds a headache (it needs to be maintained)
- It can already be obtained by djang.get_version()
- forum_modules/updates/base.py already uses the above method to report the correct version
Attila-Mihaly Balazs [Thu, 16 Jan 2014 10:06:15 +0000 (12:06 +0200)]
Access request trough singleton where necessarry
Attila-Mihaly Balazs [Thu, 16 Jan 2014 10:05:25 +0000 (12:05 +0200)]
Merge branch 'threadsafe_requestholder' into update_django
Attila-Mihaly Balazs [Thu, 16 Jan 2014 10:05:06 +0000 (12:05 +0200)]
Make RequestHolder thread-safe
Attila-Mihaly Balazs [Wed, 15 Jan 2014 18:36:34 +0000 (20:36 +0200)]
Add replacement for the markdown filter (removed in Django 1.6)
Javyer Der Derian [Wed, 15 Jan 2014 16:06:03 +0000 (08:06 -0800)]
Merge pull request #11 from udacity/make_faq_settings_translatable
Make FAQ admin setting descriptions translateable
Javyer Der Derian [Wed, 15 Jan 2014 15:54:54 +0000 (07:54 -0800)]
Merge pull request #1 from udacity/add_requirements_file
Create requirements.txt for easy dependency installation with pip and set up .gitignore
Attila-Mihaly Balazs [Mon, 13 Jan 2014 11:01:11 +0000 (13:01 +0200)]
Suggest enabling of pooled connections by default
Attila-Mihaly Balazs [Fri, 10 Jan 2014 18:56:07 +0000 (20:56 +0200)]
Make FAQ admin setting descriptions translateable
Attila-Mihaly Balazs [Thu, 9 Jan 2014 11:25:09 +0000 (13:25 +0200)]
Configure logging "the Django way" and ensure that all messages are written to the logfile
Attila-Mihaly Balazs [Mon, 6 Jan 2014 14:58:00 +0000 (16:58 +0200)]
Add README to the source code
Attila-Mihaly Balazs [Sat, 4 Jan 2014 11:09:35 +0000 (13:09 +0200)]
Remove ADMIN_MEDIA_PREFIX since it has been deprecated in Django 1.4
Laurent Raufaste [Sat, 7 Dec 2013 00:34:51 +0000 (19:34 -0500)]
Added french locales
Attila-Mihaly Balazs [Tue, 3 Dec 2013 13:55:23 +0000 (15:55 +0200)]
Ignore active copies of setting files
Attila-Mihaly Balazs [Tue, 3 Dec 2013 13:53:08 +0000 (15:53 +0200)]
Migrate to Django 1.6
Attila-Mihaly Balazs [Tue, 3 Dec 2013 09:09:27 +0000 (11:09 +0200)]
Create requirements.txt for easy dependency installation with pip and set up .gitignore
Javyer DerDerian [Mon, 30 Sep 2013 16:03:42 +0000 (13:03 -0300)]
Merged pt_BR locale from https://github.com/OSQA/osqa/commit/
676fdbc347f8f5e91a66b215eaaafd763dec2913
javyer [Wed, 29 May 2013 21:56:57 +0000 (21:56 +0000)]
Fixed twitter login
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1285
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
javyer [Tue, 28 May 2013 16:08:29 +0000 (16:08 +0000)]
Fixed yahoo openid auth
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1284
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
hernani [Wed, 13 Mar 2013 23:08:25 +0000 (23:08 +0000)]
Fix in query cache
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1283
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
hernani [Tue, 19 Feb 2013 15:00:12 +0000 (15:00 +0000)]
Fixed problem in data cache with international strings
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1282
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
javyer [Wed, 5 Dec 2012 23:19:10 +0000 (23:19 +0000)]
Added extra check to avoid empty tags been sent in notifications.
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1281
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
javyer [Wed, 24 Oct 2012 14:52:12 +0000 (14:52 +0000)]
ValidatedEmail badge should be awarded only once
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1280
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
javyer [Wed, 17 Oct 2012 17:24:51 +0000 (17:24 +0000)]
Implemented 'report user' feature
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1279
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
javyer [Wed, 17 Oct 2012 15:44:20 +0000 (15:44 +0000)]
OSQA-895, added IT locale files
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1278
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
javyer [Wed, 15 Aug 2012 13:31:18 +0000 (13:31 +0000)]
Fixed WMD to correctly show < and > in preview for <code> text
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1277
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
javyer [Wed, 1 Aug 2012 15:38:21 +0000 (15:38 +0000)]
Added reply-to option to send_template_mail
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1276
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
javyer [Fri, 27 Jul 2012 18:48:57 +0000 (18:48 +0000)]
allows send_template_mail to define sender details
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1275
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
javyer [Mon, 16 Jul 2012 14:53:01 +0000 (14:53 +0000)]
Added a small error message in wmd.js
Tries to add some feedback for the user when there's a server error uploading an image.
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1274
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Tue, 26 Jun 2012 22:10:09 +0000 (22:10 +0000)]
do not show user bio if user is suspended
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1273
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Fri, 15 Jun 2012 18:17:36 +0000 (18:17 +0000)]
we need to be able to take additional keyword arguments from the search manager
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1272
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Mon, 11 Jun 2012 11:31:15 +0000 (11:31 +0000)]
follow RFC 822 AFAIR when sending emails
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1271
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Sat, 9 Jun 2012 13:15:36 +0000 (13:15 +0000)]
make user subscriptions view decoratable
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1270
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Sun, 27 May 2012 12:49:51 +0000 (12:49 +0000)]
be able to handle Unicode GET params in auth.py properly
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1269
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Wed, 23 May 2012 17:10:19 +0000 (17:10 +0000)]
trigger contentchanged event on subscription widget add/remove tags
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1268
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Tue, 22 May 2012 15:15:56 +0000 (15:15 +0000)]
accept only POST requests for vote_post command, make the ajax command send only POST requests
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1267
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Tue, 22 May 2012 13:36:51 +0000 (13:36 +0000)]
allow only AJAX requests for post votes, otherwise it makes CSRF possible
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1266
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Sat, 19 May 2012 22:23:12 +0000 (22:23 +0000)]
be able to accept default page size parameter on UserListPaginatorContext
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1265
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Wed, 16 May 2012 22:57:24 +0000 (22:57 +0000)]
the contributors_info template tag should tag context and pass it
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1264
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Fri, 11 May 2012 00:49:34 +0000 (00:49 +0000)]
show link that leads to the badge page, not list of all badges
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1263
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Wed, 9 May 2012 21:05:35 +0000 (21:05 +0000)]
undo this, it's a bit redundant
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1262
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Wed, 9 May 2012 20:59:46 +0000 (20:59 +0000)]
try to get the position of the event currentTarget if there is no pageX or pageY property, useful when dealing with popups called by keyup event
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1261
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Mon, 7 May 2012 23:56:03 +0000 (23:56 +0000)]
show information about the badge you just got in the message notification instead of just showing link to the user profile
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1260
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Fri, 27 Apr 2012 22:19:01 +0000 (22:19 +0000)]
show the recaptcha field to unauthenticated users without a metter what is the min rep setting
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1259
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
hernani [Thu, 26 Apr 2012 22:41:00 +0000 (22:41 +0000)]
Make sure to clean the original state on all objects recently fetched.
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1258
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Thu, 26 Apr 2012 14:17:05 +0000 (14:17 +0000)]
we need to close both dialogs if users selects No on award points confirmation
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1257
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Thu, 26 Apr 2012 13:18:41 +0000 (13:18 +0000)]
the variable needs to be defined with var in front of it, because otherwise it is taken from the previous scope and messes the dialog when two or more of them are used simultaneously
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1256
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Thu, 26 Apr 2012 00:51:30 +0000 (00:51 +0000)]
Users should be warned before getting their karma points decreased to certain values on reputation award
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1255
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Tue, 24 Apr 2012 22:10:48 +0000 (22:10 +0000)]
be able to pass additional context to the _edit_question view
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1254
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Thu, 19 Apr 2012 22:22:25 +0000 (22:22 +0000)]
OSQA-829, resolves a unicode problem when answering question, use smart_unicode for the username field which is used in the friendly_username and friendly_ownername methods of the ActionProxy class
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1253
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Wed, 18 Apr 2012 13:49:12 +0000 (13:49 +0000)]
listen for DoesNotExist exceptions when exporting user marked tags, use different method to add files to a Zip archive
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1252
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Sun, 15 Apr 2012 21:27:39 +0000 (21:27 +0000)]
make the xml exporter work
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1251
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Thu, 12 Apr 2012 14:39:46 +0000 (14:39 +0000)]
cast project badges Bug Buster badge setting to int type
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1250
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Tue, 10 Apr 2012 21:23:11 +0000 (21:23 +0000)]
revert previous commit
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1249
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Tue, 10 Apr 2012 20:38:50 +0000 (20:38 +0000)]
resolves an issue with tags used count that can get out of control if called from a module delete action
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1248
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Mon, 9 Apr 2012 20:19:56 +0000 (20:19 +0000)]
make the karma history positive & negative reputation blocks use CSS min-width instead of width, other wise 100 reputation in block overflows into 10(line break)0
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1247
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Sun, 8 Apr 2012 00:25:31 +0000 (00:25 +0000)]
make RSS items decoratable, add an option to block email notifications per node, useful in some cases when we need to check states for the node before allowing to send email notification
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1246
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Sat, 7 Apr 2012 14:47:53 +0000 (14:47 +0000)]
make user decorated name decoratable through OSQA modules, allow superusers to edit screen name
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1245
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Fri, 6 Apr 2012 14:04:20 +0000 (14:04 +0000)]
make {% comments %} template tag decoratable and add ability to attach additional post controls to them
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1244
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Wed, 4 Apr 2012 23:10:46 +0000 (23:10 +0000)]
OSQA-828, Support fullname to real_name mapping from OpenID providers
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1243
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Tue, 3 Apr 2012 23:01:24 +0000 (23:01 +0000)]
don't use template loaders caching when DEBUG=True
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1242
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Mon, 2 Apr 2012 23:11:47 +0000 (23:11 +0000)]
OSQA-425, adding LDAP Based Authentication OSQA module to the core
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1241
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Mon, 2 Apr 2012 22:43:05 +0000 (22:43 +0000)]
OSQA-809, Include question summaries in question and answers views, wrap that in a setting
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1240
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Mon, 2 Apr 2012 21:22:37 +0000 (21:22 +0000)]
OSQA-818, a bit improved English translation, + remake and recompile all other translations so that we keep them more current
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1239
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Mon, 2 Apr 2012 20:05:13 +0000 (20:05 +0000)]
OSQA-824: Enable Django template caching
Django loads and parses templates for every request, so this significantly improves OSQA performance.
* I've checked over the custom template tags for thread safety and they look fine,
so this change should be safe:
https://docs.djangoproject.com/en/dev/howto/custom-template-tags/#template-tag-thread-safety
* Profiling indicated the other major contributor to CPU/request time was Django's lack of database
connection pooling/persistent connections. That's best handled with an external daemon:
http://meta.osqa.net/questions/11381/is-osqa-cpu-bound
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1238
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Sun, 25 Mar 2012 00:18:56 +0000 (00:18 +0000)]
adding wrapping divs to user blocks
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1237
0cfe37f9 -358a-4d5e-be75-
b63607b5c754
jordan [Thu, 22 Mar 2012 15:20:29 +0000 (15:20 +0000)]
don't focus recaptcha field
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1236
0cfe37f9 -358a-4d5e-be75-
b63607b5c754