Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates license strings #2945

Merged
merged 2 commits into from
Oct 5, 2023
Merged

Updates license strings #2945

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b93c0b9
Updates 'GitLens X' and 'Pro trial' patterns
axosoft-ramint Oct 4, 2023
e067098
Updates base/default plan name
axosoft-ramint Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ See the [FAQ](#is-gitlens-free-to-use 'Jump to FAQ') for more details.

[Features](#discover-powerful-features 'Jump to Discover Powerful Features')
| [Labs](#gitkraken-labs 'Jump to GitKraken Labs')
| [Pro](#ready-for-gitlens-pro 'Jump to Ready for GitLens Pro?')
| [Pro](#ready-for-gitlens-pro 'Jump to Ready for GitKraken Pro?')
| [FAQ](#faq 'Jump to FAQ')
| [Support and Community](#support-and-community 'Jump to Support and Community')
| [Contributing](#contributing 'Jump to Contributing')
Expand Down Expand Up @@ -257,11 +257,11 @@ Use the Explain panel on the **Commit Details** view to leverage AI to help you

Use the `Generate Commit Message` command from the Source Control view's context menu to automatically generate a commit message for your staged changes by leveraging AI.

# Ready for GitLens Pro?
# Ready for GitKraken Pro?

When you're ready to unlock the full potential of GitLens and enjoy all the benefits on your privately hosted repos, consider upgrading to GitLens Pro. With GitLens Pro, you'll gain access to ✨ features on privately hosted repos and ☁️ features based on the Pro plan.
When you're ready to unlock the full potential of GitLens and enjoy all the benefits on your privately hosted repos, consider upgrading to GitKraken Pro. With GitKraken Pro, you'll gain access to ✨ features on privately hosted repos and ☁️ features based on the Pro plan.

To learn more about the pricing and the additional ✨ and ☁️ features offered with GitLens Pro, visit the [GitLens Pricing page](https://www.gitkraken.com/gitlens/pricing). Upgrade to GitLens Pro today and take your Git workflow to the next level!
To learn more about the pricing and the additional ✨ and ☁️ features offered with GitKraken Pro, visit the [GitLens Pricing page](https://www.gitkraken.com/gitlens/pricing). Upgrade to GitKraken Pro today and take your Git workflow to the next level!

# FAQ

Expand All @@ -274,7 +274,7 @@ Yes. All features are free to use on all repos, **except** for features,

While GitLens offers a remarkable set of free features, a subset of features tailored for professional developers and teams, marked with a ✨, require a trial or paid plan for use on privately hosted repos — use on local or publicly hosted repos is free for everyone. Additionally some features marked with a ☁️, rely on GitKraken Dev Services which requires an account and access is based on your plan, e.g. Free, Pro, etc.

Preview ✨ features instantly for free for 3 days without an account, or start a free Pro trial to get an additional 7 days and gain access to ☁️ features to experience the full power of GitLens.
Preview ✨ features instantly for free for 3 days without an account, or start a free GitKraken trial to get an additional 7 days and gain access to ☁️ features to experience the full power of GitLens.

## Are ✨ and ☁️ features free to use?

Expand All @@ -300,7 +300,7 @@ Join the GitLens community on [GitHub Discussions](https://github.com/gitkraken/

For any issues or inquiries related to GitLens, you can reach out to the GitKraken support team via the [official support page](https://support.gitkraken.com/). They will be happy to assist you with any problems you may encounter.

With GitLens Pro, you gain access to priority email support from our customer success team, ensuring higher priority and faster response times. Custom onboarding and training are also available to help you and your team quickly get up and running with a GitLens Pro plan.
With GitKraken Pro, you gain access to priority email support from our customer success team, ensuring higher priority and faster response times. Custom onboarding and training are also available to help you and your team quickly get up and running with a GitKraken Pro plan.

# Contributing

Expand Down
14 changes: 7 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14448,7 +14448,7 @@
},
{
"view": "gitlens.views.workspaces",
"contents": "[Start Free Pro Trial](command:gitlens.plus.loginOrSignUp)\n\nStart a free 7-day Pro trial to use GitKraken Workspaces, or [sign in](command:gitlens.plus.loginOrSignUp).\n☁️ Requires an account and access is based on your plan, e.g. Free, Pro, etc",
"contents": "[Start Free GitKraken Trial](command:gitlens.plus.loginOrSignUp)\n\nStart a free 7-day GitKraken trial to use GitKraken Workspaces, or [sign in](command:gitlens.plus.loginOrSignUp).\n☁️ Requires an account and access is based on your plan, e.g. Free, Pro, etc",
"when": "!gitlens:plus"
},
{
Expand All @@ -14468,17 +14468,17 @@
},
{
"view": "gitlens.views.worktrees",
"contents": "[Preview Pro](command:gitlens.plus.startPreviewTrial)\n\nPreview Pro for 3 days, or [sign in](command:gitlens.plus.loginOrSignUp) to start a full 7-day Pro trial.\n✨ A trial or paid plan is required to use this on privately hosted repos.",
"contents": "[Preview Pro](command:gitlens.plus.startPreviewTrial)\n\nPreview Pro for 3 days, or [sign in](command:gitlens.plus.loginOrSignUp) to start a full 7-day GitKraken trial.\n✨ A trial or paid plan is required to use this on privately hosted repos.",
"when": "gitlens:plus:required && gitlens:plus:state == 0"
},
{
"view": "gitlens.views.worktrees",
"contents": "Your 3-day Pro preview has ended, start a free Pro trial to get an additional 7 days, or [sign in](command:gitlens.plus.loginOrSignUp).\n\n[Start Free Pro Trial](command:gitlens.plus.loginOrSignUp)\n✨ A trial or paid plan is required to use this on privately hosted repos.",
"contents": "Your 3-day Pro preview has ended, start a free GitKraken trial to get an additional 7 days, or [sign in](command:gitlens.plus.loginOrSignUp).\n\n[Start Free GitKraken Trial](command:gitlens.plus.loginOrSignUp)\n✨ A trial or paid plan is required to use this on privately hosted repos.",
"when": "gitlens:plus:required && gitlens:plus:state == 2"
},
{
"view": "gitlens.views.worktrees",
"contents": "Your Pro trial has ended, please upgrade to continue to use this on privately hosted repos.\n\n[Upgrade to Pro](command:gitlens.plus.purchase)\n✨ A paid plan is required to use this on privately hosted repos.",
"contents": "Your GitKraken trial has ended, please upgrade to continue to use this on privately hosted repos.\n\n[Upgrade to Pro](command:gitlens.plus.purchase)\n✨ A paid plan is required to use this on privately hosted repos.",
"when": "gitlens:plus:required && gitlens:plus:state == 4"
}
],
Expand Down Expand Up @@ -14732,16 +14732,16 @@
},
{
"id": "gitlens.welcome.preview",
"title": "Previewing GitLens Pro",
"description": "During your preview, you have access to ✨ features on privately hosted repos. [Learn more](https://www.gitkraken.com/gitlens/pro-features)\n\n[Start Free Pro Trial](command:gitlens.plus.loginOrSignUp)\n\nStart a free Pro trial to get an additional 7 days.",
"title": "Previewing GitKraken Pro",
"description": "During your preview, you have access to ✨ features on privately hosted repos. [Learn more](https://www.gitkraken.com/gitlens/pro-features)\n\n[Start Free GitKraken Trial](command:gitlens.plus.loginOrSignUp)\n\nStart a free GitKraken trial to get an additional 7 days.",
"media": {
"markdown": "walkthroughs/welcome/preview.md"
},
"when": "gitlens:plus:state == 1"
},
{
"id": "gitlens.welcome.trial",
"title": "Trialing GitLens Pro",
"title": "Trialing GitKraken Pro",
"description": "During your trial, you have access to ✨ features on privately hosted repos and ☁️ features based on the Pro plan. [Learn more](https://www.gitkraken.com/gitlens/pro-features)\n\n[Upgrade to Pro](command:gitlens.plus.purchase)",
"media": {
"markdown": "walkthroughs/welcome/trial.md"
Expand Down
2 changes: 1 addition & 1 deletion src/git/remotes/richRemoteProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ export async function ensurePaidPlan(providerName: string, container: Container)
void container.subscription.startPreviewTrial();
break;
} else if (subscription.account == null) {
const signIn = { title: 'Start Free Pro Trial' };
const signIn = { title: 'Start Free GitKraken Trial' };
const cancel = { title: 'Cancel', isCloseAffordance: true };
const result = await window.showWarningMessage(
`${title}\n\nDo you want to continue to use ✨ features on privately hosted repos, free for an additional 7 days?`,
Expand Down
6 changes: 3 additions & 3 deletions src/plus/subscription/subscriptionService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,10 +419,10 @@ export class SubscriptionService implements Disposable {
void this.showAccountView();

if (!silent && plan.effective.id === SubscriptionPlanId.Free) {
const confirm: MessageItem = { title: 'Start Free Pro Trial', isCloseAffordance: true };
const confirm: MessageItem = { title: 'Start Free GitKraken Trial', isCloseAffordance: true };
const cancel: MessageItem = { title: 'Cancel' };
const result = await window.showInformationMessage(
'Your 3-day Pro preview has ended, start a free Pro trial to get an additional 7 days.\n\n✨ A trial or paid plan is required to use Pro features on privately hosted repos.',
'Your 3-day Pro preview has ended, start a free GitKraken trial to get an additional 7 days.\n\n✨ A trial or paid plan is required to use Pro features on privately hosted repos.',
{ modal: true },
confirm,
cancel,
Expand Down Expand Up @@ -475,7 +475,7 @@ export class SubscriptionService implements Disposable {
`You can now preview Pro features for ${pluralize(
'day',
days,
)}. After which, you can start a free Pro trial for an additional 7 days.`,
)}. After which, you can start a free GitKraken trial for an additional 7 days.`,
confirm,
learn,
);
Expand Down
2 changes: 1 addition & 1 deletion src/plus/workspaces/workspacesService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ export class WorkspacesService implements Disposable {
cloudWorkspaces: cloudWorkspaces,
cloudWorkspaceInfo:
filteredSharedWorkspaceCount > 0
? `${filteredSharedWorkspaceCount} shared workspaces hidden - upgrade to GitLens Pro to access.`
? `${filteredSharedWorkspaceCount} shared workspaces hidden - upgrade to GitKraken Pro to access.`
: undefined,
};
}
Expand Down
2 changes: 1 addition & 1 deletion src/quickpicks/items/directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export function createDirectiveQuickPickItem(
detail = 'Preview Pro for 3-days to use this on privately hosted repos';
break;
case Directive.ExtendTrial:
label = 'Start Free Pro Trial';
label = 'Start Free GitKraken Trial';
detail = 'Continue to use this on privately hosted repos, free for an additional 7 days';
break;
case Directive.RequiresVerification:
Expand Down
10 changes: 5 additions & 5 deletions src/subscription.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,13 +131,13 @@ export function getSubscriptionPlan(
export function getSubscriptionPlanName(id: SubscriptionPlanId) {
switch (id) {
case SubscriptionPlanId.FreePlus:
return 'GitLens Free';
return 'GitKraken Free';
case SubscriptionPlanId.Pro:
return 'GitLens Pro';
return 'GitKraken Pro';
case SubscriptionPlanId.Teams:
return 'GitLens Teams';
return 'GitKraken Teams';
case SubscriptionPlanId.Enterprise:
return 'GitLens Enterprise';
return 'GitKraken Enterprise';
case SubscriptionPlanId.Free:
default:
return 'GitLens';
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be 'GitKraken'? This would be the license displayed by your name in the GitKraken Account view when you're on the "Free" plan.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that'd be correct

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I'll update it, thanks!

Expand All @@ -153,7 +153,7 @@ export function getSubscriptionStatePlanName(state: SubscriptionState | undefine
case SubscriptionState.FreePlusInTrial:
return `${getSubscriptionPlanName(id ?? SubscriptionPlanId.Pro)} (Trial)`;
case SubscriptionState.VerificationRequired:
return `GitLens (Unverified)`;
return `GitKraken (Unverified)`;
case SubscriptionState.Paid:
return getSubscriptionPlanName(id ?? SubscriptionPlanId.Pro);
case SubscriptionState.Free:
Expand Down
14 changes: 7 additions & 7 deletions src/webviews/apps/plus/account/components/account-content.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@ export class AccountContent extends LitElement {
case SubscriptionState.Free:
case SubscriptionState.FreePreviewTrialExpired:
case SubscriptionState.FreePlusTrialExpired:
return 'GitLens Free';
return 'GitKraken Free';
case SubscriptionState.FreeInPreviewTrial:
case SubscriptionState.FreePlusInTrial:
return 'GitLens Pro (Trial)';
return 'GitKraken Pro (Trial)';
case SubscriptionState.VerificationRequired:
return `${this.plan} (Unverified)`;
default:
Expand Down Expand Up @@ -171,14 +171,14 @@ export class AccountContent extends LitElement {
<button-container>
<gl-button full href="command:gitlens.plus.loginOrSignUp">Sign Up</gl-button>
</button-container>
<p>Signing up starts a free 7-day Pro trial.</p>
<p>Signing up starts a free 7-day GitKraken trial.</p>
`;

case SubscriptionState.FreePlusTrialExpired:
return html`
<p>
Your Pro trial has ended, please upgrade to continue to use ✨ features on privately hosted
repos.
Your GitKraken trial has ended, please upgrade to continue to use ✨ features on privately
hosted repos.
</p>
<button-container>
<gl-button full href="command:gitlens.plus.purchase">Upgrade to Pro</gl-button>
Expand All @@ -192,8 +192,8 @@ export class AccountContent extends LitElement {
case SubscriptionState.FreePlusInTrial:
return html`
<p>
Your have ${this.daysRemaining} remaining in your Pro trial. Once your trial ends, you'll need a
paid plan to continue using ✨ features.
Your have ${this.daysRemaining} remaining in your GitKraken trial. Once your trial ends, you'll
need a paid plan to continue using ✨ features.
</p>
<button-container>
<gl-button full href="command:gitlens.plus.purchase">Upgrade to Pro</gl-button>
Expand Down
11 changes: 7 additions & 4 deletions src/webviews/apps/plus/shared/components/feature-gate-plus-state.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,26 +76,29 @@ export class FeatureGatePlusState extends LitElement {
>
<p>
Preview Pro for 3 days, or
<a href="command:gitlens.plus.loginOrSignUp">sign in</a> to start a full 7-day Pro trial.
<a href="command:gitlens.plus.loginOrSignUp">sign in</a> to start a full 7-day GitKraken trial.
</p>
<p>✨ A trial or paid plan is required to use this on privately hosted repos.</p>
`;

case SubscriptionState.FreePreviewTrialExpired:
return html`
<p>
Your 3-day Pro preview has ended, start a free Pro trial to get an additional 7 days, or
Your 3-day Pro preview has ended, start a free GitKraken trial to get an additional 7 days, or
<a href="command:gitlens.plus.loginOrSignUp">sign in</a>.
</p>
<gl-button appearance="${appearance}" href="command:gitlens.plus.loginOrSignUp"
>Start Free Pro Trial</gl-button
>Start Free GitKraken Trial</gl-button
>
<p>✨ A trial or paid plan is required to use this on privately hosted repos.</p>
`;

case SubscriptionState.FreePlusTrialExpired:
return html`
<p>Your Pro trial has ended, please upgrade to continue to use this on privately hosted repos.</p>
<p>
Your GitKraken trial has ended, please upgrade to continue to use this on privately hosted
repos.
</p>
<gl-button appearance="${appearance}" href="command:gitlens.plus.purchase"
>Upgrade to Pro</gl-button
>
Expand Down
2 changes: 1 addition & 1 deletion src/webviews/apps/welcome/welcome.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ <h2>Try Pro ✨</h2>
<p class="h-space-half">Unlock the full power of GitLens ✨ and ☁️ features</p>
<p>
<gl-button appearance="secondary" href="command:gitlens.plus.loginOrSignUp"
>Start a Pro trial</gl-button
>Start a GitKraken trial</gl-button
>
&nbsp;or <a href="command:gitlens.plus.loginOrSignUp" title="Sign In">sign in</a>
</p>
Expand Down