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

15289 Commits

Author SHA1 Message Date
Andrew Godwin 03ec3219a0 Merge branch 'master' into schema-alteration 
Conflicts:
	django/db/backends/mysql/introspection.py
	django/db/backends/oracle/creation.py
	django/db/backends/postgresql_psycopg2/creation.py
	django/db/models/base.py
	django/db/models/loading.py
 2013-07-22 19:04:25 +01:00
Marc Tamlyn 29a09b3638 Merge pull request #1390 from garnertb/master 
Fixed small grammatical error in docstring.
 2013-07-22 07:34:30 -07:00
Tyler Garner 8e98652416 Fixed small grammatical error in docstring. 2013-07-22 10:32:09 -04:00
Claude Paroz 27c1a72576 Fixed #20773 -- [gis] Fixed regression in GoogleMap output 
Thanks Martyn Clement for the report and the initial patch.
 2013-07-22 09:55:45 +02:00
Claude Paroz 02b0106d43 Fixed #20781 -- Fixed _has_changed regression with MultiValueField 
Thanks Tim Graham for the report.
 2013-07-22 09:06:07 +02:00
Thomas Sorrel bb145e2c47 Fixed #13629 -- Added CSS classes to the `<body>` tag of some admin templates to allow style customizations per app or per model. 2013-07-21 20:17:14 +00:00
Claude Paroz 11b7b9ad00 Fixed an email validation regression 
Thanks Vincent Wagelaar for the report.
 2013-07-21 21:11:32 +02:00
Karen Tracey 3aad955ea8 Fixed #13696 -- ensured inline pk field is rendered 2013-07-21 13:06:11 -04:00
Simon Charette 415a36947c Fixed #20765 -- Set small values of `step` using exponential notation. 
Browsers parse small factors of 10 as 0 under decimal notation.

Thanks to Trac alias matklad for the report and Claude Paroz for the review.
 2013-07-19 23:31:15 -04:00
Claude Paroz 6d52844b9b Fixed #18551 -- Enabled skipIfDBFeature/skipUnlessDBFeature to decorate a class 
Thanks Tim Graham for the review and improved patch.
 2013-07-19 20:30:14 +02:00
Matt Deacalion Stevens a269ea4fe0 Fixed #14656 -- Added Atom1Feed `published` element 
Some feed aggregators make use of the `published` element as well as
the `updated` element (within the Atom standard -- http://bit.ly/2YySb).

The standard allows for these two elements to be present in the same
entry. `Atom1Feed` had implemented the `updated` element which was
incorrectly taking the date from `pubdate`.
 2013-07-19 10:38:34 -04:00
Tim Graham e1c737b62f Merge pull request #1374 from seocam/fix_i18n_docs 
LocaleMiddleware isn't default anymore (corrected docs)
 2013-07-19 03:35:46 -07:00
Tim Graham 4aa006efd0 Merge pull request #1377 from Matt-Stevens/doc-fixes-ref-databases 
Updated the `databases` documentation
 2013-07-19 03:31:15 -07:00
Tim Graham 997e305d24 Merge pull request #1375 from Matt-Stevens/master 
Fixed Croatia's country code in `localflavor` docs
 2013-07-19 02:30:27 -07:00
Tim Graham 4669986228 Merge pull request #1378 from loic/docs 
Fixed #20772 -- Fixed minor typo in form media docs.
 2013-07-19 02:19:24 -07:00
Loic Bistuer aa41eb9b8b Fixed #20772 -- Fixed minor typo in form media docs. 2013-07-19 15:48:38 +07:00
Matt Deacalion Stevens fa217d14a0 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).
 2013-07-19 09:01:13 +01:00
Matt Deacalion Stevens 97e5398629 Fix Croatia's country code in `localflavor` docs 
Croatia's country code is 'HR', not 'CR'.
 2013-07-19 09:01:13 +01:00
Sergio Oliveira cf6c754629 LocaleMiddleware isn't default anymore 
Changed in @23229061fcb836ecca2195cc75f91e331279a5d1
 2013-07-18 21:15:30 -03:00
Loic Bistuer 2fc6c9472c Fixed #20767 -- Fixed ModelAdmin.preserve_filters for namespaced URLs. 
Thanks Collin Anderson for the report.
 2013-07-18 18:18:30 -04:00
Tim Graham 9a2715da8b Merge pull request #1372 from loic/admin 
Cleaned up UserAdmin.get_form() that worked around a bug fixed in 23e1b59.
 2013-07-18 10:07:55 -07:00
Loic Bistuer 3a00229189 Cleaned up UserAdmin.get_form() that worked around a bug fixed in 23e1b59. 
Refs #18681.
 2013-07-18 23:59:45 +07:00
Tim Graham dce8945ea6 Fixed #20762 -- Clarified that add_fieldsets is not a standard ModelAdmin attribute. 2013-07-18 12:41:01 -04:00
Tim Graham d7ba2bf3cf Merge pull request #1370 from Matt-Stevens/doc-url-fix 
Fixed broken Atom URLs in syndication docs
 2013-07-18 05:47:33 -07:00
Tim Graham fd95dc9e27 Fixed #20763 -- Typo in tutorial 3. 
Thanks crichard@ for the report.
 2013-07-18 07:58:51 -04:00
Matt Deacalion Stevens beefc97171 Atom specification URL updated 
Changed to the URL of the official RFC for Atom, since Atomenabled.org
is just a holding page.
 2013-07-18 12:53:54 +01:00
Marc Tamlyn bd92a12fae Merge pull request #1368 from alasdairnicol/inspectdb_docs 
Fixed typo in inspectdb docs
 2013-07-18 04:01:15 -07:00
Alasdair Nicol 1131d4191f Fixed typo in inspectdb docs 2013-07-18 11:37:01 +01:00
Curtis Maloney a3e7d73ed7 Allowed Context.push to behave as a context mananger. 
Thanks Loic Bistuer for the review.
 2013-07-17 13:32:32 -04:00
Tim Graham 828359e52d Couple of cleanups in RelatedObjectLookups.js 
Thanks George Karpenkov.
 2013-07-17 09:32:14 -04:00
Tim Graham a3242dc9fe Fixed #20756 -- Typo in uWSGI docs. 2013-07-17 06:50:40 -04:00
Tim Graham 2333c9662b Fixed #14007 -- Added model discovery in models module without the need to specify app_label. 
Thanks mark@ and Aramgutang for work on the patch.
 2013-07-16 19:32:30 -04:00
Loic Bistuer fba6c2ede7 Reworked docs for ModelForm validation. 2013-07-16 19:20:53 -04:00
Tim Graham ce5c8a392f Merge pull request #1358 from loic/docs 
Rephrased the docs for reporting security issues to make it less intimidating.
 2013-07-16 03:20:59 -07:00
Loic Bistuer aff0aa3af8 Rephrased the docs for reporting security issues to make it less intimidating. 2013-07-16 17:17:08 +07:00
Tim Graham 862a04a56d Fixed some markup in docs/ref/templates/api.txt 2013-07-15 11:31:06 -04:00
Tim Graham 2456ffa42c Fixed #20746 -- Removed Python 2.6 specific code/docs 2013-07-14 13:02:55 -04:00
Tim Graham 0d81fd0e5f Merge pull request #1357 from dbinetti/patch-1 
Fixed grammatical error in auth docs
 2013-07-14 09:34:38 -07:00
David Binetti 51b50c47c7 Fixes grammatical error in auth docs 
Changes "An error will be raise if you try..." to "An error will be raised if you try..."
 2013-07-13 20:28:04 -07:00
Tim Graham d9c580306c Fixed #20681 -- Prevented teardown_databases from attempting to tear down aliases 
Thanks simonpercivall.
 2013-07-13 17:46:05 -04:00
Claude Paroz 1b142ef5dd Removed Python 2.6 references in GIS docs 
Refs #20746.
 2013-07-13 23:08:48 +02:00
Claude Paroz 64099e30e8 Removed obsolete sentence in queries docs 2013-07-13 21:08:44 +02:00
Tim Graham 9b471a8fe3 Fixed a deprecation warning in a selenium test. 2013-07-13 13:15:28 -04:00
Claude Paroz 7557207983 Fixed #20582 -- Allowed default Form.label_suffix to be translated 
Thanks Tim Graham for the review.
 2013-07-13 16:19:16 +02:00
Claude Paroz 73f86f4441 Isolated host validation tests in own test case 2013-07-13 10:16:52 +02:00
Tim Graham f2cb94f1c0 Fixed #20740 -- GenericIPAddressField should pass protocol to formfield() 
Thanks Jeff250.
 2013-07-12 16:05:14 -04:00
Tim Graham a7d97a6778 Fixed #20653 -- Renamed checksetup -> check missed in [03465639] 
Thanks CollinAnderson for the report.
 2013-07-12 12:48:49 -04:00
Karol Sikora 6272d2f155 Fixed #20429 -- Added QuerySet.update_or_create 
Thanks tunixman for the suggestion and Loic Bistuer for the review.
 2013-07-12 08:26:35 -04:00
Joeri Bekker 66f3d57b79 Fixed #19031 -- Added a warning when using override_settings with 'DATABASES' 2013-07-12 07:10:18 -04:00
Tim Graham b82a2c4138 Merge pull request #1349 from chrismedrela/ticket19934-comment 
Added clarification comments to django.utils.image; refs #19934
 2013-07-12 03:44:34 -07:00