projects / idea / community.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
diff: add annotate action to diff viewers
[idea/community.git] / platform / diff-impl / src / com / intellij / diff / merge /
2015-09-02 Yaroslav LepenkinMerge branch 'chainedMethodsWithComments' of https... tree | commitdiff
2015-09-01 Pap Lőrinc[groovy] fix spockTableWithComments (IDEA-137145) tree | commitdiff
2015-08-31 Dmitry TrofimovMerge branch 'traff/sdks' tree | commitdiff
2015-08-31 irengrigMerge remote-tracking branch 'origin/master' tree | commitdiff
2015-08-31 Aleksey Pivovarovdiff: cleanup tree | commitdiff
2015-08-27 Ilya.KazakevichMerge remote-tracking branch 'origin/master' tree | commitdiff
2015-08-27 Aleksey Pivovarovdiff: allow to pass additional actions via action group tree | commitdiff
2015-08-25 Dmitry TrofimovMerge remote-tracking branch 'origin/master' tree | commitdiff
2015-08-25 Vladimir.OrlovMerge remote-tracking branch 'origin/master' tree | commitdiff
2015-08-25 Aleksey Pivovarovmerge: fix NPE if UndoManager not found appcode/142.4266 clion/142.4264 tree | commitdiff
2015-08-25 Vladimir Krivosheevfix NPE if MultipleFileMergeDialog was created without... tree | commitdiff
2015-08-24 Ekaterina TuzovaMerge branch 'liana/simplified_debugger' tree | commitdiff
2015-08-24 Egor.UshakovMerge branch 'master' into nodeDescriptor_names_ext tree | commitdiff
2015-08-20 irengrigMerge remote-tracking branch 'origin/master' tree | commitdiff
2015-08-20 Dmitry TrofimovMerge remote-tracking branch 'origin/master' tree | commitdiff
2015-08-20 Aleksey PivovarovMerge branch 'new-merge' tree | commitdiff
2015-08-19 Aleksey PivovarovMerge branch 'master' into new-merge tree | commitdiff
2015-08-12 Aleksey Pivovarovmerge: register undo/redo actions in side editors tree | commitdiff
2015-08-12 Aleksey Pivovarovmerge: restore 'old-style' apply actions tree | commitdiff
2015-08-12 Aleksey Pivovarovmerge: remove "append side" actions tree | commitdiff
2015-08-12 Aleksey Pivovarovmerge: remove registry key tree | commitdiff
2015-08-12 Aleksey Pivovarovmerge: show confirmation on cancel in binary merge... tree | commitdiff
2015-08-12 Aleksey Pivovarovmerge: ask on selecting left/right side, discarding... tree | commitdiff
2015-08-12 Aleksey Pivovarovmerge: let MergeTool to decide on confirmation message tree | commitdiff
2015-08-12 Aleksey Pivovarovmerge: show "Accept Left/Right" actions in ErrorMergeTool tree | commitdiff
2015-08-12 Aleksey Pivovarovmerge: limit bottom actions to the four default ones tree | commitdiff
2015-08-12 Aleksey Pivovarovmerge: move applyResult() to the MergeRequest tree | commitdiff
2015-08-10 Aleksey Pivovarovmerge: show gutter actions in DumbMode tree | commitdiff
2015-08-10 Aleksey PivovarovMerge branch 'master' into new-merge tree | commitdiff
2015-08-06 Aleksey Pivovarovmerge: reduce visibility tree | commitdiff
2015-08-06 Aleksey Pivovarovmerge: implement two-step conflict resolve mode tree | commitdiff
2015-08-03 Aleksey Pivovarovmerge: replace modal Yes/No dialog with notification tree | commitdiff
2015-07-29 Aleksey Pivovarovmerge: support Undo actions tree | commitdiff
2015-07-29 Aleksey Pivovarovmerge: introduce state for merge changes tree | commitdiff
2015-07-29 Aleksey Pivovarovmerge: move field tree | commitdiff
2015-07-29 Aleksey Pivovarovmerge: move method tree | commitdiff
2015-07-29 Aleksey Pivovarovmerge: allow to mark resolved changes as unresolved tree | commitdiff
2015-07-29 Aleksey PivovarovMerge branch 'master' into new-merge tree | commitdiff
2015-07-28 Aleksey Pivovarovmerge: avoid "Read Only" caption for base content tree | commitdiff
2015-07-28 Aleksey Pivovarovmerge: mark initial merge content as nonundoable action tree | commitdiff
2015-07-15 Aleksey Pivovarovmerge: do not mark deletions as resolved on "append... tree | commitdiff
2015-07-15 Aleksey Pivovarovmerge: cleanup tree | commitdiff
2015-07-15 Aleksey Pivovarovmerge: allow to resolve conflict "unchanged - modified... tree | commitdiff
2015-07-15 Aleksey Pivovarovmerge: allow to resolve changes with keyboard tree | commitdiff
2015-07-15 Aleksey Pivovarovmerge: add change-apply actions to editor menu tree | commitdiff
2015-07-15 Aleksey Pivovarovdiff: extract util method tree | commitdiff
2015-07-15 Aleksey Pivovarovmerge: do not show "append" chevron action for non... tree | commitdiff
2015-07-15 Aleksey Pivovarovmerge: finish current activities before showing confirm... tree | commitdiff
2015-07-15 Aleksey Pivovarovmerge: allow to add MergeTool via extension point tree | commitdiff
2015-07-15 Aleksey Pivovarovmerge: NotNull tree | commitdiff
2015-07-15 Aleksey Pivovarovmerge: use default DialogWrapper bottom actiond tree | commitdiff
2015-07-15 Aleksey Pivovarovmerge: require confirmation on undoing initialization... tree | commitdiff
2015-07-15 Aleksey PivovarovIDEA-23756 merge: add "apply non-conflicted changed... tree | commitdiff
2015-07-15 Aleksey Pivovarovmerge: show "cancel change" action the middle editor tree | commitdiff
2015-07-15 Aleksey Pivovarovmerge: move bottom action panel creation into MergeRequ... tree | commitdiff
2015-07-15 Aleksey Pivovarovmerge: exit from bulk block in finally section tree | commitdiff
2015-07-15 Aleksey Pivovarovmerge: propose to accept results on resolving last... tree | commitdiff
2015-07-15 Aleksey Pivovarovmerge: allow to accept single side of change tree | commitdiff
2015-07-15 Aleksey Pivovarovmerge: extract method tree | commitdiff
2015-07-15 Aleksey Pivovarovmerge: do not count resolved changes on status bar tree | commitdiff
2015-07-15 Aleksey Pivovarovmerge: destroy changes before applying request tree | commitdiff
2015-07-15 Aleksey Pivovarovmerge: avoid reinstalling highlighters on every change tree | commitdiff
2015-07-15 Aleksey Pivovarovmerge: add "Apply non-conflicted changes" action tree | commitdiff
2015-07-15 Aleksey Pivovarovmerge: cleanup tree | commitdiff
2015-07-14 Aleksey Pivovarovmerge: include inserted text into change range tree | commitdiff
2015-07-14 Aleksey Pivovarovmerge: set default window action tree | commitdiff
2015-07-14 Aleksey Pivovarovmerge: add navigation actions tree | commitdiff
2015-07-14 Aleksey Pivovarovmerge: implement dotted painting of applied ranges tree | commitdiff
2015-07-14 Aleksey Pivovarovmerge: allow to apply selected side of change tree | commitdiff
2015-07-14 Aleksey Pivovarovmerge: init merge using new diff API tree | commitdiff
IntelliJ IDEA Community Edition and IntelliJ Platform.