[6.x] Forms 2 - #15039

blocks (function() { function addCopyButtons() { document.querySelectorAll('pre code').forEach(function(codeBlock) { if (codeBlock.parentElement.hasAttribute('data-copy-added')) return; codeBlock.parentElement.setAttribute('data-copy-added', 'true'); var btn = document.createElement('button'); btn.textContent = 'Copy'; btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;'; btn.onmouseover = function() { this.style.opacity = '1'; }; btn.onmouseout = function() { this.style.opacity = '0.7'; }; btn.onclick = function() { navigator.clipboard.writeText(codeBlock.textContent).then(function() { btn.textContent = 'Copied!'; setTimeout(function() { btn.textContent = 'Copy'; }, 1500); }); }; codeBlock.parentElement.style.position = 'relative'; codeBlock.parentElement.appendChild(btn); }); } addCopyButtons(); // Re-run on dynamic content var observer = new MutationObserver(addCopyButtons); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + ' [6.x] Forms 2 by jasonvarga · Pull Request #15039 · statamic/cms · GitHub Skip to contentNavigation Menu Sign inAppearance settings AI CODE CREATIONGitHub CopilotWrite better code with AI GitHub Copilot appDirect agents from issue to merge MCP RegistryIntegrate external tools DEVELOPER WORKFLOWSActionsAutomate any workflow CodespacesInstant dev environments IssuesPlan and track work Code ReviewManage code changes Code QualityEnforce quality at merge APPLICATION SECURITYGitHub Advanced SecurityFind and fix vulnerabilities Code securitySecure your code as you build Secret protectionStop leaks before they start EXPLOREWhy GitHub Documentation Blog Changelog Marketplace View all features BY COMPANY SIZEEnterprises Small and medium teams Startups Nonprofits BY USE CASEApp Modernization DevSecOps DevOps CI/CD View all use cases BY INDUSTRYHealthcare Financial services Manufacturing Government View all industries View all solutions EXPLORE BY TOPICAI Software Development DevOps Security View all topics EXPLORE BY TYPECustomer stories Events & webinars Ebooks & reports Business insights GitHub Skills SUPPORT & SERVICESDocumentation Customer support Community forum Trust center Partners View all resources COMMUNITYGitHub SponsorsFund open source developers PROGRAMSSecurity Lab Maintainer Community GitHub Stars Archive Program REPOSITORIESTopics Trending Collections ENTERPRISE SOLUTIONSEnterprise platformAI-powered developer platform AVAILABLE ADD-ONSGitHub Advanced SecurityEnterprise-grade security features Copilot for BusinessEnterprise-grade AI features Premium SupportEnterprise-grade 24/7 support Pricing Sign in Sign upAppearance settings You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert Uh oh! There was an error while loading. Please reload this page. statamic /cmsPublic Uh oh! There was an error while loading. Please reload this page. Notifications You must be signed in to change notification settings Fork 641 Star 4.9k Code Issues201 Pull requests100 Discussions Actions Projects Security and quality44 Insights Additional navigation options Code Issues Pull requests Discussions Actions Projects Security and quality Insights [6.x] Forms 2 - #15039 #15039 Draft jasonvarga wants to merge 1000 commits into6.xstatamic/cms:6.xfrom forms-2statamic/cms:forms-2Copy head branch name to clipboard ConversationCommits1000 (1000)ChecksFiles changed Draft [6.x] Forms 2#15039jasonvarga wants to merge 1000 commits into6.xstatamic/cms:6.xfrom forms-2statamic/cms:forms-2Copy head branch name to clipboard Commits This pull request is big! We're only showing the most recent 250 commits Commits on Jun 4, 2026 Star rating - add ability to adjust gap and change SVG to use our Flex icon jaygeorge committed 8ddee91View commit detailsCopy full SHA for 8ddee91 Browse repository at this point Star rating - map theme vars jaygeorge committed 69ab566View commit detailsCopy full SHA for 69ab566 Browse repository at this point Star rating - leave as unrated for the form demo jaygeorge committed 67c0b9cView commit detailsCopy full SHA for 67c0b9c Browse repository at this point Star rating - set a floor and ceiling jaygeorge committed 44f7a1bView commit detailsCopy full SHA for 44f7a1b Browse repository at this point Star rating - change star appearance and finish draft jaygeorge committed b749f10View commit detailsCopy full SHA for b749f10 Browse repository at this point fix indentation duncanmcclean committed 8c675a3View commit detailsCopy full SHA for 8c675a3 Browse repository at this point pages actually have ids now duncanmcclean committed a2c02e6View commit detailsCopy full SHA for a2c02e6 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed f8499a6View commit detailsCopy full SHA for f8499a6 Browse repository at this point Star rating - tweak size jaygeorge committed 91e9954View commit detailsCopy full SHA for 91e9954 Browse repository at this point Image choice - first pass jaygeorge committed e37e96bView commit detailsCopy full SHA for e37e96b Browse repository at this point Image choice - Switch to Tailwind jaygeorge committed a5e2211View commit detailsCopy full SHA for a5e2211 Browse repository at this point Image choice - fix error when saving jaygeorge committed ad0ed0eView commit detailsCopy full SHA for ad0ed0e Browse repository at this point Fix double border effect jaygeorge committed cde898dView commit detailsCopy full SHA for cde898d Browse repository at this point Image choice - render image previews jaygeorge committed fb85b8fView commit detailsCopy full SHA for fb85b8f Browse repository at this point Image choice - add a letter before the label jaygeorge committed 3dbae2cView commit detailsCopy full SHA for 3dbae2c Browse repository at this point Image choice - style the letters jaygeorge committed 783f17eView commit detailsCopy full SHA for 783f17e Browse repository at this point Image choice - add aspect ratio as an option for the comparisons jaygeorge committed 4484482View commit detailsCopy full SHA for 4484482 Browse repository at this point Image choice - add example jaygeorge committed be9fcf1View commit detailsCopy full SHA for be9fcf1 Browse repository at this point Image choice - improve demo jaygeorge committed 70717e5View commit detailsCopy full SHA for 70717e5 Browse repository at this point Commits on Jun 5, 2026 Image choice - tighten up a few things 🧹 jaygeorge committed 915d85cView commit detailsCopy full SHA for 915d85c Browse repository at this point Image choice - fix border 🧹 jaygeorge committed de88e8dView commit detailsCopy full SHA for de88e8d Browse repository at this point Image choice - fix padding jaygeorge committed 5adca1cView commit detailsCopy full SHA for 5adca1c Browse repository at this point Image choice - make cards more consistent with the rest of the UI jaygeorge committed 5e28231View commit detailsCopy full SHA for 5e28231 Browse repository at this point Image choice - tighten up letter choice jaygeorge committed 0735f1bView commit detailsCopy full SHA for 0735f1b Browse repository at this point Make panels slightly narrower at smaller MQs jaygeorge committed ec9c31cView commit detailsCopy full SHA for ec9c31c Browse repository at this point Add ranking form field type - first pass jaygeorge committed c305049View commit detailsCopy full SHA for c305049 Browse repository at this point Ranking field type - don't show "null" when adding a new row jaygeorge committed 6ef2072View commit detailsCopy full SHA for 6ef2072 Browse repository at this point Ranking field type - improve appearance jaygeorge committed 68825edView commit detailsCopy full SHA for 68825ed Browse repository at this point Add opinion scale field type - first pass jaygeorge committed 53ee8a7View commit detailsCopy full SHA for 53ee8a7 Browse repository at this point Add opinion scale field type - use Tailwind jaygeorge committed e9503dcView commit detailsCopy full SHA for e9503dc Browse repository at this point Add opinion scale field type - fix labels jaygeorge committed 93496c2View commit detailsCopy full SHA for 93496c2 Browse repository at this point Add opinion scale field type - tidy instructions jaygeorge committed a6eaaf4View commit detailsCopy full SHA for a6eaaf4 Browse repository at this point Add opinion scale field type - finesse jaygeorge committed 3d8edfbView commit detailsCopy full SHA for 3d8edfb Browse repository at this point Add opinion scale field type - optically align labels jaygeorge committed 7ce1379View commit detailsCopy full SHA for 7ce1379 Browse repository at this point Field types - dark mode balances jaygeorge committed 62b76e1View commit detailsCopy full SHA for 62b76e1 Browse repository at this point Star rating - fix dark mode jaygeorge committed cd09b55View commit detailsCopy full SHA for cd09b55 Browse repository at this point Fix Builder field type - it was behaving weirdly jaygeorge committed 237570dView commit detailsCopy full SHA for 237570d Browse repository at this point Commits on Jun 8, 2026 Logic tab - fixed collapsed row badge/value combo jaygeorge committed c58ecd0View commit detailsCopy full SHA for c58ecd0 Browse repository at this point Logic tab - fixed row decoration jaygeorge committed 4163a83View commit detailsCopy full SHA for 4163a83 Browse repository at this point ✨ fix form not saving - textarea is a CP fieldtype, not a form fieldtype. The builder wraps it in Fallback, but was sending fieldtype: "fallback" back on save. The repository can't look up "fallbac… Show description for 1e759d5 jaygeorge committed 1e759d5View commit detailsCopy full SHA for 1e759d5 Browse repository at this point Only output the logic icon on page titles when they logic jaygeorge committed 41ac3ceView commit detailsCopy full SHA for 41ac3ce Browse repository at this point Tighten page title space jaygeorge committed d8e3064View commit detailsCopy full SHA for d8e3064 Browse repository at this point Fix banner icon for compressed view - Information fields (banner, heading, paragraph) had their own collapsed markup that skipped the shared compressed-view structure. jaygeorge committed 2cfe1faView commit detailsCopy full SHA for 2cfe1fa Browse repository at this point Switch category color from amber to green - amber is too close to orange and the category feels pretty different to choice jaygeorge committed 0160f6bView commit detailsCopy full SHA for 0160f6b Browse repository at this point Commits on Jun 10, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed d917fb9View commit detailsCopy full SHA for d917fb9 Browse repository at this point Revert "Fix Builder field type - it was behaving weirdly" Show description for 5092cbb duncanmcclean committed 5092cbbView commit detailsCopy full SHA for 5092cbb Browse repository at this point Revert "✨ fix form not saving - textarea is a CP fieldtype, not a form fieldtype. The builder wraps it in Fallback, but was sending fieldtype: "fallback" back on save. The repository can't look up … Show description for 7e2b7b5 duncanmcclean committed 7e2b7b5View commit detailsCopy full SHA for 7e2b7b5 Browse repository at this point Revert various changes from c3050492 Show description for 9975a69 duncanmcclean committed 9975a69View commit detailsCopy full SHA for 9975a69 Browse repository at this point wip duncanmcclean committed bd1c032View commit detailsCopy full SHA for bd1c032 Browse repository at this point wip duncanmcclean committed 688379aView commit detailsCopy full SHA for 688379a Browse repository at this point Revert field preview change in be9fcf1c. Show description for 7f17afd duncanmcclean committed 7f17afdView commit detailsCopy full SHA for 7f17afd Browse repository at this point Review changes to builder in fb85b8fc Show description for 807d725 duncanmcclean committed 807d725View commit detailsCopy full SHA for 807d725 Browse repository at this point fix weird indentation duncanmcclean committed de157d0View commit detailsCopy full SHA for de157d0 Browse repository at this point wip duncanmcclean committed 3aab7a2View commit detailsCopy full SHA for 3aab7a2 Browse repository at this point image choice fieldtype tweaks Show description for e56c667 duncanmcclean committed e56c667View commit detailsCopy full SHA for e56c667 Browse repository at this point require field labels in form builder duncanmcclean committed a6972a9View commit detailsCopy full SHA for a6972a9 Browse repository at this point opinion scale fieldtype tweaks Show description for f07d652 duncanmcclean committed f07d652View commit detailsCopy full SHA for f07d652 Browse repository at this point wip duncanmcclean committed 47b6f21View commit detailsCopy full SHA for 47b6f21 Browse repository at this point star rating fieldtype tweaks Show description for 7827322 duncanmcclean committed 7827322View commit detailsCopy full SHA for 7827322 Browse repository at this point ranking fieldtype tweaks Show description for e905f05 duncanmcclean committed e905f05View commit detailsCopy full SHA for e905f05 Browse repository at this point banner fieldtype tweaks duncanmcclean committed 4a7d327View commit detailsCopy full SHA for 4a7d327 Browse repository at this point wip duncanmcclean committed 9b3e299View commit detailsCopy full SHA for 9b3e299 Browse repository at this point remove unnecessary (and missing) instructions duncanmcclean committed cc6adb1View commit detailsCopy full SHA for cc6adb1 Browse repository at this point avoid using information fields (banner, heading, paragraph) in logic Show description for b6f6fdb duncanmcclean committed b6f6fdbView commit detailsCopy full SHA for b6f6fdb Browse repository at this point improve logic value stuff for new form fieldtypes duncanmcclean committed 592eefbView commit detailsCopy full SHA for 592eefb Browse repository at this point make container/folder of image options fieldtype configurable duncanmcclean committed 6a8d511View commit detailsCopy full SHA for 6a8d511 Browse repository at this point re-work config options for information fields & add field stubs duncanmcclean committed a060025View commit detailsCopy full SHA for a060025 Browse repository at this point fix failing tests duncanmcclean committed f13d239View commit detailsCopy full SHA for f13d239 Browse repository at this point provide `is_informative` to fields loop to avoid outputting labels/instructions duncanmcclean committed 044e66eView commit detailsCopy full SHA for 044e66e Browse repository at this point use `is_informative` in our fields stub duncanmcclean committed e533341View commit detailsCopy full SHA for e533341 Browse repository at this point Commits on Jun 11, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 84e4928View commit detailsCopy full SHA for 84e4928 Browse repository at this point fix icon not being persisted in banner field config duncanmcclean committed 0eda343View commit detailsCopy full SHA for 0eda343 Browse repository at this point Avoid showing preview when dragging fields in collapsed mode duncanmcclean committed 05bdc7bView commit detailsCopy full SHA for 05bdc7b Browse repository at this point adjust how min/max clamping happens in the opinion range fieldtype duncanmcclean committed 1b0d9ebView commit detailsCopy full SHA for 1b0d9eb Browse repository at this point wip duncanmcclean committed 48cb929View commit detailsCopy full SHA for 48cb929 Browse repository at this point "generate" opinion scale values in php duncanmcclean committed 38d9227View commit detailsCopy full SHA for 38d9227 Browse repository at this point replace default values with placeholders Show description for c49797c duncanmcclean committed c49797cView commit detailsCopy full SHA for c49797c Browse repository at this point simpler opinion scale views duncanmcclean committed 4025df1View commit detailsCopy full SHA for 4025df1 Browse repository at this point simpler star rating duncanmcclean committed aad9104View commit detailsCopy full SHA for aad9104 Browse repository at this point fix error in field inspector when page contains fieldset import duncanmcclean committed a7d69d4View commit detailsCopy full SHA for a7d69d4 Browse repository at this point simpler ranking views duncanmcclean committed 9f7a37eView commit detailsCopy full SHA for 9f7a37e Browse repository at this point process field config when saving, not when updating config options Show description for 7bad860 duncanmcclean committed 7bad860View commit detailsCopy full SHA for 7bad860 Browse repository at this point avoid generating field handles with hyphens Show description for ac6d62a duncanmcclean committed ac6d62aView commit detailsCopy full SHA for ac6d62a Browse repository at this point image choice view duncanmcclean committed 3cf0913View commit detailsCopy full SHA for 3cf0913 Browse repository at this point preprocess values when loading form builder duncanmcclean committed 57a0d60View commit detailsCopy full SHA for 57a0d60 Browse repository at this point make form fieldtype for spacer duncanmcclean committed 288fd39View commit detailsCopy full SHA for 288fd39 Browse repository at this point prevent configuring logic based on structure fields duncanmcclean committed ae35c37View commit detailsCopy full SHA for ae35c37 Browse repository at this point Commits on Jun 12, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed bdc19aeView commit detailsCopy full SHA for bdc19ae Browse repository at this point fix banner example duncanmcclean committed db760e9View commit detailsCopy full SHA for db760e9 Browse repository at this point provide meta and values to previews publish container duncanmcclean committed 321d0d2View commit detailsCopy full SHA for 321d0d2 Browse repository at this point hide validation tab in field inspector for structure/information fields Show description for 96cfec5 duncanmcclean committed 96cfec5View commit detailsCopy full SHA for 96cfec5 Browse repository at this point Revert "preprocess values when loading form builder" Show description for be447a4 duncanmcclean committed be447a4View commit detailsCopy full SHA for be447a4 Browse repository at this point Revert "process field config when saving, not when updating config options" Show description for 3b05e49 duncanmcclean committed 3b05e49View commit detailsCopy full SHA for 3b05e49 Browse repository at this point preprocess before validating duncanmcclean committed 5ee6cf8View commit detailsCopy full SHA for 5ee6cf8 Browse repository at this point group form fieldtype duncanmcclean committed 7e01077View commit detailsCopy full SHA for 7e01077 Browse repository at this point combine assets and files fieldtypes into a single upload form fieldtype duncanmcclean committed 26d37fbView commit detailsCopy full SHA for 26d37fb Browse repository at this point very lightly style rankings view so its clear you can drag & drop duncanmcclean committed b42935cView commit detailsCopy full SHA for b42935c Browse repository at this point use FormLayout on submission show page duncanmcclean committed e49f607View commit detailsCopy full SHA for e49f607 Browse repository at this point Commits on Jun 15, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed fdb3c20View commit detailsCopy full SHA for fdb3c20 Browse repository at this point formatting duncanmcclean committed 4a81aa3View commit detailsCopy full SHA for 4a81aa3 Browse repository at this point Small background color adjustments including dark mode jaygeorge committed fc38b65View commit detailsCopy full SHA for fc38b65 Browse repository at this point fix failing tests duncanmcclean committed a363f92View commit detailsCopy full SHA for a363f92 Browse repository at this point wip duncanmcclean committed a85473dView commit detailsCopy full SHA for a85473d Browse repository at this point missing `__` imports duncanmcclean committed 37be4c6View commit detailsCopy full SHA for 37be4c6 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed bfdb8e4View commit detailsCopy full SHA for bfdb8e4 Browse repository at this point Wrap some inline stylesheet using a cascade layer so devs can easily override jaygeorge committed e66d0ffView commit detailsCopy full SHA for e66d0ff Browse repository at this point Revert "Wrap some inline stylesheet using a cascade layer so devs can easily override" Show description for 7e759eb jaygeorge committed 7e759ebView commit detailsCopy full SHA for 7e759eb Browse repository at this point [6.x] Forms 2: Yes/No Form Fieldtype (#14819) Show description for 272cb73 duncanmcclean andjaygeorge authored 272cb73View commit detailsCopy full SHA for 272cb73 Browse repository at this point remove solo.yml from git duncanmcclean committed cf27f47View commit detailsCopy full SHA for cf27f47 Browse repository at this point Improve focus / selection state - Image Choice jaygeorge committed e95ff5dView commit detailsCopy full SHA for e95ff5d Browse repository at this point Improve focus / selection state - Opinion Scale jaygeorge committed 137ba00View commit detailsCopy full SHA for 137ba00 Browse repository at this point Commits on Jun 16, 2026 Yes/No - only fill the icon if the option is selected jaygeorge committed dca2b8bView commit detailsCopy full SHA for dca2b8b Browse repository at this point [6.x] Make the ranking fieldtype orderable with just the keyboard (#14823) Show description for 166a8ac jaygeorge andduncanmcclean authored 166a8acView commit detailsCopy full SHA for 166a8ac Browse repository at this point prevent information fieldtypes showing in listing column list duncanmcclean committed b0a68bdView commit detailsCopy full SHA for b0a68bd Browse repository at this point Merge branch '6.x' into forms-2 jaygeorge committed 754131eView commit detailsCopy full SHA for 754131e Browse repository at this point Logic rule formatting jaygeorge committed cc39fd3View commit detailsCopy full SHA for cc39fd3 Browse repository at this point Logic rule formatting jaygeorge committed ff01c73View commit detailsCopy full SHA for ff01c73 Browse repository at this point Improve logic rule badge balance jaygeorge committed be83111View commit detailsCopy full SHA for be83111 Browse repository at this point Commits on Jun 17, 2026 Improve logic rule text balance jaygeorge committed 96bb4a6View commit detailsCopy full SHA for 96bb4a6 Browse repository at this point Fix empty state dark border jaygeorge committed 8ed11aaView commit detailsCopy full SHA for 8ed11aa Browse repository at this point Ranking field - add an 'ordered' state jaygeorge committed 9433d57View commit detailsCopy full SHA for 9433d57 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed e04391cView commit detailsCopy full SHA for e04391c Browse repository at this point underlying yes/no fieldtype shouldn't be visible in form builder Show description for 890d3b0 duncanmcclean committed 890d3b0View commit detailsCopy full SHA for 890d3b0 Browse repository at this point Commits on Jun 18, 2026 [6.x] Fix the stars rating field rendering (#14820) Show description for 9db3d8d jaygeorge andduncanmcclean authored 9db3d8dView commit detailsCopy full SHA for 9db3d8d Browse repository at this point Commits on Jun 19, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6ba903dView commit detailsCopy full SHA for 6ba903d Browse repository at this point translate form title in all the places duncanmcclean committed 159fcdaView commit detailsCopy full SHA for 159fcda Browse repository at this point Commits on Jun 22, 2026 [6.x] Forms 2: Compressed view (#14853) jaygeorge authored 1717518View commit detailsCopy full SHA for 1717518 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 21b1829View commit detailsCopy full SHA for 21b1829 Browse repository at this point add confirmation modal before deleting field duncanmcclean committed aa8db6dView commit detailsCopy full SHA for aa8db6d Browse repository at this point [6.x] Forms 2: Add "Always hide" option to field logic dropdown (#14859) duncanmcclean authored 57f9f5cView commit detailsCopy full SHA for 57f9f5c Browse repository at this point Commits on Jun 23, 2026 wip duncanmcclean committed d94e62dView commit detailsCopy full SHA for d94e62d Browse repository at this point Commits on Jun 24, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 1e397bbView commit detailsCopy full SHA for 1e397bb Browse repository at this point Commits on Jun 25, 2026 [6.x] Forms 2: Submission Statuses (#14832) Show description for df261ed duncanmcclean andjasonvarga authored df261edView commit detailsCopy full SHA for df261ed Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 2e75c1cView commit detailsCopy full SHA for 2e75c1c Browse repository at this point Commits on Jun 30, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed e4dd0a8View commit detailsCopy full SHA for e4dd0a8 Browse repository at this point adjust initial page logic Show description for 5f81608 duncanmcclean committed 5f81608View commit detailsCopy full SHA for 5f81608 Browse repository at this point [6.x] Forms 2: Site Filter (#14902) duncanmcclean authored 47f7905View commit detailsCopy full SHA for 47f7905 Browse repository at this point cleanup `data-panels-showing` attribute when unmounting panel layout duncanmcclean committed e090e85View commit detailsCopy full SHA for e090e85 Browse repository at this point avoid publishing `star-rating.css`. the css is inlined now. duncanmcclean committed 9f2b2d2View commit detailsCopy full SHA for 9f2b2d2 Browse repository at this point Commits on Jul 1, 2026 exclude partial submissions from results count on forms listing duncanmcclean committed eff4c77View commit detailsCopy full SHA for eff4c77 Browse repository at this point move `is_informative` out of generic `RendersForms` trait Show description for 07b190f duncanmcclean committed 07b190fView commit detailsCopy full SHA for 07b190f Browse repository at this point Commits on Jul 2, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6e0764aView commit detailsCopy full SHA for 6e0764a Browse repository at this point Merge branch '6.x' into forms-2 jaygeorge committed 9b7ae88View commit detailsCopy full SHA for 9b7ae88 Browse repository at this point [6.x] Forms 2: Field numbering (#14909) duncanmcclean authored 0ac798dView commit detailsCopy full SHA for 0ac798d Browse repository at this point Commits on Jul 3, 2026 Fix architectural lines breaking out of .content, e.g. /collections/create jaygeorge committed 378491cView commit detailsCopy full SHA for 378491c Browse repository at this point Merge remote-tracking branch 'origin/6.x' into forms-2 Show description for bbea10d jasonvarga committed bbea10dView commit detailsCopy full SHA for bbea10d Browse repository at this point Small dark mode fix jaygeorge committed e88ad6fView commit detailsCopy full SHA for e88ad6f Browse repository at this point Commits on Jul 6, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 461512dView commit detailsCopy full SHA for 461512d Browse repository at this point fix logic indicator not showing sometimes duncanmcclean committed 3b4eb46View commit detailsCopy full SHA for 3b4eb46 Browse repository at this point include fieldset reference in tooltip duncanmcclean committed 491b44dView commit detailsCopy full SHA for 491b44d Browse repository at this point [6.x] Forms 2: Logic Tree (#14811) Show description for 243b695 jaygeorge andduncanmcclean authored 243b695View commit detailsCopy full SHA for 243b695 Browse repository at this point wip duncanmcclean committed 52798d9View commit detailsCopy full SHA for 52798d9 Browse repository at this point reset active tab in page inspector when selecting the last page duncanmcclean committed be337b9View commit detailsCopy full SHA for be337b9 Browse repository at this point avoid moving fields between pages in logic tree duncanmcclean committed 5739fc4View commit detailsCopy full SHA for 5739fc4 Browse repository at this point Commits on Jul 7, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed de239ddView commit detailsCopy full SHA for de239dd Browse repository at this point Small dark mode badge fix for page logic jaygeorge committed ef8d8feView commit detailsCopy full SHA for ef8d8fe Browse repository at this point Make "delete" icon condition only appear on hover, like the trash icon jaygeorge committed d7f1f57View commit detailsCopy full SHA for d7f1f57 Browse repository at this point Balance page rule with trash icon jaygeorge committed 34aa292View commit detailsCopy full SHA for 34aa292 Browse repository at this point Make "delete" icon condition only appear on hover for field logic too jaygeorge committed 9552b0aView commit detailsCopy full SHA for 9552b0a Browse repository at this point Connect - adjust grid responsively jaygeorge committed eb2005bView commit detailsCopy full SHA for eb2005b Browse repository at this point Merge branch '6.x' into forms-2 jaygeorge committed 381570eView commit detailsCopy full SHA for 381570e Browse repository at this point [6.x] Forms 2: Allow multiple forms when Forms Pro is installed (#14952) Show description for cc7f602 duncanmcclean andclaude authored cc7f602View commit detailsCopy full SHA for cc7f602 Browse repository at this point [6.x] Forms 2: Access (#14950) Show description for 56e9900 duncanmcclean andjasonvarga authored 56e9900View commit detailsCopy full SHA for 56e9900 Browse repository at this point Commits on Jul 8, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 7c9eaa7View commit detailsCopy full SHA for 7c9eaa7 Browse repository at this point [6.x] Forms 2: Multi-page forms & `SubmitForm` action (#14840) Show description for 88a0a19 duncanmcclean andjasonvarga authored 88a0a19View commit detailsCopy full SHA for 88a0a19 Browse repository at this point Commits on Jul 9, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 510cea1View commit detailsCopy full SHA for 510cea1 Browse repository at this point Fix failing test caused by #14959 duncanmcclean committed da09e47View commit detailsCopy full SHA for da09e47 Browse repository at this point [6.x] Forms 2: Tighten form upload validation in `SubmitForm` action (#14964) duncanmcclean authored 4cea062View commit detailsCopy full SHA for 4cea062 Browse repository at this point fix error when submitting a form page containing a fieldset import Show description for 9bb3804 duncanmcclean committed 9bb3804View commit detailsCopy full SHA for 9bb3804 Browse repository at this point Logic tree - improve the way overflow is handled jaygeorge committed 7ef050bView commit detailsCopy full SHA for 7ef050b Browse repository at this point Logic tree - improve full bleed scrolling with a separator jaygeorge committed bc563b2View commit detailsCopy full SHA for bc563b2 Browse repository at this point Logic tree - panel styling jaygeorge committed 90e8d5cView commit detailsCopy full SHA for 90e8d5c Browse repository at this point Logic tree - add a container query like the list view jaygeorge committed 15674b2View commit detailsCopy full SHA for 15674b2 Browse repository at this point Logic tree - separate rules in split panel, like we do in the Edit tab jaygeorge committed b526263View commit detailsCopy full SHA for b526263 Browse repository at this point Fix connector line stacking context jaygeorge committed 9e022c8View commit detailsCopy full SHA for 9e022c8 Browse repository at this point Logic tree - align rules with the page header jaygeorge committed ee555cfView commit detailsCopy full SHA for ee555cf Browse repository at this point Logic tree - When an item is selected, highlight its connection jaygeorge committed fe40316View commit detailsCopy full SHA for fe40316 Browse repository at this point [6.x] Forms 2: Remember panel widths (#14968) jackmcdade authored 369d2d7View commit detailsCopy full SHA for 369d2d7 Browse repository at this point Logic tree - dim the connection arrow of unselected columns too jaygeorge committed e98a704View commit detailsCopy full SHA for e98a704 Browse repository at this point Merge branch '6.x' into forms-2 jasonvarga committed 0d0a2cfView commit detailsCopy full SHA for 0d0a2cf Browse repository at this point Commits on Jul 10, 2026 [6.x] Forms 2: ✨ Move the panel to the side for /logic > tree view (#14969) Show description for 769cf0b jaygeorge andduncanmcclean authored 769cf0bView commit detailsCopy full SHA for 769cf0b Browse repository at this point fix adding field logic in list mode duncanmcclean committed 668ce1cView commit detailsCopy full SHA for 668ce1c Browse repository at this point [6.x] Logic empty state (#14976) jaygeorge authored 1791060View commit detailsCopy full SHA for 1791060 Browse repository at this point [6.x] Forms 2: Fix false dirty state when opening field inspector in Logic Tree view (#14977) duncanmcclean authored c4deef3View commit detailsCopy full SHA for c4deef3 Browse repository at this point make text in paragraph fieldtype mandatory duncanmcclean committed 4ff2828View commit detailsCopy full SHA for 4ff2828 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed e02192fView commit detailsCopy full SHA for e02192f Browse repository at this point Merge branch '6.x' into forms-2 Show description for 6fe3804 jasonvarga committed 6fe3804View commit detailsCopy full SHA for 6fe3804 Browse repository at this point [6.x] Forms 2: Permissions (#14957) Show description for 4df166b authored 4df166bView commit detailsCopy full SHA for 4df166b Browse repository at this point Commits on Jul 13, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed d7f3217View commit detailsCopy full SHA for d7f3217 Browse repository at this point Add form builder empty state help text jackmcdade committed 316c1a2View commit detailsCopy full SHA for 316c1a2 Browse repository at this point Commits on Jul 14, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed b48ceeeView commit detailsCopy full SHA for b48ceee Browse repository at this point Space headings a little more jaygeorge committed b194775View commit detailsCopy full SHA for b194775 Browse repository at this point Half way jaygeorge committed 3ba0eb4View commit detailsCopy full SHA for 3ba0eb4 Browse repository at this point Stop graph paper lines going through titles jaygeorge committed 2dea0aaView commit detailsCopy full SHA for 2dea0aa Browse repository at this point Align empty message with top row jaygeorge committed 7a59b13View commit detailsCopy full SHA for 7a59b13 Browse repository at this point Commits on Jul 15, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 5d917a3View commit detailsCopy full SHA for 5d917a3 Browse repository at this point use `v-else` instead duncanmcclean committed 4290b17View commit detailsCopy full SHA for 4290b17 Browse repository at this point indent duncanmcclean committed 9335d5fView commit detailsCopy full SHA for 9335d5f Browse repository at this point Correct sidebar calculations by accounting for container padding jaygeorge committed 90d32f4View commit detailsCopy full SHA for 90d32f4 Browse repository at this point Skew panels right jaygeorge committed c8915a3View commit detailsCopy full SHA for c8915a3 Browse repository at this point Skew panels right jaygeorge committed c4256f4View commit detailsCopy full SHA for c4256f4 Browse repository at this point Panels - restore middle breakpoint width jaygeorge committed dbd793dView commit detailsCopy full SHA for dbd793d Browse repository at this point Revert "use `v-else` instead" Show description for 5664b3e duncanmcclean committed 5664b3eView commit detailsCopy full SHA for 5664b3e Browse repository at this point Tweak empty message decoration slightly, ready for a larger sidebar with blueprints jaygeorge committed 07bc4f9View commit detailsCopy full SHA for 07bc4f9 Browse repository at this point Commits on Jul 16, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 87d8be6View commit detailsCopy full SHA for 87d8be6 Browse repository at this point Commits on Jul 17, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed c70dd63View commit detailsCopy full SHA for c70dd63 Browse repository at this point ensure extra config options are passed to fieldtypes duncanmcclean committed ce56ae5View commit detailsCopy full SHA for ce56ae5 Browse repository at this point Commits on Jul 20, 2026 copy form fields when duplicating form duncanmcclean committed ea49753View commit detailsCopy full SHA for ea49753 Browse repository at this point add default messages as field placeholders duncanmcclean committed 4c6383bView commit detailsCopy full SHA for 4c6383b Browse repository at this point [6.x] Logic tree leap calculation (#15035) Show description for bc6c992 authored bc6c992View commit detailsCopy full SHA for bc6c992 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 6e0af1cView commit detailsCopy full SHA for 6e0af1c Browse repository at this point avoid dispatching events during initialization duncanmcclean committed 9adc15eView commit detailsCopy full SHA for 9adc15e Browse repository at this point fix nav state getting out of sync with the DOM on page load Show description for 316f2e3 duncanmcclean committed 316f2e3View commit detailsCopy full SHA for 316f2e3 Browse repository at this point Commits on Jul 21, 2026 Merge branch '6.x' into forms-2 jasonvarga committed 5af8300View commit detailsCopy full SHA for 5af8300 Browse repository at this point emit updated when validation rules are added via mutation Show description for 0359e5c jasonvarga andclaude committed 0359e5cView commit detailsCopy full SHA for 0359e5c Browse repository at this point Make current item more consistent with CP buttons jaygeorge committed 8574cedView commit detailsCopy full SHA for 8574ced Browse repository at this point [6.x] Forms 2: Various file upload improvements (#15006) Show description for fa798d0 authored fa798d0View commit detailsCopy full SHA for fa798d0 Browse repository at this point Commits on Jul 22, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed ea115ecView commit detailsCopy full SHA for ea115ec Browse repository at this point Commits on Jul 23, 2026 move translation calls inside getter to avoid boot errors duncanmcclean committed e7b3387View commit detailsCopy full SHA for e7b3387 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 4774811View commit detailsCopy full SHA for 4774811 Browse repository at this point [6.x] Remove unused form metrics code (#15066) Show description for c316553 duncanmcclean andclaude authored c316553View commit detailsCopy full SHA for c316553 Browse repository at this point Rename Marketplace button jackmcdade committed c40daf8View commit detailsCopy full SHA for c40daf8 Browse repository at this point Add Generate Fake Submission support for all the new form fieldtypes jackmcdade committed 7f2fa3aView commit detailsCopy full SHA for 7f2fa3a Browse repository at this point ensure toggle conditions work correctly duncanmcclean committed 660175eView commit detailsCopy full SHA for 660175e Browse repository at this point Commits on Jul 31, 2026 Nicer previous page UX jackmcdade committed 99ed81dView commit detailsCopy full SHA for 99ed81d Browse repository at this point Commits on Aug 3, 2026 [6.x] Forms 2: Show option dropdown when adding logic against Image Choice fields (#15096) duncanmcclean authored 1460605View commit detailsCopy full SHA for 1460605 Browse repository at this point Commits on Aug 5, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 9aca449View commit detailsCopy full SHA for 9aca449 Browse repository at this point Commits on Aug 6, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed fbe2f7cView commit detailsCopy full SHA for fbe2f7c Browse repository at this point Commits on Aug 7, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6d9762cView commit detailsCopy full SHA for 6d9762c Browse repository at this point refactor information/structure check duncanmcclean committed 9b68d22View commit detailsCopy full SHA for 9b68d22 Browse repository at this point move page logic to action inspector duncanmcclean committed da24576View commit detailsCopy full SHA for da24576 Browse repository at this point Commits on Aug 10, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 3027011View commit detailsCopy full SHA for 3027011 Browse repository at this point Add scroll margin to pagination too jaygeorge committed b6decd9View commit detailsCopy full SHA for b6decd9 Browse repository at this point move logic icon next to actions duncanmcclean committed 3a0261aView commit detailsCopy full SHA for 3a0261a Browse repository at this point validate against numbers in names duncanmcclean committed 9f9602fView commit detailsCopy full SHA for 9f9602f Browse repository at this point Commits on Aug 12, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed b2795adView commit detailsCopy full SHA for b2795ad Browse repository at this point Commits on Aug 13, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 3c8816eView commit detailsCopy full SHA for 3c8816e Browse repository at this point Commits on Aug 14, 2026 [6.x] Forms 2: Extract star rating, ranking and image choice into UI components (#15068) Show description for 291bb65 duncanmcclean andjackmcdade authored 291bb65View commit detailsCopy full SHA for 291bb65 Browse repository at this point Commits on Aug 17, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 8e0eb96View commit detailsCopy full SHA for 8e0eb96 Browse repository at this point [6.x] Forms 2: Temporary file upload fixes (#15206) Show description for c0b4163 duncanmcclean andclaude authored c0b4163View commit detailsCopy full SHA for c0b4163 Browse repository at this point [6.x] Forms 2: Generate field handles from labels (#15203) Show description for 25266cc duncanmcclean andclaude authored 25266ccView commit detailsCopy full SHA for 25266cc Browse repository at this point Commits on Aug 18, 2026 move handle below label/heading field in banner/heading/paragraph fieldtypes duncanmcclean committed 62d35c2View commit detailsCopy full SHA for 62d35c2 Browse repository at this point Commits on Aug 24, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 04ed9b0View commit detailsCopy full SHA for 04ed9b0 Browse repository at this point formatting duncanmcclean committed 7f90033View commit detailsCopy full SHA for 7f90033 Browse repository at this point Commits on Aug 26, 2026 [6.x] Forms 2: Respect min/max when generating fake integer values (#15276) Show description for 94b0fb0 duncanmcclean andclaude authored 94b0fb0View commit detailsCopy full SHA for 94b0fb0 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed d1b353fView commit detailsCopy full SHA for d1b353f Browse repository at this point Commits on Aug 27, 2026 Merge remote-tracking branch 'origin/6.x' into forms-2 jasonvarga committed cad71daView commit detailsCopy full SHA for cad71da Browse repository at this point Commits on Aug 28, 2026 [6.x] Forms 2: Ensure `FormSubmissionsController` follows conventions (#15300) duncanmcclean authored dbcdd6fView commit detailsCopy full SHA for dbcdd6f Browse repository at this point Commits on Aug 31, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6dcfee8View commit detailsCopy full SHA for 6dcfee8 Browse repository at this point [6.x] Forms 2: Catch untranslated strings (#15315) Show description for 2b62ccb duncanmcclean andclaude authored 2b62ccbView commit detailsCopy full SHA for 2b62ccb Browse repository at this point Footer © 2026 GitHub, Inc. Footer navigation Terms Privacy Security Status Community Docs Contact You can’t perform that action at this time. , 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' [6.x] Forms 2 by jasonvarga · Pull Request #15039 · statamic/cms · GitHub Skip to contentNavigation Menu Sign inAppearance settings AI CODE CREATIONGitHub CopilotWrite better code with AI GitHub Copilot appDirect agents from issue to merge MCP RegistryIntegrate external tools DEVELOPER WORKFLOWSActionsAutomate any workflow CodespacesInstant dev environments IssuesPlan and track work Code ReviewManage code changes Code QualityEnforce quality at merge APPLICATION SECURITYGitHub Advanced SecurityFind and fix vulnerabilities Code securitySecure your code as you build Secret protectionStop leaks before they start EXPLOREWhy GitHub Documentation Blog Changelog Marketplace View all features BY COMPANY SIZEEnterprises Small and medium teams Startups Nonprofits BY USE CASEApp Modernization DevSecOps DevOps CI/CD View all use cases BY INDUSTRYHealthcare Financial services Manufacturing Government View all industries View all solutions EXPLORE BY TOPICAI Software Development DevOps Security View all topics EXPLORE BY TYPECustomer stories Events & webinars Ebooks & reports Business insights GitHub Skills SUPPORT & SERVICESDocumentation Customer support Community forum Trust center Partners View all resources COMMUNITYGitHub SponsorsFund open source developers PROGRAMSSecurity Lab Maintainer Community GitHub Stars Archive Program REPOSITORIESTopics Trending Collections ENTERPRISE SOLUTIONSEnterprise platformAI-powered developer platform AVAILABLE ADD-ONSGitHub Advanced SecurityEnterprise-grade security features Copilot for BusinessEnterprise-grade AI features Premium SupportEnterprise-grade 24/7 support Pricing Sign in Sign upAppearance settings You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert Uh oh! There was an error while loading. Please reload this page. statamic /cmsPublic Uh oh! There was an error while loading. Please reload this page. Notifications You must be signed in to change notification settings Fork 641 Star 4.9k Code Issues201 Pull requests100 Discussions Actions Projects Security and quality44 Insights Additional navigation options Code Issues Pull requests Discussions Actions Projects Security and quality Insights [6.x] Forms 2 - #15039 #15039 Draft jasonvarga wants to merge 1000 commits into6.xstatamic/cms:6.xfrom forms-2statamic/cms:forms-2Copy head branch name to clipboard ConversationCommits1000 (1000)ChecksFiles changed Draft [6.x] Forms 2#15039jasonvarga wants to merge 1000 commits into6.xstatamic/cms:6.xfrom forms-2statamic/cms:forms-2Copy head branch name to clipboard Commits This pull request is big! We're only showing the most recent 250 commits Commits on Jun 4, 2026 Star rating - add ability to adjust gap and change SVG to use our Flex icon jaygeorge committed 8ddee91View commit detailsCopy full SHA for 8ddee91 Browse repository at this point Star rating - map theme vars jaygeorge committed 69ab566View commit detailsCopy full SHA for 69ab566 Browse repository at this point Star rating - leave as unrated for the form demo jaygeorge committed 67c0b9cView commit detailsCopy full SHA for 67c0b9c Browse repository at this point Star rating - set a floor and ceiling jaygeorge committed 44f7a1bView commit detailsCopy full SHA for 44f7a1b Browse repository at this point Star rating - change star appearance and finish draft jaygeorge committed b749f10View commit detailsCopy full SHA for b749f10 Browse repository at this point fix indentation duncanmcclean committed 8c675a3View commit detailsCopy full SHA for 8c675a3 Browse repository at this point pages actually have ids now duncanmcclean committed a2c02e6View commit detailsCopy full SHA for a2c02e6 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed f8499a6View commit detailsCopy full SHA for f8499a6 Browse repository at this point Star rating - tweak size jaygeorge committed 91e9954View commit detailsCopy full SHA for 91e9954 Browse repository at this point Image choice - first pass jaygeorge committed e37e96bView commit detailsCopy full SHA for e37e96b Browse repository at this point Image choice - Switch to Tailwind jaygeorge committed a5e2211View commit detailsCopy full SHA for a5e2211 Browse repository at this point Image choice - fix error when saving jaygeorge committed ad0ed0eView commit detailsCopy full SHA for ad0ed0e Browse repository at this point Fix double border effect jaygeorge committed cde898dView commit detailsCopy full SHA for cde898d Browse repository at this point Image choice - render image previews jaygeorge committed fb85b8fView commit detailsCopy full SHA for fb85b8f Browse repository at this point Image choice - add a letter before the label jaygeorge committed 3dbae2cView commit detailsCopy full SHA for 3dbae2c Browse repository at this point Image choice - style the letters jaygeorge committed 783f17eView commit detailsCopy full SHA for 783f17e Browse repository at this point Image choice - add aspect ratio as an option for the comparisons jaygeorge committed 4484482View commit detailsCopy full SHA for 4484482 Browse repository at this point Image choice - add example jaygeorge committed be9fcf1View commit detailsCopy full SHA for be9fcf1 Browse repository at this point Image choice - improve demo jaygeorge committed 70717e5View commit detailsCopy full SHA for 70717e5 Browse repository at this point Commits on Jun 5, 2026 Image choice - tighten up a few things 🧹 jaygeorge committed 915d85cView commit detailsCopy full SHA for 915d85c Browse repository at this point Image choice - fix border 🧹 jaygeorge committed de88e8dView commit detailsCopy full SHA for de88e8d Browse repository at this point Image choice - fix padding jaygeorge committed 5adca1cView commit detailsCopy full SHA for 5adca1c Browse repository at this point Image choice - make cards more consistent with the rest of the UI jaygeorge committed 5e28231View commit detailsCopy full SHA for 5e28231 Browse repository at this point Image choice - tighten up letter choice jaygeorge committed 0735f1bView commit detailsCopy full SHA for 0735f1b Browse repository at this point Make panels slightly narrower at smaller MQs jaygeorge committed ec9c31cView commit detailsCopy full SHA for ec9c31c Browse repository at this point Add ranking form field type - first pass jaygeorge committed c305049View commit detailsCopy full SHA for c305049 Browse repository at this point Ranking field type - don't show "null" when adding a new row jaygeorge committed 6ef2072View commit detailsCopy full SHA for 6ef2072 Browse repository at this point Ranking field type - improve appearance jaygeorge committed 68825edView commit detailsCopy full SHA for 68825ed Browse repository at this point Add opinion scale field type - first pass jaygeorge committed 53ee8a7View commit detailsCopy full SHA for 53ee8a7 Browse repository at this point Add opinion scale field type - use Tailwind jaygeorge committed e9503dcView commit detailsCopy full SHA for e9503dc Browse repository at this point Add opinion scale field type - fix labels jaygeorge committed 93496c2View commit detailsCopy full SHA for 93496c2 Browse repository at this point Add opinion scale field type - tidy instructions jaygeorge committed a6eaaf4View commit detailsCopy full SHA for a6eaaf4 Browse repository at this point Add opinion scale field type - finesse jaygeorge committed 3d8edfbView commit detailsCopy full SHA for 3d8edfb Browse repository at this point Add opinion scale field type - optically align labels jaygeorge committed 7ce1379View commit detailsCopy full SHA for 7ce1379 Browse repository at this point Field types - dark mode balances jaygeorge committed 62b76e1View commit detailsCopy full SHA for 62b76e1 Browse repository at this point Star rating - fix dark mode jaygeorge committed cd09b55View commit detailsCopy full SHA for cd09b55 Browse repository at this point Fix Builder field type - it was behaving weirdly jaygeorge committed 237570dView commit detailsCopy full SHA for 237570d Browse repository at this point Commits on Jun 8, 2026 Logic tab - fixed collapsed row badge/value combo jaygeorge committed c58ecd0View commit detailsCopy full SHA for c58ecd0 Browse repository at this point Logic tab - fixed row decoration jaygeorge committed 4163a83View commit detailsCopy full SHA for 4163a83 Browse repository at this point ✨ fix form not saving - textarea is a CP fieldtype, not a form fieldtype. The builder wraps it in Fallback, but was sending fieldtype: "fallback" back on save. The repository can't look up "fallbac… Show description for 1e759d5 jaygeorge committed 1e759d5View commit detailsCopy full SHA for 1e759d5 Browse repository at this point Only output the logic icon on page titles when they logic jaygeorge committed 41ac3ceView commit detailsCopy full SHA for 41ac3ce Browse repository at this point Tighten page title space jaygeorge committed d8e3064View commit detailsCopy full SHA for d8e3064 Browse repository at this point Fix banner icon for compressed view - Information fields (banner, heading, paragraph) had their own collapsed markup that skipped the shared compressed-view structure. jaygeorge committed 2cfe1faView commit detailsCopy full SHA for 2cfe1fa Browse repository at this point Switch category color from amber to green - amber is too close to orange and the category feels pretty different to choice jaygeorge committed 0160f6bView commit detailsCopy full SHA for 0160f6b Browse repository at this point Commits on Jun 10, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed d917fb9View commit detailsCopy full SHA for d917fb9 Browse repository at this point Revert "Fix Builder field type - it was behaving weirdly" Show description for 5092cbb duncanmcclean committed 5092cbbView commit detailsCopy full SHA for 5092cbb Browse repository at this point Revert "✨ fix form not saving - textarea is a CP fieldtype, not a form fieldtype. The builder wraps it in Fallback, but was sending fieldtype: "fallback" back on save. The repository can't look up … Show description for 7e2b7b5 duncanmcclean committed 7e2b7b5View commit detailsCopy full SHA for 7e2b7b5 Browse repository at this point Revert various changes from c3050492 Show description for 9975a69 duncanmcclean committed 9975a69View commit detailsCopy full SHA for 9975a69 Browse repository at this point wip duncanmcclean committed bd1c032View commit detailsCopy full SHA for bd1c032 Browse repository at this point wip duncanmcclean committed 688379aView commit detailsCopy full SHA for 688379a Browse repository at this point Revert field preview change in be9fcf1c. Show description for 7f17afd duncanmcclean committed 7f17afdView commit detailsCopy full SHA for 7f17afd Browse repository at this point Review changes to builder in fb85b8fc Show description for 807d725 duncanmcclean committed 807d725View commit detailsCopy full SHA for 807d725 Browse repository at this point fix weird indentation duncanmcclean committed de157d0View commit detailsCopy full SHA for de157d0 Browse repository at this point wip duncanmcclean committed 3aab7a2View commit detailsCopy full SHA for 3aab7a2 Browse repository at this point image choice fieldtype tweaks Show description for e56c667 duncanmcclean committed e56c667View commit detailsCopy full SHA for e56c667 Browse repository at this point require field labels in form builder duncanmcclean committed a6972a9View commit detailsCopy full SHA for a6972a9 Browse repository at this point opinion scale fieldtype tweaks Show description for f07d652 duncanmcclean committed f07d652View commit detailsCopy full SHA for f07d652 Browse repository at this point wip duncanmcclean committed 47b6f21View commit detailsCopy full SHA for 47b6f21 Browse repository at this point star rating fieldtype tweaks Show description for 7827322 duncanmcclean committed 7827322View commit detailsCopy full SHA for 7827322 Browse repository at this point ranking fieldtype tweaks Show description for e905f05 duncanmcclean committed e905f05View commit detailsCopy full SHA for e905f05 Browse repository at this point banner fieldtype tweaks duncanmcclean committed 4a7d327View commit detailsCopy full SHA for 4a7d327 Browse repository at this point wip duncanmcclean committed 9b3e299View commit detailsCopy full SHA for 9b3e299 Browse repository at this point remove unnecessary (and missing) instructions duncanmcclean committed cc6adb1View commit detailsCopy full SHA for cc6adb1 Browse repository at this point avoid using information fields (banner, heading, paragraph) in logic Show description for b6f6fdb duncanmcclean committed b6f6fdbView commit detailsCopy full SHA for b6f6fdb Browse repository at this point improve logic value stuff for new form fieldtypes duncanmcclean committed 592eefbView commit detailsCopy full SHA for 592eefb Browse repository at this point make container/folder of image options fieldtype configurable duncanmcclean committed 6a8d511View commit detailsCopy full SHA for 6a8d511 Browse repository at this point re-work config options for information fields & add field stubs duncanmcclean committed a060025View commit detailsCopy full SHA for a060025 Browse repository at this point fix failing tests duncanmcclean committed f13d239View commit detailsCopy full SHA for f13d239 Browse repository at this point provide `is_informative` to fields loop to avoid outputting labels/instructions duncanmcclean committed 044e66eView commit detailsCopy full SHA for 044e66e Browse repository at this point use `is_informative` in our fields stub duncanmcclean committed e533341View commit detailsCopy full SHA for e533341 Browse repository at this point Commits on Jun 11, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 84e4928View commit detailsCopy full SHA for 84e4928 Browse repository at this point fix icon not being persisted in banner field config duncanmcclean committed 0eda343View commit detailsCopy full SHA for 0eda343 Browse repository at this point Avoid showing preview when dragging fields in collapsed mode duncanmcclean committed 05bdc7bView commit detailsCopy full SHA for 05bdc7b Browse repository at this point adjust how min/max clamping happens in the opinion range fieldtype duncanmcclean committed 1b0d9ebView commit detailsCopy full SHA for 1b0d9eb Browse repository at this point wip duncanmcclean committed 48cb929View commit detailsCopy full SHA for 48cb929 Browse repository at this point "generate" opinion scale values in php duncanmcclean committed 38d9227View commit detailsCopy full SHA for 38d9227 Browse repository at this point replace default values with placeholders Show description for c49797c duncanmcclean committed c49797cView commit detailsCopy full SHA for c49797c Browse repository at this point simpler opinion scale views duncanmcclean committed 4025df1View commit detailsCopy full SHA for 4025df1 Browse repository at this point simpler star rating duncanmcclean committed aad9104View commit detailsCopy full SHA for aad9104 Browse repository at this point fix error in field inspector when page contains fieldset import duncanmcclean committed a7d69d4View commit detailsCopy full SHA for a7d69d4 Browse repository at this point simpler ranking views duncanmcclean committed 9f7a37eView commit detailsCopy full SHA for 9f7a37e Browse repository at this point process field config when saving, not when updating config options Show description for 7bad860 duncanmcclean committed 7bad860View commit detailsCopy full SHA for 7bad860 Browse repository at this point avoid generating field handles with hyphens Show description for ac6d62a duncanmcclean committed ac6d62aView commit detailsCopy full SHA for ac6d62a Browse repository at this point image choice view duncanmcclean committed 3cf0913View commit detailsCopy full SHA for 3cf0913 Browse repository at this point preprocess values when loading form builder duncanmcclean committed 57a0d60View commit detailsCopy full SHA for 57a0d60 Browse repository at this point make form fieldtype for spacer duncanmcclean committed 288fd39View commit detailsCopy full SHA for 288fd39 Browse repository at this point prevent configuring logic based on structure fields duncanmcclean committed ae35c37View commit detailsCopy full SHA for ae35c37 Browse repository at this point Commits on Jun 12, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed bdc19aeView commit detailsCopy full SHA for bdc19ae Browse repository at this point fix banner example duncanmcclean committed db760e9View commit detailsCopy full SHA for db760e9 Browse repository at this point provide meta and values to previews publish container duncanmcclean committed 321d0d2View commit detailsCopy full SHA for 321d0d2 Browse repository at this point hide validation tab in field inspector for structure/information fields Show description for 96cfec5 duncanmcclean committed 96cfec5View commit detailsCopy full SHA for 96cfec5 Browse repository at this point Revert "preprocess values when loading form builder" Show description for be447a4 duncanmcclean committed be447a4View commit detailsCopy full SHA for be447a4 Browse repository at this point Revert "process field config when saving, not when updating config options" Show description for 3b05e49 duncanmcclean committed 3b05e49View commit detailsCopy full SHA for 3b05e49 Browse repository at this point preprocess before validating duncanmcclean committed 5ee6cf8View commit detailsCopy full SHA for 5ee6cf8 Browse repository at this point group form fieldtype duncanmcclean committed 7e01077View commit detailsCopy full SHA for 7e01077 Browse repository at this point combine assets and files fieldtypes into a single upload form fieldtype duncanmcclean committed 26d37fbView commit detailsCopy full SHA for 26d37fb Browse repository at this point very lightly style rankings view so its clear you can drag & drop duncanmcclean committed b42935cView commit detailsCopy full SHA for b42935c Browse repository at this point use FormLayout on submission show page duncanmcclean committed e49f607View commit detailsCopy full SHA for e49f607 Browse repository at this point Commits on Jun 15, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed fdb3c20View commit detailsCopy full SHA for fdb3c20 Browse repository at this point formatting duncanmcclean committed 4a81aa3View commit detailsCopy full SHA for 4a81aa3 Browse repository at this point Small background color adjustments including dark mode jaygeorge committed fc38b65View commit detailsCopy full SHA for fc38b65 Browse repository at this point fix failing tests duncanmcclean committed a363f92View commit detailsCopy full SHA for a363f92 Browse repository at this point wip duncanmcclean committed a85473dView commit detailsCopy full SHA for a85473d Browse repository at this point missing `__` imports duncanmcclean committed 37be4c6View commit detailsCopy full SHA for 37be4c6 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed bfdb8e4View commit detailsCopy full SHA for bfdb8e4 Browse repository at this point Wrap some inline stylesheet using a cascade layer so devs can easily override jaygeorge committed e66d0ffView commit detailsCopy full SHA for e66d0ff Browse repository at this point Revert "Wrap some inline stylesheet using a cascade layer so devs can easily override" Show description for 7e759eb jaygeorge committed 7e759ebView commit detailsCopy full SHA for 7e759eb Browse repository at this point [6.x] Forms 2: Yes/No Form Fieldtype (#14819) Show description for 272cb73 duncanmcclean andjaygeorge authored 272cb73View commit detailsCopy full SHA for 272cb73 Browse repository at this point remove solo.yml from git duncanmcclean committed cf27f47View commit detailsCopy full SHA for cf27f47 Browse repository at this point Improve focus / selection state - Image Choice jaygeorge committed e95ff5dView commit detailsCopy full SHA for e95ff5d Browse repository at this point Improve focus / selection state - Opinion Scale jaygeorge committed 137ba00View commit detailsCopy full SHA for 137ba00 Browse repository at this point Commits on Jun 16, 2026 Yes/No - only fill the icon if the option is selected jaygeorge committed dca2b8bView commit detailsCopy full SHA for dca2b8b Browse repository at this point [6.x] Make the ranking fieldtype orderable with just the keyboard (#14823) Show description for 166a8ac jaygeorge andduncanmcclean authored 166a8acView commit detailsCopy full SHA for 166a8ac Browse repository at this point prevent information fieldtypes showing in listing column list duncanmcclean committed b0a68bdView commit detailsCopy full SHA for b0a68bd Browse repository at this point Merge branch '6.x' into forms-2 jaygeorge committed 754131eView commit detailsCopy full SHA for 754131e Browse repository at this point Logic rule formatting jaygeorge committed cc39fd3View commit detailsCopy full SHA for cc39fd3 Browse repository at this point Logic rule formatting jaygeorge committed ff01c73View commit detailsCopy full SHA for ff01c73 Browse repository at this point Improve logic rule badge balance jaygeorge committed be83111View commit detailsCopy full SHA for be83111 Browse repository at this point Commits on Jun 17, 2026 Improve logic rule text balance jaygeorge committed 96bb4a6View commit detailsCopy full SHA for 96bb4a6 Browse repository at this point Fix empty state dark border jaygeorge committed 8ed11aaView commit detailsCopy full SHA for 8ed11aa Browse repository at this point Ranking field - add an 'ordered' state jaygeorge committed 9433d57View commit detailsCopy full SHA for 9433d57 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed e04391cView commit detailsCopy full SHA for e04391c Browse repository at this point underlying yes/no fieldtype shouldn't be visible in form builder Show description for 890d3b0 duncanmcclean committed 890d3b0View commit detailsCopy full SHA for 890d3b0 Browse repository at this point Commits on Jun 18, 2026 [6.x] Fix the stars rating field rendering (#14820) Show description for 9db3d8d jaygeorge andduncanmcclean authored 9db3d8dView commit detailsCopy full SHA for 9db3d8d Browse repository at this point Commits on Jun 19, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6ba903dView commit detailsCopy full SHA for 6ba903d Browse repository at this point translate form title in all the places duncanmcclean committed 159fcdaView commit detailsCopy full SHA for 159fcda Browse repository at this point Commits on Jun 22, 2026 [6.x] Forms 2: Compressed view (#14853) jaygeorge authored 1717518View commit detailsCopy full SHA for 1717518 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 21b1829View commit detailsCopy full SHA for 21b1829 Browse repository at this point add confirmation modal before deleting field duncanmcclean committed aa8db6dView commit detailsCopy full SHA for aa8db6d Browse repository at this point [6.x] Forms 2: Add "Always hide" option to field logic dropdown (#14859) duncanmcclean authored 57f9f5cView commit detailsCopy full SHA for 57f9f5c Browse repository at this point Commits on Jun 23, 2026 wip duncanmcclean committed d94e62dView commit detailsCopy full SHA for d94e62d Browse repository at this point Commits on Jun 24, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 1e397bbView commit detailsCopy full SHA for 1e397bb Browse repository at this point Commits on Jun 25, 2026 [6.x] Forms 2: Submission Statuses (#14832) Show description for df261ed duncanmcclean andjasonvarga authored df261edView commit detailsCopy full SHA for df261ed Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 2e75c1cView commit detailsCopy full SHA for 2e75c1c Browse repository at this point Commits on Jun 30, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed e4dd0a8View commit detailsCopy full SHA for e4dd0a8 Browse repository at this point adjust initial page logic Show description for 5f81608 duncanmcclean committed 5f81608View commit detailsCopy full SHA for 5f81608 Browse repository at this point [6.x] Forms 2: Site Filter (#14902) duncanmcclean authored 47f7905View commit detailsCopy full SHA for 47f7905 Browse repository at this point cleanup `data-panels-showing` attribute when unmounting panel layout duncanmcclean committed e090e85View commit detailsCopy full SHA for e090e85 Browse repository at this point avoid publishing `star-rating.css`. the css is inlined now. duncanmcclean committed 9f2b2d2View commit detailsCopy full SHA for 9f2b2d2 Browse repository at this point Commits on Jul 1, 2026 exclude partial submissions from results count on forms listing duncanmcclean committed eff4c77View commit detailsCopy full SHA for eff4c77 Browse repository at this point move `is_informative` out of generic `RendersForms` trait Show description for 07b190f duncanmcclean committed 07b190fView commit detailsCopy full SHA for 07b190f Browse repository at this point Commits on Jul 2, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6e0764aView commit detailsCopy full SHA for 6e0764a Browse repository at this point Merge branch '6.x' into forms-2 jaygeorge committed 9b7ae88View commit detailsCopy full SHA for 9b7ae88 Browse repository at this point [6.x] Forms 2: Field numbering (#14909) duncanmcclean authored 0ac798dView commit detailsCopy full SHA for 0ac798d Browse repository at this point Commits on Jul 3, 2026 Fix architectural lines breaking out of .content, e.g. /collections/create jaygeorge committed 378491cView commit detailsCopy full SHA for 378491c Browse repository at this point Merge remote-tracking branch 'origin/6.x' into forms-2 Show description for bbea10d jasonvarga committed bbea10dView commit detailsCopy full SHA for bbea10d Browse repository at this point Small dark mode fix jaygeorge committed e88ad6fView commit detailsCopy full SHA for e88ad6f Browse repository at this point Commits on Jul 6, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 461512dView commit detailsCopy full SHA for 461512d Browse repository at this point fix logic indicator not showing sometimes duncanmcclean committed 3b4eb46View commit detailsCopy full SHA for 3b4eb46 Browse repository at this point include fieldset reference in tooltip duncanmcclean committed 491b44dView commit detailsCopy full SHA for 491b44d Browse repository at this point [6.x] Forms 2: Logic Tree (#14811) Show description for 243b695 jaygeorge andduncanmcclean authored 243b695View commit detailsCopy full SHA for 243b695 Browse repository at this point wip duncanmcclean committed 52798d9View commit detailsCopy full SHA for 52798d9 Browse repository at this point reset active tab in page inspector when selecting the last page duncanmcclean committed be337b9View commit detailsCopy full SHA for be337b9 Browse repository at this point avoid moving fields between pages in logic tree duncanmcclean committed 5739fc4View commit detailsCopy full SHA for 5739fc4 Browse repository at this point Commits on Jul 7, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed de239ddView commit detailsCopy full SHA for de239dd Browse repository at this point Small dark mode badge fix for page logic jaygeorge committed ef8d8feView commit detailsCopy full SHA for ef8d8fe Browse repository at this point Make "delete" icon condition only appear on hover, like the trash icon jaygeorge committed d7f1f57View commit detailsCopy full SHA for d7f1f57 Browse repository at this point Balance page rule with trash icon jaygeorge committed 34aa292View commit detailsCopy full SHA for 34aa292 Browse repository at this point Make "delete" icon condition only appear on hover for field logic too jaygeorge committed 9552b0aView commit detailsCopy full SHA for 9552b0a Browse repository at this point Connect - adjust grid responsively jaygeorge committed eb2005bView commit detailsCopy full SHA for eb2005b Browse repository at this point Merge branch '6.x' into forms-2 jaygeorge committed 381570eView commit detailsCopy full SHA for 381570e Browse repository at this point [6.x] Forms 2: Allow multiple forms when Forms Pro is installed (#14952) Show description for cc7f602 duncanmcclean andclaude authored cc7f602View commit detailsCopy full SHA for cc7f602 Browse repository at this point [6.x] Forms 2: Access (#14950) Show description for 56e9900 duncanmcclean andjasonvarga authored 56e9900View commit detailsCopy full SHA for 56e9900 Browse repository at this point Commits on Jul 8, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 7c9eaa7View commit detailsCopy full SHA for 7c9eaa7 Browse repository at this point [6.x] Forms 2: Multi-page forms & `SubmitForm` action (#14840) Show description for 88a0a19 duncanmcclean andjasonvarga authored 88a0a19View commit detailsCopy full SHA for 88a0a19 Browse repository at this point Commits on Jul 9, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 510cea1View commit detailsCopy full SHA for 510cea1 Browse repository at this point Fix failing test caused by #14959 duncanmcclean committed da09e47View commit detailsCopy full SHA for da09e47 Browse repository at this point [6.x] Forms 2: Tighten form upload validation in `SubmitForm` action (#14964) duncanmcclean authored 4cea062View commit detailsCopy full SHA for 4cea062 Browse repository at this point fix error when submitting a form page containing a fieldset import Show description for 9bb3804 duncanmcclean committed 9bb3804View commit detailsCopy full SHA for 9bb3804 Browse repository at this point Logic tree - improve the way overflow is handled jaygeorge committed 7ef050bView commit detailsCopy full SHA for 7ef050b Browse repository at this point Logic tree - improve full bleed scrolling with a separator jaygeorge committed bc563b2View commit detailsCopy full SHA for bc563b2 Browse repository at this point Logic tree - panel styling jaygeorge committed 90e8d5cView commit detailsCopy full SHA for 90e8d5c Browse repository at this point Logic tree - add a container query like the list view jaygeorge committed 15674b2View commit detailsCopy full SHA for 15674b2 Browse repository at this point Logic tree - separate rules in split panel, like we do in the Edit tab jaygeorge committed b526263View commit detailsCopy full SHA for b526263 Browse repository at this point Fix connector line stacking context jaygeorge committed 9e022c8View commit detailsCopy full SHA for 9e022c8 Browse repository at this point Logic tree - align rules with the page header jaygeorge committed ee555cfView commit detailsCopy full SHA for ee555cf Browse repository at this point Logic tree - When an item is selected, highlight its connection jaygeorge committed fe40316View commit detailsCopy full SHA for fe40316 Browse repository at this point [6.x] Forms 2: Remember panel widths (#14968) jackmcdade authored 369d2d7View commit detailsCopy full SHA for 369d2d7 Browse repository at this point Logic tree - dim the connection arrow of unselected columns too jaygeorge committed e98a704View commit detailsCopy full SHA for e98a704 Browse repository at this point Merge branch '6.x' into forms-2 jasonvarga committed 0d0a2cfView commit detailsCopy full SHA for 0d0a2cf Browse repository at this point Commits on Jul 10, 2026 [6.x] Forms 2: ✨ Move the panel to the side for /logic > tree view (#14969) Show description for 769cf0b jaygeorge andduncanmcclean authored 769cf0bView commit detailsCopy full SHA for 769cf0b Browse repository at this point fix adding field logic in list mode duncanmcclean committed 668ce1cView commit detailsCopy full SHA for 668ce1c Browse repository at this point [6.x] Logic empty state (#14976) jaygeorge authored 1791060View commit detailsCopy full SHA for 1791060 Browse repository at this point [6.x] Forms 2: Fix false dirty state when opening field inspector in Logic Tree view (#14977) duncanmcclean authored c4deef3View commit detailsCopy full SHA for c4deef3 Browse repository at this point make text in paragraph fieldtype mandatory duncanmcclean committed 4ff2828View commit detailsCopy full SHA for 4ff2828 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed e02192fView commit detailsCopy full SHA for e02192f Browse repository at this point Merge branch '6.x' into forms-2 Show description for 6fe3804 jasonvarga committed 6fe3804View commit detailsCopy full SHA for 6fe3804 Browse repository at this point [6.x] Forms 2: Permissions (#14957) Show description for 4df166b authored 4df166bView commit detailsCopy full SHA for 4df166b Browse repository at this point Commits on Jul 13, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed d7f3217View commit detailsCopy full SHA for d7f3217 Browse repository at this point Add form builder empty state help text jackmcdade committed 316c1a2View commit detailsCopy full SHA for 316c1a2 Browse repository at this point Commits on Jul 14, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed b48ceeeView commit detailsCopy full SHA for b48ceee Browse repository at this point Space headings a little more jaygeorge committed b194775View commit detailsCopy full SHA for b194775 Browse repository at this point Half way jaygeorge committed 3ba0eb4View commit detailsCopy full SHA for 3ba0eb4 Browse repository at this point Stop graph paper lines going through titles jaygeorge committed 2dea0aaView commit detailsCopy full SHA for 2dea0aa Browse repository at this point Align empty message with top row jaygeorge committed 7a59b13View commit detailsCopy full SHA for 7a59b13 Browse repository at this point Commits on Jul 15, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 5d917a3View commit detailsCopy full SHA for 5d917a3 Browse repository at this point use `v-else` instead duncanmcclean committed 4290b17View commit detailsCopy full SHA for 4290b17 Browse repository at this point indent duncanmcclean committed 9335d5fView commit detailsCopy full SHA for 9335d5f Browse repository at this point Correct sidebar calculations by accounting for container padding jaygeorge committed 90d32f4View commit detailsCopy full SHA for 90d32f4 Browse repository at this point Skew panels right jaygeorge committed c8915a3View commit detailsCopy full SHA for c8915a3 Browse repository at this point Skew panels right jaygeorge committed c4256f4View commit detailsCopy full SHA for c4256f4 Browse repository at this point Panels - restore middle breakpoint width jaygeorge committed dbd793dView commit detailsCopy full SHA for dbd793d Browse repository at this point Revert "use `v-else` instead" Show description for 5664b3e duncanmcclean committed 5664b3eView commit detailsCopy full SHA for 5664b3e Browse repository at this point Tweak empty message decoration slightly, ready for a larger sidebar with blueprints jaygeorge committed 07bc4f9View commit detailsCopy full SHA for 07bc4f9 Browse repository at this point Commits on Jul 16, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 87d8be6View commit detailsCopy full SHA for 87d8be6 Browse repository at this point Commits on Jul 17, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed c70dd63View commit detailsCopy full SHA for c70dd63 Browse repository at this point ensure extra config options are passed to fieldtypes duncanmcclean committed ce56ae5View commit detailsCopy full SHA for ce56ae5 Browse repository at this point Commits on Jul 20, 2026 copy form fields when duplicating form duncanmcclean committed ea49753View commit detailsCopy full SHA for ea49753 Browse repository at this point add default messages as field placeholders duncanmcclean committed 4c6383bView commit detailsCopy full SHA for 4c6383b Browse repository at this point [6.x] Logic tree leap calculation (#15035) Show description for bc6c992 authored bc6c992View commit detailsCopy full SHA for bc6c992 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 6e0af1cView commit detailsCopy full SHA for 6e0af1c Browse repository at this point avoid dispatching events during initialization duncanmcclean committed 9adc15eView commit detailsCopy full SHA for 9adc15e Browse repository at this point fix nav state getting out of sync with the DOM on page load Show description for 316f2e3 duncanmcclean committed 316f2e3View commit detailsCopy full SHA for 316f2e3 Browse repository at this point Commits on Jul 21, 2026 Merge branch '6.x' into forms-2 jasonvarga committed 5af8300View commit detailsCopy full SHA for 5af8300 Browse repository at this point emit updated when validation rules are added via mutation Show description for 0359e5c jasonvarga andclaude committed 0359e5cView commit detailsCopy full SHA for 0359e5c Browse repository at this point Make current item more consistent with CP buttons jaygeorge committed 8574cedView commit detailsCopy full SHA for 8574ced Browse repository at this point [6.x] Forms 2: Various file upload improvements (#15006) Show description for fa798d0 authored fa798d0View commit detailsCopy full SHA for fa798d0 Browse repository at this point Commits on Jul 22, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed ea115ecView commit detailsCopy full SHA for ea115ec Browse repository at this point Commits on Jul 23, 2026 move translation calls inside getter to avoid boot errors duncanmcclean committed e7b3387View commit detailsCopy full SHA for e7b3387 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 4774811View commit detailsCopy full SHA for 4774811 Browse repository at this point [6.x] Remove unused form metrics code (#15066) Show description for c316553 duncanmcclean andclaude authored c316553View commit detailsCopy full SHA for c316553 Browse repository at this point Rename Marketplace button jackmcdade committed c40daf8View commit detailsCopy full SHA for c40daf8 Browse repository at this point Add Generate Fake Submission support for all the new form fieldtypes jackmcdade committed 7f2fa3aView commit detailsCopy full SHA for 7f2fa3a Browse repository at this point ensure toggle conditions work correctly duncanmcclean committed 660175eView commit detailsCopy full SHA for 660175e Browse repository at this point Commits on Jul 31, 2026 Nicer previous page UX jackmcdade committed 99ed81dView commit detailsCopy full SHA for 99ed81d Browse repository at this point Commits on Aug 3, 2026 [6.x] Forms 2: Show option dropdown when adding logic against Image Choice fields (#15096) duncanmcclean authored 1460605View commit detailsCopy full SHA for 1460605 Browse repository at this point Commits on Aug 5, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 9aca449View commit detailsCopy full SHA for 9aca449 Browse repository at this point Commits on Aug 6, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed fbe2f7cView commit detailsCopy full SHA for fbe2f7c Browse repository at this point Commits on Aug 7, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6d9762cView commit detailsCopy full SHA for 6d9762c Browse repository at this point refactor information/structure check duncanmcclean committed 9b68d22View commit detailsCopy full SHA for 9b68d22 Browse repository at this point move page logic to action inspector duncanmcclean committed da24576View commit detailsCopy full SHA for da24576 Browse repository at this point Commits on Aug 10, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 3027011View commit detailsCopy full SHA for 3027011 Browse repository at this point Add scroll margin to pagination too jaygeorge committed b6decd9View commit detailsCopy full SHA for b6decd9 Browse repository at this point move logic icon next to actions duncanmcclean committed 3a0261aView commit detailsCopy full SHA for 3a0261a Browse repository at this point validate against numbers in names duncanmcclean committed 9f9602fView commit detailsCopy full SHA for 9f9602f Browse repository at this point Commits on Aug 12, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed b2795adView commit detailsCopy full SHA for b2795ad Browse repository at this point Commits on Aug 13, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 3c8816eView commit detailsCopy full SHA for 3c8816e Browse repository at this point Commits on Aug 14, 2026 [6.x] Forms 2: Extract star rating, ranking and image choice into UI components (#15068) Show description for 291bb65 duncanmcclean andjackmcdade authored 291bb65View commit detailsCopy full SHA for 291bb65 Browse repository at this point Commits on Aug 17, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 8e0eb96View commit detailsCopy full SHA for 8e0eb96 Browse repository at this point [6.x] Forms 2: Temporary file upload fixes (#15206) Show description for c0b4163 duncanmcclean andclaude authored c0b4163View commit detailsCopy full SHA for c0b4163 Browse repository at this point [6.x] Forms 2: Generate field handles from labels (#15203) Show description for 25266cc duncanmcclean andclaude authored 25266ccView commit detailsCopy full SHA for 25266cc Browse repository at this point Commits on Aug 18, 2026 move handle below label/heading field in banner/heading/paragraph fieldtypes duncanmcclean committed 62d35c2View commit detailsCopy full SHA for 62d35c2 Browse repository at this point Commits on Aug 24, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 04ed9b0View commit detailsCopy full SHA for 04ed9b0 Browse repository at this point formatting duncanmcclean committed 7f90033View commit detailsCopy full SHA for 7f90033 Browse repository at this point Commits on Aug 26, 2026 [6.x] Forms 2: Respect min/max when generating fake integer values (#15276) Show description for 94b0fb0 duncanmcclean andclaude authored 94b0fb0View commit detailsCopy full SHA for 94b0fb0 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed d1b353fView commit detailsCopy full SHA for d1b353f Browse repository at this point Commits on Aug 27, 2026 Merge remote-tracking branch 'origin/6.x' into forms-2 jasonvarga committed cad71daView commit detailsCopy full SHA for cad71da Browse repository at this point Commits on Aug 28, 2026 [6.x] Forms 2: Ensure `FormSubmissionsController` follows conventions (#15300) duncanmcclean authored dbcdd6fView commit detailsCopy full SHA for dbcdd6f Browse repository at this point Commits on Aug 31, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6dcfee8View commit detailsCopy full SHA for 6dcfee8 Browse repository at this point [6.x] Forms 2: Catch untranslated strings (#15315) Show description for 2b62ccb duncanmcclean andclaude authored 2b62ccbView commit detailsCopy full SHA for 2b62ccb Browse repository at this point Footer © 2026 GitHub, Inc. Footer navigation Terms Privacy Security Status Community Docs Contact You can’t perform that action at this time. , 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' [6.x] Forms 2 by jasonvarga · Pull Request #15039 · statamic/cms · GitHub Skip to contentNavigation Menu Sign inAppearance settings AI CODE CREATIONGitHub CopilotWrite better code with AI GitHub Copilot appDirect agents from issue to merge MCP RegistryIntegrate external tools DEVELOPER WORKFLOWSActionsAutomate any workflow CodespacesInstant dev environments IssuesPlan and track work Code ReviewManage code changes Code QualityEnforce quality at merge APPLICATION SECURITYGitHub Advanced SecurityFind and fix vulnerabilities Code securitySecure your code as you build Secret protectionStop leaks before they start EXPLOREWhy GitHub Documentation Blog Changelog Marketplace View all features BY COMPANY SIZEEnterprises Small and medium teams Startups Nonprofits BY USE CASEApp Modernization DevSecOps DevOps CI/CD View all use cases BY INDUSTRYHealthcare Financial services Manufacturing Government View all industries View all solutions EXPLORE BY TOPICAI Software Development DevOps Security View all topics EXPLORE BY TYPECustomer stories Events & webinars Ebooks & reports Business insights GitHub Skills SUPPORT & SERVICESDocumentation Customer support Community forum Trust center Partners View all resources COMMUNITYGitHub SponsorsFund open source developers PROGRAMSSecurity Lab Maintainer Community GitHub Stars Archive Program REPOSITORIESTopics Trending Collections ENTERPRISE SOLUTIONSEnterprise platformAI-powered developer platform AVAILABLE ADD-ONSGitHub Advanced SecurityEnterprise-grade security features Copilot for BusinessEnterprise-grade AI features Premium SupportEnterprise-grade 24/7 support Pricing Sign in Sign upAppearance settings You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert Uh oh! There was an error while loading. Please reload this page. statamic /cmsPublic Uh oh! There was an error while loading. Please reload this page. Notifications You must be signed in to change notification settings Fork 641 Star 4.9k Code Issues201 Pull requests100 Discussions Actions Projects Security and quality44 Insights Additional navigation options Code Issues Pull requests Discussions Actions Projects Security and quality Insights [6.x] Forms 2 - #15039 #15039 Draft jasonvarga wants to merge 1000 commits into6.xstatamic/cms:6.xfrom forms-2statamic/cms:forms-2Copy head branch name to clipboard ConversationCommits1000 (1000)ChecksFiles changed Draft [6.x] Forms 2#15039jasonvarga wants to merge 1000 commits into6.xstatamic/cms:6.xfrom forms-2statamic/cms:forms-2Copy head branch name to clipboard Commits This pull request is big! We're only showing the most recent 250 commits Commits on Jun 4, 2026 Star rating - add ability to adjust gap and change SVG to use our Flex icon jaygeorge committed 8ddee91View commit detailsCopy full SHA for 8ddee91 Browse repository at this point Star rating - map theme vars jaygeorge committed 69ab566View commit detailsCopy full SHA for 69ab566 Browse repository at this point Star rating - leave as unrated for the form demo jaygeorge committed 67c0b9cView commit detailsCopy full SHA for 67c0b9c Browse repository at this point Star rating - set a floor and ceiling jaygeorge committed 44f7a1bView commit detailsCopy full SHA for 44f7a1b Browse repository at this point Star rating - change star appearance and finish draft jaygeorge committed b749f10View commit detailsCopy full SHA for b749f10 Browse repository at this point fix indentation duncanmcclean committed 8c675a3View commit detailsCopy full SHA for 8c675a3 Browse repository at this point pages actually have ids now duncanmcclean committed a2c02e6View commit detailsCopy full SHA for a2c02e6 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed f8499a6View commit detailsCopy full SHA for f8499a6 Browse repository at this point Star rating - tweak size jaygeorge committed 91e9954View commit detailsCopy full SHA for 91e9954 Browse repository at this point Image choice - first pass jaygeorge committed e37e96bView commit detailsCopy full SHA for e37e96b Browse repository at this point Image choice - Switch to Tailwind jaygeorge committed a5e2211View commit detailsCopy full SHA for a5e2211 Browse repository at this point Image choice - fix error when saving jaygeorge committed ad0ed0eView commit detailsCopy full SHA for ad0ed0e Browse repository at this point Fix double border effect jaygeorge committed cde898dView commit detailsCopy full SHA for cde898d Browse repository at this point Image choice - render image previews jaygeorge committed fb85b8fView commit detailsCopy full SHA for fb85b8f Browse repository at this point Image choice - add a letter before the label jaygeorge committed 3dbae2cView commit detailsCopy full SHA for 3dbae2c Browse repository at this point Image choice - style the letters jaygeorge committed 783f17eView commit detailsCopy full SHA for 783f17e Browse repository at this point Image choice - add aspect ratio as an option for the comparisons jaygeorge committed 4484482View commit detailsCopy full SHA for 4484482 Browse repository at this point Image choice - add example jaygeorge committed be9fcf1View commit detailsCopy full SHA for be9fcf1 Browse repository at this point Image choice - improve demo jaygeorge committed 70717e5View commit detailsCopy full SHA for 70717e5 Browse repository at this point Commits on Jun 5, 2026 Image choice - tighten up a few things 🧹 jaygeorge committed 915d85cView commit detailsCopy full SHA for 915d85c Browse repository at this point Image choice - fix border 🧹 jaygeorge committed de88e8dView commit detailsCopy full SHA for de88e8d Browse repository at this point Image choice - fix padding jaygeorge committed 5adca1cView commit detailsCopy full SHA for 5adca1c Browse repository at this point Image choice - make cards more consistent with the rest of the UI jaygeorge committed 5e28231View commit detailsCopy full SHA for 5e28231 Browse repository at this point Image choice - tighten up letter choice jaygeorge committed 0735f1bView commit detailsCopy full SHA for 0735f1b Browse repository at this point Make panels slightly narrower at smaller MQs jaygeorge committed ec9c31cView commit detailsCopy full SHA for ec9c31c Browse repository at this point Add ranking form field type - first pass jaygeorge committed c305049View commit detailsCopy full SHA for c305049 Browse repository at this point Ranking field type - don't show "null" when adding a new row jaygeorge committed 6ef2072View commit detailsCopy full SHA for 6ef2072 Browse repository at this point Ranking field type - improve appearance jaygeorge committed 68825edView commit detailsCopy full SHA for 68825ed Browse repository at this point Add opinion scale field type - first pass jaygeorge committed 53ee8a7View commit detailsCopy full SHA for 53ee8a7 Browse repository at this point Add opinion scale field type - use Tailwind jaygeorge committed e9503dcView commit detailsCopy full SHA for e9503dc Browse repository at this point Add opinion scale field type - fix labels jaygeorge committed 93496c2View commit detailsCopy full SHA for 93496c2 Browse repository at this point Add opinion scale field type - tidy instructions jaygeorge committed a6eaaf4View commit detailsCopy full SHA for a6eaaf4 Browse repository at this point Add opinion scale field type - finesse jaygeorge committed 3d8edfbView commit detailsCopy full SHA for 3d8edfb Browse repository at this point Add opinion scale field type - optically align labels jaygeorge committed 7ce1379View commit detailsCopy full SHA for 7ce1379 Browse repository at this point Field types - dark mode balances jaygeorge committed 62b76e1View commit detailsCopy full SHA for 62b76e1 Browse repository at this point Star rating - fix dark mode jaygeorge committed cd09b55View commit detailsCopy full SHA for cd09b55 Browse repository at this point Fix Builder field type - it was behaving weirdly jaygeorge committed 237570dView commit detailsCopy full SHA for 237570d Browse repository at this point Commits on Jun 8, 2026 Logic tab - fixed collapsed row badge/value combo jaygeorge committed c58ecd0View commit detailsCopy full SHA for c58ecd0 Browse repository at this point Logic tab - fixed row decoration jaygeorge committed 4163a83View commit detailsCopy full SHA for 4163a83 Browse repository at this point ✨ fix form not saving - textarea is a CP fieldtype, not a form fieldtype. The builder wraps it in Fallback, but was sending fieldtype: "fallback" back on save. The repository can't look up "fallbac… Show description for 1e759d5 jaygeorge committed 1e759d5View commit detailsCopy full SHA for 1e759d5 Browse repository at this point Only output the logic icon on page titles when they logic jaygeorge committed 41ac3ceView commit detailsCopy full SHA for 41ac3ce Browse repository at this point Tighten page title space jaygeorge committed d8e3064View commit detailsCopy full SHA for d8e3064 Browse repository at this point Fix banner icon for compressed view - Information fields (banner, heading, paragraph) had their own collapsed markup that skipped the shared compressed-view structure. jaygeorge committed 2cfe1faView commit detailsCopy full SHA for 2cfe1fa Browse repository at this point Switch category color from amber to green - amber is too close to orange and the category feels pretty different to choice jaygeorge committed 0160f6bView commit detailsCopy full SHA for 0160f6b Browse repository at this point Commits on Jun 10, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed d917fb9View commit detailsCopy full SHA for d917fb9 Browse repository at this point Revert "Fix Builder field type - it was behaving weirdly" Show description for 5092cbb duncanmcclean committed 5092cbbView commit detailsCopy full SHA for 5092cbb Browse repository at this point Revert "✨ fix form not saving - textarea is a CP fieldtype, not a form fieldtype. The builder wraps it in Fallback, but was sending fieldtype: "fallback" back on save. The repository can't look up … Show description for 7e2b7b5 duncanmcclean committed 7e2b7b5View commit detailsCopy full SHA for 7e2b7b5 Browse repository at this point Revert various changes from c3050492 Show description for 9975a69 duncanmcclean committed 9975a69View commit detailsCopy full SHA for 9975a69 Browse repository at this point wip duncanmcclean committed bd1c032View commit detailsCopy full SHA for bd1c032 Browse repository at this point wip duncanmcclean committed 688379aView commit detailsCopy full SHA for 688379a Browse repository at this point Revert field preview change in be9fcf1c. Show description for 7f17afd duncanmcclean committed 7f17afdView commit detailsCopy full SHA for 7f17afd Browse repository at this point Review changes to builder in fb85b8fc Show description for 807d725 duncanmcclean committed 807d725View commit detailsCopy full SHA for 807d725 Browse repository at this point fix weird indentation duncanmcclean committed de157d0View commit detailsCopy full SHA for de157d0 Browse repository at this point wip duncanmcclean committed 3aab7a2View commit detailsCopy full SHA for 3aab7a2 Browse repository at this point image choice fieldtype tweaks Show description for e56c667 duncanmcclean committed e56c667View commit detailsCopy full SHA for e56c667 Browse repository at this point require field labels in form builder duncanmcclean committed a6972a9View commit detailsCopy full SHA for a6972a9 Browse repository at this point opinion scale fieldtype tweaks Show description for f07d652 duncanmcclean committed f07d652View commit detailsCopy full SHA for f07d652 Browse repository at this point wip duncanmcclean committed 47b6f21View commit detailsCopy full SHA for 47b6f21 Browse repository at this point star rating fieldtype tweaks Show description for 7827322 duncanmcclean committed 7827322View commit detailsCopy full SHA for 7827322 Browse repository at this point ranking fieldtype tweaks Show description for e905f05 duncanmcclean committed e905f05View commit detailsCopy full SHA for e905f05 Browse repository at this point banner fieldtype tweaks duncanmcclean committed 4a7d327View commit detailsCopy full SHA for 4a7d327 Browse repository at this point wip duncanmcclean committed 9b3e299View commit detailsCopy full SHA for 9b3e299 Browse repository at this point remove unnecessary (and missing) instructions duncanmcclean committed cc6adb1View commit detailsCopy full SHA for cc6adb1 Browse repository at this point avoid using information fields (banner, heading, paragraph) in logic Show description for b6f6fdb duncanmcclean committed b6f6fdbView commit detailsCopy full SHA for b6f6fdb Browse repository at this point improve logic value stuff for new form fieldtypes duncanmcclean committed 592eefbView commit detailsCopy full SHA for 592eefb Browse repository at this point make container/folder of image options fieldtype configurable duncanmcclean committed 6a8d511View commit detailsCopy full SHA for 6a8d511 Browse repository at this point re-work config options for information fields & add field stubs duncanmcclean committed a060025View commit detailsCopy full SHA for a060025 Browse repository at this point fix failing tests duncanmcclean committed f13d239View commit detailsCopy full SHA for f13d239 Browse repository at this point provide `is_informative` to fields loop to avoid outputting labels/instructions duncanmcclean committed 044e66eView commit detailsCopy full SHA for 044e66e Browse repository at this point use `is_informative` in our fields stub duncanmcclean committed e533341View commit detailsCopy full SHA for e533341 Browse repository at this point Commits on Jun 11, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 84e4928View commit detailsCopy full SHA for 84e4928 Browse repository at this point fix icon not being persisted in banner field config duncanmcclean committed 0eda343View commit detailsCopy full SHA for 0eda343 Browse repository at this point Avoid showing preview when dragging fields in collapsed mode duncanmcclean committed 05bdc7bView commit detailsCopy full SHA for 05bdc7b Browse repository at this point adjust how min/max clamping happens in the opinion range fieldtype duncanmcclean committed 1b0d9ebView commit detailsCopy full SHA for 1b0d9eb Browse repository at this point wip duncanmcclean committed 48cb929View commit detailsCopy full SHA for 48cb929 Browse repository at this point "generate" opinion scale values in php duncanmcclean committed 38d9227View commit detailsCopy full SHA for 38d9227 Browse repository at this point replace default values with placeholders Show description for c49797c duncanmcclean committed c49797cView commit detailsCopy full SHA for c49797c Browse repository at this point simpler opinion scale views duncanmcclean committed 4025df1View commit detailsCopy full SHA for 4025df1 Browse repository at this point simpler star rating duncanmcclean committed aad9104View commit detailsCopy full SHA for aad9104 Browse repository at this point fix error in field inspector when page contains fieldset import duncanmcclean committed a7d69d4View commit detailsCopy full SHA for a7d69d4 Browse repository at this point simpler ranking views duncanmcclean committed 9f7a37eView commit detailsCopy full SHA for 9f7a37e Browse repository at this point process field config when saving, not when updating config options Show description for 7bad860 duncanmcclean committed 7bad860View commit detailsCopy full SHA for 7bad860 Browse repository at this point avoid generating field handles with hyphens Show description for ac6d62a duncanmcclean committed ac6d62aView commit detailsCopy full SHA for ac6d62a Browse repository at this point image choice view duncanmcclean committed 3cf0913View commit detailsCopy full SHA for 3cf0913 Browse repository at this point preprocess values when loading form builder duncanmcclean committed 57a0d60View commit detailsCopy full SHA for 57a0d60 Browse repository at this point make form fieldtype for spacer duncanmcclean committed 288fd39View commit detailsCopy full SHA for 288fd39 Browse repository at this point prevent configuring logic based on structure fields duncanmcclean committed ae35c37View commit detailsCopy full SHA for ae35c37 Browse repository at this point Commits on Jun 12, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed bdc19aeView commit detailsCopy full SHA for bdc19ae Browse repository at this point fix banner example duncanmcclean committed db760e9View commit detailsCopy full SHA for db760e9 Browse repository at this point provide meta and values to previews publish container duncanmcclean committed 321d0d2View commit detailsCopy full SHA for 321d0d2 Browse repository at this point hide validation tab in field inspector for structure/information fields Show description for 96cfec5 duncanmcclean committed 96cfec5View commit detailsCopy full SHA for 96cfec5 Browse repository at this point Revert "preprocess values when loading form builder" Show description for be447a4 duncanmcclean committed be447a4View commit detailsCopy full SHA for be447a4 Browse repository at this point Revert "process field config when saving, not when updating config options" Show description for 3b05e49 duncanmcclean committed 3b05e49View commit detailsCopy full SHA for 3b05e49 Browse repository at this point preprocess before validating duncanmcclean committed 5ee6cf8View commit detailsCopy full SHA for 5ee6cf8 Browse repository at this point group form fieldtype duncanmcclean committed 7e01077View commit detailsCopy full SHA for 7e01077 Browse repository at this point combine assets and files fieldtypes into a single upload form fieldtype duncanmcclean committed 26d37fbView commit detailsCopy full SHA for 26d37fb Browse repository at this point very lightly style rankings view so its clear you can drag & drop duncanmcclean committed b42935cView commit detailsCopy full SHA for b42935c Browse repository at this point use FormLayout on submission show page duncanmcclean committed e49f607View commit detailsCopy full SHA for e49f607 Browse repository at this point Commits on Jun 15, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed fdb3c20View commit detailsCopy full SHA for fdb3c20 Browse repository at this point formatting duncanmcclean committed 4a81aa3View commit detailsCopy full SHA for 4a81aa3 Browse repository at this point Small background color adjustments including dark mode jaygeorge committed fc38b65View commit detailsCopy full SHA for fc38b65 Browse repository at this point fix failing tests duncanmcclean committed a363f92View commit detailsCopy full SHA for a363f92 Browse repository at this point wip duncanmcclean committed a85473dView commit detailsCopy full SHA for a85473d Browse repository at this point missing `__` imports duncanmcclean committed 37be4c6View commit detailsCopy full SHA for 37be4c6 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed bfdb8e4View commit detailsCopy full SHA for bfdb8e4 Browse repository at this point Wrap some inline stylesheet using a cascade layer so devs can easily override jaygeorge committed e66d0ffView commit detailsCopy full SHA for e66d0ff Browse repository at this point Revert "Wrap some inline stylesheet using a cascade layer so devs can easily override" Show description for 7e759eb jaygeorge committed 7e759ebView commit detailsCopy full SHA for 7e759eb Browse repository at this point [6.x] Forms 2: Yes/No Form Fieldtype (#14819) Show description for 272cb73 duncanmcclean andjaygeorge authored 272cb73View commit detailsCopy full SHA for 272cb73 Browse repository at this point remove solo.yml from git duncanmcclean committed cf27f47View commit detailsCopy full SHA for cf27f47 Browse repository at this point Improve focus / selection state - Image Choice jaygeorge committed e95ff5dView commit detailsCopy full SHA for e95ff5d Browse repository at this point Improve focus / selection state - Opinion Scale jaygeorge committed 137ba00View commit detailsCopy full SHA for 137ba00 Browse repository at this point Commits on Jun 16, 2026 Yes/No - only fill the icon if the option is selected jaygeorge committed dca2b8bView commit detailsCopy full SHA for dca2b8b Browse repository at this point [6.x] Make the ranking fieldtype orderable with just the keyboard (#14823) Show description for 166a8ac jaygeorge andduncanmcclean authored 166a8acView commit detailsCopy full SHA for 166a8ac Browse repository at this point prevent information fieldtypes showing in listing column list duncanmcclean committed b0a68bdView commit detailsCopy full SHA for b0a68bd Browse repository at this point Merge branch '6.x' into forms-2 jaygeorge committed 754131eView commit detailsCopy full SHA for 754131e Browse repository at this point Logic rule formatting jaygeorge committed cc39fd3View commit detailsCopy full SHA for cc39fd3 Browse repository at this point Logic rule formatting jaygeorge committed ff01c73View commit detailsCopy full SHA for ff01c73 Browse repository at this point Improve logic rule badge balance jaygeorge committed be83111View commit detailsCopy full SHA for be83111 Browse repository at this point Commits on Jun 17, 2026 Improve logic rule text balance jaygeorge committed 96bb4a6View commit detailsCopy full SHA for 96bb4a6 Browse repository at this point Fix empty state dark border jaygeorge committed 8ed11aaView commit detailsCopy full SHA for 8ed11aa Browse repository at this point Ranking field - add an 'ordered' state jaygeorge committed 9433d57View commit detailsCopy full SHA for 9433d57 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed e04391cView commit detailsCopy full SHA for e04391c Browse repository at this point underlying yes/no fieldtype shouldn't be visible in form builder Show description for 890d3b0 duncanmcclean committed 890d3b0View commit detailsCopy full SHA for 890d3b0 Browse repository at this point Commits on Jun 18, 2026 [6.x] Fix the stars rating field rendering (#14820) Show description for 9db3d8d jaygeorge andduncanmcclean authored 9db3d8dView commit detailsCopy full SHA for 9db3d8d Browse repository at this point Commits on Jun 19, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6ba903dView commit detailsCopy full SHA for 6ba903d Browse repository at this point translate form title in all the places duncanmcclean committed 159fcdaView commit detailsCopy full SHA for 159fcda Browse repository at this point Commits on Jun 22, 2026 [6.x] Forms 2: Compressed view (#14853) jaygeorge authored 1717518View commit detailsCopy full SHA for 1717518 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 21b1829View commit detailsCopy full SHA for 21b1829 Browse repository at this point add confirmation modal before deleting field duncanmcclean committed aa8db6dView commit detailsCopy full SHA for aa8db6d Browse repository at this point [6.x] Forms 2: Add "Always hide" option to field logic dropdown (#14859) duncanmcclean authored 57f9f5cView commit detailsCopy full SHA for 57f9f5c Browse repository at this point Commits on Jun 23, 2026 wip duncanmcclean committed d94e62dView commit detailsCopy full SHA for d94e62d Browse repository at this point Commits on Jun 24, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 1e397bbView commit detailsCopy full SHA for 1e397bb Browse repository at this point Commits on Jun 25, 2026 [6.x] Forms 2: Submission Statuses (#14832) Show description for df261ed duncanmcclean andjasonvarga authored df261edView commit detailsCopy full SHA for df261ed Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 2e75c1cView commit detailsCopy full SHA for 2e75c1c Browse repository at this point Commits on Jun 30, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed e4dd0a8View commit detailsCopy full SHA for e4dd0a8 Browse repository at this point adjust initial page logic Show description for 5f81608 duncanmcclean committed 5f81608View commit detailsCopy full SHA for 5f81608 Browse repository at this point [6.x] Forms 2: Site Filter (#14902) duncanmcclean authored 47f7905View commit detailsCopy full SHA for 47f7905 Browse repository at this point cleanup `data-panels-showing` attribute when unmounting panel layout duncanmcclean committed e090e85View commit detailsCopy full SHA for e090e85 Browse repository at this point avoid publishing `star-rating.css`. the css is inlined now. duncanmcclean committed 9f2b2d2View commit detailsCopy full SHA for 9f2b2d2 Browse repository at this point Commits on Jul 1, 2026 exclude partial submissions from results count on forms listing duncanmcclean committed eff4c77View commit detailsCopy full SHA for eff4c77 Browse repository at this point move `is_informative` out of generic `RendersForms` trait Show description for 07b190f duncanmcclean committed 07b190fView commit detailsCopy full SHA for 07b190f Browse repository at this point Commits on Jul 2, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6e0764aView commit detailsCopy full SHA for 6e0764a Browse repository at this point Merge branch '6.x' into forms-2 jaygeorge committed 9b7ae88View commit detailsCopy full SHA for 9b7ae88 Browse repository at this point [6.x] Forms 2: Field numbering (#14909) duncanmcclean authored 0ac798dView commit detailsCopy full SHA for 0ac798d Browse repository at this point Commits on Jul 3, 2026 Fix architectural lines breaking out of .content, e.g. /collections/create jaygeorge committed 378491cView commit detailsCopy full SHA for 378491c Browse repository at this point Merge remote-tracking branch 'origin/6.x' into forms-2 Show description for bbea10d jasonvarga committed bbea10dView commit detailsCopy full SHA for bbea10d Browse repository at this point Small dark mode fix jaygeorge committed e88ad6fView commit detailsCopy full SHA for e88ad6f Browse repository at this point Commits on Jul 6, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 461512dView commit detailsCopy full SHA for 461512d Browse repository at this point fix logic indicator not showing sometimes duncanmcclean committed 3b4eb46View commit detailsCopy full SHA for 3b4eb46 Browse repository at this point include fieldset reference in tooltip duncanmcclean committed 491b44dView commit detailsCopy full SHA for 491b44d Browse repository at this point [6.x] Forms 2: Logic Tree (#14811) Show description for 243b695 jaygeorge andduncanmcclean authored 243b695View commit detailsCopy full SHA for 243b695 Browse repository at this point wip duncanmcclean committed 52798d9View commit detailsCopy full SHA for 52798d9 Browse repository at this point reset active tab in page inspector when selecting the last page duncanmcclean committed be337b9View commit detailsCopy full SHA for be337b9 Browse repository at this point avoid moving fields between pages in logic tree duncanmcclean committed 5739fc4View commit detailsCopy full SHA for 5739fc4 Browse repository at this point Commits on Jul 7, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed de239ddView commit detailsCopy full SHA for de239dd Browse repository at this point Small dark mode badge fix for page logic jaygeorge committed ef8d8feView commit detailsCopy full SHA for ef8d8fe Browse repository at this point Make "delete" icon condition only appear on hover, like the trash icon jaygeorge committed d7f1f57View commit detailsCopy full SHA for d7f1f57 Browse repository at this point Balance page rule with trash icon jaygeorge committed 34aa292View commit detailsCopy full SHA for 34aa292 Browse repository at this point Make "delete" icon condition only appear on hover for field logic too jaygeorge committed 9552b0aView commit detailsCopy full SHA for 9552b0a Browse repository at this point Connect - adjust grid responsively jaygeorge committed eb2005bView commit detailsCopy full SHA for eb2005b Browse repository at this point Merge branch '6.x' into forms-2 jaygeorge committed 381570eView commit detailsCopy full SHA for 381570e Browse repository at this point [6.x] Forms 2: Allow multiple forms when Forms Pro is installed (#14952) Show description for cc7f602 duncanmcclean andclaude authored cc7f602View commit detailsCopy full SHA for cc7f602 Browse repository at this point [6.x] Forms 2: Access (#14950) Show description for 56e9900 duncanmcclean andjasonvarga authored 56e9900View commit detailsCopy full SHA for 56e9900 Browse repository at this point Commits on Jul 8, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 7c9eaa7View commit detailsCopy full SHA for 7c9eaa7 Browse repository at this point [6.x] Forms 2: Multi-page forms & `SubmitForm` action (#14840) Show description for 88a0a19 duncanmcclean andjasonvarga authored 88a0a19View commit detailsCopy full SHA for 88a0a19 Browse repository at this point Commits on Jul 9, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 510cea1View commit detailsCopy full SHA for 510cea1 Browse repository at this point Fix failing test caused by #14959 duncanmcclean committed da09e47View commit detailsCopy full SHA for da09e47 Browse repository at this point [6.x] Forms 2: Tighten form upload validation in `SubmitForm` action (#14964) duncanmcclean authored 4cea062View commit detailsCopy full SHA for 4cea062 Browse repository at this point fix error when submitting a form page containing a fieldset import Show description for 9bb3804 duncanmcclean committed 9bb3804View commit detailsCopy full SHA for 9bb3804 Browse repository at this point Logic tree - improve the way overflow is handled jaygeorge committed 7ef050bView commit detailsCopy full SHA for 7ef050b Browse repository at this point Logic tree - improve full bleed scrolling with a separator jaygeorge committed bc563b2View commit detailsCopy full SHA for bc563b2 Browse repository at this point Logic tree - panel styling jaygeorge committed 90e8d5cView commit detailsCopy full SHA for 90e8d5c Browse repository at this point Logic tree - add a container query like the list view jaygeorge committed 15674b2View commit detailsCopy full SHA for 15674b2 Browse repository at this point Logic tree - separate rules in split panel, like we do in the Edit tab jaygeorge committed b526263View commit detailsCopy full SHA for b526263 Browse repository at this point Fix connector line stacking context jaygeorge committed 9e022c8View commit detailsCopy full SHA for 9e022c8 Browse repository at this point Logic tree - align rules with the page header jaygeorge committed ee555cfView commit detailsCopy full SHA for ee555cf Browse repository at this point Logic tree - When an item is selected, highlight its connection jaygeorge committed fe40316View commit detailsCopy full SHA for fe40316 Browse repository at this point [6.x] Forms 2: Remember panel widths (#14968) jackmcdade authored 369d2d7View commit detailsCopy full SHA for 369d2d7 Browse repository at this point Logic tree - dim the connection arrow of unselected columns too jaygeorge committed e98a704View commit detailsCopy full SHA for e98a704 Browse repository at this point Merge branch '6.x' into forms-2 jasonvarga committed 0d0a2cfView commit detailsCopy full SHA for 0d0a2cf Browse repository at this point Commits on Jul 10, 2026 [6.x] Forms 2: ✨ Move the panel to the side for /logic > tree view (#14969) Show description for 769cf0b jaygeorge andduncanmcclean authored 769cf0bView commit detailsCopy full SHA for 769cf0b Browse repository at this point fix adding field logic in list mode duncanmcclean committed 668ce1cView commit detailsCopy full SHA for 668ce1c Browse repository at this point [6.x] Logic empty state (#14976) jaygeorge authored 1791060View commit detailsCopy full SHA for 1791060 Browse repository at this point [6.x] Forms 2: Fix false dirty state when opening field inspector in Logic Tree view (#14977) duncanmcclean authored c4deef3View commit detailsCopy full SHA for c4deef3 Browse repository at this point make text in paragraph fieldtype mandatory duncanmcclean committed 4ff2828View commit detailsCopy full SHA for 4ff2828 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed e02192fView commit detailsCopy full SHA for e02192f Browse repository at this point Merge branch '6.x' into forms-2 Show description for 6fe3804 jasonvarga committed 6fe3804View commit detailsCopy full SHA for 6fe3804 Browse repository at this point [6.x] Forms 2: Permissions (#14957) Show description for 4df166b authored 4df166bView commit detailsCopy full SHA for 4df166b Browse repository at this point Commits on Jul 13, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed d7f3217View commit detailsCopy full SHA for d7f3217 Browse repository at this point Add form builder empty state help text jackmcdade committed 316c1a2View commit detailsCopy full SHA for 316c1a2 Browse repository at this point Commits on Jul 14, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed b48ceeeView commit detailsCopy full SHA for b48ceee Browse repository at this point Space headings a little more jaygeorge committed b194775View commit detailsCopy full SHA for b194775 Browse repository at this point Half way jaygeorge committed 3ba0eb4View commit detailsCopy full SHA for 3ba0eb4 Browse repository at this point Stop graph paper lines going through titles jaygeorge committed 2dea0aaView commit detailsCopy full SHA for 2dea0aa Browse repository at this point Align empty message with top row jaygeorge committed 7a59b13View commit detailsCopy full SHA for 7a59b13 Browse repository at this point Commits on Jul 15, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 5d917a3View commit detailsCopy full SHA for 5d917a3 Browse repository at this point use `v-else` instead duncanmcclean committed 4290b17View commit detailsCopy full SHA for 4290b17 Browse repository at this point indent duncanmcclean committed 9335d5fView commit detailsCopy full SHA for 9335d5f Browse repository at this point Correct sidebar calculations by accounting for container padding jaygeorge committed 90d32f4View commit detailsCopy full SHA for 90d32f4 Browse repository at this point Skew panels right jaygeorge committed c8915a3View commit detailsCopy full SHA for c8915a3 Browse repository at this point Skew panels right jaygeorge committed c4256f4View commit detailsCopy full SHA for c4256f4 Browse repository at this point Panels - restore middle breakpoint width jaygeorge committed dbd793dView commit detailsCopy full SHA for dbd793d Browse repository at this point Revert "use `v-else` instead" Show description for 5664b3e duncanmcclean committed 5664b3eView commit detailsCopy full SHA for 5664b3e Browse repository at this point Tweak empty message decoration slightly, ready for a larger sidebar with blueprints jaygeorge committed 07bc4f9View commit detailsCopy full SHA for 07bc4f9 Browse repository at this point Commits on Jul 16, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 87d8be6View commit detailsCopy full SHA for 87d8be6 Browse repository at this point Commits on Jul 17, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed c70dd63View commit detailsCopy full SHA for c70dd63 Browse repository at this point ensure extra config options are passed to fieldtypes duncanmcclean committed ce56ae5View commit detailsCopy full SHA for ce56ae5 Browse repository at this point Commits on Jul 20, 2026 copy form fields when duplicating form duncanmcclean committed ea49753View commit detailsCopy full SHA for ea49753 Browse repository at this point add default messages as field placeholders duncanmcclean committed 4c6383bView commit detailsCopy full SHA for 4c6383b Browse repository at this point [6.x] Logic tree leap calculation (#15035) Show description for bc6c992 authored bc6c992View commit detailsCopy full SHA for bc6c992 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 6e0af1cView commit detailsCopy full SHA for 6e0af1c Browse repository at this point avoid dispatching events during initialization duncanmcclean committed 9adc15eView commit detailsCopy full SHA for 9adc15e Browse repository at this point fix nav state getting out of sync with the DOM on page load Show description for 316f2e3 duncanmcclean committed 316f2e3View commit detailsCopy full SHA for 316f2e3 Browse repository at this point Commits on Jul 21, 2026 Merge branch '6.x' into forms-2 jasonvarga committed 5af8300View commit detailsCopy full SHA for 5af8300 Browse repository at this point emit updated when validation rules are added via mutation Show description for 0359e5c jasonvarga andclaude committed 0359e5cView commit detailsCopy full SHA for 0359e5c Browse repository at this point Make current item more consistent with CP buttons jaygeorge committed 8574cedView commit detailsCopy full SHA for 8574ced Browse repository at this point [6.x] Forms 2: Various file upload improvements (#15006) Show description for fa798d0 authored fa798d0View commit detailsCopy full SHA for fa798d0 Browse repository at this point Commits on Jul 22, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed ea115ecView commit detailsCopy full SHA for ea115ec Browse repository at this point Commits on Jul 23, 2026 move translation calls inside getter to avoid boot errors duncanmcclean committed e7b3387View commit detailsCopy full SHA for e7b3387 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 4774811View commit detailsCopy full SHA for 4774811 Browse repository at this point [6.x] Remove unused form metrics code (#15066) Show description for c316553 duncanmcclean andclaude authored c316553View commit detailsCopy full SHA for c316553 Browse repository at this point Rename Marketplace button jackmcdade committed c40daf8View commit detailsCopy full SHA for c40daf8 Browse repository at this point Add Generate Fake Submission support for all the new form fieldtypes jackmcdade committed 7f2fa3aView commit detailsCopy full SHA for 7f2fa3a Browse repository at this point ensure toggle conditions work correctly duncanmcclean committed 660175eView commit detailsCopy full SHA for 660175e Browse repository at this point Commits on Jul 31, 2026 Nicer previous page UX jackmcdade committed 99ed81dView commit detailsCopy full SHA for 99ed81d Browse repository at this point Commits on Aug 3, 2026 [6.x] Forms 2: Show option dropdown when adding logic against Image Choice fields (#15096) duncanmcclean authored 1460605View commit detailsCopy full SHA for 1460605 Browse repository at this point Commits on Aug 5, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 9aca449View commit detailsCopy full SHA for 9aca449 Browse repository at this point Commits on Aug 6, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed fbe2f7cView commit detailsCopy full SHA for fbe2f7c Browse repository at this point Commits on Aug 7, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6d9762cView commit detailsCopy full SHA for 6d9762c Browse repository at this point refactor information/structure check duncanmcclean committed 9b68d22View commit detailsCopy full SHA for 9b68d22 Browse repository at this point move page logic to action inspector duncanmcclean committed da24576View commit detailsCopy full SHA for da24576 Browse repository at this point Commits on Aug 10, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 3027011View commit detailsCopy full SHA for 3027011 Browse repository at this point Add scroll margin to pagination too jaygeorge committed b6decd9View commit detailsCopy full SHA for b6decd9 Browse repository at this point move logic icon next to actions duncanmcclean committed 3a0261aView commit detailsCopy full SHA for 3a0261a Browse repository at this point validate against numbers in names duncanmcclean committed 9f9602fView commit detailsCopy full SHA for 9f9602f Browse repository at this point Commits on Aug 12, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed b2795adView commit detailsCopy full SHA for b2795ad Browse repository at this point Commits on Aug 13, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 3c8816eView commit detailsCopy full SHA for 3c8816e Browse repository at this point Commits on Aug 14, 2026 [6.x] Forms 2: Extract star rating, ranking and image choice into UI components (#15068) Show description for 291bb65 duncanmcclean andjackmcdade authored 291bb65View commit detailsCopy full SHA for 291bb65 Browse repository at this point Commits on Aug 17, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 8e0eb96View commit detailsCopy full SHA for 8e0eb96 Browse repository at this point [6.x] Forms 2: Temporary file upload fixes (#15206) Show description for c0b4163 duncanmcclean andclaude authored c0b4163View commit detailsCopy full SHA for c0b4163 Browse repository at this point [6.x] Forms 2: Generate field handles from labels (#15203) Show description for 25266cc duncanmcclean andclaude authored 25266ccView commit detailsCopy full SHA for 25266cc Browse repository at this point Commits on Aug 18, 2026 move handle below label/heading field in banner/heading/paragraph fieldtypes duncanmcclean committed 62d35c2View commit detailsCopy full SHA for 62d35c2 Browse repository at this point Commits on Aug 24, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 04ed9b0View commit detailsCopy full SHA for 04ed9b0 Browse repository at this point formatting duncanmcclean committed 7f90033View commit detailsCopy full SHA for 7f90033 Browse repository at this point Commits on Aug 26, 2026 [6.x] Forms 2: Respect min/max when generating fake integer values (#15276) Show description for 94b0fb0 duncanmcclean andclaude authored 94b0fb0View commit detailsCopy full SHA for 94b0fb0 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed d1b353fView commit detailsCopy full SHA for d1b353f Browse repository at this point Commits on Aug 27, 2026 Merge remote-tracking branch 'origin/6.x' into forms-2 jasonvarga committed cad71daView commit detailsCopy full SHA for cad71da Browse repository at this point Commits on Aug 28, 2026 [6.x] Forms 2: Ensure `FormSubmissionsController` follows conventions (#15300) duncanmcclean authored dbcdd6fView commit detailsCopy full SHA for dbcdd6f Browse repository at this point Commits on Aug 31, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6dcfee8View commit detailsCopy full SHA for 6dcfee8 Browse repository at this point [6.x] Forms 2: Catch untranslated strings (#15315) Show description for 2b62ccb duncanmcclean andclaude authored 2b62ccbView commit detailsCopy full SHA for 2b62ccb Browse repository at this point Footer © 2026 GitHub, Inc. Footer navigation Terms Privacy Security Status Community Docs Contact You can’t perform that action at this time. , 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' [6.x] Forms 2 by jasonvarga · Pull Request #15039 · statamic/cms · GitHub Skip to contentNavigation Menu Sign inAppearance settings AI CODE CREATIONGitHub CopilotWrite better code with AI GitHub Copilot appDirect agents from issue to merge MCP RegistryIntegrate external tools DEVELOPER WORKFLOWSActionsAutomate any workflow CodespacesInstant dev environments IssuesPlan and track work Code ReviewManage code changes Code QualityEnforce quality at merge APPLICATION SECURITYGitHub Advanced SecurityFind and fix vulnerabilities Code securitySecure your code as you build Secret protectionStop leaks before they start EXPLOREWhy GitHub Documentation Blog Changelog Marketplace View all features BY COMPANY SIZEEnterprises Small and medium teams Startups Nonprofits BY USE CASEApp Modernization DevSecOps DevOps CI/CD View all use cases BY INDUSTRYHealthcare Financial services Manufacturing Government View all industries View all solutions EXPLORE BY TOPICAI Software Development DevOps Security View all topics EXPLORE BY TYPECustomer stories Events & webinars Ebooks & reports Business insights GitHub Skills SUPPORT & SERVICESDocumentation Customer support Community forum Trust center Partners View all resources COMMUNITYGitHub SponsorsFund open source developers PROGRAMSSecurity Lab Maintainer Community GitHub Stars Archive Program REPOSITORIESTopics Trending Collections ENTERPRISE SOLUTIONSEnterprise platformAI-powered developer platform AVAILABLE ADD-ONSGitHub Advanced SecurityEnterprise-grade security features Copilot for BusinessEnterprise-grade AI features Premium SupportEnterprise-grade 24/7 support Pricing Sign in Sign upAppearance settings You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert Uh oh! There was an error while loading. Please reload this page. statamic /cmsPublic Uh oh! There was an error while loading. Please reload this page. Notifications You must be signed in to change notification settings Fork 641 Star 4.9k Code Issues201 Pull requests100 Discussions Actions Projects Security and quality44 Insights Additional navigation options Code Issues Pull requests Discussions Actions Projects Security and quality Insights [6.x] Forms 2 - #15039 #15039 Draft jasonvarga wants to merge 1000 commits into6.xstatamic/cms:6.xfrom forms-2statamic/cms:forms-2Copy head branch name to clipboard ConversationCommits1000 (1000)ChecksFiles changed Draft [6.x] Forms 2#15039jasonvarga wants to merge 1000 commits into6.xstatamic/cms:6.xfrom forms-2statamic/cms:forms-2Copy head branch name to clipboard Commits This pull request is big! We're only showing the most recent 250 commits Commits on Jun 4, 2026 Star rating - add ability to adjust gap and change SVG to use our Flex icon jaygeorge committed 8ddee91View commit detailsCopy full SHA for 8ddee91 Browse repository at this point Star rating - map theme vars jaygeorge committed 69ab566View commit detailsCopy full SHA for 69ab566 Browse repository at this point Star rating - leave as unrated for the form demo jaygeorge committed 67c0b9cView commit detailsCopy full SHA for 67c0b9c Browse repository at this point Star rating - set a floor and ceiling jaygeorge committed 44f7a1bView commit detailsCopy full SHA for 44f7a1b Browse repository at this point Star rating - change star appearance and finish draft jaygeorge committed b749f10View commit detailsCopy full SHA for b749f10 Browse repository at this point fix indentation duncanmcclean committed 8c675a3View commit detailsCopy full SHA for 8c675a3 Browse repository at this point pages actually have ids now duncanmcclean committed a2c02e6View commit detailsCopy full SHA for a2c02e6 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed f8499a6View commit detailsCopy full SHA for f8499a6 Browse repository at this point Star rating - tweak size jaygeorge committed 91e9954View commit detailsCopy full SHA for 91e9954 Browse repository at this point Image choice - first pass jaygeorge committed e37e96bView commit detailsCopy full SHA for e37e96b Browse repository at this point Image choice - Switch to Tailwind jaygeorge committed a5e2211View commit detailsCopy full SHA for a5e2211 Browse repository at this point Image choice - fix error when saving jaygeorge committed ad0ed0eView commit detailsCopy full SHA for ad0ed0e Browse repository at this point Fix double border effect jaygeorge committed cde898dView commit detailsCopy full SHA for cde898d Browse repository at this point Image choice - render image previews jaygeorge committed fb85b8fView commit detailsCopy full SHA for fb85b8f Browse repository at this point Image choice - add a letter before the label jaygeorge committed 3dbae2cView commit detailsCopy full SHA for 3dbae2c Browse repository at this point Image choice - style the letters jaygeorge committed 783f17eView commit detailsCopy full SHA for 783f17e Browse repository at this point Image choice - add aspect ratio as an option for the comparisons jaygeorge committed 4484482View commit detailsCopy full SHA for 4484482 Browse repository at this point Image choice - add example jaygeorge committed be9fcf1View commit detailsCopy full SHA for be9fcf1 Browse repository at this point Image choice - improve demo jaygeorge committed 70717e5View commit detailsCopy full SHA for 70717e5 Browse repository at this point Commits on Jun 5, 2026 Image choice - tighten up a few things 🧹 jaygeorge committed 915d85cView commit detailsCopy full SHA for 915d85c Browse repository at this point Image choice - fix border 🧹 jaygeorge committed de88e8dView commit detailsCopy full SHA for de88e8d Browse repository at this point Image choice - fix padding jaygeorge committed 5adca1cView commit detailsCopy full SHA for 5adca1c Browse repository at this point Image choice - make cards more consistent with the rest of the UI jaygeorge committed 5e28231View commit detailsCopy full SHA for 5e28231 Browse repository at this point Image choice - tighten up letter choice jaygeorge committed 0735f1bView commit detailsCopy full SHA for 0735f1b Browse repository at this point Make panels slightly narrower at smaller MQs jaygeorge committed ec9c31cView commit detailsCopy full SHA for ec9c31c Browse repository at this point Add ranking form field type - first pass jaygeorge committed c305049View commit detailsCopy full SHA for c305049 Browse repository at this point Ranking field type - don't show "null" when adding a new row jaygeorge committed 6ef2072View commit detailsCopy full SHA for 6ef2072 Browse repository at this point Ranking field type - improve appearance jaygeorge committed 68825edView commit detailsCopy full SHA for 68825ed Browse repository at this point Add opinion scale field type - first pass jaygeorge committed 53ee8a7View commit detailsCopy full SHA for 53ee8a7 Browse repository at this point Add opinion scale field type - use Tailwind jaygeorge committed e9503dcView commit detailsCopy full SHA for e9503dc Browse repository at this point Add opinion scale field type - fix labels jaygeorge committed 93496c2View commit detailsCopy full SHA for 93496c2 Browse repository at this point Add opinion scale field type - tidy instructions jaygeorge committed a6eaaf4View commit detailsCopy full SHA for a6eaaf4 Browse repository at this point Add opinion scale field type - finesse jaygeorge committed 3d8edfbView commit detailsCopy full SHA for 3d8edfb Browse repository at this point Add opinion scale field type - optically align labels jaygeorge committed 7ce1379View commit detailsCopy full SHA for 7ce1379 Browse repository at this point Field types - dark mode balances jaygeorge committed 62b76e1View commit detailsCopy full SHA for 62b76e1 Browse repository at this point Star rating - fix dark mode jaygeorge committed cd09b55View commit detailsCopy full SHA for cd09b55 Browse repository at this point Fix Builder field type - it was behaving weirdly jaygeorge committed 237570dView commit detailsCopy full SHA for 237570d Browse repository at this point Commits on Jun 8, 2026 Logic tab - fixed collapsed row badge/value combo jaygeorge committed c58ecd0View commit detailsCopy full SHA for c58ecd0 Browse repository at this point Logic tab - fixed row decoration jaygeorge committed 4163a83View commit detailsCopy full SHA for 4163a83 Browse repository at this point ✨ fix form not saving - textarea is a CP fieldtype, not a form fieldtype. The builder wraps it in Fallback, but was sending fieldtype: "fallback" back on save. The repository can't look up "fallbac… Show description for 1e759d5 jaygeorge committed 1e759d5View commit detailsCopy full SHA for 1e759d5 Browse repository at this point Only output the logic icon on page titles when they logic jaygeorge committed 41ac3ceView commit detailsCopy full SHA for 41ac3ce Browse repository at this point Tighten page title space jaygeorge committed d8e3064View commit detailsCopy full SHA for d8e3064 Browse repository at this point Fix banner icon for compressed view - Information fields (banner, heading, paragraph) had their own collapsed markup that skipped the shared compressed-view structure. jaygeorge committed 2cfe1faView commit detailsCopy full SHA for 2cfe1fa Browse repository at this point Switch category color from amber to green - amber is too close to orange and the category feels pretty different to choice jaygeorge committed 0160f6bView commit detailsCopy full SHA for 0160f6b Browse repository at this point Commits on Jun 10, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed d917fb9View commit detailsCopy full SHA for d917fb9 Browse repository at this point Revert "Fix Builder field type - it was behaving weirdly" Show description for 5092cbb duncanmcclean committed 5092cbbView commit detailsCopy full SHA for 5092cbb Browse repository at this point Revert "✨ fix form not saving - textarea is a CP fieldtype, not a form fieldtype. The builder wraps it in Fallback, but was sending fieldtype: "fallback" back on save. The repository can't look up … Show description for 7e2b7b5 duncanmcclean committed 7e2b7b5View commit detailsCopy full SHA for 7e2b7b5 Browse repository at this point Revert various changes from c3050492 Show description for 9975a69 duncanmcclean committed 9975a69View commit detailsCopy full SHA for 9975a69 Browse repository at this point wip duncanmcclean committed bd1c032View commit detailsCopy full SHA for bd1c032 Browse repository at this point wip duncanmcclean committed 688379aView commit detailsCopy full SHA for 688379a Browse repository at this point Revert field preview change in be9fcf1c. Show description for 7f17afd duncanmcclean committed 7f17afdView commit detailsCopy full SHA for 7f17afd Browse repository at this point Review changes to builder in fb85b8fc Show description for 807d725 duncanmcclean committed 807d725View commit detailsCopy full SHA for 807d725 Browse repository at this point fix weird indentation duncanmcclean committed de157d0View commit detailsCopy full SHA for de157d0 Browse repository at this point wip duncanmcclean committed 3aab7a2View commit detailsCopy full SHA for 3aab7a2 Browse repository at this point image choice fieldtype tweaks Show description for e56c667 duncanmcclean committed e56c667View commit detailsCopy full SHA for e56c667 Browse repository at this point require field labels in form builder duncanmcclean committed a6972a9View commit detailsCopy full SHA for a6972a9 Browse repository at this point opinion scale fieldtype tweaks Show description for f07d652 duncanmcclean committed f07d652View commit detailsCopy full SHA for f07d652 Browse repository at this point wip duncanmcclean committed 47b6f21View commit detailsCopy full SHA for 47b6f21 Browse repository at this point star rating fieldtype tweaks Show description for 7827322 duncanmcclean committed 7827322View commit detailsCopy full SHA for 7827322 Browse repository at this point ranking fieldtype tweaks Show description for e905f05 duncanmcclean committed e905f05View commit detailsCopy full SHA for e905f05 Browse repository at this point banner fieldtype tweaks duncanmcclean committed 4a7d327View commit detailsCopy full SHA for 4a7d327 Browse repository at this point wip duncanmcclean committed 9b3e299View commit detailsCopy full SHA for 9b3e299 Browse repository at this point remove unnecessary (and missing) instructions duncanmcclean committed cc6adb1View commit detailsCopy full SHA for cc6adb1 Browse repository at this point avoid using information fields (banner, heading, paragraph) in logic Show description for b6f6fdb duncanmcclean committed b6f6fdbView commit detailsCopy full SHA for b6f6fdb Browse repository at this point improve logic value stuff for new form fieldtypes duncanmcclean committed 592eefbView commit detailsCopy full SHA for 592eefb Browse repository at this point make container/folder of image options fieldtype configurable duncanmcclean committed 6a8d511View commit detailsCopy full SHA for 6a8d511 Browse repository at this point re-work config options for information fields & add field stubs duncanmcclean committed a060025View commit detailsCopy full SHA for a060025 Browse repository at this point fix failing tests duncanmcclean committed f13d239View commit detailsCopy full SHA for f13d239 Browse repository at this point provide `is_informative` to fields loop to avoid outputting labels/instructions duncanmcclean committed 044e66eView commit detailsCopy full SHA for 044e66e Browse repository at this point use `is_informative` in our fields stub duncanmcclean committed e533341View commit detailsCopy full SHA for e533341 Browse repository at this point Commits on Jun 11, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 84e4928View commit detailsCopy full SHA for 84e4928 Browse repository at this point fix icon not being persisted in banner field config duncanmcclean committed 0eda343View commit detailsCopy full SHA for 0eda343 Browse repository at this point Avoid showing preview when dragging fields in collapsed mode duncanmcclean committed 05bdc7bView commit detailsCopy full SHA for 05bdc7b Browse repository at this point adjust how min/max clamping happens in the opinion range fieldtype duncanmcclean committed 1b0d9ebView commit detailsCopy full SHA for 1b0d9eb Browse repository at this point wip duncanmcclean committed 48cb929View commit detailsCopy full SHA for 48cb929 Browse repository at this point "generate" opinion scale values in php duncanmcclean committed 38d9227View commit detailsCopy full SHA for 38d9227 Browse repository at this point replace default values with placeholders Show description for c49797c duncanmcclean committed c49797cView commit detailsCopy full SHA for c49797c Browse repository at this point simpler opinion scale views duncanmcclean committed 4025df1View commit detailsCopy full SHA for 4025df1 Browse repository at this point simpler star rating duncanmcclean committed aad9104View commit detailsCopy full SHA for aad9104 Browse repository at this point fix error in field inspector when page contains fieldset import duncanmcclean committed a7d69d4View commit detailsCopy full SHA for a7d69d4 Browse repository at this point simpler ranking views duncanmcclean committed 9f7a37eView commit detailsCopy full SHA for 9f7a37e Browse repository at this point process field config when saving, not when updating config options Show description for 7bad860 duncanmcclean committed 7bad860View commit detailsCopy full SHA for 7bad860 Browse repository at this point avoid generating field handles with hyphens Show description for ac6d62a duncanmcclean committed ac6d62aView commit detailsCopy full SHA for ac6d62a Browse repository at this point image choice view duncanmcclean committed 3cf0913View commit detailsCopy full SHA for 3cf0913 Browse repository at this point preprocess values when loading form builder duncanmcclean committed 57a0d60View commit detailsCopy full SHA for 57a0d60 Browse repository at this point make form fieldtype for spacer duncanmcclean committed 288fd39View commit detailsCopy full SHA for 288fd39 Browse repository at this point prevent configuring logic based on structure fields duncanmcclean committed ae35c37View commit detailsCopy full SHA for ae35c37 Browse repository at this point Commits on Jun 12, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed bdc19aeView commit detailsCopy full SHA for bdc19ae Browse repository at this point fix banner example duncanmcclean committed db760e9View commit detailsCopy full SHA for db760e9 Browse repository at this point provide meta and values to previews publish container duncanmcclean committed 321d0d2View commit detailsCopy full SHA for 321d0d2 Browse repository at this point hide validation tab in field inspector for structure/information fields Show description for 96cfec5 duncanmcclean committed 96cfec5View commit detailsCopy full SHA for 96cfec5 Browse repository at this point Revert "preprocess values when loading form builder" Show description for be447a4 duncanmcclean committed be447a4View commit detailsCopy full SHA for be447a4 Browse repository at this point Revert "process field config when saving, not when updating config options" Show description for 3b05e49 duncanmcclean committed 3b05e49View commit detailsCopy full SHA for 3b05e49 Browse repository at this point preprocess before validating duncanmcclean committed 5ee6cf8View commit detailsCopy full SHA for 5ee6cf8 Browse repository at this point group form fieldtype duncanmcclean committed 7e01077View commit detailsCopy full SHA for 7e01077 Browse repository at this point combine assets and files fieldtypes into a single upload form fieldtype duncanmcclean committed 26d37fbView commit detailsCopy full SHA for 26d37fb Browse repository at this point very lightly style rankings view so its clear you can drag & drop duncanmcclean committed b42935cView commit detailsCopy full SHA for b42935c Browse repository at this point use FormLayout on submission show page duncanmcclean committed e49f607View commit detailsCopy full SHA for e49f607 Browse repository at this point Commits on Jun 15, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed fdb3c20View commit detailsCopy full SHA for fdb3c20 Browse repository at this point formatting duncanmcclean committed 4a81aa3View commit detailsCopy full SHA for 4a81aa3 Browse repository at this point Small background color adjustments including dark mode jaygeorge committed fc38b65View commit detailsCopy full SHA for fc38b65 Browse repository at this point fix failing tests duncanmcclean committed a363f92View commit detailsCopy full SHA for a363f92 Browse repository at this point wip duncanmcclean committed a85473dView commit detailsCopy full SHA for a85473d Browse repository at this point missing `__` imports duncanmcclean committed 37be4c6View commit detailsCopy full SHA for 37be4c6 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed bfdb8e4View commit detailsCopy full SHA for bfdb8e4 Browse repository at this point Wrap some inline stylesheet using a cascade layer so devs can easily override jaygeorge committed e66d0ffView commit detailsCopy full SHA for e66d0ff Browse repository at this point Revert "Wrap some inline stylesheet using a cascade layer so devs can easily override" Show description for 7e759eb jaygeorge committed 7e759ebView commit detailsCopy full SHA for 7e759eb Browse repository at this point [6.x] Forms 2: Yes/No Form Fieldtype (#14819) Show description for 272cb73 duncanmcclean andjaygeorge authored 272cb73View commit detailsCopy full SHA for 272cb73 Browse repository at this point remove solo.yml from git duncanmcclean committed cf27f47View commit detailsCopy full SHA for cf27f47 Browse repository at this point Improve focus / selection state - Image Choice jaygeorge committed e95ff5dView commit detailsCopy full SHA for e95ff5d Browse repository at this point Improve focus / selection state - Opinion Scale jaygeorge committed 137ba00View commit detailsCopy full SHA for 137ba00 Browse repository at this point Commits on Jun 16, 2026 Yes/No - only fill the icon if the option is selected jaygeorge committed dca2b8bView commit detailsCopy full SHA for dca2b8b Browse repository at this point [6.x] Make the ranking fieldtype orderable with just the keyboard (#14823) Show description for 166a8ac jaygeorge andduncanmcclean authored 166a8acView commit detailsCopy full SHA for 166a8ac Browse repository at this point prevent information fieldtypes showing in listing column list duncanmcclean committed b0a68bdView commit detailsCopy full SHA for b0a68bd Browse repository at this point Merge branch '6.x' into forms-2 jaygeorge committed 754131eView commit detailsCopy full SHA for 754131e Browse repository at this point Logic rule formatting jaygeorge committed cc39fd3View commit detailsCopy full SHA for cc39fd3 Browse repository at this point Logic rule formatting jaygeorge committed ff01c73View commit detailsCopy full SHA for ff01c73 Browse repository at this point Improve logic rule badge balance jaygeorge committed be83111View commit detailsCopy full SHA for be83111 Browse repository at this point Commits on Jun 17, 2026 Improve logic rule text balance jaygeorge committed 96bb4a6View commit detailsCopy full SHA for 96bb4a6 Browse repository at this point Fix empty state dark border jaygeorge committed 8ed11aaView commit detailsCopy full SHA for 8ed11aa Browse repository at this point Ranking field - add an 'ordered' state jaygeorge committed 9433d57View commit detailsCopy full SHA for 9433d57 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed e04391cView commit detailsCopy full SHA for e04391c Browse repository at this point underlying yes/no fieldtype shouldn't be visible in form builder Show description for 890d3b0 duncanmcclean committed 890d3b0View commit detailsCopy full SHA for 890d3b0 Browse repository at this point Commits on Jun 18, 2026 [6.x] Fix the stars rating field rendering (#14820) Show description for 9db3d8d jaygeorge andduncanmcclean authored 9db3d8dView commit detailsCopy full SHA for 9db3d8d Browse repository at this point Commits on Jun 19, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6ba903dView commit detailsCopy full SHA for 6ba903d Browse repository at this point translate form title in all the places duncanmcclean committed 159fcdaView commit detailsCopy full SHA for 159fcda Browse repository at this point Commits on Jun 22, 2026 [6.x] Forms 2: Compressed view (#14853) jaygeorge authored 1717518View commit detailsCopy full SHA for 1717518 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 21b1829View commit detailsCopy full SHA for 21b1829 Browse repository at this point add confirmation modal before deleting field duncanmcclean committed aa8db6dView commit detailsCopy full SHA for aa8db6d Browse repository at this point [6.x] Forms 2: Add "Always hide" option to field logic dropdown (#14859) duncanmcclean authored 57f9f5cView commit detailsCopy full SHA for 57f9f5c Browse repository at this point Commits on Jun 23, 2026 wip duncanmcclean committed d94e62dView commit detailsCopy full SHA for d94e62d Browse repository at this point Commits on Jun 24, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 1e397bbView commit detailsCopy full SHA for 1e397bb Browse repository at this point Commits on Jun 25, 2026 [6.x] Forms 2: Submission Statuses (#14832) Show description for df261ed duncanmcclean andjasonvarga authored df261edView commit detailsCopy full SHA for df261ed Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 2e75c1cView commit detailsCopy full SHA for 2e75c1c Browse repository at this point Commits on Jun 30, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed e4dd0a8View commit detailsCopy full SHA for e4dd0a8 Browse repository at this point adjust initial page logic Show description for 5f81608 duncanmcclean committed 5f81608View commit detailsCopy full SHA for 5f81608 Browse repository at this point [6.x] Forms 2: Site Filter (#14902) duncanmcclean authored 47f7905View commit detailsCopy full SHA for 47f7905 Browse repository at this point cleanup `data-panels-showing` attribute when unmounting panel layout duncanmcclean committed e090e85View commit detailsCopy full SHA for e090e85 Browse repository at this point avoid publishing `star-rating.css`. the css is inlined now. duncanmcclean committed 9f2b2d2View commit detailsCopy full SHA for 9f2b2d2 Browse repository at this point Commits on Jul 1, 2026 exclude partial submissions from results count on forms listing duncanmcclean committed eff4c77View commit detailsCopy full SHA for eff4c77 Browse repository at this point move `is_informative` out of generic `RendersForms` trait Show description for 07b190f duncanmcclean committed 07b190fView commit detailsCopy full SHA for 07b190f Browse repository at this point Commits on Jul 2, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6e0764aView commit detailsCopy full SHA for 6e0764a Browse repository at this point Merge branch '6.x' into forms-2 jaygeorge committed 9b7ae88View commit detailsCopy full SHA for 9b7ae88 Browse repository at this point [6.x] Forms 2: Field numbering (#14909) duncanmcclean authored 0ac798dView commit detailsCopy full SHA for 0ac798d Browse repository at this point Commits on Jul 3, 2026 Fix architectural lines breaking out of .content, e.g. /collections/create jaygeorge committed 378491cView commit detailsCopy full SHA for 378491c Browse repository at this point Merge remote-tracking branch 'origin/6.x' into forms-2 Show description for bbea10d jasonvarga committed bbea10dView commit detailsCopy full SHA for bbea10d Browse repository at this point Small dark mode fix jaygeorge committed e88ad6fView commit detailsCopy full SHA for e88ad6f Browse repository at this point Commits on Jul 6, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 461512dView commit detailsCopy full SHA for 461512d Browse repository at this point fix logic indicator not showing sometimes duncanmcclean committed 3b4eb46View commit detailsCopy full SHA for 3b4eb46 Browse repository at this point include fieldset reference in tooltip duncanmcclean committed 491b44dView commit detailsCopy full SHA for 491b44d Browse repository at this point [6.x] Forms 2: Logic Tree (#14811) Show description for 243b695 jaygeorge andduncanmcclean authored 243b695View commit detailsCopy full SHA for 243b695 Browse repository at this point wip duncanmcclean committed 52798d9View commit detailsCopy full SHA for 52798d9 Browse repository at this point reset active tab in page inspector when selecting the last page duncanmcclean committed be337b9View commit detailsCopy full SHA for be337b9 Browse repository at this point avoid moving fields between pages in logic tree duncanmcclean committed 5739fc4View commit detailsCopy full SHA for 5739fc4 Browse repository at this point Commits on Jul 7, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed de239ddView commit detailsCopy full SHA for de239dd Browse repository at this point Small dark mode badge fix for page logic jaygeorge committed ef8d8feView commit detailsCopy full SHA for ef8d8fe Browse repository at this point Make "delete" icon condition only appear on hover, like the trash icon jaygeorge committed d7f1f57View commit detailsCopy full SHA for d7f1f57 Browse repository at this point Balance page rule with trash icon jaygeorge committed 34aa292View commit detailsCopy full SHA for 34aa292 Browse repository at this point Make "delete" icon condition only appear on hover for field logic too jaygeorge committed 9552b0aView commit detailsCopy full SHA for 9552b0a Browse repository at this point Connect - adjust grid responsively jaygeorge committed eb2005bView commit detailsCopy full SHA for eb2005b Browse repository at this point Merge branch '6.x' into forms-2 jaygeorge committed 381570eView commit detailsCopy full SHA for 381570e Browse repository at this point [6.x] Forms 2: Allow multiple forms when Forms Pro is installed (#14952) Show description for cc7f602 duncanmcclean andclaude authored cc7f602View commit detailsCopy full SHA for cc7f602 Browse repository at this point [6.x] Forms 2: Access (#14950) Show description for 56e9900 duncanmcclean andjasonvarga authored 56e9900View commit detailsCopy full SHA for 56e9900 Browse repository at this point Commits on Jul 8, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 7c9eaa7View commit detailsCopy full SHA for 7c9eaa7 Browse repository at this point [6.x] Forms 2: Multi-page forms & `SubmitForm` action (#14840) Show description for 88a0a19 duncanmcclean andjasonvarga authored 88a0a19View commit detailsCopy full SHA for 88a0a19 Browse repository at this point Commits on Jul 9, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 510cea1View commit detailsCopy full SHA for 510cea1 Browse repository at this point Fix failing test caused by #14959 duncanmcclean committed da09e47View commit detailsCopy full SHA for da09e47 Browse repository at this point [6.x] Forms 2: Tighten form upload validation in `SubmitForm` action (#14964) duncanmcclean authored 4cea062View commit detailsCopy full SHA for 4cea062 Browse repository at this point fix error when submitting a form page containing a fieldset import Show description for 9bb3804 duncanmcclean committed 9bb3804View commit detailsCopy full SHA for 9bb3804 Browse repository at this point Logic tree - improve the way overflow is handled jaygeorge committed 7ef050bView commit detailsCopy full SHA for 7ef050b Browse repository at this point Logic tree - improve full bleed scrolling with a separator jaygeorge committed bc563b2View commit detailsCopy full SHA for bc563b2 Browse repository at this point Logic tree - panel styling jaygeorge committed 90e8d5cView commit detailsCopy full SHA for 90e8d5c Browse repository at this point Logic tree - add a container query like the list view jaygeorge committed 15674b2View commit detailsCopy full SHA for 15674b2 Browse repository at this point Logic tree - separate rules in split panel, like we do in the Edit tab jaygeorge committed b526263View commit detailsCopy full SHA for b526263 Browse repository at this point Fix connector line stacking context jaygeorge committed 9e022c8View commit detailsCopy full SHA for 9e022c8 Browse repository at this point Logic tree - align rules with the page header jaygeorge committed ee555cfView commit detailsCopy full SHA for ee555cf Browse repository at this point Logic tree - When an item is selected, highlight its connection jaygeorge committed fe40316View commit detailsCopy full SHA for fe40316 Browse repository at this point [6.x] Forms 2: Remember panel widths (#14968) jackmcdade authored 369d2d7View commit detailsCopy full SHA for 369d2d7 Browse repository at this point Logic tree - dim the connection arrow of unselected columns too jaygeorge committed e98a704View commit detailsCopy full SHA for e98a704 Browse repository at this point Merge branch '6.x' into forms-2 jasonvarga committed 0d0a2cfView commit detailsCopy full SHA for 0d0a2cf Browse repository at this point Commits on Jul 10, 2026 [6.x] Forms 2: ✨ Move the panel to the side for /logic > tree view (#14969) Show description for 769cf0b jaygeorge andduncanmcclean authored 769cf0bView commit detailsCopy full SHA for 769cf0b Browse repository at this point fix adding field logic in list mode duncanmcclean committed 668ce1cView commit detailsCopy full SHA for 668ce1c Browse repository at this point [6.x] Logic empty state (#14976) jaygeorge authored 1791060View commit detailsCopy full SHA for 1791060 Browse repository at this point [6.x] Forms 2: Fix false dirty state when opening field inspector in Logic Tree view (#14977) duncanmcclean authored c4deef3View commit detailsCopy full SHA for c4deef3 Browse repository at this point make text in paragraph fieldtype mandatory duncanmcclean committed 4ff2828View commit detailsCopy full SHA for 4ff2828 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed e02192fView commit detailsCopy full SHA for e02192f Browse repository at this point Merge branch '6.x' into forms-2 Show description for 6fe3804 jasonvarga committed 6fe3804View commit detailsCopy full SHA for 6fe3804 Browse repository at this point [6.x] Forms 2: Permissions (#14957) Show description for 4df166b authored 4df166bView commit detailsCopy full SHA for 4df166b Browse repository at this point Commits on Jul 13, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed d7f3217View commit detailsCopy full SHA for d7f3217 Browse repository at this point Add form builder empty state help text jackmcdade committed 316c1a2View commit detailsCopy full SHA for 316c1a2 Browse repository at this point Commits on Jul 14, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed b48ceeeView commit detailsCopy full SHA for b48ceee Browse repository at this point Space headings a little more jaygeorge committed b194775View commit detailsCopy full SHA for b194775 Browse repository at this point Half way jaygeorge committed 3ba0eb4View commit detailsCopy full SHA for 3ba0eb4 Browse repository at this point Stop graph paper lines going through titles jaygeorge committed 2dea0aaView commit detailsCopy full SHA for 2dea0aa Browse repository at this point Align empty message with top row jaygeorge committed 7a59b13View commit detailsCopy full SHA for 7a59b13 Browse repository at this point Commits on Jul 15, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 5d917a3View commit detailsCopy full SHA for 5d917a3 Browse repository at this point use `v-else` instead duncanmcclean committed 4290b17View commit detailsCopy full SHA for 4290b17 Browse repository at this point indent duncanmcclean committed 9335d5fView commit detailsCopy full SHA for 9335d5f Browse repository at this point Correct sidebar calculations by accounting for container padding jaygeorge committed 90d32f4View commit detailsCopy full SHA for 90d32f4 Browse repository at this point Skew panels right jaygeorge committed c8915a3View commit detailsCopy full SHA for c8915a3 Browse repository at this point Skew panels right jaygeorge committed c4256f4View commit detailsCopy full SHA for c4256f4 Browse repository at this point Panels - restore middle breakpoint width jaygeorge committed dbd793dView commit detailsCopy full SHA for dbd793d Browse repository at this point Revert "use `v-else` instead" Show description for 5664b3e duncanmcclean committed 5664b3eView commit detailsCopy full SHA for 5664b3e Browse repository at this point Tweak empty message decoration slightly, ready for a larger sidebar with blueprints jaygeorge committed 07bc4f9View commit detailsCopy full SHA for 07bc4f9 Browse repository at this point Commits on Jul 16, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 87d8be6View commit detailsCopy full SHA for 87d8be6 Browse repository at this point Commits on Jul 17, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed c70dd63View commit detailsCopy full SHA for c70dd63 Browse repository at this point ensure extra config options are passed to fieldtypes duncanmcclean committed ce56ae5View commit detailsCopy full SHA for ce56ae5 Browse repository at this point Commits on Jul 20, 2026 copy form fields when duplicating form duncanmcclean committed ea49753View commit detailsCopy full SHA for ea49753 Browse repository at this point add default messages as field placeholders duncanmcclean committed 4c6383bView commit detailsCopy full SHA for 4c6383b Browse repository at this point [6.x] Logic tree leap calculation (#15035) Show description for bc6c992 authored bc6c992View commit detailsCopy full SHA for bc6c992 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 6e0af1cView commit detailsCopy full SHA for 6e0af1c Browse repository at this point avoid dispatching events during initialization duncanmcclean committed 9adc15eView commit detailsCopy full SHA for 9adc15e Browse repository at this point fix nav state getting out of sync with the DOM on page load Show description for 316f2e3 duncanmcclean committed 316f2e3View commit detailsCopy full SHA for 316f2e3 Browse repository at this point Commits on Jul 21, 2026 Merge branch '6.x' into forms-2 jasonvarga committed 5af8300View commit detailsCopy full SHA for 5af8300 Browse repository at this point emit updated when validation rules are added via mutation Show description for 0359e5c jasonvarga andclaude committed 0359e5cView commit detailsCopy full SHA for 0359e5c Browse repository at this point Make current item more consistent with CP buttons jaygeorge committed 8574cedView commit detailsCopy full SHA for 8574ced Browse repository at this point [6.x] Forms 2: Various file upload improvements (#15006) Show description for fa798d0 authored fa798d0View commit detailsCopy full SHA for fa798d0 Browse repository at this point Commits on Jul 22, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed ea115ecView commit detailsCopy full SHA for ea115ec Browse repository at this point Commits on Jul 23, 2026 move translation calls inside getter to avoid boot errors duncanmcclean committed e7b3387View commit detailsCopy full SHA for e7b3387 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 4774811View commit detailsCopy full SHA for 4774811 Browse repository at this point [6.x] Remove unused form metrics code (#15066) Show description for c316553 duncanmcclean andclaude authored c316553View commit detailsCopy full SHA for c316553 Browse repository at this point Rename Marketplace button jackmcdade committed c40daf8View commit detailsCopy full SHA for c40daf8 Browse repository at this point Add Generate Fake Submission support for all the new form fieldtypes jackmcdade committed 7f2fa3aView commit detailsCopy full SHA for 7f2fa3a Browse repository at this point ensure toggle conditions work correctly duncanmcclean committed 660175eView commit detailsCopy full SHA for 660175e Browse repository at this point Commits on Jul 31, 2026 Nicer previous page UX jackmcdade committed 99ed81dView commit detailsCopy full SHA for 99ed81d Browse repository at this point Commits on Aug 3, 2026 [6.x] Forms 2: Show option dropdown when adding logic against Image Choice fields (#15096) duncanmcclean authored 1460605View commit detailsCopy full SHA for 1460605 Browse repository at this point Commits on Aug 5, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 9aca449View commit detailsCopy full SHA for 9aca449 Browse repository at this point Commits on Aug 6, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed fbe2f7cView commit detailsCopy full SHA for fbe2f7c Browse repository at this point Commits on Aug 7, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6d9762cView commit detailsCopy full SHA for 6d9762c Browse repository at this point refactor information/structure check duncanmcclean committed 9b68d22View commit detailsCopy full SHA for 9b68d22 Browse repository at this point move page logic to action inspector duncanmcclean committed da24576View commit detailsCopy full SHA for da24576 Browse repository at this point Commits on Aug 10, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 3027011View commit detailsCopy full SHA for 3027011 Browse repository at this point Add scroll margin to pagination too jaygeorge committed b6decd9View commit detailsCopy full SHA for b6decd9 Browse repository at this point move logic icon next to actions duncanmcclean committed 3a0261aView commit detailsCopy full SHA for 3a0261a Browse repository at this point validate against numbers in names duncanmcclean committed 9f9602fView commit detailsCopy full SHA for 9f9602f Browse repository at this point Commits on Aug 12, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed b2795adView commit detailsCopy full SHA for b2795ad Browse repository at this point Commits on Aug 13, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 3c8816eView commit detailsCopy full SHA for 3c8816e Browse repository at this point Commits on Aug 14, 2026 [6.x] Forms 2: Extract star rating, ranking and image choice into UI components (#15068) Show description for 291bb65 duncanmcclean andjackmcdade authored 291bb65View commit detailsCopy full SHA for 291bb65 Browse repository at this point Commits on Aug 17, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 8e0eb96View commit detailsCopy full SHA for 8e0eb96 Browse repository at this point [6.x] Forms 2: Temporary file upload fixes (#15206) Show description for c0b4163 duncanmcclean andclaude authored c0b4163View commit detailsCopy full SHA for c0b4163 Browse repository at this point [6.x] Forms 2: Generate field handles from labels (#15203) Show description for 25266cc duncanmcclean andclaude authored 25266ccView commit detailsCopy full SHA for 25266cc Browse repository at this point Commits on Aug 18, 2026 move handle below label/heading field in banner/heading/paragraph fieldtypes duncanmcclean committed 62d35c2View commit detailsCopy full SHA for 62d35c2 Browse repository at this point Commits on Aug 24, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 04ed9b0View commit detailsCopy full SHA for 04ed9b0 Browse repository at this point formatting duncanmcclean committed 7f90033View commit detailsCopy full SHA for 7f90033 Browse repository at this point Commits on Aug 26, 2026 [6.x] Forms 2: Respect min/max when generating fake integer values (#15276) Show description for 94b0fb0 duncanmcclean andclaude authored 94b0fb0View commit detailsCopy full SHA for 94b0fb0 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed d1b353fView commit detailsCopy full SHA for d1b353f Browse repository at this point Commits on Aug 27, 2026 Merge remote-tracking branch 'origin/6.x' into forms-2 jasonvarga committed cad71daView commit detailsCopy full SHA for cad71da Browse repository at this point Commits on Aug 28, 2026 [6.x] Forms 2: Ensure `FormSubmissionsController` follows conventions (#15300) duncanmcclean authored dbcdd6fView commit detailsCopy full SHA for dbcdd6f Browse repository at this point Commits on Aug 31, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6dcfee8View commit detailsCopy full SHA for 6dcfee8 Browse repository at this point [6.x] Forms 2: Catch untranslated strings (#15315) Show description for 2b62ccb duncanmcclean andclaude authored 2b62ccbView commit detailsCopy full SHA for 2b62ccb Browse repository at this point Footer © 2026 GitHub, Inc. Footer navigation Terms Privacy Security Status Community Docs Contact You can’t perform that action at this time. , 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' [6.x] Forms 2 by jasonvarga · Pull Request #15039 · statamic/cms · GitHub Skip to contentNavigation Menu Sign inAppearance settings AI CODE CREATIONGitHub CopilotWrite better code with AI GitHub Copilot appDirect agents from issue to merge MCP RegistryIntegrate external tools DEVELOPER WORKFLOWSActionsAutomate any workflow CodespacesInstant dev environments IssuesPlan and track work Code ReviewManage code changes Code QualityEnforce quality at merge APPLICATION SECURITYGitHub Advanced SecurityFind and fix vulnerabilities Code securitySecure your code as you build Secret protectionStop leaks before they start EXPLOREWhy GitHub Documentation Blog Changelog Marketplace View all features BY COMPANY SIZEEnterprises Small and medium teams Startups Nonprofits BY USE CASEApp Modernization DevSecOps DevOps CI/CD View all use cases BY INDUSTRYHealthcare Financial services Manufacturing Government View all industries View all solutions EXPLORE BY TOPICAI Software Development DevOps Security View all topics EXPLORE BY TYPECustomer stories Events & webinars Ebooks & reports Business insights GitHub Skills SUPPORT & SERVICESDocumentation Customer support Community forum Trust center Partners View all resources COMMUNITYGitHub SponsorsFund open source developers PROGRAMSSecurity Lab Maintainer Community GitHub Stars Archive Program REPOSITORIESTopics Trending Collections ENTERPRISE SOLUTIONSEnterprise platformAI-powered developer platform AVAILABLE ADD-ONSGitHub Advanced SecurityEnterprise-grade security features Copilot for BusinessEnterprise-grade AI features Premium SupportEnterprise-grade 24/7 support Pricing Sign in Sign upAppearance settings You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert Uh oh! There was an error while loading. Please reload this page. statamic /cmsPublic Uh oh! There was an error while loading. Please reload this page. Notifications You must be signed in to change notification settings Fork 641 Star 4.9k Code Issues201 Pull requests100 Discussions Actions Projects Security and quality44 Insights Additional navigation options Code Issues Pull requests Discussions Actions Projects Security and quality Insights [6.x] Forms 2 - #15039 #15039 Draft jasonvarga wants to merge 1000 commits into6.xstatamic/cms:6.xfrom forms-2statamic/cms:forms-2Copy head branch name to clipboard ConversationCommits1000 (1000)ChecksFiles changed Draft [6.x] Forms 2#15039jasonvarga wants to merge 1000 commits into6.xstatamic/cms:6.xfrom forms-2statamic/cms:forms-2Copy head branch name to clipboard Commits This pull request is big! We're only showing the most recent 250 commits Commits on Jun 4, 2026 Star rating - add ability to adjust gap and change SVG to use our Flex icon jaygeorge committed 8ddee91View commit detailsCopy full SHA for 8ddee91 Browse repository at this point Star rating - map theme vars jaygeorge committed 69ab566View commit detailsCopy full SHA for 69ab566 Browse repository at this point Star rating - leave as unrated for the form demo jaygeorge committed 67c0b9cView commit detailsCopy full SHA for 67c0b9c Browse repository at this point Star rating - set a floor and ceiling jaygeorge committed 44f7a1bView commit detailsCopy full SHA for 44f7a1b Browse repository at this point Star rating - change star appearance and finish draft jaygeorge committed b749f10View commit detailsCopy full SHA for b749f10 Browse repository at this point fix indentation duncanmcclean committed 8c675a3View commit detailsCopy full SHA for 8c675a3 Browse repository at this point pages actually have ids now duncanmcclean committed a2c02e6View commit detailsCopy full SHA for a2c02e6 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed f8499a6View commit detailsCopy full SHA for f8499a6 Browse repository at this point Star rating - tweak size jaygeorge committed 91e9954View commit detailsCopy full SHA for 91e9954 Browse repository at this point Image choice - first pass jaygeorge committed e37e96bView commit detailsCopy full SHA for e37e96b Browse repository at this point Image choice - Switch to Tailwind jaygeorge committed a5e2211View commit detailsCopy full SHA for a5e2211 Browse repository at this point Image choice - fix error when saving jaygeorge committed ad0ed0eView commit detailsCopy full SHA for ad0ed0e Browse repository at this point Fix double border effect jaygeorge committed cde898dView commit detailsCopy full SHA for cde898d Browse repository at this point Image choice - render image previews jaygeorge committed fb85b8fView commit detailsCopy full SHA for fb85b8f Browse repository at this point Image choice - add a letter before the label jaygeorge committed 3dbae2cView commit detailsCopy full SHA for 3dbae2c Browse repository at this point Image choice - style the letters jaygeorge committed 783f17eView commit detailsCopy full SHA for 783f17e Browse repository at this point Image choice - add aspect ratio as an option for the comparisons jaygeorge committed 4484482View commit detailsCopy full SHA for 4484482 Browse repository at this point Image choice - add example jaygeorge committed be9fcf1View commit detailsCopy full SHA for be9fcf1 Browse repository at this point Image choice - improve demo jaygeorge committed 70717e5View commit detailsCopy full SHA for 70717e5 Browse repository at this point Commits on Jun 5, 2026 Image choice - tighten up a few things 🧹 jaygeorge committed 915d85cView commit detailsCopy full SHA for 915d85c Browse repository at this point Image choice - fix border 🧹 jaygeorge committed de88e8dView commit detailsCopy full SHA for de88e8d Browse repository at this point Image choice - fix padding jaygeorge committed 5adca1cView commit detailsCopy full SHA for 5adca1c Browse repository at this point Image choice - make cards more consistent with the rest of the UI jaygeorge committed 5e28231View commit detailsCopy full SHA for 5e28231 Browse repository at this point Image choice - tighten up letter choice jaygeorge committed 0735f1bView commit detailsCopy full SHA for 0735f1b Browse repository at this point Make panels slightly narrower at smaller MQs jaygeorge committed ec9c31cView commit detailsCopy full SHA for ec9c31c Browse repository at this point Add ranking form field type - first pass jaygeorge committed c305049View commit detailsCopy full SHA for c305049 Browse repository at this point Ranking field type - don't show "null" when adding a new row jaygeorge committed 6ef2072View commit detailsCopy full SHA for 6ef2072 Browse repository at this point Ranking field type - improve appearance jaygeorge committed 68825edView commit detailsCopy full SHA for 68825ed Browse repository at this point Add opinion scale field type - first pass jaygeorge committed 53ee8a7View commit detailsCopy full SHA for 53ee8a7 Browse repository at this point Add opinion scale field type - use Tailwind jaygeorge committed e9503dcView commit detailsCopy full SHA for e9503dc Browse repository at this point Add opinion scale field type - fix labels jaygeorge committed 93496c2View commit detailsCopy full SHA for 93496c2 Browse repository at this point Add opinion scale field type - tidy instructions jaygeorge committed a6eaaf4View commit detailsCopy full SHA for a6eaaf4 Browse repository at this point Add opinion scale field type - finesse jaygeorge committed 3d8edfbView commit detailsCopy full SHA for 3d8edfb Browse repository at this point Add opinion scale field type - optically align labels jaygeorge committed 7ce1379View commit detailsCopy full SHA for 7ce1379 Browse repository at this point Field types - dark mode balances jaygeorge committed 62b76e1View commit detailsCopy full SHA for 62b76e1 Browse repository at this point Star rating - fix dark mode jaygeorge committed cd09b55View commit detailsCopy full SHA for cd09b55 Browse repository at this point Fix Builder field type - it was behaving weirdly jaygeorge committed 237570dView commit detailsCopy full SHA for 237570d Browse repository at this point Commits on Jun 8, 2026 Logic tab - fixed collapsed row badge/value combo jaygeorge committed c58ecd0View commit detailsCopy full SHA for c58ecd0 Browse repository at this point Logic tab - fixed row decoration jaygeorge committed 4163a83View commit detailsCopy full SHA for 4163a83 Browse repository at this point ✨ fix form not saving - textarea is a CP fieldtype, not a form fieldtype. The builder wraps it in Fallback, but was sending fieldtype: "fallback" back on save. The repository can't look up "fallbac… Show description for 1e759d5 jaygeorge committed 1e759d5View commit detailsCopy full SHA for 1e759d5 Browse repository at this point Only output the logic icon on page titles when they logic jaygeorge committed 41ac3ceView commit detailsCopy full SHA for 41ac3ce Browse repository at this point Tighten page title space jaygeorge committed d8e3064View commit detailsCopy full SHA for d8e3064 Browse repository at this point Fix banner icon for compressed view - Information fields (banner, heading, paragraph) had their own collapsed markup that skipped the shared compressed-view structure. jaygeorge committed 2cfe1faView commit detailsCopy full SHA for 2cfe1fa Browse repository at this point Switch category color from amber to green - amber is too close to orange and the category feels pretty different to choice jaygeorge committed 0160f6bView commit detailsCopy full SHA for 0160f6b Browse repository at this point Commits on Jun 10, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed d917fb9View commit detailsCopy full SHA for d917fb9 Browse repository at this point Revert "Fix Builder field type - it was behaving weirdly" Show description for 5092cbb duncanmcclean committed 5092cbbView commit detailsCopy full SHA for 5092cbb Browse repository at this point Revert "✨ fix form not saving - textarea is a CP fieldtype, not a form fieldtype. The builder wraps it in Fallback, but was sending fieldtype: "fallback" back on save. The repository can't look up … Show description for 7e2b7b5 duncanmcclean committed 7e2b7b5View commit detailsCopy full SHA for 7e2b7b5 Browse repository at this point Revert various changes from c3050492 Show description for 9975a69 duncanmcclean committed 9975a69View commit detailsCopy full SHA for 9975a69 Browse repository at this point wip duncanmcclean committed bd1c032View commit detailsCopy full SHA for bd1c032 Browse repository at this point wip duncanmcclean committed 688379aView commit detailsCopy full SHA for 688379a Browse repository at this point Revert field preview change in be9fcf1c. Show description for 7f17afd duncanmcclean committed 7f17afdView commit detailsCopy full SHA for 7f17afd Browse repository at this point Review changes to builder in fb85b8fc Show description for 807d725 duncanmcclean committed 807d725View commit detailsCopy full SHA for 807d725 Browse repository at this point fix weird indentation duncanmcclean committed de157d0View commit detailsCopy full SHA for de157d0 Browse repository at this point wip duncanmcclean committed 3aab7a2View commit detailsCopy full SHA for 3aab7a2 Browse repository at this point image choice fieldtype tweaks Show description for e56c667 duncanmcclean committed e56c667View commit detailsCopy full SHA for e56c667 Browse repository at this point require field labels in form builder duncanmcclean committed a6972a9View commit detailsCopy full SHA for a6972a9 Browse repository at this point opinion scale fieldtype tweaks Show description for f07d652 duncanmcclean committed f07d652View commit detailsCopy full SHA for f07d652 Browse repository at this point wip duncanmcclean committed 47b6f21View commit detailsCopy full SHA for 47b6f21 Browse repository at this point star rating fieldtype tweaks Show description for 7827322 duncanmcclean committed 7827322View commit detailsCopy full SHA for 7827322 Browse repository at this point ranking fieldtype tweaks Show description for e905f05 duncanmcclean committed e905f05View commit detailsCopy full SHA for e905f05 Browse repository at this point banner fieldtype tweaks duncanmcclean committed 4a7d327View commit detailsCopy full SHA for 4a7d327 Browse repository at this point wip duncanmcclean committed 9b3e299View commit detailsCopy full SHA for 9b3e299 Browse repository at this point remove unnecessary (and missing) instructions duncanmcclean committed cc6adb1View commit detailsCopy full SHA for cc6adb1 Browse repository at this point avoid using information fields (banner, heading, paragraph) in logic Show description for b6f6fdb duncanmcclean committed b6f6fdbView commit detailsCopy full SHA for b6f6fdb Browse repository at this point improve logic value stuff for new form fieldtypes duncanmcclean committed 592eefbView commit detailsCopy full SHA for 592eefb Browse repository at this point make container/folder of image options fieldtype configurable duncanmcclean committed 6a8d511View commit detailsCopy full SHA for 6a8d511 Browse repository at this point re-work config options for information fields & add field stubs duncanmcclean committed a060025View commit detailsCopy full SHA for a060025 Browse repository at this point fix failing tests duncanmcclean committed f13d239View commit detailsCopy full SHA for f13d239 Browse repository at this point provide `is_informative` to fields loop to avoid outputting labels/instructions duncanmcclean committed 044e66eView commit detailsCopy full SHA for 044e66e Browse repository at this point use `is_informative` in our fields stub duncanmcclean committed e533341View commit detailsCopy full SHA for e533341 Browse repository at this point Commits on Jun 11, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 84e4928View commit detailsCopy full SHA for 84e4928 Browse repository at this point fix icon not being persisted in banner field config duncanmcclean committed 0eda343View commit detailsCopy full SHA for 0eda343 Browse repository at this point Avoid showing preview when dragging fields in collapsed mode duncanmcclean committed 05bdc7bView commit detailsCopy full SHA for 05bdc7b Browse repository at this point adjust how min/max clamping happens in the opinion range fieldtype duncanmcclean committed 1b0d9ebView commit detailsCopy full SHA for 1b0d9eb Browse repository at this point wip duncanmcclean committed 48cb929View commit detailsCopy full SHA for 48cb929 Browse repository at this point "generate" opinion scale values in php duncanmcclean committed 38d9227View commit detailsCopy full SHA for 38d9227 Browse repository at this point replace default values with placeholders Show description for c49797c duncanmcclean committed c49797cView commit detailsCopy full SHA for c49797c Browse repository at this point simpler opinion scale views duncanmcclean committed 4025df1View commit detailsCopy full SHA for 4025df1 Browse repository at this point simpler star rating duncanmcclean committed aad9104View commit detailsCopy full SHA for aad9104 Browse repository at this point fix error in field inspector when page contains fieldset import duncanmcclean committed a7d69d4View commit detailsCopy full SHA for a7d69d4 Browse repository at this point simpler ranking views duncanmcclean committed 9f7a37eView commit detailsCopy full SHA for 9f7a37e Browse repository at this point process field config when saving, not when updating config options Show description for 7bad860 duncanmcclean committed 7bad860View commit detailsCopy full SHA for 7bad860 Browse repository at this point avoid generating field handles with hyphens Show description for ac6d62a duncanmcclean committed ac6d62aView commit detailsCopy full SHA for ac6d62a Browse repository at this point image choice view duncanmcclean committed 3cf0913View commit detailsCopy full SHA for 3cf0913 Browse repository at this point preprocess values when loading form builder duncanmcclean committed 57a0d60View commit detailsCopy full SHA for 57a0d60 Browse repository at this point make form fieldtype for spacer duncanmcclean committed 288fd39View commit detailsCopy full SHA for 288fd39 Browse repository at this point prevent configuring logic based on structure fields duncanmcclean committed ae35c37View commit detailsCopy full SHA for ae35c37 Browse repository at this point Commits on Jun 12, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed bdc19aeView commit detailsCopy full SHA for bdc19ae Browse repository at this point fix banner example duncanmcclean committed db760e9View commit detailsCopy full SHA for db760e9 Browse repository at this point provide meta and values to previews publish container duncanmcclean committed 321d0d2View commit detailsCopy full SHA for 321d0d2 Browse repository at this point hide validation tab in field inspector for structure/information fields Show description for 96cfec5 duncanmcclean committed 96cfec5View commit detailsCopy full SHA for 96cfec5 Browse repository at this point Revert "preprocess values when loading form builder" Show description for be447a4 duncanmcclean committed be447a4View commit detailsCopy full SHA for be447a4 Browse repository at this point Revert "process field config when saving, not when updating config options" Show description for 3b05e49 duncanmcclean committed 3b05e49View commit detailsCopy full SHA for 3b05e49 Browse repository at this point preprocess before validating duncanmcclean committed 5ee6cf8View commit detailsCopy full SHA for 5ee6cf8 Browse repository at this point group form fieldtype duncanmcclean committed 7e01077View commit detailsCopy full SHA for 7e01077 Browse repository at this point combine assets and files fieldtypes into a single upload form fieldtype duncanmcclean committed 26d37fbView commit detailsCopy full SHA for 26d37fb Browse repository at this point very lightly style rankings view so its clear you can drag & drop duncanmcclean committed b42935cView commit detailsCopy full SHA for b42935c Browse repository at this point use FormLayout on submission show page duncanmcclean committed e49f607View commit detailsCopy full SHA for e49f607 Browse repository at this point Commits on Jun 15, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed fdb3c20View commit detailsCopy full SHA for fdb3c20 Browse repository at this point formatting duncanmcclean committed 4a81aa3View commit detailsCopy full SHA for 4a81aa3 Browse repository at this point Small background color adjustments including dark mode jaygeorge committed fc38b65View commit detailsCopy full SHA for fc38b65 Browse repository at this point fix failing tests duncanmcclean committed a363f92View commit detailsCopy full SHA for a363f92 Browse repository at this point wip duncanmcclean committed a85473dView commit detailsCopy full SHA for a85473d Browse repository at this point missing `__` imports duncanmcclean committed 37be4c6View commit detailsCopy full SHA for 37be4c6 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed bfdb8e4View commit detailsCopy full SHA for bfdb8e4 Browse repository at this point Wrap some inline stylesheet using a cascade layer so devs can easily override jaygeorge committed e66d0ffView commit detailsCopy full SHA for e66d0ff Browse repository at this point Revert "Wrap some inline stylesheet using a cascade layer so devs can easily override" Show description for 7e759eb jaygeorge committed 7e759ebView commit detailsCopy full SHA for 7e759eb Browse repository at this point [6.x] Forms 2: Yes/No Form Fieldtype (#14819) Show description for 272cb73 duncanmcclean andjaygeorge authored 272cb73View commit detailsCopy full SHA for 272cb73 Browse repository at this point remove solo.yml from git duncanmcclean committed cf27f47View commit detailsCopy full SHA for cf27f47 Browse repository at this point Improve focus / selection state - Image Choice jaygeorge committed e95ff5dView commit detailsCopy full SHA for e95ff5d Browse repository at this point Improve focus / selection state - Opinion Scale jaygeorge committed 137ba00View commit detailsCopy full SHA for 137ba00 Browse repository at this point Commits on Jun 16, 2026 Yes/No - only fill the icon if the option is selected jaygeorge committed dca2b8bView commit detailsCopy full SHA for dca2b8b Browse repository at this point [6.x] Make the ranking fieldtype orderable with just the keyboard (#14823) Show description for 166a8ac jaygeorge andduncanmcclean authored 166a8acView commit detailsCopy full SHA for 166a8ac Browse repository at this point prevent information fieldtypes showing in listing column list duncanmcclean committed b0a68bdView commit detailsCopy full SHA for b0a68bd Browse repository at this point Merge branch '6.x' into forms-2 jaygeorge committed 754131eView commit detailsCopy full SHA for 754131e Browse repository at this point Logic rule formatting jaygeorge committed cc39fd3View commit detailsCopy full SHA for cc39fd3 Browse repository at this point Logic rule formatting jaygeorge committed ff01c73View commit detailsCopy full SHA for ff01c73 Browse repository at this point Improve logic rule badge balance jaygeorge committed be83111View commit detailsCopy full SHA for be83111 Browse repository at this point Commits on Jun 17, 2026 Improve logic rule text balance jaygeorge committed 96bb4a6View commit detailsCopy full SHA for 96bb4a6 Browse repository at this point Fix empty state dark border jaygeorge committed 8ed11aaView commit detailsCopy full SHA for 8ed11aa Browse repository at this point Ranking field - add an 'ordered' state jaygeorge committed 9433d57View commit detailsCopy full SHA for 9433d57 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed e04391cView commit detailsCopy full SHA for e04391c Browse repository at this point underlying yes/no fieldtype shouldn't be visible in form builder Show description for 890d3b0 duncanmcclean committed 890d3b0View commit detailsCopy full SHA for 890d3b0 Browse repository at this point Commits on Jun 18, 2026 [6.x] Fix the stars rating field rendering (#14820) Show description for 9db3d8d jaygeorge andduncanmcclean authored 9db3d8dView commit detailsCopy full SHA for 9db3d8d Browse repository at this point Commits on Jun 19, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6ba903dView commit detailsCopy full SHA for 6ba903d Browse repository at this point translate form title in all the places duncanmcclean committed 159fcdaView commit detailsCopy full SHA for 159fcda Browse repository at this point Commits on Jun 22, 2026 [6.x] Forms 2: Compressed view (#14853) jaygeorge authored 1717518View commit detailsCopy full SHA for 1717518 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 21b1829View commit detailsCopy full SHA for 21b1829 Browse repository at this point add confirmation modal before deleting field duncanmcclean committed aa8db6dView commit detailsCopy full SHA for aa8db6d Browse repository at this point [6.x] Forms 2: Add "Always hide" option to field logic dropdown (#14859) duncanmcclean authored 57f9f5cView commit detailsCopy full SHA for 57f9f5c Browse repository at this point Commits on Jun 23, 2026 wip duncanmcclean committed d94e62dView commit detailsCopy full SHA for d94e62d Browse repository at this point Commits on Jun 24, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 1e397bbView commit detailsCopy full SHA for 1e397bb Browse repository at this point Commits on Jun 25, 2026 [6.x] Forms 2: Submission Statuses (#14832) Show description for df261ed duncanmcclean andjasonvarga authored df261edView commit detailsCopy full SHA for df261ed Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 2e75c1cView commit detailsCopy full SHA for 2e75c1c Browse repository at this point Commits on Jun 30, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed e4dd0a8View commit detailsCopy full SHA for e4dd0a8 Browse repository at this point adjust initial page logic Show description for 5f81608 duncanmcclean committed 5f81608View commit detailsCopy full SHA for 5f81608 Browse repository at this point [6.x] Forms 2: Site Filter (#14902) duncanmcclean authored 47f7905View commit detailsCopy full SHA for 47f7905 Browse repository at this point cleanup `data-panels-showing` attribute when unmounting panel layout duncanmcclean committed e090e85View commit detailsCopy full SHA for e090e85 Browse repository at this point avoid publishing `star-rating.css`. the css is inlined now. duncanmcclean committed 9f2b2d2View commit detailsCopy full SHA for 9f2b2d2 Browse repository at this point Commits on Jul 1, 2026 exclude partial submissions from results count on forms listing duncanmcclean committed eff4c77View commit detailsCopy full SHA for eff4c77 Browse repository at this point move `is_informative` out of generic `RendersForms` trait Show description for 07b190f duncanmcclean committed 07b190fView commit detailsCopy full SHA for 07b190f Browse repository at this point Commits on Jul 2, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6e0764aView commit detailsCopy full SHA for 6e0764a Browse repository at this point Merge branch '6.x' into forms-2 jaygeorge committed 9b7ae88View commit detailsCopy full SHA for 9b7ae88 Browse repository at this point [6.x] Forms 2: Field numbering (#14909) duncanmcclean authored 0ac798dView commit detailsCopy full SHA for 0ac798d Browse repository at this point Commits on Jul 3, 2026 Fix architectural lines breaking out of .content, e.g. /collections/create jaygeorge committed 378491cView commit detailsCopy full SHA for 378491c Browse repository at this point Merge remote-tracking branch 'origin/6.x' into forms-2 Show description for bbea10d jasonvarga committed bbea10dView commit detailsCopy full SHA for bbea10d Browse repository at this point Small dark mode fix jaygeorge committed e88ad6fView commit detailsCopy full SHA for e88ad6f Browse repository at this point Commits on Jul 6, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 461512dView commit detailsCopy full SHA for 461512d Browse repository at this point fix logic indicator not showing sometimes duncanmcclean committed 3b4eb46View commit detailsCopy full SHA for 3b4eb46 Browse repository at this point include fieldset reference in tooltip duncanmcclean committed 491b44dView commit detailsCopy full SHA for 491b44d Browse repository at this point [6.x] Forms 2: Logic Tree (#14811) Show description for 243b695 jaygeorge andduncanmcclean authored 243b695View commit detailsCopy full SHA for 243b695 Browse repository at this point wip duncanmcclean committed 52798d9View commit detailsCopy full SHA for 52798d9 Browse repository at this point reset active tab in page inspector when selecting the last page duncanmcclean committed be337b9View commit detailsCopy full SHA for be337b9 Browse repository at this point avoid moving fields between pages in logic tree duncanmcclean committed 5739fc4View commit detailsCopy full SHA for 5739fc4 Browse repository at this point Commits on Jul 7, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed de239ddView commit detailsCopy full SHA for de239dd Browse repository at this point Small dark mode badge fix for page logic jaygeorge committed ef8d8feView commit detailsCopy full SHA for ef8d8fe Browse repository at this point Make "delete" icon condition only appear on hover, like the trash icon jaygeorge committed d7f1f57View commit detailsCopy full SHA for d7f1f57 Browse repository at this point Balance page rule with trash icon jaygeorge committed 34aa292View commit detailsCopy full SHA for 34aa292 Browse repository at this point Make "delete" icon condition only appear on hover for field logic too jaygeorge committed 9552b0aView commit detailsCopy full SHA for 9552b0a Browse repository at this point Connect - adjust grid responsively jaygeorge committed eb2005bView commit detailsCopy full SHA for eb2005b Browse repository at this point Merge branch '6.x' into forms-2 jaygeorge committed 381570eView commit detailsCopy full SHA for 381570e Browse repository at this point [6.x] Forms 2: Allow multiple forms when Forms Pro is installed (#14952) Show description for cc7f602 duncanmcclean andclaude authored cc7f602View commit detailsCopy full SHA for cc7f602 Browse repository at this point [6.x] Forms 2: Access (#14950) Show description for 56e9900 duncanmcclean andjasonvarga authored 56e9900View commit detailsCopy full SHA for 56e9900 Browse repository at this point Commits on Jul 8, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 7c9eaa7View commit detailsCopy full SHA for 7c9eaa7 Browse repository at this point [6.x] Forms 2: Multi-page forms & `SubmitForm` action (#14840) Show description for 88a0a19 duncanmcclean andjasonvarga authored 88a0a19View commit detailsCopy full SHA for 88a0a19 Browse repository at this point Commits on Jul 9, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 510cea1View commit detailsCopy full SHA for 510cea1 Browse repository at this point Fix failing test caused by #14959 duncanmcclean committed da09e47View commit detailsCopy full SHA for da09e47 Browse repository at this point [6.x] Forms 2: Tighten form upload validation in `SubmitForm` action (#14964) duncanmcclean authored 4cea062View commit detailsCopy full SHA for 4cea062 Browse repository at this point fix error when submitting a form page containing a fieldset import Show description for 9bb3804 duncanmcclean committed 9bb3804View commit detailsCopy full SHA for 9bb3804 Browse repository at this point Logic tree - improve the way overflow is handled jaygeorge committed 7ef050bView commit detailsCopy full SHA for 7ef050b Browse repository at this point Logic tree - improve full bleed scrolling with a separator jaygeorge committed bc563b2View commit detailsCopy full SHA for bc563b2 Browse repository at this point Logic tree - panel styling jaygeorge committed 90e8d5cView commit detailsCopy full SHA for 90e8d5c Browse repository at this point Logic tree - add a container query like the list view jaygeorge committed 15674b2View commit detailsCopy full SHA for 15674b2 Browse repository at this point Logic tree - separate rules in split panel, like we do in the Edit tab jaygeorge committed b526263View commit detailsCopy full SHA for b526263 Browse repository at this point Fix connector line stacking context jaygeorge committed 9e022c8View commit detailsCopy full SHA for 9e022c8 Browse repository at this point Logic tree - align rules with the page header jaygeorge committed ee555cfView commit detailsCopy full SHA for ee555cf Browse repository at this point Logic tree - When an item is selected, highlight its connection jaygeorge committed fe40316View commit detailsCopy full SHA for fe40316 Browse repository at this point [6.x] Forms 2: Remember panel widths (#14968) jackmcdade authored 369d2d7View commit detailsCopy full SHA for 369d2d7 Browse repository at this point Logic tree - dim the connection arrow of unselected columns too jaygeorge committed e98a704View commit detailsCopy full SHA for e98a704 Browse repository at this point Merge branch '6.x' into forms-2 jasonvarga committed 0d0a2cfView commit detailsCopy full SHA for 0d0a2cf Browse repository at this point Commits on Jul 10, 2026 [6.x] Forms 2: ✨ Move the panel to the side for /logic > tree view (#14969) Show description for 769cf0b jaygeorge andduncanmcclean authored 769cf0bView commit detailsCopy full SHA for 769cf0b Browse repository at this point fix adding field logic in list mode duncanmcclean committed 668ce1cView commit detailsCopy full SHA for 668ce1c Browse repository at this point [6.x] Logic empty state (#14976) jaygeorge authored 1791060View commit detailsCopy full SHA for 1791060 Browse repository at this point [6.x] Forms 2: Fix false dirty state when opening field inspector in Logic Tree view (#14977) duncanmcclean authored c4deef3View commit detailsCopy full SHA for c4deef3 Browse repository at this point make text in paragraph fieldtype mandatory duncanmcclean committed 4ff2828View commit detailsCopy full SHA for 4ff2828 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed e02192fView commit detailsCopy full SHA for e02192f Browse repository at this point Merge branch '6.x' into forms-2 Show description for 6fe3804 jasonvarga committed 6fe3804View commit detailsCopy full SHA for 6fe3804 Browse repository at this point [6.x] Forms 2: Permissions (#14957) Show description for 4df166b authored 4df166bView commit detailsCopy full SHA for 4df166b Browse repository at this point Commits on Jul 13, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed d7f3217View commit detailsCopy full SHA for d7f3217 Browse repository at this point Add form builder empty state help text jackmcdade committed 316c1a2View commit detailsCopy full SHA for 316c1a2 Browse repository at this point Commits on Jul 14, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed b48ceeeView commit detailsCopy full SHA for b48ceee Browse repository at this point Space headings a little more jaygeorge committed b194775View commit detailsCopy full SHA for b194775 Browse repository at this point Half way jaygeorge committed 3ba0eb4View commit detailsCopy full SHA for 3ba0eb4 Browse repository at this point Stop graph paper lines going through titles jaygeorge committed 2dea0aaView commit detailsCopy full SHA for 2dea0aa Browse repository at this point Align empty message with top row jaygeorge committed 7a59b13View commit detailsCopy full SHA for 7a59b13 Browse repository at this point Commits on Jul 15, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 5d917a3View commit detailsCopy full SHA for 5d917a3 Browse repository at this point use `v-else` instead duncanmcclean committed 4290b17View commit detailsCopy full SHA for 4290b17 Browse repository at this point indent duncanmcclean committed 9335d5fView commit detailsCopy full SHA for 9335d5f Browse repository at this point Correct sidebar calculations by accounting for container padding jaygeorge committed 90d32f4View commit detailsCopy full SHA for 90d32f4 Browse repository at this point Skew panels right jaygeorge committed c8915a3View commit detailsCopy full SHA for c8915a3 Browse repository at this point Skew panels right jaygeorge committed c4256f4View commit detailsCopy full SHA for c4256f4 Browse repository at this point Panels - restore middle breakpoint width jaygeorge committed dbd793dView commit detailsCopy full SHA for dbd793d Browse repository at this point Revert "use `v-else` instead" Show description for 5664b3e duncanmcclean committed 5664b3eView commit detailsCopy full SHA for 5664b3e Browse repository at this point Tweak empty message decoration slightly, ready for a larger sidebar with blueprints jaygeorge committed 07bc4f9View commit detailsCopy full SHA for 07bc4f9 Browse repository at this point Commits on Jul 16, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 87d8be6View commit detailsCopy full SHA for 87d8be6 Browse repository at this point Commits on Jul 17, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed c70dd63View commit detailsCopy full SHA for c70dd63 Browse repository at this point ensure extra config options are passed to fieldtypes duncanmcclean committed ce56ae5View commit detailsCopy full SHA for ce56ae5 Browse repository at this point Commits on Jul 20, 2026 copy form fields when duplicating form duncanmcclean committed ea49753View commit detailsCopy full SHA for ea49753 Browse repository at this point add default messages as field placeholders duncanmcclean committed 4c6383bView commit detailsCopy full SHA for 4c6383b Browse repository at this point [6.x] Logic tree leap calculation (#15035) Show description for bc6c992 authored bc6c992View commit detailsCopy full SHA for bc6c992 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 6e0af1cView commit detailsCopy full SHA for 6e0af1c Browse repository at this point avoid dispatching events during initialization duncanmcclean committed 9adc15eView commit detailsCopy full SHA for 9adc15e Browse repository at this point fix nav state getting out of sync with the DOM on page load Show description for 316f2e3 duncanmcclean committed 316f2e3View commit detailsCopy full SHA for 316f2e3 Browse repository at this point Commits on Jul 21, 2026 Merge branch '6.x' into forms-2 jasonvarga committed 5af8300View commit detailsCopy full SHA for 5af8300 Browse repository at this point emit updated when validation rules are added via mutation Show description for 0359e5c jasonvarga andclaude committed 0359e5cView commit detailsCopy full SHA for 0359e5c Browse repository at this point Make current item more consistent with CP buttons jaygeorge committed 8574cedView commit detailsCopy full SHA for 8574ced Browse repository at this point [6.x] Forms 2: Various file upload improvements (#15006) Show description for fa798d0 authored fa798d0View commit detailsCopy full SHA for fa798d0 Browse repository at this point Commits on Jul 22, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed ea115ecView commit detailsCopy full SHA for ea115ec Browse repository at this point Commits on Jul 23, 2026 move translation calls inside getter to avoid boot errors duncanmcclean committed e7b3387View commit detailsCopy full SHA for e7b3387 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 4774811View commit detailsCopy full SHA for 4774811 Browse repository at this point [6.x] Remove unused form metrics code (#15066) Show description for c316553 duncanmcclean andclaude authored c316553View commit detailsCopy full SHA for c316553 Browse repository at this point Rename Marketplace button jackmcdade committed c40daf8View commit detailsCopy full SHA for c40daf8 Browse repository at this point Add Generate Fake Submission support for all the new form fieldtypes jackmcdade committed 7f2fa3aView commit detailsCopy full SHA for 7f2fa3a Browse repository at this point ensure toggle conditions work correctly duncanmcclean committed 660175eView commit detailsCopy full SHA for 660175e Browse repository at this point Commits on Jul 31, 2026 Nicer previous page UX jackmcdade committed 99ed81dView commit detailsCopy full SHA for 99ed81d Browse repository at this point Commits on Aug 3, 2026 [6.x] Forms 2: Show option dropdown when adding logic against Image Choice fields (#15096) duncanmcclean authored 1460605View commit detailsCopy full SHA for 1460605 Browse repository at this point Commits on Aug 5, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 9aca449View commit detailsCopy full SHA for 9aca449 Browse repository at this point Commits on Aug 6, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed fbe2f7cView commit detailsCopy full SHA for fbe2f7c Browse repository at this point Commits on Aug 7, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6d9762cView commit detailsCopy full SHA for 6d9762c Browse repository at this point refactor information/structure check duncanmcclean committed 9b68d22View commit detailsCopy full SHA for 9b68d22 Browse repository at this point move page logic to action inspector duncanmcclean committed da24576View commit detailsCopy full SHA for da24576 Browse repository at this point Commits on Aug 10, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 3027011View commit detailsCopy full SHA for 3027011 Browse repository at this point Add scroll margin to pagination too jaygeorge committed b6decd9View commit detailsCopy full SHA for b6decd9 Browse repository at this point move logic icon next to actions duncanmcclean committed 3a0261aView commit detailsCopy full SHA for 3a0261a Browse repository at this point validate against numbers in names duncanmcclean committed 9f9602fView commit detailsCopy full SHA for 9f9602f Browse repository at this point Commits on Aug 12, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed b2795adView commit detailsCopy full SHA for b2795ad Browse repository at this point Commits on Aug 13, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 3c8816eView commit detailsCopy full SHA for 3c8816e Browse repository at this point Commits on Aug 14, 2026 [6.x] Forms 2: Extract star rating, ranking and image choice into UI components (#15068) Show description for 291bb65 duncanmcclean andjackmcdade authored 291bb65View commit detailsCopy full SHA for 291bb65 Browse repository at this point Commits on Aug 17, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 8e0eb96View commit detailsCopy full SHA for 8e0eb96 Browse repository at this point [6.x] Forms 2: Temporary file upload fixes (#15206) Show description for c0b4163 duncanmcclean andclaude authored c0b4163View commit detailsCopy full SHA for c0b4163 Browse repository at this point [6.x] Forms 2: Generate field handles from labels (#15203) Show description for 25266cc duncanmcclean andclaude authored 25266ccView commit detailsCopy full SHA for 25266cc Browse repository at this point Commits on Aug 18, 2026 move handle below label/heading field in banner/heading/paragraph fieldtypes duncanmcclean committed 62d35c2View commit detailsCopy full SHA for 62d35c2 Browse repository at this point Commits on Aug 24, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 04ed9b0View commit detailsCopy full SHA for 04ed9b0 Browse repository at this point formatting duncanmcclean committed 7f90033View commit detailsCopy full SHA for 7f90033 Browse repository at this point Commits on Aug 26, 2026 [6.x] Forms 2: Respect min/max when generating fake integer values (#15276) Show description for 94b0fb0 duncanmcclean andclaude authored 94b0fb0View commit detailsCopy full SHA for 94b0fb0 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed d1b353fView commit detailsCopy full SHA for d1b353f Browse repository at this point Commits on Aug 27, 2026 Merge remote-tracking branch 'origin/6.x' into forms-2 jasonvarga committed cad71daView commit detailsCopy full SHA for cad71da Browse repository at this point Commits on Aug 28, 2026 [6.x] Forms 2: Ensure `FormSubmissionsController` follows conventions (#15300) duncanmcclean authored dbcdd6fView commit detailsCopy full SHA for dbcdd6f Browse repository at this point Commits on Aug 31, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6dcfee8View commit detailsCopy full SHA for 6dcfee8 Browse repository at this point [6.x] Forms 2: Catch untranslated strings (#15315) Show description for 2b62ccb duncanmcclean andclaude authored 2b62ccbView commit detailsCopy full SHA for 2b62ccb Browse repository at this point Footer © 2026 GitHub, Inc. Footer navigation Terms Privacy Security Status Community Docs Contact You can’t perform that action at this time. , 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' [6.x] Forms 2 by jasonvarga · Pull Request #15039 · statamic/cms · GitHub Skip to contentNavigation Menu Sign inAppearance settings AI CODE CREATIONGitHub CopilotWrite better code with AI GitHub Copilot appDirect agents from issue to merge MCP RegistryIntegrate external tools DEVELOPER WORKFLOWSActionsAutomate any workflow CodespacesInstant dev environments IssuesPlan and track work Code ReviewManage code changes Code QualityEnforce quality at merge APPLICATION SECURITYGitHub Advanced SecurityFind and fix vulnerabilities Code securitySecure your code as you build Secret protectionStop leaks before they start EXPLOREWhy GitHub Documentation Blog Changelog Marketplace View all features BY COMPANY SIZEEnterprises Small and medium teams Startups Nonprofits BY USE CASEApp Modernization DevSecOps DevOps CI/CD View all use cases BY INDUSTRYHealthcare Financial services Manufacturing Government View all industries View all solutions EXPLORE BY TOPICAI Software Development DevOps Security View all topics EXPLORE BY TYPECustomer stories Events & webinars Ebooks & reports Business insights GitHub Skills SUPPORT & SERVICESDocumentation Customer support Community forum Trust center Partners View all resources COMMUNITYGitHub SponsorsFund open source developers PROGRAMSSecurity Lab Maintainer Community GitHub Stars Archive Program REPOSITORIESTopics Trending Collections ENTERPRISE SOLUTIONSEnterprise platformAI-powered developer platform AVAILABLE ADD-ONSGitHub Advanced SecurityEnterprise-grade security features Copilot for BusinessEnterprise-grade AI features Premium SupportEnterprise-grade 24/7 support Pricing Sign in Sign upAppearance settings You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert Uh oh! There was an error while loading. Please reload this page. statamic /cmsPublic Uh oh! There was an error while loading. Please reload this page. Notifications You must be signed in to change notification settings Fork 641 Star 4.9k Code Issues201 Pull requests100 Discussions Actions Projects Security and quality44 Insights Additional navigation options Code Issues Pull requests Discussions Actions Projects Security and quality Insights [6.x] Forms 2 - #15039 #15039 Draft jasonvarga wants to merge 1000 commits into6.xstatamic/cms:6.xfrom forms-2statamic/cms:forms-2Copy head branch name to clipboard ConversationCommits1000 (1000)ChecksFiles changed Draft [6.x] Forms 2#15039jasonvarga wants to merge 1000 commits into6.xstatamic/cms:6.xfrom forms-2statamic/cms:forms-2Copy head branch name to clipboard Commits This pull request is big! We're only showing the most recent 250 commits Commits on Jun 4, 2026 Star rating - add ability to adjust gap and change SVG to use our Flex icon jaygeorge committed 8ddee91View commit detailsCopy full SHA for 8ddee91 Browse repository at this point Star rating - map theme vars jaygeorge committed 69ab566View commit detailsCopy full SHA for 69ab566 Browse repository at this point Star rating - leave as unrated for the form demo jaygeorge committed 67c0b9cView commit detailsCopy full SHA for 67c0b9c Browse repository at this point Star rating - set a floor and ceiling jaygeorge committed 44f7a1bView commit detailsCopy full SHA for 44f7a1b Browse repository at this point Star rating - change star appearance and finish draft jaygeorge committed b749f10View commit detailsCopy full SHA for b749f10 Browse repository at this point fix indentation duncanmcclean committed 8c675a3View commit detailsCopy full SHA for 8c675a3 Browse repository at this point pages actually have ids now duncanmcclean committed a2c02e6View commit detailsCopy full SHA for a2c02e6 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed f8499a6View commit detailsCopy full SHA for f8499a6 Browse repository at this point Star rating - tweak size jaygeorge committed 91e9954View commit detailsCopy full SHA for 91e9954 Browse repository at this point Image choice - first pass jaygeorge committed e37e96bView commit detailsCopy full SHA for e37e96b Browse repository at this point Image choice - Switch to Tailwind jaygeorge committed a5e2211View commit detailsCopy full SHA for a5e2211 Browse repository at this point Image choice - fix error when saving jaygeorge committed ad0ed0eView commit detailsCopy full SHA for ad0ed0e Browse repository at this point Fix double border effect jaygeorge committed cde898dView commit detailsCopy full SHA for cde898d Browse repository at this point Image choice - render image previews jaygeorge committed fb85b8fView commit detailsCopy full SHA for fb85b8f Browse repository at this point Image choice - add a letter before the label jaygeorge committed 3dbae2cView commit detailsCopy full SHA for 3dbae2c Browse repository at this point Image choice - style the letters jaygeorge committed 783f17eView commit detailsCopy full SHA for 783f17e Browse repository at this point Image choice - add aspect ratio as an option for the comparisons jaygeorge committed 4484482View commit detailsCopy full SHA for 4484482 Browse repository at this point Image choice - add example jaygeorge committed be9fcf1View commit detailsCopy full SHA for be9fcf1 Browse repository at this point Image choice - improve demo jaygeorge committed 70717e5View commit detailsCopy full SHA for 70717e5 Browse repository at this point Commits on Jun 5, 2026 Image choice - tighten up a few things 🧹 jaygeorge committed 915d85cView commit detailsCopy full SHA for 915d85c Browse repository at this point Image choice - fix border 🧹 jaygeorge committed de88e8dView commit detailsCopy full SHA for de88e8d Browse repository at this point Image choice - fix padding jaygeorge committed 5adca1cView commit detailsCopy full SHA for 5adca1c Browse repository at this point Image choice - make cards more consistent with the rest of the UI jaygeorge committed 5e28231View commit detailsCopy full SHA for 5e28231 Browse repository at this point Image choice - tighten up letter choice jaygeorge committed 0735f1bView commit detailsCopy full SHA for 0735f1b Browse repository at this point Make panels slightly narrower at smaller MQs jaygeorge committed ec9c31cView commit detailsCopy full SHA for ec9c31c Browse repository at this point Add ranking form field type - first pass jaygeorge committed c305049View commit detailsCopy full SHA for c305049 Browse repository at this point Ranking field type - don't show "null" when adding a new row jaygeorge committed 6ef2072View commit detailsCopy full SHA for 6ef2072 Browse repository at this point Ranking field type - improve appearance jaygeorge committed 68825edView commit detailsCopy full SHA for 68825ed Browse repository at this point Add opinion scale field type - first pass jaygeorge committed 53ee8a7View commit detailsCopy full SHA for 53ee8a7 Browse repository at this point Add opinion scale field type - use Tailwind jaygeorge committed e9503dcView commit detailsCopy full SHA for e9503dc Browse repository at this point Add opinion scale field type - fix labels jaygeorge committed 93496c2View commit detailsCopy full SHA for 93496c2 Browse repository at this point Add opinion scale field type - tidy instructions jaygeorge committed a6eaaf4View commit detailsCopy full SHA for a6eaaf4 Browse repository at this point Add opinion scale field type - finesse jaygeorge committed 3d8edfbView commit detailsCopy full SHA for 3d8edfb Browse repository at this point Add opinion scale field type - optically align labels jaygeorge committed 7ce1379View commit detailsCopy full SHA for 7ce1379 Browse repository at this point Field types - dark mode balances jaygeorge committed 62b76e1View commit detailsCopy full SHA for 62b76e1 Browse repository at this point Star rating - fix dark mode jaygeorge committed cd09b55View commit detailsCopy full SHA for cd09b55 Browse repository at this point Fix Builder field type - it was behaving weirdly jaygeorge committed 237570dView commit detailsCopy full SHA for 237570d Browse repository at this point Commits on Jun 8, 2026 Logic tab - fixed collapsed row badge/value combo jaygeorge committed c58ecd0View commit detailsCopy full SHA for c58ecd0 Browse repository at this point Logic tab - fixed row decoration jaygeorge committed 4163a83View commit detailsCopy full SHA for 4163a83 Browse repository at this point ✨ fix form not saving - textarea is a CP fieldtype, not a form fieldtype. The builder wraps it in Fallback, but was sending fieldtype: "fallback" back on save. The repository can't look up "fallbac… Show description for 1e759d5 jaygeorge committed 1e759d5View commit detailsCopy full SHA for 1e759d5 Browse repository at this point Only output the logic icon on page titles when they logic jaygeorge committed 41ac3ceView commit detailsCopy full SHA for 41ac3ce Browse repository at this point Tighten page title space jaygeorge committed d8e3064View commit detailsCopy full SHA for d8e3064 Browse repository at this point Fix banner icon for compressed view - Information fields (banner, heading, paragraph) had their own collapsed markup that skipped the shared compressed-view structure. jaygeorge committed 2cfe1faView commit detailsCopy full SHA for 2cfe1fa Browse repository at this point Switch category color from amber to green - amber is too close to orange and the category feels pretty different to choice jaygeorge committed 0160f6bView commit detailsCopy full SHA for 0160f6b Browse repository at this point Commits on Jun 10, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed d917fb9View commit detailsCopy full SHA for d917fb9 Browse repository at this point Revert "Fix Builder field type - it was behaving weirdly" Show description for 5092cbb duncanmcclean committed 5092cbbView commit detailsCopy full SHA for 5092cbb Browse repository at this point Revert "✨ fix form not saving - textarea is a CP fieldtype, not a form fieldtype. The builder wraps it in Fallback, but was sending fieldtype: "fallback" back on save. The repository can't look up … Show description for 7e2b7b5 duncanmcclean committed 7e2b7b5View commit detailsCopy full SHA for 7e2b7b5 Browse repository at this point Revert various changes from c3050492 Show description for 9975a69 duncanmcclean committed 9975a69View commit detailsCopy full SHA for 9975a69 Browse repository at this point wip duncanmcclean committed bd1c032View commit detailsCopy full SHA for bd1c032 Browse repository at this point wip duncanmcclean committed 688379aView commit detailsCopy full SHA for 688379a Browse repository at this point Revert field preview change in be9fcf1c. Show description for 7f17afd duncanmcclean committed 7f17afdView commit detailsCopy full SHA for 7f17afd Browse repository at this point Review changes to builder in fb85b8fc Show description for 807d725 duncanmcclean committed 807d725View commit detailsCopy full SHA for 807d725 Browse repository at this point fix weird indentation duncanmcclean committed de157d0View commit detailsCopy full SHA for de157d0 Browse repository at this point wip duncanmcclean committed 3aab7a2View commit detailsCopy full SHA for 3aab7a2 Browse repository at this point image choice fieldtype tweaks Show description for e56c667 duncanmcclean committed e56c667View commit detailsCopy full SHA for e56c667 Browse repository at this point require field labels in form builder duncanmcclean committed a6972a9View commit detailsCopy full SHA for a6972a9 Browse repository at this point opinion scale fieldtype tweaks Show description for f07d652 duncanmcclean committed f07d652View commit detailsCopy full SHA for f07d652 Browse repository at this point wip duncanmcclean committed 47b6f21View commit detailsCopy full SHA for 47b6f21 Browse repository at this point star rating fieldtype tweaks Show description for 7827322 duncanmcclean committed 7827322View commit detailsCopy full SHA for 7827322 Browse repository at this point ranking fieldtype tweaks Show description for e905f05 duncanmcclean committed e905f05View commit detailsCopy full SHA for e905f05 Browse repository at this point banner fieldtype tweaks duncanmcclean committed 4a7d327View commit detailsCopy full SHA for 4a7d327 Browse repository at this point wip duncanmcclean committed 9b3e299View commit detailsCopy full SHA for 9b3e299 Browse repository at this point remove unnecessary (and missing) instructions duncanmcclean committed cc6adb1View commit detailsCopy full SHA for cc6adb1 Browse repository at this point avoid using information fields (banner, heading, paragraph) in logic Show description for b6f6fdb duncanmcclean committed b6f6fdbView commit detailsCopy full SHA for b6f6fdb Browse repository at this point improve logic value stuff for new form fieldtypes duncanmcclean committed 592eefbView commit detailsCopy full SHA for 592eefb Browse repository at this point make container/folder of image options fieldtype configurable duncanmcclean committed 6a8d511View commit detailsCopy full SHA for 6a8d511 Browse repository at this point re-work config options for information fields & add field stubs duncanmcclean committed a060025View commit detailsCopy full SHA for a060025 Browse repository at this point fix failing tests duncanmcclean committed f13d239View commit detailsCopy full SHA for f13d239 Browse repository at this point provide `is_informative` to fields loop to avoid outputting labels/instructions duncanmcclean committed 044e66eView commit detailsCopy full SHA for 044e66e Browse repository at this point use `is_informative` in our fields stub duncanmcclean committed e533341View commit detailsCopy full SHA for e533341 Browse repository at this point Commits on Jun 11, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 84e4928View commit detailsCopy full SHA for 84e4928 Browse repository at this point fix icon not being persisted in banner field config duncanmcclean committed 0eda343View commit detailsCopy full SHA for 0eda343 Browse repository at this point Avoid showing preview when dragging fields in collapsed mode duncanmcclean committed 05bdc7bView commit detailsCopy full SHA for 05bdc7b Browse repository at this point adjust how min/max clamping happens in the opinion range fieldtype duncanmcclean committed 1b0d9ebView commit detailsCopy full SHA for 1b0d9eb Browse repository at this point wip duncanmcclean committed 48cb929View commit detailsCopy full SHA for 48cb929 Browse repository at this point "generate" opinion scale values in php duncanmcclean committed 38d9227View commit detailsCopy full SHA for 38d9227 Browse repository at this point replace default values with placeholders Show description for c49797c duncanmcclean committed c49797cView commit detailsCopy full SHA for c49797c Browse repository at this point simpler opinion scale views duncanmcclean committed 4025df1View commit detailsCopy full SHA for 4025df1 Browse repository at this point simpler star rating duncanmcclean committed aad9104View commit detailsCopy full SHA for aad9104 Browse repository at this point fix error in field inspector when page contains fieldset import duncanmcclean committed a7d69d4View commit detailsCopy full SHA for a7d69d4 Browse repository at this point simpler ranking views duncanmcclean committed 9f7a37eView commit detailsCopy full SHA for 9f7a37e Browse repository at this point process field config when saving, not when updating config options Show description for 7bad860 duncanmcclean committed 7bad860View commit detailsCopy full SHA for 7bad860 Browse repository at this point avoid generating field handles with hyphens Show description for ac6d62a duncanmcclean committed ac6d62aView commit detailsCopy full SHA for ac6d62a Browse repository at this point image choice view duncanmcclean committed 3cf0913View commit detailsCopy full SHA for 3cf0913 Browse repository at this point preprocess values when loading form builder duncanmcclean committed 57a0d60View commit detailsCopy full SHA for 57a0d60 Browse repository at this point make form fieldtype for spacer duncanmcclean committed 288fd39View commit detailsCopy full SHA for 288fd39 Browse repository at this point prevent configuring logic based on structure fields duncanmcclean committed ae35c37View commit detailsCopy full SHA for ae35c37 Browse repository at this point Commits on Jun 12, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed bdc19aeView commit detailsCopy full SHA for bdc19ae Browse repository at this point fix banner example duncanmcclean committed db760e9View commit detailsCopy full SHA for db760e9 Browse repository at this point provide meta and values to previews publish container duncanmcclean committed 321d0d2View commit detailsCopy full SHA for 321d0d2 Browse repository at this point hide validation tab in field inspector for structure/information fields Show description for 96cfec5 duncanmcclean committed 96cfec5View commit detailsCopy full SHA for 96cfec5 Browse repository at this point Revert "preprocess values when loading form builder" Show description for be447a4 duncanmcclean committed be447a4View commit detailsCopy full SHA for be447a4 Browse repository at this point Revert "process field config when saving, not when updating config options" Show description for 3b05e49 duncanmcclean committed 3b05e49View commit detailsCopy full SHA for 3b05e49 Browse repository at this point preprocess before validating duncanmcclean committed 5ee6cf8View commit detailsCopy full SHA for 5ee6cf8 Browse repository at this point group form fieldtype duncanmcclean committed 7e01077View commit detailsCopy full SHA for 7e01077 Browse repository at this point combine assets and files fieldtypes into a single upload form fieldtype duncanmcclean committed 26d37fbView commit detailsCopy full SHA for 26d37fb Browse repository at this point very lightly style rankings view so its clear you can drag & drop duncanmcclean committed b42935cView commit detailsCopy full SHA for b42935c Browse repository at this point use FormLayout on submission show page duncanmcclean committed e49f607View commit detailsCopy full SHA for e49f607 Browse repository at this point Commits on Jun 15, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed fdb3c20View commit detailsCopy full SHA for fdb3c20 Browse repository at this point formatting duncanmcclean committed 4a81aa3View commit detailsCopy full SHA for 4a81aa3 Browse repository at this point Small background color adjustments including dark mode jaygeorge committed fc38b65View commit detailsCopy full SHA for fc38b65 Browse repository at this point fix failing tests duncanmcclean committed a363f92View commit detailsCopy full SHA for a363f92 Browse repository at this point wip duncanmcclean committed a85473dView commit detailsCopy full SHA for a85473d Browse repository at this point missing `__` imports duncanmcclean committed 37be4c6View commit detailsCopy full SHA for 37be4c6 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed bfdb8e4View commit detailsCopy full SHA for bfdb8e4 Browse repository at this point Wrap some inline stylesheet using a cascade layer so devs can easily override jaygeorge committed e66d0ffView commit detailsCopy full SHA for e66d0ff Browse repository at this point Revert "Wrap some inline stylesheet using a cascade layer so devs can easily override" Show description for 7e759eb jaygeorge committed 7e759ebView commit detailsCopy full SHA for 7e759eb Browse repository at this point [6.x] Forms 2: Yes/No Form Fieldtype (#14819) Show description for 272cb73 duncanmcclean andjaygeorge authored 272cb73View commit detailsCopy full SHA for 272cb73 Browse repository at this point remove solo.yml from git duncanmcclean committed cf27f47View commit detailsCopy full SHA for cf27f47 Browse repository at this point Improve focus / selection state - Image Choice jaygeorge committed e95ff5dView commit detailsCopy full SHA for e95ff5d Browse repository at this point Improve focus / selection state - Opinion Scale jaygeorge committed 137ba00View commit detailsCopy full SHA for 137ba00 Browse repository at this point Commits on Jun 16, 2026 Yes/No - only fill the icon if the option is selected jaygeorge committed dca2b8bView commit detailsCopy full SHA for dca2b8b Browse repository at this point [6.x] Make the ranking fieldtype orderable with just the keyboard (#14823) Show description for 166a8ac jaygeorge andduncanmcclean authored 166a8acView commit detailsCopy full SHA for 166a8ac Browse repository at this point prevent information fieldtypes showing in listing column list duncanmcclean committed b0a68bdView commit detailsCopy full SHA for b0a68bd Browse repository at this point Merge branch '6.x' into forms-2 jaygeorge committed 754131eView commit detailsCopy full SHA for 754131e Browse repository at this point Logic rule formatting jaygeorge committed cc39fd3View commit detailsCopy full SHA for cc39fd3 Browse repository at this point Logic rule formatting jaygeorge committed ff01c73View commit detailsCopy full SHA for ff01c73 Browse repository at this point Improve logic rule badge balance jaygeorge committed be83111View commit detailsCopy full SHA for be83111 Browse repository at this point Commits on Jun 17, 2026 Improve logic rule text balance jaygeorge committed 96bb4a6View commit detailsCopy full SHA for 96bb4a6 Browse repository at this point Fix empty state dark border jaygeorge committed 8ed11aaView commit detailsCopy full SHA for 8ed11aa Browse repository at this point Ranking field - add an 'ordered' state jaygeorge committed 9433d57View commit detailsCopy full SHA for 9433d57 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed e04391cView commit detailsCopy full SHA for e04391c Browse repository at this point underlying yes/no fieldtype shouldn't be visible in form builder Show description for 890d3b0 duncanmcclean committed 890d3b0View commit detailsCopy full SHA for 890d3b0 Browse repository at this point Commits on Jun 18, 2026 [6.x] Fix the stars rating field rendering (#14820) Show description for 9db3d8d jaygeorge andduncanmcclean authored 9db3d8dView commit detailsCopy full SHA for 9db3d8d Browse repository at this point Commits on Jun 19, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6ba903dView commit detailsCopy full SHA for 6ba903d Browse repository at this point translate form title in all the places duncanmcclean committed 159fcdaView commit detailsCopy full SHA for 159fcda Browse repository at this point Commits on Jun 22, 2026 [6.x] Forms 2: Compressed view (#14853) jaygeorge authored 1717518View commit detailsCopy full SHA for 1717518 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 21b1829View commit detailsCopy full SHA for 21b1829 Browse repository at this point add confirmation modal before deleting field duncanmcclean committed aa8db6dView commit detailsCopy full SHA for aa8db6d Browse repository at this point [6.x] Forms 2: Add "Always hide" option to field logic dropdown (#14859) duncanmcclean authored 57f9f5cView commit detailsCopy full SHA for 57f9f5c Browse repository at this point Commits on Jun 23, 2026 wip duncanmcclean committed d94e62dView commit detailsCopy full SHA for d94e62d Browse repository at this point Commits on Jun 24, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 1e397bbView commit detailsCopy full SHA for 1e397bb Browse repository at this point Commits on Jun 25, 2026 [6.x] Forms 2: Submission Statuses (#14832) Show description for df261ed duncanmcclean andjasonvarga authored df261edView commit detailsCopy full SHA for df261ed Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 2e75c1cView commit detailsCopy full SHA for 2e75c1c Browse repository at this point Commits on Jun 30, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed e4dd0a8View commit detailsCopy full SHA for e4dd0a8 Browse repository at this point adjust initial page logic Show description for 5f81608 duncanmcclean committed 5f81608View commit detailsCopy full SHA for 5f81608 Browse repository at this point [6.x] Forms 2: Site Filter (#14902) duncanmcclean authored 47f7905View commit detailsCopy full SHA for 47f7905 Browse repository at this point cleanup `data-panels-showing` attribute when unmounting panel layout duncanmcclean committed e090e85View commit detailsCopy full SHA for e090e85 Browse repository at this point avoid publishing `star-rating.css`. the css is inlined now. duncanmcclean committed 9f2b2d2View commit detailsCopy full SHA for 9f2b2d2 Browse repository at this point Commits on Jul 1, 2026 exclude partial submissions from results count on forms listing duncanmcclean committed eff4c77View commit detailsCopy full SHA for eff4c77 Browse repository at this point move `is_informative` out of generic `RendersForms` trait Show description for 07b190f duncanmcclean committed 07b190fView commit detailsCopy full SHA for 07b190f Browse repository at this point Commits on Jul 2, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6e0764aView commit detailsCopy full SHA for 6e0764a Browse repository at this point Merge branch '6.x' into forms-2 jaygeorge committed 9b7ae88View commit detailsCopy full SHA for 9b7ae88 Browse repository at this point [6.x] Forms 2: Field numbering (#14909) duncanmcclean authored 0ac798dView commit detailsCopy full SHA for 0ac798d Browse repository at this point Commits on Jul 3, 2026 Fix architectural lines breaking out of .content, e.g. /collections/create jaygeorge committed 378491cView commit detailsCopy full SHA for 378491c Browse repository at this point Merge remote-tracking branch 'origin/6.x' into forms-2 Show description for bbea10d jasonvarga committed bbea10dView commit detailsCopy full SHA for bbea10d Browse repository at this point Small dark mode fix jaygeorge committed e88ad6fView commit detailsCopy full SHA for e88ad6f Browse repository at this point Commits on Jul 6, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 461512dView commit detailsCopy full SHA for 461512d Browse repository at this point fix logic indicator not showing sometimes duncanmcclean committed 3b4eb46View commit detailsCopy full SHA for 3b4eb46 Browse repository at this point include fieldset reference in tooltip duncanmcclean committed 491b44dView commit detailsCopy full SHA for 491b44d Browse repository at this point [6.x] Forms 2: Logic Tree (#14811) Show description for 243b695 jaygeorge andduncanmcclean authored 243b695View commit detailsCopy full SHA for 243b695 Browse repository at this point wip duncanmcclean committed 52798d9View commit detailsCopy full SHA for 52798d9 Browse repository at this point reset active tab in page inspector when selecting the last page duncanmcclean committed be337b9View commit detailsCopy full SHA for be337b9 Browse repository at this point avoid moving fields between pages in logic tree duncanmcclean committed 5739fc4View commit detailsCopy full SHA for 5739fc4 Browse repository at this point Commits on Jul 7, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed de239ddView commit detailsCopy full SHA for de239dd Browse repository at this point Small dark mode badge fix for page logic jaygeorge committed ef8d8feView commit detailsCopy full SHA for ef8d8fe Browse repository at this point Make "delete" icon condition only appear on hover, like the trash icon jaygeorge committed d7f1f57View commit detailsCopy full SHA for d7f1f57 Browse repository at this point Balance page rule with trash icon jaygeorge committed 34aa292View commit detailsCopy full SHA for 34aa292 Browse repository at this point Make "delete" icon condition only appear on hover for field logic too jaygeorge committed 9552b0aView commit detailsCopy full SHA for 9552b0a Browse repository at this point Connect - adjust grid responsively jaygeorge committed eb2005bView commit detailsCopy full SHA for eb2005b Browse repository at this point Merge branch '6.x' into forms-2 jaygeorge committed 381570eView commit detailsCopy full SHA for 381570e Browse repository at this point [6.x] Forms 2: Allow multiple forms when Forms Pro is installed (#14952) Show description for cc7f602 duncanmcclean andclaude authored cc7f602View commit detailsCopy full SHA for cc7f602 Browse repository at this point [6.x] Forms 2: Access (#14950) Show description for 56e9900 duncanmcclean andjasonvarga authored 56e9900View commit detailsCopy full SHA for 56e9900 Browse repository at this point Commits on Jul 8, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 7c9eaa7View commit detailsCopy full SHA for 7c9eaa7 Browse repository at this point [6.x] Forms 2: Multi-page forms & `SubmitForm` action (#14840) Show description for 88a0a19 duncanmcclean andjasonvarga authored 88a0a19View commit detailsCopy full SHA for 88a0a19 Browse repository at this point Commits on Jul 9, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 510cea1View commit detailsCopy full SHA for 510cea1 Browse repository at this point Fix failing test caused by #14959 duncanmcclean committed da09e47View commit detailsCopy full SHA for da09e47 Browse repository at this point [6.x] Forms 2: Tighten form upload validation in `SubmitForm` action (#14964) duncanmcclean authored 4cea062View commit detailsCopy full SHA for 4cea062 Browse repository at this point fix error when submitting a form page containing a fieldset import Show description for 9bb3804 duncanmcclean committed 9bb3804View commit detailsCopy full SHA for 9bb3804 Browse repository at this point Logic tree - improve the way overflow is handled jaygeorge committed 7ef050bView commit detailsCopy full SHA for 7ef050b Browse repository at this point Logic tree - improve full bleed scrolling with a separator jaygeorge committed bc563b2View commit detailsCopy full SHA for bc563b2 Browse repository at this point Logic tree - panel styling jaygeorge committed 90e8d5cView commit detailsCopy full SHA for 90e8d5c Browse repository at this point Logic tree - add a container query like the list view jaygeorge committed 15674b2View commit detailsCopy full SHA for 15674b2 Browse repository at this point Logic tree - separate rules in split panel, like we do in the Edit tab jaygeorge committed b526263View commit detailsCopy full SHA for b526263 Browse repository at this point Fix connector line stacking context jaygeorge committed 9e022c8View commit detailsCopy full SHA for 9e022c8 Browse repository at this point Logic tree - align rules with the page header jaygeorge committed ee555cfView commit detailsCopy full SHA for ee555cf Browse repository at this point Logic tree - When an item is selected, highlight its connection jaygeorge committed fe40316View commit detailsCopy full SHA for fe40316 Browse repository at this point [6.x] Forms 2: Remember panel widths (#14968) jackmcdade authored 369d2d7View commit detailsCopy full SHA for 369d2d7 Browse repository at this point Logic tree - dim the connection arrow of unselected columns too jaygeorge committed e98a704View commit detailsCopy full SHA for e98a704 Browse repository at this point Merge branch '6.x' into forms-2 jasonvarga committed 0d0a2cfView commit detailsCopy full SHA for 0d0a2cf Browse repository at this point Commits on Jul 10, 2026 [6.x] Forms 2: ✨ Move the panel to the side for /logic > tree view (#14969) Show description for 769cf0b jaygeorge andduncanmcclean authored 769cf0bView commit detailsCopy full SHA for 769cf0b Browse repository at this point fix adding field logic in list mode duncanmcclean committed 668ce1cView commit detailsCopy full SHA for 668ce1c Browse repository at this point [6.x] Logic empty state (#14976) jaygeorge authored 1791060View commit detailsCopy full SHA for 1791060 Browse repository at this point [6.x] Forms 2: Fix false dirty state when opening field inspector in Logic Tree view (#14977) duncanmcclean authored c4deef3View commit detailsCopy full SHA for c4deef3 Browse repository at this point make text in paragraph fieldtype mandatory duncanmcclean committed 4ff2828View commit detailsCopy full SHA for 4ff2828 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed e02192fView commit detailsCopy full SHA for e02192f Browse repository at this point Merge branch '6.x' into forms-2 Show description for 6fe3804 jasonvarga committed 6fe3804View commit detailsCopy full SHA for 6fe3804 Browse repository at this point [6.x] Forms 2: Permissions (#14957) Show description for 4df166b authored 4df166bView commit detailsCopy full SHA for 4df166b Browse repository at this point Commits on Jul 13, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed d7f3217View commit detailsCopy full SHA for d7f3217 Browse repository at this point Add form builder empty state help text jackmcdade committed 316c1a2View commit detailsCopy full SHA for 316c1a2 Browse repository at this point Commits on Jul 14, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed b48ceeeView commit detailsCopy full SHA for b48ceee Browse repository at this point Space headings a little more jaygeorge committed b194775View commit detailsCopy full SHA for b194775 Browse repository at this point Half way jaygeorge committed 3ba0eb4View commit detailsCopy full SHA for 3ba0eb4 Browse repository at this point Stop graph paper lines going through titles jaygeorge committed 2dea0aaView commit detailsCopy full SHA for 2dea0aa Browse repository at this point Align empty message with top row jaygeorge committed 7a59b13View commit detailsCopy full SHA for 7a59b13 Browse repository at this point Commits on Jul 15, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 5d917a3View commit detailsCopy full SHA for 5d917a3 Browse repository at this point use `v-else` instead duncanmcclean committed 4290b17View commit detailsCopy full SHA for 4290b17 Browse repository at this point indent duncanmcclean committed 9335d5fView commit detailsCopy full SHA for 9335d5f Browse repository at this point Correct sidebar calculations by accounting for container padding jaygeorge committed 90d32f4View commit detailsCopy full SHA for 90d32f4 Browse repository at this point Skew panels right jaygeorge committed c8915a3View commit detailsCopy full SHA for c8915a3 Browse repository at this point Skew panels right jaygeorge committed c4256f4View commit detailsCopy full SHA for c4256f4 Browse repository at this point Panels - restore middle breakpoint width jaygeorge committed dbd793dView commit detailsCopy full SHA for dbd793d Browse repository at this point Revert "use `v-else` instead" Show description for 5664b3e duncanmcclean committed 5664b3eView commit detailsCopy full SHA for 5664b3e Browse repository at this point Tweak empty message decoration slightly, ready for a larger sidebar with blueprints jaygeorge committed 07bc4f9View commit detailsCopy full SHA for 07bc4f9 Browse repository at this point Commits on Jul 16, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 87d8be6View commit detailsCopy full SHA for 87d8be6 Browse repository at this point Commits on Jul 17, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed c70dd63View commit detailsCopy full SHA for c70dd63 Browse repository at this point ensure extra config options are passed to fieldtypes duncanmcclean committed ce56ae5View commit detailsCopy full SHA for ce56ae5 Browse repository at this point Commits on Jul 20, 2026 copy form fields when duplicating form duncanmcclean committed ea49753View commit detailsCopy full SHA for ea49753 Browse repository at this point add default messages as field placeholders duncanmcclean committed 4c6383bView commit detailsCopy full SHA for 4c6383b Browse repository at this point [6.x] Logic tree leap calculation (#15035) Show description for bc6c992 authored bc6c992View commit detailsCopy full SHA for bc6c992 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 6e0af1cView commit detailsCopy full SHA for 6e0af1c Browse repository at this point avoid dispatching events during initialization duncanmcclean committed 9adc15eView commit detailsCopy full SHA for 9adc15e Browse repository at this point fix nav state getting out of sync with the DOM on page load Show description for 316f2e3 duncanmcclean committed 316f2e3View commit detailsCopy full SHA for 316f2e3 Browse repository at this point Commits on Jul 21, 2026 Merge branch '6.x' into forms-2 jasonvarga committed 5af8300View commit detailsCopy full SHA for 5af8300 Browse repository at this point emit updated when validation rules are added via mutation Show description for 0359e5c jasonvarga andclaude committed 0359e5cView commit detailsCopy full SHA for 0359e5c Browse repository at this point Make current item more consistent with CP buttons jaygeorge committed 8574cedView commit detailsCopy full SHA for 8574ced Browse repository at this point [6.x] Forms 2: Various file upload improvements (#15006) Show description for fa798d0 authored fa798d0View commit detailsCopy full SHA for fa798d0 Browse repository at this point Commits on Jul 22, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed ea115ecView commit detailsCopy full SHA for ea115ec Browse repository at this point Commits on Jul 23, 2026 move translation calls inside getter to avoid boot errors duncanmcclean committed e7b3387View commit detailsCopy full SHA for e7b3387 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 4774811View commit detailsCopy full SHA for 4774811 Browse repository at this point [6.x] Remove unused form metrics code (#15066) Show description for c316553 duncanmcclean andclaude authored c316553View commit detailsCopy full SHA for c316553 Browse repository at this point Rename Marketplace button jackmcdade committed c40daf8View commit detailsCopy full SHA for c40daf8 Browse repository at this point Add Generate Fake Submission support for all the new form fieldtypes jackmcdade committed 7f2fa3aView commit detailsCopy full SHA for 7f2fa3a Browse repository at this point ensure toggle conditions work correctly duncanmcclean committed 660175eView commit detailsCopy full SHA for 660175e Browse repository at this point Commits on Jul 31, 2026 Nicer previous page UX jackmcdade committed 99ed81dView commit detailsCopy full SHA for 99ed81d Browse repository at this point Commits on Aug 3, 2026 [6.x] Forms 2: Show option dropdown when adding logic against Image Choice fields (#15096) duncanmcclean authored 1460605View commit detailsCopy full SHA for 1460605 Browse repository at this point Commits on Aug 5, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 9aca449View commit detailsCopy full SHA for 9aca449 Browse repository at this point Commits on Aug 6, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed fbe2f7cView commit detailsCopy full SHA for fbe2f7c Browse repository at this point Commits on Aug 7, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6d9762cView commit detailsCopy full SHA for 6d9762c Browse repository at this point refactor information/structure check duncanmcclean committed 9b68d22View commit detailsCopy full SHA for 9b68d22 Browse repository at this point move page logic to action inspector duncanmcclean committed da24576View commit detailsCopy full SHA for da24576 Browse repository at this point Commits on Aug 10, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 3027011View commit detailsCopy full SHA for 3027011 Browse repository at this point Add scroll margin to pagination too jaygeorge committed b6decd9View commit detailsCopy full SHA for b6decd9 Browse repository at this point move logic icon next to actions duncanmcclean committed 3a0261aView commit detailsCopy full SHA for 3a0261a Browse repository at this point validate against numbers in names duncanmcclean committed 9f9602fView commit detailsCopy full SHA for 9f9602f Browse repository at this point Commits on Aug 12, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed b2795adView commit detailsCopy full SHA for b2795ad Browse repository at this point Commits on Aug 13, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 3c8816eView commit detailsCopy full SHA for 3c8816e Browse repository at this point Commits on Aug 14, 2026 [6.x] Forms 2: Extract star rating, ranking and image choice into UI components (#15068) Show description for 291bb65 duncanmcclean andjackmcdade authored 291bb65View commit detailsCopy full SHA for 291bb65 Browse repository at this point Commits on Aug 17, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 8e0eb96View commit detailsCopy full SHA for 8e0eb96 Browse repository at this point [6.x] Forms 2: Temporary file upload fixes (#15206) Show description for c0b4163 duncanmcclean andclaude authored c0b4163View commit detailsCopy full SHA for c0b4163 Browse repository at this point [6.x] Forms 2: Generate field handles from labels (#15203) Show description for 25266cc duncanmcclean andclaude authored 25266ccView commit detailsCopy full SHA for 25266cc Browse repository at this point Commits on Aug 18, 2026 move handle below label/heading field in banner/heading/paragraph fieldtypes duncanmcclean committed 62d35c2View commit detailsCopy full SHA for 62d35c2 Browse repository at this point Commits on Aug 24, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 04ed9b0View commit detailsCopy full SHA for 04ed9b0 Browse repository at this point formatting duncanmcclean committed 7f90033View commit detailsCopy full SHA for 7f90033 Browse repository at this point Commits on Aug 26, 2026 [6.x] Forms 2: Respect min/max when generating fake integer values (#15276) Show description for 94b0fb0 duncanmcclean andclaude authored 94b0fb0View commit detailsCopy full SHA for 94b0fb0 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed d1b353fView commit detailsCopy full SHA for d1b353f Browse repository at this point Commits on Aug 27, 2026 Merge remote-tracking branch 'origin/6.x' into forms-2 jasonvarga committed cad71daView commit detailsCopy full SHA for cad71da Browse repository at this point Commits on Aug 28, 2026 [6.x] Forms 2: Ensure `FormSubmissionsController` follows conventions (#15300) duncanmcclean authored dbcdd6fView commit detailsCopy full SHA for dbcdd6f Browse repository at this point Commits on Aug 31, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6dcfee8View commit detailsCopy full SHA for 6dcfee8 Browse repository at this point [6.x] Forms 2: Catch untranslated strings (#15315) Show description for 2b62ccb duncanmcclean andclaude authored 2b62ccbView commit detailsCopy full SHA for 2b62ccb Browse repository at this point Footer © 2026 GitHub, Inc. Footer navigation Terms Privacy Security Status Community Docs Contact You can’t perform that action at this time. , 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); [6.x] Forms 2 by jasonvarga · Pull Request #15039 · statamic/cms · GitHub Skip to contentNavigation Menu Sign inAppearance settings AI CODE CREATIONGitHub CopilotWrite better code with AI GitHub Copilot appDirect agents from issue to merge MCP RegistryIntegrate external tools DEVELOPER WORKFLOWSActionsAutomate any workflow CodespacesInstant dev environments IssuesPlan and track work Code ReviewManage code changes Code QualityEnforce quality at merge APPLICATION SECURITYGitHub Advanced SecurityFind and fix vulnerabilities Code securitySecure your code as you build Secret protectionStop leaks before they start EXPLOREWhy GitHub Documentation Blog Changelog Marketplace View all features BY COMPANY SIZEEnterprises Small and medium teams Startups Nonprofits BY USE CASEApp Modernization DevSecOps DevOps CI/CD View all use cases BY INDUSTRYHealthcare Financial services Manufacturing Government View all industries View all solutions EXPLORE BY TOPICAI Software Development DevOps Security View all topics EXPLORE BY TYPECustomer stories Events & webinars Ebooks & reports Business insights GitHub Skills SUPPORT & SERVICESDocumentation Customer support Community forum Trust center Partners View all resources COMMUNITYGitHub SponsorsFund open source developers PROGRAMSSecurity Lab Maintainer Community GitHub Stars Archive Program REPOSITORIESTopics Trending Collections ENTERPRISE SOLUTIONSEnterprise platformAI-powered developer platform AVAILABLE ADD-ONSGitHub Advanced SecurityEnterprise-grade security features Copilot for BusinessEnterprise-grade AI features Premium SupportEnterprise-grade 24/7 support Pricing Sign in Sign upAppearance settings You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert Uh oh! There was an error while loading. Please reload this page. statamic /cmsPublic Uh oh! There was an error while loading. Please reload this page. Notifications You must be signed in to change notification settings Fork 641 Star 4.9k Code Issues201 Pull requests100 Discussions Actions Projects Security and quality44 Insights Additional navigation options Code Issues Pull requests Discussions Actions Projects Security and quality Insights [6.x] Forms 2 - #15039 #15039 Draft jasonvarga wants to merge 1000 commits into6.xstatamic/cms:6.xfrom forms-2statamic/cms:forms-2Copy head branch name to clipboard ConversationCommits1000 (1000)ChecksFiles changed Draft [6.x] Forms 2#15039jasonvarga wants to merge 1000 commits into6.xstatamic/cms:6.xfrom forms-2statamic/cms:forms-2Copy head branch name to clipboard Commits This pull request is big! We're only showing the most recent 250 commits Commits on Jun 4, 2026 Star rating - add ability to adjust gap and change SVG to use our Flex icon jaygeorge committed 8ddee91View commit detailsCopy full SHA for 8ddee91 Browse repository at this point Star rating - map theme vars jaygeorge committed 69ab566View commit detailsCopy full SHA for 69ab566 Browse repository at this point Star rating - leave as unrated for the form demo jaygeorge committed 67c0b9cView commit detailsCopy full SHA for 67c0b9c Browse repository at this point Star rating - set a floor and ceiling jaygeorge committed 44f7a1bView commit detailsCopy full SHA for 44f7a1b Browse repository at this point Star rating - change star appearance and finish draft jaygeorge committed b749f10View commit detailsCopy full SHA for b749f10 Browse repository at this point fix indentation duncanmcclean committed 8c675a3View commit detailsCopy full SHA for 8c675a3 Browse repository at this point pages actually have ids now duncanmcclean committed a2c02e6View commit detailsCopy full SHA for a2c02e6 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed f8499a6View commit detailsCopy full SHA for f8499a6 Browse repository at this point Star rating - tweak size jaygeorge committed 91e9954View commit detailsCopy full SHA for 91e9954 Browse repository at this point Image choice - first pass jaygeorge committed e37e96bView commit detailsCopy full SHA for e37e96b Browse repository at this point Image choice - Switch to Tailwind jaygeorge committed a5e2211View commit detailsCopy full SHA for a5e2211 Browse repository at this point Image choice - fix error when saving jaygeorge committed ad0ed0eView commit detailsCopy full SHA for ad0ed0e Browse repository at this point Fix double border effect jaygeorge committed cde898dView commit detailsCopy full SHA for cde898d Browse repository at this point Image choice - render image previews jaygeorge committed fb85b8fView commit detailsCopy full SHA for fb85b8f Browse repository at this point Image choice - add a letter before the label jaygeorge committed 3dbae2cView commit detailsCopy full SHA for 3dbae2c Browse repository at this point Image choice - style the letters jaygeorge committed 783f17eView commit detailsCopy full SHA for 783f17e Browse repository at this point Image choice - add aspect ratio as an option for the comparisons jaygeorge committed 4484482View commit detailsCopy full SHA for 4484482 Browse repository at this point Image choice - add example jaygeorge committed be9fcf1View commit detailsCopy full SHA for be9fcf1 Browse repository at this point Image choice - improve demo jaygeorge committed 70717e5View commit detailsCopy full SHA for 70717e5 Browse repository at this point Commits on Jun 5, 2026 Image choice - tighten up a few things 🧹 jaygeorge committed 915d85cView commit detailsCopy full SHA for 915d85c Browse repository at this point Image choice - fix border 🧹 jaygeorge committed de88e8dView commit detailsCopy full SHA for de88e8d Browse repository at this point Image choice - fix padding jaygeorge committed 5adca1cView commit detailsCopy full SHA for 5adca1c Browse repository at this point Image choice - make cards more consistent with the rest of the UI jaygeorge committed 5e28231View commit detailsCopy full SHA for 5e28231 Browse repository at this point Image choice - tighten up letter choice jaygeorge committed 0735f1bView commit detailsCopy full SHA for 0735f1b Browse repository at this point Make panels slightly narrower at smaller MQs jaygeorge committed ec9c31cView commit detailsCopy full SHA for ec9c31c Browse repository at this point Add ranking form field type - first pass jaygeorge committed c305049View commit detailsCopy full SHA for c305049 Browse repository at this point Ranking field type - don't show "null" when adding a new row jaygeorge committed 6ef2072View commit detailsCopy full SHA for 6ef2072 Browse repository at this point Ranking field type - improve appearance jaygeorge committed 68825edView commit detailsCopy full SHA for 68825ed Browse repository at this point Add opinion scale field type - first pass jaygeorge committed 53ee8a7View commit detailsCopy full SHA for 53ee8a7 Browse repository at this point Add opinion scale field type - use Tailwind jaygeorge committed e9503dcView commit detailsCopy full SHA for e9503dc Browse repository at this point Add opinion scale field type - fix labels jaygeorge committed 93496c2View commit detailsCopy full SHA for 93496c2 Browse repository at this point Add opinion scale field type - tidy instructions jaygeorge committed a6eaaf4View commit detailsCopy full SHA for a6eaaf4 Browse repository at this point Add opinion scale field type - finesse jaygeorge committed 3d8edfbView commit detailsCopy full SHA for 3d8edfb Browse repository at this point Add opinion scale field type - optically align labels jaygeorge committed 7ce1379View commit detailsCopy full SHA for 7ce1379 Browse repository at this point Field types - dark mode balances jaygeorge committed 62b76e1View commit detailsCopy full SHA for 62b76e1 Browse repository at this point Star rating - fix dark mode jaygeorge committed cd09b55View commit detailsCopy full SHA for cd09b55 Browse repository at this point Fix Builder field type - it was behaving weirdly jaygeorge committed 237570dView commit detailsCopy full SHA for 237570d Browse repository at this point Commits on Jun 8, 2026 Logic tab - fixed collapsed row badge/value combo jaygeorge committed c58ecd0View commit detailsCopy full SHA for c58ecd0 Browse repository at this point Logic tab - fixed row decoration jaygeorge committed 4163a83View commit detailsCopy full SHA for 4163a83 Browse repository at this point ✨ fix form not saving - textarea is a CP fieldtype, not a form fieldtype. The builder wraps it in Fallback, but was sending fieldtype: "fallback" back on save. The repository can't look up "fallbac… Show description for 1e759d5 jaygeorge committed 1e759d5View commit detailsCopy full SHA for 1e759d5 Browse repository at this point Only output the logic icon on page titles when they logic jaygeorge committed 41ac3ceView commit detailsCopy full SHA for 41ac3ce Browse repository at this point Tighten page title space jaygeorge committed d8e3064View commit detailsCopy full SHA for d8e3064 Browse repository at this point Fix banner icon for compressed view - Information fields (banner, heading, paragraph) had their own collapsed markup that skipped the shared compressed-view structure. jaygeorge committed 2cfe1faView commit detailsCopy full SHA for 2cfe1fa Browse repository at this point Switch category color from amber to green - amber is too close to orange and the category feels pretty different to choice jaygeorge committed 0160f6bView commit detailsCopy full SHA for 0160f6b Browse repository at this point Commits on Jun 10, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed d917fb9View commit detailsCopy full SHA for d917fb9 Browse repository at this point Revert "Fix Builder field type - it was behaving weirdly" Show description for 5092cbb duncanmcclean committed 5092cbbView commit detailsCopy full SHA for 5092cbb Browse repository at this point Revert "✨ fix form not saving - textarea is a CP fieldtype, not a form fieldtype. The builder wraps it in Fallback, but was sending fieldtype: "fallback" back on save. The repository can't look up … Show description for 7e2b7b5 duncanmcclean committed 7e2b7b5View commit detailsCopy full SHA for 7e2b7b5 Browse repository at this point Revert various changes from c3050492 Show description for 9975a69 duncanmcclean committed 9975a69View commit detailsCopy full SHA for 9975a69 Browse repository at this point wip duncanmcclean committed bd1c032View commit detailsCopy full SHA for bd1c032 Browse repository at this point wip duncanmcclean committed 688379aView commit detailsCopy full SHA for 688379a Browse repository at this point Revert field preview change in be9fcf1c. Show description for 7f17afd duncanmcclean committed 7f17afdView commit detailsCopy full SHA for 7f17afd Browse repository at this point Review changes to builder in fb85b8fc Show description for 807d725 duncanmcclean committed 807d725View commit detailsCopy full SHA for 807d725 Browse repository at this point fix weird indentation duncanmcclean committed de157d0View commit detailsCopy full SHA for de157d0 Browse repository at this point wip duncanmcclean committed 3aab7a2View commit detailsCopy full SHA for 3aab7a2 Browse repository at this point image choice fieldtype tweaks Show description for e56c667 duncanmcclean committed e56c667View commit detailsCopy full SHA for e56c667 Browse repository at this point require field labels in form builder duncanmcclean committed a6972a9View commit detailsCopy full SHA for a6972a9 Browse repository at this point opinion scale fieldtype tweaks Show description for f07d652 duncanmcclean committed f07d652View commit detailsCopy full SHA for f07d652 Browse repository at this point wip duncanmcclean committed 47b6f21View commit detailsCopy full SHA for 47b6f21 Browse repository at this point star rating fieldtype tweaks Show description for 7827322 duncanmcclean committed 7827322View commit detailsCopy full SHA for 7827322 Browse repository at this point ranking fieldtype tweaks Show description for e905f05 duncanmcclean committed e905f05View commit detailsCopy full SHA for e905f05 Browse repository at this point banner fieldtype tweaks duncanmcclean committed 4a7d327View commit detailsCopy full SHA for 4a7d327 Browse repository at this point wip duncanmcclean committed 9b3e299View commit detailsCopy full SHA for 9b3e299 Browse repository at this point remove unnecessary (and missing) instructions duncanmcclean committed cc6adb1View commit detailsCopy full SHA for cc6adb1 Browse repository at this point avoid using information fields (banner, heading, paragraph) in logic Show description for b6f6fdb duncanmcclean committed b6f6fdbView commit detailsCopy full SHA for b6f6fdb Browse repository at this point improve logic value stuff for new form fieldtypes duncanmcclean committed 592eefbView commit detailsCopy full SHA for 592eefb Browse repository at this point make container/folder of image options fieldtype configurable duncanmcclean committed 6a8d511View commit detailsCopy full SHA for 6a8d511 Browse repository at this point re-work config options for information fields & add field stubs duncanmcclean committed a060025View commit detailsCopy full SHA for a060025 Browse repository at this point fix failing tests duncanmcclean committed f13d239View commit detailsCopy full SHA for f13d239 Browse repository at this point provide `is_informative` to fields loop to avoid outputting labels/instructions duncanmcclean committed 044e66eView commit detailsCopy full SHA for 044e66e Browse repository at this point use `is_informative` in our fields stub duncanmcclean committed e533341View commit detailsCopy full SHA for e533341 Browse repository at this point Commits on Jun 11, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 84e4928View commit detailsCopy full SHA for 84e4928 Browse repository at this point fix icon not being persisted in banner field config duncanmcclean committed 0eda343View commit detailsCopy full SHA for 0eda343 Browse repository at this point Avoid showing preview when dragging fields in collapsed mode duncanmcclean committed 05bdc7bView commit detailsCopy full SHA for 05bdc7b Browse repository at this point adjust how min/max clamping happens in the opinion range fieldtype duncanmcclean committed 1b0d9ebView commit detailsCopy full SHA for 1b0d9eb Browse repository at this point wip duncanmcclean committed 48cb929View commit detailsCopy full SHA for 48cb929 Browse repository at this point "generate" opinion scale values in php duncanmcclean committed 38d9227View commit detailsCopy full SHA for 38d9227 Browse repository at this point replace default values with placeholders Show description for c49797c duncanmcclean committed c49797cView commit detailsCopy full SHA for c49797c Browse repository at this point simpler opinion scale views duncanmcclean committed 4025df1View commit detailsCopy full SHA for 4025df1 Browse repository at this point simpler star rating duncanmcclean committed aad9104View commit detailsCopy full SHA for aad9104 Browse repository at this point fix error in field inspector when page contains fieldset import duncanmcclean committed a7d69d4View commit detailsCopy full SHA for a7d69d4 Browse repository at this point simpler ranking views duncanmcclean committed 9f7a37eView commit detailsCopy full SHA for 9f7a37e Browse repository at this point process field config when saving, not when updating config options Show description for 7bad860 duncanmcclean committed 7bad860View commit detailsCopy full SHA for 7bad860 Browse repository at this point avoid generating field handles with hyphens Show description for ac6d62a duncanmcclean committed ac6d62aView commit detailsCopy full SHA for ac6d62a Browse repository at this point image choice view duncanmcclean committed 3cf0913View commit detailsCopy full SHA for 3cf0913 Browse repository at this point preprocess values when loading form builder duncanmcclean committed 57a0d60View commit detailsCopy full SHA for 57a0d60 Browse repository at this point make form fieldtype for spacer duncanmcclean committed 288fd39View commit detailsCopy full SHA for 288fd39 Browse repository at this point prevent configuring logic based on structure fields duncanmcclean committed ae35c37View commit detailsCopy full SHA for ae35c37 Browse repository at this point Commits on Jun 12, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed bdc19aeView commit detailsCopy full SHA for bdc19ae Browse repository at this point fix banner example duncanmcclean committed db760e9View commit detailsCopy full SHA for db760e9 Browse repository at this point provide meta and values to previews publish container duncanmcclean committed 321d0d2View commit detailsCopy full SHA for 321d0d2 Browse repository at this point hide validation tab in field inspector for structure/information fields Show description for 96cfec5 duncanmcclean committed 96cfec5View commit detailsCopy full SHA for 96cfec5 Browse repository at this point Revert "preprocess values when loading form builder" Show description for be447a4 duncanmcclean committed be447a4View commit detailsCopy full SHA for be447a4 Browse repository at this point Revert "process field config when saving, not when updating config options" Show description for 3b05e49 duncanmcclean committed 3b05e49View commit detailsCopy full SHA for 3b05e49 Browse repository at this point preprocess before validating duncanmcclean committed 5ee6cf8View commit detailsCopy full SHA for 5ee6cf8 Browse repository at this point group form fieldtype duncanmcclean committed 7e01077View commit detailsCopy full SHA for 7e01077 Browse repository at this point combine assets and files fieldtypes into a single upload form fieldtype duncanmcclean committed 26d37fbView commit detailsCopy full SHA for 26d37fb Browse repository at this point very lightly style rankings view so its clear you can drag & drop duncanmcclean committed b42935cView commit detailsCopy full SHA for b42935c Browse repository at this point use FormLayout on submission show page duncanmcclean committed e49f607View commit detailsCopy full SHA for e49f607 Browse repository at this point Commits on Jun 15, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed fdb3c20View commit detailsCopy full SHA for fdb3c20 Browse repository at this point formatting duncanmcclean committed 4a81aa3View commit detailsCopy full SHA for 4a81aa3 Browse repository at this point Small background color adjustments including dark mode jaygeorge committed fc38b65View commit detailsCopy full SHA for fc38b65 Browse repository at this point fix failing tests duncanmcclean committed a363f92View commit detailsCopy full SHA for a363f92 Browse repository at this point wip duncanmcclean committed a85473dView commit detailsCopy full SHA for a85473d Browse repository at this point missing `__` imports duncanmcclean committed 37be4c6View commit detailsCopy full SHA for 37be4c6 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed bfdb8e4View commit detailsCopy full SHA for bfdb8e4 Browse repository at this point Wrap some inline stylesheet using a cascade layer so devs can easily override jaygeorge committed e66d0ffView commit detailsCopy full SHA for e66d0ff Browse repository at this point Revert "Wrap some inline stylesheet using a cascade layer so devs can easily override" Show description for 7e759eb jaygeorge committed 7e759ebView commit detailsCopy full SHA for 7e759eb Browse repository at this point [6.x] Forms 2: Yes/No Form Fieldtype (#14819) Show description for 272cb73 duncanmcclean andjaygeorge authored 272cb73View commit detailsCopy full SHA for 272cb73 Browse repository at this point remove solo.yml from git duncanmcclean committed cf27f47View commit detailsCopy full SHA for cf27f47 Browse repository at this point Improve focus / selection state - Image Choice jaygeorge committed e95ff5dView commit detailsCopy full SHA for e95ff5d Browse repository at this point Improve focus / selection state - Opinion Scale jaygeorge committed 137ba00View commit detailsCopy full SHA for 137ba00 Browse repository at this point Commits on Jun 16, 2026 Yes/No - only fill the icon if the option is selected jaygeorge committed dca2b8bView commit detailsCopy full SHA for dca2b8b Browse repository at this point [6.x] Make the ranking fieldtype orderable with just the keyboard (#14823) Show description for 166a8ac jaygeorge andduncanmcclean authored 166a8acView commit detailsCopy full SHA for 166a8ac Browse repository at this point prevent information fieldtypes showing in listing column list duncanmcclean committed b0a68bdView commit detailsCopy full SHA for b0a68bd Browse repository at this point Merge branch '6.x' into forms-2 jaygeorge committed 754131eView commit detailsCopy full SHA for 754131e Browse repository at this point Logic rule formatting jaygeorge committed cc39fd3View commit detailsCopy full SHA for cc39fd3 Browse repository at this point Logic rule formatting jaygeorge committed ff01c73View commit detailsCopy full SHA for ff01c73 Browse repository at this point Improve logic rule badge balance jaygeorge committed be83111View commit detailsCopy full SHA for be83111 Browse repository at this point Commits on Jun 17, 2026 Improve logic rule text balance jaygeorge committed 96bb4a6View commit detailsCopy full SHA for 96bb4a6 Browse repository at this point Fix empty state dark border jaygeorge committed 8ed11aaView commit detailsCopy full SHA for 8ed11aa Browse repository at this point Ranking field - add an 'ordered' state jaygeorge committed 9433d57View commit detailsCopy full SHA for 9433d57 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed e04391cView commit detailsCopy full SHA for e04391c Browse repository at this point underlying yes/no fieldtype shouldn't be visible in form builder Show description for 890d3b0 duncanmcclean committed 890d3b0View commit detailsCopy full SHA for 890d3b0 Browse repository at this point Commits on Jun 18, 2026 [6.x] Fix the stars rating field rendering (#14820) Show description for 9db3d8d jaygeorge andduncanmcclean authored 9db3d8dView commit detailsCopy full SHA for 9db3d8d Browse repository at this point Commits on Jun 19, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6ba903dView commit detailsCopy full SHA for 6ba903d Browse repository at this point translate form title in all the places duncanmcclean committed 159fcdaView commit detailsCopy full SHA for 159fcda Browse repository at this point Commits on Jun 22, 2026 [6.x] Forms 2: Compressed view (#14853) jaygeorge authored 1717518View commit detailsCopy full SHA for 1717518 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 21b1829View commit detailsCopy full SHA for 21b1829 Browse repository at this point add confirmation modal before deleting field duncanmcclean committed aa8db6dView commit detailsCopy full SHA for aa8db6d Browse repository at this point [6.x] Forms 2: Add "Always hide" option to field logic dropdown (#14859) duncanmcclean authored 57f9f5cView commit detailsCopy full SHA for 57f9f5c Browse repository at this point Commits on Jun 23, 2026 wip duncanmcclean committed d94e62dView commit detailsCopy full SHA for d94e62d Browse repository at this point Commits on Jun 24, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 1e397bbView commit detailsCopy full SHA for 1e397bb Browse repository at this point Commits on Jun 25, 2026 [6.x] Forms 2: Submission Statuses (#14832) Show description for df261ed duncanmcclean andjasonvarga authored df261edView commit detailsCopy full SHA for df261ed Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 2e75c1cView commit detailsCopy full SHA for 2e75c1c Browse repository at this point Commits on Jun 30, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed e4dd0a8View commit detailsCopy full SHA for e4dd0a8 Browse repository at this point adjust initial page logic Show description for 5f81608 duncanmcclean committed 5f81608View commit detailsCopy full SHA for 5f81608 Browse repository at this point [6.x] Forms 2: Site Filter (#14902) duncanmcclean authored 47f7905View commit detailsCopy full SHA for 47f7905 Browse repository at this point cleanup `data-panels-showing` attribute when unmounting panel layout duncanmcclean committed e090e85View commit detailsCopy full SHA for e090e85 Browse repository at this point avoid publishing `star-rating.css`. the css is inlined now. duncanmcclean committed 9f2b2d2View commit detailsCopy full SHA for 9f2b2d2 Browse repository at this point Commits on Jul 1, 2026 exclude partial submissions from results count on forms listing duncanmcclean committed eff4c77View commit detailsCopy full SHA for eff4c77 Browse repository at this point move `is_informative` out of generic `RendersForms` trait Show description for 07b190f duncanmcclean committed 07b190fView commit detailsCopy full SHA for 07b190f Browse repository at this point Commits on Jul 2, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6e0764aView commit detailsCopy full SHA for 6e0764a Browse repository at this point Merge branch '6.x' into forms-2 jaygeorge committed 9b7ae88View commit detailsCopy full SHA for 9b7ae88 Browse repository at this point [6.x] Forms 2: Field numbering (#14909) duncanmcclean authored 0ac798dView commit detailsCopy full SHA for 0ac798d Browse repository at this point Commits on Jul 3, 2026 Fix architectural lines breaking out of .content, e.g. /collections/create jaygeorge committed 378491cView commit detailsCopy full SHA for 378491c Browse repository at this point Merge remote-tracking branch 'origin/6.x' into forms-2 Show description for bbea10d jasonvarga committed bbea10dView commit detailsCopy full SHA for bbea10d Browse repository at this point Small dark mode fix jaygeorge committed e88ad6fView commit detailsCopy full SHA for e88ad6f Browse repository at this point Commits on Jul 6, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 461512dView commit detailsCopy full SHA for 461512d Browse repository at this point fix logic indicator not showing sometimes duncanmcclean committed 3b4eb46View commit detailsCopy full SHA for 3b4eb46 Browse repository at this point include fieldset reference in tooltip duncanmcclean committed 491b44dView commit detailsCopy full SHA for 491b44d Browse repository at this point [6.x] Forms 2: Logic Tree (#14811) Show description for 243b695 jaygeorge andduncanmcclean authored 243b695View commit detailsCopy full SHA for 243b695 Browse repository at this point wip duncanmcclean committed 52798d9View commit detailsCopy full SHA for 52798d9 Browse repository at this point reset active tab in page inspector when selecting the last page duncanmcclean committed be337b9View commit detailsCopy full SHA for be337b9 Browse repository at this point avoid moving fields between pages in logic tree duncanmcclean committed 5739fc4View commit detailsCopy full SHA for 5739fc4 Browse repository at this point Commits on Jul 7, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed de239ddView commit detailsCopy full SHA for de239dd Browse repository at this point Small dark mode badge fix for page logic jaygeorge committed ef8d8feView commit detailsCopy full SHA for ef8d8fe Browse repository at this point Make "delete" icon condition only appear on hover, like the trash icon jaygeorge committed d7f1f57View commit detailsCopy full SHA for d7f1f57 Browse repository at this point Balance page rule with trash icon jaygeorge committed 34aa292View commit detailsCopy full SHA for 34aa292 Browse repository at this point Make "delete" icon condition only appear on hover for field logic too jaygeorge committed 9552b0aView commit detailsCopy full SHA for 9552b0a Browse repository at this point Connect - adjust grid responsively jaygeorge committed eb2005bView commit detailsCopy full SHA for eb2005b Browse repository at this point Merge branch '6.x' into forms-2 jaygeorge committed 381570eView commit detailsCopy full SHA for 381570e Browse repository at this point [6.x] Forms 2: Allow multiple forms when Forms Pro is installed (#14952) Show description for cc7f602 duncanmcclean andclaude authored cc7f602View commit detailsCopy full SHA for cc7f602 Browse repository at this point [6.x] Forms 2: Access (#14950) Show description for 56e9900 duncanmcclean andjasonvarga authored 56e9900View commit detailsCopy full SHA for 56e9900 Browse repository at this point Commits on Jul 8, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 7c9eaa7View commit detailsCopy full SHA for 7c9eaa7 Browse repository at this point [6.x] Forms 2: Multi-page forms & `SubmitForm` action (#14840) Show description for 88a0a19 duncanmcclean andjasonvarga authored 88a0a19View commit detailsCopy full SHA for 88a0a19 Browse repository at this point Commits on Jul 9, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 510cea1View commit detailsCopy full SHA for 510cea1 Browse repository at this point Fix failing test caused by #14959 duncanmcclean committed da09e47View commit detailsCopy full SHA for da09e47 Browse repository at this point [6.x] Forms 2: Tighten form upload validation in `SubmitForm` action (#14964) duncanmcclean authored 4cea062View commit detailsCopy full SHA for 4cea062 Browse repository at this point fix error when submitting a form page containing a fieldset import Show description for 9bb3804 duncanmcclean committed 9bb3804View commit detailsCopy full SHA for 9bb3804 Browse repository at this point Logic tree - improve the way overflow is handled jaygeorge committed 7ef050bView commit detailsCopy full SHA for 7ef050b Browse repository at this point Logic tree - improve full bleed scrolling with a separator jaygeorge committed bc563b2View commit detailsCopy full SHA for bc563b2 Browse repository at this point Logic tree - panel styling jaygeorge committed 90e8d5cView commit detailsCopy full SHA for 90e8d5c Browse repository at this point Logic tree - add a container query like the list view jaygeorge committed 15674b2View commit detailsCopy full SHA for 15674b2 Browse repository at this point Logic tree - separate rules in split panel, like we do in the Edit tab jaygeorge committed b526263View commit detailsCopy full SHA for b526263 Browse repository at this point Fix connector line stacking context jaygeorge committed 9e022c8View commit detailsCopy full SHA for 9e022c8 Browse repository at this point Logic tree - align rules with the page header jaygeorge committed ee555cfView commit detailsCopy full SHA for ee555cf Browse repository at this point Logic tree - When an item is selected, highlight its connection jaygeorge committed fe40316View commit detailsCopy full SHA for fe40316 Browse repository at this point [6.x] Forms 2: Remember panel widths (#14968) jackmcdade authored 369d2d7View commit detailsCopy full SHA for 369d2d7 Browse repository at this point Logic tree - dim the connection arrow of unselected columns too jaygeorge committed e98a704View commit detailsCopy full SHA for e98a704 Browse repository at this point Merge branch '6.x' into forms-2 jasonvarga committed 0d0a2cfView commit detailsCopy full SHA for 0d0a2cf Browse repository at this point Commits on Jul 10, 2026 [6.x] Forms 2: ✨ Move the panel to the side for /logic > tree view (#14969) Show description for 769cf0b jaygeorge andduncanmcclean authored 769cf0bView commit detailsCopy full SHA for 769cf0b Browse repository at this point fix adding field logic in list mode duncanmcclean committed 668ce1cView commit detailsCopy full SHA for 668ce1c Browse repository at this point [6.x] Logic empty state (#14976) jaygeorge authored 1791060View commit detailsCopy full SHA for 1791060 Browse repository at this point [6.x] Forms 2: Fix false dirty state when opening field inspector in Logic Tree view (#14977) duncanmcclean authored c4deef3View commit detailsCopy full SHA for c4deef3 Browse repository at this point make text in paragraph fieldtype mandatory duncanmcclean committed 4ff2828View commit detailsCopy full SHA for 4ff2828 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed e02192fView commit detailsCopy full SHA for e02192f Browse repository at this point Merge branch '6.x' into forms-2 Show description for 6fe3804 jasonvarga committed 6fe3804View commit detailsCopy full SHA for 6fe3804 Browse repository at this point [6.x] Forms 2: Permissions (#14957) Show description for 4df166b authored 4df166bView commit detailsCopy full SHA for 4df166b Browse repository at this point Commits on Jul 13, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed d7f3217View commit detailsCopy full SHA for d7f3217 Browse repository at this point Add form builder empty state help text jackmcdade committed 316c1a2View commit detailsCopy full SHA for 316c1a2 Browse repository at this point Commits on Jul 14, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed b48ceeeView commit detailsCopy full SHA for b48ceee Browse repository at this point Space headings a little more jaygeorge committed b194775View commit detailsCopy full SHA for b194775 Browse repository at this point Half way jaygeorge committed 3ba0eb4View commit detailsCopy full SHA for 3ba0eb4 Browse repository at this point Stop graph paper lines going through titles jaygeorge committed 2dea0aaView commit detailsCopy full SHA for 2dea0aa Browse repository at this point Align empty message with top row jaygeorge committed 7a59b13View commit detailsCopy full SHA for 7a59b13 Browse repository at this point Commits on Jul 15, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 5d917a3View commit detailsCopy full SHA for 5d917a3 Browse repository at this point use `v-else` instead duncanmcclean committed 4290b17View commit detailsCopy full SHA for 4290b17 Browse repository at this point indent duncanmcclean committed 9335d5fView commit detailsCopy full SHA for 9335d5f Browse repository at this point Correct sidebar calculations by accounting for container padding jaygeorge committed 90d32f4View commit detailsCopy full SHA for 90d32f4 Browse repository at this point Skew panels right jaygeorge committed c8915a3View commit detailsCopy full SHA for c8915a3 Browse repository at this point Skew panels right jaygeorge committed c4256f4View commit detailsCopy full SHA for c4256f4 Browse repository at this point Panels - restore middle breakpoint width jaygeorge committed dbd793dView commit detailsCopy full SHA for dbd793d Browse repository at this point Revert "use `v-else` instead" Show description for 5664b3e duncanmcclean committed 5664b3eView commit detailsCopy full SHA for 5664b3e Browse repository at this point Tweak empty message decoration slightly, ready for a larger sidebar with blueprints jaygeorge committed 07bc4f9View commit detailsCopy full SHA for 07bc4f9 Browse repository at this point Commits on Jul 16, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 87d8be6View commit detailsCopy full SHA for 87d8be6 Browse repository at this point Commits on Jul 17, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed c70dd63View commit detailsCopy full SHA for c70dd63 Browse repository at this point ensure extra config options are passed to fieldtypes duncanmcclean committed ce56ae5View commit detailsCopy full SHA for ce56ae5 Browse repository at this point Commits on Jul 20, 2026 copy form fields when duplicating form duncanmcclean committed ea49753View commit detailsCopy full SHA for ea49753 Browse repository at this point add default messages as field placeholders duncanmcclean committed 4c6383bView commit detailsCopy full SHA for 4c6383b Browse repository at this point [6.x] Logic tree leap calculation (#15035) Show description for bc6c992 authored bc6c992View commit detailsCopy full SHA for bc6c992 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 6e0af1cView commit detailsCopy full SHA for 6e0af1c Browse repository at this point avoid dispatching events during initialization duncanmcclean committed 9adc15eView commit detailsCopy full SHA for 9adc15e Browse repository at this point fix nav state getting out of sync with the DOM on page load Show description for 316f2e3 duncanmcclean committed 316f2e3View commit detailsCopy full SHA for 316f2e3 Browse repository at this point Commits on Jul 21, 2026 Merge branch '6.x' into forms-2 jasonvarga committed 5af8300View commit detailsCopy full SHA for 5af8300 Browse repository at this point emit updated when validation rules are added via mutation Show description for 0359e5c jasonvarga andclaude committed 0359e5cView commit detailsCopy full SHA for 0359e5c Browse repository at this point Make current item more consistent with CP buttons jaygeorge committed 8574cedView commit detailsCopy full SHA for 8574ced Browse repository at this point [6.x] Forms 2: Various file upload improvements (#15006) Show description for fa798d0 authored fa798d0View commit detailsCopy full SHA for fa798d0 Browse repository at this point Commits on Jul 22, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed ea115ecView commit detailsCopy full SHA for ea115ec Browse repository at this point Commits on Jul 23, 2026 move translation calls inside getter to avoid boot errors duncanmcclean committed e7b3387View commit detailsCopy full SHA for e7b3387 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed 4774811View commit detailsCopy full SHA for 4774811 Browse repository at this point [6.x] Remove unused form metrics code (#15066) Show description for c316553 duncanmcclean andclaude authored c316553View commit detailsCopy full SHA for c316553 Browse repository at this point Rename Marketplace button jackmcdade committed c40daf8View commit detailsCopy full SHA for c40daf8 Browse repository at this point Add Generate Fake Submission support for all the new form fieldtypes jackmcdade committed 7f2fa3aView commit detailsCopy full SHA for 7f2fa3a Browse repository at this point ensure toggle conditions work correctly duncanmcclean committed 660175eView commit detailsCopy full SHA for 660175e Browse repository at this point Commits on Jul 31, 2026 Nicer previous page UX jackmcdade committed 99ed81dView commit detailsCopy full SHA for 99ed81d Browse repository at this point Commits on Aug 3, 2026 [6.x] Forms 2: Show option dropdown when adding logic against Image Choice fields (#15096) duncanmcclean authored 1460605View commit detailsCopy full SHA for 1460605 Browse repository at this point Commits on Aug 5, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 9aca449View commit detailsCopy full SHA for 9aca449 Browse repository at this point Commits on Aug 6, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed fbe2f7cView commit detailsCopy full SHA for fbe2f7c Browse repository at this point Commits on Aug 7, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6d9762cView commit detailsCopy full SHA for 6d9762c Browse repository at this point refactor information/structure check duncanmcclean committed 9b68d22View commit detailsCopy full SHA for 9b68d22 Browse repository at this point move page logic to action inspector duncanmcclean committed da24576View commit detailsCopy full SHA for da24576 Browse repository at this point Commits on Aug 10, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 3027011View commit detailsCopy full SHA for 3027011 Browse repository at this point Add scroll margin to pagination too jaygeorge committed b6decd9View commit detailsCopy full SHA for b6decd9 Browse repository at this point move logic icon next to actions duncanmcclean committed 3a0261aView commit detailsCopy full SHA for 3a0261a Browse repository at this point validate against numbers in names duncanmcclean committed 9f9602fView commit detailsCopy full SHA for 9f9602f Browse repository at this point Commits on Aug 12, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed b2795adView commit detailsCopy full SHA for b2795ad Browse repository at this point Commits on Aug 13, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 3c8816eView commit detailsCopy full SHA for 3c8816e Browse repository at this point Commits on Aug 14, 2026 [6.x] Forms 2: Extract star rating, ranking and image choice into UI components (#15068) Show description for 291bb65 duncanmcclean andjackmcdade authored 291bb65View commit detailsCopy full SHA for 291bb65 Browse repository at this point Commits on Aug 17, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 8e0eb96View commit detailsCopy full SHA for 8e0eb96 Browse repository at this point [6.x] Forms 2: Temporary file upload fixes (#15206) Show description for c0b4163 duncanmcclean andclaude authored c0b4163View commit detailsCopy full SHA for c0b4163 Browse repository at this point [6.x] Forms 2: Generate field handles from labels (#15203) Show description for 25266cc duncanmcclean andclaude authored 25266ccView commit detailsCopy full SHA for 25266cc Browse repository at this point Commits on Aug 18, 2026 move handle below label/heading field in banner/heading/paragraph fieldtypes duncanmcclean committed 62d35c2View commit detailsCopy full SHA for 62d35c2 Browse repository at this point Commits on Aug 24, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 04ed9b0View commit detailsCopy full SHA for 04ed9b0 Browse repository at this point formatting duncanmcclean committed 7f90033View commit detailsCopy full SHA for 7f90033 Browse repository at this point Commits on Aug 26, 2026 [6.x] Forms 2: Respect min/max when generating fake integer values (#15276) Show description for 94b0fb0 duncanmcclean andclaude authored 94b0fb0View commit detailsCopy full SHA for 94b0fb0 Browse repository at this point Merge branch '6.x' into forms-2 duncanmcclean committed d1b353fView commit detailsCopy full SHA for d1b353f Browse repository at this point Commits on Aug 27, 2026 Merge remote-tracking branch 'origin/6.x' into forms-2 jasonvarga committed cad71daView commit detailsCopy full SHA for cad71da Browse repository at this point Commits on Aug 28, 2026 [6.x] Forms 2: Ensure `FormSubmissionsController` follows conventions (#15300) duncanmcclean authored dbcdd6fView commit detailsCopy full SHA for dbcdd6f Browse repository at this point Commits on Aug 31, 2026 Merge branch '6.x' into forms-2 duncanmcclean committed 6dcfee8View commit detailsCopy full SHA for 6dcfee8 Browse repository at this point [6.x] Forms 2: Catch untranslated strings (#15315) Show description for 2b62ccb duncanmcclean andclaude authored 2b62ccbView commit detailsCopy full SHA for 2b62ccb Browse repository at this point Footer © 2026 GitHub, Inc. Footer navigation Terms Privacy Security Status Community Docs Contact You can’t perform that action at this time.