summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Allow specifying prefixes also for resource directories (#9793)7.0.0.beta4Artur Signell2012-10-105-24/+20
| | | | | | | | * Export VAADIN/widgetsets/* in client-compiled * Export VAADIN/themes/* in themes * Export VAADIN in server (vaadinBootstrap.js) Change-Id: I15b0f7352779479bf73585017f0b95492692f73b
* Changed the convention for importing themes from e.g @import "reindeer.scss" ↵Marc Englund2012-10-101-25/+28
| | | | | | to @import "../reindeer/reindeer.scss" to support jar/extracted cases better. Change-Id: Ic638a91ab03059859cf3cc006ac167d2216a8cd7
* Allow overriding handleContextRootWithoutSlash (#9921)Leif Åstrand2012-10-101-6/+17
| | | | Change-Id: I79947a5ce1f54e0e6477d4ed745bd9e77d9b294c
* Preserve query string and use sendRedirect (#9921)Leif Åstrand2012-10-101-3/+7
| | | | Change-Id: I493e1a03d41f086dfa02ecb9b472ebe2a728e685
* Revert "Fixed Sass resolver to work with themes both unpacked and in jar"Artur Signell2012-10-105-21/+14
| | | | This reverts commit ce56841cce14cd4015b1840e5330de14ac2e15a0.
* Fixed Sass resolver to work with themes both unpacked and in jarMarc Englund2012-10-105-14/+21
| | | | Change-Id: I9978e311429248f3ffe868cdf583ee22f047cf6c
* Reverted previously fixed scrollbars since it does not work with components ↵John Ahlroos2012-10-103-34/+0
| | | | | | requiring inline-block #9552 #9572 Change-Id: Iec43c1e4926b51724c93c93d1f4500e0fcf8759e
* Import all required jsoup packages (#9793)Johannes Dahlström2012-10-091-1/+1
| | | | Change-Id: I00206bc1497aaef6ed556e851c63538db7671553
* Explicitly specify symbolic names for each bundle to prevent names like ↵Johannes Dahlström2012-10-098-5/+11
| | | | | | "com.vaadin.vaadin-shared" (#9793) Change-Id: I329e4d6b8334864be5023ef51225a6e340e74aa6
* Redirect if no ending slash in context root request (#9921)Leif Åstrand2012-10-091-0/+25
| | | | Change-Id: Ief3f2c339a962230607df2e3e17dea93fcfb4f2e
* Merge "Fixed typos and added missing import in OSGi requirements (#9793) * ↵Artur Signell2012-10-092-4/+4
|\ | | | | | | Import-package: javax.servlet.http * Require-bundle should use bundle-version, not version"
| * Fixed typos and added missing import in OSGi requirements (#9793)Artur Signell2012-10-092-4/+4
| | | | | | | | | | | | | | * Import-package: javax.servlet.http * Require-bundle should use bundle-version, not version Change-Id: I100235621de94ee344352c59e6685245c7e21697
* | Avoid logging all taskdef Ivy lookupsArtur Signell2012-10-091-2/+2
|/ | | | Change-Id: I73c79ed24f0d6bc024e1a1cef7d27653dc37e3b1
* Merge "Update test script to work with updated embed1 servlet mapping"Henri Sara2012-10-091-2/+2
|\
| * Update test script to work with updated embed1 servlet mappingLeif Åstrand2012-10-091-2/+2
| | | | | | | | Change-Id: I59d0f0b10120c7fdb40e8d78650eb7901d421457
* | Merge "Add version to exported packages (#7222)"Johannes Dahlström2012-10-092-5/+12
|\ \
| * | Add version to exported packages (#7222)Artur Signell2012-10-092-5/+12
| | | | | | | | | | | | Change-Id: I8c22329258cbd8d4dc2f892ae5ba6fa0b9b37a10
* | | Merge "Applied splitpanel scrollbar fix for IE9 as well #9552"Leif Åstrand2012-10-091-5/+6
|\ \ \
| * | | Applied splitpanel scrollbar fix for IE9 as well #9552John Ahlroos2012-10-091-5/+6
| | | | | | | | | | | | | | | | Change-Id: Ife96da6315796548c9aeab34b6f307a70e80ef36
* | | | Merge "Applied a similar fix for the scrollbars in accordion and tabsheet as ↵Leif Åstrand2012-10-092-0/+22
|\ \ \ \ | | | | | | | | | | | | | | | was done for the splitpanel previously #9572"
| * | | | Applied a similar fix for the scrollbars in accordion and tabsheet as was ↵John Ahlroos2012-10-092-0/+22
| |/ / / | | | | | | | | | | | | | | | | | | | | done for the splitpanel previously #9572 Change-Id: Ic52081d30e0febeac2cc2378e4a6af7f83306ae9
* | | | Merge "Update confs to make jetty classes available for the ProxyTest"Artur Signell2012-10-091-3/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update confs to make jetty classes available for the ProxyTestLeif Åstrand2012-10-091-3/+4
| | | | | | | | | | | | | | | | Change-Id: Iaa36ad9c5be9b2f4a31812ce129d2c428f677b71
* | | | Move theme name mangling to where it is actually desired (#9891)Leif Åstrand2012-10-092-5/+6
|/ / / | | | | | | | | | Change-Id: Ia78d38c36e7f5f9c86e645f4afd2014cdc88cb32
* | | Merge "Rename connector resource -> dependency resource (#9691)"Leif Åstrand2012-10-096-46/+49
|\ \ \ | |_|/ |/| |
| * | Rename connector resource -> dependency resource (#9691)Leif Åstrand2012-10-096-46/+49
| | | | | | | | | | | | Change-Id: If263c3e9eb3d2221ae7a7ca39c5bc05f2c8c14d9
* | | Added import package and require bundle definitions (#9793)Artur Signell2012-10-093-0/+16
| | | | | | | | | | | | Change-Id: I106dc90c30ddac4abf90131824893a4d5d40921f
* | | Fixed build issue with provided depdencies no longer being used (#9793)Artur Signell2012-10-091-1/+0
|/ / | | | | | | Change-Id: Iac88131625812a4ba4bf5b137888743cad9fda62
* | Merge "Refactor OSGi manifest attribute handling to support import/export ↵Henri Sara2012-10-092-23/+64
|\ \ | |/ |/| | | better (#9793)"
| * Refactor OSGi manifest attribute handling to support import/export better ↵Artur Signell2012-10-092-23/+64
| | | | | | | | | | | | (#9793) Change-Id: Iae53213b40a688b27a4195fa25c998d3ba43cba3
* | Merge changes I9bcdc149,Ia25f247cLeif Åstrand2012-10-093-33/+23
|\| | | | | | | | | | | * changes: Make vaadin.themes a bundle (#9793) Make vaadin.client-compiled a bundle (#9793)
| * Make vaadin.themes a bundle (#9793)Artur Signell2012-10-082-15/+12
| | | | | | | | | | | | Refactored themes/build.xml to use the common.xml jar target Change-Id: I9bcdc149f0995814faa172023059e615d683d034
| * Make vaadin.client-compiled a bundle (#9793)Artur Signell2012-10-081-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 Signell2012-10-091-10/+15
| | | | | | | | Change-Id: I99fc667a65b39e2ac58351a312f2570e371ee421
* | Merge "Remove CombinedRequest and BrowserDetails (#8165)"Henri Sara2012-10-0819-395/+65
|\ \
| * | Remove CombinedRequest and BrowserDetails (#8165)Leif Åstrand2012-10-0819-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 Ahlroos2012-10-08172-8432/+9095
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' into sassJohn Ahlroos2012-10-086-66/+50
| |\ \
| * | | Fixed some issues found in review for #9724John Ahlroos2012-10-081-7/+1
| | | |
| * | | Made test pass by correcting css and removing failing rulesArtur Signell2012-10-051-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 mixinsMarc Englund2012-10-042-2/+24
| | | | | | | | | | | | | | | | Change-Id: I9e42bbc075cc3ef84c1a7bf5b449f18df5773327
| * | | Sass mixin cleanup (author: seba)Marc Englund2012-10-043-18/+2
| | | | | | | | | | | | | | | | Change-Id: Ie462d5e213d4e81430143aa9d0708fac6b8d77d4
| * | | Fully fixes #9846, sass mixins with multiple optional params (author: seba)Marc Englund2012-10-043-611/+679
| | | | | | | | | | | | | | | | Change-Id: I8330c6c0a7022b3485bbfee5c6a4833ef5cb4e1d
| * | | Partial fix for sass mixins with multiple optional params #9846 (author: seba)Marc Englund2012-10-045-511/+622
| | | | | | | | | | | | | | | | Change-Id: Iacd94ffb41a91e9dd20874cd7f981830e4267a87
| * | | Adds support for CSS3 selectors #9858 (autor: seba)Marc Englund2012-10-045-991/+1066
| | | | | | | | | | | | | | | | Change-Id: Icd8e0fd09c3964ebbfab8f130d7945e51af326d7
| * | | FontFace nodes are created correctly, fixes #9611 (author: seba)Marc Englund2012-10-042-2/+23
| | | | | | | | | | | | | | | | Change-Id: Ifbec8e848654c19e95c19cce05976ed9e5d8290a
| * | | Merge branch 'master' into sassMarc Englund2012-10-0452-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 Ahlroos2012-10-021-2/+14
| | | | | | | | | | | | | | | | | | | | changed #9724
| * | | | Button now changes child element stylenames when primary style name is ↵John Ahlroos2012-10-021-0/+7
| | | | | | | | | | | | | | | | | | | | changed specifically #9724
| * | | | Javadoc + fixed a typo in method name #9724John Ahlroos2012-10-012-5/+21
| | | | |