p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
15,221 Commits 28 Branches 411 Tags 641 MiB
Commit Graph

5719 Commits

Author SHA1 Message Date
Tim Graham 2ab2d0fb25 [1.6.x] Fixed a link in topics/testing/overview.txt 
Backport of 0c295a7718 from master
 2013-09-06 17:41:43 -04:00
Keith Edmiston 2c73ba88f2 [1.6.x] Fixed #19295 -- Documented that CachedStaticFilesStorage isn't compatible with runserver --insecure. 
Backport of 028db97503 from master
 2013-09-06 17:30:59 -04:00
Tim Graham da44a8bdc2 [1.6.x] Fixed #20646 -- Clarified the use of AbstractBaseUser.REQUIRED_FIELDS 
Thanks craigbruce.

Backport of db3de52807 from master
 2013-09-06 16:06:46 -04:00
Tim Graham 544382dd85 [1.6.x] Fixed instructions for running a subset of tests. 
Backport of cd4068f359 from master
 2013-09-06 14:31:43 -04:00
Eric Boersma 180b9955cc [1.6.x] Fixed #21035 -- Changed docs to treat the acronym SQL phonetically. 
The documentation and comments now all use 'an' to
refer to the word SQL and not 'a'.

Backport of 4d13cc56de from master
 2013-09-05 20:16:14 -04:00
micahhausler 9f69ae7847 [1.6.x] Fixed #21047 -- Added CLA mesage on the new contributor advice doc 
Backport of 93dd31cadf from master
 2013-09-05 17:54:56 -04:00
Tim Graham 1dd061ad77 [1.6.x] Fixed #21044 -- Documented django.core.urlresolvers.Resolver404 
Thanks Keryn Knight for the suggestion.

Backport of eacf060e01 from master
 2013-09-05 08:45:58 -04:00
Tim Graham 622d5c7650 [1.6.x] Fixed #20900 -- Documented RemoteUserBackend.authenticate 
Backport of 7b62b80693 from master
 2013-09-05 06:32:50 -04:00
Tim Graham cda4fc8225 [1.6.x] Fixed #20958 -- Documented that GenericForeignKey fields can't be accessed in forms. 
Thanks marky1991.

Backport of 533d1ab334 from master
 2013-09-04 13:19:32 -04:00
Paul C. Anagnostopoulos fe0eb2f995 [1.6.x] Clarified docs for some tags and filters 
Backport of 1ccdc08189 from master
 2013-09-04 13:04:51 -04:00
Loic Bistuer a62b640f7d [1.6.x] Fixed #20973 -- Document serving static files without django.contrib.staticfiles 
Backport of 7b04038a7f from master
 2013-09-03 09:01:43 -04:00
Aymeric Augustin 115318051c [1.6.x] Replaced "not PY3" by "PY2", new in six 1.4.0. 
Conflicts:
	django/db/backends/oracle/base.py
	django/db/backends/sqlite3/base.py
	django/db/models/base.py

Backport of 365c3e8b from master.
 2013-09-03 07:34:45 -05:00
Tim Graham c0fb6bdde3 [1.6.x] Fixed #21002 -- Documented JSON session serialization requires string keys 
Thanks jeroen.pulles at redslider.net for the report.

Backport of 3baf1d1042 from master
 2013-09-03 07:49:59 -04:00
Claude Paroz 4e3794dd1f [1.6.x] Fixed #20998 -- Allow custom (de)serialization for GIS widgets 
Thanks Mathieu Leplatre for the report and the initial patch.
Backport of 102f26c92 from master.
 2013-09-02 13:34:26 +02:00
Loic Bistuer 64383e8349 [1.6.x] Made the doc about translating string literals in templates more prominent. 
Backport of 9885f07757 from master
 2013-08-31 08:00:33 -04:00
Claude Paroz 68ae9f39b7 [1.6.x] Fixed copy/paste error in measurement docs 
Backport of e87997dd33 frmo master.
 2013-08-31 10:33:46 +02:00
Tim Graham 0089a9a854 [1.6.x] Fixed typo in docs/ref/models/options.txt 
Backport of a89c856a7a from master
 2013-08-30 21:07:04 -04:00
Carl Meyer 21a3efcf48 [1.6.x] Fixed #20999 - Allow overriding formfield class with choices, without subclass restrictions. 
Refs #18162. Thanks claudep and mjtamlyn for review.

Backport of 7211741fc5 from master.
 2013-08-30 17:45:14 -06:00
Anssi Kääriäinen 76e38a2177 [1.6.x] Fixed #20988 -- Added model meta option select_on_save 
The option can be used to force pre 1.6 style SELECT on save behaviour.
This is needed in case the database returns zero updated rows even if
there is a matching row in the DB. One such case is PostgreSQL update
trigger that returns NULL.

Reviewed by Tim Graham.

Refs #16649

Backport of e973ee6a98 from master

Conflicts:
	django/db/models/options.py
	tests/basic/tests.py
 2013-08-30 09:47:34 +03:00
Jorge C. Leitão 60df34d477 [1.6.x] Added links to file docs. 
Backport of d72f83c410 from master
 2013-08-29 12:49:27 -04:00
Phaneendra Chiruvella 68eca2b36f [1.6.x] Minor spelling correction in ModelForms docs 
Backport of 2fbf949760 from master
 2013-08-28 07:12:38 -04:00
Krzysztof Jurewicz 544a190ebf [1.6.x] Fixed #20981 -- Noted the default value of disable_existing_loggers. 
Backport of 095643e691 from master
 2013-08-27 10:27:44 -04:00
Jan Böcker c4e2e4f630 [1.6.x] Fixed typo in docs/topics/conditional-view-processing.txt 
Backport of 5fd2c979cb from master
 2013-08-27 09:22:31 -04:00
Matt Robenolt 28026c3e26 [1.6.x] Updated instructions for running contrib tests. 
Backport of 08e7a64369 from master
 2013-08-27 08:24:31 -04:00
Ramiro Morales 2a166623a6 [1.6.x] Typos introduced in 57c82f909b. 2013-08-22 22:33:59 -03:00
Tim Graham 5f061986b9 [1.6.x] 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.

Backport of b0ce6fe656 from master
 2013-08-22 17:55:01 -04:00
Kevin Christopher Henry bf9382fb02 [1.6.x] Documentation -- Clarified use of 'view' in test client introduction. 
Backport of 2e926b041c from master
 2013-08-22 09:39:14 -04:00
Marc Tamlyn 8d02c378ab [1.6.x] Fixed #20944 -- Removed inaccurate statement about View.dispatch(). 
Backport of bac4d03ce6 from master
 2013-08-22 09:21:28 -04:00
Ramiro Morales 26a4c83598 [1.6.x] Made description of LANGUAGE_CODE setting more clear. 
297f5af222 from master.
 2013-08-22 08:29:59 -03:00
Kevin Christopher Henry 69a4594cb7 [1.6.x] 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.

Backport of bb011cf809 from master
 2013-08-21 17:46:18 -04:00
Kevin Christopher Henry e7d4d41a30 [1.6.x] 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:55 -07:00
Florian Apolloner 12d364a9b0 [1.6.x] Fixed #20933 -- Allowed loaddata to load fixtures from relative paths. 
Backport of 6e846f7627 from master.
 2013-08-20 21:28:14 +02:00
Tim Graham 7825fb8788 [1.6.x] Fixed #20891 -- Removed part of the tutorial that requires pytz 
Thanks AtomicSpark for the report.

Backport of 55339a7669 from master
 2013-08-15 15:31:57 -04:00
James Bennett d2419bb2b8 [1.6.x] Added release date to 1.5 release notes. 
Forwardport of 61283a8208 from 1.5.x
 2013-08-15 07:41:53 -04:00
Alasdair Nicol 52741004f6 [1.6.x] Updated docs following deprecation of django.views.defaults.shortcut 
Follows 3f2befc

Backport of 354009d67e from master
 2013-08-15 07:07:15 -04:00
Tim Graham 8bd5251fd5 [1.6.x] Added some doc links for django.contrib.messages 
Backport of b6178fa24b from master
 2013-08-14 12:58:19 -04:00
Tim Graham 529afa7138 Added 1.4.6/1.5.2 release notes. 2013-08-13 11:17:07 -05:00
Tim Graham 4f470f5186 [1.6.x] Added missing release notes for older versions of Django 
Backport of 3f6cc33cff from master
 2013-08-12 14:07:58 -04:00
Tim Graham 43f12f368b [1.6.x] Fixed #20890 -- Added missing import in class-based view docs. 
Thanks André Augusto.

Backport of ab680725bf from master
 2013-08-10 18:08:27 -04:00
Tim Graham 2cd1439c06 [1.6.x] Fixed #20868 -- Added an email to django-announce as a security step. 
Thanks garrison for the report.

Backport of 5737c57d95 from master
 2013-08-09 16:02:54 -04:00
Tim Graham 7c5d43eea0 [1.6.x] Added an anchor for django.forms.Form.clean in docs 
Backport of 8442268869 from master
 2013-08-08 14:14:14 -04:00
Jaime Irurzun 7836bd502c [1.6.x] Clarifed meaning of models.User.is_authenticated() 
Backport of f96fe3cd1e from master
 2013-08-08 10:27:34 -04:00
Daniele Procida 9cc7407f2c [1.6.x] Added more on @cached_property, refs #20870 
Backport of 7e6af9d40c from master
 2013-08-08 09:47:24 -04:00
Daniele Procida 25ce1e0e0a [1.6.x] Fixed #20870 -- Documented django.utils.functional.cached_property 
Backport of 7a2296eb5b from master
 2013-08-08 05:36:52 -04:00
Christopher Medrela 6264e39c34 [1.6.x] Added note to GenericIPAddressField documentation 
refs #20484

Backport of fb26c4996a from master
 2013-08-08 05:17:54 -04:00
Leandro Regueiro 4c90081b5b [1.6.x] Added section labels in cache docs 
Backport of 709cd2c4b7 from master
 2013-08-06 11:56:31 -04:00
Jimmy Song ea7bef318f [1.6.x] Fixed #20859 - Clarified Model.clean() example. 
Backport of 94d7fed775 from master
 2013-08-05 09:06:36 -04:00
Tim Graham 06f484dcf9 [1.6.x] Fixed #20862 -- Updated startproject MIDDLEWARE_CLASSES in docs. 
Thanks Keryn Knight.

Backport of 26c4bd38ac from master
 2013-08-05 08:16:56 -04:00
Julien Phalip 7cc91eae7c [1.6.x] Fixed a small formatting issue. 
Backport 0b071ba7df of from master.
 2013-08-04 17:33:00 -07:00
Julien Phalip 59bf42f79e [1.6.x] Added a note to the 1.6 release about the new `--keep-pot` option for `makemessages`. 
Refs #17008.
Backport of 28d3b33c04 from master.
 2013-08-04 17:20:22 -07:00