mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-16 12:20:46 +00:00
Code Issues 32 Releases Wiki Activity
13,957 Commits 29 Branches 437 Tags
Commit Graph

13957 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tai Lee
23b234a9d9 [1.5.x] Fixed #20354 -- makemessages no longer crashes with UnicodeDecodeError 
Handle the `UnicodeDecodeError` exception, send a warning to `stdout` with the
file name and location, and continue processing other files.
Backport of 99a6f0e77 from master.
 2013-05-07 21:36:51 +02:00
Tim Graham
acd9dc3888 [1.5.x] Fixed #20177 - Corrected docs for django.test.utils.setup_test_environment. 
Thanks vlad.london.uk@ for the report.

Backport of bc02a963db from master
 2013-05-06 13:56:48 -04:00
Tim Graham
1ef423b003 [1.5.x] Fixed #20274 - Added some clarifying section headings in the test docs. 
Backport of e886808994 from master
 2013-05-06 13:46:27 -04:00
Tim Graham
0fc4c405a4 [1.5.x] Fixed #20305 - Added include for polls/static to MANIFEST.in in tutorial. 
Thanks monuszko for the report.

Backport of 86d3079d57 from master
 2013-05-06 06:54:10 -04:00
Florian Apolloner
0b0d98fd4e [1.5.x] Fixed test failures introduced in a5becad9094e5c5403b692b9a7b3a6ffaabf64a3. 
Backport of 780fa48f5fb81b2f0f58de95167abff84a6149aa from master
 2013-05-05 16:14:41 +02:00
Claude Paroz
4f10b35a2e [1.5.x] Fixed #20309 -- admin.py is not automatically created in Django 1.5 2013-05-04 11:36:28 +02:00
Florian Apolloner
4391718f26 [1.5.x] Fixed #19252 -- Added support for wheel packages. 
Backport from master (a5becad9094e5c5403b692b9a7b3a6ffaabf64a3).

Signed-off-by: Jannis Leidel <jannis@leidel.info>
 2013-05-01 13:52:38 +02:00
Claude Paroz
8b345614cd [1.5.x] Updated Transifex links to the Django project 
Translations for the Django framework are now hosted on the
django-core Transifex project, and the django project is only
dedicated to a team-only hub project.
Backport of 8f7276b782 from master.
 2013-04-25 10:38:18 +02:00
Jannis Leidel
240649ef68 [1.5.x] Fixed a rST bug in the README template in the reusable apps docs. 
Backport of db394e6ab2c1d3d53b8b8d691e995d0c3584b944 from master.
 2013-04-24 09:41:30 +02:00
Jannis Leidel
399ceaab96 [1.5.x] Fixed the reusable apps docs to use a rst file extension for the README and follow PEP8 a bit more. 
Backport of 949b4e94588e73067f64b5b6d22e569a105baaf7 from master.
 2013-04-24 09:27:36 +02:00
Thomas Thurman
da89c7bbc0 [1.5.x] Fixed #20307 -- Word repeated in tutorial. 
Replaced "the the" in the tutorial with "the".

Backport of f17aa99 from master.
 2013-04-23 23:15:08 -04:00
Baptiste Mispelon
6bb8df0a98 [1.5.x] Fixed #20270 -- Fixed error in AjaxResponseMixin documentation 
Backport of 73c26f0c95 from master.
 2013-04-22 20:03:21 +02:00
Tim Graham
4376a64524 [1.5.x] Fixed #20285 - Added missing commas in translation docs. 
Thanks cody.j.b.scott@

Backport of 9f7b277d2e from master
 2013-04-18 13:45:27 -04:00
Tim Graham
d8d498347f [1.5.x] Fixed #20286 - Typo in static files docs. 
Thanks bmispelon.

Backport of f71fdf83a8 from master
 2013-04-18 13:42:46 -04:00
Claude Paroz
807264ed8d [1.5.x] Fixed #20266 -- Updated view example in CBV introduction 
Thanks jim at hellolocals.com for the report.
Backport of 58b3a974fc from master.
 2013-04-16 09:00:57 +02:00
Simon Charette
56f6348c50 [1.5.x] Fixed #20262 -- Replaced a reference to the wrong model in the CBV doc. 
Thanks to mossplix for the review and bmispelon for the review.

Backport of b0bbccf from master.
 2013-04-15 16:28:30 -04:00
Simon Charette
19ad7231da [1.5.x] Fixed #20263 -- Corrected wording in the formset documentation. 
Thanks to feraudyh at yahoo.com for the report.

Backport of 1de63cccb1 from master.
 2013-04-15 12:22:51 -04:00
Claude Paroz
9176fa70c1 [1.5.x] Fixed geojson detection with Spatialite 
This is a partial backport of commit eb9430fc4be1. Without this,
geojson support is never detected with Spatialite.
Refs #20252 and #19028.
 2013-04-14 19:08:50 +02:00
Tim Graham
6e3b80239e [1.5.x] Fixed #20247 - Added some missing paths in the tutorial. 
Thanks gsavix for the suggestion and patch.

Backport of aad5661c6c from master.
 2013-04-12 19:25:59 -04:00
Claude Paroz
991ce52bc8 [1.5.x] Fixed #20252 -- Mentionned geojson Spatialite support from 1.5 
Thanks burton449geo at gmail.com for the report.
Backport of d58e985aa from master.
 2013-04-12 21:01:52 +02:00
Claude Paroz
abdcf81843 [1.5.x] Fixed #20237 (again) Allowed binary parameter to assertContains 
Backport of b04fd579d5 from master.
 2013-04-12 20:16:35 +02:00
Tim Graham
8ab5db7a33 [1.5.x] Fixed #20248 - Clarified manage.py vs. django-admin.py 
Backport of 8fc68af9c0 from master
 2013-04-12 06:11:22 -04:00
Baptiste Mispelon
9c49e64b66 [1.5.x] Fixed #20211: Document backwards-incompatible change in BoundField.label_tag 
Also cleaned up label escaping and consolidated the test suite regarding
label_tag.
Backport of ab686022f from master.
 2013-04-12 10:25:44 +02:00
Claude Paroz
991432ee8a [1.5.x] Documented BoundField.label_tag 
Backport of 0f99246b6 from master.
 2013-04-12 10:18:24 +02:00
Tim Graham
709ee83cd3 [1.5.x] Fixed #20243 - Clarified when RelatedManager.remove() exists. 
Backport of 712a792713 from master
 2013-04-11 14:17:19 -04:00
Andrew Badr
93231851f8 [1.5.x] Removed incorrect phrase from DecimalField docs 
Backport of 408da7b457 from master
 2013-04-11 13:39:29 -04:00
Claude Paroz
427b59495e [1.5.x] Fixed #20237 -- Reenabled assertContains with binary parameter 
Thanks Baptiste Mispelon for the review.
Backport of fe01404bb9 from master.
 2013-04-11 10:58:06 +02:00
Tim Graham
82b5e10e61 [1.5.x] Fixed #20204 - Consistent usage of url() in URL dispatcher documentation 
Thanks Baptiste Mispelon for the patch and dave.lampton@ for the suggestion.

Backport of c852d45681 from master.
 2013-04-10 20:41:03 -04:00
Simon Charette
d04e8f8c78 [1.5.x] Fixed #20207 -- Handle ManyToManyField with a unicode name correctly. 
Backport of 216580e034.
 2013-04-05 15:21:59 -04:00
Julien Phalip
a15a3e9148 [1.5.x] Fixed #20169 -- Ensured that the WSGI request's path is correctly based on the SCRIPT_NAME environment parameter or the FORCE_SCRIPT_NAME setting, regardless of whether or not those have a trailing slash. Thanks to bmispelon for the review. 
Backport of 2f81a0ca6543f
 2013-04-01 12:07:58 -07:00
Tim Graham
405d6208e5 [1.5.x] Fixed #8649 - Documented a caveat about dynamically adjusting formsets. 
Backport of 4a1d425cfe from master
 2013-03-31 04:35:48 -04:00
Tim Graham
930cd8eebb [1.5.x] Fixed #9913 - Clarified User.is_authenticated docs. 
Thanks rshea for the draft text.

Backport of ac4d82b94a from master
 2013-03-31 04:01:05 -04:00
Tim Graham
a825b1903d [1.5.x] Fixed #20168 - Generalized a PostgreSQL specific database query in the docs. 
Thanks Russ for the suggestion.

Backport of c119d0f152 from master
 2013-03-31 03:41:44 -04:00
Tim Graham
999817375b [1.5.X] Fixed #19492 - Added a link to the uWSGI/Django tutorial. 
Backport of 91d06ea719 from master
 2013-03-30 16:22:43 -04:00
Tim Graham
ed3dd2759e [1.5.X] Fixed #18277 - Clarified startproject documentation. 
Backport of 33503600b5 from master
 2013-03-30 08:38:28 -04:00
Richard Cornish
29c77c5ed2 [1.5.X] Updated bios of committers 
Backport of 6e67d764ae from master
 2013-03-30 07:49:21 -04:00
Tim Graham
c3779d4214 [1.5.x] Fixed #19897 - Updated static files howto. 
Thanks Jan Murre, Reinout van Rees and Wim Feijen,
plus Remco Wendt for reviewing.

Backport of i6c730da1f from master.
 2013-03-30 07:12:37 -04:00
Tim Graham
1c42a3ec73 [1.5.X] Fixed #19582 - Added a static files tutorial. 
Thanks James Pic.

Backport of c32fc79aa1 from master
 2013-03-30 07:03:33 -04:00
Tim Graham
abaab6ef48 [1.5.x] Fixed #15379 - Added "how to cite Django" to FAQ. 
Thanks Russ and Susan Tan.

Backport of 9916e69bf1 from master
 2013-03-29 16:50:33 -04:00
Nimesh Ghelani
1d620fb957 [1.5.x] Fixed #20150 -- Fixed an error in manager doc example 
Backport of 485c024567 from master
 2013-03-29 15:55:23 -04:00
Maik Hoepfel
28cb46befb [1.5.x] Removed ambiguity regarding LANGUAGES setting 
Backport of a05042fd3a from master
 2013-03-29 08:01:38 -04:00
Gavin Wahl
d1b7bd030b [1.5.x] Fixed spelling errors 
Backport of ec04fd1344 from master
 2013-03-29 08:00:24 -04:00
Tim Graham
149150deb1 [1.5.x] Improved FormView docs in class-based views index. 
Thanks Stefan Berder.

Backport of 738eef0f8b from master
 2013-03-29 07:59:50 -04:00
ferhat elmas
56d4356d8c [1.5.x] Fixed #20146 -- Updated removed_tags example 
Backport of e5d252f5b9 from master.
 2013-03-28 22:45:30 +01:00
Jacob Kaplan-Moss
1cf4968cc5 Bumped version number post-release. 2013-03-28 16:07:32 -05:00
Jacob Kaplan-Moss
2847ae6665 Bump version numbers for 1.5.1. 1.5.1 2013-03-28 15:12:39 -05:00
Jacob Kaplan-Moss
d7eaadb4f8 [1.5.x] Added 1.5.1 release notes. 
Backport of ae5247cb from master.
 2013-03-28 15:07:43 -05:00
Claude Paroz
ebac592a83 Updated translations from Transifex 
Polish, Telugu, Georgian, Azerbaijani, Norwegian Bokmål, Basque,
Dutch, Thai, Spanish (Argentina), Afrikaans.
 2013-03-28 09:22:57 +01:00
Jacob Kaplan-Moss
bec250211b [1.5.x] Correctly restore warning capture after logging tests. 
This is a fix to the wrong behavior that 15c3906eeb introduced.

Backport of 4befef9 from trunk.
 2013-03-27 17:03:12 -05:00
Jacob Kaplan-Moss
9a41045b77 [1.5.x] Fixed logging-related test failure introduced by e79b857. 
Backport of 654d8e9.
 2013-03-27 12:21:26 -05:00