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-27	21	-42/+266
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename Root -> UI in root cleanup code Conflicts: client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java server/src/com/vaadin/ui/UI.java
\| \| *	Migrate Slider to Vaadin 7 (#9304)	Johannes Dahlström	2012-08-24	3	-0/+79
\| \| \|
\| \| *	Split Embedded into several components, migrate them to Vaadin 7 (#9087)	Johannes Dahlström	2012-08-24	5	-0/+117
\| \| \|
\| \| *	Remaining Root -> UI renames (#8908)	Artur Signell	2012-08-24	5	-9/+10
\| \| \|
\| \| *	Rename Root related classes and package to UI (#8908)	Artur Signell	2012-08-24	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic renames in Eclipse of: - package com.vaadin.terminal.gwt.client.ui.root to .UI - RootConnector to UIConnector - RootServerRpc to UIServerRpc - RootState to UIState - VRoot to VUI - RootRequiresMoreInformationException to UIRequiresMoreInformationException
\| \| *	Make it possible to delegate state changes to widget (#9297)	Leif Åstrand	2012-08-24	4	-0/+35
\| \| \|
\| * \|	Merge branch 'master' into root-cleanup	Johannes Dahlström	2012-08-22	11	-29/+178
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: client/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java
\| * \| \|	Sending and receiving heartbeat requests (#9265)	Johannes Dahlström	2012-08-22	1	-0/+2
\| \| \| \|
* \| \| \|	Merge branch 'master' into layoutgraph	John Ahlroos	2012-08-28	9	-55/+72
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Changed Notification type and position to enum (#9072)	Artur Signell	2012-08-23	1	-0/+20
\| \| \| \|
\| * \| \|	Make the (server-side) getState method protected (#9315)	Leif Åstrand	2012-08-22	1	-11/+0
\| \| \| \|
\| * \| \|	Support using public fields in state classes (#9324)	Leif Åstrand	2012-08-22	2	-20/+3
\| \| \|/ \| \|/\|
\| * \|	Changed border style to enum (#9072)	Artur Signell	2012-08-22	1	-0/+20
\| \| \|
\| * \|	Refactored margin handlers (#8292)	Artur Signell	2012-08-22	4	-16/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit ff4988f6beaa0a1c8b908e098525afc3505ece64. Conflicts: client/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java
* \| \|	Merge master	Jouni Koivuviita	2012-08-20	6	-5/+137
\|\\| \|
\| * \|	Support @Delayable and change window size update to use it (#8421)	Leif Åstrand	2012-08-20	5	-5/+129
\| \|/
\| *	Merge branch 'master' into root-cleanup	Johannes Dahlström	2012-08-17	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \|	Merge master	Jouni Koivuviita	2012-08-17	1	-0/+20
\|/
*	Replaced license place holder with actual license (#8955)	Artur Signell	2012-08-16	77	-79/+1003
\|
*	Moved Version class to com.vaadin.shared (#4617)	Artur Signell	2012-08-16	1	-0/+74
\|
*	Removed @version which is included in some files but not in all (#9299)	Artur Signell	2012-08-15	4	-4/+0
\|
*	Removed depdencies from server to client (#9279)	Artur Signell	2012-08-14	1	-0/+2
\|
*	Eliminated dependencies from server to client (#9279)	Artur Signell	2012-08-13	17	-0/+294
\|
*	Moved com.vaadin.shared files to a shared src folder (#9299)	Artur Signell	2012-08-13	60	-0/+3055