projects
/
idea
/
community.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
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
/
2015-09-03
Aleksey Pivovarov
diff: add annotate action to diff viewers
tree
|
commitdiff
2015-09-03
Aleksey Pivovarov
diff: add listeners for DiffViewerBase
tree
|
commitdiff
2015-09-03
Aleksey Pivovarov
diff: add general extension point for diff viewers
tree
|
commitdiff
2015-09-03
Ilya.Kazakevich
Merge remote-tracking branch 'origin/master'
appcode/142.4580
tree
|
commitdiff
2015-09-02
Yaroslav Lepenkin
Merge branch 'chainedMethodsWithComments' of https...
tree
|
commitdiff
2015-09-02
Max Medvedev
Merge remote-tracking branch 'origin/master'
tree
|
commitdiff
2015-09-01
Pap Lőrinc
[groovy] fix spockTableWithComments (IDEA-137145)
tree
|
commitdiff
2015-09-01
Aleksey Pivovarov
diff: print usage help to stdout
tree
|
commitdiff
2015-09-01
Aleksey Pivovarov
diff: allow to show three-way diff from command line
tree
|
commitdiff
2015-08-31
Dmitry Trofimov
Merge branch 'traff/sdks'
tree
|
commitdiff
2015-08-31
irengrig
Merge remote-tracking branch 'origin/master'
tree
|
commitdiff
2015-08-31
Aleksey Pivovarov
diff: cleanup
tree
|
commitdiff
2015-08-31
Aleksey Pivovarov
Revert "diff: allow to redefine DialogWrapper's actions...
tree
|
commitdiff
2015-08-31
Aleksey Pivovarov
vcs: use custom MergeTool for patch conflicts without...
tree
|
commitdiff
2015-08-28
Roman Shevchenko
Merge remote-tracking branch 'origin/master'
tree
|
commitdiff
2015-08-27
Ilya.Kazakevich
Merge remote-tracking branch 'origin/master'
tree
|
commitdiff
2015-08-27
Aleksey Pivovarov
diff: save document before opening external tool
tree
|
commitdiff
2015-08-27
Aleksey Pivovarov
diff: allow to pass additional actions via action group
tree
|
commitdiff
2015-08-27
Aleksey Pivovarov
diff: enable "Clear Read-Only flag" dialog in Diff...
tree
|
commitdiff
2015-08-27
Aleksey Pivovarov
merge: make file writable on applyLeft/applyRight
tree
|
commitdiff
2015-08-25
Dmitry Trofimov
Merge remote-tracking branch 'origin/master'
tree
|
commitdiff
2015-08-25
Vladimir.Orlov
Merge remote-tracking branch 'origin/master'
tree
|
commitdiff
2015-08-25
Aleksey Pivovarov
merge: fix NPE if UndoManager not found
appcode/142.4266
clion/142.4264
tree
|
commitdiff
2015-08-25
Vladimir Krivosheev
fix NPE if MultipleFileMergeDialog was created without...
tree
|
commitdiff
2015-08-24
Ilya.Kazakevich
Merge remote-tracking branch 'origin/master'
tree
|
commitdiff
2015-08-24
Aleksey Pivovarov
merge: add binary merge request to API
tree
|
commitdiff
2015-08-24
Ekaterina Tuzova
Merge branch 'liana/simplified_debugger'
tree
|
commitdiff
2015-08-24
Egor.Ushakov
Merge branch 'master' into nodeDescriptor_names_ext
tree
|
commitdiff
2015-08-22
irengrig
Merge remote-tracking branch 'origin/master'
tree
|
commitdiff
2015-08-21
Ilya.Kazakevich
Merge remote-tracking branch 'origin/master'
tree
|
commitdiff
2015-08-21
Dmitry Batrak
enable context menu in EditorImpl by default (relates...
tree
|
commitdiff
2015-08-21
Vladimir.Orlov
Merge remote-tracking branch 'origin/master'
tree
|
commitdiff
2015-08-20
irengrig
Merge remote-tracking branch 'origin/master'
tree
|
commitdiff
2015-08-20
Aleksey Pivovarov
merge: mark files dirty in MergeApplication
tree
|
commitdiff
2015-08-20
Alexander Zolotov
Dispose shortcut set on closing window
tree
|
commitdiff
2015-08-20
Dmitry Trofimov
Merge remote-tracking branch 'origin/master'
tree
|
commitdiff
2015-08-20
Aleksey Pivovarov
diff: rename "Oneside Viewer" -> "Unified Viewer"
tree
|
commitdiff
2015-08-20
Aleksey Pivovarov
diff: show custom tools by-default
tree
|
commitdiff
2015-08-20
Dmitry Trofimov
Merge remote-tracking branch 'origin/master'
tree
|
commitdiff
2015-08-20
Aleksey Pivovarov
Merge branch 'new-merge'
tree
|
commitdiff
2015-08-20
Nadya Zabrodina
Merge remote-tracking branch 'origin/master'
tree
|
commitdiff
2015-08-19
Aleksey Pivovarov
diff: allow to assign FileType from unshelve diff
tree
|
commitdiff
2015-08-19
Aleksey Pivovarov
diff: log exceptions
tree
|
commitdiff
2015-08-19
Aleksey Pivovarov
diff: do not expose internal toString() in exceptions...
tree
|
commitdiff
2015-08-19
Aleksey Pivovarov
diff: allow to set custom notifications
tree
|
commitdiff
2015-08-19
Aleksey Pivovarov
diff: allow to redefine DialogWrapper's actions in...
tree
|
commitdiff
2015-08-19
Aleksey Pivovarov
diff: cleanup
tree
|
commitdiff
2015-08-19
irengrig
Merge remote-tracking branch 'origin/master'
tree
|
commitdiff
2015-08-19
Vladimir.Orlov
Merge remote-tracking branch 'origin/master'
tree
|
commitdiff
2015-08-19
Roman Shevchenko
Merge remote-tracking branch 'origin/master'
clion/142.4130
rubymine/142.4129
tree
|
commitdiff
2015-08-19
Aleksey Pivovarov
Merge branch 'master' into new-merge
tree
|
commitdiff
2015-08-19
Aleksey Pivovarov
Revert "IDEA-143772 IDEA shows deleted files in command...
tree
|
commitdiff
2015-08-19
Nadya Zabrodina
Merge remote-tracking branch 'origin/master'
tree
|
commitdiff
2015-08-19
Alexander Zolotov
Revert disposing for a while
tree
|
commitdiff
2015-08-18
Nadya Zabrodina
Merge remote-tracking branch 'origin/master'
tree
|
commitdiff
2015-08-18
Alexander Zolotov
Remove shortcut set on closing window
tree
|
commitdiff
2015-08-18
Dmitry Trofimov
Merge remote-tracking branch 'origin/master'
tree
|
commitdiff
2015-08-18
Nadya Zabrodina
Merge 'Shared_shelf' branch
tree
|
commitdiff
2015-08-18
Ilya.Kazakevich
Merge branch 'py-16643'
tree
|
commitdiff
2015-08-18
Ilya.Kazakevich
Merge remote-tracking branch 'origin/master'
tree
|
commitdiff
2015-08-18
Dmitry Avdeev
Merge remote-tracking branch 'origin/master'
tree
|
commitdiff
2015-08-18
Dmitry Avdeev
Merge remote-tracking branch 'remotes/origin/merge13...
tree
|
commitdiff
2015-08-18
Vladislav.Soroka
Merge remote-tracking branch 'origin/master'
tree
|
commitdiff
2015-08-17
Roman Shevchenko
Merge remote-tracking branch 'origin/master'
appcode/142.4078
tree
|
commitdiff
2015-08-17
Konstantin Bulenkov
IDEA-143772 IDEA shows deleted files in command line...
tree
|
commitdiff
2015-08-17
Nadya Zabrodina
Merge branch 'nz/shared_shelf'
tree
|
commitdiff
2015-08-17
Konstantin Bulenkov
Merge remote-tracking branch 'origin/master'
tree
|
commitdiff
2015-08-14
Aleksey Pivovarov
diff: add heuristic for by-word diff
tree
|
commitdiff
2015-08-12
Aleksey Pivovarov
merge: register undo/redo actions in side editors
tree
|
commitdiff
2015-08-12
Aleksey Pivovarov
merge: restore 'old-style' apply actions
tree
|
commitdiff
2015-08-12
Aleksey Pivovarov
merge: remove "append side" actions
tree
|
commitdiff
2015-08-12
Aleksey Pivovarov
merge: remove registry key
tree
|
commitdiff
2015-08-12
Aleksey Pivovarov
merge: show confirmation on cancel in binary merge...
tree
|
commitdiff
2015-08-12
Aleksey Pivovarov
merge: ask on selecting left/right side, discarding...
tree
|
commitdiff
2015-08-12
Aleksey Pivovarov
merge: let MergeTool to decide on confirmation message
tree
|
commitdiff
2015-08-12
Aleksey Pivovarov
merge: show "Accept Left/Right" actions in ErrorMergeTool
tree
|
commitdiff
2015-08-12
Aleksey Pivovarov
merge: limit bottom actions to the four default ones
tree
|
commitdiff
2015-08-12
Aleksey Pivovarov
merge: move applyResult() to the MergeRequest
tree
|
commitdiff
2015-08-10
Aleksey Pivovarov
merge: show gutter actions in DumbMode
tree
|
commitdiff
2015-08-10
Aleksey Pivovarov
diff: use new merge in settings panel
tree
|
commitdiff
2015-08-10
Aleksey Pivovarov
Merge branch 'master' into new-merge
tree
|
commitdiff
2015-08-07
Ilya.Kazakevich
Merge remote-tracking branch 'origin/master'
tree
|
commitdiff
2015-08-07
Alexander Koshevoy
Merge branch 'akoshevoy/path_mappers'
tree
|
commitdiff
2015-08-07
irengrig
Merge remote-tracking branch 'origin/master'
tree
|
commitdiff
2015-08-06
Aleksey Pivovarov
diff: remove LineFragment caching logic
tree
|
commitdiff
2015-08-06
Aleksey Pivovarov
merge: trust exit code of external tool
tree
|
commitdiff
2015-08-06
Aleksey Pivovarov
merge: reduce visibility
tree
|
commitdiff
2015-08-06
Aleksey Pivovarov
merge: implement two-step conflict resolve mode
tree
|
commitdiff
2015-08-04
Aleksey Pivovarov
diff: twoside viewer - check content from both sides...
clion/142.3763
tree
|
commitdiff
2015-08-04
Aleksey Pivovarov
diff: place "before" title on top of "after" title
tree
|
commitdiff
2015-08-04
Aleksey Pivovarov
move user data key to UndoManager
tree
|
commitdiff
2015-08-04
Aleksey Pivovarov
diff: DiffRequestPanel should not affect window title
tree
|
commitdiff
2015-08-04
Aleksey Pivovarov
IDEA-143443 diff: hide debug action under registry key
tree
|
commitdiff
2015-08-03
Aleksey Pivovarov
merge: replace modal Yes/No dialog with notification
tree
|
commitdiff
2015-08-03
Aleksey Pivovarov
diff: update ellipsis LaF
tree
|
commitdiff
2015-07-29
Aleksey Pivovarov
merge: support Undo actions
tree
|
commitdiff
2015-07-29
Aleksey Pivovarov
merge: introduce state for merge changes
tree
|
commitdiff
2015-07-29
Aleksey Pivovarov
diff: introduce DiffCommandAction wrapper
tree
|
commitdiff
2015-07-29
Aleksey Pivovarov
merge: move field
tree
|
commitdiff
2015-07-29
Aleksey Pivovarov
merge: move method
tree
|
commitdiff
next