Resolves merge conflicts by:
- Integrating new Cards::Columns architecture from main
- Preserving collapsible columns functionality
- Maintaining stage-specific doing columns support
- Using new column-based rendering while keeping expanders
🤖 Generated with [Claude Code](https://claude.ai/code)
Co-Authored-By: Claude <noreply@anthropic.com>
* main:
Fix add card not working in the cards screen
Submit and refresh results as you type terms
Fix: When expanding filters, submitting filters should keep the filters expanded
Invalidate cache when filter changes
Switch to gpt-5-chat
Handle filter toggles with JS
Prevent glitch where you see the filter bar expanded when you clear it
Remove unused templates
Fix: all collections link not working after moving to turbo frame
Restore cache I deleted by mistake
Speed up filter expansion with turbo stream
Fix: filtering collections not working after moving menu to turbo frame
Respect params when loading the menu or they won't be reflected!
Add HTTP cache for the menu
Load main menu lazily with a turbo frame
Inline :has(&) as it's REALLY slow in Safari
Extract helper method
Remove transition that is making Safari choke when navigating to Fizzy menus
Reduce page size to reduce load for processing local times on initial page load
Avoid having to parse strings
# Conflicts:
# app/views/cards/index/_add_card_button.html.erb
# test/vcr_cassettes/period_highlight_test-test_don_t_generate_highlights_for_existing_periods.yml
# test/vcr_cassettes/period_highlight_test-test_generate_period_highlights.yml
# test/vcr_cassettes/user/highlights_test-test_don_t_generate_highlights_for_existing_periods.yml
# test/vcr_cassettes/user/highlights_test-test_generate_weekly_highlights.yml
* main:
Add a focus effect when hovering columns
Fix up hotkeys
test: backfill hotkeys helper tests
refactor: remove unused routes associated with "resource :account"
test: backfill account route tests to prepare for refactor
Alphabetically order concerns (#992)
Copy
Don't show the filter if there aren't any tags
Add clearer labels for sorting options
Prevent deleting the last collection
Don't show "All collections" when there's only the default collection
Rename engagement columns
* main: (203 commits)
Re-write help content, try a modal-like display
Move to internal registry
Show date instead of time for notifications older than 1 day
Ensure checks are visible for tags and assignments
Adjust padding so card number isn't cut off
Don't color the collection header in considering
Golden cards bubble to the top of Considering, too
Adjust card collection header when colored golden
Allow cards in Considering to gilded
Hide focus ring on new card titles and step inputs
Add hover effect for comment edit button
Add hover effect to overflow button
Improve multi-account behavior of the PWA
Remove unneeded *
Rename test
Review the code to move cards
Update editor
Generalize and delete mentions too
Remove unused code
Make sure we don't remove accesses if collection is accessible
...
* main: (34 commits)
Opt out of writer affinity on readings controller
Enable VFS, but don't load extension again
Add flash notice when adding another card
Fix tests after updating rails
Fix fixtures after updating gem
Make sure you can't drag drafts
Fix clipped tag selector
Don't miss cards dropped in the same container!
Make sure that only cards in do/considering are draggable
Add test
Add test
Use the same controller for publishing cards and for publishing and adding another
Position Completed stamps better
Bump sentry-rails from 5.24.0 to 5.25.0
Bump rails from `0ac3fba` to `fd49d6a`
Bump sentry-ruby from 5.24.0 to 5.25.0
Add multiple cards quickly
Tweak a little more
Tighter bubbles on small screens
Need a little space in the layout for the drag/drop outline
...
* main: (45 commits)
Fix tests
Rework min card design and meta section for all cards
Move `title` to the `img` element so we get hover in both cases
Remove sorting filter UI
Sort Considering and Doing by `updated_at`
Restore comment action icon
Fix dot escaping container
Seen cards should be flat
Ensure overflow cards are hidden
Arrow needs to match derived color
Dialog target needs to be present
This isn't necessary in the mini card template
Revert "The button and dialog need not render in previews"
Paginate collection cards
Add a rails helper for the new custom stream action
Add test
Reflect picked color automatically with a custom stream action
Simplify conditions to pick up a color
Reuse existing constant
Update fixtures and test
...
Jorge Manrubia