diff --git a/community-resources/resources/idea/IdeaApplicationInfo.xml b/community-resources/resources/idea/IdeaApplicationInfo.xml index b825ee9ca83a..210c6413770b 100644 --- a/community-resources/resources/idea/IdeaApplicationInfo.xml +++ b/community-resources/resources/idea/IdeaApplicationInfo.xml @@ -1,6 +1,6 @@ - + diff --git a/platform/platform-impl/src/com/intellij/ide/gdpr/ConsentOptions.java b/platform/platform-impl/src/com/intellij/ide/gdpr/ConsentOptions.java index 7304baae7c10..10072f0d291d 100644 --- a/platform/platform-impl/src/com/intellij/ide/gdpr/ConsentOptions.java +++ b/platform/platform-impl/src/com/intellij/ide/gdpr/ConsentOptions.java @@ -161,7 +161,7 @@ public final class ConsentOptions implements ModificationTracker { static final ConsentOptions ourInstance = new ConsentOptions(new IOBackendImpl(getBundledResourcePath(), getConfirmedConsentsFile())); private static String getBundledResourcePath() { - if ("JetBrains".equals(System.getProperty("idea.vendor.name"))) { + if ("OpenIDE".equals(System.getProperty("idea.vendor.name"))) { return "consents.json"; } diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties index 983c6c954e9d..47f748539f40 100644 --- a/platform/util/resources/misc/registry.properties +++ b/platform/util/resources/misc/registry.properties @@ -2095,7 +2095,7 @@ ide.show.open.button.in.tip.dialog.description=Shows the Open button in the Tip ide.save.missing.jb.colors=false ide.save.missing.jb.colors.description=A missing named color will be added to UIDefaults with !!! suffix -ide.hide.toolbox.promo=false +ide.hide.toolbox.promo=true ide.hide.toolbox.promo.description=Removes JetBrains Toolbox promotion from the update settings page ide.show.plugins.in.editor=false