Commit Graph
138330 Commits
Author SHA1 Message Date
Roman Shevchenko 43a93b3e97 Merge remote-tracking branch 'origin/master' 2014-09-23 17:14:10 +02:00
Kirill Likhodedov 6f76683005 [push] Enable show diff from the repository node 2014-09-23 19:08:18 +04:00
Alexey Kudravtsev e9c1a15ee7 stress tests crash with PCE 2014-09-23 19:01:27 +04:00
Vladimir Krivosheev 3c124f27c3 don't use super result as own result — don't rely on implementation 2014-09-23 16:57:31 +02:00
Vladimir Krivosheev 2a61c2ca6e cleanup 2014-09-23 16:57:30 +02:00
Dmitry Batrak 924382b376 IDEA-74010 outliner-like code folding improvements 2014-09-23 18:56:15 +04:00
Dmitry Batrak 2973758520 expand/collapse block recursively on Shift-click on gutter icon (IDEA-92889) 2014-09-23 18:56:14 +04:00
Dmitry Batrak dc7010ec08 IDEA-15412 Expand or Collapse all existing foldings in selection 2014-09-23 18:56:13 +04:00
Vladimir Krivosheev 75e5e72ce2 You don't need anymore to mark PersistentStateComponent as ExporableComponent. If it is application wide and roamable — so, it is exportable.
init IDEA-127006
2014-09-23 16:49:45 +02:00
Vladimir Krivosheev 74c3f1f53b cleanup 2014-09-23 16:49:45 +02:00
Alexey Kudravtsev 87fb336de1 reverted 2014-09-23 18:47:39 +04:00
Alexey Kudravtsev 26918f0090 notnull 2014-09-23 18:47:38 +04:00
Kirill Likhodedov 44b4f320f9 [git] cleanup: null is not possible here 2014-09-23 18:19:16 +04:00
Kirill Likhodedov 6fa0a26b98 [git push] don't show remote popup if there is only 1 remote 2014-09-23 18:18:45 +04:00
Konstantin Bulenkov 617935ebee avoid top hit providers duplication in SE 2014-09-23 16:14:03 +02:00
Kirill Likhodedov 7bb9fad515 [push] Place selection to the first repository node which has commits
Unless the selection was changed manually by the user.
2014-09-23 18:12:36 +04:00
Kirill Likhodedov 5a9773fbc6 Fix NPE in GlobalMatchingVisitor 2014-09-23 18:12:35 +04:00
Roman Shevchenko ba2fd6f490 Cleanup (constants) 2014-09-23 16:11:59 +02:00
Roman Shevchenko c0ab0b8c81 IDEA-130255 (decompiler legal notice) 2014-09-23 16:11:58 +02:00
Roman Shevchenko 19105b302a ui: reuse tooltip manager code to limit "got it" balloon width
(required for IDEA-130255)
2014-09-23 16:11:58 +02:00
Roman Shevchenko c95f5f334c platform: notify application bus about opened editors
(required for IDEA-130255)
2014-09-23 16:11:57 +02:00
Vassiliy.Kudryashov 20974959c0 IDEA-127739 Navigation Tab
Stage 6: new API, "Files" and "Documentation" providers have been implemented
2014-09-23 18:10:55 +04:00
Kirill Likhodedov 578dd6cb4b Fix NPE
java.lang.NullPointerException
  HintManagerImpl.getHintPosition(HintManagerImpl.java:455)
  HintManagerImpl.showInformationHint(HintManagerImpl.java:692)
  HintManagerImpl.showInformationHint(HintManagerImpl.java:684)
  HintManagerImpl.showInformationHint(HintManagerImpl.java:679)
  utoCompletion$2$1.run(TextFieldWithAutoCompletion.java:124)
  on.impl.LaterInvocator$FlushQueue.run(LaterInvocator.java:318)
2014-09-23 17:59:03 +04:00
Sergey Malenkov 04bea33a04 GitOptionsTopHitProvider: two options added 2014-09-23 17:49:00 +04:00
Kirill Likhodedov 67a37018df [git push] Changes exotic separator to a simple colon
Looks pretty well, and doesn't cause unicode problems on some systems
2014-09-23 17:45:14 +04:00
Kirill Likhodedov 24e69ea5f8 [push] Change dialog ID. 2014-09-23 17:35:53 +04:00
Konstantin Bulenkov fa6b0be154 top hit provider for registry 2014-09-23 15:35:24 +02:00
Konstantin Bulenkov 264d2e0ec7 Registry based option descriptor 2014-09-23 15:35:23 +02:00
Konstantin Bulenkov 06ec5666d9 check that an OptionTopHitProvider is enabled while searching in goto action 2014-09-23 15:35:22 +02:00
Konstantin Bulenkov c933b9e59e check that an OptionTopHitProvider is enabled while searching in SE 2014-09-23 15:35:21 +02:00
Konstantin Bulenkov 82c7d6904d add isEnabled(Project) to OptionTopHitProvider 2014-09-23 15:35:20 +02:00
nik 86d1f775af Google App Engine: do not check connection to avoid confusing 'connection successful' messages 2014-09-23 17:29:22 +04:00
nik 50a0e492f5 Google App Engine: show in cloud configuration that password is stored 2014-09-23 17:29:21 +04:00
nik a5976d87ae JBPasswordField created (password field which can show a message when empty) 2014-09-23 17:29:21 +04:00
nik 47e5637781 Google App Engine deployment: don't show error if user pressed 'cancel' in 'Master Password' dialog 2014-09-23 17:29:21 +04:00
nik b07b62b32b Google App Engine: 'Upload' action now creates deployment run configuration to simplify migration (IDEA-111971), obsolete deployment code removed 2014-09-23 17:29:21 +04:00
nik c994c9de72 IDEA-119102: Support oauth2 for uploading App Engine app 2014-09-23 17:29:20 +04:00
Max Medvedev 848f8997b5 newMap() method 2014-09-23 17:28:18 +04:00
Sergey Malenkov 7722e30b25 fix for alloy search field 2014-09-23 17:15:58 +04:00
Vladimir Krivosheev ff29583e90 EditorSettings should be PersistentStateComponent 2014-09-23 14:53:30 +02:00
Dmitry Trofimov 0b614c916f Merge remote-tracking branch 'origin/master' 2014-09-23 14:43:49 +02:00
Dmitry Trofimov 1b7b7735dd Fix regex. 2014-09-23 14:42:03 +02:00
Gregory.Shrago 97a768048a make remote-servers-git module optional (depends on java-impl) 2014-09-23 16:38:19 +04:00
Sergey Malenkov e692d5be95 Add TopHitProvider for Subversion 2014-09-23 16:31:56 +04:00
Kirill Likhodedov f4195292e9 [push] Fix long repository names
* Shorten repository names more: use only the folder name (unless
  there would be a conflict of two identical names).
* Make sure there is some padding between repo name and branch.
2014-09-23 16:15:03 +04:00
Kirill Likhodedov c1aa9a85fb [push] don't store commit in a field - take it from the user object 2014-09-23 16:15:02 +04:00
Kirill Likhodedov 0d9145383f [push] rename class to a simpler name 2014-09-23 16:15:02 +04:00
Kirill Likhodedov 45ee5e5aa6 [push] make commit node smaller 2014-09-23 16:15:01 +04:00
Kirill Likhodedov 7c710b51bd [push] Remove LoadingTreeNode as not used, move everything related to LoadingIconProvider 2014-09-23 16:15:01 +04:00
Kirill Likhodedov 937b3b63f7 [push] Improve UX of initially selected repositories to push
Rules:
1. While commits are initially loaded, checkboxes are not shown
   (the "loading" indicator is shown instead),
   and such roots are not ready to be pushed.
2. After outgoing commits from a repository has loaded,
   the checkbox appears back, and it selection is defined by following:
   A. If roots are synced, checkbox is selected iff there are commits
      OR something else to push (e.g. new branch is created).
   B. Otherwise, checkbox is selected iff (there are commits OR
      something else to push) AND this root was preselected from the
      context.
3. Diverged roots behave the same way as not-synced.
4. The Push button is always enabled for 1-repo setup.
   In multi-repo-sync setup, it is disabled until all repositories
   are initialized.
   In multi-repo-async setup, it is disabled until at least one
   repository with commits is loaded.
5.

Additional changes:
* Disable checkbox if target is null.
* Remove "There are no selected repositories to push" validation
  error message since it is obvious.
2014-09-23 16:15:00 +04:00