mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-23 17:46:27 +00:00
Code Issues 25 Releases Wiki Activity
17,566 Commits 28 Branches 426 Tags 666 MiB
35c2a14a49
Commit Graph

17566 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Godwin
35c2a14a49 [1.7.x] Fixed #22485: Include all unmigrated apps in project state by default. 2014-04-30 12:26:11 -07:00
Simon Charette
a6ecd5dbb3 [1.7.x] Fixed #19195 -- Allow explicit ordering by a relation _id field. 
Thanks to chrisedgemon for the report and shaib, akaariai and
timgraham for the review.

Backport of 24ec9538b7 from master
 2014-04-30 14:26:39 -04:00
Claude Paroz
1084456ac2 [1.7.x] Fixed #22474 -- Made migration recorder aware of multiple databases 
Thanks Tim Graham for the review.
Backport of 7c54f8cce from master.
 2014-04-30 16:55:12 +02:00
Mike Fogel
bb5c7e4e8d [1.7.x] Fixed #22537 -- Add tests and improved docs for field subclass with choices. 
Backport of 7fd1b35ed7 from master
 2014-04-30 07:57:35 -04:00
Tim Graham
6d4df45e29 [1.7.x] Fixed #22442 -- Provided additional documentation regarding id fields clashing. 
Thanks benjaoming for raising the issue and Loic for the examples.

Backport of 8ec388a69d from master
 2014-04-30 07:38:31 -04:00
Tim Graham
a2cac1b68d [1.7.x] Removed unused import. 
Backport of d9c272b22f from master
 2014-04-30 07:27:56 -04:00
Bruno Ribeiro da Silva
72493b1b7c [1.7.x] Fixed #22511 -- Added args to migrations management commands. 
Backport of 83413c53d2 from master
 2014-04-30 07:20:44 -04:00
Simon Charette
cda5745df0 [1.7.x] Fixed #22447 -- Make sure custom model bases can be migrated. 
Thanks to cdestigter for the report.

Backport of 390f888745 from master
 2014-04-29 10:55:45 -04:00
Simon Charette
f02f20a739 [1.7.x] Use the new implementation of six.with_metaclass. 
No more `NewBase` horrors.

Thanks to bendavis78 for his work on merging this into six.

Backport of a2340ac6d6 from master
 2014-04-29 10:55:36 -04:00
Ramiro Morales
62bbfba3aa [1.7.x] Removed bogus, ineffective 'U' flag from codecs.open() call. 
2df7238512 from master.
 2014-04-29 07:52:43 -03:00
Aymeric Augustin
95c5e244fe [1.7.x] Fixed #22523 -- Clarified pytz requirement. 
Thanks z for the report and timo for the proposal.

Backport of 0fb7570 from master
 2014-04-29 08:34:00 +02:00
Tim Graham
997648d80b [1.7.x] Added stub release notes for 1.6.5. 
Backport of 650065f0ef from master
 2014-04-28 20:38:29 -04:00
Tim Graham
a72069f5d2 [1.7.x] Added dates to release notes of today's release. 
Backport of 68d264059a from master
 2014-04-28 19:07:03 -04:00
Tim Graham
1d20693fa6 [1.7.x] Revert "Fixed #15179 -- middlewares not applied for test client login()" 
This reverts commit 4fdd51b732.

See the ticket for concerns with this implementation; it will be revisited.

Backport of aabceadd7d from master
 2014-04-28 18:49:24 -04:00
James Bennett
edca57817f [1.7.x] Bump version number for 1.7 beta 3 bugfix release. 2014-04-28 15:46:13 -05:00
Tim Graham
305ab00087 [1.7.x] Fixed #22254 -- Noted the requirement of calling django.setup() when running 
Thanks Peter Landry for the report.

Backport of 26b03f2526 from master
 2014-04-28 12:43:50 -04:00
Zhaorong Ma
c73d8c41e4 [1.7.x] Fix a typo in logging.txt 
Backport of dd3f3e4e89 from master
 2014-04-28 11:21:57 -04:00
Tim Graham
63ae243a13 [1.7.x] Fixed #22497 -- Highlighted difference between field and class deconstruction. 
Thanks nliberg for the suggestion.

Backport of b829d53b37 from master
 2014-04-28 08:20:26 -04:00
Tim Graham
23f3c53aff [1.7.x] Fixed #22445 -- Added how to perform a reverse data migration to topic guide. 
Thanks Karen Tracey for the report.

Backport of 1ce759b69f from master
 2014-04-27 15:21:07 -04:00
Tim Graham
b89bbb3c21 [1.7.x] Improved formatting and links of migration docs. 
Backport of ab8d8e00c9 from master
 2014-04-27 15:06:08 -04:00
Tim Graham
529ae6087c [1.7.x] Fixed #22526 -- Added note about check() method to 1.7 release notes. 
Thanks kevin-brown for the report.

Backport of 8905fcbda6 from master
 2014-04-27 14:20:51 -04:00
Aymeric Augustin
a5cc99de24 [1.7.x] Documented django.setup(). 
Thanks Eric Holscher and Tim Graham for the review.

Backport of 58ed387 from master
 2014-04-26 22:11:04 +02:00
Alex Gaynor
996564df4d [1.7.x] Fix many many typos in comments throughout the codebase 
Backport of 2bcb8bfc8d from master
 2014-04-26 14:35:57 -04:00
Aymeric Augustin
3bb0f118ca [1.7.x] Fixed #3214 -- Stopped parsing SQL with regex. 
Avoided introducing a new regex-based SQL splitter in the migrations
framework, before we're bound by backwards compatibility.

Adapted this change to the legacy "initial SQL data" feature, even
though it's already deprecated, in order to facilitate the transition
to migrations.

sqlparse becomes mandatory for RunSQL on some databases (all but
PostgreSQL). There's no API to provide a single statement and tell
Django not to attempt splitting. Since we have a more robust splitting
implementation, that seems like a good tradeoff. It's easier to add a
new keyword argument later if necessary than to remove one.

Many people contributed to both tickets, thank you all, and especially
Claude for the review.

Refs #22401.

Backport of 8b5b199 from master
 2014-04-26 17:46:57 +02:00
Claude Paroz
22d99200a1 [1.7.x] Specified 'csv and unicode' note as Python 2 only 
Backport of 2128b3a6 from master.
 2014-04-26 16:10:00 +02:00
Claude Paroz
e441cebce3 [1.7.x] Updated doc links to point to Python 3 documentation 
Backport of 680a0f08b from master.
 2014-04-26 16:03:40 +02:00
Claude Paroz
abd68b5aff [1.7.x] Fixed #22507 -- Clarified nature of the sender argument of signals 
Backport of d1f93e9c1e from master.
 2014-04-25 23:16:24 +02:00
Aymeric Augustin
6b38e48ba1 [1.7.x] Fixed #21166 -- Reset errors_occurred flag after commit and rollback. 
Backport of 3033a71 from master.

Conflicts:
	django/db/backends/__init__.py
 2014-04-25 22:52:51 +02:00
Aymeric Augustin
788fce4c91 [1.7.x] Fixed a confusing heading in applications docs. 
Refs #22422.

Backport of 0315f01 from master
 2014-04-25 17:40:33 +02:00
Tim Graham
c050ce7de2 [1.7.x] Fixed #22504 -- Corrected domain terminology in security guide. 
Thanks chris at chrullrich.net.

Backport of f65eb15ac6 from master
 2014-04-25 10:29:18 -04:00
Víðir Valberg Guðmundsson
bde1bc6672 [1.7.x] Fixed #22422 -- Moved information about the application loading process to refs/applications.txt. 
Backport of deb561bbe2 from master
 2014-04-25 10:12:55 -04:00
Moayad Mardini
ae15356061 [1.7.x] Fixed #22493 - Added warnings to raw() and extra() docs about SQL injection 
Thanks Erik Romijn for the suggestion.

Backport of 3776926cfe from master
 2014-04-25 09:56:04 -04:00
Malcolm Box
658710be00 [1.7.x] Fixed #22516 -- Added versionchanged annotation for STATIC_ROOT default value. 2014-04-25 09:36:18 -04:00
Tim Graham
6d87acc390 [1.7.x] Fixed #22515 -- Fixed the object_id of the LogEntry that's created after a user password change in the admin. 
Thanks ross at servercode.co.uk for the report.

Backport of 9e7f86b890 from master
 2014-04-25 08:36:20 -04:00
Aymeric Augustin
782fa14db4 [1.7.x] Set some transaction-related feature flags on SQLite. 
Refs #22496.

Backport of e368912 from master.
 2014-04-25 11:45:58 +02:00
Shai Berger
b8b179bbf5 [1.7.x] Fixed #22498 -- constraint name was not quoted in FK creation SQL 
Backport of 843613add4 from master
 2014-04-25 01:35:59 +03:00
Shai Berger
7421e1e320 [1.7.x] Made sure cursor.close() does not complain if cursor is already closed on Oracle 
Refs #22483

Backport of 53d97e4fe3 from master
 2014-04-25 01:35:38 +03:00
Tim Graham
bee118a701 [1.7.x] Fixed #22499 -- Fixed a typo in an admin_views test that caused failure on Oracle. 
Backport of d238c58912 from master
 2014-04-24 07:06:57 -04:00
Claude Paroz
1a3cde5f9f [1.7.x] Renamed Transifex project from django-core to django 
See also http://blog.transifex.com/post/83622601443/new-teams-management-transifex
Backport of 7c24027ba from master.
 2014-04-24 11:51:53 +02:00
Aymeric Augustin
9bbb43dd1a [1.7.x] Ignored repeated calls to connection.close(). 
Backport of d4cc59ef from master
 2014-04-24 08:43:24 +02:00
Aymeric Augustin
5cd6429620 [1.7.x] Prevented a crash in the cursor wrappers on Oracle. 
Fixed #22483 (again).

Backport of 0f85103e from master
 2014-04-24 08:43:16 +02:00
Aymeric Augustin
e32e359d6a [1.7.x] Used the same instance of atomic for entry and exit. 
Since all state is maintained on the connection at this time and none in
the atomic, it doesn't matter, but it could introduce some subtle bugs
if the implementation changed in the future.

Backport of 0aa4c6c3 from master
 2014-04-23 21:45:49 +02:00
Aymeric Augustin
9bf890f6f9 [1.7.x] Wrapped migrations in a transaction only on DBs with transactional DDL. 
Backport of e74d2183 from master
 2014-04-23 21:45:38 +02:00
Claude Paroz
0424c84d54 [1.7.x] Set compile messages options as class variable 
Refs #18714. Same logic as options for makemessages commands.
Backport of 3a435a057 from master.
 2014-04-23 15:16:38 +02:00
Malcolm Box
07235aec9d [1.7.x] Fixed #22495 -- Locmem cache.add() failed with infinite timeouts 
cache.add() incorrectly succeeded when there was an existing key
with an infinite (None) timeout.
Backport of af5f688392 from master.
 2014-04-23 14:56:54 +02:00
Tim Graham
e192f13103 [1.7.x] Fixed #22486 -- Restored the ability to reverse views created using functools.partial. 
Regression in 8b93b31487.

Thanks rcoup for the report.

Backport of 3c06b2f2a3 from master
 2014-04-23 08:49:53 -04:00
Claude Paroz
c3228ef3e2 [1.7.x] Added Spatialite support to the new migration framework 
Refs #22451.
Backport of 2ffa6ca73a from master.
 2014-04-23 13:48:36 +02:00
Claude Paroz
423e2cf1ea [1.7.x] Used migration framework in GIS test tearDown 
Backport of 48c4ea414 from master.
 2014-04-23 13:47:49 +02:00
Marti Raudsepp
ba1728dd9b [1.7.x] Various documentation typo/spelling fixes 
Errors detected by Topy (https://github.com/intgr/topy), all changes
verified by hand.

Backport of 11d453bcad from master
 2014-04-22 20:10:58 -04:00
Ray Ashman
4499c676ef [1.7.x] Updated grammar in description of django.contrib.auth. 
Backport of 9853779805 from master
 2014-04-22 18:29:03 -04:00