Commits · 361d1c2f64c8cdcc85158110c8a265eaa59ebe3a · 小白蛋 / Intellij Community

This project is mirrored from https://gitee.com/mirrors/intellij-community.git. Pull mirroring failed 10 months ago.
Repository mirroring has been paused due to too many failed attempts. It can be resumed by a project maintainer.
Last successful update 10 months ago.

07 Dec, 2012 1 commit
- don't show "Perpetual license" in license entry dialog, show validity version instead · 361d1c2f
  Dmitry Jemerov authored 12 years ago
  
  361d1c2f
30 Nov, 2012 3 commits

fix annotation processing for Javac inprocess compiler (IDEA-70020) · b33fb79d
Eugene Zhuravlev authored 12 years ago

b33fb79d

Merge remote branch 'origin/117' into 117 · ef79bc3e

irengrig authored 12 years ago

Conflicts:
	platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java

ef79bc3e

(primitive fix) Assertion failed: You must provide parent Disposable for · 492cb6a2

irengrig authored 12 years ago

ThreadToUse.OWN_THREAD Alarm
java.lang.Throwable
	at com.intellij.openapi.diagnostic.Logger.assertTrue(Logger.java:98)
	at com.intellij.util.Alarm.<init>(Alarm.java:88)
	at com.intellij.openapi.vcs.history.FileHistoryPanelImpl.<init>(FileHistoryPanelImpl.java:361)

492cb6a2

28 Nov, 2012 2 commits
- IDEA-94177 do not store encoding for temp artifact, remove old temp artifact [rev=maxim.medvedev] · a9890676
  Eugene Kudelevsky authored 12 years ago
  
  a9890676
- IDEA-95389 fix cosmetics, screen height validation [rev=maxim.medvedev] · 783cc802
  Eugene Kudelevsky authored 12 years ago
  
  783cc802
27 Nov, 2012 13 commits
- fix compilation after merge · f8bd9b3a
  Dmitry Jemerov authored 12 years ago
  
  f8bd9b3a
- cherry-pick fixed · 5c80f03c
  Dmitry Jemerov authored 12 years ago
  
  5c80f03c
- [diff] Remove assertion · 6a4a8a4a
  Kirill Likhodedov authored 12 years ago
```
Not sure why has it been added here, but it throws NPE after changing != to !equals().

Conflicts:

	platform/util/src/com/intellij/openapi/diff/impl/highlighting/FragmentSide.java
```
  6a4a8a4a
- possible NPE · 1b41f3f4
  Dmitry Jemerov authored 12 years ago
  
  1b41f3f4
- NPE in DefaulLogFilterModel [r=vasya] · a4cda9f6
  irengrig authored 12 years ago
  
  a4cda9f6
- close streams where appropriate · e8a94940
  Dmitry Jemerov authored 12 years ago
  
  e8a94940
- replacing == and != for strings where appropriate · fd1d518e
  Dmitry Jemerov authored 12 years ago
```
Conflicts:

	java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddDefaultConstructorFix.java
	java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java
```
  fd1d518e
- replacing == and != for strings with equals() where appropriate · 06f20e83
  Dmitry Jemerov authored 12 years ago
```
Conflicts:

	platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InfoAndProgressPanel.java
```
  06f20e83
- replacing == and != for strings with equals() where appropriate · 56b352f4
  Dmitry Jemerov authored 12 years ago
  
  56b352f4
- fix correct but unnecessarily confusing code · d9d2ab4c
  Dmitry Jemerov authored 12 years ago
  
  d9d2ab4c
- removing unnecessary 'public static void main' out of production code · 3a41d609
  Dmitry Jemerov authored 12 years ago
  
  3a41d609
- removing unnecessary 'public static void main' out of production code · c3a58783
  Dmitry Jemerov authored 12 years ago
  
  c3a58783
- removing test code out of production code · 9cc7a6a0
  Dmitry Jemerov authored 12 years ago
```
Conflicts:

	platform/platform-api/src/com/intellij/openapi/ui/LoadingDecorator.java
	platform/platform-impl/src/com/intellij/ui/BalloonImpl.java
```
  9cc7a6a0
25 Nov, 2012 1 commit
- fix compilation · 638eb21f
  Eugene Kudelevsky authored 12 years ago
  
  638eb21f
24 Nov, 2012 1 commit
- fix compile · b1e93545
  Maxim.Mossienko authored 12 years ago
  
  b1e93545
21 Nov, 2012 4 commits
- Fix failing Alarm assertion when showing the history of a file · d39cf77e
  Bas Leijdekkers authored 12 years ago
  
  d39cf77e
- IDEA-95242 IDEA-93047 support android sdk tools r21 · 3c95e492
  Eugene Kudelevsky authored 12 years ago
  
  3c95e492
- IDEA-92746 IDEA-94901 fix problems with BuildConfig.java duplicates · 1b5e26ff
  Eugene Kudelevsky authored 12 years ago
  
  1b5e26ff
- IDEA-88587 'Annotate' action from popup menu in File History table is always disabled for Git · 45f375a2
  Bas Leijdekkers authored 12 years ago
```
Fix default value for HistorySession#hasLocalSource: the source is local for most cases (except some cases in SVN).
(cherry-picked from 79b1f0f2)
```
  45f375a2
19 Nov, 2012 1 commit
- Indexing issue in IDEA 12 Preview (IDEA-94902) [r=Eugene.Juravlev] · d5899b62
  Maxim.Mossienko authored 12 years ago
  
  d5899b62
13 Nov, 2012 1 commit
- 11.1.5 EAP · 0d93428d
  Maxim.Mossienko authored 12 years ago
  
  0d93428d
12 Nov, 2012 2 commits

IDEA-94665 Subversion: with command line acceleration, status sometimes fails... · bce8972e

irengrig authored 12 years ago

IDEA-94665 Subversion: with command line acceleration, status sometimes fails if full path is reported
+ status and info parse tests
(cherry-picked from 459ff2dd) [review=denis.zhdanov]

bce8972e

IDEA-94664 Subversion: local changes inside external directory is not shown if... · f3fd5b6d

irengrig authored 12 years ago

IDEA-94664 Subversion: local changes inside external directory is not shown if command line acceleration is used
(cherry-picked from c58640eb) [review=denis.zhdanov]

f3fd5b6d

09 Nov, 2012 4 commits
- Merge remote branch 'origin/117' into 117 · eeb8feb4
  irengrig authored 12 years ago
  
  eeb8feb4
- IDEA-93910 CRITICAL: hanging background tasks blocks many functionalities · ff7b0366
  irengrig authored 12 years ago
```
shared thread is not used any more for vcs actions
```
  ff7b0366
- svnkit 1.7.7. build 9495 with "checksum mismatch" fix. Fixes concurrent... · 75d06499
  irengrig authored 12 years ago
```
svnkit 1.7.7. build 9495 with "checksum mismatch" fix. Fixes concurrent aspects that leaded to wrong checksum computation
(cherry-picked from 85a7fd93)
```
  75d06499
- svnkit 1.7.7. build 9491. With sqljet 1.1.5. · 3c4b0991
  irengrig authored 12 years ago
```
supposed to fix IDEA-85496 Getting svn: E200030: Commit failed (details follow): svn: E200030: BUSY
(Whether it is fixes requires "production" verification)
(cherry picked from commit d2fc83f2)
```
  3c4b0991
07 Nov, 2012 2 commits
- IDEA-90945 Display balloon notifications - option does not persist after restart · 50da56c4
  peter authored 12 years ago
  
  50da56c4
- IDEA-94314 Groovy: semicolon instead of body in control statement · 9647c360
  Max Medvedev authored 12 years ago
  
  9647c360
05 Nov, 2012 1 commit
- ignore deleted files on export inspection results (IDEA-92759)(cherry picked from commit bb3c1c7e ) · 24d6e4cc
  anna authored 12 years ago
  
  24d6e4cc
28 Oct, 2012 1 commit
- IDEA-92684 In an internal method of an enum constant IDEA doesn't recognize that constant itself · 7f462cd2
  Max Medvedev authored 12 years ago
```
(cherry picked from commit 1aab06ad)
```
  7f462cd2
26 Oct, 2012 2 commits
- Merge remote branch 'origin/117' into 117 · 59ae5f5a
  irengrig authored 12 years ago
  
  59ae5f5a
- IDEA-86863 Subversion: "file is changed on server" marker is shown for all... · b045b9f9
  irengrig authored 12 years ago
```
IDEA-86863 Subversion: "file is changed on server" marker is shown for all locally changed files in 1.6 working copy
(cherry-picked from d99d5a99) review=kirill.l
```
  b045b9f9
23 Oct, 2012 1 commit
- IDEA-90515 Editor tab dragged by dragging Configuration Menu pop-out items · 422c9518
  Vassiliy Kudryashov authored 12 years ago
  
  422c9518