mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-26 02:56:25 +00:00
Code Issues 25 Releases Wiki Activity
14,552 Commits 28 Branches 426 Tags 667 MiB
b5b63079bd
Commit Graph

14552 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Graham
b5b63079bd Fixed #19712 - Clarified admindocs regarding which attributes appear. 
Thanks Daniele Procida for the report.
 2013-05-16 08:09:20 -04:00
Claude Paroz
0a29057ebe Fixed #20415 -- Ensured srid is not localized in openlayers template 
Thanks pierremarc07 at gmail.com for the report.
 2013-05-16 13:48:38 +02:00
Tim Graham
da9d626be0 Merge pull request #1073 from mjtamlyn/import_by_path-docs-fix 
Made the example usage of import_by_path less confusing.
 2013-05-16 04:14:33 -07:00
Tim Graham
fa91855967 Merge pull request #1072 from hrbonz/doc_serialize_typo 
Fixed typo in serialization docs.
 2013-05-16 03:53:00 -07:00
Marc Tamlyn
cde820bd31 Make the example usage of import_by_path less confusing. 
Using import_by_path to import import_by_path is a really odd use case
and makes the code example difficult to read.
 2013-05-16 10:11:46 +02:00
Stefan hr Berder
746d3166d6 small typo, example pk=27 but description pk=24 2013-05-16 15:21:18 +08:00
Alex Gaynor
63f6ee817e Merge pull request #1070 from mfogel/ticket_20413 
Fix bug introduced in contrib.gis in 74f3884ae0
 2013-05-15 15:03:53 -07:00
Mike Fogel
3188775174 Fix bug introduced in contrib.gis in 74f3884ae0 2013-05-15 14:07:34 -07:00
Alex Gaynor
c0c3b65de9 Merge pull request #1069 from mfogel/ticket_20413 
Fixed #20413 - Respect Query.get_meta()
 2013-05-15 13:15:19 -07:00
Mike Fogel
74f3884ae0 Fixed #20413 - Respect Query.get_meta() 2013-05-15 12:55:30 -07:00
Florian Apolloner
ebfb71c64a Fixed previous commit. (Don't commit from DjangCon!) 2013-05-15 16:50:33 +02:00
Florian Apolloner
f6d1ca56c9 Don't unregister OSMGeoAdmin, other tests rely on it. 2013-05-15 16:47:03 +02:00
Aymeric Augustin
c8dcee9a42 Improved the timezone middleware example slightly. 
This change avoids having the timezone leak from a request to the next.
 2013-05-15 16:43:39 +02:00
Tim Graham
84d8b247d2 Fixed #20165 - Updated testing example to use django.test.TestCase. 
Thanks Lorin Hochstein.
 2013-05-15 06:48:17 -04:00
Florian Apolloner
4ecc6da20b Removed unicode literals from PIL compat. 2013-05-15 09:00:09 +02:00
Daniel Lindsley
33793f7c3e Fixed #19934 - Use of Pillow is now preferred over PIL. 
This starts the deprecation period for PIL (support to end in 1.8).
 2013-05-14 19:32:04 -07:00
Donald Stufft
c792c83cad Merge pull request #1062 from dstufft/switch-bcrypt-recommendations 
Recommend using the bcrypt library instead of py-bcrypt
 2013-05-14 16:20:32 -07:00
Tim Graham
8035533557 Merge pull request #1039 from cannona/master 
Clarified what unique_for_date considers
 2013-05-14 16:01:24 -07:00
Tim Graham
9db4c2c133 Merge pull request #1064 from Wilfred/master 
Minor spelling fix
 2013-05-14 07:31:29 -07:00
Wilfred Hughes
d258cce482 Fixing a minor spelling mistake in the queryset documentation 2013-05-14 11:40:33 +01:00
Donald Stufft
8f0a4665d6 Recommend using the bcrypt library instead of py-bcrypt 
* py-bcrypt has not been updated in some time
* py-bcrypt does not support Python3
* py3k-bcrypt, a port of py-bcrypt to python3 is not compatible
  with Django
* bcrypt is supported on all versions of Python that Django
  supports
 2013-05-13 23:49:00 -04:00
Tim Graham
1708c8afb6 Merge pull request #1053 from makto/patch-1 
Fixed #20394 - Clarified argument of get_user in docs
 2013-05-13 11:02:30 -07:00
Tim Graham
897e4eab65 Fixed #20398 - Added language selection code to example in documentation 
Thanks ggbaker for the suggestion and Simeon Visser for the patch.
 2013-05-13 13:43:28 -04:00
Tim Graham
b1f74670cc Merge pull request #1058 from svisser/ticket_20397 
Fixed #20397 - Cleaned up issue with quotation marks in documentation
 2013-05-12 17:16:04 -07:00
Ramiro Morales
956973ca6c Updated test failure example. 2013-05-12 17:29:34 -03:00
Simeon Visser
b9efc03e6d Fixed #20397 - Cleaned up issue with quotation marks in documentation 2013-05-12 20:24:48 +01:00
Tim Graham
2c62a509de Fixed #20136 - Fixed and expanded the docs for loaddata and model signals. 
Thanks brandon@ and Anssi for the report.
 2013-05-11 19:34:02 -04:00
Tim Graham
679a2ac843 Fixed #20249 - Removed a "feature" in the tutorial that doesn't actually work. 
Thanks bmispelon for the report and draft patch.
 2013-05-11 19:08:57 -04:00
Florian Apolloner
a6edde3260 Fixed embarrassing typo. 2013-05-11 22:57:01 +02:00
Florian Apolloner
01820466ca Don't hardcode primary keys in gis tests. 2013-05-11 22:42:39 +02:00
Donald Stufft
11c7ec7993 Merge pull request #1052 from dstufft/bcrypt-python3 
BCrypt on Python3
 2013-05-11 10:53:18 -07:00
Florian Apolloner
2bf403ecbd Fixed a regression from e23a5f9a47. 
Excluded postgis specific gis tests from other spatial databases.

Refs #17365, #17366, #18727.
 2013-05-11 18:29:08 +02:00
Donald Stufft
3070e8f711 Properly force bytes or str for bcrypt on Python3 2013-05-11 11:16:06 -04:00
Florian Apolloner
e23a5f9a47 Fixed a regression in the test runner loading of runtests.py. 
Refs #17365, #17366, #18727.
 2013-05-11 15:47:40 +02:00
zhongqi
1172bef998 Update customizing.txt 
The origin statement "which could be ... or whatever" **misguides** many newbies like me.

In fact, the ``login`` function in ``contrib.auth`` stores ``user.pk`` in session, then ``get_user`` function in ``contrib.auth`` gets ``user.pk`` in session and then passes it to your custom ``get_user`` as ``user_id``.

Which means, ``user_id`` prarameter in your custom ``get_user`` has to be the primary key of ``User`` object, too.
 2013-05-11 15:53:54 +08:00
Carl Meyer
9012833af8 Fixed #17365, #17366, #18727 -- Switched to discovery test runner. 
Thanks to Preston Timmons for the bulk of the work on the patch, especially
updating Django's own test suite to comply with the requirements of the new
runner. Thanks also to Jannis Leidel and Mahdi Yusuf for earlier work on the
patch and the discovery runner.

Refs #11077, #17032, and #18670.
 2013-05-10 23:08:45 -04:00
Anssi Kääriäinen
c0d8932a6d Fixed #19939 -- generic relations + split_exclude regression 
Added a test, the issue was already fixed (likely by the patch
for #19385).
 2013-05-11 03:48:58 +03:00
Jannis Leidel
92351c74c1 Updated my bio. 2013-05-10 15:51:14 -07:00
Alex Gaynor
327e362ff3 Fixed an obvious typo. 2013-05-10 08:56:39 -07:00
Aymeric Augustin
a4dec43b52 Fixed two admin_views tests under Oracle. 
Thanks Anssi for the review.
 2013-05-10 16:56:42 +02:00
Aymeric Augustin
bdd285723f Fixed #20385 -- Typo in files docs. 2013-05-10 13:23:57 +02:00
Claude Paroz
7b00d90208 [py3] Made GeoIP tests pass with Python 3 2013-05-10 13:21:07 +02:00
Claude Paroz
465a29abe0 Fixed #20384 -- Forced GeoIP_open path argument to bytestring 
Thanks Julian Wachholz for the report.
 2013-05-10 13:21:07 +02:00
Aymeric Augustin
9a3708cec8 Fixed a test that fails under Python 3. 2013-05-09 19:33:02 +02:00
Luke Plant
f026a519ae Fixed #19733 - deprecated ModelForms without 'fields' or 'exclude', and added '__all__' shortcut 
This also updates all dependent functionality, including modelform_factory
 and modelformset_factory, and the generic views `ModelFormMixin`,
 `CreateView` and `UpdateView` which gain a new `fields` attribute.
 2013-05-09 16:44:36 +01:00
Luke Plant
1e37cb37ce Further removal of static admin validation that can fail erroneously 2013-05-09 16:44:36 +01:00
Aymeric Augustin
1906cb9360 Fixed conditional skipping of test for left/right lookup types. 
connection.ops.spatial_version is None for some backends (eg. MySQL) and
the comparison fails on Python 3 with TypeError.
 2013-05-09 17:39:56 +02:00
Alex Gaynor
a53d7a0a50 Made gis_terms be a set, rather than a dict with None for all keys. 2013-05-09 08:13:13 -07:00
Alex Gaynor
6634cb7b53 Removed a test that didn't make sense; code could never be called the way the test was written. 2013-05-09 06:55:25 -07:00
Aymeric Augustin
3d595c3bc3 Fixed #20215 -- Disabled persistent connections by default. 2013-05-09 15:42:14 +02:00