mirrors
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues 16 Releases Wiki Activity
15,588 Commits 28 Branches 421 Tags 654 MiB
Commit Graph

5806 Commits

Author SHA1 Message Date
Matt Robenolt 08e7a64369 Updated instructions for running contrib tests. 2013-08-27 08:21:42 -04:00
Tim Graham c9a69cdb93 Fixed #20976 -- Fixed labels in migration docs. 
Thanks chrismedrela for the report.
 2013-08-27 08:05:13 -04:00
Marc Tamlyn bd97026490 Merge pull request #1513 from jboecker/typo 
Fixed typo in docs/topics/conditional-view-processing.txt
 2013-08-27 02:11:59 -07:00
Erik Romijn fa57266699 Fixed #20972 -- Make messages cookie follow session cookie secure/httponly 2013-08-26 21:34:29 +02:00
Jan Böcker 5fd2c979cb Fixed typo in docs/topics/conditional-view-processing.txt 2013-08-26 11:19:40 +02:00
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
Kevin Christopher Henry 2e926b041c Documentation -- Clarified use of 'view' in test client introduction. 2013-08-22 09:37:03 -04: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
evildmp 3e20a8856b Added myself to the committers list. 2013-08-21 22:32:04 +01: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
Ramiro Morales 01223840f3 Fixed #18967 -- Don't base64-encode message/rfc822 attachments. 
Thanks Michael Farrell for the report and his work on the fix.
 2013-08-21 22:32:04 +01:00
Florian Apolloner 839940f27f Fixed #20933 -- Allowed loaddata to load fixtures from relative paths. 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
Daniele Procida 17fb5768e0 Merge pull request #1498 from evildmp/add-myself 
Added Daniele Procida to the committers list.
 2013-08-21 07:16:37 -07:00
evildmp 082b0638ef Added myself to the committers list. 2013-08-21 16:10:51 +02: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
Ramiro Morales f9d1d5dc13 Fixed #18967 -- Don't base64-encode message/rfc822 attachments. 
Thanks Michael Farrell for the report and his work on the fix.
 2013-08-20 22:17:26 -03:00
Florian Apolloner 96346ed5ad Fixed #20933 -- Allowed loaddata to load fixtures from relative paths. 2013-08-20 21:25:57 +02: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
Carl Meyer c2907a6e3d Remove the last FIXME from the howto-release-Django doc. 2013-08-16 23:55:43 -06:00
Tim Graham 55339a7669 Fixed #20891 -- Removed part of the tutorial that requires pytz 
Thanks AtomicSpark for the report.
 2013-08-15 15:24:58 -04:00
James Bennett bc5716fc9c Added release date to 1.5 release notes. 
Forwardport of 61283a8208 from 1.5.x
 2013-08-15 07:41:18 -04: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
Tim Graham db682dcc9e Added 1.4.6/1.5.2 release notes. 2013-08-13 11:16:30 -05:00
Loic Bistuer 163a34ce4b Fixed #20883 -- Made model inheritance find parent links in abstract parents 2013-08-13 15:14:11 +03:00
Tim Graham 3f6cc33cff Added missing release notes for older versions of Django 2013-08-12 14:05:25 -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
Tim Graham ab680725bf Fixed #20890 -- Added missing import in class-based view docs. 
Thanks André Augusto.
 2013-08-10 18:08:05 -04:00
Julien Phalip 6e70f47d02 Merge pull request #1464 from evildmp/squashing_commits 
Clarified misleading wording about squashing commits
 2013-08-10 14:48:46 -07:00
Daniele Procida e868eaf680 clarified misleading wording about squashing commits 2013-08-10 22:24:24 +01:00
Andrew Godwin 7970d97a70 Docs tweaks (thanks timgraham) 2013-08-10 20:00:12 +01:00
ersran9 00d23a13eb Fixed #20828 -- Allowed @permission_required to take a list of permissions 
Thanks Giggaflop for the suggestion.
 2013-08-10 10:10:18 -04:00
Tim Graham 5737c57d95 Fixed #20868 -- Added an email to django-announce as a security step. 
Thanks garrison for the report.
 2013-08-09 16:02:05 -04: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
Andrew Godwin 1d1cfd0bd8 Document new field API in release notes 2013-08-09 14:31:24 +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