test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15,297 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

5761 Commits

Author SHA1 Message Date
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
Tim Graham 7a5f799193 [1.6.x] Fixed #20860 -- Removed references to defunct chicagocrime.org 
Backport of 1593a86494 from master
 2013-08-04 14:46:41 -04:00
Daniele Procida 74205c4a3c [1.6.x] Fixed #20842 and #20845 - Added a note on order_by() and improved prefetch_related() docs. 
Backport of e8183a8193 from master
 2013-08-04 12:35:31 -04:00
Justin Michalicek 77293f9354 [1.6.x] Fixed #20855 -- Added documentation of current_app and extra_context params to django.contrib.auth views 
refs #5298 and refs #8342

Backport of 61ecb5f48a from master
 2013-08-04 08:05:36 -04:00
Tim Graham 01a9604274 [1.6.x] Fixed #20858 -- Removed erroneous import in tutorial 2. 
Thanks AtomicSpark.

Backport of b278f7478d from master
 2013-08-04 05:59:24 -04:00
Alasdair Nicol ccef8b2aa2 [1.6.x] Added missing request argument to example in URL dispatcher docs 
Backport of a0c58113b9 from master
 2013-08-03 19:36:15 -04:00
Dominic Rodger e710f6dc56 [1.6.x] Fixed #20786 -- Cleaned up docs/ref/exceptions.txt 
Thanks Daniele Procida for the suggestion and edits.

Backport of 920b242e30 from master
 2013-08-02 09:43:20 -04:00
Tim Graham b3e54f4a01 [1.6.x] Removed unused model option "admin" 
Backport of 5df84b268d from master
 2013-08-01 12:33:19 -04:00
Tim Graham d32471f8c2 [1.6.x] Added a bugfix in docutils 0.11 -- docs will now build properly. 
Backport of a3a59a3197 from master
 2013-07-31 09:26:11 -04:00
SusanTan bc617fd42c [1.6.x] Fixed #20779 -- Documented AdminSite.app_index_template; refs #8498. 
Thanks CollinAnderson for the report.

Backport of 7de35a9ef3 from master
 2013-07-31 07:09:37 -04:00
Tim Graham e82846a9aa [1.6.x] Fixed #20823 -- Typo in docs/ref/forms/validation.txt 
Backport of 05ea5a2139 from master
 2013-07-29 18:42:22 -04:00
minusf 518faa19c1 [1.6.x] Misc doc cleanups. 
Backport of 70c080fcdb from master
 2013-07-29 07:06:29 -04:00
minusf 5f8bf4368d [1.6.x] Allowed overriding variables in docs/Makefile. 
Backport of c694e6220e from master
 2013-07-29 06:52:42 -04:00
Jannis Leidel c456a27725 [1.6.x] Fixed #20774 -- Mention the new django-localflavor app as a replacement for the contrib app. Backport from master. 2013-07-29 12:05:47 +02:00
Tim Graham 192154fb17 [1.6.x] Fixed ReST typo in topics/class-based-views/mixins.txt 
Backport of 0b35a2cce3 from master
 2013-07-28 14:10:11 -04:00
Tim Graham dbbd2b1272 [1.6.x] Fixed #20805 -- Removed an extra colon beside checkboxes in the admin. 
Thanks CollinAnderson for the report.

Backport of 8676318d2d from master
 2013-07-26 14:47:58 -04:00
Aymeric Augustin efdf7442bb [1.6.x] Added versionadded directive missing from b7bd708. 
Backport of 5ed7ec9 from master.
 2013-07-25 20:16:02 +02:00
Tim Graham 68c01e15a5 [1.6.x] Fixed #20769 -- Added "Python compatibility" section to the 1.6 release notes. 
Backport of bddb4a6818 from master
 2013-07-25 13:04:18 -04:00
mark hellewell ec6928be34 [1.6.x] Fixed #18315 -- Documented QueryDict.popitem and QueryDict.pop 
Thanks gcbirzan for the report.

Backport of 8c9240222f from master
 2013-07-25 11:08:47 -04:00
Brenton Cleeland 7604749871 [1.6.x] Fixed #20792 -- Corrected DISALLOWED_USER_AGENTS docs. 
Thanks simonb for the report.

Backport of dab52d99fc from master
 2013-07-25 07:39:36 -04:00
Jon Lønne cd46463eb1 [1.6.x] Fixed typo in Custom management commands documentation. 
Backport of 5a5d594717 from master
 2013-07-24 07:33:49 -04:00
Dominic Rodger 45d5a4e7d2 [1.6.x] Fixed #20794 -- Documented changes to validate_email 
4e2e8f39d changed the way validate_email behaves for foo@localhost
email addresses, but wasn't listed in the release notes.
Backport of c928725b9 from master.
 2013-07-24 10:27:34 +02:00
Sergio Oliveira 496f319970 [1.6.x] LocaleMiddleware isn't default anymore (corrected docs) 
Changed in @23229061fcb836ecca2195cc75f91e331279a5d1

Backport of cf6c754629 from master
 2013-07-19 06:36:26 -04:00
Matt Deacalion Stevens 9b26cb72d9 [1.6.x] Updated the `databases` documentation 
+ Removed a reference about MySQL storage engines also being
   called 'table types', as this term has been deprecated for
   8 years and is no longer used.

 + Fixed the link to the official InnoDB storage engine docs.

 + Apache (versions >= 2.4) will always choose a multi-threaded
   MPM module on modern operating systems (later than 2002).

Backport of fa217d14a0 from master
 2013-07-19 06:31:38 -04:00
Matt Deacalion Stevens e7435fbe2f [1.6.x] Fixed Croatia's country code in `localflavor` docs 
Backport of 97e5398629 from master
 2013-07-19 05:30:55 -04:00
Loic Bistuer b7556a4980 [1.6.x] Fixed #20772 -- Fixed minor typo in form media docs. 
Backport of aa41eb9b8b from master
 2013-07-19 05:19:46 -04:00
Tim Graham 579ca9ee8d [1.6.x] Fixed #20762 -- Clarified that add_fieldsets is not a standard ModelAdmin attribute. 
Backport of dce8945ea6 from master
 2013-07-18 12:41:51 -04:00
Matt Deacalion Stevens fcd5f3a8d9 [1.6.x] Atom specification URL updated 
Changed to the URL of the official RFC for Atom, since Atomenabled.org
is just a holding page.

Backport of beefc97171 from master
 2013-07-18 08:47:58 -04:00
Tim Graham 1641aa7119 [1.6.x] Fixed #20763 -- Typo in tutorial 3. 
Thanks crichard@ for the report.

Backport of fd95dc9e27 from master
 2013-07-18 08:06:50 -04:00
Alasdair Nicol 9d9f670d93 [1.6.x] Fixed typo in inspectdb docs 
Backport of 1131d4191f from master
 2013-07-18 07:46:42 -04:00
Tim Graham 0db3c45f80 [1.6.x] Fixed #20756 -- Typo in uWSGI docs. 
Backport of a3242dc9fe from master
 2013-07-17 06:51:34 -04:00
Loic Bistuer ed473d61e5 [1.6.x] Reworked docs for ModelForm validation. 
Backport of fba6c2ede7 from master
 2013-07-16 19:21:55 -04:00
Tim Graham 3d25f592fe [1.6.x] Fixed some markup in docs/ref/templates/api.txt 
Backport of 862a04a56d from master
 2013-07-15 11:31:38 -04:00
David Binetti f8fd38b560 [1.6.x] Fixed grammatical error in auth docs 
Backport of 51b50c47c7 from master
 2013-07-14 12:35:26 -04:00
Claude Paroz db33b25e86 [1.6.x] Fixed #20582 -- Allowed default Form.label_suffix to be translated 
Thanks Tim Graham for the review.
Backport of 7557207983 from master.
 2013-07-13 16:20:09 +02:00
Tim Graham b30a872973 [1.6.x] Fixed #20653 -- Renamed checksetup -> check missed in [03465639] 
Thanks CollinAnderson for the report.

Backport of a7d97a6778 from master
 2013-07-12 12:50:53 -04:00
Tim Graham 1c8e539a77 [1.6.x] Fixed #17528 -- Documented that add() and remove() with a many-to-many relationship do not call Model.save() 
Backport of 3cdeb572d7 from master
 2013-07-12 06:22:19 -04:00
Christopher Medrela 9bb04b1a6b [1.6.x] Fixed #20735 -- clarified ManyToManyField constructor doc 
Backport of ac223ff6d1 from master
 2013-07-12 06:06:17 -04:00
Tim Graham fe0a563f81 [1.6.x] Fixed #20730 -- Fixed "Programmatically creating permissions" error. 
Thanks glarrain for the report.

Backport of 684a606a4e from master
 2013-07-11 11:07:51 -04:00
Tim Graham f93b2fe7e6 [1.6.x] Fixed #20733 -- Typo in docs/ref/class-based-views/generic-display.txt 
Thanks ijl20@ for the report.

Backport of ecd746191c from master
 2013-07-11 07:37:42 -04:00
Tim Graham 2e3250fc90 [1.6.x] Added some missing test requirements in the docs; refs #19196 
Backport of 77856dc875 from master
 2013-07-10 12:02:56 -04:00
Tim Graham aecbaaed0c [1.6.x] Fixed #19196 -- Added test/requirements 
Backport of 4d92a0bd86 from master.
 2013-07-10 09:37:15 -04:00
SusanTan c1b24b09f4 [1.6.x] Fixed #18261 -- Clarified 'project root directory' 
Backport of ef3fddf26e from master
 2013-07-09 07:16:31 -04:00
Tim Graham f03398a246 [1.6.x] Fixed #18944 -- Documented PasswordResetForm's from_email argument as a backwards incompatible change for 1.3 
Thanks DrMeers for the report.

Backport of dab921751d from master
 2013-07-08 15:06:31 -04:00
James Bennett b2afe39663 [1.6.x] Fixed #19695 -- Retitle "Form Media" to "Form Assets". 
Backport of c0f03175ce from master
 2013-07-08 14:09:02 -04:00
Tim Graham 730069197f [1.6.x] Fixed #16965 -- Clarified Formset can_delete docs. 
Thanks gregcorey@ for the suggestion.

Backport of 660c30ed95 from master
 2013-07-08 12:21:25 -04:00
Tim Graham 67a6b5e53f [1.6.x] Fixed #20493 -- Added a warning that objects may not be picklable across Django versions 
Thanks cataliniacob for the suggestion and review.

Backport of 1084575163 from master
 2013-07-08 09:59:02 -04:00
Tim Graham cf8d0933cb [1.6.x] Fixed #12346 -- Added a note on how to validate InlineFormSets. 
Thanks johnsmith for the suggestion.

Backport of 181f63c22d from master
 2013-07-08 08:31:46 -04:00
Tim Graham a22b2aea19 [1.6.x] Fixed #14006 -- Documented that Field's 'description' attribute is interpolated with field.__dict__ 
Thanks abeld for the suggestion.

Backport of 2d96e660f9 from master.
 2013-07-06 18:34:29 -04:00
Claude Paroz a9dd6221af [1.6.x] Fixed #20224 -- Update docs examples which mention __unicode__ 
Thanks Marc Tamlyn and Tim Graham for the review.
Backport of 7442eb1a24 from master.
 2013-07-05 19:30:08 +02:00
Tim Graham 430aae1b0d [1.6.x] Fixed #20561 -- Emphasized that QuerySet.distinct([*fields]) is only supported by Postgres. 
Thanks jtiai for the suggestion.

Backport of 577b0f9189 from master.
 2013-07-05 07:21:13 -04:00
Tim Graham 14a5b79e29 [1.6.x] Fixed #19539 -- Updated custom model fields example for Python 3. 
Thanks astorije@ for the report.

Backport of b9fceadfd4 from master.
 2013-07-05 06:54:34 -04:00
hekevintran 80dc8175a6 [1.6.x] fixed grammar 
Backport of 62a826ab31 from master.
 2013-07-05 10:58:35 +01:00
Tim Graham 541a30c376 [1.6.x] Fixed #20134 -- Correct list of fields that UserManager requires. 
Thanks semenov and pegler.

Backport of da5069f68f from master.
 2013-07-04 10:20:02 -04:00
Tim Graham 23748c483b [1.6.x] Fixed #20673 -- Clarified that HttpRequest.user uses AUTH_USER_MODEL. 
Thanks littlepig for the report.

Backport of f407f75aae from master.
 2013-07-04 09:34:02 -04:00
Tim Graham 9687e387d8 [1.6.x] Fixed #12579 -- Noted QuerySet.get_or_create() depends on database unique constraints. 
Thanks timmolendijk, jdunck, vijay_shanker, and loic84.

Backport of 428de2e339 from master.
 2013-07-04 08:32:49 -04:00
Tim Graham 25b9939fed [1.6.x] Fixed #20690 -- Mentioned LOCALE_PATHS earlier in translation docs. 
Thanks rene@ for the suggestion.

Backport of 231e31c690 from master.
 2013-07-04 05:45:16 -04:00
SusanTan 75041d5ea3 [1.6.x] Fixed #20609 -- Documented how to use request.user with RequestFactory 
Thanks michel@ for the suggestion.

Backport of 067e0424ce from master.
 2013-07-03 11:11:04 -04:00
Tomáš Ehrlich 2f9e5483f6 [1.6.x] Fixed #20687 -- Added documentation for django.core.signing API. 
Thanks Baptiste Mispelon for the suggestion.

Backport of c5bc98d7e1 from master.
 2013-07-03 10:38:53 -04:00