mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-10 18:36:05 +00:00
Code Issues 32 Releases Wiki Activity
15,572 Commits 28 Branches 426 Tags 651 MiB
5569b0b92f
Commit Graph

1830 Commits

Author SHA1 Message Date
Andrew Godwin
5569b0b92f Merge remote-tracking branch 'core/master' into schema-alteration 
Conflicts:
	django/db/backends/oracle/base.py
	django/db/backends/postgresql_psycopg2/base.py
	django/db/models/signals.py
	tests/queries/tests.py
 2013-08-23 12:36:53 +01:00
Ramiro Morales
57c82f909b Typos introduced in 297f5af222. 2013-08-22 21:25:35 -03:00
Tim Graham
b0ce6fe656 Fixed #20922 -- Allowed customizing the serializer used by contrib.sessions 
Added settings.SESSION_SERIALIZER which is the import path of a serializer
to use for sessions.

Thanks apollo13, carljm, shaib, akaariai, charettes, and dstufft for reviews.
 2013-08-22 13:58:26 -04:00
Anssi Kääriäinen
6af05e7a0f Fixed model.__eq__ and __hash__ for no pk value cases 
The __eq__ method now considers two instances without primary key value
equal only when they have same id(). The __hash__ method raises
TypeError for no primary key case.

Fixed #18864, fixed #18250

Thanks to Tim Graham for docs review.
 2013-08-22 17:24:07 +03:00
Marc Tamlyn
bac4d03ce6 Fixed #20944 -- Removed inaccurate statement about View.dispatch(). 2013-08-22 09:20:50 -04:00
Ramiro Morales
297f5af222 Made description of LANGUAGE_CODE setting more clear. 2013-08-22 08:27:04 -03:00
Kevin Christopher Henry
7775ced938 Documentation - Noted that OneToOneField doesn't respect unique. 
Added OneToOneField to the list of model fields for which the unique
argument isn't valid. (OneToOneFields are inherently unique, and if
the user supplies a value for unique it is ignored / overwritten.)
 2013-08-21 22:32:04 +01:00
Kevin Christopher Henry
bb011cf809 Documentation -- Corrected error about Model.full_clean() 
Although the ModelForm validation code was changed to call
Model.full_clean(), the documentation still said otherwise. The
offending phrase was removed.
 2013-08-21 15:38:07 -04:00
Kevin Christopher Henry
83e434a2c2 Documentation - Noted that OneToOneField doesn't respect unique. 
Added OneToOneField to the list of model fields for which the unique
argument isn't valid. (OneToOneFields are inherently unique, and if
the user supplies a value for unique it is ignored / overwritten.)
 2013-08-20 21:20:29 -07:00
Andrew Godwin
b6a957f0ba Merge remote-tracking branch 'core/master' into schema-alteration 
Conflicts:
	docs/ref/django-admin.txt
 2013-08-19 18:30:48 +01:00
Tim Graham
7b69c3e775 Removed versionadded/changed annotations for 1.5 2013-08-19 09:09:41 -04:00
Anssi Kääriäinen
3844089edc Fixed #20777 -- Admin proxy model deletion regression 
Added proxy_models tests by Harm Geerts <github@geertswei.nl>.
 2013-08-19 09:51:41 +03:00
Anssi Kääriäinen
4668c142dc Made Model.__eq__ consider proxy models equivalent 
Fixed #11892, fixed #16458, fixed #14492.
 2013-08-19 09:51:28 +03:00
Tim Graham
29255fcb4f Fixed some ReST errors regarding backticks 2013-08-15 07:14:10 -04:00
Alasdair Nicol
354009d67e Updated docs following deprecation of django.views.defaults.shortcut 
Follows 3f2befc
 2013-08-15 00:27:16 +01:00
Tim Graham
b6178fa24b Added some doc links for django.contrib.messages 2013-08-14 12:57:55 -04:00
Jonathan Slenders
ff410565bf Fixed #20709 -- Allowed {% widthratio %} to accept an "as" parameter. 
Thanks clay.evil@ for the suggestion.
 2013-08-14 12:40:19 -04:00
SusanTan
71c491972e Fixed #11400 -- Passed kwargs from AbstractUser.email_user() to send_mail() 
Thanks Jug_ for suggestion, john_scott for the initial patch,
and Tim Graham for code review.
 2013-08-14 07:46:11 -04:00
Matt Johnson
907ef9d0d1 Fixed #20555 -- Make subwidget id attribute available 
In `BoundField.__iter__`, the widget's id attribute is now passed to
each subwidget. A new id_for_label property was added to ChoiceInput.
 2013-08-13 13:23:05 -04:00
Mel Collins
6bdb3b1135 Fixed #13518 -- Added FILE_UPLOAD_DIRECTORY_PERMISSIONS setting 
This setting does for new directories what FILE_UPLOAD_PERMISSIONS
does for new files.

Thanks jacob@ for the suggestion.
 2013-08-12 07:15:59 -04:00
Andrew Godwin
7970d97a70 Docs tweaks (thanks timgraham) 2013-08-10 20:00:12 +01:00
Andrew Godwin
588b523233 Merge remote-tracking branch 'core/master' into schema-alteration 
Conflicts:
	django/db/models/options.py
 2013-08-09 14:37:37 +01:00
Tim Graham
ddae74b64c Fixed #9057 -- Added default_permissions model meta option. 
Thanks hvendelbo for the suggestion and koenb for the draft patch.
 2013-08-09 09:19:52 -04:00
Andrew Godwin
de64c4d6e9 Merge remote-tracking branch 'core/master' into schema-alteration 
Conflicts:
	django/core/management/commands/flush.py
	django/core/management/commands/syncdb.py
	django/db/models/loading.py
	docs/internals/deprecation.txt
	docs/ref/django-admin.txt
	docs/releases/1.7.txt
 2013-08-09 14:17:30 +01:00
Loic Bistuer
f8a6a4eba1 Improved queryset handling and docs for (Single|Multiple)ObjectMixin. 2013-08-09 17:51:58 +07:00
Tim Graham
8442268869 Added an anchor for django.forms.Form.clean in docs 2013-08-08 14:13:52 -04:00
Tim Graham
58e4fe464c Merge pull request #1457 from jaimeirurzun/master 
Clarified meaning of models.User.is_authenticated()
 2013-08-08 07:27:08 -07:00
Daniele Procida
7e6af9d40c Added more on @cached_property, refs #20870 2013-08-08 09:45:26 -04:00
Marc Tamlyn
fb1dd6b13a Form.clean() does not need to return cleaned_data. 
If it does, that will be used as the cleaned_data. The default
implementation has been changed to match this change.
 2013-08-08 14:05:55 +01:00
Jaime Irurzun
f96fe3cd1e Clarify meaning of models.User.is_authenticated() 2013-08-08 12:45:06 +01:00
Daniele Procida
7a2296eb5b Fixed #20870 -- Documented django.utils.functional.cached_property 2013-08-08 05:36:17 -04:00
Preston Holmes
cf041b883c Merge pull request #1453 from chrismedrela/ticket20484-improvement 
Fixed #20484 again -- added note to field documentation
 2013-08-07 14:10:24 -07:00
Christopher Medrela
fb26c4996a Fixed #20484 again -- added note to field documentation 2013-08-07 20:57:56 +02:00
Tai Lee
1280675834 Fixed #15511 -- Allow optional fields on `MultiValueField subclasses. 
The `MultiValueField` class gets a new ``require_all_fields`` argument that
defaults to ``True``. If set to ``False``, individual fields can be made
optional, and a new ``incomplete`` validation error will be raised if any
required fields have empty values.

The ``incomplete`` error message can be defined on a `MultiValueField`
subclass or on each individual field. Skip duplicate errors.
 2013-08-06 08:50:47 -04:00
Dominic Rodger
c33d1ca1d9 Fixed #20852 - Fixed incorrectly generated left quotes in docs. 
Sphinx generates left single quotes for apostrophes after
code markup, when right single quotes are required. The
easiest way to fix this is just by inserting the unicode
character for a right single quote.

Instances of the problem were found by looking for
">&#8216;" in the generated HTML.
 2013-08-06 07:13:17 -04:00
Jimmy Song
94d7fed775 Fixed #20859 - Clarified Model.clean() example. 2013-08-05 09:06:09 -04:00
Julien Phalip
0b071ba7df Fixed a small formatting issue. 2013-08-04 17:29:55 -07:00
Tim Graham
1593a86494 Fixed #20860 -- Removed references to defunct chicagocrime.org 2013-08-04 14:46:06 -04:00
Daniele Procida
e8183a8193 Fixed #20842 and #20845 - Added a note on order_by() and improved prefetch_related() docs. 2013-08-04 12:34:28 -04:00
Loic Bistuer
ebb3e50243 Introduced ModelAdmin.get_fields() and refactored get_fieldsets() to use it. 
Refs #18681.

This also starts the deprecation of ModelAdmin.declared_fieldsets
 2013-08-04 09:14:18 -04:00
Curtis Maloney
07876cf02b Deprecated SortedDict (replaced with collections.OrderedDict) 
Thanks Loic Bistuer for the review.
 2013-08-04 07:09:39 -04:00
Loic Bistuer
0bcdcc7eb9 Added ModelAdmin.get_search_fields. 2013-08-03 20:02:43 -04:00
Dominic Rodger
920b242e30 Fixed #20786 -- Cleaned up docs/ref/exceptions.txt 
Thanks Daniele Procida for the suggestion and edits.
 2013-08-02 09:42:46 -04:00
Tim Graham
5df84b268d Removed unused model option "admin" 2013-08-01 10:27:30 -04:00
Alex Couper
1123f45511 Fixed #20649 -- Allowed blank field display to be defined in the initial list of choices. 2013-07-31 14:12:03 -04:00
Loic Bistuer
acd1d439fd Fixed #20826 -- Moved Manager.raw() and Manager._insert() to the QuerySet class. 2013-07-31 09:54:00 -04:00
Julian Bez
8f5533ab25 Fixed #20793 -- Added Last-Modified header to sitemaps. 2013-07-31 07:42:30 -04:00
Tim Graham
4d8ecbdfda Fixed some ReST errors; refs #20819. 2013-07-31 07:22:38 -04:00
SusanTan
7de35a9ef3 Fixed #20779 -- Documented AdminSite.app_index_template; refs #8498. 
Thanks CollinAnderson for the report.
 2013-07-31 07:09:12 -04:00
Tai Lee
4c6ffcf721 Fixed #20819 -- Return 404 instead of 500 error when `staticfiles` view is used in production. 2013-07-31 18:58:50 +10:00