summaryrefslogtreecommitdiffstats
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
...
| * Commit and push everything before a conflicting commitLeif Åstrand2013-05-171-3/+23
| | | | | | | | Change-Id: Ifdc45e2b0f540ac8212aaca835b9d11c18078eb5
* | Merge changes from origin/7.1Leif Åstrand2013-05-101-0/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7d9f544 Test for #11396 (merged from 6.8 branch). Depends on a blur event so cannot be autotested with TB. d09b586 Don't start merging if there are uncommitted changes 5388dce Fixed IllegalSyntaxException when using spaces in path #11782 96b6250 Form field and layout Aria corrections (#11785) 9bd7c2b Fixed order of tests in LayoutTesterApplication #11796 f2c2236 Replaced css inject hack in TestUtils with Page.Styles.add() #11798 571792e Remove old widget hierarchy hack that caused problems (#11752) 1b18807 Remove pre-loader element after pre-loading, fixes #10863 e285119 Move .v-assistive-device-only out of @mixin base-common 762c924 Update test to work with the new debug window 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 42d9476 Merge changes from origin/7.0 Change-Id: I2c02268adcb7c81bd7f0c465be152c1d88293532
| * Don't start merging if there are uncommitted changesLeif Åstrand2013-05-061-0/+8
| | | | | | | | Change-Id: Ic1211e914162be6910caae10fcfc7deebc5b4ad3
* | Update merge specification for the master branch.Leif Åstrand2013-05-071-2/+2
|/ | | | Change-Id: Ia8ad2d2e44e2d29bfa9e2271e4e4cad0a672ec22
* 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
* Include commit id and message in merge commit messageArtur Signell2013-04-231-6/+20
| | | | Change-Id: I2557eddcb4fbd4fd1ec5c608a0d73c7fa1b243b6
* Ensure no-op merges get a change idArtur Signell2013-04-231-1/+4
| | | | Change-Id: Icda1db985b3a0654fa1274e700cddfe2f990df12
* Merge commit '6922bc5b49c5551b289a5025ccd5901e2ac3aafc'Artur Signell2013-03-121-3/+1
|\ | | | | | | Change-Id: Id118fd9bae1fdf7e7ce2efd660ade5ba7bbc5109
| * Don't provide details to teamcity as it nowadays gets those from stdoutLeif Åstrand2013-03-061-3/+1
| | | | | | | | Change-Id: I2c1e80307efaa963313bf89284066bc0429e9cd8
* | Script for merging changes from a bugfix branch into master (#11299)Artur Signell2013-03-121-0/+104
|/ | | | | | | * Supports "Merge: no" for changesets which should be skipped, e.g. release notes updates. * Supports "Merge: manual" which will causes the merge to stop, requiring somebody to manually merge to change before continuing Change-Id: If5d1291ec77f4c1e31b3afb8420a45ecceedfa15
* Fix merge checker issuesLeif Åstrand2012-10-191-2/+9
|
* Fix copy/paste error in teamcity integrationLeif Åstrand2012-07-241-1/+1
|
* Adjust merge check to work more nicely with team cityLeif Åstrand2012-07-241-5/+12
|
* Add script for automatically checking for unmerged commitsLeif Åstrand2012-07-241-0/+24
|
* Abort if merge failsArtur Signell2012-02-021-0/+6
| | | | svn changeset:22856/svn branch:6.8
* Optionally read password from fileArtur Signell2012-02-021-0/+5
| | | | svn changeset:22850/svn branch:6.8
* merge.sh now works in directories other than /versions/, like merge-all.sh ↵Johannes Dahlström2012-01-311-2/+5
| | | | | | already does svn changeset:22842/svn branch:6.8
* User SVN_USER and SVN_PASS if givenArtur Signell2012-01-271-1/+7
| | | | svn changeset:22807/svn branch:6.8
* Bugfix: concatenate merge commands properlyJohannes Dahlström2012-01-271-1/+1
| | | | svn changeset:22804/svn branch:6.8
* Added exit codesArtur Signell2012-01-271-2/+3
| | | | svn changeset:22800/svn branch:6.8
* Added missing lineArtur Signell2012-01-271-1/+1
| | | | svn changeset:22786/svn branch:6.8
* Scripts for easing merge from 6.7Artur Signell2012-01-272-0/+102
svn changeset:22783/svn branch:6.8
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-29 09:26:04 +0000