]> source.dussan.org Git - vaadin-framework.git/log
vaadin-framework.git
12 years agoRename connector resource -> dependency resource (#9691) 66/66/2
Leif Åstrand [Fri, 5 Oct 2012 09:02:51 +0000 (12:02 +0300)]
Rename connector resource -> dependency resource (#9691)

Change-Id: If263c3e9eb3d2221ae7a7ca39c5bc05f2c8c14d9

12 years agoMerge "Refactor OSGi manifest attribute handling to support import/export better...
Henri Sara [Tue, 9 Oct 2012 07:15:38 +0000 (07:15 +0000)]
Merge "Refactor OSGi manifest attribute handling to support import/export better (#9793)"

12 years agoRefactor OSGi manifest attribute handling to support import/export better (#9793) 75/75/2
Artur Signell [Mon, 8 Oct 2012 13:00:37 +0000 (16:00 +0300)]
Refactor OSGi manifest attribute handling to support import/export better (#9793)

Change-Id: Iae53213b40a688b27a4195fa25c998d3ba43cba3

12 years agoMerge changes I9bcdc149,Ia25f247c
Leif Åstrand [Tue, 9 Oct 2012 06:46:52 +0000 (06:46 +0000)]
Merge changes I9bcdc149,Ia25f247c

* changes:
  Make vaadin.themes a bundle (#9793)
  Make vaadin.client-compiled a bundle (#9793)

12 years agoAdded build conf to make deps non-optional in pom.xml (#9852) 77/77/2
Artur Signell [Tue, 9 Oct 2012 05:37:52 +0000 (08:37 +0300)]
Added build conf to make deps non-optional in pom.xml (#9852)

Change-Id: I99fc667a65b39e2ac58351a312f2570e371ee421

12 years agoMerge "Remove CombinedRequest and BrowserDetails (#8165)"
Henri Sara [Mon, 8 Oct 2012 14:17:05 +0000 (14:17 +0000)]
Merge "Remove CombinedRequest and BrowserDetails (#8165)"

12 years agoRemove CombinedRequest and BrowserDetails (#8165) 71/71/2
Leif Åstrand [Mon, 8 Oct 2012 14:07:25 +0000 (17:07 +0300)]
Remove CombinedRequest and BrowserDetails (#8165)

* Primary use case for CombinedRequest (special path and parameters)
already elimiated by other changes
* BrowserDetails.getLocation is now available through Page
* BrowserDetails.getWindowName only used internally in one location
* VaadinServletRequest.cast and similar for portlets removed now that a
normal cast can always be used as there's no CombinedRequest to consider

Change-Id: I44f28722a12f86015b3c30e83768e4611b87479c

12 years agoMerge branch 'sass'
John Ahlroos [Mon, 8 Oct 2012 13:05:20 +0000 (16:05 +0300)]
Merge branch 'sass'

12 years agoMerge branch 'master' into sass
John Ahlroos [Mon, 8 Oct 2012 13:04:56 +0000 (16:04 +0300)]
Merge branch 'master' into sass

12 years agoMake vaadin.themes a bundle (#9793) 74/74/1
Artur Signell [Mon, 8 Oct 2012 12:59:30 +0000 (15:59 +0300)]
Make vaadin.themes a bundle (#9793)

Refactored themes/build.xml to use the common.xml jar target

Change-Id: I9bcdc149f0995814faa172023059e615d683d034

12 years agoMake vaadin.client-compiled a bundle (#9793) 73/73/1
Artur Signell [Mon, 8 Oct 2012 12:56:55 +0000 (15:56 +0300)]
Make vaadin.client-compiled a bundle (#9793)

Refactored client-compiled/build.xml to use the common.xml jar target

Change-Id: Ia25f247cd91b2a93b7abd739e015a34ee46268be

12 years agoCleaned up GeneratePackageExports (#9793) 72/72/1
Artur Signell [Mon, 8 Oct 2012 12:50:21 +0000 (15:50 +0300)]
Cleaned up GeneratePackageExports (#9793)

No longer deletes existing Export-Packages or generate empty Export-Package attributes

Change-Id: I17df2f74b42a50a3b2c63bc4fb79a92721aabd72

12 years agoFixed some issues found in review for #9724
John Ahlroos [Mon, 8 Oct 2012 11:34:58 +0000 (14:34 +0300)]
Fixed some issues found in review for #9724

12 years agoRemove VaadinServiceSession.getURL (#9884) 70/70/3
Leif Åstrand [Mon, 8 Oct 2012 10:17:07 +0000 (13:17 +0300)]
Remove VaadinServiceSession.getURL (#9884)

* Give an URL to LegacyApplication when initializing
* Update LoginForm to use DynamicConnectorResource instead of
RequestHandler
* Make CustomUIClassLoader work again (including previous issues not
caused by this change)
* Update some other tests to use more sensible URLs

Change-Id: I53ed5e9be3b44ed1b62f9762507b0007d53f15b7

12 years agoBootstrap UI using relative URLs with servlets (#6771) 59/59/5
Leif Åstrand [Mon, 8 Oct 2012 05:11:51 +0000 (08:11 +0300)]
Bootstrap UI using relative URLs with servlets (#6771)

* Configure widgetset using URLs relative to the requested page
* Provide a Util method for getting an absolute URL from a relative URL
* Test by using an embedded Jetty acting as a transparent proxy
* Make /embed1 use the Buttons test to enable testing UIDL requests

Change-Id: I4ef9b40e3954ae16b682d743a339f4360db40d4d

12 years agoAdd SystemMessagesProvider for getting messages for a Locale (#4127) 65/65/2
Leif Åstrand [Fri, 5 Oct 2012 07:32:48 +0000 (10:32 +0300)]
Add SystemMessagesProvider for getting messages for a Locale (#4127)

Also add an internal helper for finding the most suitable Locale based
on the currently available information.

Change-Id: Ie9893db4be5ace7b0d60c030b7ca383359500525

12 years agoMerge "Add Page.getLocation() (#9249)"
Leif Åstrand [Fri, 5 Oct 2012 13:08:28 +0000 (13:08 +0000)]
Merge "Add Page.getLocation() (#9249)"

12 years agoMerge "Fixed datefield height #9798"
Johannes Dahlström [Fri, 5 Oct 2012 11:12:48 +0000 (11:12 +0000)]
Merge "Fixed datefield height #9798"

12 years agoAdd Page.getLocation() (#9249) 63/63/2
Johannes Dahlström [Thu, 4 Oct 2012 15:21:03 +0000 (18:21 +0300)]
Add Page.getLocation() (#9249)

* Send the whole window location, not just fragment, in bootstrap and when the fragment changes
* BrowserDetails now has URI getLocation() instead of String getUriFragment()
* Keep FragmentChangeListeners as-is, should perhaps change to LocationChangeListeners at some point
* Implement Page.getFragment() by means of Page.getLocation()
* Differentiate between no fragment (null) and empty fragment ("") as java.net.URI does

Change-Id: I1da1ea0664304d0c121a57e85d127fe48605e940

12 years agoAllow servletInitialized,portletInitialized to throw exception (#9848) 69/69/1
Artur Signell [Fri, 5 Oct 2012 10:38:32 +0000 (13:38 +0300)]
Allow servletInitialized,portletInitialized to throw exception (#9848)

Change-Id: Ib0fd2524ba82998063b21d6c3b56897270c24b2c

12 years agoMade test pass by correcting css and removing failing rules 68/68/1
Artur Signell [Fri, 5 Oct 2012 10:15:29 +0000 (13:15 +0300)]
Made test pass by correcting css and removing failing rules

Re-add
.v-app-loginpage .v-button, .v-app-loginpage .v-button
once #9871 is fixed

Re-add
top: expression(document.documentElement.scrollTop +   "px");
once #9870 is fixed

Change-Id: Id2a297feb371b5e02f6ed494c352aeed192f2ba8

12 years agoRemove getters and setters from converted state
Leif Åstrand [Fri, 5 Oct 2012 09:01:43 +0000 (12:01 +0300)]
Remove getters and setters from converted state

12 years agoMerge changes I0cc40f7c,Ia65d8bfb,I03ad3d60
Artur Signell [Fri, 5 Oct 2012 08:29:46 +0000 (08:29 +0000)]
Merge changes I0cc40f7c,Ia65d8bfb,I03ad3d60

* changes:
  Declared dependencies for jars found in Maven (#9852)
  Use rebased Guava from vaadin-shared-deps (#9612)
  Use Flute from vaadin-shared-deps (#9612)

12 years agoMerge "Fixed selectors in layout.scss #9860"
John Ahlroos [Fri, 5 Oct 2012 06:08:55 +0000 (06:08 +0000)]
Merge "Fixed selectors in layout.scss #9860"

12 years agoMerge "Added IE8 HTML5 doctype fix for removing unneeded scrollbars in splitpanel...
John Ahlroos [Fri, 5 Oct 2012 06:08:13 +0000 (06:08 +0000)]
Merge "Added IE8 HTML5 doctype fix for removing unneeded scrollbars in splitpanel #9552"

12 years agoAdded IE8 HTML5 doctype fix for removing unneeded scrollbars in splitpanel #9552 57/57/4
John Ahlroos [Thu, 4 Oct 2012 11:12:38 +0000 (14:12 +0300)]
Added IE8 HTML5 doctype fix for removing unneeded scrollbars in splitpanel #9552

Change-Id: I2d9abc2add60809412a8625d4b4753aca408c7cd

12 years agoAdds one test for sass mixins
Marc Englund [Thu, 4 Oct 2012 13:29:26 +0000 (16:29 +0300)]
Adds one test for sass mixins

Change-Id: I9e42bbc075cc3ef84c1a7bf5b449f18df5773327

12 years agoDeclared dependencies for jars found in Maven (#9852) 60/60/1
Artur Signell [Thu, 4 Oct 2012 13:20:06 +0000 (16:20 +0300)]
Declared dependencies for jars found in Maven (#9852)

Change-Id: I0cc40f7c10c1dc6a1dcaff48e86d04079c1f70ae

12 years agoSass mixin cleanup (author: seba)
Marc Englund [Thu, 4 Oct 2012 13:15:53 +0000 (16:15 +0300)]
Sass mixin cleanup (author: seba)

Change-Id: Ie462d5e213d4e81430143aa9d0708fac6b8d77d4

12 years agoFully fixes #9846, sass mixins with multiple optional params (author: seba)
Marc Englund [Thu, 4 Oct 2012 12:49:12 +0000 (15:49 +0300)]
Fully fixes #9846, sass mixins with multiple optional params  (author: seba)

Change-Id: I8330c6c0a7022b3485bbfee5c6a4833ef5cb4e1d

12 years agoPartial fix for sass mixins with multiple optional params #9846 (author: seba)
Marc Englund [Thu, 4 Oct 2012 12:46:02 +0000 (15:46 +0300)]
Partial fix for sass mixins with multiple optional params #9846 (author: seba)

Change-Id: Iacd94ffb41a91e9dd20874cd7f981830e4267a87

12 years agoFixed selectors in layout.scss #9860 58/58/1
John Ahlroos [Thu, 4 Oct 2012 12:04:45 +0000 (15:04 +0300)]
Fixed selectors in layout.scss #9860

Change-Id: I297de32c4123ecc70bbadd92171b7858d7ef7399

12 years agoAdds support for CSS3 selectors #9858 (autor: seba)
Marc Englund [Thu, 4 Oct 2012 11:55:56 +0000 (14:55 +0300)]
Adds support for CSS3 selectors #9858 (autor: seba)

Change-Id: Icd8e0fd09c3964ebbfab8f130d7945e51af326d7

12 years agoFontFace nodes are created correctly, fixes #9611 (author: seba)
Marc Englund [Thu, 4 Oct 2012 11:38:41 +0000 (14:38 +0300)]
FontFace nodes are created correctly, fixes #9611 (author: seba)

Change-Id: Ifbec8e848654c19e95c19cce05976ed9e5d8290a

12 years agoMerge "Fixed combobox line heights in Chameleon theme #9838"
Johannes Dahlström [Thu, 4 Oct 2012 10:48:16 +0000 (10:48 +0000)]
Merge "Fixed combobox line heights in Chameleon theme #9838"

12 years agoMerge "Removed hard coded package names from export metadata generator (#9612)"
Johannes Dahlström [Thu, 4 Oct 2012 10:02:23 +0000 (10:02 +0000)]
Merge "Removed hard coded package names from export metadata generator (#9612)"

12 years agoMerge "Remove default bootstrap parameter support (#9824)"
Johannes Dahlström [Thu, 4 Oct 2012 09:59:02 +0000 (09:59 +0000)]
Merge "Remove default bootstrap parameter support (#9824)"

12 years agoUse rebased Guava from vaadin-shared-deps (#9612) 56/56/1
Artur Signell [Thu, 4 Oct 2012 05:55:35 +0000 (08:55 +0300)]
Use rebased Guava from vaadin-shared-deps (#9612)

Change-Id: Ia65d8bfb76842060c4f0a859588a75fb9b167900

12 years agoUse Flute from vaadin-shared-deps (#9612) 55/55/1
Artur Signell [Thu, 4 Oct 2012 05:53:02 +0000 (08:53 +0300)]
Use Flute from vaadin-shared-deps (#9612)

Change-Id: I03ad3d6070d6a87e98f28e5871df36aaf269edb8

12 years agoMerge "Revert "FontFace nodes are created correctly, fixes #9611" Should not be in...
Marc Englund [Thu, 4 Oct 2012 07:53:19 +0000 (07:53 +0000)]
Merge "Revert "FontFace nodes are created correctly, fixes #9611" Should not be in master yet."

12 years agoRevert "FontFace nodes are created correctly, fixes #9611" 53/53/1
Marc Englund [Thu, 4 Oct 2012 07:50:40 +0000 (07:50 +0000)]
Revert "FontFace nodes are created correctly, fixes #9611"
Should not be in master yet.

This reverts commit f310829d004443b40d32698bd46c9c7db8ba187a

12 years agoMerge "FontFace nodes are created correctly, fixes #9611"
Marc Englund [Thu, 4 Oct 2012 07:28:18 +0000 (07:28 +0000)]
Merge "FontFace nodes are created correctly, fixes #9611"

12 years agoFontFace nodes are created correctly, fixes #9611 52/52/1
Marc Englund [Thu, 4 Oct 2012 07:17:38 +0000 (10:17 +0300)]
FontFace nodes are created correctly, fixes #9611

Change-Id: I4ac14c512b7585979f3e88126a7106e469d29f7f

12 years agoMerge branch 'master' into sass
Marc Englund [Thu, 4 Oct 2012 06:34:37 +0000 (09:34 +0300)]
Merge branch 'master' into sass

Conflicts:
WebContent/VAADIN/themes/base/formlayout/formlayout.scss
WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss

Change-Id: Ie895a1bbafdcf2fe79d500efb04c6eef3f5a812e

12 years agoMerge "Avoid NPEs in integration test"
Leif Åstrand [Thu, 4 Oct 2012 06:21:45 +0000 (06:21 +0000)]
Merge "Avoid NPEs in integration test"

12 years agoFixed datefield height #9798 50/50/1
John Ahlroos [Thu, 4 Oct 2012 05:50:47 +0000 (08:50 +0300)]
Fixed datefield height #9798

Change-Id: Iabd4c7e7729efeed02f8be087769de5f51634662

12 years agoMerge "Firefox now uses the overflow autofix + made sure we don't trigger a layout...
Leif Åstrand [Wed, 3 Oct 2012 12:52:38 +0000 (12:52 +0000)]
Merge "Firefox now uses the overflow autofix + made sure we don't trigger a layout phase while running another layout phase #9845"

12 years agoTest case for #9508
Johannes Dahlström [Tue, 25 Sep 2012 14:52:27 +0000 (14:52 +0000)]
Test case for #9508

svn changeset:24580/svn branch:6.8

Change-Id: I2cb7dd24e09c8aaa439b43881ac6a5327cf0fac1

12 years agoEnsure the browser does not cache UIDL responses (#9732)
Johannes Dahlström [Tue, 25 Sep 2012 11:25:04 +0000 (11:25 +0000)]
Ensure the browser does not cache UIDL responses (#9732)

svn changeset:24575/svn branch:6.8

Conflicts:

src/com/vaadin/terminal/gwt/server/CommunicationManager.java

Change-Id: I64a1a8300ab1d96e7a9b22c5ed53398cf0dd3f74

12 years agoFirefox now uses the overflow autofix + made sure we don't trigger a layout phase... 48/48/1
John Ahlroos [Wed, 3 Oct 2012 11:24:01 +0000 (14:24 +0300)]
Firefox now uses the overflow autofix + made sure we don't trigger a layout phase while running another layout phase #9845

Change-Id: I5a5bdf5ffdf84f86054f3f6f1d79737e630e41cb

12 years agoFixed combobox line heights in Chameleon theme #9838 46/46/1
John Ahlroos [Wed, 3 Oct 2012 06:11:54 +0000 (09:11 +0300)]
Fixed combobox line heights in Chameleon theme #9838

Change-Id: I2193f9304b378084bdd9f0e750e049af5af5e0ec

12 years agoRemoved hard coded package names from export metadata generator (#9612) 44/44/1
Artur Signell [Tue, 2 Oct 2012 15:06:08 +0000 (18:06 +0300)]
Removed hard coded package names from export metadata generator (#9612)

Change-Id: I860d9241e270a2a96796b4800f0bbbc808e2e710

12 years agoAvoid NPEs in integration test 43/43/1
Artur Signell [Tue, 2 Oct 2012 15:03:22 +0000 (18:03 +0300)]
Avoid NPEs in integration test

Change-Id: Idc20efce93e2ee6f7e9cba2eb3676e6e6ec41771

12 years agoFixes #9828 - ComponentLocator now makes use of debug IDs if present 34/34/1
Jonatan Kronqvist [Tue, 2 Oct 2012 10:54:48 +0000 (13:54 +0300)]
Fixes #9828 - ComponentLocator now makes use of debug IDs if present

Change-Id: I58aeee42ef386dd3eef8fdf25f8dd430eb22774c

12 years agoRemove default bootstrap parameter support (#9824) 33/33/1
Leif Åstrand [Tue, 2 Oct 2012 09:34:28 +0000 (12:34 +0300)]
Remove default bootstrap parameter support (#9824)

Also remove the code that used to set the pathInfo parameter which is
never used.

Change-Id: I0ec7cc8453766bccf9527bfcf5e78411364da5f0

12 years agoMerge "Merge from 6.8: Limit propagation of vertical spacing and margins in nested...
Johannes Dahlström [Tue, 2 Oct 2012 08:07:33 +0000 (08:07 +0000)]
Merge "Merge from 6.8: Limit propagation of vertical spacing and margins in nested FormLayouts, related test (#9427)"

12 years agoMerge "Merged tests for initial fragment events (#9558)"
Johannes Dahlström [Tue, 2 Oct 2012 08:04:04 +0000 (08:04 +0000)]
Merge "Merged tests for initial fragment events (#9558)"

12 years agoMake DefaultUIProvider work with lower case parameter name (#9474) 32/32/1 7.0.0.beta3
Leif Åstrand [Tue, 2 Oct 2012 07:21:39 +0000 (10:21 +0300)]
Make DefaultUIProvider work with lower case parameter name (#9474)

Change-Id: I1c66f1661fee32ce924f5923c15a5c86b25465e1

12 years agoMerge "Merge from 6.8: Large lazy container for tests"
Artur Signell [Tue, 2 Oct 2012 06:29:01 +0000 (06:29 +0000)]
Merge "Merge from 6.8: Large lazy container for tests"

12 years agoMerge changes Iae2ac641,I50a0ac7a
Leif Åstrand [Tue, 2 Oct 2012 06:24:26 +0000 (06:24 +0000)]
Merge changes Iae2ac641,I50a0ac7a

* changes:
  Made GlobalResourceHandler serializable (#9817)
  Updated GAE test to be UI based (#9816)

12 years agoMerge from 6.8: Large lazy container for tests 27/27/2
Henri Sara [Tue, 2 Oct 2012 06:22:56 +0000 (09:22 +0300)]
Merge from 6.8: Large lazy container for tests

svn changeset:24517/svn branch:6.8

Change-Id: I215e0471f608bda6bee27309426a96139a147275

12 years agoFixed Table to change child element style names when primary stylename is changed...
John Ahlroos [Tue, 2 Oct 2012 06:17:27 +0000 (09:17 +0300)]
Fixed Table to change child element style names when primary stylename is changed #9724

12 years agoMerge "Unified log message with other Property implementors (#9804)"
Henri Sara [Tue, 2 Oct 2012 05:55:46 +0000 (05:55 +0000)]
Merge "Unified log message with other Property implementors (#9804)"

12 years agoButton now changes child element stylenames when primary style name is changed specif...
John Ahlroos [Tue, 2 Oct 2012 05:54:05 +0000 (08:54 +0300)]
Button now changes child element stylenames when primary style name is changed specifically #9724

12 years agoMerge "Avoid throwing exceptions from toString, log message instead (#9804)"
Henri Sara [Tue, 2 Oct 2012 05:53:12 +0000 (05:53 +0000)]
Merge "Avoid throwing exceptions from toString, log message instead (#9804)"

12 years agoUnified log message with other Property implementors (#9804) 31/31/1
Artur Signell [Mon, 1 Oct 2012 20:40:29 +0000 (23:40 +0300)]
Unified log message with other Property implementors (#9804)

Change-Id: I0833381d7f7871d062b04ef0ed5408f1777022af

12 years agoMade GlobalResourceHandler serializable (#9817) 30/30/1
Artur Signell [Mon, 1 Oct 2012 20:37:05 +0000 (23:37 +0300)]
Made GlobalResourceHandler serializable (#9817)

Change-Id: Iae2ac641275a7f16b0bde2184c3f42f9f059f890

12 years agoUpdated GAE test to be UI based (#9816) 29/29/1
Artur Signell [Mon, 1 Oct 2012 18:46:26 +0000 (21:46 +0300)]
Updated GAE test to be UI based (#9816)

Change-Id: I50a0ac7a8aca239e04806a8d6f9be1d9263e71dd

12 years agoFixed test to work also on build server
Artur Signell [Mon, 1 Oct 2012 18:11:49 +0000 (21:11 +0300)]
Fixed test to work also on build server

Change-Id: I78e49ad780c75b38fb62f3880bc6b4b08c9af8b1

12 years agoMoved ShortcutActionHandler constants to shared (#8484)
Artur Signell [Mon, 1 Oct 2012 15:57:41 +0000 (18:57 +0300)]
Moved ShortcutActionHandler constants to shared (#8484)

Change-Id: I59b0f732f819ceb5e63182c7f3ac492f913a6278

12 years agoMoved ShortcutActionHandler constants to shared (#8484)
Artur Signell [Mon, 1 Oct 2012 15:53:43 +0000 (18:53 +0300)]
Moved ShortcutActionHandler constants to shared (#8484)

Change-Id: Ia75fa0ca8b7f563ccc412381e88abae7c630569e

12 years agoMerge "Fixed typo in method name"
John Ahlroos [Mon, 1 Oct 2012 13:16:37 +0000 (13:16 +0000)]
Merge "Fixed typo in method name"

12 years agoFixed typo in method name 28/28/1
Artur Signell [Mon, 1 Oct 2012 12:32:42 +0000 (15:32 +0300)]
Fixed typo in method name

Change-Id: I6c8e7afc24d3c9e365c99d3bc6af26fbb1eb97a9

12 years agoJavadoc + fixed a typo in method name #9724
John Ahlroos [Mon, 1 Oct 2012 12:07:44 +0000 (15:07 +0300)]
Javadoc + fixed a typo in method name #9724

12 years agoMerge "CRLF -> LF"
John Ahlroos [Mon, 1 Oct 2012 11:34:04 +0000 (11:34 +0000)]
Merge "CRLF -> LF"

12 years agoMerge "Merged shortcut action fix from 6.8 (#8484)"
John Ahlroos [Mon, 1 Oct 2012 11:31:58 +0000 (11:31 +0000)]
Merge "Merged shortcut action fix from 6.8 (#8484)"

12 years agoAvoid throwing exceptions from toString, log message instead (#9804) 26/26/1
Artur Signell [Mon, 1 Oct 2012 11:08:33 +0000 (14:08 +0300)]
Avoid throwing exceptions from toString, log message instead (#9804)

Change-Id: Ia2f8504a0fe75ab3a7c4746d533e5fd012e2a69c

12 years agoMerge from 6.8: Limit propagation of vertical spacing and margins in 25/25/1
Henri Sara [Mon, 1 Oct 2012 11:06:43 +0000 (14:06 +0300)]
Merge from 6.8: Limit propagation of vertical spacing and margins in
nested FormLayouts, related test (#9427)

svn changeset:24503/svn branch:6.8
svn changeset:24504/svn branch:6.8
svn changeset:24506/svn branch:6.8

Change-Id: I7eca0fccdd9fc9258514c68025bd9e99dcc0b89d

12 years agoMerge "Added a dummy value to the parameter to make Websphere happy (#9776)"
Leif Åstrand [Mon, 1 Oct 2012 09:58:38 +0000 (09:58 +0000)]
Merge "Added a dummy value to the parameter to make Websphere happy (#9776)"

12 years agoMerge "Avoid adding RpcInvocationHandler toString as invocations (#9802)"
Leif Åstrand [Mon, 1 Oct 2012 09:42:41 +0000 (09:42 +0000)]
Merge "Avoid adding RpcInvocationHandler toString as invocations (#9802)"

12 years agoAvoid adding RpcInvocationHandler toString as invocations (#9802) 17/17/2
Artur Signell [Fri, 28 Sep 2012 17:47:34 +0000 (20:47 +0300)]
Avoid adding RpcInvocationHandler toString as invocations (#9802)

Change-Id: If6f378c0942132110adc748bd2c1cf87779924b6

12 years agoMerge "Publish all javadoc as an artifact and build as part of the all module (#9745)"
Henri Sara [Mon, 1 Oct 2012 09:18:57 +0000 (09:18 +0000)]
Merge "Publish all javadoc as an artifact and build as part of the all module (#9745)"

12 years agoRemove unused method (#9634) 24/24/1
Leif Åstrand [Mon, 1 Oct 2012 08:59:53 +0000 (11:59 +0300)]
Remove unused method (#9634)

Change-Id: Iad6f920d345832ec6bec49761a31ceb7290679e9

12 years agoRemove VaadinServletSession (#9638) 13/13/2
Leif Åstrand [Fri, 28 Sep 2012 12:31:03 +0000 (15:31 +0300)]
Remove VaadinServletSession (#9638)

Change-Id: I0e25ba1a6d258b8601c009f6dc062b3f4bd3dbce

12 years agoMerge branch 'primary-stylename' into sass
Marc Englund [Mon, 1 Oct 2012 08:30:59 +0000 (11:30 +0300)]
Merge branch 'primary-stylename' into sass

12 years agoMerge branch 'master' into sass
Marc Englund [Mon, 1 Oct 2012 08:28:38 +0000 (11:28 +0300)]
Merge branch 'master' into sass

Conflicts:
WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss
theme-compiler/src/com/vaadin/sass/tree/ListRemoveNode.java
theme-compiler/src/com/vaadin/sass/visitor/EachVisitor.java

12 years agoMerge branch 'master' into primary-stylename
John Ahlroos [Mon, 1 Oct 2012 05:46:58 +0000 (08:46 +0300)]
Merge branch 'master' into primary-stylename

12 years agoMerged tests for height recalculation issue for TabSheet in TabSheet (#9275) 19/19/2
Artur Signell [Fri, 28 Sep 2012 18:41:08 +0000 (21:41 +0300)]
Merged tests for height recalculation issue for TabSheet in TabSheet (#9275)

Fix is not needed for Vaadin 7

Change-Id: Ib3f3c0abf91fdab7ccdb23344d5ab0bcb92806d5

12 years agoCRLF -> LF 22/22/1
Artur Signell [Wed, 19 Sep 2012 15:14:01 +0000 (15:14 +0000)]
CRLF -> LF

Change-Id: Ib1a828ac5f423de8e05c4ad7c8f399ccaf0beb78

12 years agoMerged tests for initial fragment events (#9558) 21/21/1
Artur Signell [Wed, 19 Sep 2012 15:13:55 +0000 (15:13 +0000)]
Merged tests for initial fragment events (#9558)

Fix not needed in Vaadin 7

svn changeset:24491/svn branch:6.8

Change-Id: Id78475eac42fef47a523cf1e27b2d15f1789335f

12 years agoMerged shortcut action fix from 6.8 (#8484) 18/18/1
John Alhroos [Tue, 18 Sep 2012 10:11:02 +0000 (10:11 +0000)]
Merged shortcut action fix from 6.8 (#8484)

Change-Id: I1bc200afa9f4a4f3c5e469eb0b2f93278cca97a7

12 years agoSerialize and deserialize diff state manually (#9717, #9767) 16/16/1
Artur Signell [Fri, 28 Sep 2012 17:14:48 +0000 (20:14 +0300)]
Serialize and deserialize diff state manually (#9717, #9767)

Extended UISerialization test to both serialize and deserialize and also validate ConnectorTracker (de)serialization

Change-Id: Ifb8228bd56ec3635e4267e78160eef14dd9ff318

12 years agoAdded a dummy value to the parameter to make Websphere happy (#9776) 15/15/1
Artur Signell [Fri, 28 Sep 2012 16:47:47 +0000 (19:47 +0300)]
Added a dummy value to the parameter to make Websphere happy (#9776)

Change-Id: If44a4705fe6c2d9ce381924b2d2a47de532a712c

12 years agoPublish all javadoc as an artifact and build as part of the all module (#9745) 14/14/1
Artur Signell [Fri, 28 Sep 2012 16:44:01 +0000 (19:44 +0300)]
Publish all javadoc as an artifact and build as part of the all module (#9745)

Change-Id: I2d5ce81a2b9170eb7c9b91e37d0cf39d5383457c

12 years agoMove reinitialize session to VaadinService (#9638) 11/11/2
Leif Åstrand [Fri, 28 Sep 2012 11:58:37 +0000 (14:58 +0300)]
Move reinitialize session to VaadinService (#9638)

This change adds reinitializeSession as a static method in
VaadinService. The method is static because it affects the sessions of
all VaadinService instances that are using the underlying session.

Change-Id: Ia37567cb00e1f95aec344451299c99cb279a7275

12 years agoSass restructure: split button into nativebutton and checkbox
Marc Englund [Fri, 28 Sep 2012 14:41:35 +0000 (17:41 +0300)]
Sass restructure: split button into nativebutton and checkbox

12 years agoSass restructure: fixed bug in embedded.scss
Marc Englund [Fri, 28 Sep 2012 14:38:39 +0000 (17:38 +0300)]
Sass restructure: fixed bug in embedded.scss

12 years agoSass restructure: base theme with renameable components
Marc Englund [Fri, 28 Sep 2012 14:05:09 +0000 (17:05 +0300)]
Sass restructure: base theme with renameable components

12 years agoOrderedLayout now handles alignments for HorizontalLayouts correctly +
John Ahlroos [Fri, 28 Sep 2012 13:34:00 +0000 (16:34 +0300)]
OrderedLayout now handles alignments for HorizontalLayouts correctly +
handles dynamic setPrimaryStyle better #9724

12 years agoSass restructure: tried some variants, this should be a reindeer structure that shoul...
Marc Englund [Fri, 28 Sep 2012 13:09:23 +0000 (16:09 +0300)]
Sass restructure: tried some variants, this should be a reindeer structure that should work w/o overlay-container