mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-11-18 23:44:22 +00:00
Code Issues 24 Releases Wiki Activity
16,354 Commits 28 Branches 423 Tags 639 MiB
3f19b63f8b
Commit Graph

16354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Beattie
552a90b444 Fixed #20290 -- Allow override_settings to be nested 
Refactored override_settings to store the underlying settings._wrapped
value seen at runtime, not instantiation time.
 2013-06-21 16:57:47 +02:00
Andrew Godwin
cca40703df Prompt about renames rather than doing them automatically 2013-06-21 15:32:15 +01:00
Tim Graham
7314007c5b Fixed #19319 -- Updated example httpd.conf for Apache 2.4 
Thanks colinnkeenan@ for the report.
 2013-06-20 13:34:02 -04:00
Andrew Godwin
92a10f5552 Autodetect field renames. HAHAHA. AHAHAHAHA. YES. 2013-06-20 16:02:43 +01:00
Simon Charette
04628e2016 Fixed #20630 -- Removed maxlength attribute from NumberInput. 
This attribute is only allowed on inputs of type "text", "search", "url",
"tel", "email", or "password".

Thanks to yoyoma for the report and @bmispelon for the review.
 2013-06-20 10:59:41 -04:00
Tim Graham
6ef199a08e Fixed error in last commit. Thanks Simon Charette. 2013-06-20 10:41:29 -04:00
Andrew Godwin
0e8ee50e86 Rename makemigration to makemigrations 2013-06-20 15:27:33 +01:00
Andrew Godwin
47e4b86ddf Autodetect field alters 2013-06-20 15:19:30 +01:00
Andrew Godwin
80bdf68d6b Add AlterField and RenameField operations 2013-06-20 15:12:59 +01:00
Harm Geerts
df4a74d709 Modified tutorial 3 to use RequestContext in place of Context. 2013-06-20 09:58:01 -04:00
Andrew Godwin
6f667999e1 Add operation that renames tables 2013-06-20 14:54:11 +01:00
Baptiste Mispelon
fdbcbb9ebd Fixed #20632 -- Fixed {{ docs_version }} in project template 2013-06-20 15:39:58 +02:00
Russell Keith-Magee
18e79f1425 Fixed #20486 -- Ensure that file_move_safe raises an error if the destination already exists. 
Thanks to kux for the report, and Russ Webber for the patch.
 2013-06-20 18:55:27 +08:00
Alex Gaynor
3671e7e3e0 Merge pull request #1287 from mintchaos/patch-1 
Itty bitty typo fix.
 2013-06-19 16:47:27 -07:00
Christian Metts
c4a0c91459 Itty bitty typo fix. 
"deletes" was missing it's last e.
 2013-06-19 17:45:28 -06:00
Loic Bistuer
7462a78c1b Fixed #20288 -- Fixed inconsistency in the naming of the popup GET parameter. 
Thanks to Keryn Knight for the initial report and reviews,
and to tomask for the original patch.
 2013-06-19 22:16:16 +02:00
Andrew Godwin
73e30e9d3b Better naming, and prompt for NOT NULL field addition 2013-06-19 17:01:48 +01:00
Andrew Godwin
41214eaf18 Autodetect fields, have migrate actually work 2013-06-19 16:41:04 +01:00
Andrew Godwin
f25a385a5e Makemigration command now works 2013-06-19 16:23:52 +01:00
Aymeric Augustin
ffcf24c9ce Removed several unused imports. 2013-06-19 17:18:40 +02:00
Andrew Godwin
ab5cbae9b7 First stab at some migration creation commands 2013-06-19 15:36:22 +01:00
Andrew Godwin
2ae8a8a77d Fix test running with new apps stuff/migrate actually running migrations 2013-06-19 15:36:02 +01:00
Andrew Godwin
9daf81b94e Merge remote-tracking branch 'core/master' into schema-alteration 
Conflicts:
	django/db/models/loading.py
 2013-06-19 12:05:23 +01:00
Aymeric Augustin
d9a43545be Merge pull request #1282 from loic/ticket6903 
Fixed failing test on MySQL since c86a9b6
 2013-06-19 03:04:04 -07:00
Loic Bistuer
7d0c3b9b26 Fixed MySQL failing test introduced by c86a9b6 2013-06-19 16:13:43 +07:00
Baptiste Mispelon
b0b506b933 Fixed broken reference in documentation. 2013-06-19 10:37:24 +02:00
Florian Hahn
2f35c6f10f Fixed #14930 -- values_list() failure on qs ordered by extra column 
Thanks lsaffre for the report and simon29, vicould, and Florian Hahn
for the patch.

Some changes done by committer.
 2013-06-18 23:56:51 +03:00
Aymeric Augustin
9da9b3eb04 Merge pull request #1281 from loic/ticket6903 
Fixed #6903 - Preserved admin changelist filters.
 2013-06-18 13:07:28 -07:00
Loic Bistuer
c86a9b6398 Fixed #6903 - Preserve admin changelist filters after saving or deleting an object 2013-06-19 02:41:36 +07:00
Aymeric Augustin
a01b1ee688 Merge pull request #1280 from erikr/improve-password-reset2 
Fixed #20079 -- Improved security of password reset tokens
 2013-06-18 11:28:21 -07:00
Erik Romijn
aeb1389442 Fixed #20079 -- Improve security of password reset tokens 2013-06-18 20:02:00 +02:00
Erik Romijn
2c4fe761a0 Fixed #20593 -- Allow blank passwords in check_password() and set_password() 2013-06-18 13:32:54 -04:00
Baptiste Mispelon
3128f3d38d Fixed #20618 -- Fixed regression in BoundField.label_tag. 2013-06-18 17:49:53 +02:00
Loic Bistuer
ee77d4b253 Fixed #20199 -- Allow ModelForm fields to override error_messages from model fields 2013-06-18 08:01:17 -04:00
Loic Bistuer
f34cfec0fa Refactored ValidationError to allow persisting error params and error codes as the exception bubbles up 2013-06-18 08:01:17 -04:00
Aymeric Augustin
efe6e16008 Fixed #20615 -- Added trove classifiers for major Python versions. 2013-06-18 13:26:06 +02:00
Baptiste Mispelon
b6f86fbeb1 Added myself to the commiters list. 2013-06-17 12:30:41 +02:00
Baptiste Darthenay
39b245fd76 Fixed #20614 -- Typo in documentation. 2013-06-17 11:35:07 +02:00
Baptiste Mispelon
1b7634a0d0 Fixed #20464 -- Added a total_error_count method on formsets. 
Thanks to frog32 for the report and to Tim Graham for the review.
 2013-06-16 15:49:30 -04:00
Anssi Kääriäinen
aa22cbd51a Fixed #20583 -- ORM always uses setup_joins() for join generation 
There were a couple of places which used Query.join() directly. By
using setup_joins() in these places the code is more DRY, and in
addition there is no need to directly call field.get_joining_columns()
unless the field is the given join_field from get_path_info(). This
makes it easier to make sure a ForeignObject subclass generates joins
correctly in all cases.
 2013-06-16 15:44:52 +03:00
Daniel Lindsley
b3532f7df9 Adjusted the docs to reflect when the checksetup command was added. 2013-06-15 10:14:48 -07:00
Claude Paroz
bf9975b0eb Fixed #20606 -- Fixed 'for' example in template tag docs 
Thanks batisteo for the report.
 2013-06-15 12:02:25 +02:00
Claude Paroz
beb652e069 Worked around Python 3.3 modified exception repr 
Refs #20599.
 2013-06-15 11:14:59 +02:00
Jaap Roes
990f8d92dc Fixed #20599 -- Changed wording of ValueError raised by _load_library 
The _load_library method on BasePasswordHasher turns ImportErrors
into ValueErrors, this masks ImportErrors in the algorithm library.
Changed it to a clearer worded error message that includes
the ImportError string.
 2013-06-15 10:50:55 +02:00
Tim Graham
a1122e14a6 Fixed #20604 - Fixed file example in docs. 
Thanks Chris Lasher for the report.
 2013-06-14 21:28:17 -04:00
Daniel Lindsley
2a6a32047d Added missing docs for the checksetup command. 2013-06-14 16:02:45 -07:00
Aymeric Augustin
c3df866619 Fixed #20603 -- Made the test suite faster. 
By avoiding to run syncdb with the full set of test models.

Thanks Anssi for the idea.
 2013-06-14 23:16:15 +02:00
Marc Tamlyn
f656757888 Merge pull request #1271 from batisteo/ticket-20565 
Fixed #20565 -- Added template examples for GCBV.
 2013-06-14 07:40:00 -07:00
Marc Tamlyn
3873725861 Merge pull request #1272 from chicheng/addition-http-status-codes 
Fixed #20598 -- Add new HTTP status codes defined in rfc6585
 2013-06-14 07:39:13 -07:00
Marc Tamlyn
46789e76c6 Fixed #20548 -- Removed all PendingDeprecationWarnings from django test suite 2013-06-14 15:37:39 +01:00