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

15634 Commits

Author SHA1 Message Date
Adam Allred 0d5d8ed322 [2.1.x] Fixed #29774 -- Fixed django-admin shell hang on startup. 
sys.stdin.read() blocks waiting for EOF in shell.py which will
likely never come if the user provides input on stdin via the
keyboard before the shell starts. Added check for a tty to
skip reading stdin if it's not present.

This still allows piping of code into the shell (which should
have no TTY and should have an EOF) but also doesn't cause it
to hang if multi-line input is provided.

Backport of 4e78e389b1 from master.
 2018-10-19 20:45:55 -04:00
aspalding 0df7ea1b87 [2.1.x] Fixed #29838 -- Fixed crash when combining Q objects with __in lookups and lists. 
Regression in fc6528b25a.

Backport of 834c4ec8e4,
217f82d713, and
dc5e75d419 from master.
 2018-10-17 11:40:02 -04:00
Taoufik 6efe2ba057 [2.1.x] Fixed typo in django/utils/datastructures.py. 
Backport of f07091a30f from master
 2018-10-14 11:20:52 -04:00
Jon Dufresne 6cb5285f29 [2.1.x] Refs #29784 -- Switched to https:// links where available. 
Backport of 82f286cf6f from master.
 2018-10-09 20:52:43 -04:00
Jon Dufresne ec0803b1be [2.1.x] Capitalized "Python" in docs and comments. 
Backport of e90af8bad4 from master.
 2018-10-09 20:50:31 -04:00
Carlton Gibson 5045f8af85 Revert "[2.1.x] Refs #27795 -- Removed force_bytes() usage in sessions." 
This reverts commit f3f31b0fc2.
 2018-10-03 15:14:27 +02:00
Carlton Gibson 54eedddb50 Revert "[2.1.x] Refs #27795 -- Removed force_bytes() usage in MySQL backend." 
This reverts commit a47dd99cc6.
 2018-10-03 15:14:03 +02:00
Jon Dufresne f3f31b0fc2 [2.1.x] Refs #27795 -- Removed force_bytes() usage in sessions. 
SessionBase.decode() is the inverse operation to SessionBase.encode().
As SessionBase.encode() always returns a string, SessionBase.decode()
should always be passed a string argument. Fixed the file backend, which
was the only backend still passing a bytestring.

Backport of bdae19cf63 from master
 2018-10-03 11:33:12 +02:00
Jon Dufresne a47dd99cc6 [2.1.x] Refs #27795 -- Removed force_bytes() usage in MySQL backend. 
The mysqlclient cursor attribute `_last_executed` is always stored as
bytes. Decode it.

TextField values are already type str. No need to decode.

Backport of efd8a82e26 from master
 2018-10-03 10:42:35 +02:00
Carlton Gibson 6da866c047 [2.1.x] Post-release version bump. 2018-10-01 11:40:27 +02:00
Carlton Gibson 38e2fdadfd [2.1.x] Bumped version for 2.1.2 release. 2018-10-01 10:18:50 +02:00
Tim Graham 176d20b92a [2.1.x] Fixed #29809 -- Fixed a crash when a "view only" user POSTs to the admin user change form. 
Backport of a7284cc0c3 from master
 2018-10-01 10:16:15 +02:00
Carlton Gibson c4bd5b597e Fixed CVE-2018-16984 -- Fixed password hash disclosure to admin "view only" users. 
Thanks Claude Paroz & Tim Graham for collaborating on the patch.

# Conflicts:
#	tests/auth_tests/test_views.py
 2018-10-01 10:15:50 +02:00
Claude Paroz d5ed08263b [2.1.x] Updated translations from Transifex 2018-09-29 16:03:27 +02:00
Stephen James f5335bc745 [2.1.x] Fixed #29683 -- Added view permission to docs. 
Backport of e40e7026ca from master.
 2018-09-26 15:06:57 -04:00
Mariusz Felisiak 5aeced6dcd
[2.1.x] Fixed #29630 -- Fixed crash of sliced queries with multiple columns with the same name on Oracle 12.1. 
Regression in 0899d583bd.

Thanks Tim Graham for the review and Jani Tiainen for help.
Backport of 024abe5b82 from master
 2018-09-26 20:24:20 +02:00
Mariusz Felisiak 1f8a5d4fac [2.1.x] Made DatabaseWrapper.oracle_version() return a full version tuple. 
Backport of 90d93a1b42 from master
 2018-09-26 08:54:51 +02:00
Oleg cdb8ee741d [2.1.x] Fixed #29778 -- Fixed quoting of unique index names. 
Regression in 3b429c9673.
Backport of d1d5c97bc2 from master.
 2018-09-25 16:10:47 -04:00
Jon Dufresne f53ed7846b [2.1.x] Refs #29784 -- Normalized Python docs links to omit the version. 
Backport of ad9a28ee38 from master.
 2018-09-25 10:22:06 +02:00
Mariusz Felisiak 430966c2fc
[2.1.x] Fixed #29759 -- Fixed crash on Oracle when fetching a returned insert id with cx_Oracle 7. 
Backport of da92ec7962 from master
 2018-09-16 12:49:24 +02:00
Simon Charette 4c5a8c6f50 [2.1.x] Fixed #29755 -- Made migrations detect changes to Meta.default_related_name. 
Backport of a4495f4b98 from master
 2018-09-14 10:20:27 -04:00
Tim Graham 5bbcf83fce [2.1.x] Fixed #29749 -- Made the migrations loader ignore files starting with a tilde or underscore. 
Regression in 29150d5da8.
Backport of 32fbccab40 from master
 2018-09-11 12:51:24 -04:00
Alexander Holmbäck bd5ce0599b [2.1.x] Fixed #29727 -- Made nonexistent joins in F() raise FieldError. 
Regression in 2162f0983d.

Backport of f315d0423a from master
 2018-09-08 09:50:02 -04:00
Carlton Gibson 24a0d1b8a3 [2.1.x] Post-release version bump. 2018-08-31 10:57:02 +02:00
Carlton Gibson 497e3942b5 [2.1.x] Bumped version for 2.1.1 release. 2018-08-31 10:17:29 +02:00
Tim Graham 152b1d783b [2.1.x] Fixed #29723 -- Fixed crash if InlineModelAdmin.has_add_permission() doesn't accept the obj argument. 
* Refs #27991 -- Added testing for ModelAdmin.get_inline_instances() if the inline's has_add_permission() doesn't accept 'obj'.

* Fixed #29723 -- Fixed crash if InlineModelAdmin.has_add_permission() doesn't accept the obj argument.

Backport of fd8a7a5313 from master
 2018-08-30 11:36:04 +02:00
Mariusz Felisiak e7acd99113 [2.1.x] Fixed #29694 -- Fixed column mismatch crash with QuerySet.values() or values_list() after combining querysets with extra() with union(), difference(), or intersection(). 
Regression in 0b66c3b442.
Backport of 39461a83c3 from master
 2018-08-29 10:03:36 +02:00
Tim Graham 53b9a6654b [2.1.x] Fixed #29682 -- Fixed admin change form crash if a view-only model's form has an extra field. 
Backport of d311124be5 from master
 2018-08-20 11:15:16 -04:00
Jon Dufresne cae84904c6 [2.1.x] Refs #29015 -- Added database name to PostgreSQL database name too long exception. 
Backport of bf17f5e884 from master
 2018-08-17 12:44:17 -04:00
Jon Dufresne 9c93bf0903 [2.1.x] Fixed #29663 -- Made admin change view redirect to changelist with view permission. 
Backport of 09ee3b6fe3 from master
 2018-08-17 11:21:17 -04:00
Jon Dufresne 91d281c021 [2.1.x] Added ModelAdmin._response_post_save() to avoid code duplication. 
Backport of 57f16655cd from master
 2018-08-17 11:04:33 -04:00
Jon Dufresne f5fbff0b4e [2.1.x] Refs #8936 -- Added ModelAdmin.has_view_or_change_permission(). 
Backport of cd790ed1a6 from master
 2018-08-17 11:04:20 -04:00
Marnanel Thurman ef306338eb [2.1.x] Fixed #29662 -- Allowed test client to accept structured suffix JSON content types. 
Backport of 7cc52250f0 from master
 2018-08-15 10:28:08 -04:00
Ramiro Morales f72a7d8f44 [2.1.x] Fixed #29653 -- Fixed missing related_query_name reverse accessor if GenericRelation is declared on an abstract base model. 
Regression in 4ab027b944.

Thanks Lauri Kainulainen for the report.

Backport of b5c7cb4d33 from master
 2018-08-10 12:43:27 -04:00
Clément Mangin d7615674d9 [2.1.x] Fixed #29637 -- Fixed admin change form crash if the user doesn’t have the add permission to a TabularInline. 
Regression in 825f0beda8.

Backport of 64e1a271f5 from master
 2018-08-10 11:32:52 -04:00
Tim Graham e3be4e94d1 [2.1.x] Fixed #29623 -- Fixed translation failure of DurationField's "overflow" error message. 
Backport of 730173d1c5 from master
 2018-08-08 06:38:27 -04:00
Mariusz Felisiak 2bf766cedc
[2.1.x] Fixed #29643 -- Fixed crash when combining Q objects with __in lookups and lists. 
Regression in fc6528b25a.
Backport of 9fee229874 from master
 2018-08-08 08:52:55 +02:00
Mariusz Felisiak c706091225
[2.1.x] Fixed #29613 -- Fixed --keepdb on PostgreSQL if the database exists and the user can't create databases. 
Regression in e776dd2db6.

Thanks Tim Graham for the review.
Backport of 1a9cbf41a1 from master
 2018-08-03 10:33:52 +02:00
Tim Graham 0cfca0f2cc [2.1.x] Fixed #29627 -- Fixed QueryDict.urlencode() crash with non-string values. 
Regression in 7d96f0c49a.
Backport of d8e2be459f from master
 2018-08-02 21:56:43 -04:00
Michael Sanders 221ef69a9b [2.1.x] Fixed #29499 -- Fixed race condition in QuerySet.update_or_create(). 
A race condition happened when the object didn't already exist and
another process/thread created the object before update_or_create()
did and then attempted to update the object, also before update_or_create()
saved the object. The update by the other process/thread could be lost.

Backport of 271542dad1 from master
 2018-08-02 17:17:12 -04:00
luz.paz adfd261404 [2.1.x] Fixed typos in comments and docs. 
Backport of 97e637a87f from master
 2018-08-01 16:13:18 -04:00
Tim Graham 3f429e1955 [2.1.x] Post-release version bump. 2018-08-01 11:06:27 -04:00
Tim Graham e7ad40fcf4 [2.1.x] Bumped version for 2.1 release. 2018-08-01 09:56:13 -04:00
Andreas Hug c4e5ff7fdb [2.1.x] Fixed CVE-2018-14574 -- Fixed open redirect possibility in CommonMiddleware. 2018-08-01 09:35:09 -04:00
Claude Paroz cbf7e7dc52 [2.1.x] Updated contrib translations from Transifex 2018-08-01 08:41:58 -04:00
Claude Paroz 734e2c65ae [2.1.x] Updated core translations from Transifex 2018-08-01 08:41:58 -04:00
Dražen Odobašić 4dadf4eb7b [2.1.x] Fixed #29617 -- Fixed Template crash if template_string is lazy. 
Regression in 3a148f958d.
Backport of 9f3b9ffd51 from master
 2018-07-31 09:57:28 -04:00
Tim Graham 3a6040246f [2.1.x] Fixed #29514 -- Reverted "Used datetime.timezone.utc instead of pytz.utc for better performance." 
This reverts commit 27ca5ce19f due to a
regression.

Backport of 2ec151e35d from master
 2018-07-23 10:44:06 -04:00
Claude Paroz 1084bcc4b7 [2.1.x] Fixed #29578 -- Made numberformat.format() honor forced l10n usage. 
Thanks Sassan Haradji for the report.
Backport of 0adfba968e from master
 2018-07-19 16:44:57 -04:00
Mariusz Felisiak 16fdcf67c8 [2.1.x] Removed duplicate words in various comments. 
Backport of a73cf8110e from master
 2018-07-18 11:56:57 -04:00