summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* OSGi support for vaadin-push (#11691)Johannes Dahlström2013-05-203-7/+10
| | | | | | | | | * Require atmosphere-runtime in vaadin-push with visibility:=reexport * Require vaadin-push in vaadin-server with resolution:=optional Serving vaadinPush.js from vaadin-push will be handled by Florian's OSGi addon Change-Id: Ida3e1ae95eb17b0114e099d1425db73106aaeead
* Merge changes from origin/7.0Leif Åstrand2013-05-1714-7/+526
|\ | | | | | | | | | | | | | | | | | | | | | | 1a6200e Merge #6880 test from 6.8; fix itself is not needed in Vaadin 7 67696f3 SQLContainer.indexOfId() also searches backwards (#11849, #10376) 611e5f9 Test for #11267 adapted from 6.8. 609acd1 Fixed table height rendering in Android 2.3 #11331 63dd611 Centers VOverlays in visual viewport on iOS, Android, fixes #11614 5a33d7d Test for #11775 0c8edf1 Avoid marking AbstractField dirty in primitive getters (#11201) Change-Id: I7437e0b249c1a95372d6f349e9d6336fb85f08a4
| * Avoid marking AbstractField dirty in primitive getters (#11201)Artur Signell2013-05-171-3/+8
| | | | | | | | Change-Id: Ie289c15d5c56d3b602d87174f022b6197f0fedf0
| * Test for #11775Artur Signell2013-05-171-0/+53
| | | | | | | | Change-Id: Ic2ff1a3b13e2d74bb9119b8336b8a83e0262833b
| * Centers VOverlays in visual viewport on iOS, Android, fixes #11614Marc Englund2013-05-172-0/+131
| | | | | | | | | | Change-Id: I21fc986b2f4253ad0491a49659db793acf77842d Ticket: 11614
| * Fixed table height rendering in Android 2.3 #11331John Ahlroos2013-05-172-0/+25
| | | | | | | | Change-Id: I085d825459416b1487873660c7baf9b0cdb476d2
| * Test for #11267 adapted from 6.8. Marc Englund2013-05-153-1/+107
| | | | | | | | | | | | | | The problem is not present in 7, but you need to use a slightly different css to acieve the same result. Change-Id: Iee6907a15fd9b0674dcb490f9110fc762c56deb6 Ticket: 11267
| * SQLContainer.indexOfId() also searches backwards (#11849, #10376)Henri Sara2013-05-143-3/+86
| | | | | | | | Change-Id: Iea3f832cd50314f747b82b774c3be57797f9ac1d
| * Merge #6880 test from 6.8; fix itself is not needed in Vaadin 7Johannes Dahlström2013-05-142-0/+116
| | | | | | | | | | | | | | svn changeset:25925/svn branch:6.8 svn changeset:25928/svn branch:6.8 Change-Id: I89e6f30d7d04f9511e26121f860f846bef7ec17d
* | Commit and push everything before a conflicting commitLeif Åstrand2013-05-171-3/+23
| | | | | | | | Change-Id: Ifdc45e2b0f540ac8212aaca835b9d11c18078eb5
* | Merge commit 'a52ceb96590333' into 7.1Leif Åstrand2013-05-17560-21267/+69392
|\ \ | |/ |/| | | | | | | | | Conflicts: theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java Change-Id: I049a08a5d129b8072bf91554ca0eab0d44e537e3
| * Merge changes from origin/7.0Leif Åstrand2013-05-1711-77/+543
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 55ea6dc More specific workaround for no rows in TreeTable with pagelenght = 0 (#9203) dca728c Warn if using old widgetset (#11836) 936439d Verify that tests are run with the expected JRE version (#11835) 29eeda5 Merge "Clean up Table popup menu close handler to prevent a memory leak" from 6.8 (#11840) 6d7f5e4 Eliminate unnecessary conversions of option keys b8c6a15 Clear items in ComboBox only if changed (#10924) 42545ac Fix NPE if there's no query in the URI (#11836) Change-Id: I2e50ba59b45720a879c6e476333369523a730b9c
| * | Tooltip accessibility fixes (#11799)michaelvogt2013-05-175-5/+61
| | | | | | | | | | | | | | | | | | | | | Remove previously added attribute for WAI-ARIA live area Set overlay container as live area instead Change-Id: Ie75c2993fdb42f29f307cbd294ae3352d2ef1ce3
| * | Remove JavaDoc dependency to vaadin-server from PageState (#11873)Johannes Dahlström2013-05-171-3/+1
| | | | | | | | | | | | Change-Id: I17bbb07256c83a0a2fb7e24925c189c875907bb9
| * | Tweak TooltipConfiguration test to pass in IE9 and IE10Leif Åstrand2013-05-171-0/+10
| | | | | | | | | | | | | | | | | | | | | Intermediate mouse move events are needed to make IE realize the same element is hovered again Change-Id: I409722e5b450988b3709a58e34b2eefe79a2be3c
| * | Allow to close a context menu with ESC key (#11869)michaelvogt2013-05-171-1/+12
| | | | | | | | | | | | Change-Id: I4d19b6a385770204bb732893534efb6b62dea19a
| * | Reset focus after selection from ContextMenu (#11476)michaelvogt2013-05-171-0/+23
| | | | | | | | | | | | Change-Id: I591d82363939bf264a5080c7fc4e06de25d93500
| * | Add ARIA presentation role to FormLayout (#11866)michaelvogt2013-05-171-0/+2
| | | | | | | | | | | | Change-Id: I307b1fdc3d1d1e338b3964468aaa868f7cd5fdb9
| * | Show tooltip on focus for DataField for AT (#11865)michaelvogt2013-05-171-0/+6
| | | | | | | | | | | | | | | | | | | | | Add focus handling so that the tooltip is handled when entering the DateField with Tab Change-Id: I67fc0db62722b457918470f5de180dd39d86d346
| * | Send browser window resizes if there is a listener (#10055)Henri Sara2013-05-176-12/+115
| | | | | | | | | | | | | | | | | | | | | This also introduces PageState, which is at the moment a part of UIState. Change-Id: I4f927e6b8217fa789d83ce5e0d8254b141f485c7
| * | Show loading indicator immediately in init as before (#11850)Leif Åstrand2013-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | f7ee755e cherry-picked from the master branch. Merge: no Change-Id: Ibe91db13b301aaf0a2b5e6e5fb08f566bf5cadab
| * | Revert "Replaced css inject hack in TestUtils with Page.Styles.add() #11798"Leif Åstrand2013-05-141-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | Removing this change to make the tests behave more nicely until #11848 has been fixed. This reverts commit f2c2236cf8d0428f100e17586f7946095ffea158 Change-Id: I776699f5082273e9c4d11248cc35e7ed6b665873
| * | Revert "Assert that connector needing layout is attached (#11698)"Leif Åstrand2013-05-131-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit cb7b02d4e50e91b9377410e79c3578587a900d94 The assert is not a good idea because it is triggered when a connector registers a dependency in its init method. Merge: no Change-Id: I1f5a99af8f0af7b3329a1a596073ba09e55e18dc
| * | Merge changes from origin/7.0Leif Åstrand2013-05-1014-52/+592
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7d9f544 Test for #11396 (merged from 6.8 branch). Depends on a blur event so cannot be autotested with TB. 1b18807 Remove pre-loader element after pre-loading, fixes #10863 ce9c818 Instead of applying workaround to the root panel, apply it to the sub window content element instead to prevent scrolling of the document when a sub window is removed. #11713 (#10776) 3f5d022 Liferay 6.2 compatibility (#11751) ffd1c1b Don't ignore child component margins in AbstractOrderedLayout (#11553) 62ae5e1 More verbose output from running Jetty 21d9b67 Add a large number of debug calls to VFilterSelect (disabled by default) bdb7931 Merge test for #11623 to 7.0. 19e27a1 Move suggestion popup width calculation from connector to VFilterSelect Change-Id: I2d980126599e55fa5e4f6ec523dca16ba54107b5
| * | | Update test to work with the new debug windowLeif Åstrand2013-05-081-5/+10
| | | | | | | | | | | | | | | | Change-Id: I9a1f7791faa3bbd8aae13c0d21c505570dfa131b
| * | | Move .v-assistive-device-only out of @mixin base-commonLeif Åstrand2013-05-081-1/+2
| | | | | | | | | | | | | | | | Change-Id: Ic75bb693077640ff9c93f09ad0341d9b24f85d1e
| * | | Remove old widget hierarchy hack that caused problems (#11752)Leif Åstrand2013-05-072-30/+1
| | | | | | | | | | | | | | | | Change-Id: Icd66755512a2c1ab490e58f80389ed35966d3e3b
| * | | Replaced css inject hack in TestUtils with Page.Styles.add() #11798John Ahlroos2013-05-071-12/+3
| | | | | | | | | | | | | | | | Change-Id: Ifb43fd1d2226756e104e2f5955e23151100e9357
| * | | Fixed order of tests in LayoutTesterApplication #11796John Ahlroos2013-05-071-16/+30
| | | | | | | | | | | | | | | | Change-Id: I9fc1224df33a66f065594de4ae09a027ddaaa895
| * | | Form field and layout Aria corrections (#11785)michaelvogt2013-05-075-13/+47
| | | | | | | | | | | | | | | | Change-Id: I7625128dd02911230ffc50d5045a88489daa85b4
| * | | Fixed IllegalSyntaxException when using spaces in path #11782John Ahlroos2013-05-062-14/+131
| | | | | | | | | | | | | | | | Change-Id: I105b2835d44c94f00b847f342fd0a6e0ef571e97
| * | | Don't start merging if there are uncommitted changesLeif Åstrand2013-05-061-0/+8
| | | | | | | | | | | | | | | | Change-Id: Ic1211e914162be6910caae10fcfc7deebc5b4ad3
| * | | Update merge script to merge 7.0 to 7.1Leif Åstrand2013-05-061-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Refactor so that source and target branches are defined in variables in the beginning of the script. * Pass a dummy commit message to the merge to avoid opening an editor while running the script Merge: manual Change-Id: I76c001b3bfcfd2dbb1ce2e9ec1b730641df31a77
| * | | Update state before purging outgoing queue (#11768)Leif Åstrand2013-05-031-5/+4
| | | | | | | | | | | | | | | | Change-Id: I83ad088da0aa173e5e912b9059757274526d5c25
| * | | Mention asserts and experimental plugin in release notes (#11530)Leif Åstrand2013-05-031-1/+3
| | | | | | | | | | | | | | | | Change-Id: I25ee810c72ba32e8087f0da6ca3b72575505740d
| * | | Only complain about other session if it is locked (#11757)Leif Åstrand2013-05-031-1/+2
| | | | | | | | | | | | | | | | Change-Id: I94ff6cecc52ae79724e45bb1c246401d9521a7cf
| * | | Fixed scss file resolving issue in Windows (#11762)Artur Signell2013-05-031-0/+4
| | | | | | | | | | | | | | | | Change-Id: I63484865ce56a54cc8f3fb673c03ffd0be6c8dc1
| * | | Enable sources and javadoc building for push (#11498)Artur Signell2013-05-021-2/+0
| | | | | | | | | | | | | | | | Change-Id: I65cb0a0cdaf4c63ab14740f3c3012b7e19f54d7a
| * | | Build sources and javadoc jars for push (#11498)Artur Signell2013-05-021-0/+4
| | | | | | | | | | | | | | | | Change-Id: Ia1621376ff86935e5f9db3d54d64de3dfb85fb6c
| * | | Fix typo (#11754)Leif Åstrand2013-05-021-3/+3
| | | | | | | | | | | | | | | | Change-Id: Ib9f75c81a18a555b34cd620260f85063c58c90ce
| * | | Allow setting push mode in UI.init (#11739)Johannes Dahlström2013-05-023-5/+77
| | | | | | | | | | | | | | | | Change-Id: Ied24bc42a25800033351fcbacdc5fc5e0be8eda1
| * | | Make access() throw if another session is already locked (#11757)Leif Åstrand2013-05-023-0/+41
| | | | | | | | | | | | | | | | Change-Id: Ic8571b0d078c3ff64e8b9914e55c51766ae49024
| * | | Rename runSafely() to access() (#11756)Leif Åstrand2013-05-0213-37/+66
| | | | | | | | | | | | | | | | Change-Id: I640244732fb561d9f55da58f8ba94fd02875c191
| * | | Fix order in web.xml to pass validation (#11688, #11672)Henri Sara2013-05-021-2/+2
| | | | | | | | | | | | | | | | Change-Id: I84ae6cbded5982da9e9a67b58e9ff9a1617627b8
| * | | Fixed invalid xml (#11688)Artur Signell2013-05-021-3/+2
| | | | | | | | | | | | | | | | Change-Id: I68f74ecbaf0ee2795dc3d80a96b5333232b3d1f4
| * | | Made test work also when current month is not April 2013Artur Signell2013-05-021-69/+4
| | | | | | | | | | | | | | | | Change-Id: I4998dd4e146d5520c814e78e3456b2d37e446cef
| * | | Updated release notes for beta1 (#11530)Artur Signell2013-05-021-2/+5
| | | | | | | | | | | | | | | | Change-Id: I539cf45e23059723a7adbedd92169969748f1052
| * | | Updated web.xml to use servlet 3.0 and added a 2.4 compatible web.xml for ↵Artur Signell2013-05-022-3/+136
| | | | | | | | | | | | | | | | | | | | | | | | older test servers (#11688) Change-Id: Iff9a4b0bbe70832ced7d71e1cfc0855cc0026320
| * | | Removed changing session id from testArtur Signell2013-05-021-2/+1
| | | | | | | | | | | | | | | | Change-Id: I851df9f3b3743263267b4a434f846fcc789997e0
| * | | Add Jetty to compilation class path of uitest WAR (#11688)Henri Sara2013-04-301-3/+3
| | | | | | | | | | | | | | | | Change-Id: I0f185e9bb1f91f7eca7e93f6a42c413be48fdeec