Skip to main content
summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-04-23Fixed bug 405290: Undo-ing to the point where the compare editor is not ↵I20130430-0800I20130430-0031I20130429-2000I20130429-0800I20130428-2000Piotr Aniola1-2/+13
dirty leaves you with no easy way to recalculate diffs
2013-04-19Merge "ISynchronizeModelElement mentions subclassing but it's an interface"I20130423-0800Dani Megert1-4/+3
2013-04-19ISynchronizeModelElement mentions subclassing but it's an interfaceTomasz Zarna1-4/+3
Bug: 256964 Change-Id: I01318b323b802307caf09d24644c576d3a6c9d22
2013-04-19Merge "Add Project Explorer as Show In target to all CVS/Team perspectives"Dani Megert1-0/+3
2013-04-19Fixed bug 406012: Fix ambiguous invocation of either an outer or inherited ↵Dani Megert1-20/+28
method
2013-04-18Add Project Explorer as Show In target to all CVS/Team perspectivesTomasz Zarna1-0/+3
Bug: 307501 Change-Id: I6527dd9c4155698fd773750143808aa3cbedd52b
2013-04-18Fix ambiguous invocation of either an outer or inherited methodTomasz Zarna1-1/+1
Found by FindBugs: An inner class is invoking a method that could be resolved to either a inherited method or a method defined in an outer class. By the Java semantics, it will be resolved to invoke the inherited method, which is intended. To make the intention clear to other readers of your code and to FindBugs that you want to invoke the inherited method, not the method in the outer class, invoke it by invoking the method on super (i.e. super.setEnabled(..)). Change-Id: If00f20701b6221ec0cc0c10485a43dc09a86afb4
2013-04-18Revert "Replace deprecated ResourceSorter with ResourceComparator"Dani Megert1-4/+4
This reverts commit dee2ca6edb3f2fbc83571e5a97b43541abc7f13f.
2013-04-17Replace deprecated ResourceSorter with ResourceComparatorTomasz Zarna1-4/+4
Change-Id: I2730ec451b1fda9bc78481efcbb1432a6d44c1b4
2013-04-17Mark ICompareFilter with @noreference and fix bundle versionsDani Megert3-5/+4
2013-04-17Fixed bug 403412: Samples (except Java and Template editor) miss stylesheetDani Megert6-6/+12
2013-04-17Merge "Bug 382427 - Mechanism to inject line compare strategies into merge ↵Malgorzata Janczarska26-86/+1894
and structure viewers"
2013-04-16Use read-only everywhereDani Megert1-3/+3
2013-04-15Bug 382427 - Mechanism to inject line compare strategies into merge andJeremy Flicker26-86/+1894
structure viewers Change-Id: Iec597bd9582933b90f67de94547b4ccdaef9a319
2013-04-04Fixed bug 161737: [quick diff] Show Annotations in QuickDiff ruler is wrong ↵I20130416-0800I20130409-0900I20130409-0800Dani Megert1-3/+3
when server revision newer than local
2013-03-29Bug 403309 - Test failure: CVSMergeSubscriberTest#testLocalScrubI20130402-0800Malgorzata Janczarska1-0/+3
2013-03-28bug 403968 - Update Platform teamPaul Webster27-114/+69
2013-03-28Adding .project to .gitignoreSzymon Brandys1-0/+1
2013-03-26Bug 403311 - [NET] testSimpleHost test fail on Windows 7 - Disable testMalgorzata Janczarska1-7/+3
2013-03-26Revert "Bug 216407 - [Edit] "Copy Current from Right to Left" doesn't work ↵Dani Megert1-13/+4
when triggered after Undo" This reverts commit 57c9a3c07c972dd980fa8b106c4b1b94156f9651.
2013-03-19Updated bundle versionI20130319-1000Dani Megert1-1/+1
2013-03-18Bug 399375 - Test failures in ResourceMapperTests: TIMEOUTN20130318-2000Malgorzata Janczarska1-10/+28
2013-03-15Correctly disable EditorTests.testOpenEditorOnRevisionN20130317-2000N20130316-1500N20130315-2000Dani Megert3-6/+8
2013-03-14Bug 403311 - [NET] testSimpleHost test fail on Windows 7I20130314-1330Malgorzata Janczarska1-1/+6
2013-03-14Bug 403309 - Test failure: CVSMergeSubscriberTest#testLocalScrub -Malgorzata Janczarska1-2/+2
change deleting to force.
2013-03-14Bug 399375 - Test failures in ResourceMapperTests: TIMEOUT - disableMalgorzata Janczarska1-53/+83
failing on timeout
2013-03-14Bug 400540 - NPE in testOpenEditorOnRevision and other CVS tests -Malgorzata Janczarska2-2/+4
disable tests
2013-02-28Bug 400540 - NPE in testOpenEditorOnRevision and other CVS testsv20130228-152232I20130313-2000I20130313-0800I20130312-2000I20130312-1000I20130312-0800I20130311-2000I20130311-0800I20130310-2000I20130309-1500I20130308-2000I20130307-2000I20130306-2330I20130306-2000I20130306-1518I20130306-1318I20130306-1033I20130306-1014I20130306-0836I20130306-0045I20130305-2300I20130305-2000I20130305-1718I20130305-1653I20130305-1032I20130305-0912I20130305-0800I20130304-2000I20130303-2000I20130302-1500I20130301-2000I20130228-2000Malgorzata Janczarska1-4/+4
2013-02-28Ignore Git version numberv20130228-132921Dani Megert1-2/+6
2013-02-28Bug 216407 - [Edit] "Copy Current from Right to Left" doesn't work whenv20130228-095449Piotr Aniola1-4/+13
triggered after Undo
2013-02-27Revert "Fixed bug 309124: [compare] Java Source Compare does not show ↵I20130227-2000Dani Megert1-115/+96
whitespace characters in folder compare and in Compare With > Git Index" This reverts commit 51464728dbc3bb8f52da74ee420b9648150e22ea.
2013-02-25Fixed bug 397850: [CBI] use the correct group IDs for all artifactsv20130225-171235I20130227-0112I20130226-2200I20130226-2100I20130226-2000I20130226-0912I20130226-0800I20130225-2315I20130225-2230Dani Megert26-52/+52
2013-02-25Fixed bug 394831: [cbi] Platform parent should be renamedDani Megert1-3/+3
2013-02-20Fixed bug 309124: [compare] Java Source Compare does not show whitespaceI20130224-2000I20130223-1500I20130222-2000Manju Mathew1-96/+115
characters in folder compare and in Compare With > Git Index
2013-02-07Fixed bug 342837: [History View] Out of the box the History view shouldv20130207-162603I20130220-0922I20130219-1600I20130219-0800I20130214-2011I20130212-0800Dani Megert1-2/+2
not get a horizontal scroll bar
2013-02-04[Edit] Enable center arrow buttons when editable and for both sidesv20130204-150810I20130205-0800Robin Stocker1-36/+85
With this, the [>] and [<] buttons can also be used for non-conflicting situations, just like the toolbar buttons "Copy Current Change ..." can. It's useful e.g. in EGit to partially stage changes. It also enables using them when both sides are editable, by showing a [>] button and a [<] button below it. In the compare editor opened from EGit's Staging view, this is the case where the left side is the workspace file and the right side is the index. Bug: 398594 Change-Id: I392b181fc4bc7e31502e6edf9b59e4b8b27b8074
2013-01-30Bug 399509 - Intermittent test failurev20130130-180717I20130130-2000Malgorzata Janczarska1-0/+4
CVSWorkspaceSubscriberTest.testMarkAsMergedOnBinaryFile on Mac - disable failing test
2013-01-30Bug 399518 - ProjectSetImporterTests: testImportProject andMalgorzata Janczarska1-2/+5
testBug234149_aFewProviders fail in I20130122-0800
2013-01-30Bug 399375 - Test failures in ResourceMapperTests - increase timeoutMalgorzata Janczarska1-0/+2
2013-01-28Bug 367725 - Test failures in SaveableCompareEditorInputTest - add morev20130128-093339I20130130-0800I20130129-2000I20130129-0800I20130128-2000I20130128-0800Malgorzata Janczarska1-1/+1
details to fail message.
2013-01-02Bug 383893 - Casting to ContentMergeViewer breaks Viewer contributionsv20130102-134006I20130127-2000I20130122-0800I20130115-1300I20130115-0800I20130108-0800Piotr Aniola2-22/+33
to EP org.eclipse.compare.contentMergeViewers, with an org.eclipse.compare.IViewerCreator, that provides just an org.eclipse.jface.viewers.Viewer
2012-12-12Removed empty Javadocv20121212-113503I20130101-0800I20121225-1600I20121225-0800I20121218-1600I20121218-0800I20121214-0730I20121213-1200I20121212-2000Dani Megert1-5/+1
2012-12-10Bug 396108 - Merge in CBI patches from 4.2.2 into 4.3 (pom changes) forv20121210-102952I20121212-0800I20121211-2000I20121211-0800I20121210-2000I20121210-0800Thanh Ha15-10/+99
eclipse.platform.team
2012-12-10Bug 396109 - Merge in CBI patches from 4.2.2 into 4.3 (non-pom changes)v20121210-101141Thanh Ha1-0/+11
for eclipse.platform.team
2012-12-04Ignore binary diffsv20121204-091752I20121209-2000I20121204-2230I20121204-1600I20121204-1000I20121204-0915I20121204-0800Dani Megert1-0/+4
2012-11-08Removed trailing '.' from wizard descriptionv20121108-155326I20121127-0800I20121120-0800I20121113-0800Dani Megert1-2/+2
2012-11-08Fixed wrong IDv20121108-134437Dani Megert1-1/+1
2012-11-08Bug 377545 - Make extension pointMalgorzata Janczarska1-2/+2
for org.eclipse.team.core.storageMergers for text file usable in a headless environment - extension id should no be changed.
2012-11-08Bug 377545 - Make extension pointv20121108-113543Olivier Thomann11-177/+198
for org.eclipse.team.core.storageMergers for text file usable in a headless environment
2012-11-07Fixed Javadoc warningDani Megert1-2/+4

Back to the top