summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* No-op merge from origin/7.1Leif Åstrand2013-05-170-0/+0
|\
| * Show loading indicator immediately in init as before (#11850)Leif Åstrand2013-05-161-1/+1
| * Revert "Replaced css inject hack in TestUtils with Page.Styles.add() #11798"Leif Åstrand2013-05-141-3/+12
* | Merge changes from origin/7.1Leif Åstrand2013-05-178-4/+309
|\ \
| * | Test for #11267 adapted from 6.8. Marc Englund2013-05-153-1/+107
| * | SQLContainer.indexOfId() also searches backwards (#11849, #10376)Henri Sara2013-05-143-3/+86
| * | Merge #6880 test from 6.8; fix itself is not needed in Vaadin 7Johannes Dahlström2013-05-142-0/+116
* | | Merge commit 'a52ceb9659033'Leif Åstrand2013-05-17561-21268/+69175
|\ \ \ | |/ / |/| |
| * | Merge changes from origin/7.1Leif Åstrand2013-05-177-76/+252
| |\ \
| * \ \ No-op merge from origin/7.1Leif Åstrand2013-05-170-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | Revert "Assert that connector needing layout is attached (#11698)"Leif Åstrand2013-05-131-13/+0
| * | | Merge changes from origin/7.1Leif Åstrand2013-05-176-2/+292
| |\ \ \
| * | | | Show loading indicator immediately in init as before (#11850)Artur Signell2013-05-151-1/+1
| * | | | Revert "Assert that connector needing layout is attached (#11698)"Leif Åstrand2013-05-131-13/+0
| * | | | Merge changes from origin/7.1Leif Åstrand2013-05-1027-143/+824
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge changes from origin/7.0Leif Åstrand2013-05-1014-52/+592
| | |\ \ \
| | * | | | Update test to work with the new debug windowLeif Åstrand2013-05-081-5/+10
| | * | | | Move .v-assistive-device-only out of @mixin base-commonLeif Åstrand2013-05-081-1/+2
| | * | | | Remove old widget hierarchy hack that caused problems (#11752)Leif Åstrand2013-05-072-30/+1
| | * | | | Replaced css inject hack in TestUtils with Page.Styles.add() #11798John Ahlroos2013-05-071-12/+3
| | * | | | Fixed order of tests in LayoutTesterApplication #11796John Ahlroos2013-05-071-16/+30
| | * | | | Form field and layout Aria corrections (#11785)michaelvogt2013-05-075-13/+47
| | * | | | Fixed IllegalSyntaxException when using spaces in path #11782John Ahlroos2013-05-062-14/+131
| | * | | | Don't start merging if there are uncommitted changesLeif Åstrand2013-05-061-0/+8
| * | | | | Fixed a typo in @Widgetset annotation Javadoc. #11803Teemu Pöntelin2013-05-081-1/+1
| * | | | | Fixed a typo in UI class Javadoc. #11804Teemu Pöntelin2013-05-081-1/+1
| * | | | | Update merge specification for the master branch.Leif Åstrand2013-05-071-2/+2
| |/ / / /
| * | | | Update merge script to merge 7.0 to 7.1Leif Åstrand2013-05-061-7/+9
| * | | | Update state before purging outgoing queue (#11768)Leif Åstrand2013-05-031-5/+4
| * | | | Mention asserts and experimental plugin in release notes (#11530)Leif Åstrand2013-05-031-1/+3
| * | | | Only complain about other session if it is locked (#11757)Leif Åstrand2013-05-031-1/+2
| * | | | Fixed scss file resolving issue in Windows (#11762)Artur Signell2013-05-031-0/+4
| * | | | Enable sources and javadoc building for push (#11498)Artur Signell2013-05-021-2/+0
| * | | | Build sources and javadoc jars for push (#11498)Artur Signell2013-05-021-0/+4
| * | | | Fix typo (#11754)Leif Åstrand2013-05-021-3/+3
| * | | | Allow setting push mode in UI.init (#11739)Johannes Dahlström2013-05-023-5/+77
| * | | | Make access() throw if another session is already locked (#11757)Leif Åstrand2013-05-023-0/+41
| * | | | Rename runSafely() to access() (#11756)Leif Åstrand2013-05-0213-37/+66
| * | | | Fix order in web.xml to pass validation (#11688, #11672)Henri Sara2013-05-021-2/+2
| * | | | Fixed invalid xml (#11688)Artur Signell2013-05-021-3/+2
| * | | | Made test work also when current month is not April 2013Artur Signell2013-05-021-69/+4
| * | | | Updated release notes for beta1 (#11530)Artur Signell2013-05-021-2/+5
| * | | | Updated web.xml to use servlet 3.0 and added a 2.4 compatible web.xml for old...Artur Signell2013-05-022-3/+136
| * | | | Removed changing session id from testArtur Signell2013-05-021-2/+1
| * | | | Add Jetty to compilation class path of uitest WAR (#11688)Henri Sara2013-04-301-3/+3
| * | | | Revert "Imported new Atmosphere JS from Atmosphere 1.0.x (#11642)"Artur Signell2013-04-301-204/+145
| * | | | Remove Jetty JARs from uitest WAR (related to #11688)Henri Sara2013-04-301-7/+6
| * | | | Split client-to-server messages when websockets are used (#11648)Johannes Dahlström2013-04-295-13/+171
| * | | | Fixed test (gwt-id-X not stable)Artur Signell2013-04-294-25/+25
| * | | | Added workaround for #11737 to testArtur Signell2013-04-291-0/+11