Open
Conversation
Create simple deploy GH workflow Add basic nginx config file
EXD-104 CICD Setup
Update deploy workflow
EXD-116: Create and modify tag description field validation
EXD 111 - Select element text style
Update Main from develop
Exd 114 - Adjust tag name field validation to backend
EXD 112 - Reset form state when modal is closed
EXD 116 - FIX
EXD 110 - Table updatedAt row fix
…into exd-115 # Conflicts: # src/components/CreateOrModifyTagDialog.tsx
EXD-115 Form reset when modal is closed
…into exd-117 # Conflicts: # package.json # pnpm-lock.yaml # src/components/ComboBox.tsx # src/components/ContentTable.tsx # src/components/CreateCanvasDialog.tsx # src/components/CreateOrModifyTagDialog.tsx # src/components/DeleteTagDialog.tsx # src/components/EditCanvasDialog.tsx # src/components/TagsContent.tsx # src/components/TagsManager.tsx # src/components/TagsTable.tsx # src/components/UserDashboard.tsx # src/hooks/useCreateOrModifyTag.ts # src/schema/create-or-modify-tag.ts
EXD-117 Added prettier working prettier with eslint
…into exd-119 # Conflicts: # package.json # pnpm-lock.yaml # src/components/ComboBox.tsx # src/components/ContentTable.tsx # src/components/CreateCanvasDialog.tsx # src/components/CreateOrModifyTagDialog.tsx # src/components/DashboardFilters.tsx # src/components/DeleteTagDialog.tsx # src/components/DesktopSidebar.tsx # src/components/EditCanvasDialog.tsx # src/components/ErrorPage.tsx # src/components/Homepage.tsx # src/components/MobileMenu.tsx # src/components/SearchInput.tsx # src/components/SelectTags.tsx # src/components/TagsContent.tsx # src/components/TagsManager.tsx # src/components/TagsTable.tsx # src/components/ThemeToggle.tsx # src/components/UserDashboard.tsx # src/components/UserDropdownMenu.tsx # src/main.tsx # src/schema/create-or-modify-tag.ts # src/schema/createcanvas.ts # src/schema/edit-canvas.ts
EXD-119 - Dictionary with default translation
…into exd-120 # Conflicts: # src/components/TagsManager.tsx
EXD-120 - Tag color field as optional
* feat(exd-123): give access to canvas wip * feat(exd-123): refactored and added translation into ComboBox component * feat: disable share when canvas dont have tags, cleanup * feat: conflict resolving --------- Co-authored-by: matevszm <mateusz.marcinkowski@blockydevs.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.