Commit Graph

1472 Commits

Author SHA1 Message Date
Jorge Manrubia 05fc73e2ae Merge pull request #334 from basecamp/user-admins
Add admin role and animate admin toggle
2025-04-04 08:29:03 +02:00
Mike Dalessio 72d2728768 dep: bundle update
Notably:

- rails e9d7ca5e → e0452e80
- active_record-tenanted to pick up `db:drop` support
2025-04-03 21:39:39 -04:00
Andy Smith a94929d47d Merge pull request #349 from basecamp/image-icon-fix
Fix image icons
2025-04-03 17:57:23 -05:00
Andy Smith 2d2a38a40a Fix image icons 2025-04-03 17:56:55 -05:00
Jason Zimdars ffc31e460f Revert "Merge pull request #345 from basecamp/cascade-layers"
This reverts commit 01e7301327, reversing
changes made to 832134385a.
2025-04-03 17:42:26 -05:00
Jason Zimdars 9de705d6d4 Merge pull request #310 from basecamp/notif-all
Allow setting collection notifications to "everything", "watching" or "nothing".
2025-04-03 17:16:11 -05:00
Jason Zimdars 4734ae5b61 Fine tune notifications states 2025-04-03 17:07:18 -05:00
Jason Zimdars 48c04c416d Merge branch 'main' into notif-all
* main:
  Extract a couple components
  Add cascade layers to all CSS files
2025-04-03 15:48:32 -05:00
Andy Smith 01e7301327 Merge pull request #345 from basecamp/cascade-layers
Cascade layers
2025-04-03 11:39:18 -05:00
Andy Smith 7e2c4176b3 Merge branch 'main' into cascade-layers
* main:
  Fix merge issues
  Reload stages with morphing too
  Make frames reload compatible with page refreshes to avoid flickering
  Persist terminal turbo frame across navigations
  Enable page refreshes with morphing
  Rework the flow for closing and moving between columns
2025-04-03 11:35:58 -05:00
Jorge Manrubia c02262867e Fix merge issue 2025-04-03 17:45:11 +02:00
Jorge Manrubia 84c4003b67 Remove morphing since it's not compatible with House 2025-04-03 17:43:31 +02:00
Jorge Manrubia e07bd966f5 Enable morphing so that we get smooth page refreshes when redirecting back 2025-04-03 17:43:31 +02:00
Jorge Manrubia cfe91c25c9 Add admin role, make sure only admins can remove and promote other users 2025-04-03 17:43:29 +02:00
Kevin McConnell 7eee5ce705 Remove empty helper 2025-04-03 16:37:58 +01:00
Kevin McConnell b1803e9853 Use an icon for the button 2025-04-03 16:37:22 +01:00
Kevin McConnell e7d9259828 Show button on collection page and notif settings 2025-04-03 16:37:20 +01:00
Kevin McConnell 0820badcc3 Add involvement types to accesses
This provides a way to set the level of involvement that a user has with
a collection, and from which we determine the level of notifications to
send. Users can be access-only, watching, or being notified about
everything.

If you're access-only, you won't get an notifications. If you're
watching, you'll only get notifications for the items you're watching
(which includes the items you've been assigned, have commented on, etc).
If you're set to everything you'll get notifications about all activity
in that collection.

This change replaces our previous concept of subscriptions. Where
previously you'd subscribe to a collection to get notifications in it,
now you'll simply set the notification level on your access.
2025-04-03 16:35:13 +01:00
Jorge Manrubia 832134385a Merge pull request #339 from basecamp/enable-morphing
Enable page refreshes with morphing
2025-04-03 11:26:25 +02:00
Jorge Manrubia 75be594534 Fix merge issues 2025-04-03 11:21:46 +02:00
Jorge Manrubia 6c201fed4c Reload stages with morphing too 2025-04-03 11:16:51 +02:00
Jorge Manrubia 4a2e3b6ebb Make frames reload compatible with page refreshes to avoid flickering 2025-04-03 11:16:39 +02:00
Jorge Manrubia c4b92eb7c3 Persist terminal turbo frame across navigations 2025-04-03 11:16:07 +02:00
Jorge Manrubia 5a740a4251 Enable page refreshes with morphing
Update Trix to a compatible version https://github.com/basecamp/house/tree/morphing-2
2025-04-03 11:16:07 +02:00
Jason Zimdars f7e2d04808 Rework the flow for closing and moving between columns 2025-04-02 17:27:34 -05:00
Andy Smith cac95d552c Extract a couple components 2025-04-02 16:28:28 -05:00
Andy Smith e91bda7ffc Add cascade layers to all CSS files 2025-04-02 16:19:56 -05:00
Andy Smith 0545639cdb Merge pull request #342 from basecamp/icon-helper
Icon helper
2025-04-02 16:10:01 -05:00
Andy Smith edf7b60f17 Remove unused class 2025-04-02 14:41:25 -05:00
Andy Smith 1beff6c89d Clean img and svg from buttons.css 2025-04-02 14:41:00 -05:00
Andy Smith 24427644a2 Replace remaining image_tags with icon_tag 2025-04-02 14:38:30 -05:00
Andy Smith 51d907fca3 Replace stray image_tag instances and remove colorize class 2025-04-02 14:32:21 -05:00
Andy Smith b8a1acefd8 Use mask icons everywhere 2025-04-02 14:22:42 -05:00
Andy Smith f662c9aa0f Add mask icon helper 2025-04-02 13:19:51 -05:00
Jorge Manrubia 4bd2a06f31 Merge pull request #341 from basecamp/fix-cache-2
Fix another caching issue
2025-04-02 18:13:27 +02:00
Jorge Manrubia 45fc687ddd Only hide stages for completed cards
We will miss the picker otherwise!
2025-04-02 18:11:39 +02:00
Jorge Manrubia d5d0b02012 Merge pull request #340 from basecamp/cache-fixes
Fix caching issue with cards
2025-04-02 17:57:14 +02:00
Jorge Manrubia c53e9680e8 Fix caching issue 2025-04-02 17:53:16 +02:00
Jason Zimdars 887489b452 Merge pull request #335 from basecamp/two-cols
Two column Collection design
2025-04-02 09:49:43 -05:00
Jason Zimdars 87304f1e27 Merge branch 'main' into two-cols
* main:
  Linting
2025-04-02 09:46:43 -05:00
Jorge Manrubia 6d716fa932 Prevent turbo frames from loading edit forms when previwing cards in collections
To render N cards we were loading 3xN turbo frames. I suspect this makes staging choke.
2025-04-02 11:21:30 +02:00
Jorge Manrubia d2cd20fe5b Add script to populate some buckets and cards 2025-04-02 11:17:23 +02:00
Jorge Manrubia b34e340d2b Merge branch 'main' into two-cols
* main:
  dev: move script from /bin to /script
2025-04-02 08:39:03 +02:00
Jorge Manrubia dfa13e1b70 Merge pull request #338 from basecamp/fix-tests
Fix lint errors
2025-04-02 08:37:48 +02:00
Jorge Manrubia 27229e8f89 Linting 2025-04-02 08:36:34 +02:00
Jason Zimdars 28c7c07030 Whitespace 2025-04-01 15:16:38 -05:00
Jason Zimdars 988fa33b32 Revert unrealized changes 2025-04-01 15:13:21 -05:00
Jason Zimdars c3b4b4821d A few dark mode fixes 2025-04-01 14:52:54 -05:00
Jason Zimdars e87091d206 Wire-up sorting by newest/oldest 2025-04-01 14:09:35 -05:00
Mike Dalessio c5c0ff86ec dev: move script from /bin to /script 2025-04-01 12:14:58 -04:00