Merge branch 'develop' of github.com:craftcms/cms into 3.1

# Conflicts:
#	lib/timepicker/jquery.timepicker.js
#	lib/timepicker/jquery.timepicker.js.map
#	src/controllers/UsersController.php
#	src/elements/Category.php
#	src/elements/Entry.php
#	src/services/Sections.php

CHANGELOG-v3.md

@@ -3,11 +3,25 @@
 ## Unreleased
 
 ### Changed
+- Table fields with a fixed number of rows no longer show Delete buttons or the “Add a row” button. ([#3488](https://github.com/craftcms/cms/issues/3488))
+- Table fields that are fixed to a single row no longer show the Reorder button. ([#3488](https://github.com/craftcms/cms/issues/3488))
 - Setting `components.security.sensitiveKeywords` in `config/app.php` will now append keywords to the default array `craft\services\Security::$sensitiveKeywords` array, rather than completely overriding it.
+- When performing an action that requires an elevated session while impersonating another user, admin must now enter their own password instead of the impersonated user’s. ([#3487](https://github.com/craftcms/cms/issues/3487))
+- The System Report utility now lists any custom modules that are installed. ([#3490](https://github.com/craftcms/cms/issues/3490))
+- Control Panel charts now give preference to `ar-SA` for Arabic locales, `de-DE` for German locales, `en-US` for English locales, `es-ES` for Spanish locales, or `fr-FR` for French locales, if data for the exact application locale doesn’t exist. ([#3492](https://github.com/craftcms/cms/pull/3492))
+- “Create a new child entry” and “Create a new child category” element actions now open an edit page for the same site that was selected on the index page. ([#3496](https://github.com/craftcms/cms/issues/3496))
+- The Craft Support widget now sends `composer.json` and `composer.lock` files when contacting Craft Support.
+- It’s now possible to create element select inputs that include a site selection menu by passing `showSiteMenu: true` when including the `_includes/forms/elementSelect.html` Control Panel include template. ([#3494](https://github.com/craftcms/cms/pull/3494))
 
 ### Fixed
 - Fixed a bug where a Matrix fields’ block types and content table could be deleted even if something set `$isValid` to `false` on the `beforeDelete` event.
 - Fixed a bug where a global sets’ field layout could be deleted even if something set `$isValid` to `false` on the `beforeDelete` event.
+- Fixed a bug where after impersonating another user, the Login page would show the impersonated user’s username rather than the admin’s.
+- Fixed a bug where `craft\services\Sections::getAllSections()` could return stale results if a new section had been added recently. ([#3484](https://github.com/craftcms/cms/issues/3484))
+- Fixed a bug where “View entry” and “View category” element actions weren’t available when viewing a specific section or category group.
+
+### Security
+- Updated jQuery File Upload to 9.28.0.
 
 ## 3.0.32 - 2018-11-20
 

composer.json

@@ -64,6 +64,9 @@
     "bower-asset/punycode": "1.3.*",
     "bower-asset/yii2-pjax": "~2.0.1"
   },
+  "conflict": {
+    "league/oauth2-client": "2.4.0"
+  },
   "suggest": {
     "ext-imagick": "Adds support for more image processing formats and options.",
     "ext-iconv": "Adds support for more character encodings than PHP’s built-in mb_convert_encoding() function, which Craft will take advantage of when converting strings to UTF-8.",

gulpfile.js

@@ -1,7 +1,6 @@
 // TODO: following deps are still manual:
 // - colorpicker
 // - datepicker-i18n
-// - fileupload
 // - jquery-touch-events
 // - jquery-ui
 // - qunit
@@ -19,6 +18,7 @@ var uglify = require('gulp-uglify');
 var libPath = 'lib/';
 
 var jsDeps = [
+    { srcGlob: 'node_modules/blueimp-file-upload/js/jquery.fileupload.js', dest: libPath+'fileupload' },
     { srcGlob: 'node_modules/bootstrap/dist/js/bootstrap.js', dest: libPath+'bootstrap/js' },
     { srcGlob: 'node_modules/d3/build/d3.js', dest: libPath+'d3' },
     { srcGlob: 'node_modules/element-resize-detector/dist/element-resize-detector.js', dest: libPath+'element-resize-detector' },