mirror/plane
1
0
Fork 0
mirror of https://github.com/makeplane/plane.git synced 2026-04-25 17:49:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'preview' of github.com:makeplane/plane into fix/intake-count

Browse Source
This commit is contained in:
vamsikrishnamathala
2026-01-20 14:31:16 +05:30
parent a391366ec9 f7debcde79
commit 55b9f260e8
7 changed files with 129 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/api/plane/db/migrations/0116_workspacemember_explored_features_and_more.py
+38
View File
@@ -0,0 +1,38 @@
# Generated by Django 4.2.27 on 2026-01-13 10:38
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('db', '0115_auto_20260105_1406'),
]
operations = [
migrations.AddField(
model_name='profile',
name='notification_view_mode',
field=models.CharField(choices=[('full', 'Full'), ('compact', 'Compact')], default='full', max_length=255),
),
migrations.AddField(
model_name='user',
name='is_password_reset_required',
field=models.BooleanField(default=False),
),
migrations.AddField(
model_name='workspacemember',
name='explored_features',
field=models.JSONField(default=dict),
),
migrations.AddField(
model_name='workspacemember',
name='getting_started_checklist',
field=models.JSONField(default=dict),
),
migrations.AddField(
model_name='workspacemember',
name='tips',
field=models.JSONField(default=dict),
),
]
apps/api/plane/db/models/user.py
+8 -2
View File
@@ -84,7 +84,7 @@ class User(AbstractBaseUser, PermissionsMixin):
is_staff = models.BooleanField(default=False)
is_email_verified = models.BooleanField(default=False)
is_password_autoset = models.BooleanField(default=False)
is_password_reset_required = models.BooleanField(default=False)
# random token generated
token = models.CharField(max_length=64, blank=True)
@@ -192,6 +192,10 @@ class Profile(TimeAuditModel):
FRIDAY = 5
SATURDAY = 6
class NotificationViewMode(models.TextChoices):
FULL = "full", "Full"
COMPACT = "compact", "Compact"
START_OF_THE_WEEK_CHOICES = (
(SUNDAY, "Sunday"),
(MONDAY, "Monday"),
@@ -221,7 +225,9 @@ class Profile(TimeAuditModel):
billing_address = models.JSONField(null=True)
has_billing_address = models.BooleanField(default=False)
company_name = models.CharField(max_length=255, blank=True)
notification_view_mode = models.CharField(
max_length=255, choices=NotificationViewMode.choices, default=NotificationViewMode.FULL
)
is_smooth_cursor_enabled = models.BooleanField(default=False)
# mobile
is_mobile_onboarded = models.BooleanField(default=False)
apps/api/plane/db/models/workspace.py
+3
View File
@@ -214,6 +214,9 @@ class WorkspaceMember(BaseModel):
default_props = models.JSONField(default=get_default_props)
issue_props = models.JSONField(default=get_issue_props)
is_active = models.BooleanField(default=True)
getting_started_checklist = models.JSONField(default=dict)
tips = models.JSONField(default=dict)
explored_features = models.JSONField(default=dict)
class Meta:
unique_together = ["workspace", "member", "deleted_at"]
apps/space/core/components/account/auth-forms/auth-root.tsx
+3 -2
View File
@@ -98,7 +98,7 @@ export const AuthRoot = observer(function AuthRoot() {
}
if (currentAuthMode === EAuthModes.SIGN_IN) {
if (response.is_password_autoset && isSMTPConfigured && isMagicLoginEnabled) {
if (isSMTPConfigured && isMagicLoginEnabled && response.status === "MAGIC_CODE") {
setAuthStep(EAuthSteps.UNIQUE_CODE);
generateEmailUniqueCode(data.email);
} else if (isEmailPasswordEnabled) {
@@ -109,7 +109,7 @@ export const AuthRoot = observer(function AuthRoot() {
setErrorInfo(errorhandler);
}
} else {
if (isSMTPConfigured && isMagicLoginEnabled) {
if (isSMTPConfigured && isMagicLoginEnabled && response.status === "MAGIC_CODE") {
setAuthStep(EAuthSteps.UNIQUE_CODE);
generateEmailUniqueCode(data.email);
} else if (isEmailPasswordEnabled) {
@@ -119,6 +119,7 @@ export const AuthRoot = observer(function AuthRoot() {
setErrorInfo(errorhandler);
}
}
return;
})
.catch((error) => {
const errorhandler = authErrorHandler(error?.error_code?.toString(), data?.email || undefined);
apps/space/core/types/auth.ts
+1
View File
@@ -19,6 +19,7 @@ export interface IEmailCheckData {
}
export interface IEmailCheckResponse {
status: "MAGIC_CODE" | "CREDENTIAL";
is_password_autoset: boolean;
existing: boolean;
}
packages/editor/src/styles/table.css
+1 -1
View File
@@ -160,7 +160,7 @@
opacity: 0;
pointer-events: none;
outline: none;
z-index: 10;
z-index: 9;
transition: all 0.2s ease;
&:hover {
packages/tailwind-config/variables.css
+75 -33
View File
@@ -321,9 +321,9 @@
--txt-link-primary-hover: var(--brand-900);
--txt-link-secondary: var(--neutral-900);
/* Label colors */
--label-indigo-bg: var(--extended-color-indigo-100);
--label-indigo-bg: var(--extended-color-indigo-50);
--label-indigo-bg-strong: var(--extended-color-indigo-700);
--label-indigo-hover: var(--extended-color-indigo-300);
--label-indigo-hover: var(--extended-color-indigo-100);
--label-indigo-icon: var(--extended-color-indigo-700);
--label-indigo-text: var(--extended-color-indigo-700);
--label-indigo-border: var(--extended-color-indigo-700);
@@ -331,7 +331,7 @@
--label-emerald-bg: var(--extended-color-emerald-50);
--label-emerald-bg-strong: var(--extended-color-emerald-600);
--label-emerald-hover: var(--extended-color-emerald-200);
--label-emerald-icon: var(--extended-color-emerald-600);
--label-emerald-icon: var(--extended-color-emerald-800);
--label-emerald-text: var(--extended-color-emerald-800);
--label-emerald-border: var(--extended-color-emerald-800);
--label-emerald-focus: var(--extended-color-emerald-700);
@@ -352,10 +352,31 @@
--label-yellow-bg: var(--extended-color-yellow-50);
--label-yellow-bg-strong: var(--extended-color-yellow-600);
--label-yellow-hover: var(--extended-color-yellow-100);
--label-yellow-icon: var(--extended-color-yellow-600);
--label-yellow-text: var(--extended-color-yellow-600);
--label-yellow-icon: var(--extended-color-yellow-700);
--label-yellow-text: var(--extended-color-yellow-700);
--label-yellow-border: var(--extended-color-yellow-600);
--label-yellow-focus: var(--extended-color-yellow-400);
--label-orange-bg: var(--extended-color-orange-50);
--label-orange-bg-strong: var(--extended-color-orange-600);
--label-orange-hover: var(--extended-color-orange-100);
--label-orange-icon: var(--extended-color-orange-600);
--label-orange-text: var(--extended-color-orange-600);
--label-orange-border: var(--extended-color-orange-600);
--label-orange-focus: var(--extended-color-orange-300);
--label-pink-bg: var(--extended-color-pink-50);
--label-pink-bg-strong: var(--extended-color-pink-600);
--label-pink-hover: var(--extended-color-pink-100);
--label-pink-icon: var(--extended-color-pink-600);
--label-pink-text: var(--extended-color-pink-600);
--label-pink-border: var(--extended-color-pink-600);
--label-pink-focus: var(--extended-color-pink-400);
--label-purple-bg: var(--extended-color-purple-50);
--label-purple-bg-strong: var(--extended-color-purple-500);
--label-purple-hover: var(--extended-color-purple-100);
--label-purple-icon: var(--extended-color-purple-500);
--label-purple-text: var(--extended-color-purple-600);
--label-purple-border: var(--extended-color-purple-600);
--label-purple-focus: var(--extended-color-purple-300);
/* Illustration colors */
--illustration-fill-primary: var(--neutral-white);
--illustration-fill-secondary: var(--neutral-200);
@@ -550,41 +571,62 @@
--txt-link-primary-hover: var(--brand-700);
--txt-link-secondary: var(--neutral-1100);
/* Label colors */
--label-indigo-bg: var(--extended-color-indigo-800);
--label-indigo-bg: var(--extended-color-indigo-900);
--label-indigo-bg-strong: var(--extended-color-indigo-500);
--label-indigo-hover: var(--extended-color-indigo-700);
--label-indigo-icon: var(--extended-color-indigo-500);
--label-indigo-text: var(--extended-color-indigo-500);
--label-indigo-border: var(--extended-color-indigo-500);
--label-indigo-hover: var(--extended-color-indigo-800);
--label-indigo-icon: var(--extended-color-indigo-400);
--label-indigo-text: var(--extended-color-indigo-400);
--label-indigo-border: var(--extended-color-indigo-400);
--label-indigo-focus: var(--extended-color-indigo-400);
--label-emerald-bg: var(--extended-color-emerald-700);
--label-emerald-bg: var(--extended-color-emerald-950);
--label-emerald-bg-strong: var(--extended-color-emerald-600);
--label-emerald-hover: var(--extended-color-emerald-800);
--label-emerald-icon: var(--extended-color-emerald-600);
--label-emerald-hover: var(--extended-color-emerald-900);
--label-emerald-icon: var(--extended-color-emerald-400);
--label-emerald-text: var(--extended-color-emerald-400);
--label-emerald-border: var(--extended-color-emerald-400);
--label-emerald-focus: var(--extended-color-emerald-700);
--label-grey-bg: var(--extended-color-grey-800);
--label-grey-bg: var(--extended-color-grey-900);
--label-grey-bg-strong: var(--extended-color-grey-500);
--label-grey-hover: var(--extended-color-grey-700);
--label-grey-icon: var(--extended-color-grey-500);
--label-grey-text: var(--extended-color-grey-500);
--label-grey-border: var(--extended-color-grey-500);
--label-grey-hover: var(--extended-color-grey-800);
--label-grey-icon: var(--extended-color-grey-400);
--label-grey-text: var(--extended-color-grey-400);
--label-grey-border: var(--extended-color-grey-400);
--label-grey-focus: var(--extended-color-grey-400);
--label-crimson-bg: var(--extended-color-crimson-800);
--label-crimson-bg: var(--extended-color-crimson-950);
--label-crimson-bg-strong: var(--extended-color-crimson-500);
--label-crimson-hover: var(--extended-color-crimson-700);
--label-crimson-icon: var(--extended-color-crimson-500);
--label-crimson-text: var(--extended-color-crimson-500);
--label-crimson-border: var(--extended-color-crimson-500);
--label-crimson-hover: var(--extended-color-crimson-900);
--label-crimson-icon: var(--extended-color-crimson-400);
--label-crimson-text: var(--extended-color-crimson-400);
--label-crimson-border: var(--extended-color-crimson-400);
--label-crimson-focus: var(--extended-color-crimson-400);
--label-yellow-bg: var(--extended-color-yellow-900);
--label-yellow-bg: var(--extended-color-yellow-950);
--label-yellow-bg-strong: var(--extended-color-yellow-500);
--label-yellow-hover: var(--extended-color-yellow-800);
--label-yellow-hover: var(--extended-color-yellow-900);
--label-yellow-icon: var(--extended-color-yellow-500);
--label-yellow-text: var(--extended-color-yellow-500);
--label-yellow-border: var(--extended-color-yellow-500);
--label-yellow-focus: var(--extended-color-yellow-400);
--label-orange-bg: var(--extended-color-orange-950);
--label-orange-bg-strong: var(--extended-color-orange-400);
--label-orange-hover: var(--extended-color-orange-900);
--label-orange-icon: var(--extended-color-orange-300);
--label-orange-text: var(--extended-color-orange-300);
--label-orange-border: var(--extended-color-orange-300);
--label-orange-focus: var(--extended-color-orange-300);
--label-pink-bg: var(--extended-color-pink-900);
--label-pink-bg-strong: var(--extended-color-pink-500);
--label-pink-hover: var(--extended-color-pink-800);
--label-pink-icon: var(--extended-color-pink-400);
--label-pink-text: var(--extended-color-pink-400);
--label-pink-border: var(--extended-color-pink-400);
--label-pink-focus: var(--extended-color-pink-400);
--label-purple-bg: var(--extended-color-purple-900);
--label-purple-bg-strong: var(--extended-color-purple-400);
--label-purple-hover: var(--extended-color-purple-800);
--label-purple-icon: var(--extended-color-purple-400);
--label-purple-text: var(--extended-color-purple-400);
--label-purple-border: var(--extended-color-purple-400);
--label-purple-focus: var(--extended-color-purple-300);
/* Illustration colors */
--illustration-fill-primary: var(--neutral-400);
--illustration-fill-secondary: var(--neutral-500);
@@ -1059,42 +1101,42 @@
--text-h4-bold--letter-spacing: var(--tracking-default);
--text-h4-bold--font-weight: var(--font-weight-bold);
--text-h5-regular: var(--text-16);
--text-h5-regular: var(--text-18);
--text-h5-regular--line-height: 1.2;
--text-h5-regular--letter-spacing: var(--tracking-default);
--text-h5-regular--font-weight: var(--font-weight-regular);
--text-h5-medium: var(--text-16);
--text-h5-medium: var(--text-18);
--text-h5-medium--line-height: 1.2;
--text-h5-medium--letter-spacing: var(--tracking-default);
--text-h5-medium--font-weight: var(--font-weight-medium);
--text-h5-semibold: var(--text-16);
--text-h5-semibold: var(--text-18);
--text-h5-semibold--line-height: 1.2;
--text-h5-semibold--letter-spacing: var(--tracking-default);
--text-h5-semibold--font-weight: var(--font-weight-semibold);
--text-h5-bold: var(--text-16);
--text-h5-bold: var(--text-18);
--text-h5-bold--line-height: 1.2;
--text-h5-bold--letter-spacing: var(--tracking-default);
--text-h5-bold--font-weight: var(--font-weight-bold);
--text-h6-regular: var(--text-14);
--text-h6-regular: var(--text-16);
--text-h6-regular--line-height: 1.2;
--text-h6-regular--letter-spacing: var(--tracking-default);
--text-h6-regular--font-weight: var(--font-weight-regular);
--text-h6-medium: var(--text-14);
--text-h6-medium: var(--text-16);
--text-h6-medium--line-height: 1.2;
--text-h6-medium--letter-spacing: var(--tracking-default);
--text-h6-medium--font-weight: var(--font-weight-medium);
--text-h6-semibold: var(--text-14);
--text-h6-semibold: var(--text-16);
--text-h6-semibold--line-height: 1.2;
--text-h6-semibold--letter-spacing: var(--tracking-default);
--text-h6-semibold--font-weight: var(--font-weight-semibold);
--text-h6-bold: var(--text-14);
--text-h6-bold: var(--text-16);
--text-h6-bold--line-height: 1.2;
--text-h6-bold--letter-spacing: var(--tracking-default);
--text-h6-bold--font-weight: var(--font-weight-bold);