irengrig [Tue, 30 Oct 2012 17:34:41 +0000 (21:34 +0400)]
Merge remote branch 'origin/master'
irengrig [Tue, 30 Oct 2012 17:33:07 +0000 (21:33 +0400)]
IDEA-93931 Git log: filter commits by date
Sergey Evdokimov [Tue, 30 Oct 2012 17:22:23 +0000 (21:22 +0400)]
IDEA-93358 Annotate Grails completion results with origin info
Alexander Doroshko [Tue, 30 Oct 2012 16:47:40 +0000 (20:47 +0400)]
moved to util module
anna [Tue, 30 Oct 2012 16:44:05 +0000 (17:44 +0100)]
suggestion to remove parameter list from annotation method
anna [Tue, 30 Oct 2012 16:34:24 +0000 (17:34 +0100)]
show suggestion to place caret to another place when change signature is invoked on the inappropriate member; disable for annotation type methods/types
anna [Tue, 30 Oct 2012 15:53:36 +0000 (16:53 +0100)]
EA-40432 - AIOOBE: PrintManager.executePrint
anna [Tue, 30 Oct 2012 15:48:13 +0000 (16:48 +0100)]
EA-40443 - NPE: ImplementMethodsFix.chooseMethodsToImplement
anna [Tue, 30 Oct 2012 15:16:12 +0000 (16:16 +0100)]
new testng icon
Eugene Zhuravlev [Tue, 30 Oct 2012 16:37:51 +0000 (17:37 +0100)]
merge
Eugene Zhuravlev [Tue, 30 Oct 2012 16:27:01 +0000 (17:27 +0100)]
external make: a runner for maven resource builder allowing to copy resources before module compilation starts (needed for android source generator)
Roman Shevchenko [Tue, 30 Oct 2012 16:02:44 +0000 (17:02 +0100)]
Schedule deprecated methods EOL
Roman Shevchenko [Tue, 30 Oct 2012 16:01:18 +0000 (17:01 +0100)]
Fix test data
Roman Shevchenko [Tue, 30 Oct 2012 16:00:32 +0000 (17:00 +0100)]
Fix precise type calculation for try-with-resources
Dmitry Avdeev [Tue, 30 Oct 2012 15:39:46 +0000 (19:39 +0400)]
hiding SDK selector if compatible SDK configured for project
Dmitry Avdeev [Tue, 30 Oct 2012 14:30:57 +0000 (18:30 +0400)]
showing settings in AddModule mode
Dmitry Avdeev [Tue, 30 Oct 2012 14:05:20 +0000 (18:05 +0400)]
hiding expert settings for group
Dmitry Avdeev [Tue, 30 Oct 2012 14:02:35 +0000 (18:02 +0400)]
skipping .idea folder
Dmitry Avdeev [Tue, 30 Oct 2012 12:44:03 +0000 (16:44 +0400)]
remove empty project from templates list
Dmitry Avdeev [Tue, 30 Oct 2012 12:39:55 +0000 (16:39 +0400)]
remove empty project from templates list
Dmitry Avdeev [Tue, 30 Oct 2012 12:38:21 +0000 (16:38 +0400)]
enabling templates for adding modules
nik [Tue, 30 Oct 2012 15:44:01 +0000 (19:44 +0400)]
external compiler: added support for appengine enhancer
Roman Shevchenko [Tue, 30 Oct 2012 12:00:00 +0000 (13:00 +0100)]
Fix test data
Alexey Kudravtsev [Tue, 30 Oct 2012 15:10:29 +0000 (19:10 +0400)]
cleanup
Alexey Kudravtsev [Tue, 30 Oct 2012 15:09:02 +0000 (19:09 +0400)]
EA-39630
Alexey Kudravtsev [Tue, 30 Oct 2012 14:49:52 +0000 (18:49 +0400)]
EA-40133
Alexey Kudravtsev [Tue, 30 Oct 2012 14:44:18 +0000 (18:44 +0400)]
EA-40417
Alexey Kudravtsev [Tue, 30 Oct 2012 14:38:02 +0000 (18:38 +0400)]
IOOB
Serega Vasiliev [Tue, 30 Oct 2012 14:51:41 +0000 (15:51 +0100)]
drools: reference searchers
Alexey Kudravtsev [Tue, 30 Oct 2012 14:02:29 +0000 (18:02 +0400)]
enable dataflow from here
Sergey Evdokimov [Tue, 30 Oct 2012 14:18:09 +0000 (18:18 +0400)]
Remove incorrect assertion
Maxim.Mossienko [Tue, 30 Oct 2012 14:09:46 +0000 (15:09 +0100)]
flush remaining indexing stamps once we finished indexed files updating
anna [Tue, 30 Oct 2012 14:08:51 +0000 (15:08 +0100)]
group by test production icon
nik [Tue, 30 Oct 2012 14:01:46 +0000 (18:01 +0400)]
jps model: extracted methods to check whether dependencies should be processed recursively
Vladimir Krivosheev [Tue, 30 Oct 2012 13:41:03 +0000 (17:41 +0400)]
please use project sdk instead of custom
Konstantin Bulenkov [Tue, 30 Oct 2012 13:33:40 +0000 (14:33 +0100)]
Merge remote-tracking branch 'origin/master'
Konstantin Bulenkov [Tue, 30 Oct 2012 13:32:02 +0000 (14:32 +0100)]
tooltips bg
Konstantin Bulenkov [Tue, 30 Oct 2012 13:31:40 +0000 (14:31 +0100)]
make option tree better
Sergey Evdokimov [Tue, 30 Oct 2012 13:29:35 +0000 (17:29 +0400)]
Bug fix: maven-jps-plugin.jar must be in IDEA classpath.
Konstantin Bulenkov [Tue, 30 Oct 2012 13:29:03 +0000 (14:29 +0100)]
make option tree better
anna [Tue, 30 Oct 2012 13:20:36 +0000 (14:20 +0100)]
eclipse: external make: detect idea home by path macro
(IDEA-93425)
Sergey Evdokimov [Tue, 30 Oct 2012 13:12:06 +0000 (17:12 +0400)]
IDEA-80953 Run Grails injection compilation unit patchers when compile server mode is enabled
IDEA-92751 Grails project should be compilable by external make
Vassiliy Kudryashov [Tue, 30 Oct 2012 13:08:57 +0000 (17:08 +0400)]
Merge remote-tracking branch 'origin/master'
Vassiliy Kudryashov [Tue, 30 Oct 2012 13:06:31 +0000 (17:06 +0400)]
IDEA-52046 run/debug menu folder structure
Sergey Evdokimov [Tue, 30 Oct 2012 12:41:43 +0000 (16:41 +0400)]
Fix broken Maven test.
Konstantin Bulenkov [Tue, 30 Oct 2012 12:32:21 +0000 (13:32 +0100)]
Merge remote-tracking branch 'origin/master'
Konstantin Bulenkov [Tue, 30 Oct 2012 12:30:36 +0000 (13:30 +0100)]
Darcula: notification balloons
Alexey Kudravtsev [Tue, 30 Oct 2012 12:17:24 +0000 (16:17 +0400)]
cleanup
Alexey Kudravtsev [Tue, 30 Oct 2012 12:17:08 +0000 (16:17 +0400)]
usage view with dataflow
Alexey Kudravtsev [Tue, 30 Oct 2012 11:42:42 +0000 (15:42 +0400)]
hide annoying errors
sweinreuter [Tue, 30 Oct 2012 12:01:02 +0000 (13:01 +0100)]
Merge commit 'origin/master'
anna [Tue, 30 Oct 2012 11:52:34 +0000 (12:52 +0100)]
load from .classpath for external compiler (initial)
Alexey Kudravtsev [Tue, 30 Oct 2012 11:19:03 +0000 (15:19 +0400)]
removed notnull
sweinreuter [Tue, 30 Oct 2012 11:18:30 +0000 (12:18 +0100)]
RNG <interleave> tags not fully recognized
Alexey Kudravtsev [Tue, 30 Oct 2012 09:32:35 +0000 (13:32 +0400)]
structure view dispose
Alexey Kudravtsev [Tue, 30 Oct 2012 09:30:22 +0000 (13:30 +0400)]
IllegalMonitorException
Alexey Kudravtsev [Tue, 30 Oct 2012 09:28:05 +0000 (13:28 +0400)]
retarget range highlighters during text move
Alexey Kudravtsev [Mon, 29 Oct 2012 14:49:38 +0000 (18:49 +0400)]
cleanup
Alexey Kudravtsev [Mon, 29 Oct 2012 12:32:11 +0000 (16:32 +0400)]
cleanup
Alexey Kudravtsev [Mon, 29 Oct 2012 11:37:07 +0000 (15:37 +0400)]
cleanup, notnull
Alexey Kudravtsev [Mon, 29 Oct 2012 11:35:16 +0000 (15:35 +0400)]
annotations, listener leak
Dmitry Avdeev [Tue, 30 Oct 2012 10:55:17 +0000 (14:55 +0400)]
dumping templates tree on fail
Roman Shevchenko [Tue, 30 Oct 2012 10:57:12 +0000 (11:57 +0100)]
Fix precise type calculation for degenerate case
Roman Shevchenko [Tue, 30 Oct 2012 09:31:49 +0000 (10:31 +0100)]
Better name for the test
Konstantin Bulenkov [Tue, 30 Oct 2012 10:54:41 +0000 (11:54 +0100)]
Merge remote-tracking branch 'origin/master'
Konstantin Bulenkov [Tue, 30 Oct 2012 10:51:20 +0000 (11:51 +0100)]
Darcula: debugger tabs
Shaverdova Elena [Tue, 30 Oct 2012 10:44:47 +0000 (14:44 +0400)]
Compilation fix
nik [Tue, 30 Oct 2012 10:40:29 +0000 (14:40 +0400)]
jps model: added extensions to store base directories for module and project
Alexey Gopachenko [Tue, 30 Oct 2012 10:29:21 +0000 (11:29 +0100)]
@nullable to avoid warnings
Conflicts:
platform/util/src/com/intellij/openapi/util/text/StringUtil.java
Eugene Kudelevsky [Tue, 30 Oct 2012 10:19:39 +0000 (14:19 +0400)]
android-jps: read dex compiler settings
Eugene Kudelevsky [Mon, 29 Oct 2012 17:08:14 +0000 (21:08 +0400)]
remove verbose logging for preview versions
sweinreuter [Tue, 30 Oct 2012 10:12:19 +0000 (11:12 +0100)]
Merge commit 'origin/master'
sweinreuter [Tue, 30 Oct 2012 10:08:50 +0000 (11:08 +0100)]
nullable
sweinreuter [Tue, 30 Oct 2012 10:05:34 +0000 (11:05 +0100)]
IDEA-91157: DOM (hence PSI) leaks through org.intellij.plugins.relaxNG.model.resolve.DefinitionResolver#myDefines
Dmitry Avdeev [Tue, 30 Oct 2012 09:57:44 +0000 (13:57 +0400)]
sdks filtering
Kirill Likhodedov [Tue, 30 Oct 2012 09:56:45 +0000 (13:56 +0400)]
IDEA-93806 Fix GitRepositoryReader for rebasing from detached head + test
Kirill Likhodedov [Tue, 30 Oct 2012 09:29:49 +0000 (13:29 +0400)]
[git] Tests: GitScenarios: extract conflict() to produce a conflict with branch
Denis.Zhdanov [Tue, 30 Oct 2012 09:28:43 +0000 (13:28 +0400)]
IDEA-93879 Clear Read-Only status dialog should appear on attempt to edit the readonly file
Konstantin Bulenkov [Tue, 30 Oct 2012 09:24:43 +0000 (10:24 +0100)]
Merge remote-tracking branch 'origin/master'
nik [Tue, 30 Oct 2012 09:23:23 +0000 (13:23 +0400)]
jps model: load project name
Konstantin Bulenkov [Tue, 30 Oct 2012 09:23:25 +0000 (10:23 +0100)]
IDEA-93573 Darcula - event notifications black number
Roman Shevchenko [Tue, 30 Oct 2012 09:16:46 +0000 (10:16 +0100)]
Do not grow continuous log endlessly (by default)
Dmitry Avdeev [Tue, 30 Oct 2012 08:54:25 +0000 (12:54 +0400)]
sdks filtering
Dmitry Avdeev [Tue, 30 Oct 2012 08:51:06 +0000 (12:51 +0400)]
sdks filtering
Konstantin Bulenkov [Tue, 30 Oct 2012 08:51:42 +0000 (09:51 +0100)]
Merge remote-tracking branch 'origin/master'
Konstantin Bulenkov [Tue, 30 Oct 2012 08:50:11 +0000 (09:50 +0100)]
icons
nik [Tue, 30 Oct 2012 08:41:14 +0000 (12:41 +0400)]
external compiler: several fixes in artifact builder (IDEA-93026, IDEA-81955, IDEA-88716)
nik [Mon, 29 Oct 2012 14:57:20 +0000 (18:57 +0400)]
IDEA-92270: Clean action does not make IDEA to re-compile artifact
Denis.Zhdanov [Tue, 30 Oct 2012 07:43:59 +0000 (11:43 +0400)]
IDEA-19061 Integrate the Rearranger-plugin into core-IDE
Highlight active row's 'edit' icon
Kirill Likhodedov [Mon, 29 Oct 2012 17:04:34 +0000 (21:04 +0400)]
IDEA-93848 Fix & refactor Github Open in Browser for multi-root projects.
* Don't do "project.getBaseDir();", use the root of currently selected file.
* Find the tracked branch using GitRepository API.
* Notify more gracefully.
Kirill Likhodedov [Mon, 29 Oct 2012 16:59:52 +0000 (20:59 +0400)]
GitBranchTrackInfo: remove unused method, don't display merge param in toString() until it is used.
Kirill Likhodedov [Mon, 29 Oct 2012 16:46:43 +0000 (20:46 +0400)]
cleanup
Kirill Likhodedov [Mon, 29 Oct 2012 16:43:19 +0000 (20:43 +0400)]
IDEA-85948 Git: error on commit: can't remove already removed file
Don't update-index on commit --only
Changes are added to the index automatically, when "commit --only" is called.
Dmitry Avdeev [Tue, 30 Oct 2012 06:17:50 +0000 (10:17 +0400)]
test fixed
Dmitry Avdeev [Mon, 29 Oct 2012 14:38:12 +0000 (18:38 +0400)]
Empty project template
Denis.Zhdanov [Tue, 30 Oct 2012 06:14:35 +0000 (10:14 +0400)]
IDEA-19061 Integrate the Rearranger-plugin into core-IDE
Null check
Evgeny Zakrevsky [Mon, 29 Oct 2012 22:47:22 +0000 (02:47 +0400)]
Tasks. Assembla. Basic implementation via Generic Connector.
Evgeny Zakrevsky [Fri, 26 Oct 2012 18:30:28 +0000 (22:30 +0400)]
IDEA-68253 Issue trackers integration. Rename.
Evgeny Zakrevsky [Fri, 26 Oct 2012 17:57:49 +0000 (21:57 +0400)]
IDEA-68253 Issue trackers integration. Template variables for queries.
Evgeny Zakrevsky [Fri, 26 Oct 2012 15:16:53 +0000 (19:16 +0400)]
Tasks. Generic Connector. JSON support.