fix: merge conflicts #403
Merged
fix: merge conflicts #403
Conversation
This file contains 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
Merge pull request #260 from makeplane/stage-release
* chore: update all backend dependencies to the latest version * feat: record issue completed at date when the issues are moved to fompleted group (#262) * feat: cycle status (#265) * feat: cycle status and dates added in sidebar * feat: update status added * chore: update python runtime * feat: label grouping in dropdowns, default state in project settings (#266) * feat: label grouping in dropdowns, default state in project settings * feat: label disclosure default open * refactor: label setting page * chore: tooltip component updated * chore: tooltip component updated * feat/state_sequence_change * fix: remirror buttons (#267) * feat: burndown chart (#268) * chore: recharts dependencie added * chore: tpye added for issue completed at * feat: date range helper fn added * feat: progress chart added * feat: ideal task line added in progress chart * feat: chart legends added * fix: state reordering (#269) * fix: state reordering * refactor: remove unnecessary argument * refactor: mutation after setting default * feat: drag and drop an issue to delete (#270) * feat: drag and drop an issue to delete * style: repositioned trash box * feat : cycle sidebar revamp (#271) * feat: range date picker added * feat: cycle status ui improved * feat : sidebar progress improvement (#272) * feat: progress chart render validation * fix: sidebar stats tab * feat: sidebar active tab context * chore: removed minor bugs (#273) * fix: ui bug (#274) * fix: shortcut search fix shortcut modal ui fixes shortcut search fix email us label change * fix: email us label updated * feat: default state for project (#264) * build: add channels requirement for the asgi configuration (#225) * refactor: combine sign in and sign up endpoint to a single endpoint (#263) * feat: state grouping and ordering list (#253) * feat: state grouping and ordering list * fix: state grouping in state list endpoint * dev: added migrations for new models schema changes * fix: mac text copy fix (#277) * feat: state description in settings (#275) * chore: removed minor bugs * feat: state description in settings * feat: group by assignee * refactor: update django admin panel heading (#276) * feat: create label option in create issue modal (#281) * refactor: issue details page (#282) * fix: shortcut search (#283) * fix: search case innsensitive * style: email icon updated * feat: module sidebar date and status updated (#285) * feat: bulk assign sub-issues (#284) * fix: consistent dropdowns, refactor: ui components (#286) * build(deps): bump django in /apiserver/requirements (#289) Bumps [django](https://github.com/django/django) from 3.2.17 to 3.2.18. - [Release notes](https://github.com/django/django/releases) - [Commits](django/django@3.2.17...3.2.18) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix: workspace name and breadcrumb title , refactor: command palette (#290) * refactor: command pallette * fix: workspace name trim * fix: breadcrumb title responsiveness added * feat: copy link option (#292) * feat: copy issue link added in issue card * feat: copy cycle link added * feat: ellipsis added in module card * fix: origin path and handlecopytext added * fix: remirror image not updating (#294) * feat: resend login magic code (#291) * feat: resend login code on signing page after 30 seconds * feat: handling error on code send * refractor: isResendDisabled varible for resend button * dev: timer count-down hook * refractor: using new timer hook in sign in page * feat: issue links (#288) * feat: links for issues * fix: add issue link in serilaizer * feat: links can be added to issues --------- Co-authored-by: Aaryan Khandelwal <aaryankhandu123@gmail.com> * fix: default label color (#295) * fix: colors of old labels can now be changed * fix: black color for labels with no color * fix: ui changes (#297) * fix: module card height and invalid date * fix: issue details page title resizing fix * refractor: use local storage hook (#293) * feat: resend login code on signing page after 30 seconds * refractor: use local storage hook * refractor: properly using new local storage hook on modules sidebar * fix: assignee and labels field while editing an issue (#296) * fix: assignee and labels field while editing an issue * chore: remove unused declarations * fix: issue title resizing fix (#300) * fix: issue title resizing fix * fix: header ui fix and invalid date label updated * fix: try/catch for invalid values stored in local storage (#301) * fix: create issue modal closing on clicking on Grammarly recommendation (#299) fixed it by not closing modal on outside click * style: not showing pointer & theme color on resend code button disabled (#298) * fix: new project issues response (#303) * refactor/cycles_folder_structure (#304) * fix: ui changes (#306) * fix: sidebar date range * fix: renamed key with id in filters * fix: replace progress bar * chore: react progress bar package removed * fix: progress chart legends position * fix: progress chart legends alignment fix * feat: manual ordering of issues (#305) * feat: global component for links list (#307) * Feat: Dockerizing using nginx reverse proxy (#280) * minor docker fixes * eslint config changes * dockerfile changes to backend and frontend * oauth enabled env flag * sentry enabled env flag * build: get alternatives for environment variables and static file storage * build: automatically generate random secret key if not provided * build: update docker compose for next url env add channels to requirements for asgi server and save files in local machine for docker environment * build: update nginx conf for backend base url update backend dockerfile to make way for static file uploads * feat: create a default user with given values else default values * chore: update docker python version and other dependency version in docker * build: update local settings file to run it in docker * fix: update script to run in default production setting * fix: env variable changes and env setup shell script added * Added Single Dockerfile to run the Entire plane application * docs build fixes --------- Co-authored-by: Narayana <narayana.vadapalli1996@gmail.com> Co-authored-by: pablohashescobar <nikhilschacko@gmail.com> * feat: edit module (#309) * feat: edit module * fix: build fix * refactor: dnd function (#308) * refactor: manual ordering bugs (#312) * refactor: create issue modal input fields (#310) * style: showing user sign-in progress on sign-in with code (#311) * style: not showing pointer & theme color on resend code button disabled * style: showing user sign-in progress on sign-in with code * style: showing error from server on sign-in with code fail --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: pablohashescobar <nikhilschacko@gmail.com> Co-authored-by: pablohashescobar <118773738+pablohashescobar@users.noreply.github.com> Co-authored-by: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com> Co-authored-by: Anmol Singh Bhatia <anmolsinghbhatia1001@gmail.com> Co-authored-by: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com> Co-authored-by: vamsi <vamsi.kurama@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Dakshesh Jain <65905942+dakshesh14@users.noreply.github.com> Co-authored-by: Aaryan Khandelwal <aaryankhandu123@gmail.com> Co-authored-by: Narayana <narayana.vadapalli1996@gmail.com>
release: Stage Release 23rd Feb 2023
release: bug-fixes and ui/ux improvements for 23 Feb 2023
* chore: new link endpoints * chore: added created by info for link * chore: cannot have empty state group * feat: filtering for cycle and module issue and updated grouper function for grouping in modules and cycles (#342) * docs: github integration (#346) * fix: add pagination for github repositories endpoint (#345) * fix: remove bot accounts from list api (#344) * refactor: create new endpoints for date checking getting current upcoming and past cycles (#343) * refactor: create new endpoints for date checking getting current upcoming and past cycles * refactor: rename endpoint to match consistency * fix: remove project slug (#340) * refactor: update links to different endpoints (#338) * chore: cycle validation services and constants added * style: kanban board * chore: cycle type and services updated * chore: completed cycle dynamic importing and refactor * feat: cycle modal date validation * fix: build fix * style: redesigned sidebar, added new icons and spacing changes * style: changed app header color to white * feat: cover image selector for project create * style/projects_page * style: added dragging state design * fix: cycle form date * chore: draft cycle services and types * feat: draft tab and cycle sidebar update * style: projects list page * fix: image aspect ratio * style: assignee drop down label * style: new primary button design * style: assignee dropdown * style: assignee dropdown stlye fix * style: state dropdown redesign * style: dropdown ui consisteny * style: priority dropdown redesign * style: label dropdown redesign * style: issue dropdown re-order * style: state Icon * style: date dropdown redesign * fix: dropdown issue label * style: transsition * style: color fixed * chore: labels list file and function rename * style: redesigned create project modal style: changed image picker to pop-over instread of modal * fix: upload button on workspace settings page not working, UX of workspace settings image upload * feat: date range status function added * style: project settings pages * fix: merge conflicts * fix: mutation fix and date range helper fn added * style: workspace settings pages * style: dropdowns, feat: favorite projects in sidebar * feat: global component for combobox with new design * feat: custom context menu for issues in kanban board * refactor: global context menu component * chore: updated context menu component * chore: updated sidebar selects * style: kanban horizontal scrollbar added (#372) * style: new cycle list (#374) * feat: short date helper function * feat: linear progress indicator added * style: new cyce list and cycle card design * feat: short date function improve * feat: linear progress indicator improvement * style: cycle card and progress indicator * fix: helper date function and progress indicator fix * fix: build error --------- Co-authored-by: Aaryan Khandelwal <aaryankhandu123@gmail.com> * chore: updated project favorites endpoints (#375) * feat: favorite cycle and style: style improvements (#376) * style: consistent btn * style: caret direction for disclosure * fix: progress tooltip value rounded * chore: favorite cycle serivces * chore: favorite cycle type and constant * feat: favorite cycle feat added * refactor: favorite services and type * fix: build fix * refactor: sidebar projects menu (#377) * feat: add endpoint for draft cycles and add validation for creating draft cycles (#355) * feat: add endpoint for draft cycles and add validation for creating draft cycles * fix: key error in cycle create endpoint * feat: delete file assets from storage (#373) * chore: rename past cycle to completed cycle (#347) * fix: workspace member listing endpoint (#348) * fix: module issue viewset typo (#349) * feat: add project to favourites (#352) * feat: add project to favourites * feat: add project is_favourite attribute to list endpoints * refactor: updated destroy endpoint to send project_id * chore: nomenclature update * feat: add cover image to project (#353) * fix: cycle date filtering for current and upcoming cycle (#357) * fix: update filtering for completed cycles * fix: filter updated for upcoming cycles * fix: cycle and module issue filtering (#363) * feat: already exisiting url validation (#368) * feat: cycle favourites for user (#369) * feat: cycle favourites for user * chore: update nomenclature * chore: update on nomenclature * feat: add favorites for completed and current cycle endpoints * feat: module favourites for user (#370) * feat: added floating toolbar on text selection (#378) style: re-designed create-issue modal * dev: migrations added for ProjectFavorite, ModuleFavorite, CycleFavorite including a bunch of other attribs * chore: cycles loading, fix: cycles favorite mutation (#379) * style: cycle sidebar, fix: cycle card bug fix (#383) * style: new cycle sidebar * style: other information section * style: progress bar bg fix * fix: cycle card bug fix * style: progress chart * style: chart tooltip * style : module sidebar (#385) * style: new cycle sidebar * style: other information section * style: progress bar bg fix * fix: cycle card bug fix * style: progress chart * style: chart tooltip * style: module link tab added in sidebar stats * style: lead and member select * fix: text selection moving when typing in between (#384) * feat: added floating toolbar on text selection (#386) style: re-designed create-issue modal * style :module list (#387) * chore: module favorite type and services * style: module list * style: module list and card * fix: link fix * style: truncate (#388) * style: truncate * fix: truncate text added to cycle and module card * fix: custom menu link item (#390) * fix: ui fixes (#392) * fix: ui fixes * chore: kanban issue title length * style: ui fix (#393) * style: truncate * fix: truncate text added to cycle and module card * fix: progress percentage * feat: cycle card tooltip * fix: sidebar fix * fix: edit module mutation error (#394) * fix: issue details mutation (#389) * fix: ui improvement (#395) * fix: current cycle date updation * fix: sidebar overflow fix , date helper fn added * chore: update module dropdowns (#396) * fix: project member filter for bot accounts (#391) * fix: make api token only view once (#382) * dev: add back migration for project cover images (#381) * fix: rename db host name for docker setup (#380) * dev: promote to staging (#397) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: sriram veeraghanta <veeraghanta.sriram@gmail.com> Co-authored-by: pablohashescobar <nikhilschacko@gmail.com> Co-authored-by: pablohashescobar <118773738+pablohashescobar@users.noreply.github.com> Co-authored-by: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com> Co-authored-by: Anmol Singh Bhatia <anmolsinghbhatia1001@gmail.com> Co-authored-by: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Dakshesh Jain <65905942+dakshesh14@users.noreply.github.com> Co-authored-by: Aaryan Khandelwal <aaryankhandu123@gmail.com> Co-authored-by: Narayana <narayana.vadapalli1996@gmail.com> * Revert "dev: promote to staging (#397)" (#398) This reverts commit f7405ba. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Aaryan Khandelwal <aaryankhandu123@gmail.com> Co-authored-by: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com> Co-authored-by: pablohashescobar <118773738+pablohashescobar@users.noreply.github.com> Co-authored-by: sphynxux <122926002+sphynxux@users.noreply.github.com> Co-authored-by: Anmol Singh Bhatia <anmolsinghbhatia@caravel.tech> Co-authored-by: Dakshesh Jain <dakshesh.jain14@gmail.com> Co-authored-by: Dakshesh Jain <65905942+dakshesh14@users.noreply.github.com> Co-authored-by: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com> Co-authored-by: sriram veeraghanta <veeraghanta.sriram@gmail.com> Co-authored-by: pablohashescobar <nikhilschacko@gmail.com> Co-authored-by: Anmol Singh Bhatia <anmolsinghbhatia1001@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Narayana <narayana.vadapalli1996@gmail.com>
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
pablohashescobar
approved these changes
Mar 8, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.