Commit Graph
51054 Commits
Author SHA1 Message Date
anna 35cac19e2a wrap with expression: extended to use parseXXX; varargs support (IDEA-56469) 2010-07-15 10:44:06 +04:00
nik 7430407ba7 jps updated: less warnings 2010-07-15 10:38:51 +04:00
peter 0559e6d55c really fix ResolveMethodTest 2010-07-14 21:58:36 +01:00
peter 959d996022 fix groovy community tests 2010-07-14 21:37:51 +01:00
peter 6c33188ef5 fix g++ test: allow partial argument->parameter mapping 2010-07-14 21:37:49 +01:00
Konstantin Bulenkov 1adeb1a455 rollback, commited by mistake 2010-07-15 00:20:11 +04:00
Konstantin Bulenkov 7c662d21c7 old UML (for Java) no more available 2010-07-15 00:17:10 +04:00
Gregory Shrago 4eca108af8 minor fix 2010-07-14 23:10:10 +04:00
peter ab4a7f1510 gdsl OOME diagnostics, disaster prevention 2010-07-14 18:43:35 +01:00
Maxim.Mossienko 191443716b avoid getting duplicated spell checker messages due to presence of variable references inside php literals and injected html inside other elements 2010-07-14 20:17:28 +04:00
Eugene Zhuravlev 7b9bac08da explicitly disable running of auto-discovered annotation processors (IDEA-55836) 2010-07-14 19:49:41 +04:00
Kirill Kalishev 44b7c8de6e Merge branch 'master' of git@git.labs.intellij.net:idea/community 2010-07-14 19:07:28 +04:00
Kirill Kalishev 1f84a0247f dumbaware check refactoring + ActionGroup is dumb aware if doesnt implement update method 2010-07-14 18:51:02 +04:00
Anton Makeev 73b6c29f37 CIDR: iphone simulator bug fix + tests tuned 2010-07-14 17:59:27 +04:00
Anton Makeev de32eaaeb6 Maven: PCE fix (IDEA-56420) 2010-07-14 17:59:25 +04:00
Anton Makeev edb7f18429 expandable items tuned 2010-07-14 17:59:23 +04:00
irengrig ca43b47f2f Merge branch 'master' of git.labs.intellij.net:idea/community 2010-07-14 16:44:31 +04:00
irengrig fcac3d97f7 VCS: public for getUnversionedFiles() 2010-07-14 16:26:30 +04:00
irengrig d9a3ede341 SVN: one-click merge: + import 2010-07-14 16:24:15 +04:00
Alexey Pegov 29da4a459c IDEA-56355 Java Color Preview: SHIFT+hovering shows incorrect color 2010-07-14 16:19:43 +04:00
irengrig 4738a0a405 SVN: one-click merge. NPE - IDEA-56437; warn about JNA/Crypt32 initialization problems
(cherry picked from commit eb195c4f998905c2a1eda5a04654f3294701ea9d)
2010-07-14 16:19:13 +04:00
irengrig 42404f3339 SVN: prompt if any of "config" or "servers" files properties prevent authentication credentials from being stored
(cherry picked from commit f458405c00f76bda6659f077a55c46bd69baa562)
2010-07-14 16:18:52 +04:00
irengrig e04b0ff189 WI-2502 Spelling/typo "Not Logged To Subversion" -> "Not logged in to Subversion"
(cherry picked from commit dac1d6874da35499df265a07f7fb0b91915dfdc3)
2010-07-14 16:18:45 +04:00
irengrig 4003142038 IDEA-56282 Subversion: Merge from: some modified files from merged revision appear in non-active changelist
(cherry picked from commit 8663d299a1ce184c7f8a15503f18ddb6f4e81798)
2010-07-14 16:18:14 +04:00
irengrig bfb7027de5 IDEA-56245 Subversion: Merge From: merge all together a sequence of selected for merge revisions (only for one-click merge)
(cherry picked from commit ee785756a4a9fbac8a8cfb4a8cc2b9a181d4650d)
2010-07-14 16:17:55 +04:00
irengrig bd47b73acc IDEA-56220 Shelve: don't try to remove active changelist on shelving changes
(cherry picked from commit 077d48fc5195f329f94c674fec22847bced6f230)
2010-07-14 16:17:38 +04:00
irengrig 14b675c324 Git: no sence in getting component under read action
(cherry picked from commit 13f18862574b393492bd68c3872ac9f0ef8f8a37)
2010-07-14 16:17:04 +04:00
irengrig 20ca7667b2 SVN: one-click merge: "Merge from" to be shown only when SVN is active
(cherry picked from commit ce75d751f1fe4b4b5838e7e61f2f63086464c317)
2010-07-14 16:13:46 +04:00
irengrig d58f11e6f9 IDEA-55933 Latest EAP extremely slow to load (2 mins versus 15 sec)
(cherry picked from commit 2c1d43f9baa44b41da6aa5a01134d99516f8e197)
2010-07-14 16:12:51 +04:00
irengrig 5288b9fdb1 WI-2313 Exception raised during project loading and project loading never stops and can't be canceled
(cherry picked from commit e3c8c6dbaadffd57db804dde791905a4a93fa8b0)
2010-07-14 16:12:00 +04:00
irengrig aa86e7079a SVN: merge from action
(cherry picked from commit 6f4593f3008e95621677c0f01b0a44b050e9bdbb)
2010-07-14 16:11:36 +04:00
irengrig 8bfb9150de SVN: remove show working copies action, it is shown in local changes
(cherry picked from commit 1a9104a4198e9cd9df394a9d75d8ef6ddb6fee72)
2010-07-14 16:11:15 +04:00
irengrig b19ffbbf96 IDEA-55339 SVN: java.io.IOException: The requested operation cannot be performed on a file with a user-mapped section open
(cherry picked from commit 8a0eb8e7ffde34ddf63e61aa63d17e7bc2c9f932)
2010-07-14 16:09:29 +04:00
irengrig 8983c381a7 SVN: one-click merge: check repository capabilities - whether it supports merge info
(cherry picked from commit c289206b5cce2c2b12bbdfb5c27fb12dfb804609)
2010-07-14 16:08:42 +04:00
irengrig ba4d5bceba SVN: one-click merge: show working copies -> to changes tool window tab
(cherry picked from commit 835743433991efc6330617fd3c0907e61a355744)
2010-07-14 16:06:53 +04:00
irengrig 3d7021c9d8 SVN: one-click merge: inspect local changes when there's a conflict
(cherry picked from commit 23440e4d9a365e654ac7b3cdf16a81d073c732be)
2010-07-14 16:05:55 +04:00
irengrig 12686aaf95 SVN: one-click merge: speed search for table
(cherry picked from commit bf997a7bfa8a306d6bd2ecb91f21db7f1b8fe72d)
2010-07-14 16:05:29 +04:00
irengrig 89153d97dc SVN: one-click merge: create new changelist for merge changes
(cherry picked from commit 541567b22111a2fe53af250311fd95e2283aa933)
2010-07-14 16:05:07 +04:00
irengrig c08d7965d0 VCS: do no suggest to delete default changelist
(cherry picked from commit d86e4f830bd2d369c3ff4a5c146d65bc23411b24)
2010-07-14 16:04:31 +04:00
irengrig 3ecc391490 SVN: one-click merge: remove pages concept
(cherry picked from commit ca2fe75505216750f3dad0bf0ba7271f80cb3f15)
2010-07-14 15:59:25 +04:00
irengrig bd123b0e22 SVN: one-click merge: local changes prompt - able to shelve local changes. New continuation used
(cherry picked from commit 1d559d9c4584aa62fa6f4703305c9aae8dfe65b6)
2010-07-14 15:59:04 +04:00
irengrig b897b51708 continuation
(cherry picked from commit 36dd886f35c6d39ae4a6134e5ecc23bd369950fb)
2010-07-14 15:58:35 +04:00
irengrig 20c6b09029 SVN: one-click merge: check for switched copies
(cherry picked from commit aaf8e546f1deb62c39f7fddaaa6a412f150e236a)
2010-07-14 15:58:09 +04:00
Maxim.Mossienko 167619671e WI-2551 HTML5 completion does not work when PhpStorm / WebStorm installation path contains spaces 2010-07-14 15:53:29 +04:00
nik cc6dbc23f1 fast compilation for community tests 2010-07-14 15:48:51 +04:00
nik b0217ab387 faster compilation enabled again (problems with jdk1.6.0_02 fixed) 2010-07-14 15:46:20 +04:00
irengrig 64da99feb9 VCS: + concurrent tasks test - if all tasks didn't return a result
(cherry picked from commit d7eb74a979394b9a1cd35a69ea1fd2693efeaf87)
2010-07-14 15:45:19 +04:00
irengrig 8bbd8158d4 SVN: one-click merge/integrate to branch: correctly process merge cancellation (if stopped in the middle, do not take next changelist)
(cherry picked from commit 835ed1c8c9b3d8620ff04c3979c44c9b8c428cf3)
2010-07-14 15:43:48 +04:00
irengrig 2b8c44d1b6 SVN: one-click merge/integrate to branch: correctly process merge cancellation (if stopped in the middle, do not take next changelist)
(cherry picked from commit 835ed1c8c9b3d8620ff04c3979c44c9b8c428cf3)
2010-07-14 15:43:08 +04:00
irengrig 6cc3ef9d46 SVN: one-click merge: concurrent tasks fix
(cherry picked from commit dc8f5fdb7be1d4e8f8c98951594885354f4269cc)
2010-07-14 15:42:59 +04:00