Merge commit '42dff'

Merge commit '6e9601'

Conflicts:
WebContent/release-notes.html

Merge commit '56d0c'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/ClickEventHandler.java
src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java
src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java
src/com/vaadin/ui/AbstractSplitPanel.java

Merge commit '61638'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/ClickEventHandler.java
tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.html
tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.html

Merge commit '6d07c'

Merge commit 'bc630'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java

Merge commit '165544'

Merge commit '8e5b5'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheet.java

Merge commit 'bb48c'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java

Merge commit 'cb20a6'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java

Merge commit 'b0210'

Merge commit 'edf451'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java

Merge commit 'e8a652'

Merge commit 'e8844'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java

Merge commit '9fc49'

Merge commit '35b979'

Merge commit '375f73'

Conflicts:
tests/test.xml

Merge commit 'e7f31'

Conflicts:
src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java

Merge commit 'e085e'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java
tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java

Merge commit 'bec62'

Conflicts:
WebContent/VAADIN/themes/base/common/common.css
src/com/vaadin/terminal/gwt/client/ui/button/VButton.java
src/com/vaadin/ui/Button.java

Merge commit '99786'

Conflicts:
src/com/vaadin/ui/TabSheet.java

Merge commit 'ecd026'

Conflicts:
src/com/vaadin/ui/TreeTable.java

Merge commit 'b5486'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java

Merge commit 'adf89'

Merge commit 'a21464'

Fix accidentally committed file with unresolved conflicts

Merge commit '8b064'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/panel/VPanel.java
src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java

Merge commit '0ec349'

Merge commit 'c03c4'

Merge commit '22652b'

Merge commit '9ae6c'

Merge commit '321b4'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java

Merge commit '38263'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/panel/VPanel.java

Merge commit 'ac2008'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java

Merge commit '716de'

Merge commit '95e0de'

Merge commit 'b50dcc'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheetPanel.java

Merge commit '16c91'

Merge commit 'f560e'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java

Merge commit '239aad'

Conflicts:
WebContent/VAADIN/themes/base/panel/panel.css

Merge commit 'bb486'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/accordion/VAccordion.java

Merge commit '8383b'

Merge commit '0c4034'

Merge commit '33371'

Fixed a broken merge

Merge commit 'c8a4ca'

Merge commit 'f6bfd'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java

Merge commit 'd53b6'

Merge commit '0bcee'

Merge commit '2f9e5'

Merge commit 'af1952'

Merge commit '8cfb8'

Merge commit 'ff05bab'

Merge commit '62c36'

Merge commit '97df7e'

Merge commit '257d49'

Conflicts:
tests/testbench/com/vaadin/tests/application/PaintableIdsShouldBeUnique.java
tests/testbench/com/vaadin/tests/components/TestBase.java
tests/testbench/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java
tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java
tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
tests/testbench/com/vaadin/tests/components/window/ReplacingComponentsInHandleParameters.java
tests/testbench/com/vaadin/tests/containers/TableWithFileSystemContainer.java
tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java
tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
tests/testbench/com/vaadin/tests/tickets/Ticket6002.java

Changed tests creating their own main windows (without a good reason) and extending AbstractTestBase to call getMainWindow() and extend TestBase instead

Merge commit 'a810ce'

Conflicts:
src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java

Merge commit '03b611'

Merge commit 'c3bba'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheetPanel.java

Merge commit '33e3d'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/panel/VPanel.java

Merge commit '4599e'

Merge commit '295e0'

Merge commit '63dc0'

Conflicts:
WebContent/VAADIN/themes/base/common/common.css

Merge commit '2a72a'

Conflicts:
src/com/vaadin/terminal/UserError.java

Fix broken error tooltips in FormLayout (#8794)

Use generic parameter types for server->client RPC

Don't expect type info for Lists, Sets and Arrays (#8879)

Don't fail if opening tooltip for disappeared component

Made it possible to override the type of wrapped request used in portals

Accidentally removed change restored by this commit.

Fix broken enums in UIDL message (#8878)

Use camelCase field names -> JSON more suitable for javascript (#8888)

Use update from deserialize instead of generating the same code again

Also slightly improve indenting in generated code

Remove redundant ConnectorMap from JsonEncoder.encode

Change map serialization to use same scheme as GWT AutoBean (#8602)

Don't send type info from server to client (#8879)

Pass declared types to JsonDecoder and use them (#8677)

Add DiffJSONSerializer for updating existing objects (#8879)

This is work in progress towards using declared types for data received
from the server.

Refactor RpcManager to provide info about parameter types (#8879)

This is an intermediate step towards decoding everything received from
the server based on its declared type.

Extract duplicated code for decoding collections

Drop explicit type info from client -> server communication (#8879)

Use UidlValue for sending legacy maps and arrays (#8878)

Wrap variable change data in UidlValue wrapper with type info (#8878)

This is the first step towards dropping type info from the sent data for
everything except changeVariables data

Add missing call to super.detach() (#6690)

Change widget -> connector in some places

Fix missing licenses and Serializable (#6690)

Redefine isVisible to not paint dirty detached component (#6690)

Fix some broken hierarchies (#6690)

Fix accidental invalid cast (#6690)

Initial extension support (#6690)

Deprecate WidgetSetCompiler, not needed with Java6 (but used in Eclipse)

Repaint when contents changes (#8735)

Repaint when contents changes (#8832)

Updated to be Root-based and added debug ids to ease testing

Added generic test for FormLayout

Fixed header height by taking padding into account (box sizing change)

#1744 Fixed a regression

svn changeset:23854/svn branch:6.8

Updated Release Notes for Vaadin 6.8 RC1. Cleanup of the invalid HTML formatting.

svn changeset:23853/svn branch:6.8

[merge from 6.7] Small tweaks to #4120 based on review

svn changeset:23852/svn branch:6.8

VFilterSelect implements SubPartAware #8878

svn changeset:23851/svn branch:6.8

Support for additional build time non-Ivy JARs in build.xml .