mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-25 10:35:48 +00:00
Code Issues 25 Releases Wiki Activity
11,364 Commits 28 Branches 426 Tags 667 MiB
cd46863043
Commit Graph

4114 Commits

Author SHA1 Message Date
Aymeric Augustin
cd46863043 Added missing bits of r17352. Refs #17513. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17353 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-07 21:42:37 +00:00
Aymeric Augustin
e3a7bfccbb Fixed #9655 -- Prevented the urlize template filter from double-quoting URLs. Thanks Claude Paroz for writing the tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17347 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-07 18:15:28 +00:00
Aymeric Augustin
c3697a091b Fixed #10756 -- Error in the formats accepted by PLNIPField. Thanks remik for the report, michalm for the patch and claudep for the review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17346 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-07 11:17:44 +00:00
Ramiro Morales
33f839b252 Moved misplaced documentation warning note about internal QuerySet query atribute. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17342 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-06 17:15:15 +00:00
Ramiro Morales
8312b85c97 Added support for savepoints to the MySQL DB backend. 
MySQL provides the savepoint functionality starting with version 5.0.3
when using the MyISAM storage engine.

Thanks lamby for the report and patch.

Fixes #15507.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17341 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-05 00:45:31 +00:00
Carl Meyer
bc63ba700a Fixed #17503 -- A destination directory passed to startproject or startapp as optional second argument is now reused as the project/app directory, rather than a new project/app directory created within it. Refs #17042. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17340 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-04 23:55:34 +00:00
Carl Meyer
8e9043bccb Clarified deployment docs to avoid giving users the impression that staticfiles should be used to actually serve files in production. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17338 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-04 18:08:13 +00:00
Aymeric Augustin
8af9084495 Fixed #17490 -- Added a trailing comma in INSTALLED_APPS, to avoid unexpected string concatenation when adding another app. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17324 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-02 11:19:06 +00:00
Timo Graham
068dcbddb9 Fixed #11986 - Added sudo to Mac OS permissions note in tutorial. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17318 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-31 15:34:49 +00:00
Timo Graham
72793766a7 Fixed #640 - Documented that changing order_with_respect_to requires a schema change; thanks fcurella and poirier for the draft patches. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17316 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-31 15:30:22 +00:00
Timo Graham
060783d52d Fixed #702 - Documented that ManyToMany fields can't be in unique_together; thanks poirier for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17314 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-31 00:43:11 +00:00
Adrian Holovaty
9fe578c212 Added a bit to the 1.4 release notes about the new SECURE_PROXY_SSL_HEADER setting 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17313 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 21:13:53 +00:00
Adrian Holovaty
d4f11eb776 Fixed incorrect 'setting::' prefix in settings.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17312 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 21:13:08 +00:00
Adrian Holovaty
67f7756000 Edited release-process.txt changes from [17300] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17310 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 20:39:08 +00:00
Adrian Holovaty
937213c2c3 Edited csrf.txt changes from [17299] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17309 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 20:36:54 +00:00
Adrian Holovaty
ffb0519d44 Edited testing.txt changes from [17289] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17307 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 20:34:07 +00:00
Adrian Holovaty
32ee74f89e Edited testing.txt changes from [17283] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17306 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 20:29:27 +00:00
Adrian Holovaty
103890561b Moved 'User-requested password resets' docs from [17266] from auth docs to admin docs 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17305 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 20:23:26 +00:00
Adrian Holovaty
f2dcca6631 Edited docs/releases/1.4.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17304 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 19:18:03 +00:00
Adrian Holovaty
de697769b7 Edited doc changes from [17246] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17303 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 18:14:31 +00:00
Adrian Holovaty
d3ef13044e Edited doc changes from [17244] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17302 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 18:01:34 +00:00
Timo Graham
afb21094a9 Fixed #17068 - Documented that documentation fixes will be more freely backported. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17300 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 15:30:51 +00:00
Aymeric Augustin
39201d8fe5 Fixed #16704 -- Documented how to insert the CSRF token outside of Django's own template engine. Thanks paulcwatts and bpeschier for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17299 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 14:55:44 +00:00
Timo Graham
ca984aa50a Fixed #17334 - Documented the commit message style for backports; thanks krzysiumed for the draft patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17294 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 12:52:49 +00:00
Timo Graham
067352ec02 Fixed #17470 - Broken links in 0.95/0.96 release notes; thanks fastinetserver for the report; aaugustin for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17290 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 12:21:40 +00:00
Julien Phalip
0bf2d33770 Added the ability to specify multiple ports available for the LiveServerTestCase WSGI server. This allows multiple processes to run the tests simultaneously and is particularly useful in a continuous integration context. Many thanks to Aymeric Augustin for the suggestions and feedback. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17289 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-29 20:22:13 +00:00
Julien Phalip
ec07a30e82 Indicated the exact version that is required to use the "WebDriverWait" example in the testing doc. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17285 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-29 07:28:21 +00:00
Julien Phalip
a343a84ce6 Added the wait_until() and wait_loaded_tag() methods to AdminSeleniumWebDriverTestCase to prevent some concurrency issues with in-memory SQLite database access in the admin Selenium tests. Thanks to Florian Apolloner, Anssi Kääriäinen and Aymeric Augustin for their help debugging this problem. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17283 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-28 22:20:30 +00:00
Aymeric Augustin
4403ce10b7 Removed a redundant paragraph from the templates builtins doc. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17272 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-24 20:48:19 +00:00
Aymeric Augustin
4c445fdfaa Fixed #17110 -- Mentionned that the {% filter %} tag doesn't support the 'safe' and 'escape' filters. Thanks benspaulding. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17271 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-24 20:45:58 +00:00
Timo Graham
fe876f0119 Fixed #17442 - Broken link in refs/templates/builtins.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17269 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-24 11:58:49 +00:00
Luke Plant
1c16907199 Added a password reset link to default admin login page if a password reset URL is available. 
You no longer have to override the admin login page just to get that link to
appear!

Also provided much better docs for how to plug in the provided password
reset mechanism with minimum effort.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17266 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-24 00:14:45 +00:00
Gabriel Hurley
14ba0df3d0 Cleanup of typos, links, etc. in timezone docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17265 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-23 19:18:44 +00:00
Jannis Leidel
6fcbe90954 Minor fixes to the release notes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17264 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-23 19:13:10 +00:00
Gabriel Hurley
27f5fefc54 Fixed #17454 -- corrected year in release notes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17263 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-23 18:46:29 +00:00
Jannis Leidel
2a9ae71780 Fixed various links in the docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17262 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-23 12:19:05 +00:00
Paul McMillan
2d1a681f77 Added password hashing improvements to 1.4 alpha 1 release notes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17258 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-23 05:00:51 +00:00
James Bennett
0e29e48c05 Bump to 1.4 alpha 1. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17255 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-23 04:00:26 +00:00
Paul McMillan
dce820ff70 Renovated password hashing. Many thanks to Justine Tunney for help with the initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17253 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-23 03:46:06 +00:00
Gabriel Hurley
a976159db0 Corrections and improvements to the 1.4 release notes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17252 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-23 01:49:32 +00:00
Jannis Leidel
a9a0f0b03f Fixed #17042 -- Extended startproject and startapp management commands to better handle custom app and project templates. Many thanks to Preston Holmes for his initial patch and Alex Gaynor, Carl Meyer, Donald Stufft, Jacob Kaplan-Moss and Julien Phalip for code reviewing. 
* Added ability to pass the project or app directory path as the second argument
* Added ``--template`` option for specifying custom project and app templates
* Cleaned up admin_scripts tests a little while I was there

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17246 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-22 22:38:02 +00:00
Ramiro Morales
287565779d Added support for modifying the effect of `DISTINCT` clauses so they 
only consider some fields (PostgreSQL only).

For this, the ``distinct()`` QuerySet method now accepts an optional
list of model fields names and generates ``DISTINCT ON`` clauses on
these cases. Thanks Jeffrey Gelens and Anssi Kääriäinen for their work.

Fixes #6422.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-22 20:42:40 +00:00
Jacob Kaplan-Moss
2f18d8b4b0 Added 1.4 alpha release notes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-22 20:18:54 +00:00
Julien Phalip
2f02a05ffb Fixed #2879 -- Added support for the integration with Selenium and other in-browser testing frameworks. Also added the first Selenium tests for contrib.admin. Many thanks to everyone for their contributions and feedback: Mikeal Rogers, Dirk Datzert, mir, Simon G., Almad, Russell Keith-Magee, Denis Golomazov, devin, robertrv, andrewbadr, Idan Gazit, voidspace, Tom Christie, hjwp2, Adam Nelson, Jannis Leidel, Anssi Kääriäinen, Preston Holmes, Bruno Renié and Jacob Kaplan-Moss. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17241 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-22 08:33:58 +00:00
Jannis Leidel
39109b0e44 Fixed Sphinx warning. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17239 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-21 11:05:43 +00:00
Aymeric Augustin
295fd50752 Fixed a typo in the model fields reference. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17238 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-20 17:03:13 +00:00
Julien Phalip
355f7fc564 Fixed #17163 -- Added the NamedUrlWizardView.get_step_url() method. Thanks, Bradley Ayers. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17235 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-19 13:36:32 +00:00
Julien Phalip
1ef6841cad Fixed #17162 -- Removed the useless WizardView.get_wizard_name() method. Thanks, Bradley Ayers and Stephan Jaekel. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17234 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-19 13:13:41 +00:00
Julien Phalip
ed56e2c4a8 Fixed #17151 -- Renamed wizard_prev_step to the clearer wizard_goto_step in NamedUrlWizardView. Thanks, Bradley Ayers and Stephan Jaekel. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17233 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-19 12:58:18 +00:00
Julien Phalip
3e790ae632 Fixed #17148 -- Fixed the signature of WizardView.get_context_data() to play nicer with mixin inheritance. Thanks, Bradley Ayers and Stephan Jaekel. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17231 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-19 12:11:12 +00:00