Commit Graph

3952 Commits

Author SHA1 Message Date
Jason Zimdars f413e19508 Prefer Account.sole 2025-07-22 22:45:23 -05:00
Jason Zimdars 785de2f0cb Whitespace 2025-07-22 22:42:36 -05:00
Jason Zimdars 88dae3b0db Didn't end up needing this 2025-07-21 20:16:48 -05:00
Jason Zimdars 0afc738d19 Whitespace 2025-07-21 20:11:03 -05:00
Jason Zimdars f6d8d3021d Add controller test 2025-07-21 20:06:41 -05:00
Jason Zimdars 2593fe2221 DRY 2025-07-21 19:58:11 -05:00
Jason Zimdars 97022be929 Clean up 2025-07-21 19:01:48 -05:00
Jason Zimdars 211403f584 Remove debug 2025-07-21 18:49:29 -05:00
Jason Zimdars 9b6995194c Break sooner, use switch 2025-07-21 18:49:18 -05:00
Jason Zimdars 5cb2d46768 Merge branch 'main' into web-push
* main:
  Move fix to the existing btn--circle class
  Don't justify content for avatar buttons to make FF happy
  Use smaller action size on mobile
  Nudge position when mini
  Remove aspect ratio for closed stamps
  Put animated popups within cascade layer
  Dry up utility classes for popup__group
  Inline padding for popup__items, not popup__groups
  Same padding for all popup__items
  popup__items full-width by default
  Remove redundant flex-grow class from popup__items
  Set min-width on popup__items
2025-07-21 18:27:41 -05:00
Jason Zimdars c3b946c961 Design flow for enabling push and the various status that go with it 2025-07-21 18:27:31 -05:00
Andy Smith b06bf8bd12 Merge pull request #779 from basecamp/ff-avatar-fix
Don't justify content for avatar buttons to make FF happy
2025-07-21 17:02:25 -05:00
Andy Smith a0ae6dccd6 Move fix to the existing btn--circle class 2025-07-21 16:57:44 -05:00
Andy Smith 7db9d972aa Don't justify content for avatar buttons to make FF happy 2025-07-21 16:53:52 -05:00
Andy Smith 464aec4827 Merge pull request #777 from basecamp/stamp-alignment
Stamp alignment
2025-07-21 16:39:39 -05:00
Andy Smith fe1c166239 Merge pull request #778 from basecamp/event-header-actions-on-mobile
Use smaller action size on mobile
2025-07-21 16:33:31 -05:00
Andy Smith ed0492e2f4 Use smaller action size on mobile 2025-07-21 16:30:56 -05:00
Andy Smith a49c97ad1c Nudge position when mini 2025-07-21 16:15:04 -05:00
Andy Smith 2cc9a40372 Remove aspect ratio for closed stamps 2025-07-21 16:09:43 -05:00
Andy Smith 7315a94872 Merge pull request #776 from basecamp/popup-alignment
Popup alignment
2025-07-21 14:42:51 -05:00
Andy Smith 06c2e6d0aa Put animated popups within cascade layer 2025-07-21 14:03:15 -05:00
Andy Smith 67df61b57d Dry up utility classes for popup__group 2025-07-21 13:59:33 -05:00
Andy Smith ace44d709e Inline padding for popup__items, not popup__groups 2025-07-21 13:40:59 -05:00
Andy Smith 7e0df47c8f Same padding for all popup__items 2025-07-21 13:38:08 -05:00
Andy Smith 37cc6a6955 popup__items full-width by default 2025-07-21 13:37:33 -05:00
Andy Smith d3db752f39 Remove redundant flex-grow class from popup__items 2025-07-21 13:35:24 -05:00
Andy Smith 1e62ae8c94 Set min-width on popup__items 2025-07-21 13:32:56 -05:00
Jason Zimdars 5fb0353660 Update Gemfile.lock 2025-07-21 11:05:41 -05:00
Jason Zimdars a6e9e51071 Merge branch 'main' into web-push
* main: (28 commits)
  Clean up the /scripts directory
  Prevent recursion when invoking AI
  Bump sqlite3 from 2.7.2 to 2.7.3
  Port over Jeremy's fix for slow uploads
  .gitignore log files and portfolio's local storage
  Drop Current.account and just use Account.sole
  Use the utf8-patched mysql driver
  Call blob.preview for previewable attachments
  Make sure the image variants we use are preprocessed
  Add /user command
  Make sure it doesn't infer custom abbreviations when matching user names
  Script to load prod db in development
  Update Signup to use the queenbee_id for the tenant name
  Bump cache version
  Make sure it uses latest bundler to prevent error due to mismatch
  Invalidate cache
  Update ruby
  Update bundler to prevent error on lower version
  Update bundler to prevent error on lower version
  Resolve stages
  ...
2025-07-21 11:03:56 -05:00
Mike Dalessio 238f53e127 Merge pull request #775 from basecamp/flavorjones/clean-up-scripts-dir
Clean up the /scripts directory
2025-07-21 10:43:47 -04:00
Mike Dalessio db6b700da8 Clean up the /scripts directory
Not removing anything, just organizing scripts into subdirectories to
make it a bit more readable.
2025-07-21 09:07:15 -04:00
Jorge Manrubia f4ad46fe29 Merge pull request #774 from basecamp/prevent-ai-recursion
Prevent recursion when invoking AI
2025-07-21 10:39:59 +02:00
Jorge Manrubia 2cd4dd8709 Prevent recursion when invoking AI
This can result in stack overflow errors for missing commands.

https://fizzy.37signals.com/5986089/collections/7/cards/1135

Follow up to https://github.com/basecamp/fizzy/pull/766
2025-07-21 10:25:26 +02:00
Mike Dalessio 7a1b90c0d7 Merge pull request #768 from basecamp/dependabot/bundler/sqlite3-2.7.3
Bump sqlite3 from 2.7.2 to 2.7.3
2025-07-20 14:13:55 -04:00
dependabot[bot] d91e9a2804 Bump sqlite3 from 2.7.2 to 2.7.3
Bumps [sqlite3](https://github.com/sparklemotion/sqlite3-ruby) from 2.7.2 to 2.7.3.
- [Release notes](https://github.com/sparklemotion/sqlite3-ruby/releases)
- [Changelog](https://github.com/sparklemotion/sqlite3-ruby/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/sqlite3-ruby/compare/v2.7.2...v2.7.3)

---
updated-dependencies:
- dependency-name: sqlite3
  dependency-version: 2.7.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-07-20 18:07:09 +00:00
Mike Dalessio ebff2ca98e Merge pull request #773 from basecamp/flavorjones/long-direct-upload-expiry
Port over Jeremy's fix for slow uploads
2025-07-20 13:23:19 -04:00
Mike Dalessio 0a92fc3a16 Port over Jeremy's fix for slow uploads
ref: https://fizzy.37signals.com/5986089/collections/7/cards/944
2025-07-20 13:19:53 -04:00
Mike Dalessio af1aeca1c6 Merge pull request #772 from basecamp/flavorjones/unwind-current-account
Drop Current.account and just use Account.sole
2025-07-20 13:13:00 -04:00
Mike Dalessio ae22456365 .gitignore log files and portfolio's local storage 2025-07-20 13:11:43 -04:00
Mike Dalessio 8e13ce5b78 Drop Current.account and just use Account.sole
I had reintroduced this in dacb53b8 after David removed it in
6bbf68a4, but now I agree we don't need it.

Also, fix a CORS error when trying to redirect a user to an untenanted
path after login (see
https://fizzy.37signals.com/5986089/collections/2/cards/1032).
2025-07-20 13:00:09 -04:00
Mike Dalessio 68dbe2f42e Merge pull request #771 from basecamp/flavorjones/fix-encoding
Use the utf8-patched mysql driver
2025-07-19 11:07:29 -04:00
Mike Dalessio 0961fa6ac9 Use the utf8-patched mysql driver
ref: https://fizzy.37signals.com/5986089/collections/2/cards/1143
2025-07-19 11:05:51 -04:00
Mike Dalessio b3301cff81 Merge pull request #770 from basecamp/flavorjones/fix-previewable
Call blob.preview for previewable attachments
2025-07-19 09:21:29 -04:00
Mike Dalessio 692e563d3f Call blob.preview for previewable attachments
undoing a mistake introduced in ef6198d3
2025-07-19 09:08:59 -04:00
Mike Dalessio 8b544e6404 Merge pull request #767 from basecamp/flavorjones/active-storage-variants
Make sure the image variants we use are preprocessed
2025-07-18 16:25:31 -04:00
Mike Dalessio ef6198d394 Make sure the image variants we use are preprocessed
to avoid implicitly creating a variant during a GET to a read replica,
which will raise an exception and cause the image to fail to load.

This feels pretty brittle, to be honest, and we'll need to be careful
in the future about creating and using new variants; we will probably
need to backfill the new variant for existing images because we can't
guarantee that they will be created implicitly/lazily if the GET lands
on the replica.

ref: https://fizzy.37signals.com/5986089/collections/7/cards/942
2025-07-18 15:43:31 -04:00
Jorge Manrubia ab53523270 Merge pull request #766 from basecamp/go-to-user-command
Add /user command
2025-07-18 17:59:52 +02:00
Jorge Manrubia 39c7a54ad6 Add /user command
The LLM was relying on it. Having it missing resulted in a stack overflow error!

https://fizzy.37signals.com/5986089/collections/7/cards/1135
2025-07-18 17:59:02 +02:00
Jorge Manrubia 0fedb001be Merge pull request #765 from basecamp/resolving-jz
Make sure it doesn't infer custom abbreviations when matching user names
2025-07-18 17:34:20 +02:00
Jorge Manrubia 921db25646 Make sure it doesn't infer custom abbreviations when matching user names 2025-07-18 17:31:19 +02:00