Commit Graph

122 Commits

Author SHA1 Message Date
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
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 10b2aad647 Replace House with lexical-powered actiontext 2025-05-23 11:41:08 +02: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 f9cae2c43b Bolder day markers 2025-05-22 13:19:51 -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 504946dc54 Events for closed cards should use the closed color 2025-05-21 13:35:37 -05:00
Andy Smith b539cd1ed1 Fix tests 2025-05-13 16:39:11 -05:00
Andy Smith 05aa2e3fb9 Merge branch 'main' into activity-dom
* main:
  Just set the clear filter so `restore_collections_filter_from_cookie` can do the right thing
  Refresh local time target when morphed
  Handle case where no params are sent because nothing is checked
  Ensure checkboxes in menus have full size click targets
  Do or die
  Handle collections that do not auto close
  Ensure dates are re-formatted on turbo frame load
2025-05-13 16:28:17 -05:00
Andy Smith 46d013abac Tidy CSS 2025-05-13 16:00:40 -05:00
Andy Smith 23a655130e Fix header width 2025-05-13 15:54:05 -05:00
Andy Smith 6eb5ae3e95 Mobile styles 2025-05-13 15:48:11 -05:00
Andy Smith 32cfba82d9 Finish desktop styles 2025-05-13 14:32:51 -05:00
Andy Smith 49d24feff7 WIP Limited columns 2025-05-13 12:50:34 -05:00
Andy Smith 5c6a53a1bc WIP new sorting 2025-05-13 12:34:07 -05:00
Jason Zimdars 9c4a359865 Ensure checkboxes in menus have full size click targets 2025-05-12 21:50:32 -05:00
Andy Smith 01c642e6a8 Restructure day containers 2025-05-12 15:29:33 -05:00
Jason Zimdars d3cad768a1 Try a fresh activity design 2025-05-07 16:26:32 -05:00
Jason Zimdars dd5e45c93d Display card number in notifications and events 2025-05-07 15:09:47 -05:00
Jason Zimdars 4cf0242443 Handle the case where you can only see one collection 2025-05-02 18:08:57 +02:00
Jason Zimdars 6ed5549c1b 'Reported' -> 'Added' 2025-04-30 10:29:16 +02:00
Jason Zimdars d3ba47c2fa Sort alphabetically 2025-04-30 09:56:13 +02:00
Jason Zimdars de13f85949 Remove debug 2025-04-28 22:45:54 +02:00
Jason Zimdars 9d6e40904f Adjust size for demo 2025-04-27 21:26:06 +02:00
Jason Zimdars 81ea8f2a1d Completely revert that 2025-04-27 17:26:00 +02:00
Jason Zimdars dfbdd3da4d We can't filter these right now 2025-04-27 17:19:22 +02:00
Jason Zimdars b8fe50113b Shouldn't be nested, we already have a popup__list 2025-04-27 17:13:36 +02:00
Jason Zimdars d93419581f Add truncation to custom collections, add them to the filterable list 2025-04-27 16:47:01 +02:00
Jason Zimdars ec0fcf7420 Ensure entire row is clickable 2025-04-27 16:12:19 +02:00
Jason Zimdars b6658d3081 Bring back custom collections
WIP, still needs UI for creating new custom collections but there are two hard-coded collections and any previously created ones on production should now be available again
2025-04-26 20:49:35 -05:00
Jason Zimdars 0fa0622b06 Post-merge misc 2025-04-25 16:18:46 -05:00
Jason Zimdars 67040ad492 Add a navigation hint, make "All collections" link navigate like the others 2025-04-25 13:16:26 -05:00
Jason Zimdars c085266ceb Filter collections menus, add keyboard shortcuts 2025-04-25 12:42:22 -05:00
Jason Zimdars ffff8b72f1 Style 2025-04-25 10:39:03 -05:00
Jorge Manrubia 90576998a4 Rename to avoid using the same name 2025-04-25 10:52:51 +02:00
Jorge Manrubia 74a8a6431e Extract more templates 2025-04-25 10:21:38 +02:00
Jorge Manrubia 32c9cdbba8 Extract filter partials and rely on filter as the source of truth for the selected collections 2025-04-25 10:00:21 +02:00
Jorge Manrubia 6da814520d Remove todo I already tackled 2025-04-25 09:48:33 +02:00
Jorge Manrubia a445b5c068 Extract partial 2025-04-25 09:48:15 +02:00
Jorge Manrubia 4657663e35 Create local time formatter to match the previous format we were generating server-side 2025-04-25 08:55:36 +02:00
Jason Zimdars 00bcc2183e Should be full opacity 2025-04-24 11:14:31 -05:00
Jason Zimdars 5239a2c628 Remove extra close bracket 2025-04-24 10:47:59 -05:00
Jorge Manrubia 1196266deb Split event rendering in two templates to remove conditional 2025-04-24 14:08:20 +02:00
Jorge Manrubia 905ccb9b4b Make comments the event's host 2025-04-24 13:45:48 +02:00
Jorge Manrubia 18cc24e1d3 Add an event prefix named after the model now that events are generic 2025-04-24 13:20:09 +02:00
Jorge Manrubia 13b0c0fc41 First pass to tidy up activity time rendering 2025-04-24 12:28:16 +02:00