Jorge Manrubia
08d8b2e5ff
Revert "Replace House with Lexical"
2025-05-29 14:22:27 +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
Jason Zimdars
a69dbdafe1
Simple format excerpts in activity
2025-05-28 17:18:20 -05:00
Jorge Manrubia
594161b982
Make autosave work with lexical
2025-05-28 23:20:24 +02: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
Kevin McConnell
50e2085e8b
Remove hyphen from "Un-do"
2025-05-28 13:58:26 +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
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
Jorge Manrubia
108f711d1f
Inline missing helper
2025-05-27 12:55:09 +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
62c01627ec
First stab at styles
2025-05-26 14:56:36 -05:00
Jorge Manrubia
7b6b81444b
Minimal styles for non-image attachments
2025-05-23 14:34:16 +02:00
Jorge Manrubia
de87ff9c70
Refine syntax higlighting
2025-05-23 13:28:26 +02:00
Jorge Manrubia
1c41b956a9
Highlight at rendering time too
2025-05-23 13:25:07 +02:00
Jorge Manrubia
85f03b5bf0
Use new default toolbar
2025-05-23 12:40:29 +02:00
Jorge Manrubia
0693617d83
Some initial work to reuse styles with lexical
2025-05-23 11:53:22 +02:00
Jorge Manrubia
10b2aad647
Replace House with lexical-powered actiontext
2025-05-23 11:41:08 +02:00
Jason Zimdars
53c19e8e07
Improve flow for adding stages
...
Previously the new stage form replaced the list, now it properly appends
2025-05-22 21:48:44 -05:00
Jason Zimdars
57f8eff3b8
Merge branch 'main' into jz-5-22-25-am
...
* main:
Accidental
Show user's activity right on their profile screen
2025-05-22 16:23:03 -05:00
Jason Zimdars
7ee65608c9
Show user's activity right on their profile screen
2025-05-22 16:18:28 -05:00
Jason Zimdars
9ae92501f2
Merge branch 'main' into jz-5-22-25-am
...
* main:
Handle single items better
Finishing touches
Relative positioning for trays
WIP
2025-05-22 14:27:00 -05:00
Andy Smith
c3c5b38b84
Finishing touches
2025-05-22 13:36:20 -05:00
Jason Zimdars
f9cae2c43b
Bolder day markers
2025-05-22 13:19:51 -05:00
Andy Smith
a22c69bbc3
Relative positioning for trays
2025-05-22 12:30:15 -05:00
Jason Zimdars
f53f820817
Update edit template to include .comment container and avatar
2025-05-22 11:53:33 -05:00
Andy Smith
cfdaffeecb
Merge branch 'main' into relative-tray
...
* main:
Use link, not button
Add notification settings link
2025-05-22 11:35:58 -05:00
Andy Smith
9a9cb3340b
WIP
2025-05-22 11:01:17 -05:00
Andy Smith
9221251796
Merge pull request #519 from basecamp/notification-settings
...
Add notification settings link
2025-05-22 11:00:53 -05:00
Jason Zimdars
b90d231529
Clear the filter
2025-05-21 22:13:38 -05:00
Jason Zimdars
d79f2f903f
Allow filtering activity by user via user profile
2025-05-21 21:57:58 -05:00
Jason Zimdars
d95838d6c3
Mentions should also include the card id and collection name
2025-05-21 15:50:15 -05:00
Jason Zimdars
18db32569a
Can just call card on Notification now
2025-05-21 15:50:01 -05:00
Jason Zimdars
504946dc54
Events for closed cards should use the closed color
2025-05-21 13:35:37 -05:00
Andy Smith
5d19a1e525
Use link, not button
2025-05-21 11:14:34 -05:00
Jason Zimdars
9779adbdf5
Keep collection context when clearing filters
2025-05-21 11:11:50 -05:00
Andy Smith
d660a484e6
Add notification settings link
2025-05-21 11:11:18 -05:00
Jason Zimdars
efeee8deca
Fix extra space when there is no AI output
2025-05-21 11:01:01 -05:00
Andy Smith
3f873d904e
Fix merge conflicts
2025-05-21 09:49:43 -05:00
Andy Smith
f5dc923b43
Merge branch 'main' into tray-updates
...
* main:
Tighten cards
Stub recently closed filter
Introduce a list style for all but the first six completed cards
2025-05-21 09:49:33 -05:00
Jason Zimdars
f5e3e58be4
Tighten cards
2025-05-20 18:11:18 -05:00
Jason Zimdars
46ca6f13f6
Stub recently closed filter
2025-05-20 16:24:12 -05:00
Andy Smith
5a8da321fe
Merge branch 'main' into tray-updates
2025-05-20 15:58:30 -05:00
Andy Smith
5c5b2e03af
Add bouncy animation
2025-05-20 15:44:00 -05:00
Jason Zimdars
e5f25b8d39
Introduce a list style for all but the first six completed cards
2025-05-20 15:43:24 -05:00
Andy Smith
04d01d7d10
Merge notification styles into a card variant
2025-05-20 13:50:53 -05:00
Andy Smith
242869166e
Consolidate Tray styles
2025-05-20 12:17:40 -05:00
Jason Zimdars
84b6a1291f
Fizzy do with AI polish
2025-05-19 17:08:00 -05:00
Andy Smith
e851fe969c
Put timestamp in header
2025-05-19 16:04:14 -05:00
Andy Smith
2bf7ecbd79
Account for different notification types
2025-05-19 15:47:34 -05:00