Merge remote-tracking branch 'origin/master-2.21'

# Conflicts: # core/constant_inc.php
mantisbt · Jun 14, 2019 · ae3f4b6 · ae3f4b6
2 parents 220ace7 + a613613
commit ae3f4b6
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/docbook/Admin_Guide/en-US/Revision_History.xml b/docbook/Admin_Guide/en-US/Revision_History.xml
@@ -5,6 +5,20 @@
 	<title>Revision History</title>
 	<simpara>
 		<revhistory>
+			<revision>
+				<revnumber>2.21-1</revnumber>
+				<date>Thu Jun 13 2019</date>
+				<author>
+					<firstname>Victor</firstname>
+					<surname>Boctor</surname>
+					<email>vboctor@mantisbt.org</email>
+				</author>
+				<revdescription>
+					<simplelist>
+						<member>Release 2.21.1</member>
+					</simplelist>
+				</revdescription>
+			</revision>
 			<revision>
 				<revnumber>2.21-0</revnumber>
 				<date>Sat Apr 20 2019</date>

diff --git a/docbook/Developers_Guide/en-US/Revision_History.xml b/docbook/Developers_Guide/en-US/Revision_History.xml
@@ -7,6 +7,20 @@
 	<title>Revision History</title>
 	<simpara>
 		<revhistory>
+			<revision>
+				<revnumber>2.21-1</revnumber>
+				<date>Thu Jun 13 2019</date>
+				<author>
+					<firstname>Victor</firstname>
+					<surname>Boctor</surname>
+					<email>vboctor@mantisbt.org</email>
+				</author>
+				<revdescription>
+					<simplelist>
+						<member>Release 2.21.1</member>
+					</simplelist>
+				</revdescription>
+			</revision>
 			<revision>
 				<revnumber>2.21-0</revnumber>
 				<date>Sat Apr 20 2019</date>

diff --git a/js/common.js b/js/common.js
@@ -734,6 +734,7 @@ function enableDropzone( classPrefix, autoUpload ) {
 		uploadMultiple: true,
 		parallelUploads: 100,
 		maxFilesize: max_filseize_mb,
+		timeout: 0,
 		addRemoveLinks: !autoUpload,
 		acceptedFiles: zone.data('accepted-files'),
 		thumbnailWidth: 150,