innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
20,041 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

20041 Commits

Author SHA1 Message Date
John Giannelos e150bbd4d6 [1.8.x] Fixed #24427 -- Stopped writing migration files in dry run mode when merging. 
Also added display of migration to stdout when verbosity=3.

Backport of 8758a63ddb from master
 2015-03-16 19:45:55 -04:00
Marten Kenbeek febcbbf89d [1.8.x] Fixed #24488 -- Made create_default_site() use default pk of 1. 
Fixed create_default_site() to use a default value in case
settings.SITE_ID isn't set; refs #23945.

Backport of 818182b514 from master
 2015-03-16 13:31:22 -04:00
Preston Timmons ff71d6b8de [1.8.x] Documented Context.get() method. 
Backport of 4d9414098b from master
 2015-03-16 13:13:47 -04:00
Josh Smeaton 09062e9509 [1.8.x] Fixed #24486 -- Documented method to provide output_field to mixed F expressions 
Backport of 820381d38b from master
 2015-03-16 11:56:09 -04:00
Adrian Andreias 63b998a653 [1.8.x] Fixed allow_migrate() signature in router examples. 
Backport of 937643a1f2 from master
 2015-03-16 09:39:41 -04:00
HerHde 6dcbfc0700 [1.8.x] Added missing punctuation in some comments in tutorial 5. 
Backport of 39573a11db from master
 2015-03-16 08:24:58 -04:00
Steven Das f2db113f51 [1.8.x] Added comma to improve readability in 1.7 release notes. 
Backport of 4f494ed0c6 from master
 2015-03-16 08:17:01 -04:00
Matthew Wilkes 22a67d22e9 [1.8.x] Refs #24354 -- Prevented repointing of relations on superclasses when migrating a subclass's name change 
Forwardport of test and release note from stable/1.7.x

Backport of ae87ad005f from master
 2015-03-14 15:47:10 -04:00
Tim Graham da8b3aa7eb [1.8.x] Fixed #24480 -- Marked strings in contrib.gis templates for translation. 
Backport of 21ffbb06ec from master
 2015-03-14 15:20:53 -04:00
Floris den Hengst bd36f2d432 [1.8.x] Fixed doc typos. 
Backport of e42a720ba2 from master
 2015-03-14 12:29:27 -04:00
Tim Graham 5b91802718 [1.8.x] Refs #24462 -- Emphasized that order_by() clears previous ordering. 
Backport of b9d9ab23bd from master
 2015-03-13 15:42:03 -04:00
Andrei Kulakov 937c8a5a14 [1.8.x] Fixed #24052 -- Doc'd how to write data migrations with models in multiple apps. 
Backport of b089759d60 from master
 2015-03-13 13:24:18 -04:00
Sævar Öfjörð Magnússon 8fe451d183 [1.8.x] Fixed #24478 -- Added NUMBER_GROUPING value for Icelandic 
Backport of d8de9a64d7 from master.
 2015-03-13 16:57:37 +01:00
Claude Paroz f115694547 [1.8.x] Documented gdal DataSource encoding parameter 
Thanks Max Demars for the suggestion and Tim Graham for the review.
Backport of a8991b9b9f from master.
 2015-03-13 16:41:37 +01:00
Remco Kranenburg 6f555e54f7 [1.8.x] Refs #23559 -- warned about consequences of letting users edit User model in admin. 
Backport of f6b09a7f85 from master
 2015-03-13 08:51:24 -04:00
Ian Lee 06085024f6 [1.8.x] Added link to section in docs/howto/custom-template-tags.txt. 
Backport of 56cd87a5af from master
 2015-03-13 08:26:28 -04:00
Ian Lee 606e436a37 [1.8.x] Fixed typo in docs/howto/custom-template-tags.txt. 
Backport of 7614efa2f9 from master
 2015-03-13 08:14:30 -04:00
Ian Lee 77564c6f5a [1.8.x] Documented how to use a non-root subdirectory with mod_wsgi. 
Backport of 7f8588d22e from master
 2015-03-12 20:09:56 -04:00
Steven Das e1657cc37f [1.8.x] Fixed typo in docs/ref/models/fields.txt 
Backport of 53bc6e2e98 from master
 2015-03-12 19:16:22 -04:00
Aksel Ethem fee18ce415 [1.8.x] Fixed #24364 -- Doc'ed that ManifestStaticFileStorage shouldn't be used during testing. 
Backport of b4d8b16e51 from master
 2015-03-12 09:23:57 -04:00
ldrumm def39428bf [1.8.x] Fixed wrong operator in iri_to_uri() docs 
Backport of 27ad12a9b8 from master
 2015-03-12 13:49:07 +01:00
Dan Fellin 9f39715509 [1.8.x] Fixed typo in docs/topics/forms/modelforms.txt. 
Backport of 6ff826e12e from master
 2015-03-11 19:58:14 -04:00
Sean Wang e0e2df412f [1.8.x] Fixed #24414 -- Added examples of Prefetch object usage to the docs. 
Backport of a3e89f13df from master
 2015-03-11 12:39:50 -04:00
Preston Timmons 2982143dac [1.8.x] Fixed typo in current_app deprecation note. 
Backport of 6b605be5fe from master
 2015-03-11 12:36:08 -04:00
Tim Graham aba74d6f1e [1.8.x] Fixed escaping regression in urlize filter. 
Now that the URL is always unescaped as of refs #22267,
we should re-escape it before inserting it into the anchor.

Backport of 7b1a67cce5 from master
 2015-03-10 19:12:20 -04:00
Claude Paroz 12e199356e [1.8.x] Fixed download instructions for cities shapefile 
Thanks Daniel Wiesmann for spotting the issue.
Backport of 57d42aef97 from master.
 2015-03-10 19:44:27 +01:00
Claude Paroz e2816f1ff9 [1.8.x] Updated GIS docs wrt GIS test paths 
Backport of 1825365152 from master.
 2015-03-10 18:01:29 +01:00
Erik Romijn 846a970106 [1.8.x] Fixed #23903 -- Configured Sphinx to autogenerate django-admin manpage 
Backport of f66c2bdc0f from master
 2015-03-10 08:15:40 -04:00
Calvin Jeong 6e81786f92 [1.8.x] Fixed typo in docs/ref/database.txt 
Backport of cefbbb9db3 from master
 2015-03-10 07:12:39 -04:00
Psilo Cybin b25e542ecd [1.8.x] Fixed #24456 -- Added links to topics/forms/modelforms.txt. 
Backport of 866e71140f from master
 2015-03-09 20:53:05 -04:00
Floris den Hengst 9853844ed3 [1.8.x] Fixed #24432 -- Added docs for ManyToManyFields that reside in and refer to the same model. 
Backport of b9b8411129 from master
 2015-03-09 20:46:26 -04:00
Tim Graham ffa4ff5e8c [1.8.x] Added stub release notes for 1.7.7. 
Backport of ea9157f681 from master
 2015-03-09 13:10:09 -04:00
Tim Graham 449d1effb8 [1.8.x] Bumped version to 1.8 beta 2. 2015-03-09 10:22:51 -04:00
Baptiste Mispelon 35d68e8e76 [1.8.x] Refs #24461 -- Added test/release notes for XSS issue in ModelAdmin.readonly_fields 
This issue was fixed by refs #24464.
 2015-03-09 10:15:12 -04:00
Tim Graham 980d604bf2 [1.8.x] Clarified an item in 1.7.6 release notes. 
Backport of 300fdbbebb from master
 2015-03-09 10:11:44 -04:00
Erik Romijn d16e4e1d6f [1.8.x] Fixed #24464 -- Made built-in HTML template filter functions escape their input by default. 
This may cause some backwards compatibility issues, but may also
resolve security issues in third party projects that fail to heed warnings
in our documentation.

Thanks Markus Holtermann for help with tests and docs.

Backport of fa350e2f30 from master
 2015-03-09 09:31:07 -04:00
Anssi Kääriäinen 3a0fe942dd [1.8.x] Fixed #24171 -- Fixed failure with complex aggregate query and expressions 
The query used a construct of qs.annotate().values().aggregate() where
the first annotate used an F-object reference and the values() and
aggregate() calls referenced that F-object.

Also made sure the inner query's select clause is as simple as possible,
and made sure .values().distinct().aggreate() works correctly.

Backport of fb146193c4 from master
 2015-03-09 07:51:05 -04:00
Tim Graham 83269b2935 [1.8.x] Fixed typo in docs/howto/custom-template-tags.txt 
Backport of 63f2dd4ad7 from master
 2015-03-09 07:06:32 -04:00
Rik 930fc4db7b [1.8.x] Fixed #21661 -- Expanded authentication views documentation 
Backport of eb9b7abb83 from master.
 2015-03-08 20:40:33 +01:00
Aymeric Augustin 311b880fa9 [1.8.x] Prevented some tests from writing in the CWD. 
Backport of 90b069c33f from master
 2015-03-07 10:40:17 -05:00
Jean-Louis Fuchs 1ae2df6bfc [1.8.x] Fixed #24447 -- Made migrations add FK constraints for existing columns 
When altering from e.g. an IntegerField to a ForeignKey, Django didn't
add a constraint.

Backport of f4f0060fea from master
 2015-03-07 14:15:27 +01:00
Claude Paroz ac07890f95 [1.8.x] Fixed urlize regression with entities in query strings 
Refs #22267.
Thanks Shai Berger for spotting the issue and Tim Graham for the
initial patch.
Backport of ec808e807 from master.
 2015-03-06 22:22:51 +01:00
Josh Smeaton 823f8cdbc9 [1.8.x] Fixed #24420 -- Allowed ordering by case expressions 
Backport of ceaf31adff from master
 2015-03-06 13:31:43 +11:00
Marten Kenbeek bd7c879d5a [1.8.x] Stressed authentication should be successful before logging in a user. 
Backport of 8e744fa150 from master
 2015-03-05 12:18:13 -05:00
Aymeric Augustin 2bef57f3fb [1.8.x] Improved get_media_prefix template tag example. 
Backport of 9a4a9a8a49 from master
 2015-03-05 10:00:05 -05:00
Benjamin Wohlwend 3bc35f7e08 [1.8.x] Moved definition of chunks out of timesince function. 
This speeds up the timesince function/filter substantially.

Backport of d6969ab from master.
 2015-03-04 22:31:27 +01:00
Tim Graham 20bf320502 [1.8.x] Fixed #24426 -- Displayed admin actions panel when show_full_result_count=False. 
Backport of 36a17be9f3 from master
 2015-03-04 13:56:51 -05:00
Tim Graham 4fa61e0e4f [1.8.x] Used format_html() in contrib.admin.utils for consistency. 
Backport of fe42bfaaff from master
 2015-03-04 10:44:44 -05:00
Markus Holtermann bff446c205 [1.8.x] Fixed #24435 -- Prevented m2m field removal and addition in migrations when changing blank 
Thanks Mark Tranchant for the report and Tim Graham for the test and
review.

Backport of a9e29fae10 from master
 2015-03-04 15:44:38 +01:00
Mathias André 44dd65fb2c [1.8.x] Removed outdated docstring for get_admin_url(). 
Since a4b8a4b632 the admin
URL returned by get_admin_url() is no longer relative to
the Django admin index page.

Backport of 85757d0e79 from master
 2015-03-03 07:47:32 -05:00