summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge "Remove default bootstrap parameter support (#9824)"Johannes Dahlström2012-10-043-53/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Remove default bootstrap parameter support (#9824)Leif Åstrand2012-10-023-53/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove the code that used to set the pathInfo parameter which is never used. Change-Id: I0ec7cc8453766bccf9527bfcf5e78411364da5f0
* | | | | | | | | | | | | Merge "Revert "FontFace nodes are created correctly, fixes #9611" Should not ↵Marc Englund2012-10-042-23/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be in master yet."
| * | | | | | | | | | | | | Revert "FontFace nodes are created correctly, fixes #9611"Marc Englund2012-10-042-23/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should not be in master yet. This reverts commit f310829d004443b40d32698bd46c9c7db8ba187a
* | | | | | | | | | | | | | Merge "FontFace nodes are created correctly, fixes #9611"Marc Englund2012-10-042-2/+23
|\| | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| * | | | | | | | | | | | FontFace nodes are created correctly, fixes #9611Marc Englund2012-10-042-2/+23
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4ac14c512b7585979f3e88126a7106e469d29f7f
* | | | | | | | | | | | Merge "Avoid NPEs in integration test"Leif Åstrand2012-10-042-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Avoid NPEs in integration testArtur Signell2012-10-022-2/+2
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idc20efce93e2ee6f7e9cba2eb3676e6e6ec41771
* | | | | | | | | | | | Merge "Firefox now uses the overflow autofix + made sure we don't trigger a ↵Leif Åstrand2012-10-032-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layout phase while running another layout phase #9845"
| * | | | | | | | | | | | Firefox now uses the overflow autofix + made sure we don't trigger a layout ↵John Ahlroos2012-10-032-3/+9
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phase while running another layout phase #9845 Change-Id: I5a5bdf5ffdf84f86054f3f6f1d79737e630e41cb
* | | | | | | | | | | | Test case for #9508Johannes Dahlström2012-10-031-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn changeset:24580/svn branch:6.8 Change-Id: I2cb7dd24e09c8aaa439b43881ac6a5327cf0fac1
* | | | | | | | | | | | Ensure the browser does not cache UIDL responses (#9732)Johannes Dahlström2012-10-031-0/+5
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn changeset:24575/svn branch:6.8 Conflicts: src/com/vaadin/terminal/gwt/server/CommunicationManager.java Change-Id: I64a1a8300ab1d96e7a9b22c5ed53398cf0dd3f74
* | / / / / / / / / / Fixes #9828 - ComponentLocator now makes use of debug IDs if presentJonatan Kronqvist2012-10-021-2/+4
| |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I58aeee42ef386dd3eef8fdf25f8dd430eb22774c
* | | | | | | | | | Merge "Merge from 6.8: Limit propagation of vertical spacing and margins in ↵Johannes Dahlström2012-10-025-36/+209
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | nested FormLayouts, related test (#9427)"
| * | | | | | | | | Merge from 6.8: Limit propagation of vertical spacing and margins inHenri Sara2012-10-015-36/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nested FormLayouts, related test (#9427) svn changeset:24503/svn branch:6.8 svn changeset:24504/svn branch:6.8 svn changeset:24506/svn branch:6.8 Change-Id: I7eca0fccdd9fc9258514c68025bd9e99dcc0b89d
* | | | | | | | | | Merge "Merged tests for initial fragment events (#9558)"Johannes Dahlström2012-10-024-0/+223
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Merged tests for initial fragment events (#9558)Artur Signell2012-09-284-0/+223
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix not needed in Vaadin 7 svn changeset:24491/svn branch:6.8 Change-Id: Id78475eac42fef47a523cf1e27b2d15f1789335f
* | | | | | | | | | Make DefaultUIProvider work with lower case parameter name (#9474)7.0.0.beta3Leif Åstrand2012-10-021-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1c66f1661fee32ce924f5923c15a5c86b25465e1
* | | | | | | | | | Merge "Merge from 6.8: Large lazy container for tests"Artur Signell2012-10-022-0/+267
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Merge from 6.8: Large lazy container for testsHenri Sara2012-10-022-0/+267
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn changeset:24517/svn branch:6.8 Change-Id: I215e0471f608bda6bee27309426a96139a147275
* | | | | | | | | | | Merge changes Iae2ac641,I50a0ac7aLeif Åstrand2012-10-023-6/+48
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Made GlobalResourceHandler serializable (#9817) Updated GAE test to be UI based (#9816)
| * | | | | | | | | | | Made GlobalResourceHandler serializable (#9817)Artur Signell2012-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iae2ac641275a7f16b0bde2184c3f42f9f059f890
| * | | | | | | | | | | Updated GAE test to be UI based (#9816)Artur Signell2012-10-012-5/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I50a0ac7a8aca239e04806a8d6f9be1d9263e71dd
* | | | | | | | | | | | Merge "Unified log message with other Property implementors (#9804)"Henri Sara2012-10-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Unified log message with other Property implementors (#9804)Artur Signell2012-10-011-1/+1
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0833381d7f7871d062b04ef0ed5408f1777022af
* | | | | | | | | | | | Merge "Avoid throwing exceptions from toString, log message instead (#9804)"Henri Sara2012-10-023-7/+47
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Avoid throwing exceptions from toString, log message instead (#9804)Artur Signell2012-10-013-7/+47
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia2f8504a0fe75ab3a7c4746d533e5fd012e2a69c
* | | | | | | | | | | Fixed test to work also on build serverArtur Signell2012-10-012-47/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I78e49ad780c75b38fb62f3880bc6b4b08c9af8b1
* | | | | | | | | | | Moved ShortcutActionHandler constants to shared (#8484)Artur Signell2012-10-011-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I59b0f732f819ceb5e63182c7f3ac492f913a6278
* | | | | | | | | | | Moved ShortcutActionHandler constants to shared (#8484)Artur Signell2012-10-012-29/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia75fa0ca8b7f563ccc412381e88abae7c630569e
* | | | | | | | | | | Merge "Fixed typo in method name"John Ahlroos2012-10-011-9/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fixed typo in method nameArtur Signell2012-10-011-9/+9
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6c8e7afc24d3c9e365c99d3bc6af26fbb1eb97a9
* | | | | | | | | | Merge "CRLF -> LF"John Ahlroos2012-10-011-57/+57
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | CRLF -> LFArtur Signell2012-09-281-57/+57
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib1a828ac5f423de8e05c4ad7c8f399ccaf0beb78
* | | | | | | | | | Merge "Merged shortcut action fix from 6.8 (#8484)"John Ahlroos2012-10-017-46/+266
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merged shortcut action fix from 6.8 (#8484)John Alhroos2012-09-287-46/+266
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1bc200afa9f4a4f3c5e469eb0b2f93278cca97a7
* | | | | | | | | Merge "Added a dummy value to the parameter to make Websphere happy (#9776)"Leif Åstrand2012-10-011-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added a dummy value to the parameter to make Websphere happy (#9776)Artur Signell2012-09-281-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If44a4705fe6c2d9ce381924b2d2a47de532a712c
* | | | | | | | | Merge "Avoid adding RpcInvocationHandler toString as invocations (#9802)"Leif Åstrand2012-10-013-0/+130
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Avoid adding RpcInvocationHandler toString as invocations (#9802)Artur Signell2012-10-013-0/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If6f378c0942132110adc748bd2c1cf87779924b6
* | | | | | | | | | Merge "Publish all javadoc as an artifact and build as part of the all ↵Henri Sara2012-10-012-2/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | module (#9745)"
| * | | | | | | | | | Publish all javadoc as an artifact and build as part of the all module (#9745)Artur Signell2012-09-282-2/+3
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2d5ce81a2b9170eb7c9b91e37d0cf39d5383457c
* | | | | | | | | | Remove unused method (#9634)Leif Åstrand2012-10-011-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iad6f920d345832ec6bec49761a31ceb7290679e9
* | | | | | | | | | Remove VaadinServletSession (#9638)Leif Åstrand2012-10-0110-83/+43
| |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | Change-Id: I0e25ba1a6d258b8601c009f6dc062b3f4bd3dbce
* | | | | | | | | Merged tests for height recalculation issue for TabSheet in TabSheet (#9275)Artur Signell2012-09-292-0/+105
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix is not needed for Vaadin 7 Change-Id: Ib3f3c0abf91fdab7ccdb23344d5ab0bcb92806d5
* | | | | | | | Serialize and deserialize diff state manually (#9717, #9767)Artur Signell2012-09-284-6/+79
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extended UISerialization test to both serialize and deserialize and also validate ConnectorTracker (de)serialization Change-Id: Ifb8228bd56ec3635e4267e78160eef14dd9ff318
* | | | | | | Move reinitialize session to VaadinService (#9638)Leif Åstrand2012-09-287-62/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds reinitializeSession as a static method in VaadinService. The method is static because it affects the sessions of all VaadinService instances that are using the underlying session. Change-Id: Ia37567cb00e1f95aec344451299c99cb279a7275
* | | | | | | Do UI cleanup on heartbeat and connector resource requests (#9770)Johannes Dahlström2012-09-282-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8da2639aaf90d395f825806a7464a9b5732cb87c
* | | | | | | Ensure there's a service for each session (#9733)Leif Åstrand2012-09-2815-18/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9425c2d33fd09759b18930741344e9181dc79364
* | | | | | | Rename VaadinSession -> VaadinServiceSession (#9733)Leif Åstrand2012-09-2872-312/+330
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4472cebf2f9f4cf3e0dea31a0dda8dc892323c5c