]> source.dussan.org Git - vaadin-framework.git/log
vaadin-framework.git
12 years agoRemoved @Override annotations from interface methods
Artur Signell [Mon, 28 Nov 2011 13:13:33 +0000 (15:13 +0200)]
Removed @Override annotations from interface methods

12 years agoMethod for getting all Fields in Vaadin
Artur Signell [Mon, 28 Nov 2011 13:08:51 +0000 (15:08 +0200)]
Method for getting all Fields in Vaadin

12 years agoMisc tests for converters
Artur Signell [Mon, 28 Nov 2011 13:07:18 +0000 (15:07 +0200)]
Misc tests for converters

12 years agoRemoved interface @Overrides
Artur Signell [Mon, 28 Nov 2011 11:50:00 +0000 (13:50 +0200)]
Removed interface @Overrides

12 years agoInitial implementation of using converters in Table
Artur Signell [Mon, 28 Nov 2011 11:43:22 +0000 (13:43 +0200)]
Initial implementation of using converters in Table

12 years agoInitial implementation of converters for AbstractField
Artur Signell [Mon, 28 Nov 2011 11:43:07 +0000 (13:43 +0200)]
Initial implementation of converters for AbstractField

12 years agoDefault value for a CheckBox is now false and not null. Removed
Artur Signell [Mon, 28 Nov 2011 11:39:03 +0000 (13:39 +0200)]
Default value for a CheckBox is now false and not null. Removed
old booleanValue as getValue() returns true/false now for all basic
cases

12 years agoFirst take on Converters
Artur Signell [Fri, 25 Nov 2011 15:48:47 +0000 (17:48 +0200)]
First take on Converters

12 years agoMerge branch 'master' into databinding
Artur Signell [Thu, 24 Nov 2011 09:17:37 +0000 (11:17 +0200)]
Merge branch 'master' into databinding

12 years agoMerge remote-tracking branch 'origin/6.8'
Artur Signell [Thu, 24 Nov 2011 08:34:30 +0000 (10:34 +0200)]
Merge remote-tracking branch 'origin/6.8'

12 years agoAdded ids and re-enabled test
Artur Signell [Thu, 24 Nov 2011 08:32:44 +0000 (08:32 +0000)]
Added ids and re-enabled test

svn changeset:22114/svn branch:6.8

12 years agoAdded ids and re-enabled test
Artur Signell [Thu, 24 Nov 2011 08:32:35 +0000 (08:32 +0000)]
Added ids and re-enabled test

svn changeset:22113/svn branch:6.8

12 years agodisabled test, testbench don't support custom implementations of client side components
Matti Tahvonen [Wed, 23 Nov 2011 09:10:08 +0000 (09:10 +0000)]
disabled test, testbench don't support custom implementations of client side components

svn changeset:22101/svn branch:6.8

12 years ago#7964 Fixed test
Artur Signell [Tue, 22 Nov 2011 15:42:01 +0000 (17:42 +0200)]
#7964 Fixed test

12 years ago#7985 Method for checking if browser is too old to work with Vaadin 7
Artur Signell [Tue, 22 Nov 2011 15:34:35 +0000 (17:34 +0200)]
#7985 Method for checking if browser is too old to work with Vaadin 7

12 years ago#7913 Removed IE6/IE7 related fix from merged change
Artur Signell [Tue, 22 Nov 2011 15:06:16 +0000 (17:06 +0200)]
#7913 Removed IE6/IE7 related fix from merged change

12 years ago#7984 removed Firefox workarounds
Artur Signell [Tue, 22 Nov 2011 15:05:42 +0000 (17:05 +0200)]
#7984 removed Firefox workarounds

12 years agoFIXME comment for the future
Artur Signell [Tue, 22 Nov 2011 14:47:20 +0000 (16:47 +0200)]
FIXME comment for the future

12 years ago#7963 Additional fixes
Artur Signell [Tue, 22 Nov 2011 14:37:40 +0000 (16:37 +0200)]
#7963 Additional fixes

Removed special case from widget set that used to support VButton
changing into VCheckBox

Corrected tests

12 years ago#7964 Fixed test to be compatible with CheckBox change
Artur Signell [Tue, 22 Nov 2011 13:56:13 +0000 (15:56 +0200)]
#7964 Fixed test to be compatible with CheckBox change

12 years agoAdded license header to VDragAndDropWrapperIE.java
Henri Sara [Tue, 22 Nov 2011 13:17:15 +0000 (13:17 +0000)]
Added license header to VDragAndDropWrapperIE.java

svn changeset:22095/svn branch:6.8

12 years agoAdded WebContent/VAADIN/widgetsets to .gitignore as git cannot track empty directorie...
Artur Signell [Tue, 22 Nov 2011 11:17:52 +0000 (13:17 +0200)]
Added WebContent/VAADIN/widgetsets to .gitignore as git cannot track empty directories and complains about changes when DefaultWidgetSet has been compiled

12 years ago#7981 Removed Firefox 2 specific code and CSS
Artur Signell [Tue, 22 Nov 2011 11:08:29 +0000 (13:08 +0200)]
#7981 Removed Firefox 2 specific code and CSS

12 years ago#7913 Removed IE7 specific CSS rules
Artur Signell [Tue, 22 Nov 2011 11:05:51 +0000 (13:05 +0200)]
#7913 Removed IE7 specific CSS rules

12 years ago#7913 Removed IE7 related stuff
Artur Signell [Tue, 22 Nov 2011 10:57:54 +0000 (12:57 +0200)]
#7913 Removed IE7 related stuff

12 years ago#7964 Added booleanValue() to CheckBox for now. Can probably be removed
Artur Signell [Tue, 22 Nov 2011 10:34:21 +0000 (12:34 +0200)]
#7964 Added booleanValue() to CheckBox for now. Can probably be removed
once
CheckBox.getValue() return Boolean

12 years ago#7963 Button now extends AbstractComponent instead of AbstractField
Artur Signell [Tue, 22 Nov 2011 10:31:21 +0000 (12:31 +0200)]
#7963 Button now extends AbstractComponent instead of AbstractField

Focus related methods previously used from AbstractField are now
implemented in Button directly.

Fixed tests related to this change.

12 years ago#7963 Moved ActionManager from AbstractField to AbstractComponent to
Artur Signell [Tue, 22 Nov 2011 10:26:53 +0000 (12:26 +0200)]
#7963 Moved ActionManager from AbstractField to AbstractComponent to
enable Button to extend AbstractComponent

12 years ago#7964 CheckBox now extends AbstractField directly.
Artur Signell [Tue, 22 Nov 2011 09:10:03 +0000 (11:10 +0200)]
#7964 CheckBox now extends AbstractField directly.

ClickListener is no longer available for a CheckBox.
Fixed tests accordingly

12 years ago#7913 Removed IE7 specific code from Button
Artur Signell [Tue, 22 Nov 2011 09:03:10 +0000 (11:03 +0200)]
#7913 Removed IE7 specific code from Button

12 years ago#7913 Removed IE6/IE7 specific code from CheckBox
Artur Signell [Tue, 22 Nov 2011 09:02:07 +0000 (11:02 +0200)]
#7913 Removed IE6/IE7 specific code from CheckBox

12 years agoRemoved demo related ignores that are no longer relevant
Artur Signell [Tue, 22 Nov 2011 07:27:07 +0000 (09:27 +0200)]
Removed demo related ignores that are no longer relevant

12 years agoMerge some changes from 6.7 to 6.8
Henri Sara [Tue, 22 Nov 2011 11:01:14 +0000 (11:01 +0000)]
Merge some changes from 6.7 to 6.8

svn changeset:22091/svn branch:6.8

12 years agoMerge remote branch 'origin/6.8'
Leif Åstrand [Tue, 22 Nov 2011 10:14:22 +0000 (12:14 +0200)]
Merge remote branch 'origin/6.8'

Conflicts:
tests/integration_tests.xml

12 years agoMerge changes from 6.7 to 6.8
Leif Åstrand [Tue, 22 Nov 2011 10:06:39 +0000 (10:06 +0000)]
Merge changes from 6.7 to 6.8

svn changeset:22090/svn branch:6.8

12 years agorenamed html file so that test bench don't think it is a test script
Matti Tahvonen [Mon, 21 Nov 2011 14:18:27 +0000 (14:18 +0000)]
renamed html file so that test bench don't think it is a test script

svn changeset:22085/svn branch:6.8

12 years agorenamed html file so that test bench don't think it is a test script
Matti Tahvonen [Mon, 21 Nov 2011 14:18:08 +0000 (14:18 +0000)]
renamed html file so that test bench don't think it is a test script

svn changeset:22084/svn branch:6.8

12 years agodragandropwrapper can now initiate html5 drags, fixes #7833
Matti Tahvonen [Mon, 21 Nov 2011 13:38:31 +0000 (13:38 +0000)]
dragandropwrapper can now initiate html5 drags, fixes #7833

svn changeset:22081/svn branch:6.8

12 years agoMerged fixes from 6.7
Artur Signell [Thu, 17 Nov 2011 13:37:04 +0000 (13:37 +0000)]
Merged fixes from 6.7

svn changeset:22048/svn branch:6.8

12 years agoMerged some changes from 6.7 to 6.8
Henri Sara [Wed, 16 Nov 2011 10:39:05 +0000 (10:39 +0000)]
Merged some changes from 6.7 to 6.8

svn changeset:22016/svn branch:6.8

12 years agoMerged #7837 to Vaadin 6.8
Henri Sara [Tue, 15 Nov 2011 14:52:47 +0000 (14:52 +0000)]
Merged #7837 to Vaadin 6.8

svn changeset:22010/svn branch:6.8

12 years agoMerge branch 'master' into databinding
Henri Sara [Mon, 14 Nov 2011 09:36:40 +0000 (11:36 +0200)]
Merge branch 'master' into databinding

12 years ago#7930 Eliminate Validator.isValid()
Henri Sara [Sat, 12 Nov 2011 10:18:27 +0000 (12:18 +0200)]
#7930 Eliminate Validator.isValid()

Eliminate the redundant method Validator.isValid(). Validator.validate()
does the same but throws an exception including the validation error
message.

Migration:
- replace implementations of isValid() with internalIsValid() in custom
subclasses of AbstractValidator
- use Validator.validate() and catch exceptions rather than call
Validator.isValid()
- note that AbstractField still provides an isValid() method that is
internally based on validate()

12 years agoDummy commit #1 for testing repository
Artur Signell [Fri, 11 Nov 2011 13:25:44 +0000 (15:25 +0200)]
Dummy commit #1 for testing repository

12 years agoMerge remote branch 'origin/6.8'
Artur Signell [Fri, 11 Nov 2011 12:56:05 +0000 (14:56 +0200)]
Merge remote branch 'origin/6.8'

12 years agoConvert nested data model event classes to static where possible.
Henri Sara [Fri, 11 Nov 2011 12:37:57 +0000 (14:37 +0200)]
Convert nested data model event classes to static where possible.

12 years agoEliminate more Field and Property related raw type warnings.
Henri Sara [Fri, 11 Nov 2011 11:11:01 +0000 (13:11 +0200)]
Eliminate more Field and Property related raw type warnings.

Eliminate some more warnings for use of raw types (Field, Property,
Class), mostly by changing API method return types.

12 years agoMerge branch 'master' of ssh://git@dev.vaadin.com/vaadin
Artur Signell [Fri, 11 Nov 2011 08:50:14 +0000 (10:50 +0200)]
Merge branch 'master' of ssh://git@dev.vaadin.com/vaadin

12 years agoEliminate some generics related warnings in core (non-API).
Henri Sara [Fri, 11 Nov 2011 08:40:15 +0000 (10:40 +0200)]
Eliminate some generics related warnings in core (non-API).

Eliminate some (mostly Field and Property related) warnings about
raw types etc. No modifications to public API, only inside methods and
private API.

12 years agoLonger pause before taking the inital screenshot (#7396)
Leif Åstrand [Fri, 11 Nov 2011 08:25:39 +0000 (10:25 +0200)]
Longer pause before taking the inital screenshot (#7396)

12 years agoRun integration tests with Safari 5 instead of Firefox 3.6 (#7396)
Leif Åstrand [Fri, 11 Nov 2011 07:52:25 +0000 (09:52 +0200)]
Run integration tests with Safari 5 instead of Firefox 3.6 (#7396)

12 years agoEliminate many generics related warnings in tests.
Henri Sara [Thu, 10 Nov 2011 14:06:30 +0000 (16:06 +0200)]
Eliminate many generics related warnings in tests.

Most of the warnings eliminated are related to generics for
Property, Field or field factories. Not all such warnings are eliminated
in this changeset.

12 years agoChange Form.addField() parameter from Field to Field<?>.
Henri Sara [Thu, 10 Nov 2011 14:04:50 +0000 (16:04 +0200)]
Change Form.addField() parameter from Field to Field<?>.

12 years agoEliminate generics related warnings in field factories.
Henri Sara [Thu, 10 Nov 2011 14:03:56 +0000 (16:03 +0200)]
Eliminate generics related warnings in field factories.

12 years ago#7918 Test with Firefox 8
Artur Signell [Thu, 10 Nov 2011 14:02:00 +0000 (14:02 +0000)]
#7918 Test with Firefox 8

svn changeset:21959/svn branch:6.7

12 years agoFirefox 7 -> 8
Artur Signell [Thu, 10 Nov 2011 13:26:00 +0000 (15:26 +0200)]
Firefox 7 -> 8

12 years agoMerge branch 'master' into databinding
Henri Sara [Thu, 10 Nov 2011 12:39:52 +0000 (14:39 +0200)]
Merge branch 'master' into databinding

12 years ago#7917 Add BeanItem.expandProperty() and use it in form tests.
Henri Sara [Thu, 10 Nov 2011 12:30:07 +0000 (14:30 +0200)]
#7917 Add BeanItem.expandProperty() and use it in form tests.

12 years agoMinor formatting changes
Leif Åstrand [Thu, 10 Nov 2011 11:42:43 +0000 (13:42 +0200)]
Minor formatting changes

12 years agoMinor formatting change
Leif Åstrand [Thu, 10 Nov 2011 11:42:07 +0000 (13:42 +0200)]
Minor formatting change

12 years ago#6887 addNestedContainerBean() in AbstractBeanContainer to replace a
Henri Sara [Thu, 10 Nov 2011 07:32:48 +0000 (09:32 +0200)]
#6887 addNestedContainerBean() in AbstractBeanContainer to replace a
property with all of its nested properties

12 years ago#7912 Remove support for IE6
Leif Åstrand [Wed, 9 Nov 2011 14:48:12 +0000 (16:48 +0200)]
#7912 Remove support for IE6

12 years agoFormatting changes
Leif Åstrand [Wed, 9 Nov 2011 13:14:39 +0000 (15:14 +0200)]
Formatting changes

12 years agoCreate scaffolding for data binding tests (one/many-to-one/many).
Henri Sara [Wed, 9 Nov 2011 12:00:18 +0000 (14:00 +0200)]
Create scaffolding for data binding tests (one/many-to-one/many).

Created test class Millionaire with multiple residences.
Created test classes User and Role which refer to collections of each
other. Each direction of the relationship is handled differently.
Initial test class scaffolding for data binding changes (FormOneToOne
and FormOneToMany, FormManyToMany).

12 years agoSplit Address out from test class Person.
Henri Sara [Wed, 9 Nov 2011 11:06:01 +0000 (13:06 +0200)]
Split Address out from test class Person.

Address split out of test class Person and refactoring of old tests
using Person.

12 years agoMerge remote branch 'origin/6.8'
Artur Signell [Tue, 8 Nov 2011 16:20:44 +0000 (18:20 +0200)]
Merge remote branch 'origin/6.8'

12 years agoMerge branch 'master' into databinding
Henri Sara [Tue, 8 Nov 2011 16:08:51 +0000 (18:08 +0200)]
Merge branch 'master' into databinding

12 years agoTest for #7908
Artur Signell [Tue, 8 Nov 2011 16:03:45 +0000 (16:03 +0000)]
Test for #7908

svn changeset:21947/svn branch:6.7

12 years agoParameterize Property and Field with the value type.
Henri Sara [Tue, 8 Nov 2011 16:02:55 +0000 (18:02 +0200)]
Parameterize Property and Field with the value type.

The interfaces Property and Field and most of their implementations are
now parameterized with the type of their value. The method getValue()
returns the Property type but setValue() takes Object as its parameter.
No implicit conversions between value type and strings are performed in
most locations (fields).

Among others, AbstractTextField, DateField and RichTextArea not have
specific value types and do not accept arbitrary values.

Most locations requiring migration will be visible as compilation
errors, with the exception of some cases where a non-parameterized
Property or Field (or one parametrized with Object) is used.

Not yet done:
- Label
- converters
- setValue() parameterization (causes much more migration effort)

12 years agoMerge remote-tracking branch 'origin/6.8' into master
Leif Åstrand [Tue, 8 Nov 2011 15:28:27 +0000 (17:28 +0200)]
Merge remote-tracking branch 'origin/6.8' into master

12 years agoRemoved svn:executable property to avoid problems with Git on Windows
Artur Signell [Tue, 8 Nov 2011 14:29:40 +0000 (14:29 +0000)]
Removed svn:executable property to avoid problems with Git on Windows

svn changeset:21944/svn branch:6.7

12 years agoEliminate more cases that used Property.toString().
Henri Sara [Tue, 8 Nov 2011 09:24:12 +0000 (11:24 +0200)]
Eliminate more cases that used Property.toString().

Remaining possibly problematic cases include Label.compareTo(),
TestForPreconfiguredComponents and TestForTrees.

12 years agoTest for file uploads. Not run automatically due to limitations in testing file uploa...
Artur Signell [Tue, 8 Nov 2011 08:35:37 +0000 (08:35 +0000)]
Test for file uploads. Not run automatically due to limitations in testing file uploads with TestBench/Selenium.

svn changeset:21938/svn branch:6.7

12 years agoThrow exception from Property.toString() implementations.
Henri Sara [Mon, 7 Nov 2011 15:56:31 +0000 (17:56 +0200)]
Throw exception from Property.toString() implementations.

The default implementations of Property.toString() now throw an
UnsupportedOperationException to help find and eliminate code relying on
Property.toString().

12 years agoPartly eliminate the use of Property.toString().
Henri Sara [Mon, 7 Nov 2011 15:54:18 +0000 (17:54 +0200)]
Partly eliminate the use of Property.toString().

The toString() method should not be used on a property to get its value.
Added getStringValue() to AbstractField, Label etc. Using them
where applicable. Added comments to some problematic locations where
Property.toString() is known to be used.

AbstractField.toString() and Label.toString() still return the same
values as before, but it will throw an exception in future revisions.

Migration needed: Replace explicit and implicit uses of
Property.toString() with use property.getValue() and its
string representation.
Alternatively, use AbstractProperty.getStringValue() and
AbstractField.getStringValue() instead of Property.toString() during
migration.

12 years agoRemove Field.getCaption(), getDescription() and setDescription().
Henri Sara [Mon, 7 Nov 2011 09:25:15 +0000 (11:25 +0200)]
Remove Field.getCaption(), getDescription() and setDescription().

Obsolete methods removed. When needed, these methods are in
AbstractComponent and can be accessed by casting the Field.

Migration needed: occasional cast of Field to AbstractComponent.

12 years agoFixed dates
Artur Signell [Fri, 4 Nov 2011 14:06:10 +0000 (14:06 +0000)]
Fixed dates

svn changeset:21913/svn branch:6.7

12 years ago#7839 Corrected cases where pagelength=0 or where number of children > pagebuffer...
Artur Signell [Fri, 4 Nov 2011 12:23:49 +0000 (12:23 +0000)]
#7839 Corrected cases where pagelength=0 or where number of children > pagebuffer size

svn changeset:21910/svn branch:6.7

12 years agoTest for TreeTable with pageLength set to zero
Artur Signell [Fri, 4 Nov 2011 12:22:40 +0000 (12:22 +0000)]
Test for TreeTable with pageLength set to zero

svn changeset:21908/svn branch:6.7

12 years agoFixed dates
Artur Signell [Fri, 4 Nov 2011 12:13:59 +0000 (12:13 +0000)]
Fixed dates

svn changeset:21907/svn branch:6.7

12 years agoTheme for tickets, based on Reindeer
Artur Signell [Fri, 4 Nov 2011 11:39:28 +0000 (11:39 +0000)]
Theme for tickets, based on Reindeer

svn changeset:21904/svn branch:6.7

12 years ago#7780 Don't do partial repaints if the item set has changed during an expand or collapse
Artur Signell [Fri, 4 Nov 2011 09:01:09 +0000 (09:01 +0000)]
#7780 Don't do partial repaints if the item set has changed during an expand or collapse

svn changeset:21901/svn branch:6.7

12 years agoTest for #7839
Artur Signell [Fri, 4 Nov 2011 08:22:50 +0000 (08:22 +0000)]
Test for #7839

svn changeset:21898/svn branch:6.7

12 years agoTest for #7839
Artur Signell [Fri, 4 Nov 2011 08:20:18 +0000 (08:20 +0000)]
Test for #7839

svn changeset:21896/svn branch:6.7

12 years ago#7839 Avoid discarding rows when updating rows as row indexes have not been updated...
Artur Signell [Fri, 4 Nov 2011 08:13:49 +0000 (08:13 +0000)]
#7839 Avoid discarding rows when updating rows as row indexes have not been updated yet causing wrong rows to be removed

svn changeset:21894/svn branch:6.7

12 years ago#7839 Cleanup based on review
Artur Signell [Fri, 4 Nov 2011 08:10:42 +0000 (08:10 +0000)]
#7839 Cleanup based on review

svn changeset:21893/svn branch:6.7

12 years agoSome minor formatting changes
Leif Åstrand [Fri, 4 Nov 2011 07:41:57 +0000 (09:41 +0200)]
Some minor formatting changes

12 years ago#7839 Out of Sync error when using Generated Columns with TreeTable - additional fix
Artur Signell [Fri, 4 Nov 2011 06:19:20 +0000 (06:19 +0000)]
#7839 Out of Sync error when using Generated Columns with TreeTable - additional fix

svn changeset:21892/svn branch:6.7

12 years ago#7839 Out of Sync error when using Generated Columns with TreeTable
Artur Signell [Thu, 3 Nov 2011 15:58:23 +0000 (15:58 +0000)]
#7839 Out of Sync error when using Generated Columns with TreeTable

Fixed multiple indexing issues that could occur in partial updates in Table and TreeTable

svn changeset:21889/svn branch:6.7

12 years agoAdded javadoc and debug logging
Artur Signell [Thu, 3 Nov 2011 15:52:44 +0000 (15:52 +0000)]
Added javadoc and debug logging

svn changeset:21888/svn branch:6.7

12 years ago#7790 Reverted sort methods to call refreshRenderedCells instead of refreshRowCache
Artur Signell [Thu, 3 Nov 2011 15:22:56 +0000 (15:22 +0000)]
#7790 Reverted sort methods to call refreshRenderedCells instead of refreshRowCache

svn changeset:21887/svn branch:6.7

12 years agoPartly reverted [21883] as it caused unnecessary rendering in some cases
Artur Signell [Thu, 3 Nov 2011 15:15:05 +0000 (15:15 +0000)]
Partly reverted [21883] as it caused unnecessary rendering in some cases

svn changeset:21886/svn branch:6.7

12 years agoInclude c.v.terminal.gwt.server in the test coverage data
Leif Åstrand [Thu, 3 Nov 2011 13:37:20 +0000 (13:37 +0000)]
Include c.v.terminal.gwt.server in the test coverage data

svn changeset:21885/svn branch:6.7

12 years ago#7790 Renamed method to refreshRowCache, ensured it is used internally by Table aswel...
Artur Signell [Thu, 3 Nov 2011 13:28:02 +0000 (13:28 +0000)]
#7790 Renamed method to refreshRowCache, ensured it is used internally by Table aswell and made the method public

svn changeset:21883/svn branch:6.7

12 years ago#7790 Added a method for forcing Table to repaint its rows
Artur Signell [Thu, 3 Nov 2011 13:18:42 +0000 (13:18 +0000)]
#7790 Added a method for forcing Table to repaint its rows

svn changeset:21882/svn branch:6.7

12 years agoDon't fail build if test coverage generation is disabled
Leif Åstrand [Thu, 3 Nov 2011 07:41:02 +0000 (09:41 +0200)]
Don't fail build if test coverage generation is disabled

12 years agoCorrected the Scrollable JavaDoc to correspond with the code.
Marko Grönroos [Wed, 2 Nov 2011 10:56:16 +0000 (10:56 +0000)]
Corrected the Scrollable JavaDoc to correspond with the code.

svn changeset:21864/svn branch:6.7

12 years ago#7810 Fixed error handling of the row disabled in [21824]
Leif Åstrand [Wed, 2 Nov 2011 07:53:15 +0000 (07:53 +0000)]
#7810 Fixed error handling of the row disabled in [21824]

svn changeset:21858/svn branch:6.7

12 years agoMerge branch 'master' of ssh://git@dev.vaadin.com/vaadin.git
Leif Åstrand [Wed, 2 Nov 2011 07:46:49 +0000 (09:46 +0200)]
Merge branch 'master' of ssh://git@dev.vaadin.com/vaadin.git

12 years agoSome additions to .gitignore
Leif Åstrand [Wed, 2 Nov 2011 07:46:25 +0000 (09:46 +0200)]
Some additions to .gitignore