mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-29 12:36:08 +00:00
Code Issues 30 Releases Wiki Activity
12,490 Commits 28 Branches 426 Tags 680 MiB
15fffcc751
Commit Graph

12490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aymeric Augustin
fe43ad5707 Fixed a small formatting error. 2012-04-30 17:50:32 +02:00
Aymeric Augustin
3d842a0a94 Merge branch 'master' of github.com:django/django 2012-04-30 17:50:22 +02:00
Anssi Kääriäinen
4b11762f7d Fixed SortedDict.__copy__() 
Fixed #18175 -- Calling SortedDict.__copy__() resulted in changes to
the original dictionary. The reason was likely related to subclassing
dict.

Thanks to linovia for report and patch.
 2012-04-30 17:19:55 +03:00
Alex Gaynor
aa1aa1ad41 Fix a typo in a comment. 2012-04-30 10:15:36 -04:00
Alex Gaynor
b4b8977814 Merge pull request #26 from kylef/docs-rsync 
docs: It's rsync_project not rysnc_project
 2012-04-30 06:30:43 -07:00
Aymeric Augustin
e4d4cb6130 Simplified date-based generic views. 
Removed a confusing helper function that was confusing -- it used
last_day to store the first day of the next month.
 2012-04-30 14:45:25 +02:00
Anssi Kääriäinen
c09f6ff0a5 Merge pull request #25 from akaariai/ticket_15933_alt 
Made get_indexes() consistent across backends.
 2012-04-30 04:53:22 -07:00
Kyle Fuller
96af691835 docs: It's rsync_project not rysnc_project 2012-04-30 12:52:37 +01:00
Anssi Kääriäinen
a18e43c5bb Made get_indexes() consistent across backends. 
Fixed #15933, #18082 -- the get_indexes() method introspection was
done inconsitently depending on the backend. For example SQLite
included all the columns in the table in the returned dictionary,
while MySQL introspected also multicolumn indexes.

All backends return now consistenly only single-column indexes.

Thanks to andi for the MySQL report, and ikelly for comments on
Oracle's get_indexes() changes.
 2012-04-30 14:30:29 +03:00
Claude Paroz
eba4197c71 Fixed #18240 -- Made admindocs tests pass even when language is not en. 
Thanks miguel.ventura@gmail.com for the report and the patch.
 2012-04-30 09:41:59 +02:00
Alex Gaynor
d5a277ba4d Switch a datastructure internal to the ORM to be a set, instead of a dictionary. 2012-04-29 22:18:30 -04:00
Adrian Holovaty
6ff118cdb9 Fixed #17644 -- Changed Query.alias_map to use namedtuples 
This makes the code easier to understand and may even have a benefit in memory usage (namedtuples instead of dicts). Thanks, lrekucki and akaariai
 2012-04-29 17:50:48 -05:00
Aymeric Augustin
af71ce06ea Minor fixes in the custom template tags docs. 2012-04-29 21:44:31 +02:00
Claude Paroz
3904b74a3f Fixed #18013 -- Use the new 'as' syntax for exceptions. 
Thanks Clueless for the initial patch.
Note that unittest has been purposely left out (external package only used by Python 2.6).
 2012-04-29 20:57:15 +02:00
Claude Paroz
eefb00f301 Fixed #18220 -- Removed the CACHE_BACKEND setting, as per official deprecation timeline. 
Thanks Ramiro Morales for the review.
 2012-04-29 20:47:36 +02:00
Adrian Holovaty
5b644a5464 Moved version code out of __init__.py. 
Moved everything except VERSION and a get_version() stub out of the top-level __init__.py, so that we're not importing all that stuff all the time. And because it's cleaner.
 2012-04-29 13:44:32 -05:00
Adrian Holovaty
e7d99aa0fe Edited docs/releases/1.5.txt 2012-04-29 13:33:54 -05:00
Anssi Kääriäinen
76c3314b6d Removed unused variable from sql/query.py 2012-04-29 21:23:38 +03:00
Aymeric Augustin
cec6bd5a59 Fixed #18023 -- Removed bundled simplejson. 
And started the deprecation path for django.utils.simplejson.

Thanks Alex Ogier, Clueless, and other contributors for their
work on the patch.
 2012-04-29 19:58:00 +02:00
Anssi Kääriäinen
ee0a7c741e Fixed an Oracle-specific test case failure 
Made a test checking ORM-generated query string case-insensitive.
 2012-04-29 19:48:43 +03:00
Anssi Kääriäinen
584e2c0337 Prevent Oracle from changing field.null to True 
Fixed #17957 -- when using Oracle and character fields, the fields
were set null = True to ease the handling of empty strings. This
caused problems when using multiple databases from different vendors,
or when the character field happened to be also a primary key.

The handling was changed so that NOT NULL is not emitted on Oracle
even if field.null = False, and field.null is not touched otherwise.

Thanks to bhuztez for the report, ramiro for triaging & comments,
ikelly for the patch and alex for reviewing.
 2012-04-29 19:25:46 +03:00
Alex Gaynor
e75bd7e51c Merge pull request #22 from aviraldg/test_17967 
Added regression test for #17967.  Thanks to aviraldg for the patch!
 2012-04-29 09:08:12 -07:00
Aviral Dasgupta
0525f6d8bd Fixed some style issues in previous commit. 2012-04-29 21:31:09 +05:30
Aymeric Augustin
a15cfb2e45 Simplified timezones tests with settings_changed. 
All relevant state is now properly reset whenever TIME_ZONE or USE_TZ
are changed in tests.
 2012-04-29 16:03:46 +02:00
Aymeric Augustin
3e8b40f479 Fixed #17992 -- Added a public API for localtime. 
Thanks Bradley Ayers for the report.
 2012-04-29 15:37:23 +02:00
Anssi Kääriäinen
5aa51fa999 Simplified QuerySet field.null handling 
QuerySet had previously some complex logic for dealing with nullable
fields in negated add_filter() calls. It seems the logic is leftover
from a time where the WhereNode wasn't as intelligent in handling
field__in=[] conditions.

Thanks to aaugustin for comments on the patch.
 2012-04-29 16:27:25 +03:00
Aymeric Augustin
9350d1d59c Fixed #17976 -- Made forms.BooleanField pickleable. 
This was a regression in Django 1.4.
Thanks bronger for the report and claudep for the patch.
 2012-04-29 14:25:06 +02:00
Aviral Dasgupta
d12d55ec26 Added regression test for #17967. 2012-04-29 17:26:22 +05:30
Aymeric Augustin
02a5b41db4 Fixed #18224 -- Changed the dev version number. 
Following the move from SVN to git.
 2012-04-29 13:40:10 +02:00
Aymeric Augustin
905bd7fb44 Fixed #13196 -- Formatting in admin changelists. 
Handled values returned by functions more like field values.
In particular, localized dates, times and datetimes properly,
and converted datetimes to the current timezone.
 2012-04-29 11:51:12 +02:00
Aymeric Augustin
7c27d1561e Merge pull request #20 from yumike/fix/pull_request_17_syntax_error 
Fixed template syntax error, introduced in pull request #17
 2012-04-29 00:49:28 -07:00
Mike Yumatov
b1be28554f Fixed template syntax error, introduced in pull request #17 2012-04-29 11:03:12 +04:00
Adrian Holovaty
d20fbf46ba Merge pull request #17 from aviraldg/fix_17967 
Fixed #17967: Hide "Change Password" link in admin if user.has_usable_password is False.
 2012-04-28 22:22:22 -07:00
Aviral Dasgupta
9bea857957 Fixed #17967: Hide "Change Password" link in admin if user.has_usable_password is False. 2012-04-29 07:36:50 +05:30
Adrian Holovaty
97c8992840 Merge pull request #16 from akaariai/ticket_18218 
Made table_names() output sorted.
 2012-04-28 17:19:49 -07:00
Karen Tracey
75743c189d Fixed #18234: Avoided exception on flatpage add 2012-04-28 19:44:14 -04:00
Anssi Kääriäinen
527cce80dc Made table_names() output sorted. 
Fixed #18218 -- previously Django's introspection table_names() and
get_table_list() methods did not sort the output consistently. This
resulted in random order of inspected models.

This commit also removed all external usages of get_table_list().
table_names() should be used instead.

Thanks to claudep for patch and report.
 2012-04-29 02:11:55 +03:00
Adrian Holovaty
c2055ee161 Merge pull request #14 from matthewwithanm/js-i18n-patch-2 
Corrected i18n javascript_catalog Reference Error
 2012-04-28 14:40:07 -07:00
Adrian Holovaty
9362413670 Merge pull request #15 from jasondavies/readme 
Fixed bullet formatting for README.rst.
 2012-04-28 14:05:48 -07:00
Jason Davies
02bed132c2 Fix bullet formatting for README.rst. 2012-04-28 21:20:39 +01:00
Matthew Tretter
97502a96f4 Correct reference error (undefined variable) 2012-04-28 15:32:22 -04:00
Adrian Holovaty
50b0984a8b Merge pull request #2 from notcarl/master 
Changed phone2numeric to use generator expressions instead of lambdas
 2012-04-28 12:11:56 -07:00
Not Carl
6b430b883f Whitespace formatting 2012-04-28 14:58:11 -04:00
Adrian Holovaty
80d32b51b0 Merge pull request #10 from kleinmatic/patch-1 
Updated some antique references in "Is Django stable?"
 2012-04-28 11:19:53 -07:00
Adrian Holovaty
ebcba0129f Merge pull request #9 from t0m/master 
Fixed typo: instanciating -> instantiating in django/views/generic/edit.py
 2012-04-28 11:18:35 -07:00
Adrian Holovaty
2cadd86239 Renamed README to README.rst so that GitHub will give it the proper formatting 2012-04-28 13:17:06 -05:00
Scott Klein
5c3e88060e Updated some antique references in "Is Django stable?" 2012-04-28 15:16:46 -03:00
Tom Terrace
a0d34348dd fix typo: instanciating -> instantiating 2012-04-28 14:18:16 -03:00
Aymeric Augustin
10cade8fac Removed a svn-specific hack from a test. 2012-04-28 15:19:04 +02:00
Aymeric Augustin
b49bc5c990 Removed a svn-specific configuration for Sphinx. 2012-04-28 15:03:16 +02:00