Aaryan Khandelwal 26f8c52fd7 fix: merge conflicts resolved

2025-01-16 20:32:57 +05:30

..

account

Merge branch 'preview' into 'sync/ce-ee'

2025-01-15 16:50:33 +05:30

analytics

chore: moving web constants to packages

2025-01-14 16:30:43 +05:30

api-token

[WEB-2442] feat: Revamp Timeline Layout (#5915)

2024-10-28 18:03:31 +05:30

archives

chore: moving web constants to packages

2025-01-14 16:30:43 +05:30

auth-screens

[WEB-2357] fix: update and redefine user roles across the platform (#5466)

2024-09-11 17:10:15 +05:30

automation

fix: casing across all settings pages (#5675)

2024-09-23 16:41:25 +05:30

command-palette

Merge branch 'preview' into 'sync/ce-ee'

2025-01-15 16:50:33 +05:30

common

Merge branch 'preview' into 'sync/ce-ee'

2025-01-15 16:50:33 +05:30

core

fix: merge conflicts resolved

2025-01-16 20:32:57 +05:30

cycles

Merge pull request #2203 from makeplane/sync/ce-ee

2025-01-15 21:12:50 +05:30

dashboard

fix: build errors while upgrading date-fns

2024-12-23 19:05:52 +05:30

dropdowns

chore: added current cycle to cycle dropdown (#6376)

2025-01-15 15:59:57 +05:30

editor

fix: merge conflicts resolved

2025-01-16 20:32:57 +05:30

empty-state

[WEB-3096] feat: stickies page (#6380)

2025-01-16 19:57:51 +05:30

estimates

Merge branch 'preview' into 'sync/ce-ee'

2025-01-15 16:50:33 +05:30

exporter

fix: casing across all settings pages (#5675)

2024-09-23 16:41:25 +05:30

gantt-chart

use getBlockById from the store for modules (#6325)

2025-01-06 20:28:32 +05:30

global

fix: removed default timezone and added the value from the user details and handle the value in timezone select (#6381)

2025-01-10 18:41:12 +05:30

graphs

Refactor folder structure (#4759)

2024-06-11 14:39:52 +05:30

home

[WEB-3096] feat: stickies page (#6380)

2025-01-16 19:57:51 +05:30

icons

[WEB-1116] fix: editor info badges occupying multiple lines (#5548)

2024-09-07 09:01:01 +05:30

importers

Merge branch 'preview' into 'sync/ce-ee'

2025-01-15 16:50:33 +05:30

inbox

chore: workspace entity search endpoint (#6272)

2024-12-26 15:00:32 +05:30

instance

fix: code spliting and instance maintenance screens

2024-11-12 19:48:31 +05:30

integration

Merge branch 'preview' into 'sync/ce-ee'

2025-01-15 16:50:33 +05:30

issues

Merge pull request #2212 from makeplane/sync/ce-ee

2025-01-16 15:23:19 +05:30

labels

chore: lint related changes and packaging fixes (#6163)

2024-12-06 14:56:49 +05:30

modules

Merge branch 'preview' into 'sync/ce-ee'

2025-01-15 16:50:33 +05:30

onboarding

Merge branch 'preview' into 'sync/ce-ee'

2025-01-15 16:50:33 +05:30

page-views

Merge branch 'preview' into 'sync/ce-ee'

2025-01-15 16:50:33 +05:30

pages

chore: add page flag hook (#6354)

2025-01-08 15:42:14 +05:30

profile

Merge branch 'preview' into 'sync/ce-ee'

2025-01-15 16:50:33 +05:30

project

Merge branch 'preview' into 'sync/ce-ee'

2025-01-15 16:50:33 +05:30

project-states

chore: update issue-states settings ui (#6338)

2025-01-07 17:16:42 +05:30

sidebar

[WEB-1920] dev: app sidebar revamp (#5150)

2024-07-18 12:56:33 +05:30

stickies

[WEB-3096] feat: stickies page (#6380)

2025-01-16 19:57:51 +05:30

ui

Merge branch 'preview' into 'sync/ce-ee'

2025-01-15 16:50:33 +05:30

user

Refactor folder structure (#4759)

2024-06-11 14:39:52 +05:30

views

chore: modified functionality and placement for live button (#6400)

2025-01-15 16:21:00 +05:30

web-hooks

[WEB-2762] chore: loader code refactor (#5992)

2024-12-02 13:24:01 +05:30

workspace

Merge branch 'preview' into 'sync/ce-ee'

2025-01-15 16:50:33 +05:30

workspace-notifications

Merge branch 'preview' into 'sync/ce-ee'

2025-01-15 16:50:33 +05:30