diff: add annotate action to diff viewers
[idea/community.git] / platform / diff-impl / src / com / intellij / diff /
2015-09-03 Aleksey Pivovarovdiff: add annotate action to diff viewers
2015-09-03 Aleksey Pivovarovdiff: add listeners for DiffViewerBase
2015-09-03 Aleksey Pivovarovdiff: add general extension point for diff viewers
2015-09-03 Ilya.KazakevichMerge remote-tracking branch 'origin/master' appcode/142.4580
2015-09-02 Yaroslav LepenkinMerge branch 'chainedMethodsWithComments' of https...
2015-09-02 Max MedvedevMerge remote-tracking branch 'origin/master'
2015-09-01 Pap Lőrinc[groovy] fix spockTableWithComments (IDEA-137145)
2015-09-01 Aleksey Pivovarovdiff: print usage help to stdout
2015-09-01 Aleksey Pivovarovdiff: allow to show three-way diff from command line
2015-08-31 Dmitry TrofimovMerge branch 'traff/sdks'
2015-08-31 irengrigMerge remote-tracking branch 'origin/master'
2015-08-31 Aleksey Pivovarovdiff: cleanup
2015-08-31 Aleksey PivovarovRevert "diff: allow to redefine DialogWrapper's actions...
2015-08-31 Aleksey Pivovarovvcs: use custom MergeTool for patch conflicts without...
2015-08-28 Roman ShevchenkoMerge remote-tracking branch 'origin/master'
2015-08-27 Ilya.KazakevichMerge remote-tracking branch 'origin/master'
2015-08-27 Aleksey Pivovarovdiff: save document before opening external tool
2015-08-27 Aleksey Pivovarovdiff: allow to pass additional actions via action group
2015-08-27 Aleksey Pivovarovdiff: enable "Clear Read-Only flag" dialog in Diff...
2015-08-27 Aleksey Pivovarovmerge: make file writable on applyLeft/applyRight
2015-08-25 Dmitry TrofimovMerge remote-tracking branch 'origin/master'
2015-08-25 Vladimir.OrlovMerge remote-tracking branch 'origin/master'
2015-08-25 Aleksey Pivovarovmerge: fix NPE if UndoManager not found appcode/142.4266 clion/142.4264
2015-08-25 Vladimir Krivosheevfix NPE if MultipleFileMergeDialog was created without...
2015-08-24 Ilya.KazakevichMerge remote-tracking branch 'origin/master'
2015-08-24 Aleksey Pivovarovmerge: add binary merge request to API
2015-08-24 Ekaterina TuzovaMerge branch 'liana/simplified_debugger'
2015-08-24 Egor.UshakovMerge branch 'master' into nodeDescriptor_names_ext
2015-08-22 irengrigMerge remote-tracking branch 'origin/master'
2015-08-21 Ilya.KazakevichMerge remote-tracking branch 'origin/master'
2015-08-21 Dmitry Batrakenable context menu in EditorImpl by default (relates...
2015-08-21 Vladimir.OrlovMerge remote-tracking branch 'origin/master'
2015-08-20 irengrigMerge remote-tracking branch 'origin/master'
2015-08-20 Aleksey Pivovarovmerge: mark files dirty in MergeApplication
2015-08-20 Alexander ZolotovDispose shortcut set on closing window
2015-08-20 Dmitry TrofimovMerge remote-tracking branch 'origin/master'
2015-08-20 Aleksey Pivovarovdiff: rename "Oneside Viewer" -> "Unified Viewer"
2015-08-20 Aleksey Pivovarovdiff: show custom tools by-default
2015-08-20 Dmitry TrofimovMerge remote-tracking branch 'origin/master'
2015-08-20 Aleksey PivovarovMerge branch 'new-merge'
2015-08-20 Nadya ZabrodinaMerge remote-tracking branch 'origin/master'
2015-08-19 Aleksey Pivovarovdiff: allow to assign FileType from unshelve diff
2015-08-19 Aleksey Pivovarovdiff: log exceptions
2015-08-19 Aleksey Pivovarovdiff: do not expose internal toString() in exceptions...
2015-08-19 Aleksey Pivovarovdiff: allow to set custom notifications
2015-08-19 Aleksey Pivovarovdiff: allow to redefine DialogWrapper's actions in...
2015-08-19 Aleksey Pivovarovdiff: cleanup
2015-08-19 irengrigMerge remote-tracking branch 'origin/master'
2015-08-19 Vladimir.OrlovMerge remote-tracking branch 'origin/master'
2015-08-19 Roman ShevchenkoMerge remote-tracking branch 'origin/master' clion/142.4130 rubymine/142.4129
2015-08-19 Aleksey PivovarovMerge branch 'master' into new-merge
2015-08-19 Aleksey PivovarovRevert "IDEA-143772 IDEA shows deleted files in command...
2015-08-19 Nadya ZabrodinaMerge remote-tracking branch 'origin/master'
2015-08-19 Alexander ZolotovRevert disposing for a while
2015-08-18 Nadya ZabrodinaMerge remote-tracking branch 'origin/master'
2015-08-18 Alexander ZolotovRemove shortcut set on closing window
2015-08-18 Dmitry TrofimovMerge remote-tracking branch 'origin/master'
2015-08-18 Nadya ZabrodinaMerge 'Shared_shelf' branch
2015-08-18 Ilya.KazakevichMerge branch 'py-16643'
2015-08-18 Ilya.KazakevichMerge remote-tracking branch 'origin/master'
2015-08-18 Dmitry AvdeevMerge remote-tracking branch 'origin/master'
2015-08-18 Dmitry AvdeevMerge remote-tracking branch 'remotes/origin/merge13...
2015-08-18 Vladislav.SorokaMerge remote-tracking branch 'origin/master'
2015-08-17 Roman ShevchenkoMerge remote-tracking branch 'origin/master' appcode/142.4078
2015-08-17 Konstantin BulenkovIDEA-143772 IDEA shows deleted files in command line...
2015-08-17 Nadya ZabrodinaMerge branch 'nz/shared_shelf'
2015-08-17 Konstantin BulenkovMerge remote-tracking branch 'origin/master'
2015-08-14 Aleksey Pivovarovdiff: add heuristic for by-word diff
2015-08-12 Aleksey Pivovarovmerge: register undo/redo actions in side editors
2015-08-12 Aleksey Pivovarovmerge: restore 'old-style' apply actions
2015-08-12 Aleksey Pivovarovmerge: remove "append side" actions
2015-08-12 Aleksey Pivovarovmerge: remove registry key
2015-08-12 Aleksey Pivovarovmerge: show confirmation on cancel in binary merge...
2015-08-12 Aleksey Pivovarovmerge: ask on selecting left/right side, discarding...
2015-08-12 Aleksey Pivovarovmerge: let MergeTool to decide on confirmation message
2015-08-12 Aleksey Pivovarovmerge: show "Accept Left/Right" actions in ErrorMergeTool
2015-08-12 Aleksey Pivovarovmerge: limit bottom actions to the four default ones
2015-08-12 Aleksey Pivovarovmerge: move applyResult() to the MergeRequest
2015-08-10 Aleksey Pivovarovmerge: show gutter actions in DumbMode
2015-08-10 Aleksey Pivovarovdiff: use new merge in settings panel
2015-08-10 Aleksey PivovarovMerge branch 'master' into new-merge
2015-08-07 Ilya.KazakevichMerge remote-tracking branch 'origin/master'
2015-08-07 Alexander KoshevoyMerge branch 'akoshevoy/path_mappers'
2015-08-07 irengrigMerge remote-tracking branch 'origin/master'
2015-08-06 Aleksey Pivovarovdiff: remove LineFragment caching logic
2015-08-06 Aleksey Pivovarovmerge: trust exit code of external tool
2015-08-06 Aleksey Pivovarovmerge: reduce visibility
2015-08-06 Aleksey Pivovarovmerge: implement two-step conflict resolve mode
2015-08-04 Aleksey Pivovarovdiff: twoside viewer - check content from both sides... clion/142.3763
2015-08-04 Aleksey Pivovarovdiff: place "before" title on top of "after" title
2015-08-04 Aleksey Pivovarovmove user data key to UndoManager
2015-08-04 Aleksey Pivovarovdiff: DiffRequestPanel should not affect window title
2015-08-04 Aleksey PivovarovIDEA-143443 diff: hide debug action under registry key
2015-08-03 Aleksey Pivovarovmerge: replace modal Yes/No dialog with notification
2015-08-03 Aleksey Pivovarovdiff: update ellipsis LaF
2015-07-29 Aleksey Pivovarovmerge: support Undo actions
2015-07-29 Aleksey Pivovarovmerge: introduce state for merge changes
2015-07-29 Aleksey Pivovarovdiff: introduce DiffCommandAction wrapper
2015-07-29 Aleksey Pivovarovmerge: move field
2015-07-29 Aleksey Pivovarovmerge: move method