Commit Graph

2896 Commits

Author SHA1 Message Date
Jorge Manrubia 08d8b2e5ff Revert "Replace House with Lexical" 2025-05-29 14:22:27 +02:00
Jorge Manrubia ba54ed6104 Merge pull request #531 from basecamp/lexical
Replace House with Lexical
2025-05-29 14:15:52 +02:00
Jorge Manrubia c1f1183bb0 Update actiontext lexical 2025-05-29 13:39:15 +02:00
Jorge Manrubia f00fffe801 Remove trace 2025-05-29 13:34:16 +02:00
Jorge Manrubia 0acfe2bcb7 Update lexical 2025-05-29 13:32:38 +02:00
Jorge Manrubia 6d88975d46 Use existing method 2025-05-29 13:07:20 +02:00
Jorge Manrubia 1e18fa87a9 Update lexical 2025-05-29 13:01:29 +02:00
Jorge Manrubia 6c8c9d30d1 Fix merge issues 2025-05-29 12:51:12 +02:00
Jorge Manrubia 1f051896a1 Format 2025-05-29 12:51:08 +02:00
Jorge Manrubia 62bef018ea Merge branch 'main' into lexical
* main:
  Don't choke when rendering commands where the card was deleted
  Update tests
  Rework system events
  test: add missing assertions
  dep: bump active_record-tenanted to fix URI support
  Remove hyphen from "Un-do"
  Prevent default when handling keyboard shortcuts
  dep: update AR::Tenanted to support database URIs
  Detect platform and label the correct hotkey shortcut
  Things got too tight
  Don't require TLS for Beamer at the moment
  dep: update dependencies

# Conflicts:
#	Gemfile
#	Gemfile.lock
#	app/assets/stylesheets/comments.css
2025-05-29 12:44:14 +02:00
Jorge Manrubia 9287d03d78 Cleanup 2025-05-29 12:39:14 +02:00
Jorge Manrubia 34eb8f1672 Format 2025-05-29 12:38:07 +02:00
Jorge Manrubia ecf82d8703 Make tests pass with action text 2025-05-29 12:37:16 +02:00
Jorge Manrubia 3eeba253ad Don't choke when rendering commands where the card was deleted 2025-05-29 00:39:17 +02:00
Jorge Manrubia 515cb2afd2 Update lexical 2025-05-29 00:38:16 +02:00
Jason Zimdars a69dbdafe1 Simple format excerpts in activity 2025-05-28 17:18:20 -05:00
Jorge Manrubia 4c88c192f9 Update lexical 2025-05-28 23:21:05 +02:00
Jorge Manrubia 594161b982 Make autosave work with lexical 2025-05-28 23:20:24 +02:00
Jorge Manrubia 2594bf90a7 Bye house! 2025-05-28 22:36:43 +02:00
Jason Zimdars d1f01182f2 Update tests 2025-05-28 15:32:00 -05:00
Jason Zimdars c6c9e0d5fc Rework system events
- Restyle system events so they don't look like comments and aren't attributed to the system user
- Ensure the event creator is included in the description so it's clear who did it.
- Walk back system comment replacement. Yes, it potentially avoids embarassing people when they change their mind, it's also losing data. If two intentional assigments happen in proximity, we've been only showing the latest one,.
2025-05-28 15:26:41 -05:00
Mike Dalessio f17742fdc2 Merge pull request #539 from basecamp/flavorjones/add-assertions-20250528
test: add missing assertions
2025-05-28 12:14:41 -04:00
Jason Zimdars 224fb1893e Can't reliably use percentages here 2025-05-28 11:13:59 -05:00
Mike Dalessio 1262285181 test: add missing assertions 2025-05-28 12:13:40 -04:00
Jason Zimdars adc84a7054 Improve color associations, add a few more types 2025-05-28 11:13:00 -05:00
Jason Zimdars 5e2c1c3501 Add a little more pizzazz to file icons 2025-05-28 10:26:32 -05:00
Mike Dalessio 71081c0ab0 Merge pull request #538 from basecamp/flavorjones/fix-uri-support
dep: bump active_record-tenanted to fix URI support
2025-05-28 11:13:23 -04:00
Mike Dalessio 8e873693bb dep: bump active_record-tenanted to fix URI support 2025-05-28 11:12:16 -04:00
Jason Zimdars d767e158bb Update Lexical 2025-05-28 09:31:06 -05:00
Jason Zimdars b50a6e57b6 Typo 2025-05-28 09:29:44 -05:00
Jason Zimdars f62c986a22 Tighten blocks, add explicit spacing 2025-05-28 09:29:13 -05:00
Kevin McConnell 50e2085e8b Remove hyphen from "Un-do" 2025-05-28 13:58:26 +01:00
Kevin McConnell e4e31b4557 Merge pull request #537 from basecamp/prevent-default-hotkey-action
Prevent default when handling keyboard shortcuts
2025-05-28 08:24:45 +01:00
Kevin McConnell 880e3d98b2 Prevent default when handling keyboard shortcuts
Without this, any default action would still happen. With Chrome on
Linux, that causes browser features to be triggered with our CTRL+J and
CTRL+K actions.
2025-05-28 08:18:49 +01:00
Jason Zimdars fc0d0cd300 Style non-previewable attachment in editor and rendered 2025-05-27 22:21:58 -05:00
Jason Zimdars bdbd556560 Center and allow natural width 2025-05-27 14:55:25 -05:00
Mike Dalessio 75b7935185 Merge pull request #536 from basecamp/flavorjones/bump-ar-tenanted-20250527
dep: update AR::Tenanted to support database URIs
2025-05-27 14:20:49 -04:00
Mike Dalessio 5f63bc6809 dep: update AR::Tenanted to support database URIs
ref: https://37s.fizzy.37signals.com/collections/7/cards/649
2025-05-27 14:18:39 -04:00
Jason Zimdars c42395a3ab Merge branch 'main' into jz-5-26-25
* main:
  Detect platform and label the correct hotkey shortcut
2025-05-27 12:15:50 -05:00
Jason Zimdars d17134cb5c Detect platform and label the correct hotkey shortcut
Yes, Platform Agent is overkill for just this but there isn't a one-size JS solution for updating both input placeholders and other HTML text and we're likely to need it later for other things like displaying platform-specific PWA prompts.
2025-05-27 12:14:24 -05:00
Jason Zimdars 7f497cf109 Merge branch 'main' into jz-5-26-25
* main:
  Don't require TLS for Beamer at the moment
2025-05-27 11:27:25 -05:00
Jorge Manrubia 7eaba8b835 Update 2025-05-27 13:30:09 +02:00
Jorge Manrubia 108f711d1f Inline missing helper 2025-05-27 12:55:09 +02:00
Jorge Manrubia 393205a132 Update lexical 2025-05-27 12:45:00 +02:00
Jorge Manrubia 41acd15fa4 Update lexical 2025-05-27 12:31:46 +02:00
Jorge Manrubia 4aa1cef99d Show previeable content in the editor
Embedded PDF previewing isnt' reliable (not working in Safari with active storage). Instead
let's align the editor with Active Storage previews and support pdf previews
2025-05-27 12:30:44 +02:00
Jason Zimdars b2509ce806 Fix a couple of spacing wonks 2025-05-26 17:28:08 -05:00
Jason Zimdars c32c6af765 Style caption input 2025-05-26 17:21:02 -05:00
Jason Zimdars 7ef8e2f041 Align progress bar 2025-05-26 17:15:11 -05:00
Jason Zimdars e2b3374971 Update dependency 2025-05-26 17:02:06 -05:00