innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
17,780 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

17780 Commits

Author SHA1 Message Date
Jakub Roztocil 4b6ba2c1d1 [1.7.x] Fixed #22489 -- missing implemenation for search lookup 
When custom lookups were added, converting the search lookup to use
the new Lookup infrastructure wasn't done.

Some changes were needed to the added test, main change done by
committer was ensuring the test works on MySQL versions prior to 5.6.

Backport of 7131e14d00 from master
 2014-05-05 14:40:06 +03:00
Tim Graham 6a6f294f51 [1.7.x] Fixed #22575 -- Fixed typo in docs/topics/class-based-views/generic-editing.txt. 
Thanks adminq80 at gmail.com.

Backport of 87776859af from master
 2014-05-05 06:42:21 -04:00
Anssi Kääriäinen 402fc4f6c9 [1.7.x] Fixed #22429 -- Incorrect SQL when using ~Q and F 
Backport of 5e1f4656b9 from master
 2014-05-05 13:06:51 +03:00
Andrew Godwin 87d873ab47 [1.7.x] Fix docs error with deconstruct() docs 2014-05-03 16:18:56 -07:00
Tim Graham f8fa735dc2 [1.7.x] Fixed #22435 -- Prevented adding a ManyToManyField from prompting for a default. 
Thanks andrewsg for the report.

Backport of 3818d96426 from master
 2014-05-02 20:53:39 -04:00
Claude Paroz 61fd00d4fd [1.7.x] Fixed #22565 -- Prevented pgettext_lazy crash with bytestring input 
Thanks ygbo for the report.
Backport of 142c27218 from master.
 2014-05-02 19:33:58 +02:00
Brenda J. Butler 35b7dd4ddb [1.7.x] Fixed #22558 -- Added missing word in contributing docs 
Backport of c8d257e81 from master.
 2014-05-02 08:29:20 +02:00
Chris Beaven 5ab93bbe74 [1.7.x] Fix migration autodector to work correctly with custom deconstructed values 2014-05-02 15:12:42 +12:00
Claude Paroz d5a9d74eec [1.7.x] Fixed #22551 -- Made oracle backend method Python 3 compatible 
Thanks fatal10110 at gmail.com for the report. The fix is 1.6-only
because that code has been refactored in 1.7 (6983201cfb).
'Docs-only' forward port of 120a98120 from 1.6.x.
 2014-05-01 18:17:55 +02:00
Yehonatan Daniv d56267ba57 [1.7.x] Fixed #22539 -- Copied exclude argument in Model.full_clean() to prevent side effects. 
Backport of e2e4cdba11 from master
 2014-05-01 09:30:49 -04:00
Tim Graham e5941ba5f3 [1.7.x] flake8 fixes. 
Backport of 45c2d1f5d9 from master.
 2014-04-30 18:35:40 -04:00
Tim Graham 3cd1db9121 [1.7.x] Fixed #22547 -- Added some links to tutorial 2. 
Thanks bjb at sourcer.ca for the suggestion.

Backport of b0d032f9fc from master
 2014-04-30 18:25:32 -04:00
Andrew Godwin 6ca5367869 [1.7.x] Cleanup failing test w/contenttypes and remove useless graph load 2014-04-30 15:12:18 -07:00
Moayad Mardini c0d5521e69 [1.7.x] Fixed #22546 -- Removed idioms in tutorial 2. 
Thanks bjb at sourcerer.ca for the suggestion.

Backport of 927245ccd8 from master
 2014-04-30 18:02:00 -04:00
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