Commit Graph
43892 Commits
Author SHA1 Message Date
anna 3973debce5 show conflicts unification;
encapsulate fields: rise conflicts; tests
2009-10-27 12:23:55 +03:00
Irina Chernushina 5a43e94baf Merge branch 'master' of git.labs.intellij.net:idea/community 2009-10-27 11:49:27 +03:00
unknown 4a7da1ac96 CVS: remove external timeout (we can wait for read action also not only server response so it doesn't make sense) IDEADEV-40617 (CVS: after import with checkout files have incorrect statuses) 2009-10-27 11:40:34 +03:00
Maxim.Mossienko 96e71cf9bc fixing tests (xml lexer still reports unexpected character in comment content), 2 2009-10-27 01:32:52 +03:00
Eugene Zhuravlev 4c7ba40579 clear output dir on rebuild is true by default (fed up with complaints about compiler errors in 'green' sources) 2009-10-27 00:23:56 +03:00
Eugene Zhuravlev 3989f4efd7 added some waitForSmartMode() to reduce possibility of IndexNotReadyException() 2009-10-27 00:22:30 +03:00
Maxim Shafirov 22608c043f Fix bookmarks popup toolbar actions broken with introduction of FilteringListModel. 2009-10-26 22:37:33 +03:00
Maxim.Mossienko 2ae4b1b347 fixing tests (xml lexer still reports unexpected character in comment content) 2009-10-26 22:07:40 +03:00
Dmitry Jemerov ac18a7da71 remove incorrect dependency 2009-10-26 20:49:45 +03:00
peter 81e863bdfd WordCompletionTest->community 2009-10-26 17:13:32 +00:00
peter 8740f9fa35 catch INRE in debugger 2009-10-26 17:13:32 +00:00
Alexey Pegov 4807a03483 xhtml conditional comment injection take 3 2009-10-26 20:03:24 +03:00
Alexey Pegov d2f6432cc5 xhtml conditional comments injection take 2 2009-10-26 20:03:23 +03:00
Alexey Pegov 38484eb582 fix tests: do not throw exception on empty extension if in headless or unit-tests mode 2009-10-26 19:10:04 +03:00
Anton.Makeev 7998adf5b5 Actions: do not hide non-dumb-aware actions, just disable them 2009-10-26 18:54:39 +03:00
Anton.Makeev af08dfc939 Settings: keymap label binded to the chooser 2009-10-26 18:54:39 +03:00
Anton.Makeev 1e817e07c2 Maven: infinite recursion fix 2009-10-26 18:54:38 +03:00
Anton.Makeev fc18ca4c7f git: backgound roots check++ 2009-10-26 18:54:38 +03:00
Anton.Makeev 85035da9fa Git: background roots update 2009-10-26 18:54:37 +03:00
Dmitry Jemerov cc24b6828c write thread dumps to correct directory (IDEADEV-40838) 2009-10-26 18:52:28 +03:00
Dmitry Jemerov a16fbf9649 IDEADEV-41003 2009-10-26 18:48:28 +03:00
Dmitry Avdeev 27238601ed JVM crash fix!!! (no more static fields) 2009-10-26 17:56:52 +03:00
Dmitry Avdeev 357a6a7e10 JVM crash fix!!! 2009-10-26 17:14:44 +03:00
Irina Chernushina de909c39a7 Merge branch 'master' of git.labs.intellij.net:idea/community 2009-10-26 17:00:50 +03:00
unknown 1c0b44f00b IDEADEV-40851 (Version control: ApplicationPooledThreadControlledAlarms progress bar is shown endlessly on project closing) 2009-10-26 16:58:42 +03:00
Alexey Pegov f7f6c9d7d6 remove storage verbouse logging [STORAGE], etc 2009-10-26 16:51:17 +03:00
unknown a74f72258c CVS: local changes update should not delay Project closing. extra canceled() checks (corrected) 2009-10-26 16:15:42 +03:00
Ekaterina Shliakhovetskaja 741b18cde4 Spellchecker: update spellchecker configuration 2009-10-26 16:06:24 +03:00
Ekaterina Shliakhovetskaja 210a570e95 Spellchecker: fix suggestions for words in camel case, improve spellchecker configuration, introduce dictionary managment 2009-10-26 16:06:24 +03:00
Kirill Kalishev 82b3633645 Merge branch 'tree-fixes' 2009-10-26 16:05:44 +03:00
Kirill Kalishev e902d04d99 TreeUi: insert new element for node which is to always show plus 2009-10-26 16:03:49 +03:00
Maxim Shafirov 2fa02d1344 Accessing PSI requires read action. 2009-10-26 16:00:28 +03:00
Oleg Shpynov 387fc80395 Moved UI components to community/platform/util 2009-10-26 15:25:51 +03:00
unknown cdf2a4f20b CVS: local changes update should not delay Project closing. extra canceled() checks 2009-10-26 15:16:30 +03:00
Kirill Kalishev e1f2e7ed1d ProjectView: position on new created element fixed 2009-10-26 15:04:32 +03:00
Kirill Kalishev e07ea32dfd TreeUi: expand node when enqueued for update 2009-10-26 14:52:08 +03:00
Alexey Pegov 47cc84088f 16432 IOE: VirtualDirectoryImpl.getOutputStream: file based storage should have an extension 2009-10-26 14:39:47 +03:00
Dmitry Avdeev 9d1d1d5597 JVM crash fix? 2009-10-26 14:32:42 +03:00
nik 31f33600a2 Merge branch 'master' of git@git.labs.intellij.net:idea/community 2009-10-26 13:57:25 +03:00
nik e3b8d043a1 sort artifacts targets in generated ant xml 2009-10-26 13:55:35 +03:00
nik ec45a449c0 correctly put web and ejb artifacts in ear artifact && unused classes removed 2009-10-26 13:52:41 +03:00
Dmitry Avdeev b8e3f9e1de JVM crash fix? 2009-10-26 13:44:50 +03:00
Dmitry Avdeev 9c8f56dc62 GitRootTracker moved to background 2009-10-26 13:28:13 +03:00
nik 1bb6ebc283 fixed problem with non-disposed root models? 2009-10-26 13:21:30 +03:00
Kirill Kalishev 3d9b72f4bf Merge branch 'focus-fix' 2009-10-26 13:04:48 +03:00
Kirill Kalishev 965352d2f2 actionSystem.suspendFocusTransferIfApplicationInactive=false by default 2009-10-26 13:04:24 +03:00
Dmitry Avdeev 06771093ca Win32fs disabled in tests 2009-10-26 13:02:34 +03:00
nik 0fe3a19093 IDEADEV-40991: Artifact editor: misleading label in Create manifest chooser 2009-10-26 12:40:27 +03:00
Dmitry Avdeev ae74fb7e2b Win32fs re-enabled 2009-10-26 11:36:04 +03:00
anna b1da624f5c junit: do not pull statistics events if no statistics were read 2009-10-26 11:24:36 +03:00