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

18012 Commits

Author SHA1 Message Date
Tim Graham ee0208108b Revert "[1.7.x] Fixed #23088 -- Used `six` `range` type in `Paginator.page_range`." 
This reverts commit ce95ab8f02.

It caused some backwards compatibility concerns (refs #23140).
 2014-08-01 10:14:28 -04:00
Tim Graham e02d82155a [1.7.x] Fixed typo in docs/topics/testing/tools.txt. 
Backport of 7ce4ef58c9 from master
 2014-08-01 09:43:47 -04:00
Loic Bistuer e2c129fa5b [1.7.x] Used JsonResponse in CBV examples. 
Thanks Hiroki Kiyohara and Tim Graham for the reviews.

Backport of 7579080899 from master
 2014-07-31 13:46:53 -04:00
Tim Graham 42bb047d33 [1.7.x] Updated timezone docs to use timezone.now() 
Thanks James Cleveland for the report and Aymeric for suggesting
the solution.

Backport of da59902250 from master
 2014-07-31 12:57:50 -04:00
Tim Graham 063e7e56bc [1.7.x] Fixed flake8 warnings. 
Backport of 9a922dcad1 from master
 2014-07-31 09:25:23 -04:00
Florian Apolloner 567ae0d529 [1.7.x] Fixed the previous commit for Python3. 
Backport of 4453c80634 from master.
 2014-07-30 22:22:56 +02:00
areski e22ad1c325 [1.7.x] Fixed #23112 -- Field.get_choices tries to index an iterable 
Backport of 97a38de230 from master.
 2014-07-30 21:36:01 +02:00
Tim Graham 5736631233 [1.7.x] Fixed test failure on Windows. 
os.close(fd) is needed to avoid "The process cannot access the file
because it is being used by another process"

Backport of c2ab501bab from master
 2014-07-30 14:33:58 -04:00
Tim Graham 7dc29dcb99 [1.7.x] Fixed #23134 -- Fixed typos in docs/ref/models/querysets.txt. 
Thanks Josh Kupershmidt.

Backport of 66630f589c from master
 2014-07-30 13:04:38 -04:00
Tim Graham 82695c3f2b [1.7.x] Fixed flake8 errors. 
Backport of 34c60c42b6 from master
 2014-07-30 12:59:46 -04:00
areski 7cb4a82eaf [1.7.x] Fixed #23107 -- Made runserver output respect --no-color. 
Backport of 67d7da5fb9 from master
 2014-07-30 12:59:39 -04:00
Tim Graham 813f938093 [1.7.x] Forwardported 1.6.6 release note for #19107. 
Backport of 7fcfefbc4a from master
 2014-07-30 09:33:44 -04:00
Tim Graham 7e6eeef366 [1.7.x] Fixed #23132 -- Removed confusing clause in auth docs. 
Backport of abb97cffdf from master
 2014-07-30 08:16:01 -04:00
Andrew Godwin 8e7fdfdb6f [1.7.x] Fixed #23092: Squashing handles external dependencies 2014-07-29 10:22:30 -07:00
Andrew Godwin cc875e94cf [1.7.x] Fixed #23127: south_migrations note in docs 2014-07-29 10:10:58 -07:00
Andrew Godwin 3deddc2fdf [1.7.x] Fixed #23090: Document and enforce not double-squashing migrations 2014-07-29 10:03:59 -07:00
Andrew Godwin 0a4fbf4e13 [1.7.x] Fixed #23101: Prefer doing deletes before creates in autodetector. 
Makes declined or missed renames still work (but drop data).
 2014-07-29 09:39:01 -07:00
David Arcos fb8ddac27a [1.7.x] Fixed a typo in the admin documentation. 
The 'app' subpackage does not exist, should be 'app'.

Backport of b9daa4f0e1 from master
 2014-07-29 12:29:32 -04:00
Andrew Godwin 9abc36b626 [1.7.x] Fix soft_applied in a way that doesn't break tests 2014-07-29 09:24:22 -07:00
Andrew Godwin 053af1422a [1.7.x] Make detect_soft_applied exit correctly on non-create migrations 2014-07-29 09:19:48 -07:00
Tim Graham dcedc453a2 [1.7.x] Forwardported 1.6.6 release notes for refs #20292. 
Backport of f294f93a17 from master
 2014-07-29 09:43:29 -04:00
Tim Graham c0ddc410ec [1.7.x] Fixed #23079 -- Added data loss issues to those that will be backported to LTS. 
Backport of e46801f13d from master
 2014-07-29 09:27:28 -04:00
Tim Graham 5ac7fd9664 [1.7.x] Fixed #23120 -- Updated GeoDjango tutorial for migrations workflow. 
Backport of b012122d30 from master
 2014-07-29 09:10:27 -04:00
Baptiste Mispelon 9fb1652ac3 [1.7.x] Fixed #23123 -- Don't use a bare except in ModelAdmin documentation 
Thanks to wkschwartz for the report and to Tim for the patch.

Backport of e5619330e2 from master.
 2014-07-29 11:09:40 +02:00
Baptiste Mispelon 13d44f54a2 [1.7.x] Fixed #23114 -- Clarified documentation of template lookups. 
Thanks to gmunumel and Tom Dalton for their help on the patch.

Backport of 62c74abbb0 from master.
 2014-07-29 11:00:19 +02:00
Andrew Godwin 394053ce60 [1.7.x] Fixed #23121: AlterModelOptions operation not changing state right 2014-07-28 10:47:55 -07:00
Andrew Godwin d84b881600 [1.7.x] Fixed #23100: Individual FK creation missing dependencies 2014-07-28 10:33:28 -07:00
Moayad Mardini acbe3fac7c [1.7.x] Fixed #22491 -- documented how select_for_update() should be tested. 
Thanks Andreas Pelme for the report.

Backport of 668d432d0a from master
 2014-07-28 10:57:49 -04:00
Gabriel Muñumel 2077bbe3fe [1.7.x] Fixed #23102 -- Documented that sql* commands now respect allow_migrate(). 
Backport of 0af593dbe5 from master
 2014-07-28 10:06:06 -04:00
Aymeric Augustin d82cf95c52 [1.7.x] Fixed #23062 -- Documented how to create superuser. 
Patch by Tim Graham. Thanks areski for the review.

Backport of 53a61d8 from master.
 2014-07-27 15:49:32 +02:00
James Bennett b4c80238a2 [1.7.x] Bump version number for 1.7 RC 2. 2014-07-27 14:33:04 +02:00
James Bennett df55a697b3 [1.7.x] Update from key ID in security.txt to authorized release keys list. 
Backport of fe87f8d670 from master.
 2014-07-27 13:55:40 +02:00
Florian Apolloner 99c2c917c3 [1.7.x] Fixed #23098 -- Checked that lazy choices are not evaluated too soon 
Thanks Matthieu Agopian for the report.

Backport of 2f73b527dd from master.
 2014-07-27 13:32:07 +02:00
Florian Apolloner f8ec200671 [1.7.x] Only warn about initial data if fixtures have been found. 
Backport of 2ab0ed7b28 from master.
 2014-07-27 13:29:36 +02:00
Tushar Bhatia df0d5ea7bc [1.7.x] Fixed #22979 -- Moved bug* tests 
Backport of 11181a64f from master.
 2014-07-26 21:10:03 -04:00
David Hoffman 30ccb36cb9 [1.7.x] Fixed #23106 -- Updated class-based view reference title. 
Backport of f14898a453 from master
 2014-07-26 20:47:06 -04:00
Andrew Godwin 37f8a83ad0 Merge pull request #2977 from abrahammartin/stable/1.7.x 
Fixed #23101 db_table wasn't copied in deconstruct
 2014-07-26 09:58:59 -07:00
Abraham Martin 999758fc7a Fixed #23101 db_table wasn't copied in deconstruct 2014-07-26 18:48:36 +02:00
Andrew Godwin 7e708a2536 [1.7.x] Fixed #22944: Bad dependency on FK alteration in autodetector 2014-07-26 09:22:31 -07:00
qingfeng 3a2badcbb7 [1.7.x] Fixed #23060 -- Prevented UnicodeDecodeError in debug templatetag 
Backport of 08451f17d0 from master.
 2014-07-26 18:04:01 +02:00
David Hoffman 1ef544f91f [1.7.x] Fixed #22553 -- Added refreshing queryset info to docs. 
Backport of 6d5daa30cf from master
 2014-07-26 10:27:46 -04:00
Niclas Olofsson ddf2b7d96b [1.7.x] Fixed #22305 -- Added note to docs about UTF8 database requirement. 
Backport of 08b85de9b7 from master
 2014-07-26 09:40:24 -04:00
Hiroki KIYOHARA df678b7500 [1.7.x] Fixed code to solve #23070 problem 
Added a class to wrap callable in settings:
* Not to call in the debug page (#21345).
* Not to break the debug page if the callable forbidding to set attributes (#23070).

Thanks @bmispelon for giving me some advice.

Backport of d0889863de from master.
 2014-07-26 14:53:31 +02:00
Hiroki KIYOHARA 0d8d4fe9b4 [1.7.x] Added test for the #23070 problem 
Backport of e569144910 from master.
 2014-07-26 14:48:25 +02:00
Federico Frenguelli bc3d401b9f [1.7.x] Fixed #22887 -- Added comment for translators on unique_for_date error message 
Backport of 6eed751162 from master.
 2014-07-26 13:56:58 +02:00
David Hoffman 08e8e2137d [1.7.x] Fixed #23097 -- Switched to new octal format in docs 
Backport of e1c85167a3 from master.
 2014-07-26 11:21:16 +02:00
Tim Graham d1c08d4758 [1.7.x] Fixed bad usage of rstrip() that caused test failure. 
If the temporary file name contained a p or y as its last
characters, it would be stripped. refs #23083.

Backport of 57d2b3f2a7 from master
 2014-07-25 15:17:18 -04:00
Tim Graham 4f8a5bd8d0 [1.7.x] Fixed #23083 -- Fixed runserver reloading when deleting a file. 
Thanks Collin Anderson for the report and hirokiky for the fix.

Backport of b8cb5ba708 from master
 2014-07-25 13:25:16 -04:00
Andrew Godwin 3268711417 [1.7.x] Fixed #23085: Better error message for PostGIS 1.5/bad custom fields 2014-07-25 09:50:17 -07:00
Andrew Godwin e01c565b47 [1.7.x] Restore support for reading __latest__ for compatability 2014-07-25 09:44:15 -07:00