ConflictsDialog: use appendRaw, as HTMLis possible in conflict descriptions
[idea/community.git] / platform / lang-impl / src / com / intellij / refactoring / ui / ConflictsDialog.java
2020-08-12 Tagir ValeevConflictsDialog: use appendRaw, as HTMLis possible...
2020-08-05 Tagir Valeev[util] IDEA-247475 API for HTML concatenations
2020-06-12 Andrei KuznetsovMerge Android Studio 4.0 (aosp/studio-master-dev)
2020-05-12 Dmitriy.PanovSpace plugin merged
2020-02-21 Anna Kozlovai18n: core refactorings
2020-02-03 Dmitriy.PanovMerge remote-tracking branch 'origin/master' into ank...
2020-01-27 Anna.Kozlovarefactoring conflicts: show max 20 conflicts by default
2020-01-16 Nikolaj SchumacherMerge branch 'nschum/interner'
2020-01-16 Tagir ValeevArray annotations changed to type-use style (not compil...
2019-07-23 Alexander LuyblinskyMerge branch 'master' into aliublinskii/OC-18684-receiv...
2019-07-02 Yann Cébron[lang-impl] fix deprecation problems
2019-07-01 Yann Cébron[lang-impl] fix deprecation problems
2019-06-16 Rustam VishnyakovEditorConfig documentation test
2019-06-16 Egor ZhdanCleanup: NotNull/Nullable
2019-06-13 Anna Kozlovaconstructor reference: don't ignore constructor paramet...
2019-06-13 Egor ZhdanCleanup: NotNull/Nullable
2019-05-30 Vladimir Krivosheevprefer ArrayUtilRt
2018-12-19 Roman ShevchenkoMerge PR #895 (https://github.com/JetBrains/intellij...
2018-11-26 Viktor ShatrovMerge branch 'master' into vshatrov/webconsole
2018-11-09 Alexey Kudravtsevnotnull
2018-11-07 Eldar AbusalimovMerge remote-tracking branch 'origin/clion-memory-view'
2018-10-24 Dmitry TrofimovMerge branch 'PRmodulelist' of https://github.com/guoci...
2018-10-23 Roman ShevchenkoMerge PR #880 (https://github.com/JetBrains/intellij... rubymine/191.714
2018-10-22 Dmitry TrofimovMerge branch 'quote-vars' of https://github.com/rohanjo...
2018-10-22 Dmitry TrofimovMerge branch 'terminalProjectEnv' of https://github...
2018-10-10 Florian KistnerMerge branch 'florian.kistner/appnap' appcode/191.93 clion/191.92
2018-10-09 Dmitry TrofimovMerge remote-tracking branch 'origin/ssimonchik/termina... rubymine/191.58
2018-10-09 Dmitry TrofimovMerge branch 'traff/terminal_new_tabs'
2018-10-09 Vladimir PlyashkunMerge branch 'master' into vplyashkun/clang_tidy_multif... clion/191.353
2018-10-09 Tagir ValeevBulk addAll/collection constructor used; other warnings...
2018-10-01 Dmitry TrofimovMerge remote-tracking branch 'origin/master'
2018-09-14 Dmitry.Krasilschikovmerging; RUBY-21149 move "ShowFilterAction" to upper...
2018-09-11 Vladimir PlyashkunMerge branch 'master' into vplyashkun/clang_tidy_multif...
2018-09-11 Vladimir PlyashkunMerge branch 'master' into vplyashkun/perf
2018-09-10 Eldar AbusalimovMerge remote-tracking branch 'origin/master' into eldar...
2018-09-10 Alexander LuyblinskyMerge branch 'master' into aliublinskii/OC-17089-debug...
2018-09-08 Vasily RomanikhinCPP-744: remote mode: registry.properties - resolving...
2018-09-06 Philipp SmorygoMerge branch 'egorzhdan/swiftpm'
2018-09-06 nikcleanup: remove 'public' modifier from constructors...
2018-07-24 peterMerge branch 'master' of https://github.com/michaelsiep...
2018-06-29 Dmitry TrofimovMerge remote-tracking branch 'origin/master'
2018-06-27 Dmitry TrofimovMerge branch 'behrangsa-fish-config' of https://github...
2018-06-25 Vassiliy.KudryashovMerge remote-tracking branch 'origin/master' appcode/183.337 clion/183.336 dbe/183.333 idea/183.338 phpstorm/183.332 pycharm/183.334 pycharm/183.335 rubymine/183.339
2018-06-25 Eldar AbusalimovMerge branch 'eldar/cidr-debugger'
2018-06-25 Roman ShevchenkoMerge remote-tracking branch 'origin/master'
2018-06-24 Alexey Kudravtsevremoved deprecated members
2018-05-07 Vitaliy.BibaevMerge remote-tracking branch 'stats-collector/master...
2018-04-24 Dmitry BatkovichMerge branch 'db/implicit-to-string'
2018-03-31 Daniil OvchinnikovMerge branch 'daniil/ast-loading-filter-2'
2018-02-15 Alexey UtkinMerge remote-tracking branch 'origin/uta/lexerIndent'
2018-02-08 Vladimir.OrlovMerge remote-tracking branch 'origin/master' clion/181.3590 dbe/181.3594 phpstorm/181.3593 phpstorm/181.3597 pycharm/181.3591 pycharm/181.3592 rubymine/181.3596 webstorm/181.3589
2018-02-07 Florian KistnerMerge remote-tracking branch 'origin/master' into flori...
2018-02-07 Anton MakeevMerge branch 'amakeev/file-root-icons'
2018-02-07 Anna.Kozlovamake private fields `final`
2018-01-26 Stanislav DombrovskyMerge remote-tracking branch 'origin/sdombrovsky/dmg_ba...
2018-01-26 Florian KistnerMerge remote-tracking branch 'origin/master' into flori...
2018-01-26 Vasily RomanikhinMerge branch 'vromanik/process_handler_interface' into...
2018-01-18 Tagir ValeevCollection.toArray: use empty array instead of presized one
2017-09-26 Vitaliy.BibaevMerge branch 'master' of ../../merge/stream-debugger...
2017-07-05 Aleksey PivovarovMerge pull request #491
2017-05-25 Vladislav.SorokaMerge branch 'mvn-to-gradle-with-classifier' of https...
2017-05-24 Yaroslav LepenkinMerge branch 'javadoc-continuation-indent' of https...
2017-05-24 Yaroslav LepenkinMerge branch 'javadoc-format-refactor' of https://githu...
2017-04-25 Dmitry TrofimovMerge branch 'feature/ext-point-for-sdk-comparator...
2017-04-21 peterMerge branch 'feature/guess-project-if-file-modified...
2017-04-18 Stanislav DombrovskyMerge branch 'sdombrovsky/virtual_lines'
2017-04-13 Yaroslav LepenkinMerge branch 'stats-collector-logging'
2017-04-06 Vladimir PlyashkunMerge branch 'vplyashkun/clang-tidy'
2017-04-05 Alexey UtkinMerge remote-tracking branch 'origin/uta/mutableColorKeys'
2017-04-03 Dmitry BatkovichMerge branch 'db/method-chains-completion'
2017-04-03 Roman ShevchenkoMerge pull request #538 (https://github.com/JetBrains...
2017-04-03 Vladimir.OrlovMerge remote-tracking branch 'origin/master' idea/172.1133
2017-04-03 Anton TarasovMerge remote-tracking branch 'origin/master' idea/172.1130
2017-04-03 Anton TarasovIDEA-170099 let Swing text components dynamically scale...
2016-12-14 Vitaliy.BibaevMove Memory view repository to IDEA repo
2016-11-09 Pavel DolgovMerge remote-tracking branch 'remotes/origin/pdolgov...
2016-11-02 Eugene ZhuravlevMerge branch 'IDEA-163243' of https://github.com/zdary...
2016-11-02 Eugene ZhuravlevMerge branch 'IDEA-162949' of https://github.com/zdary...
2016-10-31 Eugene ZhuravlevIDEA-141243 Support ant-contrib try/catch-task (by...
2016-10-27 Dmitry TrofimovMerge remote-tracking branch 'origin/master'
2016-10-27 Roman ShevchenkoMerge remote-tracking branch 'origin/master'
2016-10-27 irengrigorder of element in conflicts dialog - WEB-23880 Intent...
2016-10-25 Valentin FondaratovMerge branch 'ruby-attach-to-process'
2016-10-18 Dmitry TrofimovMerge remote-tracking branch 'origin/traff/vmprof-line...
2016-10-17 Ilya.KazakevichMerge branch 'py-15166' of https://github.com/happy...
2016-10-14 Egor.UshakovMerge branch 'assert_throw_in_else_clause' of https...
2016-08-23 Daniil OvchinnikovMerge branch 'dany/grails-project-view'
2016-08-19 fitermayMerge branch 'master' of https://github.com/JetBrains...
2016-08-11 Alexey UtkinMerge branch 'master' into uta/rainbow
2016-08-11 Vladimir.OrlovMerge remote-tracking branch 'origin/master'
2016-08-08 Anna.Kozlovaexplicit types to diamonds
2016-08-08 Anna.Kozlovarename inspection to more predictable name
2016-07-22 Anna.Kozlovaexplicit types to diamonds
2016-07-13 Dmitry AvdeevMerge branch 'master' of https://github.com/Kendos...
2016-06-28 Vladislav.SorokaMerge branch 'failsafe' of https://github.com/diorcety...
2016-06-15 Valentina KiryushkinaResolve merge conflicts
2016-06-02 Vasily PisarMerge remote-tracking branch 'origin/vasily_pisar/cmake...
2016-06-02 Vasily PisarMerge branch 'master' into vasily_pisar/cmake_console
2016-05-26 Max MedvedevMerge branch 'master' into OC-13477 appcode/162.496
2016-05-19 Anton MakeevMerge remote-tracking branch 'origin/master' into amake...
next