vaadin-framework.git - Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into root-cleanup	Johannes Dahlström	2012-08-22	30	-252/+600
\|\ \| \| \| \| \| \| \| \|	Conflicts: client/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java
\| *	Changed border style to enum (#9072)	Artur Signell	2012-08-22	2	-9/+16
\| \|
\| *	Refactored margin handlers (#8292)	Artur Signell	2012-08-22	8	-36/+12
\| \| \| \| \| \| \| \| \| \| \| \|	Only layouts actually supporting margins now implement MarginHandler CssLayout should be simplified before 7.0.0 so margin support was removed. GridLayout, VerticalLayout and HorizontalLayout were the only other layouts which actually supported margin. MarginInfo is now passed directly in the state.
\| *	Revert "Added a heartbeat timer to RootConnector (#9265)"	Johannes Dahlström	2012-08-21	1	-38/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit ff4988f6beaa0a1c8b908e098525afc3505ece64. Conflicts: client/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java
\| *	Merged 6.8 branch	John Ahlroos	2012-08-20	10	-122/+314
\| \|
\| *	Support StateChangeHandler for selected parts of the state (#8598)	Leif Åstrand	2012-08-20	5	-37/+169
\| \|
\| *	Support @Delayable and change window size update to use it (#8421)	Leif Åstrand	2012-08-20	6	-48/+89
\| \|
* \|	Improve documentation, disable cleanup if heartbeat interval nonpositive, ↵	Johannes Dahlström	2012-08-22	2	-5/+15
\| \| \| \| \| \| \| \|	change default heartbeat interval from 500 to 300, some logging on client side (#9265)
* \|	Sending and receiving heartbeat requests (#9265)	Johannes Dahlström	2012-08-22	2	-39/+70
\| \|
* \|	Add heartbeat interval to DeploymentConfiguration, include in bootstrap ↵	Johannes Dahlström	2012-08-21	1	-0/+8
\|/ \| \| \|	config (#9265)
*	Merge branch 'master' into root-cleanup	Johannes Dahlström	2012-08-17	1	-0/+38
\| \| \| \| \| \| \| \|	Conflicts: server/src/com/vaadin/terminal/DeploymentConfiguration.java server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java
*	Replaced license place holder with actual license (#8955)	Artur Signell	2012-08-16	255	-255/+3315
\|
*	Use shared Version in client side also (#4617)	Artur Signell	2012-08-16	3	-21/+7
\|
*	Removed @version which is included in some files but not in all (#9299)	Artur Signell	2012-08-15	6	-6/+0
\|
*	Removed reference to VaadinDOMImplSafari from widgetset	John Ahlroos	2012-08-15	1	-6/+0
\|
*	Removed workaround for GWT issue #6130 after applying patch	John Ahlroos	2012-08-15	1	-26/+0
\| \| \| \|	http://code.google.com/p/google-web-toolkit/issues/detail?id=6130 to GWT branch.
*	Fixed widgetset compilation (#9299)	Artur Signell	2012-08-14	1	-0/+85
\|
*	Removed dependencies from client to server/client-compiler (#9299)	Artur Signell	2012-08-14	5	-20/+10
\|
*	Moved client compiler sources to own source folder (#9299)	Artur Signell	2012-08-14	15	-2829/+0
\|
*	Removed depdencies from server to client (#9279)	Artur Signell	2012-08-14	1	-13/+15
\|
*	Eliminated dependencies from server to client (#9279)	Artur Signell	2012-08-13	33	-284/+206
\|
*	Moved client files to a client src folder (#9299)	Artur Signell	2012-08-13	311	-0/+61103