07290211ff
Pulled core Django translations from Transifex
...
Forward port 760f076786
2016-08-01 19:46:47 +02:00
971120778a
Fixed #26945 -- Ensured that i18n_patterns returns a list
2016-07-24 17:17:00 +02:00
490107f14d
Added Upper/Lower Sorbian translations
2016-06-29 21:11:30 +02:00
e8cbf53c33
Added Upper/Lower Sorbian languages
2016-06-29 21:11:30 +02:00
96f97691ad
Fixed broken links in docs and comments.
2016-06-15 21:20:23 -04:00
c3495bb984
Fixed #12666 -- Added EMAIL_USE_LOCALTIME setting.
...
When EMAIL_USE_LOCALTIME=True, send emails with a Date header
in the local time zone.
2016-06-04 09:55:50 -04:00
5ccee815ff
Updated translation catalogs
2016-05-17 23:21:35 +02:00
9baf692a58
Fixed #26601 -- Improved middleware per DEP 0005.
...
Thanks Tim Graham for polishing the patch, updating the tests, and
writing documentation. Thanks Carl Meyer for shepherding the DEP.
2016-05-17 07:22:22 -04:00
929684d6ee
Fixed #21231 -- Enforced a max size for GET/POST values read into memory.
...
Thanks Tom Christie for review.
2016-05-12 10:17:52 -04:00
8dcf352c03
Pulled translations from Transifex
2016-04-30 14:27:07 +02:00
669c29c8f4
Fixed #26427 -- Ensured deleted setting doesn't appear in dir(settings)
2016-04-23 16:01:16 +02:00
5c6d397956
Refs #26484 -- Avoided masking useful exceptions in manage.py's ImportError.
2016-04-13 13:28:54 -04:00
df8d8d4292
Fixed E128 flake8 warnings in django/.
2016-04-08 09:51:06 -04:00
724a279849
Raised a more helpful ImportError message in manage.py template.
2016-03-29 07:35:27 -04:00
b4250ea04a
Fixed #26033 -- Added Argon2 password hasher.
2016-03-08 11:22:18 -05:00
839a955d08
Fixed #25933 -- Allowed an unprefixed default language in i18n_patterns().
2016-03-08 08:14:10 -05:00
47b5a6a43c
Fixed #26187 -- Removed weak password hashers from PASSWORD_HASHERS.
2016-02-22 18:59:23 -05:00
dcee1dfc79
Fixed #12405 -- Added LOGOUT_REDIRECT_URL setting.
...
After a user logs out via auth.views.logout(), they're redirected
to LOGOUT_REDIRECT_URL if no `next_page` argument is provided.
2016-02-04 10:35:37 -05:00
60586dd737
Fixed #26125 -- Fixed E731 flake warnings.
2016-01-25 14:23:43 -05:00
abc0777b63
Fixed #25968 -- Changed project/app templates to use a "py-tpl" suffix.
...
Debian packages unconditionally byte-compile .py files on installation and
do not silence errors by design. Therefore, we need a way of shipping these
invalid .py files without a .py extension but ensuring that when we
template them, they end up as .py.
We don't special-case .py files so that the all the TemplateCommand
command-line options (eg. extra_files and extensions) still work entirely
as expected and it may even be useful for other formats too.
2016-01-25 12:39:06 -05:00
a1fba4e843
Corrected English name of nb language.
2016-01-20 17:27:58 -05:00
16411b8400
Fixed #26013 -- Moved django.core.urlresolvers to django.urls.
...
Thanks to Tim Graham for the review.
2015-12-31 14:21:29 -05:00
f14ab700c3
Updated translations from Transifex
...
Forward port of 59f3590ca7
2015-12-31 15:53:02 +01:00
10427646b8
Fixed #25909 -- Added unicode_literals import to apps.py generated by startapp.
2015-12-12 09:34:01 -05:00
b0ad5081d5
Fixed #25717 -- Corrected Slovak local name
2015-12-12 09:18:06 +01:00
59f861fcb4
Fixed #25918 -- Removed unused LOGOUT_URL setting.
...
Thanks hop for the report and patch.
2015-12-11 12:43:02 -05:00
179fbab7e0
Fixed #25711 -- Updated the project template's include() example.
...
Referencing URLs by dotted path is a stronger convention than
importing the URLs.
2015-12-09 11:27:16 -05:00
0c37bae189
Pulled core Django translations from Transifex
...
Forward port of 3039d76bd6
2015-12-01 20:36:53 +01:00
8bc0266b3f
Added Scottish Gaelic as new available language
...
Refs #25815 . Thanks gunchleoc <fios@foramnagaidhlog.net> for the Scottish Gaelic
formats.py.
2015-11-27 09:55:11 +01:00
ff0dac9666
Added Colombian Spanish as new available language
...
Refs #25815 .
2015-11-27 09:55:11 +01:00
f233aa3ff9
Updated translation catalogs
...
Forward port of f717cb2ab4
2015-10-09 18:02:47 +02:00
7ce6b10e94
Fixed #25525 -- Added instructions about importing include() in urls.py
2015-10-07 17:02:34 -04:00
2a20ebe6a5
Removed deprecated TEMPLATE_* settings per deprecation timeline.
2015-09-23 19:31:11 -04:00
849037af36
Refs #23957 -- Required session verification per deprecation timeline.
2015-09-23 19:31:10 -04:00
785cc71d5b
Refs #22384 -- Removed the ability to reverse URLs by dotted path per deprecation timeline.
2015-09-23 19:31:09 -04:00
d79122f40b
Refs #23276 -- Removed passing views as strings to url() per deprecation timeline.
2015-09-23 19:31:09 -04:00
a25d3ce007
Refs #22218 -- Removed conf.urls.patterns() per deprecation timeline.
2015-09-23 19:31:09 -04:00
04ee4059d7
Refs #24022 -- Removed the ssi tag per deprecation timeline.
2015-09-23 19:31:09 -04:00
862de0b254
Fixed #25356 -- Removed default_app_config from startapp template.
...
Also discouraged its use outside the intended use case.
2015-09-07 15:23:11 -04:00
ab26b65b2f
Fixed #25334 -- Provided a way to allow cross-origin unsafe requests over HTTPS.
...
Added the CSRF_TRUSTED_ORIGINS setting which contains a list of other
domains that are included during the CSRF Referer header verification
for secure (HTTPS) requests.
2015-09-05 09:19:57 -04:00
5153a3bfdc
Fixed #25331 -- Removed trailing blank lines in docstrings.
2015-08-31 17:37:21 -04:00
9c40f01a66
Refs #24121 -- Added repr() to LazySettings, Settings, and UserSettingsHolder.
2015-08-31 16:08:30 -04:00
64982cc2fb
Updated Wikipedia links to use https
2015-08-08 12:02:32 +02:00
4dcfbd7923
Fixed #25211 -- Added HttpRequest.get_port() and USE_X_FORWARDED_PORT setting.
2015-08-04 09:50:57 -04:00
14c1fd0730
Fixed #25194 -- Fixed Korean YEAR_MONTH_FORMAT and MONTH_DAY_FORMAT.
...
'F' translates a month to a Korean name with a month number so,
for example, 'F 월' becomes '10 월월' for October. This should
be either 'F' or 'n월', and I followed conventions in other
languages like Japanese and Chinese.
2015-08-03 07:37:54 -04:00
1fed8dd715
Fixed #25120 -- Deprecated egg template loader.
2015-07-16 09:32:42 -04:00
7da3923ba0
Sorted imports in __init__.py files.
2015-06-27 11:53:33 -04:00
aaacaeb096
Renamed RemovedInDjangoXYWarnings for new roadmap.
...
Forwardport of ae1d663b79
2015-06-24 16:08:20 -04:00
e6dd7f995a
Fixed #24971 -- Made startapp generate an apps.py
2015-06-16 07:08:04 -04:00
5d42890821
Fixed #24950 -- Added unicode_literals to models.py in app template
...
Thanks Tim Graham for the patch
2015-06-11 16:38:12 +02:00
1e82094f1b
Fixed #21927 -- Made application and instance namespaces more distinct.
...
Made URL application namespaces be set in the included URLconf and
instance namespaces in the call to include(). Deprecated other ways
to set application and instance namespaces.
2015-06-08 15:12:20 -04:00
8b1f39a727
Fixed #24796 -- Added a hint on placement of SecurityMiddleware in MIDDLEWARE_CLASSES.
...
Also moved it in the project template.
2015-06-08 12:32:38 -04:00
1daae25bdc
Fixed #16860 -- Added password validation to django.contrib.auth.
2015-06-07 19:31:20 +02:00
6aed5cfc6f
Updated translations from Transifex
...
Updates for languages: Indonesian, Belarusian, Persian, and Dutch.
Forward port of cb370f8510
2015-04-30 14:29:08 +02:00
0b5abb0321
Fixed #24635 -- Updated deprecated urls.py examples in default project template.
2015-04-14 12:48:17 -04:00
7dad681e2e
Fetched updated core translations from Transifex
...
Forward port of d1b206daf8
2015-04-01 19:51:49 +02:00
465edf2bb2
Updated translation catalogs
...
Strings are frozen in anticipation of the Django 1.8 release.
Forward port of 1cd2584c98
2015-03-18 09:31:00 +01:00
d8de9a64d7
Fixed #24478 -- Added NUMBER_GROUPING value for Icelandic
2015-03-13 16:56:03 +01:00
668d53cd12
Fixed #21495 -- Added settings.CSRF_HEADER_NAME
2015-03-05 15:03:40 -05:00
dda2a3cf4c
Added formats for the Azerbaijani locale.
2015-02-23 07:37:13 -05:00
15b711b5ee
Deprecated TEMPLATE_DEBUG setting.
2015-02-15 20:47:04 +01:00
27eeb64a96
Fixed #17716 -- Prevented include('...', app_name='...') without a namespace.
2015-02-12 08:07:58 -05:00
0ed7d15563
Sorted imports with isort; refs #23860 .
2015-02-06 08:16:28 -05:00
9ec8aa5e5d
Fixed #24149 -- Normalized tuple settings to lists.
2015-02-03 14:59:45 -05:00
f1ff9407c9
Fixed Persian locale FIRST_DAY_OF_WEEK & DECIMAL/THOUSAND_SEPARATORs.
...
Reference: http://lh.2xlibre.net/locale/fa_IR/
2015-01-29 12:55:20 -05:00
0f3ea8c0bc
Updated Azerbaijani language name.
2015-01-28 06:48:09 -05:00
40f122c8f5
Added contrib.postgres translation catalog
...
Forward port of 8c8a1a084
2015-01-18 21:02:54 +01:00
f0a1df0b01
Removed deprecated Chinese language codes; refs #18149 .
2015-01-17 11:23:43 -05:00
41f0d3d3bc
Removed FastCGI support per deprecation timeline; refs #20766 .
2015-01-17 08:32:31 -05:00
53e1423eda
Updated en translation catalogs
...
Forward port of 666c12e52
2015-01-17 11:19:37 +01:00
26a92619f6
Fixed #24124 -- Changed context_processors in the default settings.py
2015-01-12 13:17:44 -05:00
74f02557e0
Fixed #23967 -- Added formats for Greek
2015-01-10 11:10:26 -05:00
92e8f1f302
Moved context_processors from django.core to django.template.
2014-12-28 17:00:07 +01:00
1acfd624d6
Added initial support for loading template engines.
2014-12-28 16:08:31 +01:00
9495989265
Fixed timesince translations for Korean
...
Refs #23989 .
Forward port of eb632bfba
2014-12-14 16:48:42 +01:00
b6ea059b4a
Fixed #23957 -- Started deprecation toward requiring session verification.
...
Thanks Carl Meyer for review.
2014-12-05 07:37:34 -05:00
4c123d0f79
Fixed #23899 -- Added 'Generated by Django X.Y' to startproject template.
2014-11-25 09:41:56 -05:00
4b9eb7602d
Normalized check that ALLOWED_INCLUDE_ROOTS is a tuple.
2014-11-17 22:49:01 +01:00
eab3dc195e
Updated FIRST_DAY_OF_WEEK for Ukrainian to Monday.
2014-10-30 09:19:32 -04:00
d6a15026c4
Updated translations from Transifex
...
Forward port of e9c8aefbce
2014-09-30 20:55:50 +02:00
caf5cd7ba7
Fixed #23436 -- Made BASE_DIR absolute in settings template.
...
This ensures consistency between Python 3.4+ and earlier versions.
Thanks Harry Percival for the report.
2014-09-28 13:33:29 +02:00
903d144d85
Fixed #23532 -- Fixed Macedonian locale date formats
2014-09-22 18:04:57 +02:00
fc2b8ddcc8
Fixed #23495 -- Stopped swallowing real settings import error
...
Thanks papaloizouc for the report.
2014-09-17 17:15:44 +02:00
22bfc45146
Fixed #23466 -- Removed seconds from all locale time output formats.
2014-09-13 13:00:42 -04:00
5472d18e31
Fixed #23461 -- Added EMAIL_TIMEOUT setting
2014-09-13 09:33:21 -04:00
52ef6a4726
Fixed #17101 -- Integrated django-secure and added check --deploy option
...
Thanks Carl Meyer for django-secure and for reviewing.
Thanks also to Zach Borboa, Erik Romijn, Collin Anderson, and
Jorge Carleitao for reviews.
2014-09-12 15:05:23 -04:00
00535e8e6b
Fixed #20743 -- Added support for keyfile/certfile in SMTP connections.
...
Thanks jwmayfield, serg.partizan, and Wojciech Banaś for work on the patch.
2014-09-10 11:14:20 -04:00
1ac32e76ac
Fixed #23417 -- Completed locale formats for zh_CN, zh_Hans, zh_Hant and zh_TW.
2014-09-10 09:07:07 -04:00
df7187d795
Fixed #23368 -- Overhauled the Welsh formats.py file.
...
The only debatable thing here is setting FIRST_DAY_OF_WEEK to 1.
The only examples of calendars I can find in Welsh start on Monday,
for example, the calendar on S4C (the only all Welsh TV station).
http://www.s4c.co.uk/clic/c_clicschedule.shtml
2014-09-09 20:48:33 -04:00
885ff6845e
Revert "Fixed #23384 -- Allowed overriding part of a dictionary-type setting"
...
This reverts commit 66757fee7e#22734 .
2014-09-05 20:06:02 +02:00
1101467ce0
Limited lines to 119 characters in django/
...
refs #23395 .
2014-09-05 09:22:16 -04:00
b3752d410a
Fixed comments in en_GB and en_AU formats.py files.
...
Changed comments in en_GB and en_AU formats files replacing 'pm' with
'p.m.' to match what is actually output.
2014-09-02 13:34:52 -04:00
be8ccc2648
Fixed #23371 -- Changed en_GB first day of the week to Monday.
2014-09-01 08:39:21 -04:00
66757fee7e
Fixed #23384 -- Allowed overriding part of a dictionary-type setting
...
This change is needed for upcoming changes where settings might be
grouped in a parent dictionary.
Thanks Tim Graham for the review.
2014-08-30 12:37:10 +02:00
1c660d0de2
Added new supported languages
...
Forward port of 46393980cf
2014-08-23 14:13:28 +02:00
efa67b897b
Fetched translations from Transifex
...
Forward port of 49280a73ea
2014-08-20 10:22:41 +02:00
a9fd740d22
Fixed #23276 -- Deprecated passing views as strings to url().
2014-08-12 13:15:40 -04:00
6eed751162
Fixed #22887 -- Added comment for translators on unique_for_date error message
2014-07-26 13:55:20 +02:00
5dcdbe95c7
Fixed #23005 -- Allowed specifying special fallback languages
...
This fixes the Chinese language issues described in #23005 but
also provides for other fallback exceptions by updating the
LANG_INFO structure.
Thanks caxekis at gmail.com for the report and Tim Graham for the
review.
2014-07-14 20:50:03 +02:00
7c3d6149a7
Removed ADMIN_FOR from global_settings.py.
...
The functionality it was used for was removed in Django 1.7.
2014-07-02 10:19:15 -04:00
4696cd9671
Fixed #22477 -- Removed contrib middleware from the global settings defaults.
...
Also added a compatibility check for changed middleware defaults.
Forwardport of d94de802d3
2014-06-13 12:45:56 -04:00
a1c6cd6a16
Fixed #22780 -- Checked that LOCALE_PATHS is really a tuple
2014-06-10 23:04:24 +02:00
8c12d51ea2
Fixed #22487 : Optional rollback emulation for migrated apps
2014-06-08 19:30:15 -07:00
1dcc603eff
Fixed several typos in Django
2014-05-28 17:39:14 -07:00
9d1bf8f841
Removed executeable bit from a few files.
2014-05-25 23:16:40 +02:00
1a69d276bd
Updated translation catalogs
2014-05-19 15:17:35 +02:00
e3a9714ce3
Added "/" divider for DATE(TIME)_INPUT_FORMATS for Dutch locale.
...
Dutch ('nl-NL' and 'nl-BE') has several valid input formats;
see http://nl.wikipedia.org/wiki/Datum_(dagtekening) .
Thanks Erik Romijn for review.
2014-05-18 12:49:14 -04:00
3417ba0309
Also allowed a non-overridden setting to be deleted
...
Refs #20032 , #18824 . Thanks ztorstri at gmail.com for the report.
2014-04-12 15:33:22 +02:00
fd23c06023
Fixed #21649 -- Added optional invalidation of sessions when user password changes.
...
Thanks Paul McMillan, Aymeric Augustin, and Erik Romijn for reviews.
2014-04-05 12:50:51 -04:00
0f6ea69e27
Cleaned up string detection for a deprecation warning by using six.string_types.
2014-04-03 11:03:31 -04:00
d73d0e071c
Fixed #22218 -- Deprecated django.conf.urls.patterns.
...
Thanks Carl Meyer for the suggestion and Alex Gaynor and Carl for reviews.
2014-04-03 07:28:10 -04:00
aaa2110259
Fixed #22302 -- Updated Finnish locale formats
2014-03-22 10:35:06 +01:00
06160cb945
Removed deprecated TRANSACTIONS_MANAGED setting.
2014-03-21 21:34:47 +01:00
9344bbb446
Removed django.views.defaults.shortcut and django.conf.urls.shortcut per deprecation timeline.
2014-03-21 07:56:00 -04:00
11e22129d5
Removed settings.SEND_BROKEN_LINK_EMAILS per deprecation timeline.
2014-03-21 07:15:58 -04:00
aa93a1890f
Removed contrib.comments per deprecation timeline.
2014-03-21 07:05:36 -04:00
cfbc887b2c
Changed start of week for Australia to Sunday as requested in https://code.djangoproject.com/ticket/21989
2014-03-14 14:00:27 -04:00
8b67fa7551
Revert "Reordered INSTALLED_APPS in default template, refs #22005"
...
This reverts commit a718fcf201
2014-03-09 20:10:56 +01:00
210d0489c5
Fixed #21188 -- Introduced subclasses for to-be-removed-in-django-XX warnings
...
Thanks Anssi Kääriäinen for the idea and Simon Charette for the
review.
2014-03-08 09:57:40 +01:00
9b729ddd8f
Fixed #22185 -- Added settings.CSRF_COOKIE_AGE
...
Thanks Paul McMillan for the review.
2014-03-06 08:28:43 -05:00
8c98f39624
Fixed #15318 -- Added settings for language cookie max-age, path, domain
...
Introduced a number of settings to configure max-age, path, and domain
for the language cookie: LANGUAGE_COOKIE_AGE, LANGUAGE_COOKIE_PATH and
LANGUAGE_COOKIE_DOMAIN.
Thanks sahid for the suggestion.
2014-03-01 07:52:45 -05:00
b4f21d1807
Fixed #19647 -- Added formats.py for Esperanto.
...
Thanks to Objectivesea and Guttorm Flatabø (dittaeva)!
2014-02-19 11:58:20 +01:00
a718fcf201
Reordered INSTALLED_APPS in default template, refs #22005
2014-02-11 09:01:48 +01:00
114b70ccf8
Fixed #21237 -- Added Australian English (en_AU) to locale conf
...
Adds Australian English (en_AU) to locale conf, which differs from
American English in date formatting and spelling, and continues
to diverge from British English in spelling (and first-day-of-week
according to the current en_GB locale format.py).
The transifex language project to match this patch has been requested.
2014-02-08 07:12:46 -05:00
2ff93e027c
Fixed #21829 -- Added default AppConfigs.
...
Thanks Russell for the report, Marc for the initial patch, Carl for the
final review, and everyone who contributed to the design discussion.
2014-01-25 10:41:56 +01:00
6070a5d6a6
Fixes #21833 -- Fix UserSettingsHolder.is_overridden() and add tests.
2014-01-20 20:25:33 -07:00
d818e0c9b2
Fixed #16905 -- Added extensible checks (nee validation) framework
...
This is the result of Christopher Medrela's 2013 Summer of Code project.
Thanks also to Preston Holmes, Tim Graham, Anssi Kääriäinen, Florian
Apolloner, and Alex Gaynor for review notes along the way.
Also: Fixes #8579 , fixes #3055 , fixes #19844 .
2014-01-20 10:45:21 +08:00
10e0cfc0e4
Fixed #21712 -- Moved autodiscover() to AdminConfig.ready().
...
Thanks Marc Tamlyn for the initial version of the patch.
2014-01-18 23:06:00 +01:00
4befb3015c
Fixed #21581 -- Fixed a number of issues with collectstatic.
...
When STATIC_ROOT wasn't set, collectstatic --clear would delete
every files within the current directory and its descendants.
This patch makes the following changes:
Prevent collectstatic from running if STATIC_ROOT isn't set.
Fixed an issue that prevented collectstatic from displaying the
destination directory.
Changed the warning header to notify when the command is run
in dry-run mode.
2013-12-31 14:58:49 -05:00
b8e3373f45
Fixed #21714 -- Moved logging configuration to global setup()
...
Thanks Aymeric Augustin for the report and the review.
2013-12-31 18:35:00 +01:00
553500133c
Removed an obsolete unicity check.
...
It doesn't account for app configs.
Refs #21679 .
2013-12-31 17:29:04 +01:00
4ac5def4a2
Simplied some code in django.conf.__init__.
2013-12-18 18:23:25 -05:00
96dd48c83f
Change initial migration writing to work as docs suggest.
...
Application template now includes an empty migrations module, and
the autodetector will only make initial migrations for apps with
empty modules.
2013-11-27 12:34:31 +00:00
9d6c48aeb0
Use str.isupper() to test if a string is uppercased.
2013-11-26 14:08:05 +01:00
4142d15102
Fixed #21388 -- Corrected language code for Frisian
2013-11-11 13:34:01 +01:00
c0a2388a1c
Fixed #18149 -- Changed language codes for Chinese
...
Language codes for Chinese are zh_Hans (Simplified) and zh_Hant (Traditional).
Added support for browsers that still send the deprecated language codes.
Thanks to Olli Wang for the report.
2013-11-04 23:03:28 +01:00
3bc0d46a84
Fixed all E261 warnings
2013-11-02 18:20:39 -04:00
726ded5708
Started attackign the next flake8 violation
2013-10-31 08:42:28 -07:00
9bf5610890
Start attacking E231 violations
2013-10-24 10:30:03 -07:00
dfb4cb9970
Fixed #21285 -- Fixed E121,E122 pep8 warnings
2013-10-17 20:20:11 -04:00
b67ab75e82
Fixed assorted flake8 errors.
2013-10-11 07:25:14 -04:00
1dae4ac177
Whitespace cleanup.
...
* Removed trailing whitespace.
* Added newline to EOF if missing.
* Removed blank lines at EOF.
* Removed some stray tabs.
2013-10-10 16:49:20 -04:00
a5b062576b
Removed a few trailing backslashes.
...
We have always been at war with trailing backslashes.
2013-09-22 14:04:10 +02:00
e4a67fd906
Set 'bidi' Urdu property to True
...
Refs #20454 .
2013-08-30 12:03:39 +02:00
5569b0b92f
Merge remote-tracking branch 'core/master' into schema-alteration
...
Conflicts:
django/db/backends/oracle/base.py
django/db/backends/postgresql_psycopg2/base.py
django/db/models/signals.py
tests/queries/tests.py
2013-08-23 12:36:53 +01:00
b0ce6fe656
Fixed #20922 -- Allowed customizing the serializer used by contrib.sessions
...
Added settings.SESSION_SERIALIZER which is the import path of a serializer
to use for sessions.
Thanks apollo13, carljm, shaib, akaariai, charettes, and dstufft for reviews.
2013-08-22 13:58:26 -04:00
b6a957f0ba
Merge remote-tracking branch 'core/master' into schema-alteration
...
Conflicts:
docs/ref/django-admin.txt
2013-08-19 18:30:48 +01:00
6bdb3b1135
Fixed #13518 -- Added FILE_UPLOAD_DIRECTORY_PERMISSIONS setting
...
This setting does for new directories what FILE_UPLOAD_PERMISSIONS
does for new files.
Thanks jacob@ for the suggestion.
2013-08-12 07:15:59 -04:00
588b523233
Merge remote-tracking branch 'core/master' into schema-alteration
...
Conflicts:
django/db/models/options.py
2013-08-09 14:37:37 +01:00
de64c4d6e9
Merge remote-tracking branch 'core/master' into schema-alteration
...
Conflicts:
django/core/management/commands/flush.py
django/core/management/commands/syncdb.py
django/db/models/loading.py
docs/internals/deprecation.txt
docs/ref/django-admin.txt
docs/releases/1.7.txt
2013-08-09 14:17:30 +01:00
Claude Paroz
Alex Hill
Ville Skyttä
Anton I. Sipos
Florian Apolloner
Andre Cruz
Tim Graham
Ben Welsh
Bas Westerbaan
Krzysztof Urbaniak
Hugo Osvaldo Barrera
userimack
Chris Lamb
Petter Reinholdtsen
Marten Kenbeek
Baptiste Mispelon
Joshua Kehn
Maxime Lorant
Keryn Knight
Matt Robenolt
Donggi Jung
Mounir Messelmeni
Markus Holtermann
Marissa Zhou
Erik Romijn
Andrew Pinkham
Sævar Öfjörð Magnússon
Grzegorz Slusarek
Emin Mastizada
Aymeric Augustin
darkryder
Reza Mohammadi
Emin Mastizada
Collin Anderson
Serafeim Papastefanos
JuneHyeon Bae
Martin Blech
slollo
Dejan Noveski
Malte Beckmann
José Padilla
Andi Albrecht
Duncan Parkes
Federico Frenguelli
mlavin
Tim Schaffer
Andrew Godwin
Alex Gaynor
SaeX
Antti Hirvonen
Nathan Smith
Roger Hu
Sergey Kolosov
Baptiste Darthenay
Tom Fifield
Carl Meyer
Russell Keith-Magee
Loic Bistuer
Ondrej Sika
Bouke Haarsma
coagulant
Alasdair Nicol
Mel Collins