| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | Merge commit 'e978b99' | Johannes Dahlström | 2012-06-12 | 1 | -2/+0 | |
| | |\| | | ||||||
| | | * | | #8878 Cannot use @Override when implementing interface methods in Java 1.5 | Johannes Dahlström | 2012-05-30 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | | svn changeset:23856/svn branch:6.8 | |||||
| | * | | | Merge commit '11322' | Johannes Dahlström | 2012-06-12 | 1 | -4/+0 | |
| | |\| | | ||||||
| | | * | | #1744 Should not check for reversed position here | Johannes Dahlström | 2012-05-30 | 1 | -4/+0 | |
| | | | | | | | | | | | | | | | | | svn changeset:23855/svn branch:6.8 | |||||
| | * | | | Merge commit '42dff' | Johannes Dahlström | 2012-06-12 | 1 | -1/+1 | |
| | |\| | | ||||||
| | | * | | #1744 Fixed a regression | Johannes Dahlström | 2012-05-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | svn changeset:23854/svn branch:6.8 | |||||
| | * | | | Merge commit '56d0c' | Johannes Dahlström | 2012-06-12 | 6 | -29/+301 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | | * | | [merge from 6.7] Small tweaks to #4120 based on review | Automerge | 2012-05-30 | 2 | -5/+1 | |
| | | | | | | | | | | | | | | | | | svn changeset:23852/svn branch:6.8 | |||||
| | | * | | VFilterSelect implements SubPartAware #8878 | Jonatan Kronqvist | 2012-05-30 | 1 | -1/+21 | |
| | | | | | | | | | | | | | | | | | svn changeset:23851/svn branch:6.8 | |||||
| | | * | | Added options for setting maximum and minimum split positions to SplitPanel ↵ | Tapio Aali | 2012-05-30 | 2 | -21/+208 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | (#1744). svn changeset:23850/svn branch:6.8 | |||||
| | * | | | Merge commit '61638' | Johannes Dahlström | 2012-06-11 | 3 | -15/+102 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | | * | | [merge from 6.7] Make ClickEventHandler fire clicks only if mousedown and ↵ | Automerge | 2012-05-30 | 2 | -5/+90 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | mouseup match (#4120) svn changeset:23846/svn branch:6.8 | |||||
| | * | | | Merge commit 'bc630' | Johannes Dahlström | 2012-06-11 | 1 | -5/+3 | |
| | |\| | | | | | | | | | | | | | | | | | | Conflicts: src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java | |||||
| | | * | | [merge from 6.7] Revert last attempt of fix for (#6039) as it doesn't fix ↵ | Automerge | 2012-05-29 | 1 | -8/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | all problems svn changeset:23839/svn branch:6.8 | |||||
| | * | | | Merge commit '165544' | Johannes Dahlström | 2012-06-11 | 1 | -5/+0 | |
| | |\| | | ||||||
| | | * | | Removed non-working/unneeded code (#8428) | Artur Signell | 2012-05-29 | 1 | -5/+0 | |
| | | | | | | | | | | | | | | | | | svn changeset:23835/svn branch:6.8 | |||||
| | * | | | Merge commit '8e5b5' | Johannes Dahlström | 2012-06-11 | 3 | -1/+48 | |
| | |\| | | | | | | | | | | | | | | | | | | Conflicts: src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheet.java | |||||
| | | * | | Made Table serializable when using column width for row header (#8428) | Artur Signell | 2012-05-29 | 2 | -1/+37 | |
| | | | | | | | | | | | | | | | | | svn changeset:23834/svn branch:6.8 | |||||
| | | * | | #8625 Fixed a regression caused by #8720 changes (touch scroll support) | Johannes Dahlström | 2012-05-25 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | svn changeset:23832/svn branch:6.8 | |||||
| | * | | | Merge commit 'bb48c' | Johannes Dahlström | 2012-06-11 | 3 | -1/+40 | |
| | |\| | | | | | | | | | | | | | | | | | | Conflicts: src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java | |||||
| | | * | | #7911 Added a common CSS class "v-touch" for all touch devices | Johannes Dahlström | 2012-05-25 | 1 | -1/+6 | |
| | | | | | | | | | | | | | | | | | svn changeset:23828/svn branch:6.8 | |||||
| | | * | | Manual merge from 6.7 to 6.8 for #8799 timer unregistration. | Henri Sara | 2012-05-24 | 1 | -0/+19 | |
| | | | | | | | | | | | | | | | | | svn changeset:23825/svn branch:6.8 | |||||
| | | * | | [merge from 6.7] #8801 Recompute VFilterSelect textbox width if popup opener ↵ | Automerge | 2012-05-24 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | width has changed eg. due to a style/theme change svn changeset:23823/svn branch:6.8 | |||||
| | * | | | Merge commit 'cb20a6' | Johannes Dahlström | 2012-06-11 | 1 | -24/+101 | |
| | |\| | | | | | | | | | | | | | | | | | | Conflicts: src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java | |||||
| | | * | | Merged VView changes to 6.8 (#8799). | Henri Sara | 2012-05-24 | 1 | -22/+99 | |
| | | | | | | | | | | | | | | | | | svn changeset:23820/svn branch:6.8 | |||||
| | * | | | Merge commit 'edf451' | Johannes Dahlström | 2012-06-11 | 1 | -0/+12 | |
| | |\| | | | | | | | | | | | | | | | | | | Conflicts: src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java | |||||
| | | * | | Fixed styles that were left lingering while changing the orientation of a ↵ | Tapio Aali | 2012-05-23 | 1 | -1/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | slider (#7002). svn changeset:23813/svn branch:6.8 | |||||
| | * | | | Merge commit 'e8a652' | Johannes Dahlström | 2012-06-11 | 2 | -2/+71 | |
| | |\| | | ||||||
| | | * | | Table: Make some columns uncollapsable (#7495) | Leif Åstrand | 2012-05-23 | 2 | -2/+71 | |
| | | | | | | | | | | | | | | | | | svn changeset:23811/svn branch:6.8 | |||||
| | * | | | Merge commit 'e8844' | Johannes Dahlström | 2012-06-11 | 1 | -0/+3 | |
| | |\| | | | | | | | | | | | | | | | | | | Conflicts: src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java | |||||
| | | * | | [merge from 6.7] Recalculate column widths if scrollbar has changed (#6039) | Automerge | 2012-05-22 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | | svn changeset:23804/svn branch:6.8 | |||||
| | * | | | Merge commit '35b979' | Johannes Dahlström | 2012-06-11 | 1 | -0/+27 | |
| | |\| | | ||||||
| | | * | | [merge from 6.7] #8305 extend Liferay session when the user interacts with a ↵ | Automerge | 2012-05-22 | 1 | -0/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Vaadin portlet svn changeset:23802/svn branch:6.8 | |||||
| | * | | | Merge commit 'e7f31' | Johannes Dahlström | 2012-06-11 | 1 | -41/+3 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java | |||||
| | | * | | Remove clientHeight/Width from WebBrowser (#5655) | Leif Åstrand | 2012-05-22 | 3 | -45/+4 | |
| | | | | | | | | | | | | | | | | | svn changeset:23792/svn branch:6.8 | |||||
| | * | | | Merge commit 'e085e' | Johannes Dahlström | 2012-06-11 | 2 | -10/+65 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java | |||||
| | | * | | Make browser window size available in Window (#5655) | Leif Åstrand | 2012-05-22 | 2 | -16/+64 | |
| | | | | | | | | | | | | | | | | | svn changeset:23790/svn branch:6.8 | |||||
| | * | | | Merge commit 'bec62' | Johannes Dahlström | 2012-06-11 | 5 | -144/+68 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: WebContent/VAADIN/themes/base/common/common.css src/com/vaadin/terminal/gwt/client/ui/button/VButton.java src/com/vaadin/ui/Button.java | |||||
| | | * | | #8724 Properly generate simulated click events from touch events on iOS 5 | Johannes Dahlström | 2012-05-22 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | svn changeset:23784/svn branch:6.8 | |||||
| | | * | | [merge from 6.7] Remove duplicate code in constructor | Automerge | 2012-05-21 | 1 | -7/+1 | |
| | | | | | | | | | | | | | | | | | svn changeset:23779/svn branch:6.8 | |||||
| | | * | | Removed an empty if() {} | Johannes Dahlström | 2012-05-21 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | | svn changeset:23776/svn branch:6.8 | |||||
| | | * | | #8724 Factored away duplicate code in native/non-native touch handling, ↵ | Johannes Dahlström | 2012-05-21 | 1 | -115/+33 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | removed unused variables, removed debug messages, added comments svn changeset:23775/svn branch:6.8 | |||||
| | | * | | [merge from 6.7] Don't trigger actions if space or enter is pressed with ↵ | Automerge | 2012-05-21 | 2 | -28/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Button focused (#7191) svn changeset:23774/svn branch:6.8 | |||||
| | | * | | #8723 Remove superfluous sinkEvents() call | Johannes Dahlström | 2012-05-21 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | | svn changeset:23772/svn branch:6.8 | |||||
| | * | | | Merge commit '99786' | Johannes Dahlström | 2012-06-11 | 3 | -60/+98 | |
| | |\| | | | | | | | | | | | | | | | | | | Conflicts: src/com/vaadin/ui/TabSheet.java | |||||
| | | * | | [merge from 6.7] #8810 Fix row collapse animation as well | Automerge | 2012-05-18 | 1 | -12/+21 | |
| | | | | | | | | | | | | | | | | | svn changeset:23764/svn branch:6.8 | |||||
| | | * | | [merge from 6.7] Fix #8810 - only animate row expansion if there are child ↵ | Automerge | 2012-05-18 | 1 | -2/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | rows to animate svn changeset:23763/svn branch:6.8 | |||||
| | | * | | [merge from 6.7] #8805 fix flickering of partial first row in table, related ↵ | Automerge | 2012-05-18 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | manual test svn changeset:23762/svn branch:6.8 | |||||
| | | * | | [merge from 6.7] #8793 Retain all tab metadata, not just caption and icon, ↵ | Johannes Dahlström | 2012-05-18 | 1 | -46/+32 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | in TabSheet.replaceComponent() svn changeset:23761/svn branch:6.8 | |||||
| | * | | | Merge commit 'ecd026' | Johannes Dahlström | 2012-06-11 | 2 | -7/+44 | |
| | |\| | | | | | | | | | | | | | | | | | | Conflicts: src/com/vaadin/ui/TreeTable.java | |||||
 |
index : vaadin-framework.git | |
| Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework | www-data |
| summaryrefslogtreecommitdiffstats |