c4ca5d34e4
Allow cards to be moved to another collection
2025-05-29 21:41:29 -05:00
0fce31eba8
Merge branch 'jz-5-29-25-pm'
...
* jz-5-29-25-pm:
Don't color closed golden cards
2025-05-29 16:50:46 -05:00
9228337c52
Don't color closed golden cards
2025-05-29 16:49:57 -05:00
9135d13f76
Update to latest
2025-05-29 23:38:55 +02:00
f863ced9dd
Merge branch 'main' into jz-5-29-25
...
* main:
Use consistent rem margins
2025-05-29 16:28:15 -05:00
88a54a246d
Need to convert to srgb color space when using oklch colors in Safari
...
No idea why
2025-05-29 16:24:17 -05:00
9efdf3385c
Merge pull request #546 from basecamp/rich-text-margins
...
Use consistent rem margins
2025-05-29 16:14:45 -05:00
6738d3a365
Don't go too hard, we want related cards highlighting to still work
2025-05-29 16:12:11 -05:00
c974127a76
Merge branch 'main' into jz-5-28-25
...
* main:
Update to latest
Update lexical to fix hangs when creating cards
2025-05-29 15:30:40 -05:00
9052b76c39
Indicate golden cards in activity
2025-05-29 15:30:17 -05:00
80c78ea56f
Update to latest
2025-05-29 22:30:09 +02:00
8911fb71c5
Merge pull request #547 from basecamp/fix-hang
...
Update lexical to fix hangs when creating cards
2025-05-29 22:26:09 +02:00
dec696b64f
Update lexical to fix hangs when creating cards
2025-05-29 22:25:37 +02:00
81eb1e6fa3
Tighten spacing, try a subtle texture
2025-05-29 15:17:51 -05:00
71cfa95308
Use consistent rem margins
2025-05-29 14:37:56 -05:00
613a877f7f
Merge branch 'main' into jz-5-28-25
...
* main: (58 commits)
Safari doesn't support CSS `field-sizing: content` so we can shim it for now
Hide bubbles in trays
update lexical
update lexical
Update script to deal with duplicated records
Revert "Revert "Replace House with Lexical""
Revert "Replace House with Lexical"
Update actiontext lexical
Remove trace
Update lexical
Use existing method
Update lexical
Fix merge issues
Format
Cleanup
Format
Make tests pass with action text
Don't choke when rendering commands where the card was deleted
Update lexical
Simple format excerpts in activity
...
2025-05-29 14:21:17 -05:00
32ae94524a
Safari doesn't support CSS field-sizing: content so we can shim it for now
2025-05-29 14:19:48 -05:00
6a88655ed1
Merge pull request #544 from basecamp/no-bubbles-in-trays
...
Hide bubbles in trays
2025-05-29 13:38:17 -05:00
e0accd0fd4
Hide bubbles in trays
2025-05-29 13:37:07 -05:00
0e5bb87bc6
update lexical
2025-05-29 16:33:04 +02:00
f405c364ac
update lexical
2025-05-29 16:31:16 +02:00
b4c9945582
Merge pull request #543 from basecamp/revert-542-revert-531-lexical
...
Revert "Revert "Replace House with Lexical""
2025-05-29 15:55:32 +02:00
ee3a9503cd
Update script to deal with duplicated records
...
We are not enforcing unique keys for markdowns, and we have some dups
2025-05-29 15:44:43 +02:00
fa04016cbe
Revert "Revert "Replace House with Lexical""
2025-05-29 14:25:16 +02:00
223e589169
Merge pull request #542 from basecamp/revert-531-lexical
...
Revert "Replace House with Lexical"
2025-05-29 14:22:40 +02:00
08d8b2e5ff
Revert "Replace House with Lexical"
2025-05-29 14:22:27 +02:00
ba54ed6104
Merge pull request #531 from basecamp/lexical
...
Replace House with Lexical
2025-05-29 14:15:52 +02:00
c1f1183bb0
Update actiontext lexical
2025-05-29 13:39:15 +02:00
f00fffe801
Remove trace
2025-05-29 13:34:16 +02:00
0acfe2bcb7
Update lexical
2025-05-29 13:32:38 +02:00
6d88975d46
Use existing method
2025-05-29 13:07:20 +02:00
1e18fa87a9
Update lexical
2025-05-29 13:01:29 +02:00
6c8c9d30d1
Fix merge issues
2025-05-29 12:51:12 +02:00
1f051896a1
Format
2025-05-29 12:51:08 +02:00
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
9287d03d78
Cleanup
2025-05-29 12:39:14 +02:00
34eb8f1672
Format
2025-05-29 12:38:07 +02:00
ecf82d8703
Make tests pass with action text
2025-05-29 12:37:16 +02:00
3eeba253ad
Don't choke when rendering commands where the card was deleted
2025-05-29 00:39:17 +02:00
515cb2afd2
Update lexical
2025-05-29 00:38:16 +02:00
a69dbdafe1
Simple format excerpts in activity
2025-05-28 17:18:20 -05:00
4c88c192f9
Update lexical
2025-05-28 23:21:05 +02:00
594161b982
Make autosave work with lexical
2025-05-28 23:20:24 +02:00
f04cbf44de
Fix event comment horizontal alignment
...
- No need to expose reactions here, either
2025-05-28 16:13:42 -05:00
2594bf90a7
Bye house!
2025-05-28 22:36:43 +02:00
d1f01182f2
Update tests
2025-05-28 15:32:00 -05:00
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
f17742fdc2
Merge pull request #539 from basecamp/flavorjones/add-assertions-20250528
...
test: add missing assertions
2025-05-28 12:14:41 -04:00
224fb1893e
Can't reliably use percentages here
2025-05-28 11:13:59 -05:00
1262285181
test: add missing assertions
2025-05-28 12:13:40 -04:00
Jason Zimdars