MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity
77,999 Commits 34 Branches 10 Tags
d47214a1735e034db9cd5332a7b7f6eb9d710ce4
Commit Graph
77999 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
anna d47214a173 testdata fixed to exclude copyright 2012-02-21 14:07:38 +01:00
anna 70cefe0922 Merge remote-tracking branch 'origin/master' 2012-02-21 13:51:30 +01:00
anna 5bffdd267c testdata fixed to exclude copyright 2012-02-21 13:49:39 +01:00
Kirill Likhodedov ec65a4e4c4 Merge remote-tracking branch 'origin/master' 2012-02-21 16:14:08 +04:00
Kirill Likhodedov 63c9dd7c99 Git: Compare branches: diff mode 
1. Extract GitChangeUtils.getDiffOutput method from GitOldChangesCollector.
    Introduce GitChangeUtils.getDiff to get changes.
2. GitCompareBranchesDialog: show a tabbed pane with log view in one tab, and diff view in the other.
 2012-02-21 16:01:49 +04:00
Sergey Evdokimov 3ff5b78233 IDEA-46477 (Need ability to feed custom properties into maven archetype when creating a new project) 2012-02-21 15:54:30 +04:00
Maxim.Medvedev 77494dabbc IDEA-81618 IntelliJ 11 Groovy mixin code complete not available when more than one mixin 2012-02-21 15:38:26 +04:00
Maxim.Medvedev beea9a922f autocompletion after foo.& and foo.@ 2012-02-21 15:38:24 +04:00
irengrig 9d7728cfb4 Merge remote branch 'origin/master' 2012-02-21 15:25:43 +04:00
irengrig 9803c92199 SVN 1.7: IDEA-81650 Subversion 1.7. explicitly lock file + command line status -> exception 2012-02-21 15:23:56 +04:00
anna 1188b58704 do not loose array dimension expressions when converting array types; move caret and selection only in case when no expressions were detected 2012-02-21 12:18:20 +01:00
anna 2471e079a8 rename: override instead of implement for non-abstract methods 2012-02-21 12:18:19 +01:00
anna 5e31bd3055 inplace rename optimization: no need in snapshot processing for members rename as the refactoring processor already does all preparations 2012-02-21 12:18:18 +01:00
anna 90e951c5f3 skip formatting during inplace refactorings 2012-02-21 12:18:17 +01:00
Rustam.Vishnyakov c1726429da Fixed handling of multiple folding regions per element 2012-02-21 14:53:26 +04:00
Dennis Ushakov 03603edfba IDEA-76836 Right-click and drag out of menu is treated like a file drag operation. 2012-02-21 14:29:39 +04:00
Alexander Lobas 40f85d1381 Merge remote-tracking branch 'origin/master' 2012-02-21 14:02:31 +04:00
Alexander Lobas 8eb0be03d7 Work on Tree 2012-02-21 13:59:18 +04:00
irengrig c16195cf93 SVN 1.7: IDEA-80897 Subversion1.7: UpdateProject Info view shows all folders as 'not in repository' 2012-02-21 13:50:08 +04:00
anna b7b31c13d2 Merge remote-tracking branch 'origin/master' 2012-02-21 10:38:25 +01:00
anna 4a999d8fa2 do not warn about default deprecated constructor for anonymous classes which use non-deprecated constructors 2012-02-21 10:37:22 +01:00
Alexey Kudravtsev d1bde2e7e5 do not strip documents during shutdown 2012-02-21 12:54:52 +04:00
irengrig a28b5401e8 SVN 1.7: svnkit 8804 2012-02-21 12:42:17 +04:00
irengrig b0004737e8 VCS: NPE because of patching svn change with svn properties 2012-02-21 12:41:33 +04:00
Kirill Likhodedov 7e0e583aa5 [Git] Don't propose to delete remote branch after merge. 2012-02-21 12:22:48 +04:00
anna c1fc540869 restore buffered image during inplace rename; disable for tests 2012-02-21 09:16:15 +01:00
irengrig 0c58f36522 SVN 1.7: additional 1.7 format check 2012-02-21 12:03:04 +04:00
anna 07ee6d4b13 temp revert 2012-02-21 08:58:09 +01:00
anna 8a0ff1368d Merge remote-tracking branch 'origin/master' 2012-02-21 08:45:59 +01:00
anna 5bcb14dad1 leak 2012-02-21 08:41:14 +01:00
Denis.Zhdanov 60e29df111 IDEA-76142: Gradle support - cannot update IDEA projects once one of build.gradle files changes 
1. 'Sync project structure' tree nodes sorting algorithm is corrected in order to always keep gradle-local entities on top;
2. Corresponding tests are corrected;
3. 'Conflict gradle-local' entities are highlighted accordingly after the import;
 2012-02-21 11:06:29 +04:00
Denis.Zhdanov 72d28ee49d IDEA-76142: Gradle support - cannot update IDEA projects once one of build.gradle files changes 
1. Added support for importing module dependencies;
2. Corresponding tests are added;
 2012-02-21 09:51:09 +04:00
Denis.Zhdanov e7da7b8ef6 IDEA-76142: Gradle support - cannot update IDEA projects once one of build.gradle files changes 
1. Library path conflict change now aggregates all mismatched paths;
2. 'Local change' markup is used for 'conflict changes' now;
3. Corresonding tests are added;
 2012-02-21 08:03:18 +04:00
Denis.Zhdanov 5e983fcdbc IDEA-76142: Gradle support - cannot update IDEA projects once one of build.gradle files changes 
Don't refresh gradle project on intellij project structure change while modal dialog is open (assuming that that modal dialog is 'project settings' dialog)
 2012-02-21 08:03:17 +04:00
peter 62dc79cffe allow to shelve changes from p4 offline mode (IDEA-69121) 2012-02-20 21:12:38 +01:00
peter 915d8b951a paint disabled actions in gray even when focused (goto action) 2012-02-20 21:12:38 +01:00
Alexander Lobas 1d769b8a43 Merge remote-tracking branch 'origin/master' 2012-02-20 23:26:21 +04:00
Alexander Lobas d75f3c674f Work on Tree 2012-02-20 23:25:14 +04:00
Konstantin Bulenkov 0afa8c8af0 better typeahead 2012-02-20 20:22:43 +01:00
Eugene Zhuravlev c1bb0ab54e Builder params API 2012-02-20 20:15:01 +01:00
Dmitry Jemerov a1f600f2a8 Merge remote-tracking branch 'origin/master' 2012-02-20 19:58:33 +01:00
Konstantin Bulenkov 6a7e0273eb make this feature for all (IDEA-81078 Ctrl+backspace shortcut should be supported in "File structure" popup window in IDEA 11,1) 2012-02-20 19:57:04 +01:00
Dmitry Jemerov 88303eb5e2 Merge remote-tracking branch 'origin/master' 2012-02-20 19:53:38 +01:00
Dmitry Jemerov 25ba4db86b correctly handle tab drag when selecting tab triggers row reordering (IDEA-65073) 2012-02-20 19:51:15 +01:00
Alexander Doroshko d1fcfc2058 better extensions handling 2012-02-20 22:46:13 +04:00
Dmitry Jemerov 0b2318bf51 on drag out of inactive tab, restore selection to tab which was selected before drag out started (IDEA-61536) 2012-02-20 19:29:23 +01:00
Konstantin Bulenkov 0a2bde6861 soe fix 2012-02-20 19:24:55 +01:00
peter ce4d0aa925 fix running unit tests written in groovy 2012-02-20 18:45:54 +01:00
peter 935e96cfc8 align multiline event log entries to date 2012-02-20 18:45:54 +01:00
peter b178b95992 correct link offsets in TeamCity notifications 2012-02-20 18:45:54 +01:00