Merge remote-tracking branch 'origin/master' into prendota/plugin-manager-new-protocol
authorIvan Chirkov <Ivan.Chirkov@jetbrains.com>
Fri, 17 Apr 2020 10:40:43 +0000 (12:40 +0200)
committerintellij-monorepo-bot <intellij-monorepo-bot-no-reply@jetbrains.com>
Wed, 22 Apr 2020 07:31:06 +0000 (07:31 +0000)
commit572fcedd26b0d7ba4ed4e1cb565380ae3fc7ee2e
tree09975fb1d5df4ffa276bc3fbcb41fa3f2a181667
parent60e2db2cc3a18d5cf643531b20e81b4c19a173bc
parent165741d47b7d0f637de7adae3824df485ee8edec
Merge remote-tracking branch 'origin/master' into prendota/plugin-manager-new-protocol

# Conflicts:
# community/platform/platform-impl/src/com/intellij/ide/plugins/PluginNode.java
# community/platform/platform-impl/src/com/intellij/ide/plugins/newui/MyPluginModel.java
# community/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.kt

GitOrigin-RevId: 5ee8edd3161b27355cc491fc6cb7e83f2df89f4d
platform/platform-api/resources/messages/IdeBundle.properties
platform/platform-impl/src/com/intellij/ide/plugins/PluginInstaller.java
platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java
platform/platform-impl/src/com/intellij/ide/plugins/PluginNode.java
platform/platform-impl/src/com/intellij/ide/plugins/marketplace/PluginRepositoryObjects.kt
platform/platform-impl/src/com/intellij/ide/plugins/newui/ListPluginComponent.java
platform/platform-impl/src/com/intellij/ide/plugins/newui/MyPluginModel.java
platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginDetailsPageComponent.java
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/PluginDownloader.java
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.kt
platform/platform-tests/testSrc/com/intellij/openapi/updateSettings/UpdatePluginsFromCustomRepositoryTest.java