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

17465 Commits

Author SHA1 Message Date
Claude Paroz a6eda3a5fc [1.7.x] Also allowed a non-overridden setting to be deleted 
Refs #20032, #18824. Thanks ztorstri at gmail.com for the report.
Backport of 3417ba0309 from master.
 2014-04-12 15:35:11 +02:00
Claude Paroz d9f8cc12ae [1.7.x] Fixed #22102 -- Made SimpleTestCase tests run before unittest.TestCase ones 
Thanks aptiko for the report and Tim Graham for the review.
Backport of 3e3a7372f5 from master.
 2014-04-12 11:43:10 +02:00
Aymeric Augustin 3f48ca2071 [1.7.x] Improved a comment. Thanks intgr for the report. 
Backport of 476db08 from master
 2014-04-11 23:03:25 +02:00
Tim Graham 593e72c141 [1.7.x] Fixed #22419 -- Typo in docs/topics/db/multi-db.txt. 
Thanks Josh Kupershmidt.

Backport of c487b1e230 from master
 2014-04-10 19:33:39 -04:00
Aymeric Augustin 1bcc8eb0f6 [1.7.x] Increased robustness of 58161e4e. Refs #22291. 
Backport of ee837b9a from master
 2014-04-10 23:18:36 +02:00
Aymeric Augustin 2ad0bc132a [1.7.x] Fixed #21202 -- Maintained atomicity when the server disconnects. 
Thanks intgr for the report.

This commit doesn't include a test because I don't know how to emulate a
database disconnection in a cross-database compatible way.

Also simplified a 'backends' test that was constrained by this problem.

Backport of 81761508 from master
 2014-04-10 23:18:36 +02:00
Aymeric Augustin 2e42c859da [1.7.x] Fixed #21239 -- Maintained atomicity when closing the connection. 
Refs #15802 -- Reverted #7c657b24 as BaseDatabaseWrapper.close() now
has a proper "finally" clause that may need to preserve self.connection.

Backport of 25860096 from master.
 2014-04-10 23:18:35 +02:00
Aymeric Augustin 5f22bda382 [1.7.x] Fixed #22321 -- Wrapped exceptions in _set_autocommit. 
Refs #21202.

Backport of 3becac84 from master
 2014-04-10 23:06:58 +02:00
Aymeric Augustin 7e89434084 [1.7.x] Fixed #22291 -- Avoided shadowing deadlock exceptions on MySQL. 
Thanks err for the report.

Backport of 58161e4e from master.
 2014-04-10 23:02:54 +02:00
Tim Graham ae78227de3 [1.7.x] Fixed #21353 -- Noted that description is ignored for TabularInlines. 
Thanks nofinator for the report.

Backport of d5031ecf88 from master
 2014-04-10 13:33:28 -04:00
John Paulett b4681be154 [1.7.x] Fixed #22364 -- Sanitized getpass input in changepassword. 
Python 2 getpass on Windows does not accept unicode, even
when containing on ASCII characters. Related #190807.

Backport of b5a9166f7e from master
 2014-04-10 13:16:04 -04:00
Tim Graham ddd25b280f [1.7.x] Fixed #22194 -- Added --list-tags option to check command. 
Thanks Elvard for the patch.

Backport of 395d75ea6b from master
 2014-04-10 09:44:43 -04:00
Tim Graham 32e6237450 [1.7.x] Fixed #22195 -- Used constants to define built-in tags for check framework. 
Thanks Elvard for the patch.

Backport of b513fa5fc6 from master
 2014-04-10 08:54:32 -04:00
Carl Meyer 0b43308e2d [1.7.x] Fixed #22412 -- More nuanced advice re template filters and exceptions. 
Thanks Tim for review.

Backport of 7e3834adc9 from master
 2014-04-10 06:19:02 -04:00
Shai Berger 941f947bfd [1.7.x] Documentation fixes for the select_for_update change. 
Refs #22343; thanks Tim Graham for the fixes.

Backport of 59b1d30 from master
 2014-04-10 03:43:05 +03:00
Shai Berger 3a9a4570ef [1.7.x] Fixed #22343 -- Disallowed select_for_update in autocommit mode 
The ticket was originally about two failing tests, which are
fixed by putting their queries in transactions.

Thanks Tim Graham for the report, Aymeric Augustin for the fix,
and Simon Charette, Tim Graham & Loïc Bistuer for review.

Backport of b990df1d63 from master
 2014-04-10 01:44:30 +03:00
Aymeric Augustin f6f188ffc7 [1.7.x] Fixed #21553 -- Ensured unusable database connections get closed. 
Backport of 5f2f47f from master
 2014-04-09 22:50:21 +02:00
Tim Graham 396d65b580 [1.7.x] Noted that pip is included with Python 3.4 in Windows install guide. 
Thanks CHI Cheng.

Backport of 11e7254c3d from master
 2014-04-09 07:39:08 -04:00
ejstronge 763b1d55e2 [1.7.x] Fixed small typo in django-admin.txt 
The word 'by' seemed to be missing from the first line of the compilemessages command.

Backport of 5ca522b9ed from master
 2014-04-09 07:13:37 -04:00
Huu Nguyen f22177a9a3 [1.7.x] Refs #21230 -- removed direct settings manipulation from signed cookies tests 
Backport of b9bfcd82f0 from master
 2014-04-08 12:15:40 -04:00
Anubhav Joshi 2cb7013179 [1.7.x] Fixed #16205 -- Added an installation for Windows. 
Backport of d35d2f61c5 from master
 2014-04-08 11:28:58 -04:00
Tim Graham 8158557f22 [1.7.x] Added Python 3.4 to list of supported version in docs/intro/install.txt 
Backport of a1fa6fcabc from master
 2014-04-08 11:13:36 -04:00
Tim Graham 9063e6ed39 [1.7.x] Fixed casing of "GeoDjango". 2014-04-08 10:12:15 -04:00
Anubhav Joshi d9c7d9eb6e [1.7.x] Fixed #9535 -- Added a reference guide for file upload classes. 
Backport of c8c2b8a638 from master
 2014-04-08 10:09:01 -04:00
Anubhav Joshi 61b7fcf478 [1.7.x] Fixed #22405 -- Fixed string error in models/queries docs. 
Backport of 36de29200e from master.
 2014-04-08 13:34:37 +02:00
Yin Jifeng c148d8e730 [1.7.x] Added missing request parameter to get_current_site(). 
Backport of d6c9bdd825 from master
 2014-04-07 09:57:04 -04:00
Tim Graham 32c8579089 [1.7.x] Fixed #21084 -- Used proxy model's content type for admin log entries. 
(the previous commit included only the test)

Backport of 3cba90f22a from master
 2014-04-07 09:06:09 -04:00
Alejandro Gómez 5e74d6cf0a [1.7.x] Fixed #21084 -- Used proxy model's content type for admin log entries. 
Backport of 7a7f6fccae from master
 2014-04-07 08:59:27 -04:00
Tim Graham 38679254bf [1.7.x] Fixed #22216 -- Added Form.non_field_errors to form API doc. 
Backport of d2f4553d70 from master
 2014-04-05 18:17:13 -04:00
Tim Graham 5891fd3f89 [1.7.x] Fixed #21649 -- Added optional invalidation of sessions when user password changes. 
Thanks Paul McMillan, Aymeric Augustin, and Erik Romijn for reviews.

Backport of fd23c06023 from master
 2014-04-05 13:01:03 -04:00
Vishal Lal 4ad4a236de [1.7.x] Fixed #22380 -- Missing SECRET_KEY variable in sample settings file for testing 
Backport of 8f621b83e9 from master.
 2014-04-04 09:48:56 +02:00
Tomasz Wysocki 23984cf907 [1.7.x] Refactored and commented strip_tags utility 
Backport of c28beb4291 from master.
 2014-04-03 21:28:10 +02:00
Simon Charette 7b3a221ad6 [1.7.x] Fixed #22363 -- Correctly serialize `django.utils.datetime_safe` objects. 
Thanks to linovia for the report.

Backport of 074d3183d9 from master
 2014-04-03 14:56:41 -04:00
Vishal Lal 28a686a0b7 [1.7.x] Fixed #22372 -- Improved description of WizardView.get_context_data(). 
Thanks simon29 for the report.

Backport of a8e2ec0e82 from master
 2014-04-03 08:27:57 -04:00
Ramiro Morales 1a1b22679d [1.7.x] Document removal of GeoDjangoTestSuiteRunner in 1.6 release notes. 
e6ced2bb08 from master.
 2014-04-02 17:16:33 -03:00
Vishal Lal 36d1e3725f [1.7.x] Fixed #22347 -- Unified FileSystemStorage documentation. 
Thanks nliberg for the report.

Backport of ca93f02c62 from master
 2014-04-02 13:01:03 -04:00
Claude Paroz cfb7eca2a1 [1.7.x] Added 1.6.3 release note for refs #22256. 2014-04-01 20:48:06 +02:00
Loic Bistuer 6405889a72 [1.7.x] Fixed #22360 -- Fixed two non-deterministic tests in Python 3.4. 
The order of admin's changelist filters in the querystring relied on
dict ordering.

Backport of 4d996b8e69 from master
 2014-03-31 08:24:09 -04:00
Tim Graham ef37346932 [1.7.x] Fixed #22362 -- Improved AuthenticationMiddleware assertion message. 
Thanks Keryn Knight.

Backport of 246face209 from master
 2014-03-31 08:12:16 -04:00
Tim Graham 07c42cee7f [1.7.x] Replaced urllib/urlparse imports with from django.utils.six.moves. 
Backport of 981b864fbd from master
 2014-03-31 07:55:25 -04:00
Loic Bistuer 5268d71f18 [1.7.x] Fixed #21795 -- Made add_preserved_filters account for url prefixes. 
Thanks to trac username honyczek for the report. Refs #6903.

Backport of 4339e9a92d from master
 2014-03-31 07:20:20 -04:00
Tim Graham 25da849896 [1.7.x] Added 1.6.3 release note for refs #22250. 
Backport of d57ba04d89 from master
 2014-03-31 07:12:12 -04:00
Tim Graham 2f2d21fe5c [1.7.x] Fixed typo in docstring. 
Backport of 029d77eaaa from master
 2014-03-31 07:01:27 -04:00
Loic Bistuer 8e73d3a2c1 [1.7.x] Fixed #22319 -- Fixed migration external dependencies when there are internal dependencies. 
Backport of 0fd51cf0bd from master
 2014-03-31 06:57:44 -04:00
Loic Bistuer bdec848063 [1.7.x] Fixed #22359 -- Changing M2M field to blank=True failed on sqlite. 
Backport of a449e7feec from master
 2014-03-31 06:35:06 -04:00
Ramiro Morales 422f5d9a2c [1.7.x] Corrected an import in a model form docs example. 
cb5dd99bb4 from master.
 2014-03-30 20:34:29 -03:00
Berker Peksag 273f8e2297 [1.7.x] Added Python 3.4 to classifiers in setup.py. 
Backport of 47509e3c5d from master
 2014-03-30 17:46:38 -04:00
Tim Graham 0f9f8738d5 [1.7.x] Fixed #22338 -- Fixed a test dependent on dictionary key iteration order. 
Backport of 69a4f383f6 from master
 2014-03-30 14:27:05 -04:00
Aymeric Augustin 18b2c03ea3 [1.7.x] Increased memoization cache size for language codes. 
There may be more than 100 (default maxsize) commonly seen xx-yy values
on some sites. The additional memory consumption isn't significant.

Also added a comment explaining why this cache must have a maxsize.

Backport of f356b6e from master.
 2014-03-29 19:47:47 +01:00
Tim Graham c139e3e0a0 [1.7.x] Fixed #21858 -- Clarified 1.6 release note regarding M2M help text changes. 
Thanks lee at semel.net for the report.

Backport of f30e6590f4 from master
 2014-03-29 10:23:23 -04:00