]> source.dussan.org Git - vaadin-framework.git/commit
Merge branch 'master' into grid
authorTeemu Suo-Anttila <teemusa@vaadin.com>
Tue, 20 May 2014 10:26:57 +0000 (13:26 +0300)
committerTeemu Suo-Anttila <teemusa@vaadin.com>
Tue, 20 May 2014 11:53:22 +0000 (14:53 +0300)
commit1ac972f2bb7d92604a89abf5e08e4343726fbd01
tree8f213bb97eb2f2abd0d02c0eec1e16871d5bb823
parent335eb7937d29c4b540b9bd2e02651e11ff46a6ba
parent13ddd2b03c99b563b131c115982ac09453ca749f
Merge branch 'master' into grid

Conflicts:
WebContent/release-notes.html

Change-Id: Icccb2e30199f99a7b0b00f05b1a12d5f7297402f
39 files changed:
WebContent/release-notes.html
client/src/com/vaadin/client/data/AbstractRemoteDataSource.java
client/src/com/vaadin/client/data/DataChangeHandler.java
client/src/com/vaadin/client/data/DataSource.java
client/src/com/vaadin/client/data/RpcDataSourceConnector.java
client/src/com/vaadin/client/ui/grid/Cell.java
client/src/com/vaadin/client/ui/grid/ColumnConfiguration.java
client/src/com/vaadin/client/ui/grid/ColumnGroup.java
client/src/com/vaadin/client/ui/grid/ColumnGroupRow.java
client/src/com/vaadin/client/ui/grid/Escalator.java
client/src/com/vaadin/client/ui/grid/EscalatorUpdater.java
client/src/com/vaadin/client/ui/grid/FlyweightCell.java
client/src/com/vaadin/client/ui/grid/FlyweightRow.java
client/src/com/vaadin/client/ui/grid/Grid.java
client/src/com/vaadin/client/ui/grid/GridColumn.java
client/src/com/vaadin/client/ui/grid/GridConnector.java
client/src/com/vaadin/client/ui/grid/PositionFunction.java
client/src/com/vaadin/client/ui/grid/Renderer.java
client/src/com/vaadin/client/ui/grid/Row.java
client/src/com/vaadin/client/ui/grid/RowContainer.java
client/src/com/vaadin/client/ui/grid/RowVisibilityChangeEvent.java
client/src/com/vaadin/client/ui/grid/RowVisibilityChangeHandler.java
client/src/com/vaadin/client/ui/grid/ScrollbarBundle.java
client/src/com/vaadin/client/ui/grid/datasources/ListDataSource.java
client/src/com/vaadin/client/ui/grid/renderers/DateRenderer.java
client/src/com/vaadin/client/ui/grid/renderers/HtmlRenderer.java
client/src/com/vaadin/client/ui/grid/renderers/NumberRenderer.java
client/src/com/vaadin/client/ui/grid/renderers/TextRenderer.java
server/src/com/vaadin/data/Container.java
server/src/com/vaadin/data/RpcDataProviderExtension.java
server/src/com/vaadin/data/util/AbstractBeanContainer.java
server/src/com/vaadin/data/util/AbstractInMemoryContainer.java
server/src/com/vaadin/data/util/IndexedContainer.java
server/src/com/vaadin/ui/components/grid/ColumnGroup.java
server/src/com/vaadin/ui/components/grid/ColumnGroupRow.java
server/src/com/vaadin/ui/components/grid/Grid.java
server/src/com/vaadin/ui/components/grid/GridColumn.java
server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java
server/tests/src/com/vaadin/data/util/TestIndexedContainer.java