mirrors
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues 24 Releases Wiki Activity
15,760 Commits 28 Branches 423 Tags 631 MiB
Commit Graph

15760 Commits

Author SHA1 Message Date
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
Rainer Koirikivi 3c03004050 Fixed #20640 -- Avoided NoReverseMatch in get_deleted_objects 
The default delete action resulted in a NoReverseMatch if it were to
list any Model with a ModelAdmin with `get_urls` overridden to remove
the change url.  Catching the error and not displaying the link in that
case, as was already done for models with no registered admins.

Thanks Keryn Knight for the report.
 2013-08-19 12:01:33 -04:00
Anssi Kääriäinen ddeb20e31b Fixed GIS regression caused by force_subq 
Caused by commit 7737305a4f
 2013-08-19 16:35:11 +03:00
Tim Graham 7b69c3e775 Removed versionadded/changed annotations for 1.5 2013-08-19 09:09:41 -04:00
Anssi Kääriäinen 58c6d0209d Fixed #12807 -- EmptyResultSet ORed condition 
The EmptyResultSet wasn't treated correctly so the end results was
incorrect, too. The bug had been already fixed in master so only tests
added.
 2013-08-19 16:24:45 +03:00
Anssi Kääriäinen 7bc57a6d71 Fixed #11881 -- removed junk from aggregation subqueries 
There were clauses that weren't needed in the subqueries. These were
ORDER BY, SELECT FOR UPDATE and related selections.
 2013-08-19 16:15:09 +03:00
Anssi Kääriäinen 7737305a4f Fixed #12886 -- aggregation over sliced queryset 2013-08-19 16:00:17 +03:00
Andrew Godwin 52edc16086 Add more stringent M2M tests and fix the bug they exposed 2013-08-19 13:50:26 +01:00
Andrew Godwin 5b522cd85a Minor oracle fixes 2013-08-19 13:12:48 +01:00
Anssi Kääriäinen 7d28bed13b PEP 8 cleanup 2013-08-19 14:16:10 +03:00
Anssi Kääriäinen 630b9df42f Fixed #12567 -- Incorrect SQL in model inheritance case 
An isnull lookup produced incorrect SQL. This was already fixed
earlier, so only tests added.
 2013-08-19 14:10:03 +03: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
Alex Gaynor 4090982617 Some code simplification 2013-08-18 09:43:41 -07:00
Alex Gaynor aa01c99f55 Merge pull request #1479 from nickbruun/ticket_20924 
Proxy __len__ and __contains__ for LazyObject
 2013-08-18 09:41:43 -07:00
Nick Bruun 7a698c05b5 Update LazyObject method proxy declarations to simpler form. 2013-08-18 15:58:55 +02:00
Carl Meyer c2907a6e3d Remove the last FIXME from the howto-release-Django doc. 2013-08-16 23:55:43 -06:00
Harm Geerts 240886183b Fixed #20829 -- Skip postgis metadata tables with introspection 2013-08-16 21:14:29 +02:00
Claude Paroz 165f44aaaa Combine consecutive with statements 
Python 2.7 allows to combine several 'with' instructions.
 2013-08-16 20:12:10 +02:00
Alasdair Nicol 22c6497f99 Fixed #20895 -- Made check management command warn if a BooleanField does not have a default value 
Thanks to Collin Anderson for the suggestion and Tim Graham for
reviewing the patch.
 2013-08-15 19:47:26 -04: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
Nick Bruun b9ef96e73c Regression test and patch for ticket #20924. 2013-08-15 20:59:58 +02: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
Krzysztof Jurewicz 4eeb8ec147 Fixed #20864 -- Made the test client use common method for performing requests. 2013-08-13 19:08:13 -04:00
Florian Apolloner 4e50e40654 Removed unneeded conditional_escapes from the testsuite. 2013-08-13 22:22:46 +02:00
Andrew Godwin 157604a87f Oracle schema backend, passes most tests and is pretty complete. 2013-08-13 20:54:57 +01: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
Jacob Kaplan-Moss cbe6d5568f Apply autoescaping to AdminURLFieldWidget. 
This is a security fix; disclosure to follow shortly.
 2013-08-13 11:06:41 -05:00
Jacob Kaplan-Moss ae3535169a Fixed is_safe_url() to reject URLs that use a scheme other than HTTP/S. 
This is a security fix; disclosure to follow shortly.
 2013-08-13 11:06:22 -05:00
Anssi Kääriäinen 09a5f5aabe Fixed test failure on MySQL 
The fix for #20874 caused a MySQL specific failure.
 2013-08-13 15:37:08 +03:00
Tim Graham 737b53ab9a Merge pull request #1470 from loic/admin.actionlist 
Fixed overflow for the "Recent Actions" widget on the admin index.
 2013-08-13 05:11:39 -07:00
Loic Bistuer 163a34ce4b Fixed #20883 -- Made model inheritance find parent links in abstract parents 2013-08-13 15:14:11 +03:00
Loic Bistuer 33fc083b0d Fixed overflow for the "Recent Actions" widget on the admin index. 
Previously the CSS targeted "li.changelink" and therefore didn't
work for the "add" and "delete" actions.

Refs #14868.
 2013-08-13 18:20:12 +07:00
Anssi Kääriäinen dcdc579d16 Fixed #20874 -- bump_prefix() in nested subqueries 
Also made some cleanup to build_filter() code by introducing submethods
solve_lookup_type() and prepare_lookup_value().
 2013-08-13 14:11:52 +03:00
Ramiro Morales 6c12cd15e9 Unlocalize line numbers and ids in debug 500 view. 
While using USE_L10N, line numbers and IDs were printed as comma (or
locale equivalent) separated values.

Thanks Kronuz for the report and intial patch.

Fixes #20861.
 2013-08-12 21:59:27 -03:00
Andrew Godwin 44f907dd98 Start of getting Oracle to do schema stuff 2013-08-12 20:05:20 +01:00
Tim Graham 3f6cc33cff Added missing release notes for older versions of Django 2013-08-12 14:05:25 -04:00
Tim Graham 71b5617c24 Fixed #17778 -- Prevented class attributes on context from resolving as template variables. 
Thanks KyleMac for the report, regebro for the patch, and Aymeric for the test.
 2013-08-12 12:41:39 -04:00
Andrew Godwin 841b7af812 Use DEFAULT_DB_ALIAS 2013-08-12 16:40:41 +01: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 b61b634628 Fix weird planning issues when already fully migrated. 2013-08-11 15:28:51 +01:00
Andrew Godwin b4c493ecd3 Remove keep_default from add_field 2013-08-11 14:28:55 +01:00
Andrew Godwin d985fd7a18 Fix tablespace command 2013-08-11 14:27:42 +01:00
Andrew Godwin ae19315b4d Support index_together during model creation 2013-08-11 14:23:31 +01:00