aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge changes from origin/7.1Artur Signell2014-04-2314-57/+436
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * ContainerEventProvider returns style names from container. Fixes #10718Maciej Przepióra2014-04-162-2/+34
| | | | | | | | | | | | | | | | ContainerEventProvider doesn't actually return style names from container in certain situations (copy-pasted code). This patch fixes the problem. Change-Id: I512ea260f34a6db0572b614db393699da152fa8d (cherry picked from commit 4709b75bb47d28630dacbb240bb43de16d972371)
| * Add test for TransactionalPropertyWrapper memory leaksTeemu Suo-Anttila2014-04-142-1/+117
| | | | | | | | Change-Id: I69d0d759f95100f1dd9e2dbba57ec2c246e3aca9
| * Fixed resetting of ComboBox if focused and new items allowed (#13413).Tapio Aali2014-04-143-1/+119
| | | | | | | | Change-Id: Ibea81666101ff119e1b3e48726224f369e59b00f
| * Always initialize WebBrowser for new sessions (#13571)Leif Åstrand2014-04-145-11/+105
| | | | | | | | Change-Id: I3918498d63032f6b507b52634df5b41470363e15
| * Revert "Drag image for text-area should contain text of text-area (#13557)"Teemu Suo-Anttila2014-04-145-202/+1
| | | | | | | | | | | | | | | | | | | | | | This reverts commit f227f0c1068f17e5491bd399d9f5bde16a0c8272. Synchronising content after IE wraps the given element into a table with a body causes a NullPointerException on client side. This patch also contains new API and should be targeted to master branch. Change-Id: Ia19acd9fa31c7b67507bf797a2bab7c28ea37b4b
| * Fix FieldGroup and TransactionalPropertyWrapper memory leaks (#13438)Teemu Suo-Anttila2014-04-142-7/+27
| | | | | | | | Change-Id: Ifafb6d87b4280f8bd9e631235fff62f42de4b4c8
| * Introduce a drag threshold for Drag and Drop (#13381)Teemu Suo-Anttila2014-04-111-37/+37
| | | | | | | | | | | | Based on partial fix by Fabian Lange. Change-Id: I1a18c6ea105d87496b196b93e701aaccb987b3e7
| * Drag image for text-area should contain text of text-area (#13557).Denis Anisimov2014-04-105-1/+202
| | | | | | | | Change-Id: Ief653c3f15d18fdd076f0fb80f8a91ae429a54d3
* | Clarify lock check assert message if another session is locked (#13473)Leif Åstrand2014-04-171-2/+11
| | | | | | | | | | | | 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)
* | Merge changes from origin/7.1Build Agent2014-04-166-59/+324
|\| | | | | | | | | | | | | 08b0589 Refactored TimeoutRedirectResetsOnActivity tests. 5057c59 Added integration test for WebSphere Portal. (#13309) Change-Id: I50c8a8f6513679dca611889b43782d6ee6089d6c
| * Added integration test for WebSphere Portal. (#13309)Sauli Tähkäpää2014-04-093-8/+189
| | | | | | | | Change-Id: I576fb145cd34f98ffa90657e20f5a7c1854f470c
| * Refactored TimeoutRedirectResetsOnActivity tests.Sauli Tähkäpää2014-04-083-51/+135
| | | | | | | | | | | | -Added RetryOnFail test rule. Change-Id: I0b2cd5af0a144c29855c3ba1e158ba54900a9523
* | Merge commit '591996b' into 7.2Sauli Tähkäpää2014-04-164-11/+14
|\| | | | | | | | | | | | | Conflicts: build.properties Change-Id: Ie3cf9bd0af8aba7debf4626d2db77afea37e7cb3
| * Updated javadoc copyright years.Sauli Tähkäpää2014-04-071-2/+1
| | | | | | | | Change-Id: I56c8d6d34af90d0dc8ca605b62ebfe5ad95a4e5e
| * Fix ScreenshotTB3Test removing reference imagesTeemu Suo-Anttila2014-04-041-1/+1
| | | | | | | | Change-Id: Iaeb6943b534e3df4dad2f8689837425cdb6a65bc
| * Fix too wide Table columns while sorting from init (#13517)Teemu Suo-Anttila2014-04-032-8/+11
| | | | | | | | Change-Id: I2c356c539541381e744c8960d00aa3e018beb67d
* | Merge from 7.1 to 7.2Artur Signell2014-04-161-2/+2
| | | | | | | | | | Merge: no Change-Id: Ibfe17c35ec72985823389c75a5c3135998443068
* | Add WebSphere Portal to supported portals in release notes7.2.0.beta1Jonatan Kronqvist2014-04-161-0/+1
| | | | | | | | Change-Id: I2ffadb382d1c8ca42f1525c24c51a441a67404f6
* | Support for pointer events (#13549)Matti Tahvonen2014-04-1515-1/+804
| | | | | | | | | | | | Added support for pointer events using the “extensible event mechanism” in GWT 2.6 Change-Id: Idac62114fe26536e62609edc944ff9dfef886e1c
* | Update the tab caption widths when necessary (#13402)Jonatan Kronqvist2014-04-151-14/+28
| | | | | | | | Change-Id: I9c319625da3e4cfc5b49c339f54393f7e12effed
* | Add a section on incompatible changes to release-notes (#13502)Jonatan Kronqvist2014-04-151-12/+60
| | | | | | | | Change-Id: I73cc9c7b5509dff0cb5376af9bf4b0ef572add05
* | Update release-notes for 7.2.0.beta1Jonatan Kronqvist2014-04-151-66/+24
| | | | | | | | Change-Id: I1232c72c3dd8eca5d6223aa9858dac22a5f7817e
* | Update to Atmosphere js 2.1.5.vaadin2 (#13578)Artur Signell2014-04-141-1/+1
| | | | | | | | Change-Id: Ifb209889680cdfeb18eba7c836dc60e3551e5f61
* | Disable PopupView Animations (#13593)Teemu Suo-Anttila2014-04-141-1/+2
| | | | | | | | Change-Id: I450d63abe4e7c4e9fd279fe3a6f6262e2945904b
* | Downgrade Atmosphere client jQuery 2.0.3 -> 1.11.0. (#13374)Sauli Tähkäpää2014-04-142-3/+10339
| | | | | | | | Change-Id: I5103be114ed5c45a533b89b4c973bb5c91d47a8b
* | Redo Push reconnect tests.Sauli Tähkäpää2014-04-145-118/+113
| | | | | | | | Change-Id: I75330f67f6a57658e95b9510502bf6a1e38924ad
* | Merge "Merge branch 'master' into 7.2" into 7.2Artur Signell2014-04-1430-260/+1373
|\ \
| * \ Merge branch 'master' into 7.2Jonatan Kronqvist2014-04-1430-260/+1373
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72d0aa0 Update Window Javadoc based on 7.2 API review changes ee203f5 Apply abstract ordered layout settings for replaced component (#13568) 02998d8 Updated Window API based on 7.2 API review cd94b21 Discourage use of setNeedsLayout while a layout is running (#13542) f374bc7 Make ComboBox always immediate (#4054) aec102a Update 3rd party license information (#13449) 013d32d Remove old widget from tab content on replace (#12931). 3d0ff32 Prevent duplicate detach() calls with push (#13261) a452bad Refactor VaadinPortletRequest extending. (#13551) 55dfd29 Prevent duplicate session destroy events (#12612) 2067d4e Don't allocate unnecessary memory for empty array of Objects in MethodProperty (#10446). 00a9af5 Refactor PushConfigurationTest. Merge: no Change-Id: I6563769a77f91a68cfeadcb3306dd71fe431863c
| | * \ Merge "Merge branch '7.2'"Artur Signell2014-04-146-510/+18
| | |\ \
| | | * \ Merge branch '7.2'Jonatan Kronqvist2014-04-146-510/+18
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 51c2e93 Revert "Added ItemSetAddEvent and ItemSetRemoveEvent (#2794)" ee4ae9f Merge from 7.1 to 7.2 Conflicts: scripts/automerge7.sh Change-Id: Ieb61caed4b3b6bbc6d3dc84c02ae8eeed897a144
| | * | | | Update Window Javadoc based on 7.2 API review changesLeif Åstrand2014-04-141-3/+3
| | |/ / / | | | | | | | | | | | | | | | Change-Id: Ifdc1379892d8f798f2ceabcf83d772fa6a76dd4b
| | * | | Apply abstract ordered layout settings for replaced component (#13568).Denis Anisimov2014-04-142-0/+95
| | | | | | | | | | | | | | | | | | | | Change-Id: If6863d518d902ee48bb73fbb0c9b3725cb7c8707
| | * | | Updated Window API based on 7.2 API reviewArtur Signell2014-04-142-9/+67
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie6fa8b51c2fd1d1fe7def9ca7c11b4023eae52b7
| | * | | Discourage use of setNeedsLayout while a layout is running (#13542)Leif Åstrand2014-04-141-2/+35
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia4831db39528061f4ac4b98b861b8030a261cf9a
| | * | | Make ComboBox always immediate (#4054)Jonatan Kronqvist2014-04-111-3/+11
| | | | | | | | | | | | | | | | | | | | Change-Id: I34525b7d9e78ede7f9533869326ca0c08474963a
| | * | | Merge from 7.2Artur Signell2014-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic52a0be061bf22058ac9b831f3e965547a1b8933
| | * | | Update 3rd party license information (#13449)Jonatan Kronqvist2014-04-111-1/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib168ea79f80abefb140f1e64e239b5520d0fd3bd
| | * | | Remove old widget from tab content on replace (#12931).Denis Anisimov2014-04-103-0/+121
| | | | | | | | | | | | | | | | | | | | Change-Id: I85badfcca18e129b20ab6c5c2db0b845c8c2ea5b
| | * | | Merge commit '3d0ff32bea81c3e3c64bd044276ff04a4f8555ed'Johannes Dahlström2014-04-102-1/+87
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: server/src/com/vaadin/server/communication/AtmospherePushConnection.java server/src/com/vaadin/server/communication/PushHandler.java Change-Id: I93b5c3f3017aaa1ba2a231028c808d6e56fe1c11
| | | * | Prevent duplicate detach() calls with push (#13261)Johannes Dahlström2014-04-022-41/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This used to happen when push was disconnected due to a UI or session expiring. requestStart() and requestEnd() were called on disconnect even though a disconnection is not a request. Change-Id: I31d9cae65ec75b5046802a54bbe4564d6e44b29f
| | * | | Refactor VaadinPortletRequest extending. (#13551)Sauli Tähkäpää2014-04-106-107/+472
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibe169bf0ec6d2f335e099ac2659079c8fad6ac0b
| | * | | Prevent duplicate session destroy events (#12612)Johannes Dahlström2014-04-104-20/+99
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic752268a9deac350dbff29ecf73cfce2eb1ba0cc
| | * | | Don't allocate unnecessary memory for empty array of Objects inDenis Anisimov2014-04-102-9/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MethodProperty (#10446). Change-Id: Ib8e2cfb42494a9dd3efb5ca62ddea9675a1dab1e
| | * | | Refactor PushConfigurationTest.Sauli Tähkäpää2014-04-105-103/+209
| | | | | | | | | | | | | | | | | | | | Change-Id: Iec0aecc64e16052c522eb831f13cadbd2758ae69
* | | | | Fix NPE when removing tabsheet (#13402)Artur Signell2014-04-141-1/+5
|/ / / / | | | | | | | | | | | | Change-Id: Idc78fc1bc6380d7bfada99f1efe2484b04ce3c74
* | | / Update some APIs based on the 7.2 API review commentsJonatan Kronqvist2014-04-1422-607/+278
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | * NotificationConfiguration "helpers" removed from Notification * NotificationConfiguration methods accept Type instead of style (String) * Tab.setIconAltText -> Tab.setIconAlternateText * Remove the two new TabSheet.addTab() methods * UI.reinit() -> UI.refresh() Change-Id: I97488e7c6de8cfacc591450d69c821b2973b8707
* | | Revert "Added ItemSetAddEvent and ItemSetRemoveEvent (#2794)"Jonatan Kronqvist2014-04-116-510/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 85251833de3bd101d388b20fdb9b02c532a9f1c9. Conflicts: server/src/com/vaadin/data/util/AbstractInMemoryContainer.java server/tests/src/com/vaadin/data/util/TestIndexedContainer.java Change-Id: I49dfdc58ae5841892c6d8e205c520437da9a05e5
* | | Merge from 7.1 to 7.2Artur Signell2014-04-111-1/+1
|/ / | | | | | | Change-Id: I3db340a7c971be6abf18514f044114802edfc4de
* | Don't use WindowConnector as a content connector in UI (#13127).Denis Anisimov2014-04-093-0/+105
| | | | | | | | Change-Id: I17b963c49ba2d2de05341cf60dca0d65187314b0