Merge changes from origin/7.1

0e048a5 Clarified error message (#12583)
d0af7d1 Add async-supported to all servlets to enable push testing (#12573)
1de4389 Use JUnit 4.11 in all modules (#12572)
d6954f8 Include TestBench 3.1.1 in the project (#12572)
cdb9a49 Enable native scrolling in all iOS versions newer than 5, not just iOS 6 (#12324)
0e2780a Ensure string converter is always set
cf796e2 Add v-iosN classname for all iOS versions instead of just N=6 (#12324)
46ac1e6 Update release notes to more closely be like 7.0.x (#12544)
d9f204f PostLayoutListener javadocs (#12562)
c7aaa04 Don't try to cast a connector to Widget. Fixes #12619

Change-Id: Icff34ba20a330e633c1b29ca8fd77d84b79841f5

3 files changed, 38 insertions, 28 deletions

diff --git a/WebContent/VAADIN/themes/base/common/common.scss b/WebContent/VAADIN/themes/base/common/common.scss
index cb3645c9d8..07e244a76f 100644
--- a/WebContent/VAADIN/themes/base/common/common.scss
+++ b/WebContent/VAADIN/themes/base/common/common.scss
@@ -227,11 +227,13 @@ input::-ms-clear {
 	font-size: 0;
 	line-height: normal;
 }
-
-/* Enable kinetic scrolling on iOS 6 */
-.v-ios6.v-webkit & .v-scrollable {
+.v-ios.v-webkit & .v-scrollable {
 	-webkit-overflow-scrolling: touch; 
 }
+/* Disable native scrolling on iOS 5 due to #8792 */
+.v-ios5.v-webkit & .v-scrollable {
+	-webkit-overflow-scrolling: none;
+}
 
 &.v-overlay-container {
 	width: 0;
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index ba948968e2..b93e0670fc 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -24,6 +24,7 @@
             <param-name>application</param-name>
             <param-value>com.vaadin.tests.components.button.Buttons</param-value>
         </init-param>
+        <async-supported>true</async-supported>
     </servlet>
     <servlet>
         <servlet-name>Embed App 2</servlet-name>
@@ -32,6 +33,7 @@
             <param-name>UI</param-name>
             <param-value>com.vaadin.tests.components.label.MarginsInLabels</param-value>
         </init-param>
+        <async-supported>true</async-supported>
     </servlet>
     <servlet>
         <servlet-name>UI provider app</servlet-name>
@@ -44,6 +46,7 @@
             <param-name>UI</param-name>
             <param-value>com.vaadin.tests.VerifyAssertionsEnabled</param-value>
         </init-param>
+        <async-supported>true</async-supported>
     </servlet>
 
     <servlet>
@@ -70,6 +73,7 @@
             <param-name>testParam</param-name>
             <param-value>42</param-value>
         </init-param>
+        <async-supported>true</async-supported>
     </servlet>
 
     <servlet>
diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html
index 387a5121cb..a11e526c3f 100644
--- a/WebContent/release-notes.html
+++ b/WebContent/release-notes.html
@@ -41,10 +41,10 @@
         <ul>
             <li><a href="#overview">Overview of Vaadin
                     @version@ Release</a></li>
+            <li><a href="#changelog">Change log for Vaadin
+                    @version@</a></li>
             <li><a href="#enhancements">Enhancements in Vaadin
                     @version-minor@</a></li>
-            <li><a href="#changelog">Complete change log for
-                    Vaadin @version@</a></li>
             <li><a href="#limitations">Limitations in
                     @version-minor@</a></li>
             <li><a href="#vaadin">Vaadin Installation</a></li>
@@ -63,11 +63,30 @@
         <h2 id="overview">Overview of Vaadin @version@ Release</h2>
 
         <p>
-            Vaadin @version@ is a maintenance release that includes a number
-            of important bug fixes, as listed in the <a href="#changelog">change
-            log</a> below. You can also view the <a
-                href="http://dev.vaadin.com/query?status=closed&resolution=fixed&milestone=Vaadin+@version@&order=priority">list
-                of the closed issues</a> at the Vaadin developer's site.
+            Vaadin @version@ is a maintenance release that includes a
+            number of important bug fixes, as listed in the <a
+                href="#changelog">change log</a> below.
+        </p>
+
+        <p>
+            For a list of enhancements in the last feature release, see
+            <a href="#enhancements">Enhancements in Vaadin
+                @version-minor@</a> and the <a
+                href="http://vaadin.com/download/release/@version-minor@/@version-minor@.0/release-notes.html">Release
+                Notes for Vaadin @version-minor@.0</a>.
+        </p>
+
+        <h3 id="changelog">Change log for Vaadin @version@</h3>
+
+        <p>This release includes the following closed issues:</p>
+
+        <ul>@release-notes-tickets@
+        </ul>
+
+        <p>
+            You can also view the <a
+                href="http://dev.vaadin.com/query?status=closed&resolution=fixed&milestone=Vaadin+@version@&order=id">list
+                of the closed issues</a> at the Vaadin developer's site. .
         </p>
 
         <h2 id="enhancements">Enhancements in Vaadin
@@ -191,21 +210,6 @@
                 streaming to work.</li>
         </ul>
 
-        <h3 id="changelog">ChangeLog</h3>
-
-        <p>This release includes the following closed issues:</p>
-
-        <ul>@release-notes-tickets@
-        </ul>
-
-        <p>
-            The <a
-                href="http://dev.vaadin.com/query?status=closed&resolution=fixed&milestone=Vaadin+7.1.0.beta1&milestone=Vaadin+7.1.0&order=id">full
-                list of the closed issues</a> can also be found at
-            <tt>dev.vaadin.com</tt>
-            .
-        </p>
-
         <h2 id="vaadin">Vaadin Installation</h2>
 
         <p>
@@ -573,11 +577,11 @@
         </p>
 
         <ul>
-            <li>Mozilla Firefox 18-23</li>
+            <li>Mozilla Firefox 18-24</li>
             <li>Mozilla Firefox 17 ESR</li>
             <li>Internet Explorer 8-10</li>
             <li>Safari 6</li>
-            <li>Opera 12</li>
+            <li>Opera 12,16</li>
             <li>Google Chrome 23-29</li>
         </ul>
 
@@ -587,7 +591,7 @@
         </p>
 
         <ul>
-            <li>iOS 5-6</li>
+            <li>iOS 5-7</li>
             <li>Android 2.3-4</li>
         </ul>