Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed typos and added missing import in OSGi requirements (#9793) | Artur Signell | 2012-10-09 | 2 | -4/+4 |
| | | | | | | | * Import-package: javax.servlet.http * Require-bundle should use bundle-version, not version Change-Id: I100235621de94ee344352c59e6685245c7e21697 | ||||
* | Merge "Update test script to work with updated embed1 servlet mapping" | Henri Sara | 2012-10-09 | 1 | -2/+2 |
|\ | |||||
| * | Update test script to work with updated embed1 servlet mapping | Leif Åstrand | 2012-10-09 | 1 | -2/+2 |
| | | | | | | | | Change-Id: I59d0f0b10120c7fdb40e8d78650eb7901d421457 | ||||
* | | Merge "Add version to exported packages (#7222)" | Johannes Dahlström | 2012-10-09 | 2 | -5/+12 |
|\ \ | |||||
| * | | Add version to exported packages (#7222) | Artur Signell | 2012-10-09 | 2 | -5/+12 |
| | | | | | | | | | | | | Change-Id: I8c22329258cbd8d4dc2f892ae5ba6fa0b9b37a10 | ||||
* | | | Merge "Applied splitpanel scrollbar fix for IE9 as well #9552" | Leif Åstrand | 2012-10-09 | 1 | -5/+6 |
|\ \ \ | |||||
| * | | | Applied splitpanel scrollbar fix for IE9 as well #9552 | John Ahlroos | 2012-10-09 | 1 | -5/+6 |
| | | | | | | | | | | | | | | | | Change-Id: Ife96da6315796548c9aeab34b6f307a70e80ef36 | ||||
* | | | | Merge "Applied a similar fix for the scrollbars in accordion and tabsheet as ↵ | Leif Åstrand | 2012-10-09 | 2 | -0/+22 |
|\ \ \ \ | | | | | | | | | | | | | | | | was done for the splitpanel previously #9572" | ||||
| * | | | | Applied a similar fix for the scrollbars in accordion and tabsheet as was ↵ | John Ahlroos | 2012-10-09 | 2 | -0/+22 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | done for the splitpanel previously #9572 Change-Id: Ic52081d30e0febeac2cc2378e4a6af7f83306ae9 | ||||
* | | | | Merge "Update confs to make jetty classes available for the ProxyTest" | Artur Signell | 2012-10-09 | 1 | -3/+4 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Update confs to make jetty classes available for the ProxyTest | Leif Åstrand | 2012-10-09 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | Change-Id: Iaa36ad9c5be9b2f4a31812ce129d2c428f677b71 | ||||
* | | | | Move theme name mangling to where it is actually desired (#9891) | Leif Åstrand | 2012-10-09 | 2 | -5/+6 |
|/ / / | | | | | | | | | | Change-Id: Ia78d38c36e7f5f9c86e645f4afd2014cdc88cb32 | ||||
* | | | Merge "Rename connector resource -> dependency resource (#9691)" | Leif Åstrand | 2012-10-09 | 6 | -46/+49 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Rename connector resource -> dependency resource (#9691) | Leif Åstrand | 2012-10-09 | 6 | -46/+49 |
| | | | | | | | | | | | | Change-Id: If263c3e9eb3d2221ae7a7ca39c5bc05f2c8c14d9 | ||||
* | | | Added import package and require bundle definitions (#9793) | Artur Signell | 2012-10-09 | 3 | -0/+16 |
| | | | | | | | | | | | | Change-Id: I106dc90c30ddac4abf90131824893a4d5d40921f | ||||
* | | | Fixed build issue with provided depdencies no longer being used (#9793) | Artur Signell | 2012-10-09 | 1 | -1/+0 |
|/ / | | | | | | | Change-Id: Iac88131625812a4ba4bf5b137888743cad9fda62 | ||||
* | | Merge "Refactor OSGi manifest attribute handling to support import/export ↵ | Henri Sara | 2012-10-09 | 2 | -23/+64 |
|\ \ | |/ |/| | | | better (#9793)" | ||||
| * | Refactor OSGi manifest attribute handling to support import/export better ↵ | Artur Signell | 2012-10-09 | 2 | -23/+64 |
| | | | | | | | | | | | | (#9793) Change-Id: Iae53213b40a688b27a4195fa25c998d3ba43cba3 | ||||
* | | Merge changes I9bcdc149,Ia25f247c | Leif Åstrand | 2012-10-09 | 3 | -33/+23 |
|\| | | | | | | | | | | | * changes: Make vaadin.themes a bundle (#9793) Make vaadin.client-compiled a bundle (#9793) | ||||
| * | Make vaadin.themes a bundle (#9793) | Artur Signell | 2012-10-08 | 2 | -15/+12 |
| | | | | | | | | | | | | Refactored themes/build.xml to use the common.xml jar target Change-Id: I9bcdc149f0995814faa172023059e615d683d034 | ||||
| * | Make vaadin.client-compiled a bundle (#9793) | Artur Signell | 2012-10-08 | 1 | -18/+11 |
| | | | | | | | | | | | | Refactored client-compiled/build.xml to use the common.xml jar target Change-Id: Ia25f247cd91b2a93b7abd739e015a34ee46268be | ||||
* | | Added build conf to make deps non-optional in pom.xml (#9852) | Artur Signell | 2012-10-09 | 1 | -10/+15 |
| | | | | | | | | Change-Id: I99fc667a65b39e2ac58351a312f2570e371ee421 | ||||
* | | Merge "Remove CombinedRequest and BrowserDetails (#8165)" | Henri Sara | 2012-10-08 | 19 | -395/+65 |
|\ \ | |||||
| * | | Remove CombinedRequest and BrowserDetails (#8165) | Leif Åstrand | 2012-10-08 | 19 | -395/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | | Merge branch 'sass' | John Ahlroos | 2012-10-08 | 172 | -8432/+9095 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Merge branch 'master' into sass | John Ahlroos | 2012-10-08 | 6 | -66/+50 |
| |\ \ | |||||
| * | | | Fixed some issues found in review for #9724 | John Ahlroos | 2012-10-08 | 1 | -7/+1 |
| | | | | |||||
| * | | | Made test pass by correcting css and removing failing rules | Artur Signell | 2012-10-05 | 1 | -10/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | Adds one test for sass mixins | Marc Englund | 2012-10-04 | 2 | -2/+24 |
| | | | | | | | | | | | | | | | | Change-Id: I9e42bbc075cc3ef84c1a7bf5b449f18df5773327 | ||||
| * | | | Sass mixin cleanup (author: seba) | Marc Englund | 2012-10-04 | 3 | -18/+2 |
| | | | | | | | | | | | | | | | | Change-Id: Ie462d5e213d4e81430143aa9d0708fac6b8d77d4 | ||||
| * | | | Fully fixes #9846, sass mixins with multiple optional params (author: seba) | Marc Englund | 2012-10-04 | 3 | -611/+679 |
| | | | | | | | | | | | | | | | | Change-Id: I8330c6c0a7022b3485bbfee5c6a4833ef5cb4e1d | ||||
| * | | | Partial fix for sass mixins with multiple optional params #9846 (author: seba) | Marc Englund | 2012-10-04 | 5 | -511/+622 |
| | | | | | | | | | | | | | | | | Change-Id: Iacd94ffb41a91e9dd20874cd7f981830e4267a87 | ||||
| * | | | Adds support for CSS3 selectors #9858 (autor: seba) | Marc Englund | 2012-10-04 | 5 | -991/+1066 |
| | | | | | | | | | | | | | | | | Change-Id: Icd8e0fd09c3964ebbfab8f130d7945e51af326d7 | ||||
| * | | | FontFace nodes are created correctly, fixes #9611 (author: seba) | Marc Englund | 2012-10-04 | 2 | -2/+23 |
| | | | | | | | | | | | | | | | | Change-Id: Ifbec8e848654c19e95c19cce05976ed9e5d8290a | ||||
| * | | | Merge branch 'master' into sass | Marc Englund | 2012-10-04 | 52 | -324/+1390 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: WebContent/VAADIN/themes/base/formlayout/formlayout.scss WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss Change-Id: Ie895a1bbafdcf2fe79d500efb04c6eef3f5a812e | ||||
| * | | | | Fixed Table to change child element style names when primary stylename is ↵ | John Ahlroos | 2012-10-02 | 1 | -2/+14 |
| | | | | | | | | | | | | | | | | | | | | changed #9724 | ||||
| * | | | | Button now changes child element stylenames when primary style name is ↵ | John Ahlroos | 2012-10-02 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | changed specifically #9724 | ||||
| * | | | | Javadoc + fixed a typo in method name #9724 | John Ahlroos | 2012-10-01 | 2 | -5/+21 |
| | | | | | |||||
| * | | | | Merge branch 'primary-stylename' into sass | Marc Englund | 2012-10-01 | 73 | -172/+605 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into primary-stylename | John Ahlroos | 2012-10-01 | 63 | -211/+267 |
| | |\ \ \ \ | |||||
| | * | | | | | OrderedLayout now handles alignments for HorizontalLayouts correctly + | John Ahlroos | 2012-09-28 | 3 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | handles dynamic setPrimaryStyle better #9724 | ||||
| | * | | | | | Merge branch 'master' into primary-stylename | John Ahlroos | 2012-09-28 | 1 | -2/+0 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Fixed window not getting its correct primary stylename #9724 | John Ahlroos | 2012-09-28 | 1 | -0/+3 |
| | | | | | | | | |||||
| | * | | | | | | Fixed typo in HorizontalLayout #9724 | John Ahlroos | 2012-09-27 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Added missing NativeButton state class #9724 | John Ahlroos | 2012-09-27 | 1 | -0/+7 |
| | | | | | | | | |||||
| | * | | | | | | Fixed issue with Table column alignment not updating correctly #9724 | John Ahlroos | 2012-09-27 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Fixed NativeButton broken styles #9724 | John Ahlroos | 2012-09-27 | 1 | -3/+3 |
| | | | | | | | | |||||
| | * | | | | | | Fixed layout primary stylenames #9724 | John Ahlroos | 2012-09-27 | 8 | -39/+24 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'master' into primary-stylename | John Ahlroos | 2012-09-27 | 22 | -135/+151 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Removed references to client widgetset from state #9724 | John Ahlroos | 2012-09-27 | 33 | -69/+33 |
| | | | | | | | | |