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

2071 Commits

Author SHA1 Message Date
Andrew Godwin 2bacc9f3b7 [1.7.x] Mark initial_data as deprecated separately from syncdb. Refs #23077. 
Conflicts:
	docs/internals/deprecation.txt
 2014-07-25 09:11:01 -07:00
Moayad Mardini ce95ab8f02 [1.7.x] Fixed #23088 -- Used `six` `range` type in `Paginator.page_range`. 
Backport of 6508db2ff9 from master
 2014-07-25 06:16:55 -04:00
Aymeric Augustin 0ac986fd8c [1.7.x] Avoided transactional truncates on amateur databases. 
Fixed a test failure that appeared after 753a22a6, although the bug
existed before that commit.

Refs #22308.

Backport of 6877a9d4 from master
 2014-07-24 19:18:06 -04:00
Aymeric Augustin 2a97db33a7 [1.7.x] Avoided transactional DDL on castrated databases. 
Fixed a test failure that appeared after 753a22a6, although the bug
existed before that commit.

Refs #22308 and #23089.

Backport of 0757e0f30d from master
 2014-07-24 18:48:05 -04:00
Aymeric Augustin 5ca82ff71b [1.7.x] Fixed #23089 -- Fixed transaction handling in two management commands. 
Previously, when createcachetable and flush operated on non-default
databases, they weren't atomic.

Backport of 753a22a635 from master
 2014-07-24 18:13:12 -04:00
Claude Paroz d6f293ad1b [1.7.x] Ignored STATIC_ROOT and MEDIA_ROOT in makemessages 
Also alleviate issues with weird file names typically found in
MEDIA_ROOT directories (#23010).
Thanks Tim Graham for the review.
Backport of 28efafa24c from master.
 2014-07-16 09:43:50 +02:00
Huu Nguyen 6d5238f6c8 [1.7.x] Fixed #22791 -- Invoke interactive questioner only for conflicts in specified apps. 
Thanks bendavis78 for the report and Tim Graham for the review.

Backport of f7a78f9bba from master
 2014-07-14 13:00:45 -04:00
Tim Graham aa1c615428 [1.7.x] Removed extra newline. 
Backport of b48c2c5925 from master
 2014-07-12 10:17:20 -04:00
Andrew Godwin 563046a7de [1.7.x] Fixed #22983: Alert when squashing RunPython operations with referred functions. 2014-07-11 19:01:47 -07:00
Daniel Hahler ef392387c2 [1.7.x] Fixed various minor doc typos / references. 
Backport of 67f9f385aa from master
 2014-07-05 20:26:56 -04:00
Loic Bistuer b68c7a5abb [1.7.x] Fixed #22915 -- Document backward incompatible changes in the ValidationError constructor. 
This patch also fixes update_error_dict to better handle the use case described
in this ticket, previously the type of the provided container could be lost in
some conditions.

Thanks Russell Keith-Magee for the report and Tim Graham for review.

Backport of eb7df6b8d7 from master
 2014-07-04 17:19:12 +07:00
Ian Foote 9f3c691259 [1.7.x] Added missing spaces to implicitly joined strings 
Backport of 4c39c270af from master
 2014-06-30 07:12:52 -04:00
Andrew Godwin 0dd737a719 [1.7.x] Fixed #22487: Don't flush out data from before normal TestCases 2014-06-23 20:25:52 -07:00
Claude Paroz f50a17785c [1.7.x] Fixed #8033 -- Explained app registry error during translation setup 
Thanks Tim Graham and Aymeric Augustin for the review.
Backport of 9618d68b34 from master.
 2014-06-23 09:37:38 +02:00
Andrew Godwin 72d1c4a6dd [1.7.x] Clean up syncdb parts of migrate output if no synced apps 2014-06-22 13:03:44 -07:00
Huu Nguyen d9a83d597e [1.7.x] Fixed #22862 -- Added --noinput option to makemigrations. 
Thanks artortenburger for the report.

Backport of fbb684d95e from master
 2014-06-20 09:10:43 -04:00
Claude Paroz 9005894233 [1.7.x] Swapped placeholders in [sql]migrate command error 
Backport of b67e9ed8c9 from master.
 2014-06-20 13:55:12 +02:00
Andrew Godwin bfe5f72c7e [1.7.x] Fixed #22863: Improve clarity of makemigrations for non-db params 2014-06-19 23:42:27 -07:00
Vincent-Vega 6e248d8f8c [1.7.x] Fixed #22845 -- Correctly handled memcached default timeout value. 
Backport of 4529af9ecf from master
 2014-06-16 16:35:24 -04:00
Andrew Godwin 11b8e6154b [1.7.x] Fixed #22848: Ignore no-migrations errors during makemigrations only 2014-06-16 09:59:06 -07:00
mlavin d94de802d3 [1.7.x] Fixed #22477 -- Removed contrib middleware from the global settings defaults. 
Also added a compatibility check for changed middleware defaults.
 2014-06-13 12:40:42 -04:00
Loic Bistuer d9eef1f4f7 [1.7.x] Made the vendored NamedTemporaryFile work as a context manager. Refs #22680. 
This fixes a regression on Windows introduced by b7de5f5.

Thanks Tim Graham for the report and review.

Backport of 6e8d614acd from master
 2014-06-12 14:15:31 -04:00
Florian Apolloner 1ff11304dc [1.7.x] Fixed #22680 -- I/O operation on closed file. 
This patch is two-fold; first it ensure that Django does close everything in
request.FILES at the end of the request and secondly the storage system should
no longer close any files during save, it's up to the caller to handle that --
or let Django close the files at the end of the request.

Backport of e2efc8965e from master.
 2014-06-11 09:03:11 +02:00
Tim Graham 0767055dfc [1.7.x] Fixed #22770 -- Removed create_superuser from post_migrate signals. 
Moved logic to syncdb command for backwards compatibility.

Backport of 93d05536fd from master
 2014-06-10 15:00:12 -04:00
Andrew Godwin 08218252d8 [1.7.x] Fixed #22487: Optional rollback emulation for migrated apps 
Conflicts:
	django/db/backends/creation.py
	django/test/runner.py
	docs/ref/settings.txt
	docs/topics/testing/advanced.txt
 2014-06-08 19:33:52 -07:00
Andrew Godwin 55fa4c2d34 [1.7.x] Fixed #22777: Add dependency on through for autodetected M2M adds 2014-06-08 17:13:11 -07:00
Víðir Valberg Guðmundsson 3fc4f03895 [1.7.x] Fixed #22749: Making SQL management commands migration aware. 2014-06-07 17:18:43 -07:00
Florian Apolloner ba31e45f08 [1.7.x] Revert "Making SQL management commands migration aware." 
This reverts commit cb9c9a7b58.

Backport of 83e7555ffe from master.
 2014-06-01 12:01:29 +02:00
Andrew Godwin 4956e182ac [1.7.x] Fix test failure caused by 3149cdce32 2014-05-29 15:36:49 -07:00
Víðir Valberg Guðmundsson b6a960cd1d [1.7.x] Making SQL management commands migration aware. 2014-05-29 15:36:30 -07:00
Alex Gaynor 3d98941d5c [1.7.x] Fixed several typos in Django 
Backport of 1dcc603eff from master
 2014-05-29 07:53:02 -04:00
Claude Paroz 91ef348bd6 [1.7.x] Fixed #21630 -- Simplified management command discovery 
Thanks Aymeric Augustin for the report end the review.
Backport of fe53bc524 from master.
 2014-05-28 09:35:43 +02:00
Aymeric Augustin 430faebe3b [1.7.x] Fixed #22699 -- Configure default settings in some management commands. 
This makes it possible to run django.setup() in management commands that
don't need a settings module. In addition it simplifies error handling.

Thanks Claude for the review.

Backport of 4865326f from master.
 2014-05-27 21:46:30 +02:00
Moayad Mardini c0a56001e0 [1.7.x] Fixed #22675 -- makemigrations --dry-run to output migrations to stdout. 
`makemigrations --dry-run` will output the complete migrations file
that would be written if it's used along with `--verbosity 3`.

Backport of 2e613ea5c5 from master
 2014-05-26 20:03:41 -04:00
Florian Apolloner 099625d760 [1.7.x] Removed executeable bit from a few files. 
Backport of 9d1bf8f841 from master.
 2014-05-25 23:17:18 +02:00
Moayad Mardini a59870e217 [1.7.x] Fixed #22676 -- makemigrations --dry-run should not ask for defaults 
Made the fix in InteractiveMigrationQuestioner class code, rather than
MigrationAutodetector, because --dry-run shouldn't affect whether
MigrationAutodetector will detect non-nullable fields, but the
questioner should skip the question and returns a None for default
(since that won't be used anyway) if --dry-run is used.

Backport of ee14961a2a from master
 2014-05-24 09:56:43 -04:00
Claude Paroz cdfefbec72 [1.7.x] Applied unicode_literals to makemessages command 
This also fixes #22686 as some sort of side-effect.
Backport of dbb48d2bb9 from master.
 2014-05-24 13:12:56 +02:00
Claude Paroz db2aacff99 [1.7.x] Updated Django makemessages process 
makemessages should now automatically distribute translatable
strings in the proper locale files, for Django too
(see 50a8ab7cd1).
Backport of 7999ed9b69 from master.
 2014-05-19 09:30:59 +02:00
Erik Romijn 2a66d12e77 [1.7.x] Fixed #22579 -- Corrected validation for email to reject trailing slash 
Backport of 424fe76349 from master.
 2014-05-16 15:19:21 +02:00
Claude Paroz e8a7436941 [1.7.x] Harmonized some PEP 0263 coding preambles 
Backport of e520a73ee from master.
 2014-05-15 20:01:31 +02:00
Aymeric Augustin 7fef18ba9e [1.7.x] Dropped fix_IE_for_vary/attach. 
This is a security fix. Disclosure following shortly.
 2014-05-14 10:18:26 +02:00
Malcolm Box 8a090c21f1 [1.7.x] Fixed #22606 -- Locmemcache has_key() failed for infinite cache expiry 
Refactored cache expiry logic for Locmemcache to make consistent across
all places where accessed, and correctly handle None as expiry time.
Backport of 66880e4cd from master.
 2014-05-09 19:47:43 +02:00
Andrew Godwin d2e96b5792 Merge pull request #2637 from davidszotten/validator_comparisons 
[1.7.x] Fixed #22588 -- Fix RegexValidator __eq__
 2014-05-08 19:49:59 -07:00
Claude Paroz 189bcb9b09 [1.7.x] Removed unused imports in makemigrations 
Backport of fc32e9c0d from master.
 2014-05-08 19:40:48 +02:00
David Szotten 724a7bf222 [1.7.x] Fixed #22588 -- Fix RegexValidator __eq__ 
Compare parameters instead of re.pattern instances, and add the other
parameters to the comparison. Also add a __ne__ to make assertNotEqual
work properly.
 2014-05-07 19:28:42 +01:00
Andrew Godwin 2afb6e0526 [1.7.x] Fixed #22576: Ensure makemigrations doesn't touch the database. 2014-05-06 22:42:53 -07:00
Andrew Godwin f53d1576ca [1.7.x] Fixed #22337: FileSystemStorage marked as deconstructible and tested. 2014-05-06 22:24:39 -07:00
Andrew Godwin 6ca5367869 [1.7.x] Cleanup failing test w/contenttypes and remove useless graph load 2014-04-30 15:12:18 -07:00
Andrew Godwin 35c2a14a49 [1.7.x] Fixed #22485: Include all unmigrated apps in project state by default. 2014-04-30 12:26:11 -07:00
Tim Graham a2cac1b68d [1.7.x] Removed unused import. 
Backport of d9c272b22f from master
 2014-04-30 07:27:56 -04:00