1
0
mirror of https://github.com/django/django.git synced 2024-12-23 01:25:58 +00:00
Commit Graph

16027 Commits

Author SHA1 Message Date
Anssi Kääriäinen
9027da65d3 Added '*' to quote_cache
The commit for #18333 missed quote_cache default value for *.
Refs #18333.
2013-09-24 23:00:31 +03:00
Florian Apolloner
68540fe4df Fixed #21138 -- Increased the performance of our PBKDF2 implementation.
Thanks go to Michael Gebetsroither for pointing out this issue and help on
the patch.
2013-09-24 21:06:26 +02:00
Florian Apolloner
5d74853e15 Revert "Ensure that passwords are never long enough for a DoS."
This reverts commit aae5a96d57.

This fix is no longer necessary, our pbkdf2 (see next commit) implementation
no longer rehashes the password every iteration.
2013-09-24 21:01:21 +02:00
Michael Manfre
9a041807fc Fixed #18333 - Quoted annotated column names 2013-09-24 10:10:08 -04:00
Tim Graham
77f6b468e5 Fixed #21137 -- Corrected ULRconf include example.
Thanks marfire for the report.
2013-09-24 09:41:12 -04:00
Preston Holmes
fd8d7db4d7 Merge pull request #1675 from NiGhTTraX/typoFix
Fixed #21152: Corrected small grammatical error in comment.
2013-09-24 05:22:05 -07:00
Andrei Picus
8e737cf282 Fix small grammatical error in comment.
Changed 'there are no filtering' to 'there is no filtering'.
2013-09-24 14:55:05 +03:00
Michał Lech
53c7d66869 Marked PermissionsMixin.user_permissions help_text for translation 2013-09-24 07:36:24 -04:00
Claude Paroz
18fb713e7b Properly marked skipped GIS tests as skipped 2013-09-24 12:23:42 +02:00
Claude Paroz
45403d330a Reformatted some GIS distance tests 2013-09-24 12:23:42 +02:00
Andrew Godwin
6ede1db331 Fixed #21151 -- Bad cleanup in schema M2M repoint test 2013-09-24 11:00:00 +01:00
Florian Apolloner
16ceb05b47 Isolated select_for_update tests a bit more.
This change prevents including the multiple_database test models without
duplicating the router code (we probably should do this at one point).

Refs #21148
2013-09-24 10:29:21 +02:00
Claude Paroz
4c5bc1ac30 Removed double import in mysql base.py 2013-09-24 10:25:39 +02:00
Brett Koonce
946a2226ea Removed extra p (topppings->toppings) 2013-09-23 19:24:40 -04:00
Tim Graham
45969bdeb5 Removed implication that six is part of Python stdlib. 2013-09-23 18:30:05 -04:00
Simon Charette
ab643cd634 Fixed test suite bisection on Python 3.
Thanks to @marfire for spotting this.
2013-09-23 17:05:36 -04:00
Simon Charette
4ec6d281cd Fixed #21001 -- Added a regression test for empty string exclusion on Oracle.
The issue was present in 1.4.x but has been reported to be fixed in master.

Thanks to @timgraham for the patch.
2013-09-23 14:18:03 -04:00
Louis Fill
e15f7f31d0 Fixed #21070 -- Added a more complex database configuration example.
Thanks joejasinski for the suggestion.
2013-09-23 12:18:00 -04:00
Helen ST
41167645b1 Fixed #14028 - Added validation for clashing db_columns.
Thanks akaariai for the suggestion.
2013-09-23 11:51:58 -04:00
Daley Chetwynd
a53caf28bf Fixed #20830 -- Clarified that Django uses a customized version of six.
Thanks glarrain for the suggestion.
2013-09-23 11:03:50 -04:00
Åke Forslund
6a30075eaa Fixed #21140 -- Added 'Using cached sessions' to the performance guide.
Thanks EvilDMP for the suggestion.
2013-09-23 10:50:19 -04:00
Ben Huckvale
98e0453f00 Fixed #21120 -- Added more explicit text on using validators and link to writing validators.
Thanks nicolas at niconomicon.net for the suggestion.
2013-09-23 10:37:41 -04:00
Tim Garner
c81b6f7b83 Fixed #21702 -- Added different bullet styles for nested lists.
Thanks moc at mocpa.com for the suggestion.
2013-09-23 07:37:09 -04:00
Florian Apolloner
4fcc1e4ad8 Stopped a test from executing queries at the module level.
Currently module level queries are executed against the real database
(specified in NAME) instead of the test database; since it is to late
to fix this for 1.6, we at least ensures stable builds. Refs #21443.
2013-09-22 23:02:35 +02:00
Aymeric Augustin
e6c0020d19 Translated a test to English for consistency.
Also fixed a typo.
2013-09-22 22:48:22 +02:00
Florian Apolloner
2ca00faa91 Fixed "Address already in use" from liveserver.
Our WSGIServer rewrapped the socket errors from server_bind into
WSGIServerExceptions, which is used later on to provide nicer
error messages in runserver and used by the liveserver to see if
the port is already in use. But wrapping server_bind isn't enough since
it only binds to the socket, socket.listen (which is called from
server_activate) could also raise "Address already in use".

Instead of overriding server_activate too I chose to just catch socket
errors, which seems to make more sense anyways and should be more robust
against changes in wsgiref.
2013-09-22 22:02:59 +02:00
Ramiro Morales
bebb449ac3 Added docs for changes in commit dd3a883894.
Refs #20693.
2013-09-22 15:43:27 -03:00
Aymeric Augustin
5a64f9bcbd Merge pull request #1658 from yokomizor/updated_sphinx_url
Fixed #21141 -- Updated Sphinx URL.
2013-09-22 10:54:36 -07:00
Rogério Yokomizo
1b4b710355 Fixed #21141 -- Update Sphinx URL
Updated Sphinx URL from http://sphinx.pocoo.org/ to http://sphinx-doc.org/.
2013-09-22 14:44:09 -03:00
Ramiro Morales
ce0c5c38ea A few doc additions for changes from d228c1192e. 2013-09-22 13:46:16 -03:00
Ramiro Morales
9dc45efeba Reference Meta.index_together in DB performance guide. 2013-09-22 11:11:02 -03:00
Aymeric Augustin
51ed1ef1d5 Fixed a mistake in my previous commit. 2013-09-22 14:36:53 +02:00
Aymeric Augustin
a5b062576b Removed a few trailing backslashes.
We have always been at war with trailing backslashes.
2013-09-22 14:04:10 +02:00
Aymeric Augustin
ee0ef1b094 Partial revert of 165f44aa.
That commit didn't always improve readability.

See discussion on django-developers for details.
2013-09-22 14:04:10 +02:00
Michael DiBernardo
222460a994 Fixed #21137 -- Documented best practice for URLconfs with repeated pattern prefixes. 2013-09-21 18:17:21 -04:00
Aymeric Augustin
5444a9c683 Fixed #21074 -- Added tests for localized datetime fields.
Fields must render values in the current time zone.

This commit only contains tests because this ticket was just a symptom of
a regression from #18777 that was fixed separately.
2013-09-21 23:10:14 +02:00
Florian Apolloner
56743cf9e3 Ensured that BoundField.as_widget always returns properly localized fields.
This is a follow-up to #18777 which improperly converted to strings in
prepare_value and as such caused regressions like #21074.

Refs #18777, #21074
2013-09-21 22:54:00 +02:00
Simon Charette
9e4509107b Merge pull request #1656 from mlissner/patch-1
Correct very minor typo
2013-09-21 13:36:35 -07:00
mlissner
d8f2d940cc Correct very minor typo
Just changed as to has.
2013-09-21 13:34:45 -07:00
Aymeric Augustin
68b10fa177 Ensured that explicit time zones are rejected by forms.
Refs #19371.
2013-09-21 21:09:25 +02:00
Aymeric Augustin
ec2b91f48b Merge pull request #1655 from evildmp/ticket_20877_work_in_progress
Addressed inaccuracies in performance docs
2013-09-21 10:09:57 -07:00
Aymeric Augustin
11187386f4 Addressed inaccuracies in performance docs
* Move the discussion of CachedStaticFilesStorage to the section about
  HTTP. It's really about client-side caching. It doesn't fit with the
  caching utilities from django.utils.functional.

* Tone down the warning against Pypy as per Alex' feedback. It's a valid
  choice for advanced users who are comfortable using a non-standard
  stack.

* Generally reworded the 'Using different versions of available software'
  section.

* Some other minor adjustments to the document.
2013-09-21 16:41:26 +01:00
Alex Gaynor
b14212d3c6 Merge pull request #1654 from meteozond/patch-1
- missing __init__.py
2013-09-21 07:29:20 -07:00
Alexander
3ea0194bb4 - missing __init__.py 2013-09-21 18:28:05 +04:00
Curtis Maloney
43a2ec7999 Fixed #21133 --Clarifed documentation about strftime formatting. 2013-09-21 06:42:11 -04:00
Daniele Procida
a991b01167 Merge pull request #1463 from evildmp/ticket_20877_work_in_progress
Many thanks to all involved in discussions, and in particular to Tim Graham for painstaking reviews.
2013-09-20 16:04:18 -07:00
evildmp
dc8f95b639 Fixed #20877 -- added a performance optimization guide 2013-09-20 23:21:49 +01:00
Aymeric Augustin
4db2752e28 Clarified why one must not catch database errors inside atomic. 2013-09-20 21:56:35 +02:00
tschilling
0d1ba84d13 Fixed #20702 -- Deprecated get_formsets in favor of get_formsets_with_inlines.
Thanks stanislas.guerra at gmail.com for the report.
2013-09-20 07:47:24 -04:00
Paul McMillan
f8f47718ab Merge pull request #1644 from PaulMcMillan/bump_hash_iterations
Increase default PBKDF2 iterations
2013-09-19 12:17:56 -07:00