summaryrefslogtreecommitdiff
path: root/android/ultimate
AgeCommit message (Collapse)Author
2014-11-03Merge remote-tracking branch 'aosp/upstream-master' into merge-upstreamTor Norbye
Conflicts: adt-branding/src/idea/AndroidStudioApplicationInfo.xml android/android.iml android/src/META-INF/plugin.xml android/src/com/android/tools/idea/ddms/screenshot/DeviceArtPainter.java android/src/com/android/tools/idea/run/InstalledApks.java android/src/com/android/tools/idea/startup/AndroidStudioSpecificInitializer.java android/src/com/android/tools/idea/wizard/ImportWizardModuleBuilder.java android/src/org/jetbrains/android/AndroidPlugin.java android/src/org/jetbrains/android/actions/RunAndroidAvdManagerAction.java android/src/org/jetbrains/android/facet/AndroidRootUtil.java android/src/org/jetbrains/android/run/AndroidRunningState.java android/ultimate/src/org/jetbrains/android/database/AndroidDataSource.java android/ultimate/src/org/jetbrains/android/database/AndroidDataSourcePropertiesDialog.java Change-Id: I3534d3797cc6081a9312e054fccb830b87b35bd5
2014-10-02clean upEugene Kudelevsky
2014-10-02Merge branch 'studio-1.0-release' of ↵Eugene Kudelevsky
https://android.googlesource.com/platform/tools/adt/idea into android-tmp Conflicts: adt-branding/src/idea/AndroidStudioApplicationInfo.xml android-gradle-jps/src/com/android/tools/idea/jps/builder/AndroidGradleTargetBuilder.java android/android.iml android/common/testSrc/com/android/tools/idea/gradle/output/parser/BuildOutputParserTest.java android/src/META-INF/plugin.xml android/src/com/android/tools/idea/configurations/ConfigurationAction.java android/src/com/android/tools/idea/ddms/screenshot/DeviceArtPainter.java android/src/com/android/tools/idea/gradle/invoker/GradleOutputForwarder.java android/src/com/android/tools/idea/gradle/invoker/GradleTasksExecutor.java android/src/com/android/tools/idea/gradle/projectView/AndroidTreeStructureProvider.java android/src/com/android/tools/idea/startup/AndroidStudioSpecificInitializer.java android/src/com/android/tools/idea/wizard/ImportWizardModuleBuilder.java android/src/org/jetbrains/android/AndroidPlugin.java android/src/org/jetbrains/android/exportSignedPackage/GradleSignStep.java android/src/org/jetbrains/android/facet/AndroidRootUtil.java android/src/org/jetbrains/android/facet/IdeaSourceProvider.java android/src/org/jetbrains/android/maven/AndroidFacetImporterBase.java android/src/org/jetbrains/android/run/AndroidDebugRunner.java android/testSrc/com/android/tools/idea/gradle/stubs/gradle/GradleProjectStub.java android/ultimate/src/org/jetbrains/android/database/AndroidDataSource.java android/ultimate/src/org/jetbrains/android/database/AndroidDataSourcePropertiesDialog.java
2014-07-25Merge remote-tracking branch 'aosp/upstream-master' into merge-upstreamTor Norbye
2014-07-18cleanupGregory.Shrago
2014-07-21resolve merge conflicts of c4cd6b8 to master.Tor Norbye
Change-Id: I70618406a84d8482bf55f243600298e8761153ad
2014-07-11fix IAEEugene Kudelevsky
2014-07-09NotNull assertion fixGregory.Shrago
2014-07-09more on IDEA-126591 Android Support NPE (IDEA-CR-336)Gregory.Shrago
2014-07-09IDEA-126591 Android Support NPE (IDEA-CR-336)Gregory.Shrago
2014-07-09IDEA-126591 Android Support NPEGregory.Shrago
2014-07-09NotNull assertion fixGregory.Shrago
2014-07-09more on IDEA-126591 Android Support NPE (IDEA-CR-336)Gregory.Shrago
2014-07-07IDEA-126591 Android Support NPE (IDEA-CR-336)Gregory.Shrago
2014-07-04move to com.intellij.database packageGregory.Shrago
2014-07-01dbe: resolve api-impl cyclesGregory.Shrago
2014-06-27IDEA-126591 Android Support NPEGregory.Shrago
2014-05-16do not init temporary data-sourcesGregory.Shrago
2014-05-16drop DbProjectElement as it does not really support DbElement contract: ↵Gregory.Shrago
IDEA-125072
2014-05-16drop DbProjectElement as it does not really support DbElement contract: ↵Gregory.Shrago
IDEA-125072
2014-04-10do not init temporary data-sourcesGregory.Shrago
2014-01-24remove old assertionEugene Kudelevsky
2014-01-24Merge branch 'idea133' of ↵Eugene Kudelevsky
https://android.googlesource.com/platform/tools/adt/idea into android-tmp Conflicts: android/src/com/android/tools/idea/editors/navigation/NavigationView.java android/src/com/android/tools/idea/editors/navigation/macros/Analysis.java android/src/com/android/tools/idea/editors/navigation/macros/CodeGenerator.java android/src/com/android/tools/idea/gradle/project/AndroidGradleProjectResolver.java android/src/com/android/tools/idea/gradle/project/GradleProjectImporter.java android/src/com/android/tools/idea/gradle/service/AndroidProjectDataService.java android/src/com/android/tools/idea/gradle/service/notification/SearchInBuildFilesHyperlink.java android/src/com/android/tools/idea/gradle/task/AndroidGradleTaskManager.java android/src/com/android/tools/idea/sdk/DefaultSdks.java android/src/com/android/tools/idea/structure/AndroidHomeConfigurable.java android/src/com/android/tools/idea/wizard/AssetSetStep.java android/src/com/android/tools/idea/wizard/AssetStudioWizardState.java android/src/com/android/tools/idea/wizard/ConfigureAndroidModuleStep.java android/src/com/android/tools/idea/wizard/NewModuleWizardState.java android/src/com/android/tools/idea/wizard/TemplateWizardModuleBuilder.java android/src/org/jetbrains/android/dom/AndroidDomExtender.java android/src/org/jetbrains/android/sdk/AndroidSdkUtils.java android/testSrc/com/android/tools/idea/gradle/project/AndroidGradleProjectResolverTest.java android/testSrc/com/android/tools/idea/gradle/util/ProjectsTest.java android/testSrc/com/android/tools/idea/wizard/NewProjectWizardErrorTest.java
2014-01-22several minor fixes, cleanup and IDEA-117956 Discrepancy forms database ↵Gregory.Shrago
connection
2014-01-20DB settings: track selected tab, cache isModified() & cleanupGregory.Shrago
2013-12-16IDEA-118294 Created (or duplicated) datasource is deleted without ↵Gregory.Shrago
confirmation after pressing ctrl-z in database tool window
2013-12-16IDEA-118294 Created (or duplicated) datasource is deleted without ↵Gregory.Shrago
confirmation after pressing ctrl-z in database tool window
2013-12-16DB ui cleanup & isModified fixesGregory.Shrago
2013-12-13DB ui cleanup & isModified fixesGregory.Shrago
2013-12-04provide the notification about the problem in Android db support on Android ↵Eugene Kudelevsky
4.3 devices [rev=a.lobas] (cherry picked from commit 062c94b)
2013-11-26cosmetic: revert to old UI namesGregory.Shrago
2013-11-26cosmetic: revert to old UI namesGregory.Shrago
2013-11-19review cleanup & unique name generation fixGregory.Shrago
2013-11-19EA-51520 Import of data sources with unresolved drivers fixed. Drivers/data ↵Sergey Rieder
sources management improved.
2013-11-18review cleanup & unique name generation fixGregory.Shrago
2013-11-17provide the notification about the problem in Android db support on Android ↵Eugene Kudelevsky
4.3 devices [rev=a.lobas]
2013-11-13EA-51520 Import of data sources with unresolved drivers fixed. Drivers/data ↵Sergey Rieder
sources management improved.
2013-11-12IDEA-115319 Missing driver notification addedSergey Rieder
2013-10-29cleanupGregory.Shrago
2013-10-29move actions to a dedicated packageGregory.Shrago
2013-10-17fix refreshing all android datasources when project is openedEugene Kudelevsky
2013-10-17IDEA-114723 support browsing and editing Android SQLite database located on ↵Eugene Kudelevsky
external storage
2013-10-17IDEA-114732 fix "permission denied" problem on Genymotion emulatorEugene Kudelevsky
2013-10-17IDEA-114996 replace all non-identifier characters by '_' to avoid errors ↵Eugene Kudelevsky
when creating directory
2013-10-14Driver download popup for AndroidSergey Rieder
2013-10-11"Run query in console": extra popup steps removedGregory.Shrago
2013-10-11Drivers management refactoredSergey Rieder
2013-10-09Datasources creation fixed. Table pattern save fixedSergey Rieder
2013-10-08IDEA-114087 - Drivers auto-download on DS create. ResultPanel NPE fix.Sergey Rieder
2013-10-08move SynchronizeHandler to com.intellij.persistence.databaseEugene Kudelevsky
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 12:12:40 +0000