mirror of
https://github.com/penpot/penpot.git
synced 2026-10-29 14:00:37 +00:00
2a5a235063
This commit carries the design-branching preview by Juan de la Cruz: elhombretecla/penpot:branching at 0ac265a3f5, which holds 45 commits and 3 develop merges and was last synced with develop on 2026-09-16. The branch is squashed together with a merge of origin/develop at 7c039231f7, so the tree is the merged result. The merge resolved conflicts in six files: - backend/src/app/migrations.clj: develop's 0155 and 0156 steps run first, then the branching steps; the names differ. - backend/src/app/rpc/commands/viewer.clj: both requires stay. - common/src/app/common/flags.cljc: both flags stay. - frontend/src/app/main/ui/dashboard/file_menu.cljs: "Create branch" becomes a menu-item* with the same id, guard and handler. - frontend/src/app/main/ui/dashboard/grid.cljs: the portal goes with develop's menu rewrite; the branches popover stays in the trigger. - frontend/translations/en.po: both sides' entries stay, with develop's source references. Co-authored-by: Juan de la Cruz <delacruzgarciajuan@gmail.com> AI-assisted-by: mixed models
36 lines
1.1 KiB
JSON
36 lines
1.1 KiB
JSON
[
|
|
{
|
|
"~:id": "~uc7ce0794-0992-8105-8004-38f280443999",
|
|
"~:file-branch-id": "~uc7ce0794-0992-8105-8004-38f280443998",
|
|
"~:source-file-id": "~uc7ce0794-0992-8105-8004-38f280443849",
|
|
"~:target-file-id": "~uc7ce0794-0992-8105-8004-38f280443997",
|
|
"~:title": "Checkout redesign",
|
|
"~:description": "Please review the new checkout flow",
|
|
"~:created-by": "~uc7ce0794-0992-8105-8004-38e630f29a9c",
|
|
"~:created-at": "~m1713536343369",
|
|
"~:updated-at": "~m1713873823633",
|
|
"~:status": "open",
|
|
"~:review-revn": 11,
|
|
"~:review-updated-at": "~m1713873823633",
|
|
"~:closed-at": null,
|
|
"~:closed-by": null,
|
|
"~:branch-name": "checkout",
|
|
"~:target-name": "New File 1",
|
|
"~:reviews": [
|
|
{
|
|
"~:profile-id": "~uc7ce0794-0992-8105-8004-38e630f29a9b",
|
|
"~:state": "pending",
|
|
"~:reviewed-revn": null,
|
|
"~:comment": null,
|
|
"~:updated-at": "~m1713873823633",
|
|
"~:stale": false
|
|
}
|
|
],
|
|
"~:review-state": "pending",
|
|
"~:outdated": false,
|
|
"~:ahead": 1,
|
|
"~:behind": 0,
|
|
"~:conflicts": 0
|
|
}
|
|
]
|