Merge remote-tracking branch 'origin/8.3' into 8.4

Author: mhsdesign

Neos.Media.Browser/Resources/Private/Templates/Asset/Index.html

@@ -264,7 +264,7 @@ <h2>
             <f:render partial="ConstraintsHiddenFields" arguments="{constraints: constraints}" />
         </f:form>
     </div>
-    <div id="uploader">
+    <div id="uploader" style="overflow: hidden">
         <div id="filelist"></div>
     </div>
     </f:if>

Neos.Neos/Classes/Controller/Module/Management/HistoryController.php

@@ -53,7 +53,7 @@ public function indexAction($offset = 0, $limit = 10)
                 ->controllerContext
                 ->getUriBuilder()
                 ->setCreateAbsoluteUri(true)
-                ->uriFor('Index', ['offset' => $offset + $limit], 'History', 'Neos.Neos');
+                ->uriFor('index', ['offset' => $offset + $limit]);
         }
 
         $eventsByDate = [];

Neos.Neos/Classes/Controller/Service/NodesController.php

@@ -127,7 +127,7 @@ public function showAction($identifier, $workspaceName = 'live', array $dimensio
 
         $convertedNodeProperties = $this->nodePropertyConverterService->getPropertiesArray($node);
         array_walk($convertedNodeProperties, function (&$value) {
-            if (is_array($value)) {
+            if (is_array($value) || $value instanceof \JsonSerializable) {
                 $value = json_encode($value);
             }
         });

Neos.Neos/Resources/Private/Templates/Module/Management/History/Index.html

@@ -48,7 +48,7 @@
 	window.addEventListener('DOMContentLoaded', (event) => {
 		jQuery(function($) {
 
-			var nextPage = '{nextPage}';
+			var nextPage = jQuery('div.loadMore').data('neos-history-nextpage');
 			var historyContainer = $('.neos-history');
 			$('.loadMore button').click(function() {