]> source.dussan.org Git - vaadin-framework.git/log
vaadin-framework.git
12 years agoMerge branch 'master' into gwt
Henri Sara [Wed, 20 Jun 2012 14:38:17 +0000 (17:38 +0300)]
Merge branch 'master' into gwt

12 years agoEliminate scanning for accept criteria by reversed annotation (#8641)
Henri Sara [Wed, 20 Jun 2012 13:27:32 +0000 (16:27 +0300)]
Eliminate scanning for accept criteria by reversed annotation (#8641)

The new annotation is called AcceptCriterion and is on the client side
class, pointing to the server side implementation.

This change also addresses #5956 (avoid loading classes when scanning -
no more scanning for criteria) and #6750 (logging).

12 years agoRestructure mini tutorial packages
Leif Åstrand [Wed, 20 Jun 2012 13:33:37 +0000 (16:33 +0300)]
Restructure mini tutorial packages

12 years agoDisable tutorial code for browser.getClientHeight/Width as it's broken
Leif Åstrand [Wed, 20 Jun 2012 13:32:41 +0000 (16:32 +0300)]
Disable tutorial code for browser.getClientHeight/Width as it's broken

12 years agoUpdate mini tutorial code to work with current APIs
Leif Åstrand [Wed, 20 Jun 2012 13:31:44 +0000 (16:31 +0300)]
Update mini tutorial code to work with current APIs

12 years agoAdd (partially broken) mini tutorial code to help detecting breakage
Leif Åstrand [Wed, 20 Jun 2012 13:28:05 +0000 (16:28 +0300)]
Add (partially broken) mini tutorial code to help detecting breakage

12 years agoGenerate package exports for the JAR only for com.vaadin and com.google
Henri Sara [Wed, 20 Jun 2012 13:03:55 +0000 (16:03 +0300)]
Generate package exports for the JAR only for com.vaadin and com.google

Other (unrebased) packages are not included in the exported packages
list of the manifest.

12 years agoBuild JAR with most GWT dependency packages rebased using jarjar.
Henri Sara [Wed, 20 Jun 2012 13:01:06 +0000 (16:01 +0300)]
Build JAR with most GWT dependency packages rebased using jarjar.

Precompiled versions of GWT modules (.gwtar files) are not included in
the JAR in this version to reduce its size.

12 years agoJavadocs and minor tweaks for extensions, JavaScript and js wrappers
Leif Åstrand [Wed, 20 Jun 2012 11:36:21 +0000 (14:36 +0300)]
Javadocs and minor tweaks for extensions, JavaScript and js wrappers

12 years agoFix tests broken by the layout overhaul
Johannes Dahlström [Wed, 20 Jun 2012 08:53:32 +0000 (11:53 +0300)]
Fix tests broken by the layout overhaul

12 years agoActually click on the splitter (test broken by #4120 changes)
Johannes Dahlström [Tue, 19 Jun 2012 17:10:36 +0000 (20:10 +0300)]
Actually click on the splitter (test broken by #4120 changes)

12 years agoFixed regression: AbstractClickEventHandler.onMouseUp() should call shouldFireEvent()
Johannes Dahlström [Tue, 19 Jun 2012 17:45:56 +0000 (20:45 +0300)]
Fixed regression: AbstractClickEventHandler.onMouseUp() should call shouldFireEvent()

12 years agoFix DragAndDropWrapper tooltip handling to use shared state
Johannes Dahlström [Tue, 19 Jun 2012 16:17:34 +0000 (19:17 +0300)]
Fix DragAndDropWrapper tooltip handling to use shared state

12 years agoEnsure widgets are scrollable after a state change (see also #8994)
Johannes Dahlström [Tue, 19 Jun 2012 15:23:10 +0000 (18:23 +0300)]
Ensure widgets are scrollable after a state change (see also #8994)

12 years agoFix test broken by a DOM change: properly click the tab close button
Johannes Dahlström [Tue, 19 Jun 2012 12:41:03 +0000 (15:41 +0300)]
Fix test broken by a DOM change: properly click the tab close button

12 years agoRegister mousedown handler correctly
Johannes Dahlström [Tue, 19 Jun 2012 12:19:10 +0000 (15:19 +0300)]
Register mousedown handler correctly

12 years agoProperly update v-disabled styles for most components (#8719)
Leif Åstrand [Tue, 19 Jun 2012 11:03:29 +0000 (14:03 +0300)]
Properly update v-disabled styles for most components (#8719)

12 years agoWindow.showNotification -> Notification.show
Johannes Dahlström [Tue, 19 Jun 2012 11:51:37 +0000 (14:51 +0300)]
Window.showNotification -> Notification.show

12 years agoMerge branch '6.8'
Johannes Dahlström [Tue, 19 Jun 2012 11:48:49 +0000 (14:48 +0300)]
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

12 years agoMerge remote-tracking branch 'origin/master'
Johannes Dahlström [Tue, 19 Jun 2012 10:46:38 +0000 (13:46 +0300)]
Merge remote-tracking branch 'origin/master'

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

12 years agoFix issues caused by 6.8 merge: prevent NPE with componentStyles; ensure split positi...
Johannes Dahlström [Tue, 19 Jun 2012 10:42:11 +0000 (13:42 +0300)]
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

12 years agoUse new Function instead of eval to restrict scope (#8980)
Leif Åstrand [Tue, 19 Jun 2012 10:15:14 +0000 (13:15 +0300)]
Use new Function instead of eval to restrict scope (#8980)

12 years agoFix typo in variable name
Leif Åstrand [Tue, 19 Jun 2012 10:03:27 +0000 (13:03 +0300)]
Fix typo in variable name

12 years agoExtract API from Root to Page (#8907)
Leif Åstrand [Tue, 19 Jun 2012 09:23:33 +0000 (12:23 +0300)]
Extract API from Root to Page (#8907)

12 years agoMerge remote-tracking branch 'origin/master'
Johannes Dahlström [Tue, 19 Jun 2012 08:24:20 +0000 (11:24 +0300)]
Merge remote-tracking branch 'origin/master'

12 years agoDeprecate @LoadScripts to signal that it's a temporary hack (#8888)
Leif Åstrand [Mon, 18 Jun 2012 11:01:29 +0000 (14:01 +0300)]
Deprecate @LoadScripts to signal that it's a temporary hack (#8888)

12 years ago#7938 Added reference to #8971 to the javadoc
Johannes Dahlström [Fri, 15 Jun 2012 12:41:34 +0000 (12:41 +0000)]
#7938 Added reference to #8971 to the javadoc

svn changeset:23950/svn branch:6.8

12 years agoGWT integration: leave out javax.servlet, build INDEX.LIST for the JAR
Henri Sara [Fri, 15 Jun 2012 12:15:12 +0000 (15:15 +0300)]
GWT integration: leave out javax.servlet, build INDEX.LIST for the JAR

12 years ago#7938 Clarified Window.center() javadoc
Johannes Dahlström [Fri, 15 Jun 2012 11:56:15 +0000 (11:56 +0000)]
#7938 Clarified Window.center() javadoc

svn changeset:23949/svn branch:6.8

12 years agoRemove method accidentally left behind (#6730)
Leif Åstrand [Fri, 15 Jun 2012 11:50:11 +0000 (14:50 +0300)]
Remove method accidentally left behind (#6730)

12 years agoTB script for #8949
Johannes Dahlström [Fri, 15 Jun 2012 11:16:06 +0000 (11:16 +0000)]
TB script for #8949

svn changeset:23947/svn branch:6.8

12 years agoAdd API for getting the parent connector's id (#8888)
Leif Åstrand [Fri, 15 Jun 2012 10:56:10 +0000 (13:56 +0300)]
Add API for getting the parent connector's id (#8888)

12 years agoAdd support for getting the dom element for any connector id (#8888)
Leif Åstrand [Fri, 15 Jun 2012 10:39:26 +0000 (13:39 +0300)]
Add support for getting the dom element for any connector id (#8888)

12 years ago#8949 Make sure a drag image always has absolute position
Johannes Dahlström [Fri, 15 Jun 2012 10:38:45 +0000 (10:38 +0000)]
#8949 Make sure a drag image always has absolute position

svn changeset:23944/svn branch:6.8

12 years agoAdd support for callbacks in other objects (e.g. "foo.bar") (#6730)
Leif Åstrand [Fri, 15 Jun 2012 09:44:01 +0000 (12:44 +0300)]
Add support for callbacks in other objects (e.g. "foo.bar") (#6730)

12 years agoGWT integration: only include DefaultWidgetSet.gwtar in Vaadin JAR.
Henri Sara [Fri, 15 Jun 2012 09:22:05 +0000 (12:22 +0300)]
GWT integration: only include DefaultWidgetSet.gwtar in Vaadin JAR.

12 years agoProperly pass arguments from the server to the callbacks (#8888)
Leif Åstrand [Fri, 15 Jun 2012 09:18:48 +0000 (12:18 +0300)]
Properly pass arguments from the server to the callbacks (#8888)

12 years agoAdd StateChangeHandler in init to come after component handler (#8888)
Leif Åstrand [Fri, 15 Jun 2012 09:10:54 +0000 (12:10 +0300)]
Add StateChangeHandler in init to come after component handler (#8888)

12 years agoMerge remote-tracking branch 'origin/master'
Johannes Dahlström [Fri, 15 Jun 2012 08:18:46 +0000 (11:18 +0300)]
Merge remote-tracking branch 'origin/master'

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

12 years agoGWT integration: precompile Vaadin widgetsets to .gwtar files
Henri Sara [Fri, 15 Jun 2012 08:08:43 +0000 (11:08 +0300)]
GWT integration: precompile Vaadin widgetsets to .gwtar files

12 years agoAdd missing Serializable
Leif Åstrand [Fri, 15 Jun 2012 07:13:44 +0000 (10:13 +0300)]
Add missing Serializable

12 years agoAdd missing $entry
Leif Åstrand [Fri, 15 Jun 2012 07:13:08 +0000 (10:13 +0300)]
Add missing $entry

12 years agoImplement js rpc proxy objects and wildcard rpc support (#8888)
Leif Åstrand [Thu, 14 Jun 2012 19:57:28 +0000 (22:57 +0300)]
Implement js rpc proxy objects and wildcard rpc support (#8888)

12 years agoUse callbacks directly as fields in connector object (#8888)
Leif Åstrand [Thu, 14 Jun 2012 18:18:49 +0000 (21:18 +0300)]
Use callbacks directly as fields in connector object (#8888)

12 years agoFixed typo (: instead of =) (#8941)
Artur Signell [Thu, 14 Jun 2012 14:53:11 +0000 (14:53 +0000)]
Fixed typo (: instead of =) (#8941)

svn changeset:23941/svn branch:6.8

12 years agoRename Javascript -> JavaScript
Leif Åstrand [Thu, 14 Jun 2012 14:42:04 +0000 (17:42 +0300)]
Rename Javascript -> JavaScript

12 years agoJavascriptManager -> JavaScript and changes based on review (#6730)
Leif Åstrand [Thu, 14 Jun 2012 14:29:49 +0000 (17:29 +0300)]
JavascriptManager -> JavaScript and changes based on review (#6730)

12 years agoChange package name in js file not changed by previous refactoring
Leif Åstrand [Thu, 14 Jun 2012 14:23:44 +0000 (17:23 +0300)]
Change package name in js file not changed by previous refactoring

12 years agoIntegrate GWT build with Vaadin - first step.
Henri Sara [Thu, 14 Jun 2012 13:56:10 +0000 (16:56 +0300)]
Integrate GWT build with Vaadin - first step.

Build vaadin.jar that contains the contents of gwt-user.jar, gwt-dev.jar
and gwt-codeserver.jar in addition to Vaadin itself.

The property gwt.root must be defined and point to a GWT trunk branch
check-out. The tools branch should be checked out in a directory next to
it.

12 years ago#7766 Use debug id in test to make IE 6,7,8 not fail so har
Johannes Dahlström [Thu, 14 Jun 2012 13:49:03 +0000 (13:49 +0000)]
#7766 Use debug id in test to make IE 6,7,8 not fail so har

svn changeset:23939/svn branch:6.8

12 years ago#8852 Applied Sami's patch with minor changes to comments and the test
Johannes Dahlström [Thu, 14 Jun 2012 13:11:37 +0000 (13:11 +0000)]
#8852 Applied Sami's patch with minor changes to comments and the test

svn changeset:23938/svn branch:6.8

12 years agoAdd shorthand for removing an Extension from its target (#6690)
Leif Åstrand [Thu, 14 Jun 2012 10:39:41 +0000 (13:39 +0300)]
Add shorthand for removing an Extension from its target (#6690)

12 years agoRequire all Connectors to be either Components or Extensions (#6690)
Leif Åstrand [Thu, 14 Jun 2012 10:39:13 +0000 (13:39 +0300)]
Require all Connectors to be either Components or Extensions (#6690)

12 years agoFile missing from previous commit (#6690)
Leif Åstrand [Thu, 14 Jun 2012 10:34:59 +0000 (13:34 +0300)]
File missing from previous commit (#6690)

12 years agoTweaks to Extension API based on review (#6690)
Leif Åstrand [Thu, 14 Jun 2012 10:27:34 +0000 (13:27 +0300)]
Tweaks to Extension API based on review (#6690)

12 years ago#7766 Applied Sami's patch
Johannes Dahlström [Thu, 14 Jun 2012 08:18:04 +0000 (08:18 +0000)]
#7766 Applied Sami's patch

svn changeset:23935/svn branch:6.8

12 years agoFixed some errors caused by 6.8 merge; updated tests to use LegacyWindow/Application
Johannes Dahlström [Wed, 13 Jun 2012 15:17:45 +0000 (18:17 +0300)]
Fixed some errors caused by 6.8 merge; updated tests to use LegacyWindow/Application

12 years agoMerge remote-tracking branch 'origin/master'
Johannes Dahlström [Wed, 13 Jun 2012 14:46:09 +0000 (17:46 +0300)]
Merge remote-tracking branch 'origin/master'

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

12 years agoChange Chameleon -> chameleon + unit test for all builtin themes (#8386)
Leif Åstrand [Wed, 13 Jun 2012 09:03:15 +0000 (09:03 +0000)]
Change Chameleon -> chameleon + unit test for all builtin themes (#8386)

svn changeset:23930/svn branch:6.8

12 years agoMerge commit '62362'
Johannes Dahlström [Tue, 12 Jun 2012 14:21:52 +0000 (17:21 +0300)]
Merge commit '62362'

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

12 years agoMerge commit '39848'
Johannes Dahlström [Tue, 12 Jun 2012 14:20:09 +0000 (17:20 +0300)]
Merge commit '39848'

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

12 years agoMerge commit '0a7f33'
Johannes Dahlström [Tue, 12 Jun 2012 14:15:41 +0000 (17:15 +0300)]
Merge commit '0a7f33'

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

12 years agoMerge commit '948b55'
Johannes Dahlström [Tue, 12 Jun 2012 14:14:54 +0000 (17:14 +0300)]
Merge commit '948b55'

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

12 years agoMerge commit 'f8cb0'
Johannes Dahlström [Tue, 12 Jun 2012 14:14:05 +0000 (17:14 +0300)]
Merge commit 'f8cb0'

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

12 years agoMerge commit '17c14'
Johannes Dahlström [Tue, 12 Jun 2012 14:05:23 +0000 (17:05 +0300)]
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

12 years agoMerge commit 'abdc1'
Johannes Dahlström [Tue, 12 Jun 2012 13:36:04 +0000 (16:36 +0300)]
Merge commit 'abdc1'

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

12 years agoMerge commit '6f729'
Johannes Dahlström [Tue, 12 Jun 2012 13:31:55 +0000 (16:31 +0300)]
Merge commit '6f729'

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

12 years agoMerge commit 'e978b99'
Johannes Dahlström [Tue, 12 Jun 2012 13:27:21 +0000 (16:27 +0300)]
Merge commit 'e978b99'

12 years agoMerge commit '11322'
Johannes Dahlström [Tue, 12 Jun 2012 13:26:45 +0000 (16:26 +0300)]
Merge commit '11322'

12 years agoMerge commit '42dff'
Johannes Dahlström [Tue, 12 Jun 2012 13:26:36 +0000 (16:26 +0300)]
Merge commit '42dff'

12 years agoMerge commit '6e9601'
Johannes Dahlström [Tue, 12 Jun 2012 13:26:30 +0000 (16:26 +0300)]
Merge commit '6e9601'

Conflicts:
WebContent/release-notes.html

12 years agoRefresh row cache in requestRepaintAll to avoid partial repaint (#8714)
Leif Åstrand [Tue, 12 Jun 2012 13:14:19 +0000 (16:14 +0300)]
Refresh row cache in requestRepaintAll to avoid partial repaint (#8714)

12 years agoMerge commit '56d0c'
Johannes Dahlström [Tue, 12 Jun 2012 13:09:25 +0000 (16:09 +0300)]
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

12 years agoTest app for #8714
Leif Åstrand [Tue, 12 Jun 2012 13:00:17 +0000 (16:00 +0300)]
Test app for #8714

12 years agoRename feature -> extension in test classes
Leif Åstrand [Tue, 12 Jun 2012 12:34:09 +0000 (15:34 +0300)]
Rename feature -> extension in test classes

12 years agoNavigator API changes based on review (#8859)
Henri Sara [Tue, 12 Jun 2012 11:17:41 +0000 (14:17 +0300)]
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

12 years agoSome Navigator API changes based on review (#8859).
Henri Sara [Mon, 11 Jun 2012 11:57:19 +0000 (14:57 +0300)]
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

12 years agoFix typo
Leif Åstrand [Tue, 12 Jun 2012 10:51:27 +0000 (13:51 +0300)]
Fix typo

12 years agoChange api to use callback instead or rpc for js callbacks (#8888)
Leif Åstrand [Tue, 12 Jun 2012 10:03:22 +0000 (13:03 +0300)]
Change api to use callback instead or rpc for js callbacks (#8888)

Also change JavascriptCallback.call to throw JSONException

12 years agoCall request repaint after manually triggering rpc (#8888)
Leif Åstrand [Tue, 12 Jun 2012 09:11:50 +0000 (12:11 +0300)]
Call request repaint after manually triggering rpc (#8888)

12 years agoFix typo
Leif Åstrand [Tue, 12 Jun 2012 07:50:59 +0000 (10:50 +0300)]
Fix typo

12 years agoAdd support for simplified RPC communication with JS code (#8888)
Leif Åstrand [Tue, 12 Jun 2012 07:41:51 +0000 (10:41 +0300)]
Add support for simplified RPC communication with JS code (#8888)

12 years agoShow better message when RPC method is not found
Leif Åstrand [Tue, 12 Jun 2012 07:37:15 +0000 (10:37 +0300)]
Show better message when RPC method is not found

12 years agoSupport sending raw JSON values (#8888)
Leif Åstrand [Tue, 12 Jun 2012 07:36:54 +0000 (10:36 +0300)]
Support sending raw JSON values (#8888)

12 years agoInitial javascript callback support (#6730)
Leif Åstrand [Mon, 11 Jun 2012 18:52:26 +0000 (21:52 +0300)]
Initial javascript callback support (#6730)

12 years agoInitial support for javascript components (#8888)
Leif Åstrand [Sun, 10 Jun 2012 12:10:10 +0000 (15:10 +0300)]
Initial support for javascript components (#8888)

12 years agoRename addExtensionTo -> attachTo (#6690)
Leif Åstrand [Mon, 11 Jun 2012 16:53:59 +0000 (19:53 +0300)]
Rename addExtensionTo -> attachTo (#6690)

12 years agoMerge commit '61638'
Johannes Dahlström [Mon, 11 Jun 2012 15:16:29 +0000 (18:16 +0300)]
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

12 years agoMerge commit '6d07c'
Johannes Dahlström [Mon, 11 Jun 2012 14:57:38 +0000 (17:57 +0300)]
Merge commit '6d07c'

12 years agoMerge commit 'bc630'
Johannes Dahlström [Mon, 11 Jun 2012 14:57:01 +0000 (17:57 +0300)]
Merge commit 'bc630'

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

12 years agoMerge commit '165544'
Johannes Dahlström [Mon, 11 Jun 2012 14:49:45 +0000 (17:49 +0300)]
Merge commit '165544'

12 years agoMerge commit '8e5b5'
Johannes Dahlström [Mon, 11 Jun 2012 14:49:03 +0000 (17:49 +0300)]
Merge commit '8e5b5'

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

12 years agoMerge commit 'bb48c'
Johannes Dahlström [Mon, 11 Jun 2012 14:45:52 +0000 (17:45 +0300)]
Merge commit 'bb48c'

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

12 years agoMerge commit 'cb20a6'
Johannes Dahlström [Mon, 11 Jun 2012 14:41:13 +0000 (17:41 +0300)]
Merge commit 'cb20a6'

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

12 years agoMerge commit 'b0210'
Johannes Dahlström [Mon, 11 Jun 2012 13:39:55 +0000 (16:39 +0300)]
Merge commit 'b0210'

12 years agoMerge commit 'edf451'
Johannes Dahlström [Mon, 11 Jun 2012 13:39:39 +0000 (16:39 +0300)]
Merge commit 'edf451'

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

12 years agoMerge commit 'e8a652'
Johannes Dahlström [Mon, 11 Jun 2012 12:59:39 +0000 (15:59 +0300)]
Merge commit 'e8a652'

12 years agoMerge commit 'e8844'
Johannes Dahlström [Mon, 11 Jun 2012 12:59:16 +0000 (15:59 +0300)]
Merge commit 'e8844'

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

12 years agoMerge commit '9fc49'
Johannes Dahlström [Mon, 11 Jun 2012 12:34:29 +0000 (15:34 +0300)]
Merge commit '9fc49'

12 years agoMerge commit '35b979'
Johannes Dahlström [Mon, 11 Jun 2012 12:34:11 +0000 (15:34 +0300)]
Merge commit '35b979'