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 'sass'	John Ahlroos	2012-10-08	75	-1455/+1510
\|\
\| *	Merge branch 'master' into sass	John Ahlroos	2012-10-08	1	-0/+3
\| \|\
\| * \	Merge branch 'master' into sass	Marc Englund	2012-10-04	3	-36/+36
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: WebContent/VAADIN/themes/base/formlayout/formlayout.scss WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss Change-Id: Ie895a1bbafdcf2fe79d500efb04c6eef3f5a812e
\| * \ \	Merge branch 'master' into sass	Marc Englund	2012-10-01	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss theme-compiler/src/com/vaadin/sass/tree/ListRemoveNode.java theme-compiler/src/com/vaadin/sass/visitor/EachVisitor.java
\| * \| \| \|	Sass restructure: split button into nativebutton and checkbox	Marc Englund	2012-09-28	8	-100/+149
\| \| \| \| \|
\| * \| \| \|	Sass restructure: fixed bug in embedded.scss	Marc Englund	2012-09-28	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Sass restructure: base theme with renameable components	Marc Englund	2012-09-28	31	-495/+495
\| \| \| \| \|
\| * \| \| \|	Sass restructure: tried some variants, this should be a reindeer structure ↵	Marc Englund	2012-09-28	31	-712/+712
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	that should work w/o overlay-container
\| * \| \| \|	Sass restructure: need to disable .themename{} -wrapping until we get ↵	Marc Englund	2012-09-28	10	-64/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	overlay-container.
\| * \| \| \|	Rearranging sass theme structure in phases.	Marc Englund	2012-09-26	8	-109/+109
\| \| \| \| \|
* \| \| \| \|	Merge "Fixed datefield height #9798"	Johannes Dahlström	2012-10-05	1	-0/+1
\|\ \ \ \ \
\| * \| \| \| \|	Fixed datefield height #9798	John Ahlroos	2012-10-04	1	-0/+1
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Iabd4c7e7729efeed02f8be087769de5f51634662
* \| \| \| \|	Merge "Fixed selectors in layout.scss #9860"	John Ahlroos	2012-10-05	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Fixed selectors in layout.scss #9860	John Ahlroos	2012-10-04	1	-2/+2
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I297de32c4123ecc70bbadd92171b7858d7ef7399
* \| \| \| \|	Merge "Added IE8 HTML5 doctype fix for removing unneeded scrollbars in ↵	John Ahlroos	2012-10-05	1	-0/+10
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \|	splitpanel #9552"
\| * \| \| \|	Added IE8 HTML5 doctype fix for removing unneeded scrollbars in splitpanel #9552	John Ahlroos	2012-10-04	1	-0/+10
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I2d9abc2add60809412a8625d4b4753aca408c7cd
* / / /	Fixed combobox line heights in Chameleon theme #9838	John Ahlroos	2012-10-03	1	-0/+3
\|/ / / \| \| \| \| \| \| \| \| \|	Change-Id: I2193f9304b378084bdd9f0e750e049af5af5e0ec
* \| /	Merge from 6.8: Limit propagation of vertical spacing and margins in	Henri Sara	2012-10-01	3	-36/+36
\| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nested FormLayouts, related test (#9427) svn changeset:24503/svn branch:6.8 svn changeset:24504/svn branch:6.8 svn changeset:24506/svn branch:6.8 Change-Id: I7eca0fccdd9fc9258514c68025bd9e99dcc0b89d
* \|	Fix and test case for #9294 (hideTabs() hides a nested tabsheet tabs as well)	Johannes Dahlström	2012-09-27	1	-1/+1
\|/
*	Restored content:"" for layout slots which fixes #9736	John Ahlroos	2012-09-25	1	-1/+1
\|
*	Caption text should be middle aligned #8294	John Ahlroos	2012-09-24	1	-1/+1
\|
*	Revert "Fixed different spacing height in IE and Opera #8294". Was causing ↵	John Ahlroos	2012-09-24	1	-5/+0
\| \| \| \|	too many other tests to fail.
*	Fixed different spacing height in IE and Opera #8294	John Ahlroos	2012-09-24	1	-0/+5
\|
*	Revert "Restored table row heights #8294".	John Ahlroos	2012-09-21	1	-2/+2
\|
*	Restored table row heights #8294	John Ahlroos	2012-09-21	1	-2/+2
\|
*	Fixed panel caption height causing 1px jump #8294	John Ahlroos	2012-09-20	1	-0/+1
\|
*	Fixed select row height changes #8294	John Ahlroos	2012-09-20	1	-0/+4
\|
*	Revert "Fixed NativeButton 1px caption jump #8294"	John Ahlroos	2012-09-20	1	-2/+1
\|
*	Fixed NativeButton 1px caption jump #8294	John Ahlroos	2012-09-20	1	-1/+2
\|
*	Fixed 1px jump in caption #8294	John Ahlroos	2012-09-19	1	-1/+1
\|
*	Trying again, this time making layouts block elements #8294	John Ahlroos	2012-09-19	1	-2/+2
\|
*	Fixed issue where layouts with empty slots gets line height. #8294	John Ahlroos	2012-09-19	1	-0/+1
\|
*	Removed empty content: in css rules since they generate a empty line with ↵	John Ahlroos	2012-09-18	6	-7/+6
\| \| \| \|	html5 content type
*	Moved grid layout margin and spacing fixes from reindeer to base theme #9559	John Ahlroos	2012-09-13	2	-18/+20
\|
*	Fixed previously broken gridlayout margins and spacings.	John Ahlroos	2012-09-12	1	-5/+5
\|
*	Moved background-position before sprite so sprite generator can override it	Artur Signell	2012-09-11	1	-1/+1
\|
*	Fixed combobox item selector offset bug	John Ahlroos	2012-09-11	1	-0/+1
\|
*	Add missing closing brace to @mixin base-common	Johannes Dahlström	2012-09-10	1	-0/+2
\|
*	Merge branch '6.8'	John Ahlroos	2012-09-10	1	-0/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: WebContent/VAADIN/themes/base/common/common.scss server/src/com/vaadin/server/VaadinServlet.java server/src/com/vaadin/ui/AbstractField.java src/com/vaadin/terminal/gwt/client/ui/VUriFragmentUtility.java tests/testbench/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java tests/testbench/com/vaadin/tests/components/table/TableReduceContainerSize.java tests/testbench/com/vaadin/tests/tickets/Ticket8291.java uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.html uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java uitest/src/com/vaadin/tests/tickets/Ticket8291.java uitest/test.xml
\| *	Enable (hopefully this time for real) native touch scrolling on Mobile ↵	Johannes Dahlström	2012-09-04	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \|	Safari 6+ (#8792) svn changeset:24300/svn branch:6.8
\| *	Remove #8792 fix from 6.8.2, defer to 6.8.3	Johannes Dahlström	2012-08-07	1	-4/+0
\| \| \| \| \| \| \| \|	svn changeset:24098/svn branch:6.8
\| *	Enable native touch scrolling on iOS 6 (#8792)	Johannes Dahlström	2012-08-07	1	-0/+4
\| \| \| \| \| \| \| \|	svn changeset:24094/svn branch:6.8
* \|	Fixing 1px caption jump in tabsheet and accordion after switching to	John Ahlroos	2012-09-07	2	-0/+6
\| \| \| \| \| \|	HTML5 doctype
* \|	Fix for 1px button caption jump after changing to HTML5 doctype	John Ahlroos	2012-09-07	1	-1/+1
\| \|
* \|	Removed paintable.scss	Jouni Koivuviita	2012-09-07	1	-12/+0
\| \|
* \|	Fixed 5px gaps between vertical layout slots (Firefox/Opera) after doctype ↵	Jouni Koivuviita	2012-09-07	3	-2/+15
\| \| \| \| \| \| \| \|	was changed to HTML5 (#8294). Refactored paintable.scss to widget.scss (this time for real)
* \|	Minor fix to CSS selector	John Ahlroos	2012-09-06	1	-3/+3
\| \|
* \|	Renamed .v-boxlayout selector to .v-layout and applied the .v-layout	John Ahlroos	2012-09-06	7	-187/+37
\| \| \| \| \| \|	selector to all layouts
* \|	Move captionless component error/required indicators top right	John Ahlroos	2012-08-30	1	-1/+1
\| \|
* \|	Minor changes to error indicator and caption vertical alignment	John Ahlroos	2012-08-29	2	-3/+3
\| \|