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

21064 Commits

Author SHA1 Message Date
Andriy Sokolovskiy 7866968eb3 Removed unused condition for the abstract model in ensure_default_manager() 2015-06-29 21:17:19 -04:00
Andriy Sokolovskiy c0cf73a57d Refs #20203 -- Allowed adding custom default manager to the model state 
If the only manager on the model is the default manager defined
by Django (`objects = models.Manager()`), this manager will not
be added to the model state. If it is custom, it needs to be
passed to the model state.
 2015-06-29 21:15:37 -04:00
Andriy Sokolovskiy 1d40204f82 Removed unnecessary return 2015-06-29 17:14:29 -04:00
Andriy Sokolovskiy 4359be023b Removed unreachable code 2015-06-29 17:14:29 -04:00
Luke Plant aef2a0ec59 Fixed #25018 -- Changed simple_tag to apply conditional_escape() to its output. 
This is a security hardening fix to help prevent XSS (and incorrect HTML)
for the common use case of simple_tag.

Thanks to Tim Graham for the review.
 2015-06-29 08:16:19 -04:00
Anssi Kääriäinen 9ed82154bd Fixed #23791 -- Corrected object type check for pk__in=qs 
When the pk was a relation field, qs.filter(pk__in=qs) didn't work.

In addition, fixed Restaurant.objects.filter(place=restaurant_instance),
where place is an OneToOneField and the primary key of Restaurant.

A big thank you to Josh for review and to Tim for review and cosmetic
edits.

Thanks to Beauhurst for commissioning the work on this ticket.
 2015-06-29 07:49:31 -04:00
Markus Holtermann 736fb1838c Used field.clone() where applicable 2015-06-28 15:11:26 +02:00
Trey Hunner ec4f219ecb Fixed #22463 -- Added code style guide and JavaScript linting (EditorConfig and ESLint) 2015-06-27 16:36:26 -04:00
Tim Graham 1e63652e44 Renamed MySQL-specific dbshell test file. 2015-06-27 16:22:11 -04:00
Tim Graham f59667c121 Fixed #25033 -- Added context_processors.auth to documented admin dependencies. 2015-06-27 14:27:03 -04:00
Tim Graham 7da3923ba0 Sorted imports in __init__.py files. 2015-06-27 11:53:33 -04:00
Greg Chapple 4a66a69239 Fixed #24887 -- Removed one-arg limit from models.aggregate 2015-06-27 11:44:33 -04:00
Tim Graham 6c592e79e1 Removed unused code after refs #25017. 2015-06-27 10:08:59 -04:00
Noam e291fc4757 Fixed #25031 -- Fixed a regression in the unordered_list template filter. 2015-06-27 09:37:41 -04:00
sujayskumar 2e70bf3785 Fixed #25017 -- Allowed customizing the DISALLOWED_USER_AGENTS response 2015-06-27 08:46:23 -04:00
Jason Hoos a50b66da30 Fixed #24958 -- Fixed inline forms using UUID-PK parents with auto-PK children. 2015-06-26 09:09:09 -04:00
Claude Paroz 0cc39e50e1 Pushed GDAL skip condition inside test 
As GDAL_VERSION is conditionnaly imported, it cannot be referenced
in skipIf decorator.
 2015-06-26 14:57:45 +02:00
Daniel Wiesmann b647ccfa67 Refs #24840 -- Added skip flag to raster transform test for GDAL<1.8.1. 
Thanks to Simon Charette for the report.
 2015-06-26 14:30:54 +02:00
薛丞宏 d3e12c9017 Fixed #25016 -- Reallowed non-ASCII values for ForeignKey.related_name on Python 3. 2015-06-26 08:30:05 -04:00
Claude Paroz 60879a2193 Loaded real destructor functions before garbage time 
This is an alternative patch to the unsuccessful b43b27bcd.
 2015-06-26 13:41:48 +02:00
Claude Paroz ad82d0003b Revert "Reverted lazy initialization of GIS destroy functions" 
This reverts commit b43b27bcdf.
This commit broke tests initialization on systems without GIS libraries.
 2015-06-25 23:37:36 +02:00
Claude Paroz 3f9dca62cb Updated GeoIP test for newer versions 2015-06-25 21:47:54 +02:00
Claude Paroz b43b27bcdf Reverted lazy initialization of GIS destroy functions 
Partial revert of 61d09e61. At __del__ time, it might be to late to bind
those functions.
 2015-06-25 21:05:48 +02:00
Marten Kenbeek 6364df6887 Refs #24127 -- Added documentation for HttpRequest.current_app. 2015-06-25 19:54:50 +02:00
Tim Graham aed437d567 Updated release process for new release schedule. 2015-06-25 11:36:17 -04:00
Simon Charette bdb382b2a4 Refs #25002 -- Supported textual to temporal column alteration on Oracle. 
Thanks to Tim Graham for the report and Shai Berger for the review.
 2015-06-24 19:37:55 -04:00
Tim Graham aaacaeb096 Renamed RemovedInDjangoXYWarnings for new roadmap. 
Forwardport of ae1d663b79
from stable/1.8.x plus more.
 2015-06-24 16:08:20 -04:00
Claude Paroz e73842a95f Reordered import in JSON serializer 2015-06-24 18:45:46 +02:00
Lukas Hetzenecker 6355a6d4f5 Fixed #25019 -- Added UUID support in DjangoJSONEncoder 2015-06-24 18:41:25 +02:00
Daniel Wiesmann c078021555 Refs #24840 -- Added GDALRaster Warp and transform methods 
Thanks to Tim Graham for the review.
 2015-06-24 18:31:22 +02:00
Daniel Wiesmann c0fff64486 Fixed #25011, Refs #23804 -- Added check for GDAL on RasterField initialization 2015-06-23 16:11:42 -04:00
Markus Holtermann 4202959b6f Improved coverage configuration 
By providing a .coveragerc file with all default settings, users only
have to execute "coverage run ./runtests.py" without the need to specify
all the possible flags. The same applies to "coverage html" and
"coverage xml".
 2015-06-23 21:17:37 +02:00
Markus Holtermann 7bb7670ee4 Used mock in MigrationQuestioner tests 
Thanks Andriy Sokolovskiy and Simon Charette for the review.
 2015-06-23 17:34:22 +02:00
Marten Kenbeek 290ff35e6c Fixed #25000 -- Fixed cast to string for lazy objects. 
Implemented __str__() to return the string-representation of the
proxied object, not the proxy itself, if the lazy object didn't have
a string-like object in its resultclasses.
 2015-06-23 09:16:17 -04:00
Tim Graham c45fbd060a Added white-space: pre-wrap; to docs code blocks to match docs.dp.com. 2015-06-22 15:56:06 -04:00
Wim Feijen 514b69cb9e Updated indentation of example template in docs/topics/i18n/translation.txt. 2015-06-22 15:42:09 -04:00
Ola Sitarska f1635ba433 Added Ola Sitarska to the team page. 2015-06-22 15:30:20 -04:00
Tim Graham 5ae0dd6abf Fixed #25001 -- Doc'd caveat about collectstatic and removing INSTALLED_APPS. 
Thanks aRkadeFR for the initial patch.
 2015-06-22 12:36:38 -04:00
Tim Graham 256aebbdaa Simplified wording of Python support policy. 2015-06-22 12:07:53 -04:00
Francisco Albarran e75b614640 Fixed #25009 -- Allowed User.objects.create_user(...,is_staff=True) to work. 2015-06-22 11:34:26 -04:00
Bipin Suresh 34047b23e2 Fixed #24983 -- Clarified contrib.sites Site.domain is fully qualified. 2015-06-22 09:39:54 -04:00
Simon Charette 73040e584a Fixed #25002 -- Used PostgreSQL column type alteration USING clause. 
Thanks to Dirk Uys for the report.
 2015-06-22 09:35:35 -04:00
Tim Graham 7f155a0703 Refs #25006 -- Added a '6 p.m.' option to the admin's time picker. 2015-06-22 07:24:57 -04:00
Rolo e7b4bd48c7 Fixed #24970 -- Added --managers and --admins options to the sendtestemail management command. 2015-06-22 07:21:26 -04:00
Claude Paroz 1c90a3dcca Fixed #24985 -- Added note about possible invalid feed content 
Thanks Michael Wood for the report and Tim Graham for the review.
 2015-06-21 20:53:01 +02:00
Tim Graham 4a66564888 Fixed #25010 -- Documented APP_DIRS default in startproject's settings.py 2015-06-20 19:28:17 -04:00
Marten Kenbeek 738c0de300 Fixed #14200 -- Added a fallback if HttpRequest.urlconf is None. 
Made BaseHandler fall back to settings.ROOT_URLCONF if
HttpRequest.urlconf is set to None, rather than raising
ImproperlyConfigured.
 2015-06-20 18:52:33 -04:00
Shai Berger 74402a5b0d Merge pull request #4877 from shaib/oracle-maindb-connection 
Changed Oracle test-db-creation to use an explicit main-db-connection
 2015-06-21 00:48:05 +03:00
Shai Berger abd7e48af7 Changed Oracle's test-database-creation to use an explicit main-db-connection 
rather than just relying on manipulation of settings to determine which
invocation of connection.cursor() opens a connection to the test database
and which opens a connection to the main database.

Thanks Aymeric Augustin for motivation and Tim Graham for review.
 2015-06-20 23:48:18 +03:00
Gagaro 8b7bd62ae5 Refs #24978 -- Amended test filename to avoid checkout warnings on Windows. 2015-06-20 14:22:57 -04:00