]> source.dussan.org Git - vaadin-framework.git/commit
Merge changes from origin/7.2 into master
authorJonatan Kronqvist <jonatan@vaadin.com>
Mon, 5 May 2014 08:41:09 +0000 (11:41 +0300)
committerJonatan Kronqvist <jonatan@vaadin.com>
Mon, 5 May 2014 08:43:28 +0000 (11:43 +0300)
commit0745a29a958950b47dbc178d2c3f8c1f38c2af55
tree8ee16701bec4b37e7a0601ec6bae97f34052bea1
parent2efe580cb8dbd185fc154a7c7d6acb7efc4f16d5
parent2c8c29e68b002ac6c498c3046a41822111c6d4ab
Merge changes from origin/7.2 into master

Conflicts:
build.properties
client/src/com/vaadin/client/ApplicationConnection.java
client/src/com/vaadin/client/extensions/ResponsiveConnector.java
server/src/com/vaadin/server/Responsive.java

Change-Id: I49f90521611d1b86704a60c3d003cdeea9c3b864
31 files changed:
client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ClientRpcVisitor.java
client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java
client/src/com/vaadin/client/ApplicationConnection.java
client/src/com/vaadin/client/extensions/ResponsiveConnector.java
client/src/com/vaadin/client/ui/AbstractComponentConnector.java
client/src/com/vaadin/client/ui/VCalendarPanel.java
client/src/com/vaadin/client/ui/VFilterSelect.java
client/src/com/vaadin/client/ui/VPopupCalendar.java
client/src/com/vaadin/client/ui/VScrollTable.java
client/src/com/vaadin/client/ui/VTextArea.java
client/src/com/vaadin/client/ui/VTextualDate.java
client/src/com/vaadin/client/ui/accordion/AccordionConnector.java
client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java
client/src/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java
client/src/com/vaadin/client/ui/dd/VDragEvent.java
client/src/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java
client/src/com/vaadin/client/ui/popupview/PopupViewConnector.java
server/src/com/vaadin/server/Responsive.java
server/src/com/vaadin/server/VaadinService.java
server/src/com/vaadin/server/communication/MetadataWriter.java
server/src/com/vaadin/server/communication/PublishedFileHandler.java
server/src/com/vaadin/ui/Table.java
server/tests/src/com/vaadin/server/VaadinPortletServiceTests.java
shared/src/com/vaadin/shared/ui/label/ContentMode.java
shared/src/com/vaadin/shared/ui/ui/UIClientRpc.java
uitest/ivy.xml
uitest/src/com/vaadin/tests/components/datefield/DisabledParentLayout.java
uitest/src/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java
uitest/src/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivityTest.java
uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java