]> source.dussan.org Git - vaadin-framework.git/log
vaadin-framework.git
10 years agoAvoid Vaadin entry-point being run twice (#13730)
Manolo Carrasco [Fri, 9 May 2014 07:47:14 +0000 (09:47 +0200)]
Avoid Vaadin entry-point being run twice (#13730)

- Prevent bootstrap script fail if registerWidgetset is called twice
  with the same widgetset.

Change-Id: I8b8069b442ea91c1aa0f0b7dd73c41902e75094b

10 years agoFixed disabled and read-only modes of InlineDateField (#10262)
Teemu Pöntelin [Mon, 5 May 2014 20:58:00 +0000 (23:58 +0300)]
Fixed disabled and read-only modes of InlineDateField (#10262)

Change-Id: If95d50954a4122b1039174ffcacd7874f7f1f71e

10 years agoForce recalc of width when the ComboBox style has changed (#13444)
Markus Koivisto [Fri, 25 Apr 2014 13:58:53 +0000 (16:58 +0300)]
Force recalc of width when the ComboBox style has changed  (#13444)

Change-Id: I7bb500c1b64502881824875e967cf43c5e49a999

Conflicts:
client/src/com/vaadin/client/ui/VFilterSelect.java
client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java

10 years agoMove ComboBox tests to correct package
Teemu Suo-Anttila [Mon, 19 May 2014 08:17:57 +0000 (11:17 +0300)]
Move ComboBox tests to correct package

Change-Id: I2ad5164a637b2b4c96b46f30df036ccbc5cbcd66

Conflicts:
uitest/src/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidth.java
uitest/src/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidthTest.java

10 years agoTreat initial rendering and style changes separately. (#13444)
Markus Koivisto [Wed, 21 May 2014 12:33:31 +0000 (15:33 +0300)]
Treat initial rendering and style changes separately. (#13444)

This fixes a regression caused by a previous patch, which led to empty comboboxes being initialised with a zero width.

Change-Id: I7e5ca0c563625c453e0e3006d91ed52ad227d6f0

Conflicts:
client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java

10 years agoChange forceUpdate flag to always force recalculation of width. Fix tests. (#13444)
Markus Koivisto [Fri, 25 Apr 2014 13:58:53 +0000 (16:58 +0300)]
Change forceUpdate flag to always force recalculation of width. Fix tests. (#13444)

Change-Id: Ie666e2867908160b1544d3bf8251802ea771660f

Conflicts:
client/src/com/vaadin/client/ui/VFilterSelect.java
uitest/src/com/vaadin/tests/components/ui/ComboboxStyleChangeWidthTest.java

10 years agoFix WAR file location in uitest build scripts.
Sauli Tähkäpää [Tue, 20 May 2014 08:05:45 +0000 (11:05 +0300)]
Fix WAR file location in uitest build scripts.

Change-Id: I0febbbaf85374c395454c889c36add277ca9b131

10 years agoFix table scrolling up on select (#10106)
Juuso Valli [Tue, 29 Apr 2014 09:48:07 +0000 (12:48 +0300)]
Fix table scrolling up on select (#10106)

Change-Id: I4d13bee983817ce299d1f7e52ddd6cdc725fee6f

10 years agoDisable authors because of build agent problems 7.2.0
Artur Signell [Tue, 13 May 2014 22:13:10 +0000 (01:13 +0300)]
Disable authors because of build agent problems

Change-Id: I5426d8a85f7b57193c1bbfe201258a09f93b54cb

10 years agoUse more appropriate dependencies for Jetty (#13682)
Artur Signell [Tue, 13 May 2014 15:33:08 +0000 (18:33 +0300)]
Use more appropriate dependencies for Jetty (#13682)

Change-Id: Ic977ae403068e41a64eabc42cd00c4a933d02a95

10 years agoFirefox issue was fixed
Artur Signell [Tue, 13 May 2014 10:16:27 +0000 (13:16 +0300)]
Firefox issue was fixed

Change-Id: I2b55917441a596d5c001081ecdb9836f6b9f60ee

10 years agoUse Atmosphere JS 2.1.5.vaadin4 with Firefox fix (#13578)
Artur Signell [Tue, 13 May 2014 10:07:17 +0000 (13:07 +0300)]
Use Atmosphere JS 2.1.5.vaadin4 with Firefox fix (#13578)

Change-Id: I8d3f414a40affdcbc1d6d1210207ee9868f49f31

10 years agoMerge remote-tracking branch 'origin/master' into 7.2
Artur Signell [Mon, 12 May 2014 16:44:55 +0000 (19:44 +0300)]
Merge remote-tracking branch 'origin/master' into 7.2

b617f03 Do not update state on the client side (#13743)

Change-Id: I1bc4f8eda115a5a1271291f8dbbaa69e9034d24f

10 years agoDo not update state on the client side (#13743)
Artur Signell [Mon, 12 May 2014 16:37:19 +0000 (19:37 +0300)]
Do not update state on the client side (#13743)

Change-Id: I2e1d714d1bb07db127758cf3f2d741ac50884266

10 years agoManually add fixed tickets to release-notes
Jonatan Kronqvist [Mon, 12 May 2014 12:50:10 +0000 (15:50 +0300)]
Manually add fixed tickets to release-notes

Added them manually since they are gathered from two different milestones.

Change-Id: Ifc4e61e94a8ea91f93058d1b74299f7cf73ef6fc

10 years agoUpdate issues url in release-notes (#13612)
Jonatan Kronqvist [Mon, 12 May 2014 12:44:35 +0000 (15:44 +0300)]
Update issues url in release-notes (#13612)

Change-Id: Ideb07cb41e92ba0d5e71a60957ee62246aa65f21

10 years agoMerge branch 'master' into 7.2
Jonatan Kronqvist [Mon, 12 May 2014 12:34:44 +0000 (15:34 +0300)]
Merge branch 'master' into 7.2

77a08ca - (origin/master, origin/HEAD, master) Add missing @sinces to JavaDoc
82033e8 - Support long in state again (#13692)
2b60bbb - Fix SelectedItemIcon rendering on IE (#13731)
ee16285 - Support passing multiple versions
45226d5 - Mention dnd on IE touch devices in known issues (#13612)
deeb645 - Added link to ticket for the Firefox reconnect issue (#13612)
e975af7 - List authors in release notes (#13612)
20f5633 - Make SuperDevMode work again (#13682)
e8f0fe7 - Show badges in release notes (#13612)
466883b - Convert test to TB4 to be compatible with Tomcat proxy test
cd20de5 - Make touch actions disabled on some CSS classes (#13368)
aab62be - Update sass-compiler to 0.9.2 (#13651)
43c1a36 - Update the release-notes (#13612)
35c174c - Re-apply old change which was excluded from master
67dd382 - Ignore PointerEvents in VDragAndDropManager (#13720)
5a4c888 - Rename base on API review (#13557)
4bd8314 - Remove ComponentLocator which conflicts with package name (#13729)
0970487 - Update ErrorIndicator test from TB2 to TB4
1cf11f8 - Resize PopupView's overlay on content resize (#13666)
2ecdf7e - Fix table focusing when scrolled from the server (#10522)

Change-Id: Ic0242d141705cce189c900ee12650a757e894512

10 years agoAdd missing @sinces to JavaDoc
Teemu Suo-Anttila [Mon, 12 May 2014 11:55:59 +0000 (14:55 +0300)]
Add missing @sinces to JavaDoc

Change-Id: Ib36d9c591c5089eeacacc94f68e4fbb064e5418d

10 years agoSupport long in state again (#13692)
Jonatan Kronqvist [Sun, 11 May 2014 09:38:08 +0000 (12:38 +0300)]
Support long in state again (#13692)

The fix to #9379 broke the support for long type fields in state classes. This
patch bypasses the unboxing of long values and adds the @UnsafeNativeLong annotation
to the methods which may fetch and return (without modifying) long values.

SerializerTest is extended to test the different data types in States.

Change-Id: I29fd2c6af13cd9a0d29ecb1444ed9eb8a2b013e3

10 years agoFix SelectedItemIcon rendering on IE (#13731)
Teemu Suo-Anttila [Mon, 12 May 2014 07:47:34 +0000 (10:47 +0300)]
Fix SelectedItemIcon rendering on IE (#13731)

Change-Id: Ie6a3464399aba76b9299bcb7d326ef4e6b6c858b

10 years agoSupport passing multiple versions
Artur Signell [Fri, 9 May 2014 17:57:21 +0000 (20:57 +0300)]
Support passing multiple versions

Change-Id: I5aae200f8e49e1f9f53bbf53ceba1551854d013e

10 years agoMention dnd on IE touch devices in known issues (#13612)
Jonatan Kronqvist [Sun, 11 May 2014 07:17:31 +0000 (10:17 +0300)]
Mention dnd on IE touch devices in known issues (#13612)

Change-Id: I15297c2d0862f3b8c0c5603b06f6e37706872752

10 years agoAdded link to ticket for the Firefox reconnect issue (#13612)
Jonatan Kronqvist [Sun, 11 May 2014 07:10:34 +0000 (10:10 +0300)]
Added link to ticket for the Firefox reconnect issue (#13612)

Change-Id: I2eac5ab68479420beacef2d746f69e955becc397

10 years agoList authors in release notes (#13612)
Artur Signell [Fri, 9 May 2014 19:38:42 +0000 (22:38 +0300)]
List authors in release notes (#13612)

Change-Id: I51960e9345ff233e29289b33d3224e03d866d463

10 years agoMake SuperDevMode work again (#13682)
Artur Signell [Sun, 11 May 2014 16:55:27 +0000 (19:55 +0300)]
Make SuperDevMode work again (#13682)

VNotification now works without ApplicationConnection again.
Dependencies needed by codeserver are now dependencies for client-compiler
Error message now takes into account that devModeRedirect is enabled by default

Change-Id: I079d162d9975f99fe7b91e14ad100459c80a5587

10 years agoShow badges in release notes (#13612)
Artur Signell [Fri, 9 May 2014 17:49:51 +0000 (20:49 +0300)]
Show badges in release notes (#13612)

Change-Id: I6109cda80251b343999b75f51ffecf6a9bbbd6a2

10 years agoConvert test to TB4 to be compatible with Tomcat proxy test
Artur Signell [Fri, 9 May 2014 20:27:51 +0000 (23:27 +0300)]
Convert test to TB4 to be compatible with Tomcat proxy test

Change-Id: Iab049f9036c1e2efcd1445cd7691a93af1210ff0

10 years agoMake touch actions disabled on some CSS classes (#13368)
Teemu Suo-Anttila [Fri, 9 May 2014 11:43:14 +0000 (14:43 +0300)]
Make touch actions disabled on some CSS classes (#13368)

This makes Slider, SplitPanels and DragAndDrop anywhere except Table
work on IE and touch screen.

Change-Id: I1c710a14fc3957c81ade07fd2a3de1e4b6feec1a

10 years agoUpdate sass-compiler to 0.9.2 (#13651)
Jonatan Kronqvist [Fri, 9 May 2014 13:18:25 +0000 (16:18 +0300)]
Update sass-compiler to 0.9.2 (#13651)

Change-Id: Ic6413b31c537c16beda5022ddf6ecd7ce0b6eb64

10 years agoUpdate the release-notes (#13612)
Jonatan Kronqvist [Fri, 9 May 2014 12:07:47 +0000 (15:07 +0300)]
Update the release-notes (#13612)

* Removed the "Tools have been updated for Vaadin 7.2 with the following changes:"
* Removed the security fix notice for 7.1.11
* Removed the text about using the experimental Eclipse plug-in
* Specify that 7.2 is a minor release
* Clarified the known issues section
* Listed Windows Phone 8 in supported devices
* Replaced vaadin.com/pro-account with vaadin.com/pro-tools and vaadin.com/support

Change-Id: I8e03b65453419c9cb9f4570067675156f2be76fe

10 years agoRe-apply old change which was excluded from master
Artur Signell [Fri, 9 May 2014 10:29:25 +0000 (13:29 +0300)]
Re-apply old change which was excluded from master

The merge script was faulty between May and June 2013 and merged changes
individually from both 7.0 and 7.1 to master. In the case that a commit from
7.0 was merged right before there was a "Merge: no" commit in 7.1, the changes
between the "Merge: no" commit and the previous merge point from 7.1 to master was
potentially never merged (the whole chain was merged as a no-op).

The only affected change seems to be

0a437a5 Revert "Replaced css inject hack in TestUtils with Page.Styles.add() #11798"
b008768 Implement parenthesis-handling fixes for Sass in Vaadin 7.1 (#12834)

The former one is re-applied in this commit, the latter one has been verified to be in
the master branch

Change-Id: If0cd75d75fdfc8893ac501aab2a0be1b55b09dcc

10 years agoIgnore PointerEvents in VDragAndDropManager (#13720)
Teemu Suo-Anttila [Fri, 9 May 2014 10:25:12 +0000 (13:25 +0300)]
Ignore PointerEvents in VDragAndDropManager (#13720)

Change-Id: I1fca0b71fec883c7dc2fafbaa1da20da33fe707e

10 years agoRename base on API review (#13557)
Artur Signell [Fri, 9 May 2014 08:07:56 +0000 (11:07 +0300)]
Rename base on API review (#13557)

Change-Id: I3174d19d2595232b66f4120ba8fb6fbb1c6d8be8

10 years agoRemove ComponentLocator which conflicts with package name (#13729)
Artur Signell [Fri, 9 May 2014 08:05:22 +0000 (11:05 +0300)]
Remove ComponentLocator which conflicts with package name (#13729)

Change-Id: I771d827ab88f005f8cbef6c6cbefecb1b3f498e0

10 years agoUpdate ErrorIndicator test from TB2 to TB4
Teemu Suo-Anttila [Fri, 9 May 2014 06:51:26 +0000 (09:51 +0300)]
Update ErrorIndicator test from TB2 to TB4

Change-Id: Ia5755dd476411d51415afb9bbd20ade91e3a23f4

10 years agoResize PopupView's overlay on content resize (#13666)
Antti Tanhuanpää [Tue, 6 May 2014 13:39:15 +0000 (16:39 +0300)]
Resize PopupView's overlay on content resize (#13666)

Change-Id: Iad410f26ed7f20bb03f15c46673f6f18081261d9

10 years agoFix table focusing when scrolled from the server (#10522)
Juuso Valli [Tue, 29 Apr 2014 08:02:17 +0000 (11:02 +0300)]
Fix table focusing when scrolled from the server (#10522)

Change-Id: Ib18a60ae7e41af8c6c119e5b2e12e4fd5bf1069c

10 years agoMerge branch 'master' into 7.2
Jonatan Kronqvist [Fri, 9 May 2014 05:18:21 +0000 (08:18 +0300)]
Merge branch 'master' into 7.2

9b3df56 - (origin/master, origin/HEAD, master) Actually close push connection in disconnect() (#13716)
f21c108 - Fix improper merge of 3d0ff32b from 7.1 to master (#13620)
3184af5 - Convert the ComboBoxClosePopupRetainText test to TB4 to avoid false failures.
b136dd5 - Convert the AccordionClipsContent test to TB4 to avoid false failures.
50ea89e - Update Atmosphere client. (#13727)
78981f1 - Fix occasionally misplaced error indicators in Buttons (#13723)
8fb9121 - Fix misleading message. Close does not always mean reconnect
3d42856 - Removed irrelevant readme file

Change-Id: I1c871160a47da3e720f2b7d06c5ab3601a17d053

10 years agoActually close push connection in disconnect() (#13716)
Artur Signell [Tue, 6 May 2014 14:54:11 +0000 (17:54 +0300)]
Actually close push connection in disconnect() (#13716)

Change-Id: I342633f1caa5746472d29bbb7b71590674adc04c

10 years agoFix improper merge of 3d0ff32b from 7.1 to master (#13620)
Johannes Dahlström [Fri, 2 May 2014 15:29:42 +0000 (18:29 +0300)]
Fix improper merge of 3d0ff32b from 7.1 to master (#13620)

Correctly call PushConnection.disconnect instead of setting to null.
Also remove the obsolete PushHandler.disconnectCallback.

Change-Id: Ied055d489a269b016318947cd89cf0b46003c596

10 years agoConvert the ComboBoxClosePopupRetainText test to TB4 to avoid false failures.
Jonatan Kronqvist [Thu, 8 May 2014 11:31:13 +0000 (14:31 +0300)]
Convert the ComboBoxClosePopupRetainText test to TB4 to avoid false failures.

Change-Id: Ib36917246fce3f051b61a979289c9bce23b1bf82

10 years agoConvert the AccordionClipsContent test to TB4 to avoid false failures.
Jonatan Kronqvist [Thu, 8 May 2014 10:18:03 +0000 (13:18 +0300)]
Convert the AccordionClipsContent test to TB4 to avoid false failures.

Change-Id: Iced9219e8cd3172c53af286c4b644b04f00041c2

10 years agoUpdate Atmosphere client. (#13727)
Sauli Tähkäpää [Thu, 8 May 2014 12:38:13 +0000 (15:38 +0300)]
Update Atmosphere client. (#13727)

Change-Id: Ib1ccbaad3aca39c3cbc43d0f4ccace67cf19c435

10 years agoFix occasionally misplaced error indicators in Buttons (#13723)
Teemu Suo-Anttila [Thu, 8 May 2014 08:28:39 +0000 (11:28 +0300)]
Fix occasionally misplaced error indicators in Buttons (#13723)

Change-Id: Id34a8463ff40b1351d4d8b171e561a21fc76d747

10 years agoRevert "Disable PopupView Animations (#13593)"
Teemu Suo-Anttila [Wed, 7 May 2014 11:53:55 +0000 (11:53 +0000)]
Revert "Disable PopupView Animations (#13593)"

This reverts commit dab3e63aa6644cfc3800b672abb4dd9e5f3bc4ee.

Change-Id: I0b8beab996b57af042178b9c926aeff6570fed61

10 years agoFix misleading message. Close does not always mean reconnect
Artur Signell [Tue, 6 May 2014 14:52:37 +0000 (17:52 +0300)]
Fix misleading message. Close does not always mean reconnect

Change-Id: Ic41189ee138980322204c897b58e29252dfc5cd8

10 years agoRemoved irrelevant readme file
John Ahlroos [Tue, 6 May 2014 06:59:10 +0000 (09:59 +0300)]
Removed irrelevant readme file

Change-Id: I5b4b93051f16b93482a5fe636381e24ee401b4bc

10 years agoMerge master into 7.2
Jonatan Kronqvist [Tue, 6 May 2014 07:23:14 +0000 (10:23 +0300)]
Merge master into 7.2

9bf0278 - (origin/master, origin/HEAD, master) Ignore irrelevant header lines in checkstyle configuration <Jonatan Kronqvist>
0b8545e - DevelopmentServletLoader: Reload servlet container <Manolo Carrasco>
66f9563 - Javadoc added to com.vaadin.ui.Field interface (#13209) <Dmitrii Rogozin>
27f6503 - Fix header and Javadoc issues <Teemu Suo-Anttila>
498df1e - Fix DisabledDateFieldPopup test <Teemu Suo-Anttila>
12a96b2 - Remove non-existant theme-compiler from launch <Artur Signell>

Change-Id: I88c77f8e5ddeb53e070dcaf0d06fe142363873b0

10 years agoFix header and Javadoc issues
Teemu Suo-Anttila [Mon, 5 May 2014 14:05:12 +0000 (17:05 +0300)]
Fix header and Javadoc issues

Change-Id: I171067273aedc7248e9c044bea0ebf67155fd7a9
(cherry picked from commit 27f6503eb1a0fedf504559e6f6609a6dff80637f)

10 years agoIgnore irrelevant header lines in checkstyle configuration
Jonatan Kronqvist [Tue, 29 Apr 2014 06:01:30 +0000 (09:01 +0300)]
Ignore irrelevant header lines in checkstyle configuration

* Ignores the empty lines that may have trailing white-space in the
  license header. This allows formatting of the license header either
with or without trailing white-space, which differs between different
versions of Eclipse (as well as between IDEs).

Change-Id: If97d2cfe169accd6d05e44521c9ca5265d715772

10 years agoFix DisabledDateFieldPopup test
Teemu Suo-Anttila [Mon, 5 May 2014 13:18:55 +0000 (16:18 +0300)]
Fix DisabledDateFieldPopup test

Change-Id: I27f43e5bed2a0ebc0f04a1a83c922de42fb1a3c5
(cherry picked from commit 498df1e39122ef7e0d7aa9e11ce54507279d8775)

10 years agoDevelopmentServletLoader: Reload servlet container
Manolo Carrasco [Thu, 3 Apr 2014 15:05:47 +0000 (17:05 +0200)]
DevelopmentServletLoader: Reload servlet container

- Add a couple of parameters in order make jetty context
  reload whenever a class is modified.
- Remove deprecated SSL API calls.

Change-Id: I737fb92e78ce5573a4473639f25fcdad606f3c55

10 years agoJavadoc added to com.vaadin.ui.Field interface (#13209)
Dmitrii Rogozin [Fri, 25 Apr 2014 09:51:52 +0000 (12:51 +0300)]
Javadoc added to com.vaadin.ui.Field interface (#13209)

Change-Id: Iad7381e59dfe7a6ea9cb4a633e2c411ebdd1a79d

10 years agoFix header and Javadoc issues
Teemu Suo-Anttila [Mon, 5 May 2014 14:05:12 +0000 (17:05 +0300)]
Fix header and Javadoc issues

Change-Id: I171067273aedc7248e9c044bea0ebf67155fd7a9

10 years agoFix DisabledDateFieldPopup test
Teemu Suo-Anttila [Mon, 5 May 2014 13:18:55 +0000 (16:18 +0300)]
Fix DisabledDateFieldPopup test

Change-Id: I27f43e5bed2a0ebc0f04a1a83c922de42fb1a3c5

10 years agoRemove non-existant theme-compiler from launch
Artur Signell [Mon, 5 May 2014 13:22:18 +0000 (16:22 +0300)]
Remove non-existant theme-compiler from launch

Change-Id: I0d438ebee1b922a2d6eeae6abb0cd69c16848620

10 years agoMerge branch 'origin/master' into 7.2
Jonatan Kronqvist [Mon, 5 May 2014 12:54:07 +0000 (15:54 +0300)]
Merge branch 'origin/master' into 7.2

2efe580 - Fast-forward DateField only with left mouse button (#8012) <Teemu Pöntelin>
c98286e - Set explicit left alignment instead of removing text-align style (#13399). <Denis Anisimov>
16bcacd - Modified vaadinBootstrap to send v-loc as POST instead of GET (#13685). <Tapio Aali>
a3311d8 - Prevent scroll position reset on GridLayout hierarchy change (#13386) <Johannes Dahlström>
98be6b1 - Replace DragStartModes TB2 test with TB3 test <Teemu Suo-Anttila>
43a2943 - Avoid client side exception on DnD for empty table (#13655). <Denis Anisimov>
0897607 - Fix ComboBox cleared suggestion popup on ItemSetChange (#13635) <Teemu Suo-Anttila>
813559e - Fix Table width calculation when adding the first item (#13592) <Juuso Valli>
9768fa5 - Ensure session is set before writing timeout interval (#13617) <Artur Signell>
c8bc4d7 - Fix ComboBox popup scrolling when paging disabled (#13488) <mtzukanov>
6a67b0b - Fix TextArea with enter keyboard shortcut (#12424) <Markus Koivisto>
f70a567 - Update uitest/ivy.xml to use TestBench 4.0.0.alpha1 (#13625) <Teemu Suo-Anttila>
6b6863f - Apply layout after remove tab in Accordion (#11366, #13423) <Denis Anisimov>
cf8b765 - Fix missing TreeTable column lines in IE8 (#12989) <Juuso Valli>
2cfa64d - Fix Table.sort(...) to update the sort indicator (#8978) <Juuso Valli>
8e632ae - Report an error if RPC interface is parameterized (#10392). <Denis Anisimov>
a32a15c - Disable test which changes global behavior of the servlet <Artur Signell>
0a5eeec - Support running tests on PhantomJS <Artur Signell>
716046a - Clarify comments in Table.typeIsCompatible (#8168) <Juuso Valli>
2e58e97 - Fix findUI throwing NullPointerException when extending Vaadin (#13556) <Juuso Valli>
eeb956b - Add caching support for PublishedFileHandler (#13574) <Juuso Valli>
c9bc18c - Fixed javadoc XHTML to HTML and fixed typos (#13518) <Markus Koivisto>
e778184 - Clean Table.propertyValueConverters if the property is removed (#8168) <Juuso Valli>
5a97058 - Javadoc fix <Artur Signell>
134c3bb - Clarify lock check assert message if another session is locked (#13473) <Leif Åstrand>
83b40dd - Fix test depending on default locale <Juuso Valli>
9bdf3f1 - Use getChildComponents in PopupView instead of getChildren (#13503) <Denis Anisimov>
4709b75 - (gerrit/master) ContainerEventProvider returns style names from container. Fixes #10718 <Maciej Przepióra>
c6a7c81 - Remove redundant toggling of calendarToggle enabled state (#13124) <Leif Åstrand>
cfbcaaf - Drag image for text-area should contain text of text-area (#13557). <Denis Anisimov>
0cb1704 - Disable/enable text field for DateField on setEnable() method (#13124). <Denis Anisimov>
c544c6c - Fix copyright headers not passing the validation <Leif Åstrand>

Change-Id: I5e4899619f3af22ee15486c2135c1160b6ac0ecc

10 years agoRemove the automerge script
Jonatan Kronqvist [Mon, 5 May 2014 11:41:30 +0000 (14:41 +0300)]
Remove the automerge script

This makes it impossible to run this script by mistake, as it should
no longer be used with the new master based workflow.

Change-Id: I0400ecb20bb135c09e0414196f692dd8e9ffa510

10 years agoRemove the automerge script
Jonatan Kronqvist [Mon, 5 May 2014 11:41:30 +0000 (14:41 +0300)]
Remove the automerge script

This makes it impossible to run this script by mistake, as it should
no longer be used with the new master based workflow.

Change-Id: I0400ecb20bb135c09e0414196f692dd8e9ffa510

10 years agoDisable border width storing from TabSheet (#13706)
Teemu Suo-Anttila [Mon, 5 May 2014 11:03:03 +0000 (14:03 +0300)]
Disable border width storing from TabSheet (#13706)

Change-Id: Ibf6ee26e3a1a6604bb850355855c4ef53b9bafc2

10 years agoMerge changes from origin/7.2 into master
Jonatan Kronqvist [Mon, 5 May 2014 08:41:09 +0000 (11:41 +0300)]
Merge changes from origin/7.2 into master

Conflicts:
build.properties
client/src/com/vaadin/client/ApplicationConnection.java
client/src/com/vaadin/client/extensions/ResponsiveConnector.java
server/src/com/vaadin/server/Responsive.java

Change-Id: I49f90521611d1b86704a60c3d003cdeea9c3b864

10 years agoFast-forward DateField only with left mouse button (#8012)
Teemu Pöntelin [Sun, 4 May 2014 14:12:54 +0000 (17:12 +0300)]
Fast-forward DateField only with left mouse button (#8012)

Change-Id: Ib21c650feeed1ca584b2aeefb6c694e73e12b90d

10 years agoMerge changes from origin/7.2
Artur Signell [Fri, 2 May 2014 08:06:12 +0000 (11:06 +0300)]
Merge changes from origin/7.2

08b0589 Refactored TimeoutRedirectResetsOnActivity tests.

Conflicts:
uitest/src/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivityTest.java

Change-Id: Id2dc47cb5396a24c97a2689c1412b29a421ac400

10 years agoMerge changes from origin/7.2
Artur Signell [Fri, 2 May 2014 06:42:52 +0000 (09:42 +0300)]
Merge changes from origin/7.2

591996b Updated javadoc copyright years.

Change-Id: I50856e97c276b6a6c073be34b6f4faf042e7fab6

10 years agoMerge changes from origin/7.2
Artur Signell [Fri, 2 May 2014 06:08:12 +0000 (09:08 +0300)]
Merge changes from origin/7.2

15e24ec Fix too wide Table columns while sorting from init (#13517)
a86798c Fix ScreenshotTB3Test removing reference images

Change-Id: Iec1c2caceb99a6c8cfad9a0911d4a9cd7a23db36

10 years agoSet explicit left alignment instead of removing text-align style (#13399).
Denis Anisimov [Thu, 13 Mar 2014 06:56:31 +0000 (08:56 +0200)]
Set explicit left alignment instead of removing text-align style (#13399).

Change-Id: I3407555739ff443055e2e61aa14327d44a65cd8e

10 years agoModified vaadinBootstrap to send v-loc as POST instead of GET (#13685).
Tapio Aali [Tue, 29 Apr 2014 12:56:43 +0000 (15:56 +0300)]
Modified vaadinBootstrap to send v-loc as POST instead of GET (#13685).

Since there seems to be no difference, moved also almost all other
parameters from GET to POST for consistency.

Change-Id: I528963c4c832339a9853fbee97cebcb8fabb35e1

10 years agoPrevent scroll position reset on GridLayout hierarchy change (#13386)
Johannes Dahlström [Thu, 24 Apr 2014 14:17:42 +0000 (17:17 +0300)]
Prevent scroll position reset on GridLayout hierarchy change (#13386)

State change handling by default clears measured size if the size is set
to undefined; this would cause GridLayout to shrink to zero size because
its child cells have position: absolute. The layout phase recomputes the
size, but in some cases the browser reflows first, affecting the scroll
position of the layout parent. This patch prevents GridLayout from
clearing once-computed sizes during state change.

Change-Id: Id6e066c3ea360083d16d3fcc5c6d7d4bb6cea8b7

10 years agoReplace DragStartModes TB2 test with TB3 test
Teemu Suo-Anttila [Wed, 16 Apr 2014 12:13:26 +0000 (15:13 +0300)]
Replace DragStartModes TB2 test with TB3 test

Change-Id: Ief8c36aeeff2026b4beb7d73ab61f13721a2fd4f

10 years agoAvoid client side exception on DnD for empty table (#13655).
Denis Anisimov [Sun, 27 Apr 2014 15:59:51 +0000 (18:59 +0300)]
Avoid client side exception on DnD for empty table (#13655).

Change-Id: I71c18e87760ecbff34cfe215f56390fd75f3e55c

10 years agoFix ComboBox cleared suggestion popup on ItemSetChange (#13635)
Teemu Suo-Anttila [Mon, 28 Apr 2014 11:26:26 +0000 (14:26 +0300)]
Fix ComboBox cleared suggestion popup on ItemSetChange (#13635)

Change-Id: I77285e17819daf1b8328a8aea6d62a6b6b53510c

10 years agoFix Table width calculation when adding the first item (#13592)
Juuso Valli [Thu, 24 Apr 2014 12:43:25 +0000 (15:43 +0300)]
Fix Table width calculation when adding the first item (#13592)

Change-Id: I328dd83cac0cc6ba08fa32a1227f10ece9b52d6f

10 years agoEnsure session is set before writing timeout interval (#13617)
Artur Signell [Thu, 17 Apr 2014 13:32:18 +0000 (16:32 +0300)]
Ensure session is set before writing timeout interval (#13617)

Change-Id: I4a4f85fe400b9d6e60b81fd5c6c8dbc3b3eac02c

10 years agoFix ComboBox popup scrolling when paging disabled (#13488)
mtzukanov [Fri, 21 Mar 2014 10:15:43 +0000 (12:15 +0200)]
Fix ComboBox popup scrolling when paging disabled (#13488)

Added pagelength == 0 conditions on scroll and hasNextPage.

Change-Id: I42c0eb56d42cc54ff57a6bc6b9eee2f6734315bb

10 years agoFix TextArea with enter keyboard shortcut (#12424)
Markus Koivisto [Thu, 24 Apr 2014 13:54:03 +0000 (16:54 +0300)]
Fix TextArea with enter keyboard shortcut (#12424)

When a keyboardshortcut has been added to anywhere on the page,
the previous behaviour would cause the keyboardshortcut event to
be processeed before the newline was processed. The end result
was that newlines were never added when typing in the TextArea.

Keyboard shortcuts operate on KeyDown events. By adding a listener
for these events and stopping their propagation when the ENTER key
is pressed, this unwanted behaviour can be averted, and the user
can enter multi-line text in a TextArea even when Enter is used as
a keyboard shortcut.

Obviously, this means that the keyboard shortcut will not work as
long as the TextArea widget has focus. This is the new intended
behaviour.

Change-Id: Ied438acb8589df498e5634271e486517bf6ac41e

10 years agoUpdate uitest/ivy.xml to use TestBench 4.0.0.alpha1 (#13625)
Teemu Suo-Anttila [Thu, 24 Apr 2014 08:03:45 +0000 (11:03 +0300)]
Update uitest/ivy.xml to use TestBench 4.0.0.alpha1 (#13625)

Change-Id: I141ffe924bb404bc282a6c7c81e5203a7c5cfda0

10 years agoApply layout after remove tab in Accordion (#11366, #13423)
Denis Anisimov [Sun, 6 Apr 2014 13:25:21 +0000 (16:25 +0300)]
Apply layout after remove tab in Accordion (#11366, #13423)

Change-Id: Ia56729d2d533697bea78bdb1de6b2710e166893a

10 years agoFix missing TreeTable column lines in IE8 (#12989)
Juuso Valli [Thu, 24 Apr 2014 10:34:05 +0000 (13:34 +0300)]
Fix missing TreeTable column lines in IE8 (#12989)

Change-Id: Iddc6ecd5f455d28a43a67cdbf22cf81dbf3a6a5b

10 years agoFix Table.sort(...) to update the sort indicator (#8978)
Juuso Valli [Wed, 23 Apr 2014 12:46:16 +0000 (15:46 +0300)]
Fix Table.sort(...) to update the sort indicator (#8978)

Change-Id: I2df7de7648a8a311a913267ef0d0d0e57f52f19d

10 years agoReport an error if RPC interface is parameterized (#10392).
Denis Anisimov [Sun, 20 Apr 2014 13:34:38 +0000 (16:34 +0300)]
Report an error if RPC interface is parameterized (#10392).

Change-Id: I887c14b1df282c56a1e839eae5a4534501fa3911

10 years agoDisable test which changes global behavior of the servlet
Artur Signell [Wed, 23 Apr 2014 19:03:54 +0000 (22:03 +0300)]
Disable test which changes global behavior of the servlet

Change-Id: Ia9249d76e12217089d9214573a4363fdde94d1e4

10 years agoSupport running tests on PhantomJS
Artur Signell [Sun, 30 Mar 2014 19:33:38 +0000 (22:33 +0300)]
Support running tests on PhantomJS

Change-Id: I32bda24fbb8a104a9867b7889a74d3c159bbf516

10 years agoUpdate remaining copyright years to 2014
Artur Signell [Wed, 23 Apr 2014 18:04:14 +0000 (21:04 +0300)]
Update remaining copyright years to 2014

Change-Id: I1fc2bd735b538ebac6d4f41fc8536f26795cc85f

10 years agoMerge changes from origin/7.1
Artur Signell [Wed, 23 Apr 2014 17:53:03 +0000 (20:53 +0300)]
Merge changes from origin/7.1

9c29442 Replace SelectionRangeDragging TB2 test with TB3 test
9fa230d Avoid eagerly layouting from VScrollTable.updateFromUIDL (#13188)

Change-Id: I4f1395a13e8b1eae44a0030a3679475a3db9160a

10 years agoMerge changes from origin/7.1
Artur Signell [Wed, 23 Apr 2014 17:51:04 +0000 (20:51 +0300)]
Merge changes from origin/7.1

e77e73c Update copyright year to 2014

Conflicts:
client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java
client/src/com/vaadin/client/ApplicationConnection.java
server/src/com/vaadin/data/util/converter/StringToNumberConverter.java
shared/src/com/vaadin/shared/ui/ui/PageState.java
shared/src/com/vaadin/shared/ui/window/WindowState.java
theme-compiler/src/com/vaadin/sass/SassCompiler.java
theme-compiler/src/com/vaadin/sass/internal/ScssStylesheet.java
theme-compiler/src/com/vaadin/sass/internal/expression/ArithmeticExpressionEvaluator.java
theme-compiler/src/com/vaadin/sass/internal/expression/BinaryExpression.java
theme-compiler/src/com/vaadin/sass/internal/expression/BinaryOperator.java
theme-compiler/src/com/vaadin/sass/internal/expression/exception/ArithmeticException.java
theme-compiler/src/com/vaadin/sass/internal/expression/exception/IncompatibleUnitsException.java
theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandler.java
theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandlerImpl.java
theme-compiler/src/com/vaadin/sass/internal/handler/SCSSErrorHandler.java
theme-compiler/src/com/vaadin/sass/internal/parser/CharStream.java
theme-compiler/src/com/vaadin/sass/internal/parser/Generic_CharStream.java
theme-compiler/src/com/vaadin/sass/internal/parser/LexicalUnitImpl.java
theme-compiler/src/com/vaadin/sass/internal/parser/LocatorImpl.java
theme-compiler/src/com/vaadin/sass/internal/parser/MediaListImpl.java
theme-compiler/src/com/vaadin/sass/internal/parser/ParseException.java
theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
theme-compiler/src/com/vaadin/sass/internal/parser/ParserConstants.java
theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java
theme-compiler/src/com/vaadin/sass/internal/parser/SCSSLexicalUnit.java
theme-compiler/src/com/vaadin/sass/internal/parser/SCSSParseException.java
theme-compiler/src/com/vaadin/sass/internal/parser/SelectorListImpl.java
theme-compiler/src/com/vaadin/sass/internal/parser/Selectors.java
theme-compiler/src/com/vaadin/sass/internal/parser/ThrowedParseException.java
theme-compiler/src/com/vaadin/sass/internal/parser/Token.java
theme-compiler/src/com/vaadin/sass/internal/parser/TokenMgrError.java
theme-compiler/src/com/vaadin/sass/internal/resolver/ClassloaderResolver.java
theme-compiler/src/com/vaadin/sass/internal/resolver/FilesystemResolver.java
theme-compiler/src/com/vaadin/sass/internal/resolver/ScssStylesheetResolver.java
theme-compiler/src/com/vaadin/sass/internal/resolver/VaadinResolver.java
theme-compiler/src/com/vaadin/sass/internal/selector/SelectorUtil.java
theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/ExtendNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/ForNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/FunctionNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/ImportNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/KeyframesNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/ListContainsNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/ListModifyNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/ListRemoveNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/MediaNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/MicrosoftRuleNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/MixinDefNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/MixinNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/NestPropertiesNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/Node.java
theme-compiler/src/com/vaadin/sass/internal/tree/RuleNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/SimpleNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/VariableNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/EachDefNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/IfElseDefNode.java
theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/IfNode.java
theme-compiler/src/com/vaadin/sass/internal/util/ColorUtil.java
theme-compiler/src/com/vaadin/sass/internal/util/DeepCopy.java
theme-compiler/src/com/vaadin/sass/internal/util/FastByteArrayInputStream.java
theme-compiler/src/com/vaadin/sass/internal/util/FastByteArrayOutputStream.java
theme-compiler/src/com/vaadin/sass/internal/util/StringUtil.java
theme-compiler/src/com/vaadin/sass/internal/visitor/BlockNodeHandler.java
theme-compiler/src/com/vaadin/sass/internal/visitor/EachNodeHandler.java
theme-compiler/src/com/vaadin/sass/internal/visitor/ExtendNodeHandler.java
theme-compiler/src/com/vaadin/sass/internal/visitor/IfElseNodeHandler.java
theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java
theme-compiler/src/com/vaadin/sass/internal/visitor/MixinNodeHandler.java
theme-compiler/src/com/vaadin/sass/internal/visitor/NestedNodeHandler.java
theme-compiler/src/com/vaadin/sass/internal/visitor/VariableNodeHandler.java
theme-compiler/tests/src/com/vaadin/sass/AbstractTestBase.java
theme-compiler/tests/src/com/vaadin/sass/internal/expression/ArithmeticExpressionEvaluatorTest.java
theme-compiler/tests/src/com/vaadin/sass/parser/ParserTest.java
theme-compiler/tests/src/com/vaadin/sass/resolvers/VaadinResolverTest.java
theme-compiler/tests/src/com/vaadin/sass/testcases/css/Interpolation.java
theme-compiler/tests/src/com/vaadin/sass/testcases/css/Selectors.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/AbstractDirectoryScanningSassTests.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/AutomaticSassTests.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Comments.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ControlDirectives.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Extends.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Functions.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Imports.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Mixins.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/NestedProperties.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Nesting.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentImports.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentSelector.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/SassLangTests.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/SassLangTestsBroken.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/SassTestRunner.java
theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Variables.java
theme-compiler/tests/src/com/vaadin/sass/tree/ImportNodeTest.java
uitest/src/com/vaadin/tests/push/BasicPushTest.java
uitest/src/com/vaadin/tests/push/PushConfigurationTest.java
uitest/src/com/vaadin/tests/push/PushReconnectTest.java

Change-Id: Ic08c4f9aecd4c684ce74408de4e0b0d0ff617273

10 years agoMerge changes from origin/7.1
Artur Signell [Wed, 23 Apr 2014 17:45:14 +0000 (20:45 +0300)]
Merge changes from origin/7.1

0d4080b ContainerEventProvider returns style names from container. Fixes #10718
6e91bdf Add test for TransactionalPropertyWrapper memory leaks
f0aaf89 Fixed resetting of ComboBox if focused and new items allowed (#13413).
e033fcd Always initialize WebBrowser for new sessions (#13571)
168de1f Revert "Drag image for text-area should contain text of text-area (#13557)"
35e2a34 Fix FieldGroup and TransactionalPropertyWrapper memory leaks (#13438)
7e5d44d Introduce a drag threshold for Drag and Drop (#13381)
f227f0c Drag image for text-area should contain text of text-area (#13557).

Change-Id: Idb01471f8ab0c7118fa884c364e6bc200d13948a

10 years agoClarify comments in Table.typeIsCompatible (#8168)
Juuso Valli [Wed, 23 Apr 2014 13:19:18 +0000 (16:19 +0300)]
Clarify comments in Table.typeIsCompatible (#8168)

Change-Id: Idc9b2e2052afe2b5586904c535674ec686bb4685

10 years agoFix findUI throwing NullPointerException when extending Vaadin (#13556)
Juuso Valli [Wed, 16 Apr 2014 11:47:32 +0000 (14:47 +0300)]
Fix findUI throwing NullPointerException when extending Vaadin (#13556)

findUI sometimes threw a NPE when the session wasn't set but the UI ID
was. Doesn't occur in normal use, just when doing custom things with
requestStart/requestEnd or runPendingAccessTasks
Change-Id: Id7733567923fa30dcab4946c43b73200c2a0fac2

10 years agoAdd caching support for PublishedFileHandler (#13574)
Juuso Valli [Wed, 23 Apr 2014 06:58:57 +0000 (09:58 +0300)]
Add caching support for PublishedFileHandler (#13574)

Add caching support for PublishedFileHandler similar to VaadinServlet.
Testing is done manually as browser caching is difficult to develop
tests for.

Change-Id: I314745766c9feb60758547dba77eb9e13976ce91

10 years agoFixed javadoc XHTML to HTML and fixed typos (#13518)
Markus Koivisto [Wed, 23 Apr 2014 09:44:47 +0000 (12:44 +0300)]
Fixed javadoc XHTML to HTML and fixed typos (#13518)

Change-Id: I9a61031b0ba786098db51d77d8c73dc9fb36aeb9

10 years agoClean Table.propertyValueConverters if the property is removed (#8168)
Juuso Valli [Wed, 16 Apr 2014 08:07:44 +0000 (11:07 +0300)]
Clean Table.propertyValueConverters if the property is removed (#8168)

Clean Table.propertyValueConverters if the property it attached to
is removed, or if the container is changed and the new container does
not contain a property with that identifier with a matching type.

Change-Id: I894ee6462ea7b9c1f9138a24fcb84db829165c7d

10 years agoJavadoc fix
Artur Signell [Wed, 23 Apr 2014 06:22:16 +0000 (09:22 +0300)]
Javadoc fix

Change-Id: If07374ae79b6970ccdd47e24aecb866bd5bbc838

10 years agoAvoid eagerly layouting from VScrollTable.updateFromUIDL (#13188)
Tomi Virtanen [Sat, 15 Mar 2014 17:56:46 +0000 (19:56 +0200)]
Avoid eagerly layouting from VScrollTable.updateFromUIDL (#13188)

Closing a modal sub-window at the same time when TreeTable item is
removed, caused the detached Window being re-opened by
WindowConnector.postLayout() call.

This change adds a check in postLayout: continue operation only if the
window is attached to DOM. Or else, log a warning message about the
invalid postLayout call. Another change is in TreeTableConnector and
VScrollTable to disallow Util.notifyParentOfSizeChange(Widget, boolean)
with a boolean 'false' argument, when rendering is in progress. 'false'
causes an immediate LayoutManager.layoutNow() call, which is the main
reason for this issue.

Change-Id: I6f3e331b0feff9e7814ae1d749f6f7812dcd49ac

10 years agoClarify lock check assert message if another session is locked (#13473)
Leif Åstrand [Tue, 18 Mar 2014 11:48:07 +0000 (13:48 +0200)]
Clarify lock check assert message if another session is locked (#13473)

Picking this to the 7.2 branch since the other part of the ticket was already included in 7.2.

Change-Id: I1120ad5acd553e22db95e3635fffbd453fd26310
(cherry picked from commit 134c3bb96bfeaf1eab488e685f3b5dce3093e0ef)

10 years agoClarify lock check assert message if another session is locked (#13473)
Leif Åstrand [Tue, 18 Mar 2014 11:48:07 +0000 (13:48 +0200)]
Clarify lock check assert message if another session is locked (#13473)

Change-Id: I1120ad5acd553e22db95e3635fffbd453fd26310

10 years agoFix test depending on default locale
Juuso Valli [Wed, 16 Apr 2014 08:33:00 +0000 (11:33 +0300)]
Fix test depending on default locale

Change-Id: I4b90e01ddaa4535131df3262ac53a1e2e634b2ac

10 years agoUse getChildComponents in PopupView instead of getChildren (#13503)
Denis Anisimov [Sat, 5 Apr 2014 12:48:22 +0000 (15:48 +0300)]
Use getChildComponents in PopupView instead of getChildren (#13503)

Change-Id: Ifd155376804e2403c55a115186df2b2c1c673334

10 years agoMerge changes from origin/7.1
Build Agent [Wed, 16 Apr 2014 12:09:25 +0000 (15:09 +0300)]
Merge changes from origin/7.1

08b0589 Refactored TimeoutRedirectResetsOnActivity tests.
5057c59 Added integration test for WebSphere Portal. (#13309)

Change-Id: I50c8a8f6513679dca611889b43782d6ee6089d6c

10 years agoReplace SelectionRangeDragging TB2 test with TB3 test
Teemu Suo-Anttila [Wed, 16 Apr 2014 11:01:34 +0000 (14:01 +0300)]
Replace SelectionRangeDragging TB2 test with TB3 test

Change-Id: Ic60e13b94e550c0457649ef093c8d6269a7efa19

10 years agoMerge commit '591996b' into 7.2
Sauli Tähkäpää [Wed, 16 Apr 2014 11:19:11 +0000 (14:19 +0300)]
Merge commit '591996b' into 7.2

Conflicts:
build.properties

Change-Id: Ie3cf9bd0af8aba7debf4626d2db77afea37e7cb3