Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sass' | John Ahlroos | 2012-10-08 | 33 | -165/+386 |
|\ | |||||
| * | Fixed some issues found in review for #9724 | John Ahlroos | 2012-10-08 | 1 | -7/+1 |
| | | |||||
| * | Merge branch 'master' into sass | Marc Englund | 2012-10-04 | 8 | -51/+209 |
| |\ | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | Merge branch 'master' into primary-stylename | John Ahlroos | 2012-10-01 | 1 | -6/+6 |
| |\ \ | |||||
| * | | | OrderedLayout now handles alignments for HorizontalLayouts correctly + | John Ahlroos | 2012-09-28 | 3 | -0/+11 |
| | | | | | | | | | | | | handles dynamic setPrimaryStyle better #9724 | ||||
| * | | | Fixed typo in HorizontalLayout #9724 | John Ahlroos | 2012-09-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | 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 | 7 | -37/+22 |
| | | | | |||||
| * | | | Added primary stylename to all component states #9724 | John Ahlroos | 2012-09-27 | 24 | -11/+106 |
| | | | | |||||
| * | | | Added TableState with default primary style name #9724 | John Ahlroos | 2012-09-26 | 2 | -4/+6 |
| | | | | |||||
| * | | | Primary stylename handling for Table #9724 | John Ahlroos | 2012-09-26 | 1 | -1/+7 |
| | | | | |||||
| * | | | Primary stylename handling for Table #9724 | John Ahlroos | 2012-09-26 | 1 | -26/+61 |
| | | | | |||||
| * | | | Primary stylename handling for Table #9724 | John Ahlroos | 2012-09-26 | 2 | -102/+163 |
| | | | | |||||
| * | | | Primary stylename handling for button #9724 | John Ahlroos | 2012-09-26 | 1 | -4/+9 |
| | | | | |||||
| * | | | Minor change to how the primary stylename gets applied to the widgets | John Ahlroos | 2012-09-26 | 1 | -4/+5 |
| | | | | | | | | | | | | #9724 | ||||
| * | | | Widgets primary stylename is now set if the component state has defined | John Ahlroos | 2012-09-25 | 1 | -2/+8 |
| | | | | | | | | | | | | one #9724 | ||||
| * | | | Added primary stylename handling on server side #9724 | John Ahlroos | 2012-09-24 | 1 | -1/+2 |
| | | | | |||||
* | | | | Bootstrap UI using relative URLs with servlets (#6771) | Leif Åstrand | 2012-10-08 | 4 | -48/+79 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | | | Add Page.getLocation() (#9249) | Johannes Dahlström | 2012-10-05 | 2 | -15/+11 |
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | | Firefox now uses the overflow autofix + made sure we don't trigger a layout ↵ | John Ahlroos | 2012-10-03 | 2 | -3/+9 |
| | | | | | | | | | | | | | | | | | | phase while running another layout phase #9845 Change-Id: I5a5bdf5ffdf84f86054f3f6f1d79737e630e41cb | ||||
* | | | Fixes #9828 - ComponentLocator now makes use of debug IDs if present | Jonatan Kronqvist | 2012-10-02 | 1 | -2/+4 |
| | | | | | | | | | | | | Change-Id: I58aeee42ef386dd3eef8fdf25f8dd430eb22774c | ||||
* | | | Moved ShortcutActionHandler constants to shared (#8484) | Artur Signell | 2012-10-01 | 1 | -18/+14 |
| | | | | | | | | | | | | Change-Id: Ia75fa0ca8b7f563ccc412381e88abae7c630569e | ||||
* | | | Merge "Fixed typo in method name" | John Ahlroos | 2012-10-01 | 1 | -9/+9 |
|\ \ \ | |||||
| * | | | Fixed typo in method name | Artur Signell | 2012-10-01 | 1 | -9/+9 |
| | |/ | |/| | | | | | | | Change-Id: I6c8e7afc24d3c9e365c99d3bc6af26fbb1eb97a9 | ||||
* / | | Merged shortcut action fix from 6.8 (#8484) | John Alhroos | 2012-09-28 | 4 | -37/+191 |
|/ / | | | | | | | Change-Id: I1bc200afa9f4a4f3c5e469eb0b2f93278cca97a7 | ||||
* / | Global code cleanup | Leif Åstrand | 2012-09-27 | 1 | -6/+6 |
|/ | |||||
* | Replace onVaadinSessionStarted with a listener (#9635) | Leif Åstrand | 2012-09-18 | 1 | -1/+2 |
| | |||||
* | Reverted previous fix and fixed in a more compatible way (#9534) | Artur Signell | 2012-09-18 | 1 | -6/+39 |
| | |||||
* | Workaround for Firefox 15 element comparsion issue (#9534) | Artur Signell | 2012-09-18 | 1 | -17/+16 |
| | |||||
* | Added null checks for callbacks in BundleLoader (#9648) | Artur Signell | 2012-09-18 | 2 | -4/+10 |
| | |||||
* | Fixed issues found in review #9596 | John Ahlroos | 2012-09-13 | 1 | -14/+11 |
| | |||||
* | Moved Vaadin-Widgetsets to client package where it belongs (#9593) | Artur Signell | 2012-09-13 | 1 | -0/+7 |
| | |||||
* | Ensures negative height is not returned in HorizontalLayout height ↵ | John Ahlroos | 2012-09-13 | 2 | -9/+37 |
| | | | | calculations #9596 | ||||
* | Fixed typo | Artur Signell | 2012-09-13 | 1 | -1/+1 |
| | |||||
* | Moved validation dependency and hack to client (#9551) | Artur Signell | 2012-09-12 | 2 | -5/+25 |
| | |||||
* | Fix error messages | Leif Åstrand | 2012-09-12 | 1 | -4/+4 |
| | |||||
* | Add some explanatory Javadoc | Leif Åstrand | 2012-09-12 | 1 | -0/+12 |
| | |||||
* | Properly resolve icon urls in ordered layout (#9555) | Leif Åstrand | 2012-09-12 | 1 | -1/+1 |
| | |||||
* | Update javadoc | Leif Åstrand | 2012-09-11 | 1 | -12/+16 |
| | |||||
* | Constants -> enums (#9072) | Pekka Hyvönen | 2012-09-11 | 18 | -162/+212 |
| | | | | Patch from Pekka with minor changes (ButtonCode -> MouseButton, FilteringMode -> ComboBox) | ||||
* | Fixed ComponentLocator to check for null paths. (fix for broken | John Ahlroos | 2012-09-11 | 1 | -4/+9 |
| | | | BooleanTextField test) | ||||
* | Improvements to #9087: | Johannes Dahlström | 2012-09-11 | 2 | -12/+12 |
| | | | | | | | | * Rename EmbeddedBrowser to BrowserFrame * Add constructors to Flash and BrowserFrame * Change getState() methods to protected * JavaDoc improvements * Make ImageClicks test deterministic | ||||
* | Rename Vaadin6Connector -> LegacyConnector (#9536) | Leif Åstrand | 2012-09-11 | 1 | -1/+1 |
| | |||||
* | Re-added old DefaultWidgetSet which was accidentally deleted in a merge | Artur Signell | 2012-09-10 | 1 | -0/+9 |
| | |||||
* | Merge remote-tracking branch 'origin/master' | John Ahlroos | 2012-09-10 | 1 | -6/+0 |
|\ | |||||
| * | Removed PortalDefaultWidgetSet (#9337) | Artur Signell | 2012-09-10 | 1 | -6/+0 |
| | | |||||
* | | Merge branch '6.8' | John Ahlroos | 2012-09-10 | 2 | -9/+22 |
|/ | | | | | | | | | | | | | | | | Conflicts: WebContent/VAADIN/themes/base/common/common.scss server/src/com/vaadin/server/VaadinServlet.java server/src/com/vaadin/ui/AbstractField.java src/com/vaadin/terminal/gwt/client/ui/VUriFragmentUtility.java tests/testbench/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java tests/testbench/com/vaadin/tests/components/table/TableReduceContainerSize.java tests/testbench/com/vaadin/tests/tickets/Ticket8291.java uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.html uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java uitest/src/com/vaadin/tests/tickets/Ticket8291.java uitest/test.xml |