Window.showNotification -> Notification.show

Merge branch '6.8'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapper.java
src/com/vaadin/terminal/gwt/client/ui/form/VForm.java
src/com/vaadin/terminal/gwt/client/ui/window/VWindow.java
tests/server-side/com/vaadin/tests/VaadinClasses.java

Removed Java5-incompatible @Override annotations

Merge remote-tracking branch 'origin/master'

Conflicts:
tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java

Fix issues caused by 6.8 merge: prevent NPE with componentStyles; ensure split position limits are properly set; ensure panels are scrollable after state change

Use new Function instead of eval to restrict scope (#8980)

Fix typo in variable name

Extract API from Root to Page (#8907)

Merge remote-tracking branch 'origin/master'

Deprecate @LoadScripts to signal that it's a temporary hack (#8888)

#7938 Added reference to #8971 to the javadoc

svn changeset:23950/svn branch:6.8

#7938 Clarified Window.center() javadoc

svn changeset:23949/svn branch:6.8

Remove method accidentally left behind (#6730)

TB script for #8949

svn changeset:23947/svn branch:6.8

Add API for getting the parent connector's id (#8888)

Add support for getting the dom element for any connector id (#8888)

#8949 Make sure a drag image always has absolute position

svn changeset:23944/svn branch:6.8

Add support for callbacks in other objects (e.g. "foo.bar") (#6730)

Properly pass arguments from the server to the callbacks (#8888)

Add StateChangeHandler in init to come after component handler (#8888)

Merge remote-tracking branch 'origin/master'

Conflicts:
src/com/vaadin/terminal/gwt/server/DragAndDropService.java

Add missing Serializable

Add missing $entry

Implement js rpc proxy objects and wildcard rpc support (#8888)

Use callbacks directly as fields in connector object (#8888)

Fixed typo (: instead of =) (#8941)

svn changeset:23941/svn branch:6.8

Rename Javascript -> JavaScript

JavascriptManager -> JavaScript and changes based on review (#6730)

Change package name in js file not changed by previous refactoring

#7766 Use debug id in test to make IE 6,7,8 not fail so har

svn changeset:23939/svn branch:6.8

#8852 Applied Sami's patch with minor changes to comments and the test

svn changeset:23938/svn branch:6.8

Add shorthand for removing an Extension from its target (#6690)

Require all Connectors to be either Components or Extensions (#6690)

File missing from previous commit (#6690)

Tweaks to Extension API based on review (#6690)

#7766 Applied Sami's patch

svn changeset:23935/svn branch:6.8

Fixed some errors caused by 6.8 merge; updated tests to use LegacyWindow/Application

Merge remote-tracking branch 'origin/master'

Conflicts:
src/com/vaadin/terminal/gwt/server/DragAndDropService.java

Change Chameleon -> chameleon + unit test for all builtin themes (#8386)

svn changeset:23930/svn branch:6.8

Merge commit '62362'

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

Merge commit '39848'

Conflicts:
WebContent/release-notes.html
src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java

Merge commit '0a7f33'

Conflicts:
src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java

Merge commit '948b55'

Conflicts:
src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java

Merge commit 'f8cb0'

Conflicts:
src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java

Merge commit '17c14'

Conflicts:
src/com/vaadin/Application.java
src/com/vaadin/data/util/MethodPropertyDescriptor.java
src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
src/com/vaadin/terminal/gwt/server/DragAndDropService.java
src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java
src/com/vaadin/ui/Table.java
tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java

Merge commit 'abdc1'

Conflicts:
WebContent/release-notes.html
src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java

Merge commit '6f729'

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

Merge commit 'e978b99'

Merge commit '11322'

Merge commit '42dff'

Merge commit '6e9601'

Conflicts:
WebContent/release-notes.html

Refresh row cache in requestRepaintAll to avoid partial repaint (#8714)

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

Test app for #8714

Rename feature -> extension in test classes

Navigator API changes based on review (#8859)

- Simplify the default providers and move addView()/removeView() logic
to Navigator itself.
- use longest matching view name to manage view hierarchy
- minor cleanup

Some Navigator API changes based on review (#8859).

The changes in this changeset include
- remove the concept of main view (use empty view name)
- remove View.init()
- use ViewChangeEvent in ViewChangeListener
- remove internal parameters
- add getDisplay() and a constructor that creates a SimpleViewDisplay by
default

Fix typo

Change api to use callback instead or rpc for js callbacks (#8888)

Also change JavascriptCallback.call to throw JSONException

Call request repaint after manually triggering rpc (#8888)

Fix typo

Add support for simplified RPC communication with JS code (#8888)

Show better message when RPC method is not found

Support sending raw JSON values (#8888)

Initial javascript callback support (#6730)

Initial support for javascript components (#8888)

Rename addExtensionTo -> attachTo (#6690)

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