p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
14,593 Commits 28 Branches 411 Tags 641 MiB
Commit Graph

14593 Commits

Author SHA1 Message Date
Julien Phalip ffc8e2e0ae Fixes #20162 -- Added a note in the documentation for `static.serve()` about the need for updating the system's map files when incorrect content types are returned. Many thanks to Simon Charette and Claude Paroz for their feedback. 2013-03-30 16:23:27 -07:00
Tim Graham 91d06ea719 Fixed #19492 - Added a link to the uWSGI/Django tutorial. 2013-03-30 16:21:59 -04:00
Claude Paroz 5c55e0fc98 Removed site cache clearing in TestCase._fixture_setup 
The test suite doesn't seem to suffer from this removal. Tests
should probably take care themselves to clear caches if they
depend on it.
 2013-03-30 20:17:31 +01:00
Tim Graham 33503600b5 Fixed #18277 - Clarified startproject documentation. 2013-03-30 08:36:31 -04:00
Tim Graham 72b1522a2f Merge pull request #963 from richardcornish/master 
Updated bios of committers
 2013-03-30 04:48:31 -07:00
Alisson 80b658f5aa Remove unnecessary if conditions 
if obj it None, it's None, there's no need to check it
 2013-03-30 12:22:28 +01:00
matiasb 86aaff75d0 Fixed #20059 -- Updated humanize tests to force 'en' language setting. 2013-03-30 12:19:39 +01:00
Baptiste Mispelon 5080311998 Fixed #20130 -- Regression in {% cache %} template tag. 2013-03-30 12:13:08 +01:00
Christoph Sieghart 465b01f065 Fixed #19998 -- Fixed --ignorenonexistent support for XML based fixtures. 2013-03-30 11:59:50 +01:00
Tim Graham 6c730da1f6 Fixed #19897 - Updated static files howto. 
Thanks Jan Murre, Reinout van Rees and Wim Feijen,
plus Remco Wendt for reviewing.
 2013-03-29 19:15:19 -04:00
Tim Graham c32fc79aa1 Fixed #19582 - Added a static files tutorial. 
Thanks James Pic.
 2013-03-29 19:03:53 -04:00
Tim Graham 9916e69bf1 Fixed #15379 - Added "how to cite Django" to FAQ. 
Thanks Russ and Susan Tan.
 2013-03-29 16:48:07 -04:00
Tim Graham ce11dde7c0 Merge pull request #977 from nims11/ticket_20150 
Fixed #20150 -- Fixed an error in manager doc example
 2013-03-29 12:54:41 -07:00
Carl Meyer 0524ad3fad Fixed setup.py overlaid-install warning. 
Before this change, if you had a global Django installation in /usr/local/, you
might get a spurious warning when installing Django within a virtualenv.

Thanks epicserve for the report and debugging help.
 2013-03-29 13:49:37 -06:00
Nimesh Ghelani 485c024567 Fixed #20150 -- Fixed an error in manager doc example 2013-03-30 01:01:56 +05:30
Baptiste Mispelon 391ec5a085 Fixed #20160 -- Erronous reference to `module_name` in admin doc. 
Ref #19689.
 2013-03-29 14:31:29 -04:00
Simon Charette 6293eaa062 Fixed #20159 -- Mispelled attribute in multi-db documentation example. 
Thanks to sane4ka.sh at gmail for the report!
 2013-03-29 14:16:30 -04:00
Claude Paroz 83f182da66 Fixed #14540 -- Added Porto-Rico specific formats 
Thanks rosarior for the report and the file proposal.
 2013-03-29 16:55:13 +01:00
Claude Paroz 24e710e659 Merge pull request #975 from bmispelon/ticket-20158 
Fix #20158: invalid code in queryset_pickle test models.
 2013-03-29 05:52:21 -07:00
Baptiste Mispelon a40746b1cb Fix #20158: invalid code in queryset_pickle test models. 2013-03-29 13:32:21 +01:00
Tim Graham 738eef0f8b Improved FormView docs in class-based views index. 
Thanks Stefan Berder.
 2013-03-29 07:57:07 -04:00
Tim Graham 95d504f414 Merge pull request #956 from maikhoepfel/master 
Removed ambiguity regarding LANGUAGES setting
 2013-03-29 04:44:58 -07:00
ferhat elmas e5d252f5b9 Fixed #20146 -- Updated removed_tags example 2013-03-28 22:44:26 +01:00
Carl Meyer d85d393500 Minor updates to 'How is Django Formed.' 2013-03-28 15:31:05 -06:00
Jacob Kaplan-Moss e301ea3efb Updated the release document after actually doing a release (!). 2013-03-28 16:10:11 -05:00
Jacob Kaplan-Moss ae5247cb51 Added 1.5.1 release notes. 2013-03-28 15:03:19 -05:00
Claude Paroz 86b1c31689 Fixed #19954 -- Fixed MySQL _last_executed decoding 
Queries can contain binary data undecodable with utf-8. In this
case, using the 'replace' errors mode when decoding seems like
an acceptable representation of the query.
Thanks Marcel Ryser for the report.
 2013-03-28 20:08:37 +01:00
Alex Gaynor ef348b5298 Merge pull request #972 from fusionbox/spelling 
Fixed spelling errors
 2013-03-28 10:18:58 -07:00
Gavin Wahl ec04fd1344 Fixed spelling errors 2013-03-28 11:16:53 -06:00
Jacob Kaplan-Moss e081601f6e Merge pull request #971 from fusionbox/consistant_typo 
Fixed spelling of "consistent" in admin/options.py
 2013-03-28 08:29:05 -07:00
Rocky Meza 26ad3abadf Fixed spelling of "consistent" in admin/options.py 2013-03-28 09:10:13 -06:00
Claude Paroz 244e765a94 Updated translation templates 2013-03-28 10:06:11 +01:00
Claude Paroz 0a22f7aad2 Added Burmese language 
Thanks to Yhal Htet Aung for the translation work.
 2013-03-28 10:01:30 +01:00
Claude Paroz ab76467d54 Added Ossetic language 
Thanks to Xwybylty Soslan for the translation work.
 2013-03-28 09:54:16 +01:00
Claude Paroz 65ad1b1f85 Replaced escaped by real characters in LANG_INFO structure 2013-03-28 09:46:40 +01:00
Claude Paroz c5084e7557 Updated translations from Transifex 
Polish, Telugu, Georgian, Azerbaijani, Norwegian Bokmål, Basque,
Dutch, Thai, Spanish (Argentina), Afrikaans.
 2013-03-28 09:24:07 +01:00
Jacob Kaplan-Moss 4befef91f1 Correctly restore warning capture after logging tests. 
This is a fix to the wrong behavior that 15c3906eeb introduced.
 2013-03-27 17:01:11 -05:00
Andreas 35cab0f8e4 Fixed #20016: worked around Jython not having a buffer. 2013-03-27 13:39:52 -05:00
Jacob Kaplan-Moss 15c3906eeb Merge pull request #968 from jacobian/fix-warning-log-regression 
Fixed logging-related test failure introduced by e79b857.
 2013-03-27 10:20:00 -07:00
Jacob Kaplan-Moss 654d8e96ae Fixed logging-related test failure introduced by e79b857. 2013-03-27 12:05:31 -05:00
Jacob Kaplan-Moss 95b88fd4ec Merge pull request #967 from jacobian/ticket/20078-admin-user-password-filtering 
Fixed #20078: don't allow filtering on password in the user admin.
 2013-03-27 09:48:50 -07:00
Jacob Kaplan-Moss 9e462f8101 Fixed #20078: don't allow filtering on password in the user admin. 2013-03-27 11:24:36 -05:00
Jacob Kaplan-Moss f6989e559c Merge remote-tracking branch 'ptone/18985-fix' 2013-03-27 10:34:28 -05:00
Richard Cornish 6e67d764ae Updated bios of committers 2013-03-27 00:59:05 -05:00
Claude Paroz 34a50e99e8 Added regression test for custom SQL containing percents 
Refs #3485.
 2013-03-26 23:19:32 +01:00
Donald Stufft f2a0be6151 Fix a missing " character in the password documentation 2013-03-26 15:26:20 -04:00
Donald Stufft c1d4af6884 Merge pull request #958 from dstufft/prehash-bcrypt 
Fixed #20138 -- Added BCryptSHA256PasswordHasher
 2013-03-26 10:31:34 -07:00
Donald Stufft 705591508d Add Donald Stufft to the AUTHORS file 2013-03-26 13:27:03 -04:00
Donald Stufft 25f2acfed0 Fixed #20138 -- Added BCryptSHA256PasswordHasher 
BCryptSHA256PasswordHasher pre-hashes the users password using
SHA256 to prevent the 72 byte truncation inherient in the BCrypt
algorithm.
 2013-03-26 13:26:57 -04:00
Anssi Kääriäinen e17fa9e877 Fixed #20091 -- Oracle null promotion for empty strings 2013-03-26 14:19:54 +02:00