Guillem Arias 926d71c74a Merge origin/main into feat/goals-v2-architecture ...

Resolved conflicts:
- db/schema.rb: take main's schema version (later migration timestamp);
  goals + debug_log_entries tables both present.
- app/views/categories/_form.html.erb: keep branch's shared
  color-icon-picker controller action; adopt main's t('.auto_adjust') i18n.

2026-05-20 21:41:47 +02:00

..

_badge_mobile.html.erb

Implement holdings for lunch flow (#590)

2026-01-09 13:14:14 +01:00

_badge.html.erb

Prevent long category labels from overflowing or crowding adjacent controls (#1498)

2026-04-19 18:40:50 +02:00

_category_list_group.html.erb

Standardize corners, backgrounds, and borders (#2271)

2025-05-21 10:28:56 -04:00

_category_name_mobile.html.erb

Prevent long category labels from overflowing or crowding adjacent controls (#1498)

2026-04-19 18:40:50 +02:00

_category.html.erb

Prevent long category labels from overflowing or crowding adjacent controls (#1498)

2026-04-19 18:40:50 +02:00

_color_avatar.html.erb

feat(goals): extract shared color_icon_picker controller; add icon to goals; tinted avatar

2026-05-11 21:28:23 +02:00

_form.html.erb

Merge origin/main into feat/goals-v2-architecture

2026-05-20 21:41:47 +02:00

_menu.html.erb

feat(design-system): split DS::Menu into strict action-list + new DS::Popover (#1850)

2026-05-20 18:30:25 +02:00

edit.html.erb

Component namespacing (#2463)

2025-07-18 08:30:00 -04:00

index.html.erb

feat(i18n): extract hardcoded English strings to locale files (#1806)

2026-05-17 09:52:49 +02:00

new.html.erb

Component namespacing (#2463)

2025-07-18 08:30:00 -04:00