Commit Graph

25581 Commits

Author SHA1 Message Date
Logan Allen
1923df064e interface: fixes all around for transcluded content that is subsequently deleted 2021-05-06 13:13:10 -05:00
Logan Allen
147fae2dd2 Merge branch 'release/next-js' into la/chat-delete 2021-05-06 12:44:04 -05:00
James Acklin
3ade0b5502 chat: retain ~mention on transclusion reply
fixes urbit/landscape#759
2021-05-06 13:42:33 -04:00
L
9b4b9c5c72
Merge pull request #4870 from urbit/mp/landscape/flex-title
ResourceSkeleton: always flex-shrink
2021-05-06 12:24:57 -05:00
Matilde Park
ab9e3520a3 ResourceSkeleton: always flex-shrink
Fixes urbit/landscape#842
2021-05-06 13:14:00 -04:00
matildepark
00c2f78e7d
Merge pull request #4780 from urbit/james/group-dm-invite
messages: surface invite action in group DMs
2021-05-06 13:10:15 -04:00
James Acklin
41b237538b messages: fix merge error 2021-05-06 13:06:59 -04:00
James Acklin
aeb343f83d Merge branch 'release/next-js' into james/group-dm-invite 2021-05-06 13:06:35 -04:00
Matilde Park
e2f77cb124 GraphContent: reduce margin on headings 2021-05-06 13:05:09 -04:00
matildepark
6515396f47
Merge pull request #4869 from urbit/mp/publish-amazon
publish: amazon
2021-05-06 12:42:03 -04:00
matildepark
cf25c8d705
Merge pull request #4868 from urbit/james/transclusion-node-error
permalinks: fix crashing slice error
2021-05-06 12:40:39 -04:00
Matilde Park
4ae22e7755 TranscludedNode: looser 2021-05-06 12:40:20 -04:00
Matilde Park
ef1faaef6d GraphContent: fix links, tall formatting, add breaks 2021-05-06 12:34:29 -04:00
Matilde Park
8b66ce9f57 publish: enable content types 2021-05-06 12:07:10 -04:00
James Acklin
5a20448590 permalinks: idx check + sane default 2021-05-06 10:49:48 -04:00
James Acklin
9d2fde465c permalinks: fix crashing slice error
fixes urbit/landscape#841
2021-05-06 10:33:42 -04:00
janeway-bot
8852716544
Merge 53f17d8844 into release/next-js 2021-05-06 09:48:46 +04:00
Liam Fitzgerald
53f17d8844
glob: update to 0vp51an.2c81t.2dc6j.oibjo.0mbfd 2021-05-06 15:45:30 +10:00
Liam Fitzgerald
51a9a7405d
SidebarListHeader: fix v3 2021-05-06 15:30:03 +10:00
matildepark
c9bd1f7434
Merge pull request #4867 from urbit/lf/sidebar
SidebarListHeader: fix again
2021-05-06 01:13:07 -04:00
Liam Fitzgerald
46f600da91
SidebarListHeader: fix again 2021-05-06 15:11:19 +10:00
matildepark
d018057600
Merge pull request #4866 from urbit/lf/fix-sidebar
interface: sidebar fix && images in markdown
2021-05-06 00:58:25 -04:00
Liam Fitzgerald
4143c00f3a
GraphContent: fix image rendering 2021-05-06 14:54:44 +10:00
Liam Fitzgerald
1cb938fced
SidebarListHeader: fix group feed, again 2021-05-06 14:47:08 +10:00
matildepark
0ac26732c0
Merge pull request #4833 from rabsef-bicrym/ico-mark
file-server: Added support for .ico files:
2021-05-06 00:28:07 -04:00
janeway-bot
1136daedfc
Merge f9135d594b into release/next-js 2021-05-06 08:14:51 +04:00
Liam Fitzgerald
f9135d594b
glob: update to 0v5.6jf0v.sc7t3.1kjf9.25gku.9rumj 2021-05-06 14:11:32 +10:00
Liam Fitzgerald
79e47cb6c2
Merge remote-tracking branch 'origin/release/next-js' 2021-05-06 14:01:20 +10:00
Liam Fitzgerald
6e6f5665ee
Merge branch 'lf/fix-watch-ack' 2021-05-06 14:00:59 +10:00
matildepark
2d97123a44
Merge pull request #4865 from urbit/lf/md-emph
GraphContent: fix emphasis
2021-05-05 23:59:47 -04:00
Liam Fitzgerald
fad226cef5
GraphContent: fix emphasis 2021-05-06 13:58:19 +10:00
matildepark
abe004044e
Merge pull request #4864 from urbit/lf/group-feed-hide
interface: hide group feed if disabled
2021-05-05 23:26:09 -04:00
Liam Fitzgerald
af44a9e829
interface: hide group feed if disabled 2021-05-06 13:22:09 +10:00
matildepark
5651ee01f7
Merge pull request #4863 from urbit/lf/group-feed-rep
BigIntOrderedMap: fix caching, again
2021-05-05 23:00:27 -04:00
Liam Fitzgerald
5fe3874b20
BigIntOrderedMap: fix caching, again 2021-05-06 12:48:36 +10:00
matildepark
8a0e162f87
Merge pull request #4862 from urbit/lf/forestry-fixes
forestry: transclusion and wide format fixes
2021-05-05 22:46:10 -04:00
Liam Fitzgerald
e5de9a50ce
GraphContent: fix wide rendering 2021-05-06 12:37:07 +10:00
Matilde Park
20047c6463 interface/weather: escape entities 2021-05-05 22:25:32 -04:00
Liam Fitzgerald
1db67feec9
GraphContent: fix recursive transclusion 2021-05-06 12:23:47 +10:00
Matilde Park
3ff671d477 Merge branch 'release/next-js' into la/chat-delete 2021-05-05 21:45:52 -04:00
Matilde Park
bf3c7b7b0d Merge branch 'release/next-js' into la/chat-delete 2021-05-05 21:42:07 -04:00
matildepark
61e9deb787
Merge pull request #4809 from urbit/lf/publish-mp
publish: forestry
2021-05-05 21:38:22 -04:00
Liam Fitzgerald
be34223a6e
tokenizeMessage: expand group links 2021-05-06 11:30:30 +10:00
matildepark
1310234906
Merge pull request #4861 from urbit/lf/hark-del
BigIntOrderedMap: fix caching
2021-05-05 21:22:42 -04:00
Liam Fitzgerald
5851eaa511
BigIntOrderedMap: fix caching 2021-05-06 11:09:01 +10:00
Liam Fitzgerald
6c653e7ab9
interface: fix merge errors 2021-05-06 10:45:15 +10:00
Liam Fitzgerald
93de5a312b
Merge remote-tracking branch 'origin/release/next-js' into lf/publish-mp 2021-05-06 10:32:49 +10:00
Matilde Park
f0365e6ab2 npm: change package-lock to ver@1 2021-05-05 19:18:37 -04:00
matildepark
824ee134fe
Merge pull request #4859 from urbit/mp/landscape/more-more-types
interface: type fixes, part 4
2021-05-05 19:12:54 -04:00
Matilde Park
ae13a69998 Merge branch 'release/next-js' into mp/landscape/more-more-types 2021-05-05 19:10:10 -04:00