Merged 6.8 branch

3 files changed, 47 insertions, 0 deletions

diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html
index 1e4016db90..c73f9701c5 100644
--- a/WebContent/release-notes.html
+++ b/WebContent/release-notes.html
@@ -60,6 +60,7 @@
       </p>
 
       <ul>
+<<<<<<< HEAD
         <li>Vaadin server and client side classes (<tt>/com</tt>)</li>
         <li>Vaadin server and client side sources (<tt>/com</tt>)</li>
         <li>The default widget set (<tt>/VAADIN/widgetsets</tt>)</li>
@@ -67,6 +68,39 @@
         <li>Release notes (<tt>/release-notes.html</tt>)</li>
         <li>Licensing information (<tt>/license.html</tt>)</li>
       </ul>
+=======
+  <li><a href="http://dev.vaadin.com/ticket/8932">#8932</a>: Custom build from 6.8</li>
+  <li><a href="http://dev.vaadin.com/ticket/8193">#8193</a>: Enter ClickShortcut not working in a PopupView</li>
+  <li><a href="http://dev.vaadin.com/ticket/8584">#8584</a>: Invalid behavior of multiselection for com.vaadin.ui.Table</li>
+  <li><a href="http://dev.vaadin.com/ticket/9136">#9136</a>: Tree throws wrong ItemClickEvent in IE9 (when immediate is set to true)</li>
+  <li><a href="http://dev.vaadin.com/ticket/9139">#9139</a>: TextArea in Internet Explorer</li>
+  <li><a href="http://dev.vaadin.com/ticket/9188">#9188</a>: Error parsing maps with empty string as the last value</li>
+  <li><a href="http://dev.vaadin.com/ticket/7036">#7036</a>: Enable scrollbars on a read-only RichTextArea</li>
+  <li><a href="http://dev.vaadin.com/ticket/8109">#8109</a>: Iterating over Table multiselection causes multiple Vaadin SQLContainer full table scans</li>
+  <li><a href="http://dev.vaadin.com/ticket/8144">#8144</a>: Can't use LoginForm inside an iframe</li>
+  <li><a href="http://dev.vaadin.com/ticket/9202">#9202</a>: Test using Chrome 21</li>
+  <li><a href="http://dev.vaadin.com/ticket/6219">#6219</a>: PDF viewer draws itself over floating Vaadin elements</li>
+  <li><a href="http://dev.vaadin.com/ticket/8230">#8230</a>: TextField's input prompt is persisted if Alt is depressed while in focus (Chrome)</li>
+  <li><a href="http://dev.vaadin.com/ticket/8399">#8399</a>: On IE 8 or Google Chrome 16, VOverlay components aren't display on top of Applet</li>
+  <li><a href="http://dev.vaadin.com/ticket/9148">#9148</a>: Oracle TIMESTAMP not supported in SQLContainer</li>
+  <li><a href="http://dev.vaadin.com/ticket/9189">#9189</a>: Variables sent to the DragAndDropManager are not logged in the debug console</li>
+  <li><a href="http://dev.vaadin.com/ticket/9128">#9128</a>: Typo in vaadin book</li>
+  <li><a href="http://dev.vaadin.com/ticket/8736">#8736</a>: com.vaadin.ui.Table component return null value on multiple selection</li>
+  <li><a href="http://dev.vaadin.com/ticket/9132">#9132</a>: No entries in Table with a defined pageLength causes Table to shrink in height</li>
+  <li><a href="http://dev.vaadin.com/ticket/9147">#9147</a>: SQLContainer Filters - Comparison against NULL value produces error</li>
+  <li><a href="http://dev.vaadin.com/ticket/9154">#9154</a>: NumberFormatException in client-side component VSplitPanel</li>
+  <li><a href="http://dev.vaadin.com/ticket/9171">#9171</a>: StreamVariable never cleaned up in CommunicationManager</li>
+  <li><a href="http://dev.vaadin.com/ticket/9187">#9187</a>: No horizontal scroll bar on empty Table</li>
+  <li><a href="http://dev.vaadin.com/ticket/8838">#8838</a>: Drag and Drop in Google Chrome causes ArrayIndexOutOfBoundsException in AbstractCommunicationManager#convertMap (1612)</li>
+  <li><a href="http://dev.vaadin.com/ticket/8917">#8917</a>: input prompt text is leaking into the component's value</li>
+      </ul>
+          
+      <p>
+        The <a
+        href="http://dev.vaadin.com/query?status=closed&resolution=fixed&milestone=Vaadin+@version@&order=priority">full
+        list of the closed issues</a> can be found at <tt>dev.vaadin.com</tt>.
+      </p>
+>>>>>>> remotes/origin/6.8
 
       <h2 id="enhancements">Enhancements in Vaadin @version-minor@</h2>
 
@@ -348,11 +382,19 @@
       </p>
 
       <ul>
+<<<<<<< HEAD
         <li>Mozilla Firefox 12</li>
         <li>Internet Explorer 8-9</li>
         <li>Safari 5</li>
         <li>Opera 11</li>
         <li>Google Chrome 19</li>
+=======
+        <li>Mozilla Firefox 3-14</li>
+        <li>Internet Explorer 6-9</li>
+        <li>Safari 4-5</li>
+        <li>Opera 10-12</li>
+        <li>Google Chrome 13-21</li>
+>>>>>>> remotes/origin/6.8
       </ul>
 
       <p>
diff --git a/WebContent/statictestfiles/applet.html b/WebContent/statictestfiles/applet.html
new file mode 100644
index 0000000000..05e1785e10
--- /dev/null
+++ b/WebContent/statictestfiles/applet.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+	<applet code="com/vaadin/tests/components/embedded/TestApplet/class"></applet>
+</body>
+</html>
\ No newline at end of file
diff --git a/WebContent/statictestfiles/com/vaadin/tests/components/embedded/TestApplet.class b/WebContent/statictestfiles/com/vaadin/tests/components/embedded/TestApplet.class
new file mode 100644
index 0000000000..7650e1f870
--- /dev/null
+++ b/WebContent/statictestfiles/com/vaadin/tests/components/embedded/TestApplet.class