Skip to content

Commit

Permalink
Merge branch 'develop' into translate
Browse files Browse the repository at this point in the history 
* develop: (419 commits)
  添加源
  fix: bug fixes and ui improvement (makeplane#2674)
  fix: slack integration workflow (makeplane#2675)
  fix: In kanban issues can be shifted between the column in order_by (makeplane#2676)
  chore: update avatar group logic (makeplane#2672)
  style: updated layouts UI in the space app (makeplane#2671)
  fix: render the estimate select if estimate is enabled for the project (makeplane#2663)
  Fix/mentions spaces fix (makeplane#2667)
  dev: On Demand Code Build for any branch (makeplane#2668)
  fix: existing issues modal for cycle and module (makeplane#2664)
  fix: package version fixes and mentions build error fixes (makeplane#2665)
  fix: notifications option in the sidebar menu not collapsing (makeplane#2662)
  fix: handled drag and drop issue, gantt hover issue for issue peek overview (makeplane#2660)
  refactor: removed unused packages (makeplane#2658)
  fix: product tour modal bugs (makeplane#2657)
  [feat]: Extended Tables Support (makeplane#2596)
  fix: mentions enter error (makeplane#2646)
  chore : dropdown loading state added and project card avatar fix (makeplane#2643)
  refactor: archive issue  (makeplane#2628)
  fix: open changelog in new tab (makeplane#2645)
  ...

# Conflicts:
#	apiserver/Dockerfile.api
#	apps/app/Dockerfile.web
#	apps/app/components/analytics/custom-analytics/create-update-analytics-modal.tsx
#	apps/app/components/analytics/custom-analytics/custom-analytics.tsx
#	apps/app/components/analytics/custom-analytics/sidebar.tsx
#	apps/app/components/analytics/project-modal.tsx
#	apps/app/components/automation/auto-archive-automation.tsx
#	apps/app/components/automation/auto-close-automation.tsx
#	apps/app/components/automation/select-month-modal.tsx
#	apps/app/components/command-palette/command-k.tsx
#	apps/app/components/core/filters/filters-list.tsx
#	apps/app/components/core/filters/issues-view-filter.tsx
#	apps/app/components/core/modals/bulk-delete-issues-modal.tsx
#	apps/app/components/core/sidebar/links-list.tsx
#	apps/app/components/core/sidebar/sidebar-progress-stats.tsx
#	apps/app/components/core/theme/custom-theme-selector.tsx
#	apps/app/components/core/views/all-views.tsx
#	apps/app/components/core/views/board-view/all-boards.tsx
#	apps/app/components/core/views/board-view/single-board.tsx
#	apps/app/components/core/views/calendar-view/calendar-header.tsx
#	apps/app/components/core/views/calendar-view/single-date.tsx
#	apps/app/components/core/views/issues-view.tsx
#	apps/app/components/core/views/list-view/single-list.tsx
#	apps/app/components/core/views/spreadsheet-view/single-issue.tsx
#	apps/app/components/core/views/spreadsheet-view/spreadsheet-columns.tsx
#	apps/app/components/core/views/spreadsheet-view/spreadsheet-view.tsx
#	apps/app/components/cycles/sidebar.tsx
#	apps/app/components/cycles/single-cycle-card.tsx
#	apps/app/components/estimates/create-update-estimate-modal.tsx
#	apps/app/components/issues/comment/add-comment.tsx
#	apps/app/components/issues/delete-issue-modal.tsx
#	apps/app/components/issues/description-form.tsx
#	apps/app/components/issues/gantt-chart/blocks.tsx
#	apps/app/components/issues/modal.tsx
#	apps/app/components/issues/my-issues/my-issues-select-filters.tsx
#	apps/app/components/issues/my-issues/my-issues-view.tsx
#	apps/app/components/issues/select/label.tsx
#	apps/app/components/issues/select/project.tsx
#	apps/app/components/issues/sidebar-select/label.tsx
#	apps/app/components/issues/sidebar-select/state.tsx
#	apps/app/components/issues/sub-issues-list.tsx
#	apps/app/components/issues/view-select/assignee.tsx
#	apps/app/components/issues/view-select/due-date.tsx
#	apps/app/components/issues/view-select/label.tsx
#	apps/app/components/issues/view-select/priority.tsx
#	apps/app/components/issues/view-select/start-date.tsx
#	apps/app/components/labels/single-label-group.tsx
#	apps/app/components/labels/single-label.tsx
#	apps/app/components/modules/sidebar-select/select-lead.tsx
#	apps/app/components/modules/sidebar-select/select-members.tsx
#	apps/app/components/modules/sidebar.tsx
#	apps/app/components/modules/single-module-card.tsx
#	apps/app/components/onboarding/invite-members.tsx
#	apps/app/components/onboarding/user-details.tsx
#	apps/app/components/profile/profile-issues-view.tsx
#	apps/app/components/project/settings-header.tsx
#	apps/app/components/project/settings/single-label.tsx
#	apps/app/components/project/single-project-card.tsx
#	apps/app/components/tiptap/extensions/index.tsx
#	apps/app/components/tiptap/slash-command/index.tsx
#	apps/app/components/views/form.tsx
#	apps/app/components/views/gantt-chart.tsx
#	apps/app/components/views/select-filters.tsx
#	apps/app/components/views/single-view-item.tsx
#	apps/app/components/workspace/issues-stats.tsx
#	apps/app/components/workspace/settings-header.tsx
#	apps/app/components/workspace/sidebar-quick-action.tsx
#	apps/app/constants/calendar.ts
#	apps/app/constants/filters.ts
#	apps/app/constants/project.ts
#	apps/app/helpers/calendar.helper.ts
#	apps/app/layouts/auth-layout/project-authorization-wrapper.tsx
#	apps/app/layouts/auth-layout/user-authorization-wrapper.tsx
#	apps/app/layouts/auth-layout/workspace-authorization-wrapper.tsx
#	apps/app/layouts/profile-layout.tsx
#	apps/app/layouts/settings-navbar.tsx
#	apps/app/package.json
#	apps/app/pages/[workspaceSlug]/analytics.tsx
#	apps/app/pages/[workspaceSlug]/index.tsx
#	apps/app/pages/[workspaceSlug]/me/my-issues.tsx
#	apps/app/pages/[workspaceSlug]/me/profile/index.tsx
#	apps/app/pages/[workspaceSlug]/me/profile/preferences.tsx
#	apps/app/pages/[workspaceSlug]/projects/[projectId]/archived-issues/index.tsx
#	apps/app/pages/[workspaceSlug]/projects/[projectId]/cycles/[cycleId].tsx
#	apps/app/pages/[workspaceSlug]/projects/[projectId]/cycles/index.tsx
#	apps/app/pages/[workspaceSlug]/projects/[projectId]/inbox/[inboxId].tsx
#	apps/app/pages/[workspaceSlug]/projects/[projectId]/issues/index.tsx
#	apps/app/pages/[workspaceSlug]/projects/[projectId]/modules/[moduleId].tsx
#	apps/app/pages/[workspaceSlug]/projects/[projectId]/modules/index.tsx
#	apps/app/pages/[workspaceSlug]/projects/[projectId]/pages/index.tsx
#	apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/automations.tsx
#	apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/control.tsx
#	apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/estimates.tsx
#	apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/features.tsx
#	apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx
#	apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/integrations.tsx
#	apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/labels.tsx
#	apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/members.tsx
#	apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/states.tsx
#	apps/app/pages/[workspaceSlug]/projects/[projectId]/views/[viewId].tsx
#	apps/app/pages/[workspaceSlug]/projects/[projectId]/views/index.tsx
#	apps/app/pages/[workspaceSlug]/projects/index.tsx
#	apps/app/pages/[workspaceSlug]/settings/index.tsx
#	apps/app/pages/[workspaceSlug]/settings/members.tsx
#	apps/app/pages/api/slack-redirect.ts
#	apps/app/pages/create-workspace.tsx
#	apps/app/pages/index.tsx
#	apps/app/pages/invitations.tsx
#	apps/app/pages/magic-sign-in.tsx
#	apps/app/pages/onboarding.tsx
#	apps/app/pages/reset-password.tsx
#	apps/app/pages/workspace-member-invitation.tsx
#	apps/space/Dockerfile.space
#	apps/space/components/issues/filters-render/date.tsx
#	apps/space/components/issues/filters-render/index.tsx
#	apps/space/components/issues/filters-render/priority/index.tsx
#	docker-compose.yml
#	space/components/accounts/email-code-form.tsx
#	space/components/accounts/email-password-form.tsx
#	space/components/accounts/email-reset-password-form.tsx
#	web/components/analytics/scope-and-demand/demand.tsx
#	web/components/analytics/scope-and-demand/scope-and-demand.tsx
#	web/components/analytics/scope-and-demand/scope.tsx
#	web/components/auth-screens/workspace/not-a-member.tsx
#	web/components/command-palette/issue/change-issue-priority.tsx
#	web/components/command-palette/shortcuts-modal.tsx
#	web/components/core/activity.tsx
#	web/components/core/modals/existing-issues-list-modal.tsx
#	web/components/core/modals/image-upload-modal.tsx
#	web/components/core/modals/link-modal.tsx
#	web/components/estimates/delete-estimate-modal.tsx
#	web/components/estimates/estimate-list-item.tsx
#	web/components/inbox/filters-dropdown.tsx
#	web/components/inbox/filters-list.tsx
#	web/components/inbox/main-content.tsx
#	web/components/inbox/modals/select-duplicate.tsx
#	web/components/integration/delete-import-modal.tsx
#	web/components/integration/jira/give-details.tsx
#	web/components/integration/jira/import-users.tsx
#	web/components/issues/activity.tsx
#	web/components/issues/comment/comment-card.tsx
#	web/components/issues/draft-issue-form.tsx
#	web/components/issues/parent-issues-list-modal.tsx
#	web/components/issues/peek-overview/issue-properties.tsx
#	web/components/issues/select/assignee.tsx
#	web/components/issues/select/priority.tsx
#	web/components/issues/select/state.tsx
#	web/components/issues/sidebar-select/assignee.tsx
#	web/components/issues/sidebar-select/priority.tsx
#	web/components/issues/sidebar.tsx
#	web/components/labels/create-label-modal.tsx
#	web/components/labels/create-update-label-inline.tsx
#	web/components/labels/delete-label-modal.tsx
#	web/components/labels/labels-list-modal.tsx
#	web/components/modules/delete-module-modal.tsx
#	web/components/modules/form.tsx
#	web/components/notifications/select-snooze-till-modal.tsx
#	web/components/onboarding/tour/root.tsx
#	web/components/onboarding/workspace.tsx
#	web/components/pages/delete-page-modal.tsx
#	web/components/pages/page-form.tsx
#	web/components/pages/pages-list/recent-pages-list.tsx
#	web/components/pages/pages-view.tsx
#	web/components/project/confirm-project-member-remove.tsx
#	web/components/project/create-project-modal.tsx
#	web/components/project/delete-project-modal.tsx
#	web/components/project/join-project-modal.tsx
#	web/components/project/sidebar-list-item.tsx
#	web/components/project/sidebar-list.tsx
#	web/components/states/create-state-modal.tsx
#	web/components/states/create-update-state-inline.tsx
#	web/components/ui/datepicker.tsx
#	web/components/ui/multi-level-dropdown.tsx
#	web/components/views/delete-view-modal.tsx
#	web/components/workspace/confirm-workspace-member-remove.tsx
#	web/components/workspace/create-workspace-form.tsx
#	web/components/workspace/help-section.tsx
#	web/components/workspace/issues-list.tsx
#	web/components/workspace/send-workspace-invitation-modal.tsx
#	web/components/workspace/sidebar-dropdown.tsx
#	web/components/workspace/sidebar-menu.tsx
#	web/components/workspace/views/modal.tsx
#	web/helpers/date-time.helper.ts
#	web/helpers/issue.helper.ts
#	web/pages/404.tsx
#	web/pages/[workspaceSlug]/me/profile/activity.tsx
#	web/pages/[workspaceSlug]/projects/[projectId]/issues/[issueId].tsx
#	web/pages/[workspaceSlug]/projects/[projectId]/pages/[pageId].tsx
#	web/pages/accounts/sign-up.tsx
  • Loading branch information
@gwokwong
gwokwong committed Nov 7, 2023
2 parents 66f7f31 + 996c1f0 commit e4fdf1a
Show file tree
Hide file tree
Showing 1,989 changed files with 116,749 additions and 59,224 deletions.
17 changes: 17 additions & 0 deletions .deepsource.toml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
version = 1

[[analyzers]]
name = "shell"

[[analyzers]]
name = "javascript"

[analyzers.meta]
plugins = ["react"]
environment = ["nodejs"]

[[analyzers]]
name = "python"

[analyzers.meta]
runtime_version = "3.x.x"
52 changes: 0 additions & 52 deletions .env.example
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,3 @@
# Frontend
# Extra image domains that need to be added for Next Image
NEXT_PUBLIC_EXTRA_IMAGE_DOMAINS=
# Google Client ID for Google OAuth
NEXT_PUBLIC_GOOGLE_CLIENTID=""
# Github ID for Github OAuth
NEXT_PUBLIC_GITHUB_ID=""
# Github App Name for GitHub Integration
NEXT_PUBLIC_GITHUB_APP_NAME=""
# Sentry DSN for error monitoring
NEXT_PUBLIC_SENTRY_DSN=""
# Enable/Disable OAUTH - default 0 for selfhosted instance
NEXT_PUBLIC_ENABLE_OAUTH=0
# Enable/Disable sentry
NEXT_PUBLIC_ENABLE_SENTRY=0
# Enable/Disable session recording
NEXT_PUBLIC_ENABLE_SESSION_RECORDER=0
# Enable/Disable event tracking
NEXT_PUBLIC_TRACK_EVENTS=0
# Slack for Slack Integration
NEXT_PUBLIC_SLACK_CLIENT_ID=""
# For Telemetry, set it to "app.plane.so"
NEXT_PUBLIC_PLAUSIBLE_DOMAIN=""
# public boards deploy url
NEXT_PUBLIC_DEPLOY_URL=""

# Backend
# Debug value for api server use it as 0 for production use
DEBUG=0

# Error logs
SENTRY_DSN=""

# Database Settings
PGUSER="plane"
PGPASSWORD="plane"
Expand All @@ -43,15 +10,6 @@ REDIS_HOST="plane-redis"
REDIS_PORT="6379"
REDIS_URL="redis://${REDIS_HOST}:6379/"

# Email Settings
EMAIL_HOST=""
EMAIL_HOST_USER=""
EMAIL_HOST_PASSWORD=""
EMAIL_PORT=587
EMAIL_FROM="Team Plane <[email protected]>"
EMAIL_USE_TLS="1"
EMAIL_USE_SSL="0"

# AWS Settings
AWS_REGION=""
AWS_ACCESS_KEY_ID="access-key"
Expand All @@ -67,9 +25,6 @@ OPENAI_API_BASE="https://api.openai.com/v1" # change if using a custom endpoint
OPENAI_API_KEY="sk-" # add your openai key here
GPT_ENGINE="gpt-3.5-turbo" # use "gpt-4" if you have access

# Github
GITHUB_CLIENT_SECRET="" # For fetching release notes

# Settings related to Docker
DOCKERIZED=1
# set to 1 If using the pre-configured minio setup
Expand All @@ -78,10 +33,3 @@ USE_MINIO=1
# Nginx Configuration
NGINX_PORT=80

# Default Creds
DEFAULT_EMAIL="[email protected]"
DEFAULT_PASSWORD="password123"

# SignUps
ENABLE_SIGNUP="1"
# Auto generated and Required that will be generated from setup.sh
2 changes: 1 addition & 1 deletion .eslintrc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module.exports = {
extends: ["custom"],
settings: {
next: {
rootDir: ["apps/*"],
rootDir: ["web/", "space/"],
},
},
};
55 changes: 0 additions & 55 deletions .github/workflows/Build_Test_Pull_Request.yml
View file

This file was deleted.

111 changes: 0 additions & 111 deletions .github/workflows/Update_Docker_Images.yml
View file

This file was deleted.

Loading

0 comments on commit e4fdf1a

Please sign in to comment.