diff: add annotate action to diff viewers
[idea/community.git] / platform / diff-impl / src / com / intellij / diff / tools / simple /
2015-08-31 Dmitry TrofimovMerge branch 'traff/sdks'
2015-08-31 irengrigMerge remote-tracking branch 'origin/master'
2015-08-27 Ilya.KazakevichMerge remote-tracking branch 'origin/master'
2015-08-27 Aleksey Pivovarovdiff: allow to pass additional actions via action group
2015-08-24 Ekaterina TuzovaMerge branch 'liana/simplified_debugger'
2015-08-24 Egor.UshakovMerge branch 'master' into nodeDescriptor_names_ext
2015-08-20 irengrigMerge remote-tracking branch 'origin/master'
2015-08-20 Dmitry TrofimovMerge remote-tracking branch 'origin/master'
2015-08-20 Aleksey PivovarovMerge branch 'new-merge'
2015-08-19 Aleksey PivovarovMerge branch 'master' into new-merge
2015-08-18 Dmitry AvdeevMerge remote-tracking branch 'remotes/origin/merge13...
2015-08-17 Nadya ZabrodinaMerge branch 'nz/shared_shelf'
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-07-29 Aleksey PivovarovMerge branch 'master' into new-merge
2015-07-29 Aleksey Pivovaroveditor: mark few GutterMarks as DumbAware
2015-07-28 Aleksey Pivovarovmerge: update status line on change resolve
2015-07-16 Vladimir.OrlovMerge remote-tracking branch 'origin/master' idea/142.3270 pycharm/142.3273 rubymine/142.3272 webstorm/142.3271
2015-07-15 Aleksey PivovarovIDEA-141276 diff: show wide stripe markers
2015-07-15 Aleksey Pivovarovmerge: cleanup
2015-07-15 Aleksey Pivovarovdiff: allow to apply changes with keyboard
2015-07-15 Aleksey Pivovarovdiff: create separate action for each side
2015-07-15 Aleksey Pivovarovdiff: SyncScroll - implement smart scroll to change...
2015-07-15 Aleksey Pivovarovmerge: extract method
2015-07-14 Aleksey Pivovarovdiff: extract class to be reused in merge
2015-07-08 Vladimir KrivosheevMerge branch 'master' of /Users/develar/settings-reposi...
2015-07-01 Andrey VlasovskikhMerge branch 'vlan/python-fixes'
2015-07-01 Vladimir.OrlovMerge remote-tracking branch 'origin/master'
2015-07-01 Aleksey Pivovarovdiff: fix popup action update()
2015-06-26 Ilya.KazakevichMerge branch 'PY-3999'
2015-06-23 Ilya.KazakevichMerge remote-tracking branch 'origin/master'
2015-06-18 Aleksey PivovarovMerge remote-tracking branch 'origin/master' into diff...
2015-06-18 Aleksey PivovarovMerge remote-tracking branch 'origin/master' into diff...
2015-06-16 Aleksey Pivovarovdiff: restore action visibility
2015-06-16 Aleksey Pivovarovdiff: cleanup
2015-06-16 Aleksey Pivovarovdiff: reduce duplication
2015-06-16 Aleksey Pivovarovdiff: count changes and conflicts separately in 3-way...
2015-06-16 Aleksey Pivovarovdiff: rename util class
2015-06-16 Aleksey Pivovarovdiff: rethrow PCE in prerformRediff() duties
2015-06-16 Aleksey Pivovarovdiff: extract common logic
2015-06-16 Aleksey Pivovarovdiff: extract insertion/deletion case into separate...
2015-06-16 Aleksey Pivovarovdiff: extract class
2015-06-16 Aleksey Pivovarovdiff: move to another package
2015-06-16 Aleksey Pivovarovdiff: remove TextDiffViewerBase
2015-05-25 Konstantin KolosovskyMerge remote-tracking branch 'origin/master'
2015-05-20 Ilya.KazakevichMerge remote-tracking branch 'origin/master'
2015-05-20 Aleksey Pivovarovdiff: cleanup
2015-05-20 Aleksey Pivovarovdiff: cleanup
2015-05-20 Aleksey Pivovarovdiff: cleanup
2015-05-20 Aleksey Pivovarovdiff: cleanup
2015-05-20 Roman ShevchenkoMerge remote-tracking branch 'origin/master'
2015-05-20 Aleksey Pivovarovdiff: try another initial scroll method on fail appcode/142.1894
2015-05-19 Konstantin KolosovskyMerge remote-tracking branch 'origin/master'
2015-05-19 irengrigMerge remote-tracking branch 'origin/master'
2015-05-18 Dmitry TrofimovMerge remote-tracking branch 'origin/master'
2015-05-18 Ilya.KazakevichMerge remote-tracking branch 'origin/master'
2015-05-18 Aleksey Pivovarovdiff: use getters
2015-05-18 Ilya.KazakevichMerge remote-tracking branch 'origin/master'
2015-05-18 Konstantin KolosovskyMerge remote-tracking branch 'origin/master'
2015-05-18 Dmitry TrofimovMerge remote-tracking branch 'origin/master'
2015-05-18 Aleksey Pivovarovdiff: move context hints update/process into base class
2015-05-18 Aleksey Pivovarovdiff: dispose viewers in EDT
2015-05-18 Aleksey Pivovarovdiff: destroy folding model in three-side viewer
2015-05-15 Aleksey Pivovarovdiff: rely on indicator.checkCanceled() - do not re...
2015-05-13 Vladimir.OrlovMerge remote-tracking branch 'origin/master'
2015-05-13 Ilya.KazakevichMerge remote-tracking branch 'origin/master'
2015-05-13 Dmitry TrofimovMerge remote-tracking branch 'origin/master'
2015-05-13 Aleksey Pivovarovdiff: twoside - remove applied change from list of...
2015-05-13 Aleksey Pivovarovdiff: remove duplication, extract notifications
2015-05-13 Aleksey Pivovarovdiff: extract InitialScrollPosition logic into separate...
2015-05-13 Aleksey Pivovarovdiff: extract method
2015-04-30 Roman ShevchenkoMerge remote-tracking branch 'origin/master'
2015-04-27 Ilya.KazakevichMerge branch 'skip_json_injection_for_PY_15074' appcode/142.1490 clion/142.1496 dbe/142.1493 idea/142.1491 pycharm/142.1494 rubymine/142.1489 webstorm/142.1492
2015-04-27 Ilya.KazakevichMerge remote-tracking branch 'origin/master'
2015-04-27 Aleksey PivovarovIDEA-138949 diff: allow to apply changes in oneside...
2015-04-24 Dmitry TrofimovMerge remote-tracking branch 'origin/master' appcode/142.1447 clion/142.1443 dbe/142.1446 idea/142.1448 pycharm/142.1449 rubymine/142.1444 webstorm/142.1445
2015-04-24 Konstantin KolosovskyMerge remote-tracking branch 'origin/master'
2015-04-24 irengrigMerge remote-tracking branch 'origin/master'
2015-04-23 Aleksey PivovarovIDEA-139555 diff: show 'go to next file' popup near...
2015-04-21 Dmitry TrofimovMerge remote-tracking branch 'origin/master'
2015-04-18 Max MedvedevMerge branch 'oc-bridge'
2015-04-17 Ilya.KazakevichMerge branch 'PY-15074' of git.labs.intellij.net:idea...
2015-04-16 Nadya ZabrodinaMerge remote-tracking branch 'origin/master'
2015-04-14 Ilya.KazakevichMerge remote-tracking branch 'origin/master'
2015-04-14 Aleksey Pivovarovdiff: iterating between differences should make both...
2015-04-13 Konstantin KolosovskyMerge remote-tracking branch 'origin/master'
2015-04-13 Ilya.KazakevichMerge remote-tracking branch 'origin/master'
2015-04-13 Aleksey Pivovarovdiff: require explicit 'animated' parameter for scrolling
2015-04-10 Roman ShevchenkoMerge remote-tracking branch 'origin/master'
2015-04-10 Aleksey PivovarovIDEA-97142 IDEA-138653 diff: add action to switch curre...
2015-04-08 Vladislav.SorokaMerge branch 'optionsForAnnotationProcessor' of https...
2015-04-07 Ilya.KazakevichMerge remote-tracking branch 'origin/master' clion/142.932
2015-04-07 irengrigMerge remote-tracking branch 'origin/master'
2015-04-07 Konstantin KolosovskyMerge remote-tracking branch 'origin/master'
2015-04-06 Aleksey Pivovarovdiff: wrap folding settings into object
2015-04-06 Konstantin KolosovskyMerge remote-tracking branch 'origin/master'