Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Merge commit 'ecd026' | Johannes Dahlström | 2012-06-11 | 2 | -7/+44 | |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/com/vaadin/ui/TreeTable.java | |||||
| | * | | [merge from 6.7] Rename illogical local variable | Automerge | 2012-05-16 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | svn changeset:23752/svn branch:6.8 | |||||
| | * | | [merge from 6.7] Take viewport scrolling into account when calculating drop ↵ | Automerge | 2012-05-15 | 1 | -5/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | position (#6021) svn changeset:23749/svn branch:6.8 | |||||
| | * | | [merge from 6.7] Remove invalid import used by javadocs | Automerge | 2012-05-15 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | svn changeset:23745/svn branch:6.8 | |||||
| | * | | [merge from 6.7] #5521 fixed condition that was always checking for height, ↵ | Automerge | 2012-05-15 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | not width svn changeset:23740/svn branch:6.8 | |||||
| * | | | Merge commit 'a21464' | Johannes Dahlström | 2012-06-11 | 1 | -4/+6 | |
| |\| | | ||||||
| | * | | #8763 Re-added TouchScrollDelegate#setElements() | Johannes Dahlström | 2012-05-15 | 1 | -4/+6 | |
| | | | | | | | | | | | | | | | | svn changeset:23737/svn branch:6.8 | |||||
| * | | | Fix accidentally committed file with unresolved conflicts | Johannes Dahlström | 2012-06-11 | 1 | -76/+1 | |
| | | | | ||||||
| * | | | Merge commit '8b064' | Johannes Dahlström | 2012-06-11 | 2 | -6/+88 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/com/vaadin/terminal/gwt/client/ui/panel/VPanel.java src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java | |||||
| | * | | #8716 #8725 Fix regressions introduced by CSS class handling changes | Johannes Dahlström | 2012-05-15 | 2 | -9/+22 | |
| | | | | | | | | | | | | | | | | svn changeset:23736/svn branch:6.8 | |||||
| * | | | Merge commit '0ec349' | Johannes Dahlström | 2012-06-11 | 1 | -1/+1 | |
| |\| | | ||||||
| | * | | #8723 Do not sink touch events in Accordion | Johannes Dahlström | 2012-05-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | svn changeset:23733/svn branch:6.8 | |||||
| * | | | Merge commit 'c03c4' | Johannes Dahlström | 2012-06-11 | 1 | -3/+4 | |
| |\| | | ||||||
| | * | | #8724 Erroneously called onTouchBrowserEvent with non-touch platforms | Johannes Dahlström | 2012-05-14 | 1 | -3/+4 | |
| | | | | | | | | | | | | | | | | svn changeset:23732/svn branch:6.8 | |||||
| * | | | Merge commit '22652b' | Johannes Dahlström | 2012-06-11 | 1 | -16/+45 | |
| |\| | | ||||||
| | * | | #8763 Removed debug messages, added Javadoc to TouchScrollHandler | Johannes Dahlström | 2012-05-14 | 1 | -16/+45 | |
| | | | | | | | | | | | | | | | | svn changeset:23731/svn branch:6.8 | |||||
| * | | | Merge commit '9ae6c' | Johannes Dahlström | 2012-06-11 | 1 | -3/+4 | |
| |\| | | ||||||
| | * | | #8763 Disable native touch scrolling on iOS 5 devices until #8792 is resolved | Johannes Dahlström | 2012-05-14 | 1 | -3/+4 | |
| | | | | | | | | | | | | | | | | svn changeset:23730/svn branch:6.8 | |||||
| * | | | Merge commit '321b4' | Johannes Dahlström | 2012-06-11 | 1 | -0/+1 | |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java | |||||
| | * | | [merge from 6.7] #5521 portlet body should fill portlet content e.g. in ↵ | Automerge | 2012-05-14 | 1 | -1/+37 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Liferay freeform layout, related manual test application svn changeset:23729/svn branch:6.8 | |||||
| | * | | #8716 Rewrite some CSS classname handling code to prevent overwriting ↵ | Johannes Dahlström | 2012-05-14 | 1 | -32/+23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | v-scrollable svn changeset:23728/svn branch:6.8 | |||||
| * | | | Merge commit 'ac2008' | Johannes Dahlström | 2012-06-11 | 1 | -20/+230 | |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java | |||||
| | * | | #8724 Preliminary native touch scroll support for Table | Johannes Dahlström | 2012-05-11 | 1 | -20/+194 | |
| | | | | | | | | | | | | | | | | svn changeset:23724/svn branch:6.8 | |||||
| * | | | Merge commit '716de' | Johannes Dahlström | 2012-06-11 | 2 | -5/+3 | |
| |\| | | ||||||
| | * | | #8722 Move handling of scrolling from VWindow to FocusableScrollPanel | Johannes Dahlström | 2012-05-11 | 2 | -5/+3 | |
| | | | | | | | | | | | | | | | | svn changeset:23723/svn branch:6.8 | |||||
| * | | | Merge commit '95e0de' | Johannes Dahlström | 2012-06-11 | 1 | -0/+1 | |
| |\| | | ||||||
| | * | | #8721 Make VView touch scrollable | Johannes Dahlström | 2012-05-11 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | svn changeset:23722/svn branch:6.8 | |||||
| * | | | Merge commit 'b50dcc' | Johannes Dahlström | 2012-06-11 | 1 | -4/+3 | |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheetPanel.java | |||||
| | * | | #8720 Improve handling of tab container scrolling | Johannes Dahlström | 2012-05-11 | 1 | -6/+3 | |
| | | | | | | | | | | | | | | | | svn changeset:23721/svn branch:6.8 | |||||
| * | | | Merge commit '16c91' | Johannes Dahlström | 2012-06-11 | 1 | -2/+1 | |
| |\| | | ||||||
| | * | | #8723 Oops, call removeElement(), not addElement(), in removeTab() | Johannes Dahlström | 2012-05-11 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | svn changeset:23720/svn branch:6.8 | |||||
| * | | | Merge commit 'f560e' | Johannes Dahlström | 2012-06-11 | 1 | -47/+27 | |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java | |||||
| | * | | #8725 Use TouchScrollDelegate.enableTouchScrolling() instead of ↵ | Johannes Dahlström | 2012-05-11 | 1 | -49/+23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | TouchScrollDelegate instance directly; rewrite CSS class handling a bit to prevent overwriting v-scrollable svn changeset:23719/svn branch:6.8 | |||||
| * | | | Merge commit 'bb486' | Johannes Dahlström | 2012-06-11 | 1 | -6/+17 | |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/com/vaadin/terminal/gwt/client/ui/accordion/VAccordion.java | |||||
| | * | | #8723 Add touch scrolling support to Accordion | Johannes Dahlström | 2012-05-11 | 1 | -6/+16 | |
| | | | | | | | | | | | | | | | | svn changeset:23716/svn branch:6.8 | |||||
| * | | | Merge commit '8383b' | Johannes Dahlström | 2012-06-11 | 1 | -4/+4 | |
| |\| | | ||||||
| | * | | camelCasify CSS property names | Johannes Dahlström | 2012-05-11 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | svn changeset:23715/svn branch:6.8 | |||||
| * | | | Fixed a broken merge | Johannes Dahlström | 2012-06-11 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Merge commit 'c8a4ca' | Johannes Dahlström | 2012-06-11 | 1 | -3/+19 | |
| |\| | | ||||||
| | * | | [merge from 6.7] Tweaks to #7931 based on review. | Automerge | 2012-05-10 | 1 | -3/+19 | |
| | | | | | | | | | | | | | | | | svn changeset:23708/svn branch:6.8 | |||||
| * | | | Merge commit 'f6bfd' | Johannes Dahlström | 2012-06-11 | 1 | -12/+27 | |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java | |||||
| | * | | [merge from 6.7] Send VView size instead of window size (#7931) | Automerge | 2012-05-10 | 1 | -12/+21 | |
| | | | | | | | | | | | | | | | | svn changeset:23703/svn branch:6.8 | |||||
| * | | | Merge commit 'd53b6' | Johannes Dahlström | 2012-06-11 | 1 | -0/+4 | |
| |\| | | ||||||
| | * | | Use in empty table footers to make them render properly (#7718) | Leif Åstrand | 2012-05-10 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | svn changeset:23701/svn branch:6.8 | |||||
| * | | | Merge commit '2f9e5' | Johannes Dahlström | 2012-06-11 | 1 | -0/+29 | |
| |\| | | ||||||
| | * | | TouchScrollHandler: added debug info, restored setElements() | Johannes Dahlström | 2012-05-09 | 1 | -0/+29 | |
| | | | | | | | | | | | | | | | | svn changeset:23697/svn branch:6.8 | |||||
| * | | | Merge commit '8cfb8' | Johannes Dahlström | 2012-06-11 | 1 | -1/+12 | |
| |\| | | ||||||
| | * | | [merge from 6.7] Don't activate tab when clicking close element (#7686) | Automerge | 2012-05-08 | 1 | -1/+12 | |
| | | | | | | | | | | | | | | | | svn changeset:23690/svn branch:6.8 | |||||
| * | | | Merge commit 'ff05bab' | Johannes Dahlström | 2012-06-11 | 1 | -0/+3 | |
| |\| | | ||||||
| | * | | #8722 Make subwindows touch scrollable | Johannes Dahlström | 2012-05-07 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | svn changeset:23688/svn branch:6.8 |