]>
source.dussan.org Git - vaadin-framework.git/log
Teemu Suo-Anttila [Sat, 22 Mar 2014 12:53:52 +0000 (14:53 +0200)]
Fix SelectAllRowsTest to not alter existing DesiredCapabilities
Change-Id: I5fe09c76f681ae25a9bb9f78e0eaca4ce4c57951
Artur Signell [Fri, 21 Mar 2014 13:47:40 +0000 (15:47 +0200)]
Update JQuery version for Atmosphere js 2.1.5.vaadin1 (#13374)
Change-Id: I85aa947bbbd9f3e17925481bacd653aa106cdf53
Artur Signell [Wed, 5 Mar 2014 19:39:53 +0000 (21:39 +0200)]
Use enableProtocol (#13374)
Change-Id: I93385237416bb59e82e84fb1ca214b7024c7180c
Artur Signell [Thu, 20 Mar 2014 17:16:46 +0000 (19:16 +0200)]
Update to Atmosphere js 2.1.5.vaadin1 (#13374)
Change-Id: Iec7f19349a3a7c39ee7e74f4cd5c6106006f0878
Leif Åstrand [Fri, 21 Mar 2014 08:21:19 +0000 (10:21 +0200)]
Remove all unnecessary semicolons reported by Eclipse
Change-Id: I15f6fff50e709238655a0a50f605a833e2be7d6f
Sauli Tähkäpää [Fri, 21 Mar 2014 09:30:46 +0000 (09:30 +0000)]
Merge "Merge changes from origin/7.1"
Henri Sara [Fri, 21 Mar 2014 09:01:20 +0000 (11:01 +0200)]
Eliminate disallowed characters in test debug IDs
This fixes the test CustomDateFormats for Vaadin 7.2, where the
set of allowed characters is narrower than in 7.1.
Change-Id: Ife8418aa589914eff665e47fa95c4353bcdb2aff
Henri Sara [Fri, 21 Mar 2014 07:24:02 +0000 (09:24 +0200)]
Replace broken analyze layouts test with working TB3 test
Change-Id: I3fbe44e229c0e83b96b94122446097cb202960b2
Build Agent [Fri, 21 Mar 2014 08:29:58 +0000 (10:29 +0200)]
Merge changes from origin/7.1
7112abe Preventing premature start of drag due to Chrome move event #13381
7e7b623 reduce frequency of session locking and StreamingProgressEvents (#13155)
7cab7fd Improve error message when reusing UI instance (#13457)
3e53fa6 Fixed "EEE" in DateField's date pattern (#13443)
1881ea8 Fix for width issue of TabSheet (#12805)
396820e Test for streaming reconnect issue (#13435)
2f93186 Eliminate .v-caption memory leak (#13346)
0c7cbc7 Fixes a memory leak on IE8 in LayoutManagerIE8 (#12688)
5441ef0 Merged IntegrationTestRunner into TB3Runner
3545db2 Added User-Agent and Screen Width + Height labels to portlet test.
c5aaf93 Refactored JSR286 portlet test.
52dcbaa Pressing ESC now closes the DateField popup when using month or year resolutions. (#12317)
e45294f Revert "Preventing premature start of drag due to Chrome move event #13381"
Change-Id: I35e119a6e8e68e226487906af35eaa220f3af16f
Sauli Tähkäpää [Fri, 21 Mar 2014 08:18:57 +0000 (10:18 +0200)]
Merge commit '
49973354b22e8aba9cc71f83571020b0414c54e0 '
Conflicts:
shared/ivy.xml
Change-Id: I2aa7cc35953fdc7441d1a5b15a7bf0a34a97db7f
Artur Signell [Fri, 14 Mar 2014 10:36:12 +0000 (12:36 +0200)]
Throw exception when trying to invalidate FakeHttpSession
The FakeHttpSession is used only for Tomcat 7 as far as I can see (#11721)
Invalidating the fake session will not invalidate the real session so
the end result will not be what the user expects, therefore we throw an
exception instead in this case.
Change-Id: I1703644736d81ee2870b709517cbe5fa523d00f7
Juho Nurminen [Thu, 20 Feb 2014 07:41:53 +0000 (09:41 +0200)]
Use IE11 mode (#12629)
Change-Id: Ia8dc8f918bf8e0932595db44be48648dc7fd3568
Artur Signell [Mon, 17 Feb 2014 15:41:02 +0000 (17:41 +0200)]
Upgrade to atmosphere-runtime 2.1.1.vaadin2 (#12601, #13196)
Change-Id: I7ccd1217026b5f4bab292225568da16e368050b5
Artur Signell [Wed, 19 Mar 2014 18:33:52 +0000 (20:33 +0200)]
Remove accidental @RunLocally
Change-Id: I19a9f213b9539a6f36fea9ec134c7050c3ba3175
Artur Signell [Wed, 19 Mar 2014 14:26:03 +0000 (16:26 +0200)]
Make icons again include alt text (#13152)
Change-Id: Ie645b48d3dceb24a477c5043ea88876b86875481
Artur Signell [Wed, 19 Mar 2014 14:21:03 +0000 (16:21 +0200)]
Make test work in IE. Disable Firefox which doesn't work
Change-Id: I79c0f8bc2a1e394b4ad2159a41ae426c058348ce
Artur Signell [Wed, 19 Mar 2014 14:30:23 +0000 (16:30 +0200)]
Format project files according to conventions
Change-Id: I2522698237eb2a21c0896605bed8e73a82795c97
Henri Sara [Wed, 19 Mar 2014 10:36:41 +0000 (10:36 +0000)]
Revert "Preventing premature start of drag due to Chrome move event #13381"
This reverts commit
7112abe944259a615e26342de17d0302ddec3562 .
Change-Id: I2bc231ec20c27b508570c6358fb2d8128beb2735
Sauli Tähkäpää [Wed, 19 Mar 2014 09:23:38 +0000 (11:23 +0200)]
Refactored failing test for OptionGroup.
Change-Id: Ia7cc646649dd3e98822ace82e1eefac3f2ba2a5e
John Ahlroos [Tue, 18 Mar 2014 15:19:59 +0000 (15:19 +0000)]
Revert "Merge branch 'master' into grid"
This reverts commit
4420f52578e245045677f88852f1ba3f405e88a3 .
Change-Id: I06effe06f245baaeb499071917c359eb34cc55ea
Leif Åstrand [Tue, 18 Mar 2014 13:40:01 +0000 (15:40 +0200)]
Merge branch 'master' into grid
Change-Id: Ia9d156009a3f1b4e61f12eb415040670a52d7876
Teemu Pöntelin [Sun, 16 Mar 2014 21:39:04 +0000 (23:39 +0200)]
Pressing ESC now closes the DateField popup when using month or year resolutions. (#12317)
Change-Id: Icf7b8da00e80ea4dc4843bcd28b005b5e91b866f
Sauli Tähkäpää [Tue, 18 Mar 2014 06:40:14 +0000 (08:40 +0200)]
Refactored JSR286 portlet test.
Change-Id: I1830ebca5e23890636ade0bab2eca2cefe6ee1ac
Sauli Tähkäpää [Mon, 17 Mar 2014 08:25:15 +0000 (10:25 +0200)]
Added User-Agent and Screen Width + Height labels to portlet test.
Change-Id: Ic51e0fde622b3075c6956b4c6f3700fbb281c7ba
Henrik Paul [Mon, 17 Mar 2014 14:50:28 +0000 (16:50 +0200)]
Fixes Escalator flick scroll regression (#13334)
Change-Id: Icc263c10ec1fb0542f544ddbc2bb705e8968aa40
Leif Åstrand [Mon, 29 Jul 2013 12:51:33 +0000 (15:51 +0300)]
Fix race condition that might leave access queue unpurged (#12292)
Cherry-pick of
3a373efe (the original fix) and
2ff71f62 (fixing a
regression) that were marked to not be automatically merged from 7.1 to
master.
Change-Id: Iee1012486906d8c2c46cef94cfcd6d2b399d7a6b
Artur Signell [Thu, 20 Feb 2014 20:56:43 +0000 (22:56 +0200)]
Merged IntegrationTestRunner into TB3Runner
Change-Id: I9e14a75b8446623d8995ee907bd95a1b2452cefd
Pekka Hyvönen [Fri, 14 Mar 2014 14:17:27 +0000 (16:17 +0200)]
Fixes a memory leak on IE8 in LayoutManagerIE8 (#12688)
Change-Id: Ieae3b1d82e92fadf5ab517c1c878fc82bcc0ecbd
Henri Sara [Fri, 14 Mar 2014 10:20:08 +0000 (12:20 +0200)]
Eliminate .v-caption memory leak (#13346)
Change-Id: I6577dabaaf5d9fa4c73158d3391dfcd28dd0629e
Artur Signell [Fri, 7 Mar 2014 19:21:03 +0000 (21:21 +0200)]
Test for streaming reconnect issue (#13435)
Change-Id: Ibf04105a1ffe2c22726d628a0aba4668569d45d2
Teemu Pöntelin [Tue, 11 Mar 2014 17:45:38 +0000 (19:45 +0200)]
Fix for width issue of TabSheet (#12805)
Width of v-tabsheet-tabcontainer was set by copying the width
from the ComponentConnector. This produced an incorrect result
when a relative width (other than 100%) was used. Fixed by
assigning the width to 100% when the TabSheet has a defined
width.
Change-Id: I7f128f87406e6e00ceda9ee6e75dcc5539e283b6
Maciej Przepióra [Fri, 14 Mar 2014 09:50:54 +0000 (11:50 +0200)]
Make com.vaadin.data.util.filter.Like accept Object as a property id.
Fixes #13460
Change-Id: Iedddfb6a514eee227e2a08c3278c93a0f8d80bda
Teemu Pöntelin [Thu, 13 Mar 2014 22:41:42 +0000 (00:41 +0200)]
Fixed "EEE" in DateField's date pattern (#13443)
Change-Id: Ib82d901fbf65dc39c06b117c68bb0191f0fd8e68
Leif Åstrand [Thu, 13 Mar 2014 11:23:21 +0000 (13:23 +0200)]
Improve error message when reusing UI instance (#13457)
Change-Id: I49ec1e837a1a2a04dfadef5fd5fb5b6fd10ffcbc
Artur Signell [Thu, 13 Mar 2014 18:25:26 +0000 (18:25 +0000)]
Revert "Use Guava 16 which does not have compatibility issues"
Turns out Smartsprites uses Closeables.closeQuietly which is deprecated in 15 and removed in Guava 16
This reverts commit
1159db580f350493ffcf6628c05924458881ebb2 .
Change-Id: Ica9b4e175041b00a15a320b7c3fcea5b6d42b349
Fabian Lange [Wed, 12 Mar 2014 11:47:00 +0000 (12:47 +0100)]
reduce frequency of session locking and StreamingProgressEvents (#13155)
This change introduces throttling of streaming progress events. Before
a event was fired once a buffer was filled. However as the buffer is only
4kb in size, fast uploads would trigger massive amounts of events.
This change is backwards incompatible on a logical level. Before this
change, a listener would get contentLength/4kb events, while after this
change the amount is limited to one progress event per 500ms.
Change-Id: I5da092ec4488971b8554b68b44c346057bfcc0e0
denisanisimov [Thu, 30 Jan 2014 14:03:33 +0000 (16:03 +0200)]
Avoid using toString method to access to SCSS serialized state (#9530).
Change-Id: I387ae1bbc960acd5a5a588b38c6791a9c9a90690
Fabian Lange [Wed, 26 Feb 2014 18:17:21 +0000 (19:17 +0100)]
Preventing premature start of drag due to Chrome move event #13381
The drag only actually starts when the mouse move or touch move event is
more than 3 pixel away.
The purpose is twofold:
a) it fixes the glitchy behaviour of Chrome which for some reason
sometimes fires a move directly after the mousedown, which starts a drag
immediately.
b) it helps people with shaky hands or imprecise hardware, why might not
want to drag but to select but slightly move the pointer. Some frameworks
opted to make the distance configurable.
Due to sub pixels (which might be the cause for a) in the first place),
a distance of 1 or 2 pixel is not enough. Experiments showed that unaware
users did not notice that 3 pixels movement are required for the drag to
actually start (the ghost has already a delay of 300ms)
Change-Id: I71b50b72486344a7dbe4ed927b34b1f8fab0db20
Leif Åstrand [Thu, 13 Mar 2014 07:31:32 +0000 (07:31 +0000)]
Merge "Merge changes from origin/7.1"
Teemu Suo-Anttila [Thu, 6 Mar 2014 11:28:27 +0000 (13:28 +0200)]
Update Debug Window SelectorPath to match current ElementQuery
Change-Id: I2041a9db3a35c23831c61d9ab7ddfa79bcaa437c
Build Agent [Thu, 13 Mar 2014 07:19:01 +0000 (09:19 +0200)]
Merge changes from origin/7.1
97622fd Added server launch wait to TB2 and TB3 test targets.
94d33ad Class AbstractTransactionalQuery should be public (#12285)
Change-Id: Iadb5ac2677399e13cab9212d0a56615cbb2aa674
Sauli Tähkäpää [Thu, 13 Mar 2014 06:52:37 +0000 (08:52 +0200)]
Fixed trailing slash trimming in VaadinPortletService.
Change-Id: Ia9f6230219adfb1fcb29b88ad819e3209770e1fc
Edoardo Vacchi [Fri, 13 Sep 2013 08:32:20 +0000 (10:32 +0200)]
Class AbstractTransactionalQuery should be public (#12285)
AbstractTransactionalQuery was not visible outside its package
(default visibility). Added `public`.
Making this class public avoids lots of boilerplate code when making
alternate implementations of a QueryDelegate.
A standard TableQuery does a lot of introspection on the DB schema.
If the schema is known beforehand, alternate implementations may specify
this information explicitly, and inherit from AbstractTransactionalQuery
to reuse part of the implementation.
Change-Id: I7d6b399ed7c755941ee9be7931a2ba80e812b5ab
Sauli Tähkäpää [Wed, 12 Mar 2014 08:10:30 +0000 (10:10 +0200)]
Added server launch wait to TB2 and TB3 test targets.
Change-Id: Iaa9feeedd1a2dbc879617c7b0dfedfeff36a7ba5
Artur Signell [Mon, 10 Mar 2014 19:58:09 +0000 (21:58 +0200)]
Use Guava 16 which does not have compatibility issues
Change-Id: I721aad96dfec12c0b053c75707870207ccf049be
Artur Signell [Thu, 6 Mar 2014 18:09:06 +0000 (20:09 +0200)]
Do not ever set title to null (#13430)
* If title is null, leave it as-is (assume somebody else is setting it)
* If title is non-null, set it as before
Change-Id: I72699efa089df64b58448ceef59ba31995f330bf
Artur Signell [Tue, 11 Mar 2014 16:54:27 +0000 (18:54 +0200)]
Fix compilation error in tests (#13446)
Change-Id: Id96c59710173a57a9a7c990a6d8bc9ff49e75906
Build Agent [Tue, 11 Mar 2014 19:19:23 +0000 (21:19 +0200)]
Merge changes from origin/7.1
7d74479 Revert "Fixes a memory leak on IE8 in LayoutManagerIE8 (#12688)"
c121c4e Do not fail assertion if re-setting the same lock (#13440)
c0e408c Added nojavadoc parameter to "all" build script.
0417c06 Fixed nojavadoc parameter on "all" build.
71e8c7e Make ExcludeFromSuite annotation Runtime and Inherited
Change-Id: I5395660758e9bc665aaf6eb82ea27d478fa6dfbb
Teemu Suo-Anttila [Tue, 11 Mar 2014 16:15:47 +0000 (18:15 +0200)]
Make ExcludeFromSuite annotation Runtime and Inherited
Change-Id: I35169d1560ae5e1b9a057d6350de14947f6155ae
Artur Signell [Tue, 11 Mar 2014 14:52:15 +0000 (16:52 +0200)]
Resource constructors for Button (#13446)
Change-Id: I9e8409660f38e35c01adde69158c34e85cff3c43
Henrik Paul [Thu, 6 Mar 2014 13:45:48 +0000 (15:45 +0200)]
Makes Escalator autodetect the initial row height (#13239)
Change-Id: I0511bcf6814fa33d558712da2bc112b545468153
Artur Signell [Mon, 10 Mar 2014 18:38:50 +0000 (20:38 +0200)]
Fix Android/org.json incompatibility (#13277)
Change-Id: I5ff4ae771420fae22e403bd7dcb3961f4ef53e14
Leif Åstrand [Wed, 5 Mar 2014 14:07:10 +0000 (16:07 +0200)]
Ignore type parameters when looking for metadata (#12873, #12900)
All code populating the TypeDataStore is generated using
writeClassLiteral which strips away all type parameters, so the code
doing lookups should also do the same to maintain compatibility.
Change-Id: I01654f4cc15188a12c735ffed55d30a34c77a064
Artur Signell [Mon, 10 Mar 2014 19:23:11 +0000 (21:23 +0200)]
Missing server long polling tests (#13164)
Change-Id: I0aad7ffb0c6b300cc0151dc10d20cc0a1de583f9
Sauli Tähkäpää [Mon, 10 Mar 2014 16:07:35 +0000 (18:07 +0200)]
Fixed nojavadoc parameter on "all" build.
Change-Id: I336cbee8bf33591552034c1cdf29d34fc49e3c43
Mika Murtojarvi [Fri, 21 Feb 2014 09:22:06 +0000 (11:22 +0200)]
Resolves a case where a missing semicolon was not inferred (#12792)
A rule used in includeDirective has been rewritten so that it is called
when it may be needed.
Change-Id: I6705f478a40727984b644cd2da96a7aae03b7a99
Sauli Tähkäpää [Mon, 10 Mar 2014 11:42:17 +0000 (13:42 +0200)]
Added nojavadoc parameter to "all" build script.
Change-Id: Id83983e7fd81612354c6b15037a6749ba3dda55a
Artur Signell [Mon, 10 Mar 2014 11:55:39 +0000 (13:55 +0200)]
Do not fail assertion if re-setting the same lock (#13440)
Change-Id: I2e7e9dcf8739a04583d8e42a86a1fede36011813
Maciej Przepióra [Mon, 24 Feb 2014 01:56:59 +0000 (03:56 +0200)]
Fire value change events from Label when content changes (#12414)
Change-Id: I9656025ebde0a80c913713856f5c0374e0f92c27
Artur Signell [Fri, 21 Feb 2014 23:27:58 +0000 (01:27 +0200)]
Mention Tomcat 8 and Wildfly 8 as supported (#12329, #13384)
Change-Id: Ic06fa56cc6933578ead53652d3c6c339d62ee17e
Henri Sara [Mon, 10 Mar 2014 10:59:44 +0000 (10:59 +0000)]
Revert "Fixes a memory leak on IE8 in LayoutManagerIE8 (#12688)"
This reverts commit
024692835d1e2af1a4053821959f03f8d5eb4fcb .
Change-Id: I19cf6ee66a21f7eb07d0f1fd8b9698ae88454700
Build Agent [Mon, 10 Mar 2014 06:27:54 +0000 (08:27 +0200)]
Merge changes from origin/7.1
dd5698f Revert "Fix displaced TabSheet caption icon in Chrome"
2d8ec53 Fix TabSheet caption icon alignment on Chrome and Safari (#13077)
1e22aaf Added nojavadoc parameter, test-server, test-tb2, test-tb3 targets.
Change-Id: Ibc8421d3e3c037c01f31e168ce79baf20ef61684
Sauli Tähkäpää [Mon, 10 Mar 2014 05:45:55 +0000 (07:45 +0200)]
Added nojavadoc parameter, test-server, test-tb2, test-tb3 targets.
Change-Id: I3b0f4ebc247d0cdbf5d8cdd78c3088207e2f8e45
Artur Signell [Thu, 6 Mar 2014 17:53:30 +0000 (19:53 +0200)]
Use correct OSGi bundle name for Atmosphere 2.x (#13427)
Change-Id: I21f622c0aebf76d16ff70d54631828476433bd6b
Teemu Suo-Anttila [Thu, 6 Mar 2014 12:49:54 +0000 (14:49 +0200)]
Fix NestedLayoutCaptionHoverTest to work with TB 3.1.3
Change-Id: Ief75a235f8563f9664dd82c9c5a1aab38c7bc77d
Henrik Paul [Thu, 6 Mar 2014 07:37:29 +0000 (09:37 +0200)]
Add support for changing the default row height in escalator (#12645)
Since this is quite the change, I've taken the opportunity to rewrite smaller
adjoining pieces to make more sense. Move methods from classes, and so on.
These changes are, however, only on the code level, no other functionality will
be introduced by this patch.
Change-Id: I56f19c5af7dc4ccfd2fa4c9098f06e77dbfa12fb
Matti Tahvonen [Sun, 29 Dec 2013 14:06:49 +0000 (16:06 +0200)]
Default error handler now report relevant exceptions (#11599)
Change-Id: Ia2ff7a5ccc24f183f0345149678ced0e76818380
Mika Murtojarvi [Tue, 18 Feb 2014 11:41:53 +0000 (13:41 +0200)]
Remove an empty line from a Sass test case.
The blank line caused a test failure, because some Sass tests are
currently very strict about the expected output.
Change-Id: Id01818eca1da3310557c86a4aeb09f7dc23bcf70
Teemu Suo-Anttila [Thu, 6 Mar 2014 08:42:58 +0000 (10:42 +0200)]
Fix TabSheet caption icon alignment on Chrome and Safari (#13077)
Change-Id: I8cc0eb2796a328c1996417014833020319428b61
Henri Sara [Thu, 6 Mar 2014 08:37:41 +0000 (08:37 +0000)]
Revert "Fix displaced TabSheet caption icon in Chrome"
This reverts commit
46675661cd95f61e3173f33e7dcfeb32bc377f41 .
Change-Id: I8813e162aad46bff6f1424d0dec54342b53a45b5
Artur Signell [Wed, 5 Mar 2014 15:21:07 +0000 (17:21 +0200)]
Merge commit '
2db2f667e1aff042ed6f3605675526f41e1e59b6 '
No-op merge as master already uses a newer Atmosphere version
Change-Id: If7cf3846d149a25c2654ad99e793fb7fe037105c
Artur Signell [Wed, 5 Mar 2014 10:32:40 +0000 (12:32 +0200)]
Update to Atmosphere 1.0.18.vaadin3 to fix regressions (#13299).
Change-Id: I028e29c4d39a032dd2a3cf24dff111ee52e50f44
Build Agent [Wed, 5 Mar 2014 14:43:08 +0000 (16:43 +0200)]
Merge changes from origin/7.1
372b64b Add javadoc for @DelegateToWidget (#10980)
db79438 Refactored TB3 test ip address whitelisting.
bc80f83 Refactored VerifyJreVersion test to TB3.
4667566 Fix displaced TabSheet caption icon in Chrome
0246928 Fixes a memory leak on IE8 in LayoutManagerIE8 (#12688)
Change-Id: I697900c560266cdb422ae536fe32c267e29adba8
Artur Signell [Wed, 5 Mar 2014 14:36:30 +0000 (16:36 +0200)]
Merge commit '
d7b1931270d37360a0418b1cae4d980287b05f38 '
Merged as no-op because master already uses a newer Atmosphere version
Change-Id: Ic89700b5671ad948146626d2f76a103836bf526e
Pekka Hyvönen [Wed, 5 Mar 2014 13:45:11 +0000 (15:45 +0200)]
Fixes a memory leak on IE8 in LayoutManagerIE8 (#12688)
Change-Id: I9b2d2ff9513a9063de292fdf1e14b227e0ff4d76
Build Agent [Tue, 4 Mar 2014 15:37:17 +0000 (17:37 +0200)]
Merge changes from origin/7.1
f6bd40d Extracted integration-test target.
Change-Id: I268c59c4ea45435bdafc0d2dcfd2a657f6bb7443
Teemu Suo-Anttila [Tue, 4 Mar 2014 14:10:47 +0000 (16:10 +0200)]
Fix displaced TabSheet caption icon in Chrome
Change-Id: Id3183b735ae911374d1a8821cd67b5abd1c094d5
Sauli Tähkäpää [Tue, 4 Mar 2014 11:37:39 +0000 (13:37 +0200)]
Refactored VerifyJreVersion test to TB3.
Change-Id: I7283685ee61a0a68563aeb39633090b376c57380
Teemu Suo-Anttila [Tue, 4 Mar 2014 11:15:49 +0000 (13:15 +0200)]
Fix broken PushConfigurationTest
Change-Id: I27662caaaf9de457944a76190949406167a722bf
Teemu Suo-Anttila [Tue, 4 Mar 2014 11:13:23 +0000 (13:13 +0200)]
Merge commit '
06d0cf4daa414eca3c2a73df8171706ca7012213 '
Conflicts:
uitest/src/com/vaadin/tests/push/PushConfigurationTest.java
Change-Id: Ifb458fce1a9a1fa84d935b893f5af1931951058c
Build Agent [Tue, 4 Mar 2014 09:48:15 +0000 (11:48 +0200)]
Merge changes from origin/7.1
6249518 Re-try opening ssh tunnel if it fails the first time(s)
Change-Id: I01402d5ae3a97aa2aca72f5c23dc7b6315b0edf6
Sauli Tähkäpää [Tue, 4 Mar 2014 09:03:45 +0000 (11:03 +0200)]
Refactored TB3 test ip address whitelisting.
Change-Id: I7f9aae8ed3ea163b19d92caa652313dfc2c4a159
Teemu Suo-Anttila [Tue, 4 Mar 2014 09:30:56 +0000 (11:30 +0200)]
Merge commit '
5dffe132bc98853832431424da5755d8d8d820e4 '
Conflicts:
uitest/ivy.xml
Change-Id: I5fea7895be1e93a8f97c6926fc2cafb401603a49
Leif Åstrand [Tue, 4 Mar 2014 07:29:26 +0000 (09:29 +0200)]
Add javadoc for @DelegateToWidget (#10980)
Change-Id: I15e731058b615ef478cbe27b465ffdb72f0609b1
Artur Signell [Mon, 3 Mar 2014 18:38:30 +0000 (20:38 +0200)]
Fix fallback from websocket when behind proxy (#13299)
Change-Id: Id12cb97816afde4363caea20ff30376ff9cdb173
Sauli Tähkäpää [Mon, 3 Mar 2014 06:40:54 +0000 (08:40 +0200)]
Extracted integration-test target.
Change-Id: I08722f298d295365c48e00ee04d40541b3a71de8
Teemu Suo-Anttila [Mon, 3 Mar 2014 11:35:12 +0000 (13:35 +0200)]
Workaround Streaming Push unreliabilities (#13415)
Change-Id: I5e946b365e22e71a0c13606fcd159d1ce7c82925
Artur Signell [Thu, 27 Feb 2014 09:33:16 +0000 (11:33 +0200)]
Re-try opening ssh tunnel if it fails the first time(s)
Change-Id: I653db3a818435c023f0bbd8015d2bd1a35ed4e34
Henrik Paul [Mon, 3 Mar 2014 09:46:35 +0000 (11:46 +0200)]
Merge branch 'master' into grid
Change-Id: I2f1134ce1bd5e8dbb183881fc69120e964271245
Artur Signell [Fri, 28 Feb 2014 21:24:38 +0000 (23:24 +0200)]
Use separate dependencies instead of shared-deps
* Use Guava 16 for CDI compatibility (#13351, #13383)
* Use Android Json instead of org.json (#13277)
Change-Id: I4f2c2b5c56afb03d09b41a040dec7d60b4563fe8
Leif Åstrand [Fri, 28 Feb 2014 11:42:56 +0000 (13:42 +0200)]
Fix compile errors (#13334)
Change-Id: Ib9210685ed70f98af78b5cc3ad756f37b09c326a
Teemu Suo-Anttila [Fri, 28 Feb 2014 08:52:47 +0000 (10:52 +0200)]
Update TestBench3 version for UI testing
Change-Id: I2e0a8fd2590e6f9c25825ccc0dc4c6f3d147e06f
Johannes Dahlström [Wed, 26 Feb 2014 13:22:33 +0000 (15:22 +0200)]
Support font icons in Notifications (#13373)
Change-Id: I2e721bd80cae7d0ea15a623cfd1cf0778399efb2
Johannes Dahlström [Wed, 26 Feb 2014 13:20:55 +0000 (15:20 +0200)]
Support font icons in MenuItems (#13372)
Change-Id: I2a85f77f68d701baa804bd3e6d55fa737bb4cc0e
Johannes Dahlström [Wed, 26 Feb 2014 13:18:56 +0000 (15:18 +0200)]
Support font icons in Actions (#13375)
Change-Id: If8a1755d1266857bd4bc8e2baef50146634747c3
Build Agent [Thu, 27 Feb 2014 12:24:28 +0000 (14:24 +0200)]
Merge changes from origin/7.1
09bc996 Use more worker threads for widgetset compilation
Change-Id: I29b8726ae261cfa44c3e2734b582648b94fab267
Henri Sara [Thu, 27 Feb 2014 11:33:54 +0000 (13:33 +0200)]
Use more worker threads for widgetset compilation
Change-Id: Ib7ea54e7a06516acbd9cf3dd08dbbacaac2030f9
Build Agent [Thu, 27 Feb 2014 11:42:58 +0000 (13:42 +0200)]
Merge changes from origin/7.1
e961d43 Remove tooltip that's causing CalendarAcrionEventSourceTest failures
Change-Id: I738e4a91cfeccce15f76f6df1c1346c31225cde1
Teemu Suo-Anttila [Wed, 26 Feb 2014 14:27:27 +0000 (16:27 +0200)]
Remove tooltip that's causing CalendarAcrionEventSourceTest failures
This said tooltip gets in front of the context menu and native events
actually clicks on the tooltip instead of the context menu item.
Change-Id: I6519ba98351a5ad03ccc35c29b85a831e3026325
Build Agent [Thu, 27 Feb 2014 11:14:00 +0000 (13:14 +0200)]
Merge changes from origin/7.1
badf9f2 Do not prevent deployment if Atmosphere init fails (#13199)
be827f8 Enable on-the-fly SASS compilation in OSGi (#10307)
61a1899 Fix SQLContainer paging and caching issue (#11199)
19dde49 Remove applet test which does not work reliably
a73c9ef Fix broken TableScrollingWithSQLContainer test UI
fbce127 Use Chrome 33 for testing
Change-Id: I4a09cdfcc8187604a24391a73ea6c04c6d50bb5f