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
*	Replaced all .v and .v-connector selectors with .v-widget selector	John Ahlroos	2012-08-28	2	-4/+6
\|
*	Fixed conflicting issues from merge	John Ahlroos	2012-08-28	2	-50/+55
\|
*	Merge branch 'master' into layoutgraph	John Ahlroos	2012-08-28	23	-228/+978
\|\ \| \| \| \| \| \| \| \|	Conflicts: tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
\| *	Log some errors as error	Leif Åstrand	2012-08-28	1	-4/+4
\| \|
\| *	Removed IE6/IE7 specific code accidentally included in merge	Artur Signell	2012-08-27	1	-18/+5
\| \|
\| *	Merge remote-tracking branch 'origin/6.8'	Artur Signell	2012-08-27	1	-6/+46
\| \| \| \| \| \| \| \| \| \|	Conflicts: server/src/com/vaadin/ui/Select.java
\| *	Merge branch 'master' into root-cleanup	Johannes Dahlström	2012-08-27	53	-909/+1899
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-132/+208
\| \| \|
\| \| *	Split Embedded into several components, migrate them to Vaadin 7 (#9087)	Johannes Dahlström	2012-08-24	6	-0/+507
\| \| \|
\| \| *	Remaining Root -> UI renames (#8908)	Artur Signell	2012-08-24	5	-28/+31
\| \| \|
\| \| *	Rename Root related classes and package to UI (#8908)	Artur Signell	2012-08-24	6	-38/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| *	Renamed Root to UI, automatic rename (#8908)	Artur Signell	2012-08-24	3	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic rename in Eclipse of the class Root to UI with all rename options enabled, rename also embedded "Root" in variable and method names. The following classes/methods were excluded in the rename: - BootstrapHandler.getApplicationCSSClassName() - ComponentLocator - ConnectorMap - ItemClickEvent - KeepAllItemsVisible - MenuBarTest - MenuBarTooltips - TreeTableTest - TreeWithIcons - Trees - VDebugConsole.printLayoutProblems()
\| \| *	Make it possible to delegate state changes to widget (#9297)	Leif Åstrand	2012-08-24	6	-20/+71
\| \| \|
\| * \|	Add support for heartbeat not extending session (#9266)	Johannes Dahlström	2012-08-24	1	-1/+0
\| \| \|
\| * \|	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
\| * \| \|	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 layoutgraph	John Ahlroos	2012-08-28	49	-775/+1073
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Changed Notification type and position to enum (#9072)	Artur Signell	2012-08-23	1	-16/+20
\| \| \| \|
\| * \| \|	Removed API deprecated in Vaadin 6 (#9071)	Artur Signell	2012-08-22	4	-111/+11
\| \| \| \|
\| * \| \|	Make the (server-side) getState method protected (#9315)	Leif Åstrand	2012-08-22	1	-0/+10
\| \| \| \|
\| * \| \|	Support using public fields in state classes (#9324)	Leif Åstrand	2012-08-22	1	-4/+4
\| \| \| \|
\| * \| \|	Use ConnectorBundle for JSON encoding and decoding (#9371)	Leif Åstrand	2012-08-22	10	-135/+171
\| \| \| \|
\| * \| \|	Use ConnectorBundle for ServerRpc handling (#9371)	Leif Åstrand	2012-08-22	10	-82/+145
\| \| \| \|
\| * \| \|	Use ConnectorBundle for ClientRpc handling (#9371)	Leif Åstrand	2012-08-22	13	-131/+155
\| \| \| \|
\| * \| \|	Use ConnectorBundle for creating state and widget (#9371)	Leif Åstrand	2012-08-22	8	-165/+20
\| \| \| \|
\| * \| \|	Initial ConnectorBundle implementation (#9371)	Leif Åstrand	2012-08-22	20	-121/+582
\| \| \|/ \| \|/\|
\| * \|	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
* \| \|	Merge branch 'master' into layoutgraph	John Ahlroos	2012-08-20	10	-122/+314
\|\\| \|
\| * \|	Merged 6.8 branch	John Ahlroos	2012-08-20	10	-122/+314
\| \| \|
* \| \|	Added ServerConnector.removeStateChangeHandler API	John Ahlroos	2012-08-20	2	-2/+36
\| \| \|
* \| \|	Merge master	Jouni Koivuviita	2012-08-20	10	-91/+289
\|\\| \|
\| * \|	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
\| \|/
\| *	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
* \|	-	Jouni Koivuviita	2012-08-20	1	-1/+2
\| \|
* \|	Moved BoxLayout to new package	Jouni Koivuviita	2012-08-17	7	-9/+1395
\| \|
* \|	Merge master	Jouni Koivuviita	2012-08-17	6	-16/+82
\|/
*	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
\|
*	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
\|