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

20591 Commits

Author SHA1 Message Date
Tim Graham 800a162c0c [1.8.x] Moved misplaced versionadded annotation. 
Backport of 12083c5d47 from master
 2015-09-03 08:58:54 -04:00
Tim Graham 6acf0df862 [1.8.x] Refs #24152 -- Fixed typos in deprecated GeoQuerySet aggregate names. 
Backport of a8eb715b66 from master
 2015-09-02 19:59:27 -04:00
Aymeric Augustin 2b08b36488 [1.8.x] Made the autoreloader survive all exceptions. 
Refs #24704.

Backport of b79fc11d73 from master
 2015-08-29 23:13:12 +02:00
Aymeric Augustin cc14d51ee8 Fixed #24704 -- Made the autoreloader survive SyntaxErrors. 
With this change, it's expected to survive anything except errors
that make it impossible to import the settings. It's too complex
to fallback to a sensible behavior with a broken settings module.

Harcoding things about runserver in ManagementUtility.execute is
atrocious but it's the only way out of the chicken'n'egg problem:
the current implementation of the autoreloader primarily watches
imported Python modules -- and then a few other things that were
bolted on top of this design -- but we want it to kick in even if
the project contains import-time errors and django.setup() fails.

At some point we should throw away this code and replace it by an
off-the-shelf autoreloader that watches the working directory and
re-runs `django-admin runserver` whenever something changes.

Backport of fe6ddb837d from master
 2015-08-29 23:12:08 +02:00
Aymeric Augustin dc8786ce94 [1.8.x] Ensured gen_filenames() yields native strings. 
This also fixes a test failure on Python 2 when Django is installed in a
non-ASCII path. This problem cannot happen on Python 3.

Backport of c2fcba2ac7 from master
 2015-08-29 23:10:55 +02:00
Aymeric Augustin 6af1e47aab [1.8.x] Refactored autoreload tests. 
* Added helpers to test uncached and cached access.
* Fixed test_project_root_locale: it duplicated test_locale_paths_setting.
* Rewrote test_only_new_files: test more cases.

Backport of dfa712efb8 from master
 2015-08-29 23:09:57 +02:00
Aymeric Augustin b18bb65fd2 [1.8.x] Accounted for error files in the autoreloader. 
* When some old files contain errors, the second call to
  gen_filenames() should return them.
* When some new files contain errors, the first call to
  gen_filenames(only_new=True) should return them.

Backport of 23620cb8e0 from master
 2015-08-29 23:08:06 +02:00
Tim Graham 0d368bfb47 [1.8.x] Fixed #25323 -- Fixed selenium test failures with chromedriver 2.18. 
Backport of 7ac0cd445e from master
 2015-08-28 14:38:18 -04:00
Tim Graham 3cc67a637a [1.8.x] Fixed #25299 -- Fixed crash with ModelAdmin.list_display value that clashes with a model reverse accessor. 
Backport of 9607a04041 from master
 2015-08-28 09:03:34 -04:00
Tim Graham 4f83bfa9e5 [1.8.x] Refs #2495 -- Documented that MySQL cannot have TextField(unique=True). 
Backport of e8cbc2b322 from master
 2015-08-27 09:30:29 -04:00
Tim Graham b7042576f9 [1.8.x] Added 'subtransactions' to spelling wordlist. 
Backport of 91ec1841f5 from master
 2015-08-26 08:24:19 -04:00
Tim Graham 58335a2c0b [1.8.x] Fixed #25311 -- Removed vague language about "partial commits" from docs. 
Backport of ea47a052ba from master
 2015-08-25 20:24:05 -04:00
David Sanders 0723a39a59 [1.8.x] Updated PROJ.4 link to new GitHub wiki. 
Backport of 7efdd40407 from master
 2015-08-25 09:57:34 -04:00
Tim Graham 206534893f [1.8.x] Fixed #25309 -- Corrected that ATOMIC_REQUESTS applies per view not per request. 
Backport of 2a1a085bf1 from master
 2015-08-25 09:54:48 -04:00
Claude Paroz c177d0690e [1.8.x] Fixed #25295 -- Restored 'no active translation' after language override 
Thanks David Nelson Adamec for the report and Tim Graham for the review.
Backport of 9324935c3 from master.
 2015-08-25 10:37:54 +02:00
Kai Richard Koenig 181528726e [1.8.x] Fixed #25040 -- Fixed migrations state crash with GenericForeignKey 
Backport of 60f795c060 from master
 2015-08-22 08:50:19 -04:00
Tim Graham 0e3a8c22df [1.8.x] Fixed typo in tests/migrations/test_autodetector.py. 
Backport of 01966bb2a7 from master
 2015-08-20 14:52:36 -04:00
Tim Graham ffe755e990 [1.8.x] Fixed #24951 -- Fixed AssertionError in delete queries involving a foreign/primary key. 
Thanks Anssi Kääriäinen for help.

Backport of 333cbdcd2d from master
 2015-08-20 08:46:08 -04:00
Marc 3fa5229600 [1.8.x] Recommended the JavaScript Cookie library instead of jQuery cookie. 
jQuery cookie is no longer maintained in favor of the JavaScript
cookie library. This also removes the jQuery dependency.

Backport of f9de197268 from master
 2015-08-19 10:05:01 -04:00
Markus Holtermann 79bd15ef32 [1.8.x] Fixed style issues in testing docs 
Backport of f33607ce0b from master
 2015-08-19 21:40:36 +10:00
Tim Graham 63a4384ba1 [1.8.x] Added stub release notes for 1.8.5. 
Backport of 84335e3d1f from master
 2015-08-18 19:53:05 -04:00
Anton Strogonoff a67bf4be35 [1.8.x] Used consistent capitalization and hyphenation of "class-based views" in docs. 
Backport of 20787b5c29 from master
 2015-08-18 19:08:08 -04:00
Tim Graham 3caa7a2325 [1.8.x] Post-release version bump. 2015-08-18 13:29:42 -04:00
Tim Graham acc3c1df84 [1.8.x] Bumped version for 1.8.4 release. 2015-08-18 08:36:48 -04:00
Tim Graham 2eb86b01d7 [1.8.x] Fixed DoS possiblity in contrib.auth.views.logout() 
Thanks Florian Apolloner and Carl Meyer for review.

This is a security fix.
 2015-08-18 08:15:15 -04:00
Tim Graham 048bccb1be [1.8.x] Added stub release notes for security releases. 2015-08-18 08:15:06 -04:00
Anton Strogonoff e5663ec297 [1.8.x] Limited line length in docs/ref/contrib/messages.txt example. 
Backport of d35f184b20 from master
 2015-08-17 07:48:24 -04:00
Caio Ariede 29fa1b5800 [1.8.x] Fixed #25180 -- Prevented varchar_patterns_ops and text_patterns_ops indexes for ArrayField. 
Backport of dad8434d6f from master
 2015-08-15 10:11:09 -04:00
Tim Graham 632a917c11 [1.8.x] Refs #23843 -- Updated Oracle annotations workaround to reflect latest status. 
Backport of f9636fdf92 from master
 2015-08-14 13:52:33 -04:00
Tim Graham d2dfe3ae81 [1.8.x] Fixed #25268 -- Tweaked wording in docs/ref/forms/api.txt 
Backport of 5b5a27942b from master
 2015-08-14 08:28:53 -04:00
Adam Brenecki 99b5649a07 [1.8.x] Fixed #24988 -- Documented passing a dictionary of ValidationErrors to ValidationError 
Backport of 52a190b657 from master
 2015-08-13 17:43:06 -04:00
Fabrizio Ettore Messina c652383379 [1.8.x] Fixed #25267 -- Corrected message for admin.E122 system check. 
Backport of ece78684d9 from master
 2015-08-13 13:14:17 -04:00
Andriy Sokolovskiy d5e3eb986d [1.8.x] Removed unreachable code 
Backport of 4359be023b from master
 2015-08-13 13:12:52 -04:00
Tim Graham 312abecefd [1.8.x] Corrected indentation of JsonResponse docs. 
Backport of 290145e661 from master
 2015-08-12 10:28:43 -04:00
Tim Graham 77ced0b740 [1.8.x] Updated memcached library links to point to PyPI. 
Backport of d772d812cf from master
 2015-08-11 21:21:24 -04:00
Tim Graham bcf5fb78d7 [1.8.x] Fixed typo in docs/ref/contrib/gis/geoquerysets.txt 
Backport of 56ed80ac2a from master
 2015-08-11 09:33:44 -04:00
Tim Graham e4b813c0e7 [1.8.x] Fixed #25160 -- Moved unsaved model instance data loss check to Model.save() 
This mostly reverts 5643a3b51b and
81e1a35c36.

Thanks Carl Meyer for review.

Backport of 5980b05c1f from master
 2015-08-10 11:31:22 -04:00
Claude Paroz 90c7078f48 [1.8.x] Removed unnecessary comma in docs 
Backport of f2e4c7aca4 from master
 2015-08-10 10:20:51 -04:00
Tim Graham 2112879305 [1.8.x] Refs #25236 -- Discouraged use of ifequal/ifnotequal template tags. 
Backport of 787cc7aa84 from master
 2015-08-08 08:55:51 -04:00
Tim Graham 43a05a93e9 [1.8.x] Corrected some inconsistent headings in docs/ref/templates/builtins.txt. 
Backport of 7080cef7bf from master
 2015-08-08 08:55:37 -04:00
Claude Paroz cda66497aa [1.8.x] Updated Wikipedia links to use https 
Backport of 64982cc2fb from master.
 2015-08-08 12:09:53 +02:00
Claude Paroz 293c5fcdcc [1.8.x] Updated Transifex links in docs 
Backport of 18f3d4c1bd from master.
 2015-08-08 11:34:03 +02:00
mlavin ac46eb7e83 [1.8.x] Fixed #25231 -- Added recording of squashed migrations in the migrate command. 
Ensured squashed migrations are recorded as applied when the
migrate command is run and all of the original migrations
have been previously applied.

Backport of 69db1c7455 from master
 2015-08-07 18:16:37 -04:00
Tim Graham ad2ac53054 [1.8.x] Fixed #25233 -- Fixed HStoreField.has_changed() handling of initial values. 
Thanks Simon Charette for review.

Backport of a7b7f27c05 from master
 2015-08-07 14:31:05 -04:00
Tim Graham a7fb311ace [1.8.x] Fixed #25229 -- Clarified how an iterable works with @permission_required 
Backport of 16a8d01308 from master
 2015-08-05 17:18:13 -04:00
Tim Graham ce0f2a4a4f [1.8.x] Fixed #25213 -- Discouraged use of QuerySet.extra() 
Thanks Anssi Kääriäinen for the draft text and Simon Charette
for review.

Backport of e8cd65f829 from master
 2015-08-05 08:15:44 -04:00
Tim Graham 6f6043fd26 [1.8.x] Fixed #25212 -- Documented the RawSQL expression. 
Backport of 97fa7fe961 from master
 2015-08-05 08:15:30 -04:00
Tim Graham df05495e8c [1.8.x] Fixed #25224 -- Fixed typo in docs/ref/contrib/flatpages.txt 
Backport of 28cb272a72 from master
 2015-08-04 14:52:24 -04:00
Alasdair Nicol 07546333c1 [1.8.x] Fixed password_reset signature in docs 
Backport of 6d7a9d96fe from master
 2015-08-04 13:57:45 -04:00
Caio Ariede 9f10c5cdf5 [1.8.x] Fixed #25136 -- Documented Count('X', distinct=True) in aggregate topic guide. 
Backport of 3862c568ac from master
 2015-08-04 10:50:18 -04:00