Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '7.0' | Artur Signell | 2013-02-15 | 23 | -229/+1137 |
|\ | |||||
| * | Merge "Ensure super method is called when iterating children in VAbsoluteLayo... | Leif Åstrand | 2013-02-15 | 1 | -3/+3 |
| |\ | |||||
| | * | Ensure super method is called when iterating children in VAbsoluteLayout #10762 | John Ahlroos | 2013-02-15 | 1 | -3/+3 |
| * | | Merge of first part of (#10513) to Vaadin 7. | Johannes Dahlström | 2013-02-15 | 3 | -2/+151 |
| * | | Merge "Merge of (#6160) and (#10470) to Vaadin 7." into 7.0 | Johannes Dahlström | 2013-02-14 | 15 | -226/+886 |
| |\ \ | |||||
| | * | | Merge of (#6160) and (#10470) to Vaadin 7. | Johannes Dahlström | 2013-02-14 | 9 | -182/+864 |
| * | | | Merge "Removed invalid and unnecessary clicks from test" into 7.0 | Leif Åstrand | 2013-02-14 | 5 | -25/+0 |
| |\ \ \ | |||||
| | * | | | Removed invalid and unnecessary clicks from test | Artur Signell | 2013-02-13 | 5 | -25/+0 |
| * | | | | Fixed resetting link target and updated javadoc (#10543) | Artur Signell | 2013-02-14 | 2 | -16/+7 |
| * | | | | Fixed problem with removing the icon from a Button (#10543) | Artur Signell | 2013-02-14 | 3 | -1/+111 |
| * | | | | Added back previous removed test due to #9870 to pass test (Ticket | Haijian Wang | 2013-02-14 | 1 | -0/+1 |
* | | | | | Merge "Added support for Dates to DefaultFieldGroupFieldFactory (#8539)" | John Ahlroos | 2013-02-14 | 3 | -0/+217 |
|\ \ \ \ \ | |||||
| * | | | | | Added support for Dates to DefaultFieldGroupFieldFactory (#8539) | Artur Signell | 2013-02-12 | 3 | -0/+217 |
| | |_|/ / | |/| | | | |||||
* | | | | | Use client-compiler-deps instead of bundling files (#9851) | Artur Signell | 2013-02-14 | 2 | -58/+108 |
* | | | | | Merge remote-tracking branch 'origin/7.0' | Henri Sara | 2013-02-14 | 10 | -60/+223 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Fix JDK 1.7 dependency in #10426 | Henri Sara | 2013-02-14 | 1 | -1/+2 |
| * | | | | Merge "Case-insensitive FieldGroup binding #10426" | Henri Sara | 2013-02-14 | 3 | -13/+200 |
| |\ \ \ \ | |||||
| | * | | | | Case-insensitive FieldGroup binding #10426 | Jonni Nakari | 2013-02-13 | 3 | -13/+200 |
| * | | | | | Merge "Removed redundant inline style (#10524)" | John Ahlroos | 2013-02-14 | 1 | -3/+0 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Removed redundant inline style (#10524) | Artur Signell | 2013-02-11 | 1 | -3/+0 |
| | |/ / / | |||||
| * | | | | Merge remote-tracking branch 'origin/7.0' | Henri Sara | 2013-02-12 | 6 | -44/+22 |
| |\| | | | |||||
| | * | | | Merge "Do not throw NPE when asking for a null propertyId (#10445)" | Henri Sara | 2013-02-08 | 2 | -1/+10 |
| | |\ \ \ | |||||
| | | * | | | Do not throw NPE when asking for a null propertyId (#10445) | Artur Signell | 2013-01-30 | 2 | -1/+10 |
| | * | | | | Merge "Made getServlet and getPortlet public (#10882)" | Leif Åstrand | 2013-02-07 | 2 | -2/+12 |
| | |\ \ \ \ | |||||
| | | * | | | | Made getServlet and getPortlet public (#10882) | Artur Signell | 2013-02-07 | 2 | -2/+12 |
| | * | | | | | Merge branch '7.0' | Leif Åstrand | 2013-02-07 | 2 | -41/+0 |
| | |\| | | | | |||||
| | | * | | | | Include version number in javadoc index page of vaadin-all zip | Mikael Vappula | 2013-02-01 | 1 | -1/+1 |
| | | * | | | | Merge branch '7.0' | Artur Signell | 2013-02-01 | 1 | -12/+0 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Removed legacy toString implementations as promised in 7.0 (#10916) | Artur Signell | 2013-02-01 | 2 | -41/+0 |
* | | | | | | | | Merge "SASS fails to parse CSS expression function. (Ticket #9870)" into 7.0 | Henri Sara | 2013-02-14 | 5 | -6152/+6198 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | SASS fails to parse CSS expression function. (Ticket #9870) | Haijian Wang | 2013-02-14 | 5 | -6152/+6198 |
* | | | | | | | | | Merge "Removed artifical slowdown which should no longer be needed (#11015)" ... | Leif Åstrand | 2013-02-14 | 5 | -26/+1 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | Removed artifical slowdown which should no longer be needed (#11015) | Artur Signell | 2013-02-13 | 5 | -26/+1 |
* | | | | | | | | | Merge "Fixed NPE when a connector is no longer available (#11015)" into 7.0 | Leif Åstrand | 2013-02-14 | 1 | -11/+43 |
|\| | | | | | | | | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Fixed NPE when a connector is no longer available (#11015) | Artur Signell | 2013-02-13 | 1 | -11/+43 |
* | | | | | | | | Merge "Update license header" into 7.0 | Henri Sara | 2013-02-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Update license header | Leif Åstrand | 2013-02-14 | 1 | -1/+1 |
* | | | | | | | | ParseException does not output file name (Ticket #10967) | Haijian Wang | 2013-02-14 | 2 | -1/+45 |
|/ / / / / / / | |||||
* | | | | | | | Fixed NPE in test when value is null | Artur Signell | 2013-02-13 | 1 | -2/+2 |
* | | | | | | | Merge "Sass replaces variables based on substring matches. (Tickets #10508, #... | Henri Sara | 2013-02-13 | 13 | -40/+157 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Sass replaces variables based on substring matches. (Tickets #10508, | Haijian Wang | 2013-02-13 | 13 | -40/+157 |
* | | | | | | | | Paser doesn't know CSS 'lem' and 'rem'. (Ticket #11024) | Haijian Wang | 2013-02-13 | 8 | -6377/+5587 |
* | | | | | | | | Merge "Add lightweight profiling (#10961)" into 7.0 | Artur Signell | 2013-02-13 | 13 | -77/+690 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add lightweight profiling (#10961) | Leif Åstrand | 2013-02-13 | 13 | -77/+690 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge "Handle OutOfSync by resyncing automatically (#10780)" into 7.0 | Leif Åstrand | 2013-02-13 | 3 | -5/+105 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Handle OutOfSync by resyncing automatically (#10780) | Artur Signell | 2013-02-11 | 3 | -5/+105 |
* | | | | | | | | | Merge "Referencing multiple params in multiple lines inside mixin (Ticket #10... | Henri Sara | 2013-02-12 | 3 | -15/+33 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Referencing multiple params in multiple lines inside mixin (Ticket | Haijian Wang | 2013-02-12 | 3 | -15/+33 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Fixed ColumnDragColumn test which was failing after fixes for #10890 (#11020) | John Ahlroos | 2013-02-12 | 1 | -1/+1 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | Merge "Set the overlay container width and height to zero (#10860)" into 7.0 | John Ahlroos | 2013-02-12 | 2 | -1/+62 |
|\ \ \ \ \ \ \ |