Merge branch 'staging' into hm/fix-thread-updates

tloncorp · Jul 22, 2024 · 13c6de3 · 13c6de3
2 parents 06a0579 + a3fae3f
commit 13c6de3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/apps/tlon-web/src/styles/components.css b/apps/tlon-web/src/styles/components.css
@@ -60,6 +60,10 @@
   @apply my-0;
 }
 
+.ProseMirror a {
+  @apply underline;
+}
+
 /* hack to prevent auto-zoom on em-emoji-picker */
 @media screen and (max-width: 767px) {
   em-emoji-picker {

diff --git a/desk/app/activity.hoon b/desk/app/activity.hoon
@@ -462,7 +462,7 @@
     %+  roll
       happenings
     |=  [bn=activity-bundle:a acc=activity:a]
-    (~(put by acc) source.bn (~(got by activity) source.bn))
+    (~(put by acc) source.bn (~(gut by activity) source.bn *activity-summary:a))
   ::  if start is now, need to increment to make sure we include latest
   ::  event if that event somehow has now as its time
   =/  real-start  ?:(=(start now.bowl) +(start) start)

diff --git a/desk/desk.docket-0 b/desk/desk.docket-0
@@ -2,7 +2,7 @@
     info+'Start, host, and cultivate communities. Own your communications, organize your resources, and share documents. Tlon is a decentralized platform that offers a full, communal suite of tools for messaging, writing and sharing media with others.'
     color+0xde.dede
     image+'https://bootstrap.urbit.org/tlon.svg?v=1'
-    glob-http+['https://bootstrap.urbit.org/glob-0v2.ff303.9sd1e.hslh2.d9mcj.22a3t.glob' 0v2.ff303.9sd1e.hslh2.d9mcj.22a3t]
+    glob-http+['https://bootstrap.urbit.org/glob-0v6.7brns.i8okn.pvots.en2mf.jvera.glob' 0v6.7brns.i8okn.pvots.en2mf.jvera]
     base+'groups'
     version+[6 1 0]
     website+'https://tlon.io'