urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-25 13:04:17 +03:00
Code Issues Packages Projects Releases Wiki Activity
18,857 Commits 768 Branches 10 Tags 215 MiB
0a22b6111a
Commit Graph

3731 Commits

Author SHA1 Message Date
Isaac Visintainer
ac9890c2a9 publish: fix bug in publish comment mark 2020-05-12 17:49:03 -06:00
Fang
be087a8c92
Merge branch 'release/next-sys' of https://github.com/urbit/urbit into m/debug-dashboard 2020-05-11 20:39:00 +02:00
Fang
fe2e3861bb
dbug fe: include missing component 2020-05-11 20:37:52 +02:00
Fang
c991e17871
dbug fe: correct page title 2020-05-11 20:37:28 +02:00
Fang
cd031858b6
dbug fe: remove unused imports 2020-05-11 20:37:06 +02:00
pkova
9d3c997ecf zuse: allow whitespace around = in attr:de-xml:html 
Allow one or more whitespace characters before and/or after the equals sign in
name attribute pairs, such as `<hello a = "yo" />` or `<hello a=    "yo" />`.
Following the spec at https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-Eq.
 2020-05-11 21:09:23 +03:00
Fang
e33a8952c1
Merge pull request #2840 from urbit/m/gall-just-not-unique 
gall: smaller %watch-not-unique print
 2020-05-11 19:44:30 +02:00
Fang
3a8544583c
chat: virtualize message-to-json only where needed 
Previously we were virtualizing all message rendering operations, but it's only
+tank:enjs:format that we're worried about here.

Doing this more narrowly also allows us to specify a slightly more specific
error message.
 2020-05-11 16:56:40 +02:00
Liam Fitzgerald
782135fc97 publish: abide by namespacing conventions 2020-05-09 11:26:25 +10:00
Fang
b00f48e358
dbug: include index.html for debug dashboard 2020-05-09 02:16:20 +02:00
Philip Monk
170f791d1d
Merge branch 'philip/ames-dedup' (#2852) 
* origin/philip/ames-dedup:
  clay: don't send peers to message pump
  ames: only dedupe long messages
  ames: don't split messages until ready to send
  ames: dedup new messages and fragments
 2020-05-08 13:40:09 -07:00
Fang
7152cb74a9
chat: virtualize message-to-json conversion 
Bad `@t` text might crash and fully halt the json conversion, preventing any
data from being delivered to the frontend.

Fixes #2878.
 2020-05-08 19:50:31 +02:00
Fang
959884c9cd
dbug: implement debug dashboard 2020-05-08 14:58:40 +02:00
lukechampine
baa309e375 dojo: rename remote access generators 2020-05-08 00:53:21 -04:00
Philip Monk
54e550d229
gall: clear outstanding ack queue on-load 
This will fix the issue described in #2867 for ducts that have already
triggered the bug.  This will also send spurious acks for any messages
that are outstanding at the time of the upgrade, but I don't believe
this will cause a serious problem.
 2020-05-07 21:31:50 -07:00
Philip Monk
35ca2be344
gall: clear outstanding ack queue to breaching ships 
fixes #2867
 2020-05-07 21:17:42 -07:00
lukechampine
8cbb8f142e gall: fix handling of empty path list 2020-05-07 22:46:51 -04:00
Fang
ac494a265e
verb: allow subscribing to events 
This excludes, necessarily, events that don't let us emit moves.
(+on-save, +on-peek)
 2020-05-08 01:46:29 +02:00
Fang
4a6329eb09
dbug: add scry endpoints 
Allow scrying out of state and subscriptions for apps that use /lib/dbug
 2020-05-08 01:42:29 +02:00
Fang
664275c9f1
eyre: expose bindings through scry 
Allows you to scry out all bound endpoints at /=bindings=.

Moves an internal type into zuse for easier external use.
 2020-05-08 01:39:56 +02:00
Fang
61a5e7a45e
behn: expose timers through scry 
Instead of giving the tank of the timers, give the list of timers
itself.

Updates +timers to account for this.
 2020-05-08 01:38:29 +02:00
Fang
14831f4864
ames: expose state through scries 
Support /=peers= and /=peer=/~ship scries for getting at all peers and
a specific peer's connection state, respectively.

Moves some internal types into zuse for easier external use.
 2020-05-08 01:37:07 +02:00
lukechampine
4217bfa2da dojo: remove unused %json poke 2020-05-07 17:57:58 -04:00
lukechampine
6ab3ab7d5c dojo: add remote access controls 2020-05-07 17:57:31 -04:00
Liam Fitzgerald
d7d07b014b chat-store: remove redundant tiscom 2020-05-07 10:56:24 +10:00
Liam Fitzgerald
cf8e8f8dc4 Merge branch 'master' into lf/chat-type-namespacing 2020-05-07 10:39:11 +10:00
lukechampine
9f45acc17b drum: switch to per-ship /sole/drum duct 2020-05-06 18:54:54 -04:00
Fang
69b6495d3d
Merge pull request #2854 from urbit/m/claz-register 
claz: correct lockup registration arg order
 2020-05-06 14:40:58 +02:00
Isaac Visintainer
734e643eb7 release: urbit-os-v1.0.15 2020-05-05 19:32:08 -06:00
ixv
0c57e65b38
Merge pull request #2846 from sigilante/master 
Add SVG support to img tags in Chat.
 2020-05-05 17:59:45 -07:00
ixv
277debf710
Merge pull request #2842 from urbit/mp/chat/message-fixing 
chat: message input fixes
 2020-05-05 17:59:07 -07:00
ixv
06f44ab9f1
Merge pull request #2825 from urbit/lf/chat-bottom-scroll 
chat-js: fix scrolling and unread behaviour
 2020-05-05 17:58:42 -07:00
ixv
8df1d078b1
Merge pull request #2859 from urbit/lf/drum-start-fix 
drum: fix broken app start
 2020-05-05 17:43:51 -07:00
Liam Fitzgerald
54969afdd2 drum: fix broken app start 
If we find an agent that has already been launched then we continue
iterating through the list of apps instead of stopping

Fixes: #2858
 2020-05-06 09:45:17 +10:00
Philip Monk
4cc3fea534
clay: don't send peers to message pump 2020-05-05 16:39:50 -07:00
Fang
baf8ff1182
claz: correct lockup registration arg order 
We were confusing "rate" and "rateUnit". These are "stars per tick" and
"duration of a tick" respectively, not the other way around.
 2020-05-05 23:18:07 +02:00
matildepark
ebbb3c8349
Merge pull request #2841 from urbit/lf/groups-kick-fix 
groups: fix self destruct on kick
 2020-05-05 17:03:08 -04:00
Liam Fitzgerald
6fb41209cd chat: fix ship search not wrapping correctly 
fixes #2832
 2020-05-05 16:17:45 +10:00
Liam Fitzgerald
23eb4acc37 Merge branch 'master' into lf/chat-bottom-scroll 2020-05-05 16:13:36 +10:00
ixv
c328e548d2
Merge pull request #2850 from urbit/ixv/publish-metadata-noop 
publish: allow crash case to no-op instead
 2020-05-04 22:06:27 -07:00
Philip Monk
490b615b6a
ames: only dedupe long messages 2020-05-04 21:39:59 -07:00
Isaac Visintainer
b9c5699ee4 publish: add debug poke to reset the warp loop 2020-05-04 21:39:57 -06:00
Isaac Visintainer
a91a3e50e1 publish: no-op on some other cases as well 2020-05-04 21:35:56 -06:00
Isaac Visintainer
da5f78df18 publish: allow crash case to no-op instead 2020-05-04 20:55:41 -06:00
Matilde Park
8c3e2cff92 Merge branch 'lf/chat-new-dm-race' (#2823) 
* origin/lf/chat-new-dm-race:
  chat-js: fix race condition in new-dm flow

Signed-off-by: Matilde Park <matilde@tlon.io>
 2020-05-04 20:48:50 -04:00
Matilde Park
3c06c15505 Merge branch 'lf/hood-boot-order' (#2805) 
* origin/lf/hood-boot-order:
  drum: partially restore reverted changes
  Revert "drum: address review comments"
  chat-cli: remove unnecessary %gu scry
  link-proxy-hook: remove unnecessary %gu scry
  drum: address review comments
  drum: sort cli connections
  drum: account for app dependencies on boot

Signed-off-by: Matilde Park <matilde@tlon.io>
 2020-05-04 20:41:10 -04:00
Sigilante
596e8f7906
Add SVG. 2020-05-04 14:23:24 -05:00
Matilde Park
60db7d06c7 chat: amend codeeval asset for graphical tweak 
The inverted CodeEval png would have noticable inverted borders,
so we now render the border using css and tweak its colouring as
necessary.
 2020-05-04 13:30:30 -04:00
Matilde Park
6a10987602 chat: toggle input out of code mode after sending 
Closes #2836. Code input would stick after sending a code message, so we
now toggle out of it if we were in it, on enter.
 2020-05-04 13:29:47 -04:00
Matilde Park
40378d2b79 chat: require and remove leading space for /me 
Closes #2834. Previously, starting a message with '/me' removed itself,
retaining the space between it and the message itself; it also allowed
"/memessages" to be processed as /me messages.
 2020-05-04 12:41:06 -04:00
matildepark
03d80b8c63
Merge pull request #2800 from urbit/avatar-s3 
Minimal S3 support
 2020-05-03 22:12:32 -04:00
Liam Fitzgerald
68324ec71b groups: propagate remove correctly 2020-05-04 10:25:40 +10:00
Fang
ab9ecdd7fe
gall: smaller %watch-not-unique print 
Instead of printing all outgoing subscriptions for the app, only print the
subscription whose wire we're trying to re-use.
 2020-05-03 23:21:30 +02:00
Philip Monk
081c8a864d
ames: don't split messages until ready to send 
Trying to reduce the size of ames queues.  This deduplicates incoming
message-blobs by comparing with existing message-blobs in other queues.

It also stops splitting into fragments in +feed-packets.  Instead, it
splits into fragments at the last moment, in +encrypt.  This means we
don't have to store a large number of packets in our home road.
 2020-05-02 03:35:44 -07:00
Philip Monk
c50c34d8be
ames: dedup new messages and fragments 2020-05-01 22:55:14 -07:00
Liam Fitzgerald
774f7f53f0 contacts-js: handle remove of contact correctly 
the remove functionality in contact-card.js incorrectly assumed that we
are always removing ourselves from the group.

Fixes #2816
 2020-05-02 14:08:24 +10:00
Logan Allen
c8e972aa4e chat-js: updated codeeval.png, margin, and size of icons 2020-05-01 19:08:36 -04:00
Liam Fitzgerald
1faf35928c chat: fix indenting 2020-05-01 14:11:49 +10:00
ixv
b383037a8f
Merge pull request #2830 from urbit/king-https-fix 
Get HTTPS working in King Haskell.
 2020-04-30 13:08:13 -07:00
ixv
51876044f9
Merge pull request #2820 from urbit/king-crud-type 
king: don't parse crud events, just treat them as nouns.
 2020-04-30 13:07:54 -07:00
Benjamin Summers
f66405615f king: Split cert from urbit into cert+chain before giving to warp (HTTP Server library). 2020-04-30 12:13:14 -07:00
Benjamin Summers
75f60504ee king: In http-server/set-config effect, key+cert is Wain, not Cord. 2020-04-30 11:18:23 -07:00
Liam Fitzgerald
c62140e4d6 chat: use ^? on libs correctly 2020-04-30 13:29:06 +10:00
Liam Fitzgerald
1167699ae6 chat-js: refactor unread message fetch 2020-04-30 13:08:38 +10:00
Liam Fitzgerald
bdec28c541 chat-js: load all unreads and autoread on activity 
if the number of unread messages is larger that the number we are going
to load, then load enough messages to display the unread marker.
Additionally, only automatically read a message if the user has been
active in the last minute. Freeze scroll position on inactivity.  Also
unconditionally scroll to the bottom upon sending your own message.
 2020-04-30 11:47:15 +10:00
Liam Fitzgerald
d7a5499b9a chat: expose types with libs 2020-04-30 09:04:29 +10:00
Matilde Park
e7d05988d3 Merge branch 'mp/chat/pending-reordering' (#2824) 
* origin/mp/chat/pending-reordering:
  chat: prepend new pending messages, not append

Signed-off-by: Matilde Park <matilde@tlon.io>
 2020-04-29 16:28:52 -04:00
Matilde Park
34b234b652 Merge branch 'master' into mp/chat/input-autofocus 2020-04-29 16:27:29 -04:00
Matilde Park
cf6ef7512f Merge branch 'lf/chat-eval-scroll' (#2815) 
* origin/lf/chat-eval-scroll:
  chat-js: only show scrollbars if overflow

Signed-off-by: Matilde Park <matilde@tlon.io>
 2020-04-29 16:24:39 -04:00
Matilde Park
048de06f76 Merge branch 'mp/jank-regex' (#2813) 
* origin/mp/jank-regex:
  chat: strictly match URLs in outgoing strings

Signed-off-by: Matilde Park <matilde@tlon.io>
 2020-04-29 16:24:17 -04:00
Matilde Park
0926454e08 Merge branch 'mp/chat/code-toggle-2' (#2796) 
* origin/mp/chat/code-toggle-2:
  chat: toggle code at start of input

Signed-off-by: Matilde Park <matilde@tlon.io>
 2020-04-29 16:22:25 -04:00
matildepark
c050ca10c7
Merge pull request #2784 from urbit/la-channel-err 
channel-js: fixed long-standing issue with subscription errors not being propagated
 2020-04-29 12:41:23 -04:00
Liam Fitzgerald
531efa82a9 chat: address review comments 2020-04-29 18:45:07 +10:00
Liam Fitzgerald
17e1dd8362 chat-js: update read on initialisation 2020-04-29 13:37:58 +10:00
Liam Fitzgerald
eb6b50e0ca chat-js: truncate nicknames in autocomplete 2020-04-29 13:29:09 +10:00
Liam Fitzgerald
e96bd35f81 various-js: pass props.size into flexBasis for sigil 
Fixes #2817
 2020-04-29 12:51:13 +10:00
Liam Fitzgerald
ae0e5025ad chat-js: fix race condition in new-dm flow 
Creating a new DM might redirect the user to the chat before it is
actually created. Fixed by waiting for confirmation before redirecting.

Fixes #2792
 2020-04-29 10:14:13 +10:00
Matilde Park
6836135b71 chat: prepend new pending messages, not append 2020-04-28 20:13:09 -04:00
Matilde Park
5487e48ca2 chat: autofocus input on desktop 2020-04-28 19:46:10 -04:00
Liam Fitzgerald
5dc241dbe5 drum: partially restore reverted changes 2020-04-29 08:40:38 +10:00
Liam Fitzgerald
e099f3a8c6 Revert "drum: address review comments" 
This reverts commit c925665cb8.
 2020-04-29 08:25:21 +10:00
Benjamin Summers
ecf4545d84 king: don't parse crud events, just treat them as nouns. 2020-04-28 11:40:43 -07:00
Liam Fitzgerald
77925a4580 chat-js: fix unread indicators on small screens 
fixes #2804
 2020-04-28 17:08:27 +10:00
Liam Fitzgerald
fc1518dc08 chat-js: fix behaviour of unread markers 
Fixes #2797
 2020-04-28 17:08:27 +10:00
Liam Fitzgerald
9b0a4c095e chat-js: fix scrolling to bottom 
fixes: #2778
fixes: #2782
 2020-04-28 17:08:23 +10:00
Liam Fitzgerald
a7253d4480 chat-js: only show scrollbars if overflow 
Uses overflow: auto on the code attachments so that scrollbars only
appear if the content overflows the container. Adds borders on sent Hoon
code to improve visual seperation.
 2020-04-28 12:56:19 +10:00
Liam Fitzgerald
371c98c035 chat-cli: remove unnecessary %gu scry 
This is now redundant as chat-store will always boot before chat-cli.
 2020-04-28 12:24:21 +10:00
Liam Fitzgerald
216766a84f link-proxy-hook: remove unnecessary %gu scry 
This is redundant as the metadata store will always boot before the
link-proxy-hook.
 2020-04-28 12:23:28 +10:00
Liam Fitzgerald
c925665cb8 drum: address review comments 2020-04-28 12:20:59 +10:00
Liam Fitzgerald
5f4fc28bc9 chat: improve namespacing of chat-* types 
Improved the namespacing by dropping the app prefix on types, e.g.
chat-hook-action -> action. Compensated for shadowing by importing the
/sur files behind a face. End result is that a chat-hook-action becomes
an action:hook. Splits chat-json into lib/chat-{hook,store,view}. Uses
^? on changes files in /lib and /sur to discourage deeply nested
importing.
 2020-04-28 12:01:13 +10:00
Matilde Park
5b45ad986d chat: strictly match URLs in outgoing strings 
Our regex processes true, and sends a message as a URL, if any part of
the string is a URL starting with a URI schema.
We pass this function strings cut up by spaces. If a link was enclosed
in quotes, or in brackets, this would still process as true.

This adds ^ to the regex to only process strings that START with
a schema.
 2020-04-27 21:16:10 -04:00
Logan Allen
003c4676b1 hood: added version %4 of hood state 2020-04-27 18:28:31 -04:00
Logan Allen
9b4f070f3e s3: style cleanup, response to comments 2020-04-27 15:31:04 -04:00
Logan Allen
28c707b300 hood: updated drum to version %3 2020-04-27 15:12:51 -04:00
Logan Allen
d2e2590cce chat-js: implemented S3 image upload 2020-04-27 15:02:48 -04:00
Logan Allen
7beb575551 groups: fixed error states and visual styling around image upload 2020-04-27 14:47:55 -04:00
Liam Fitzgerald
37cd90a42b drum: sort cli connections 
Sorts cli connections so that the user always boots into %dojo
regardless of their @p

Fixes: #2248
 2020-04-25 07:21:41 +10:00
Liam Fitzgerald
2e3947e3c0 drum: account for app dependencies on boot 
Changes drum's boot order to be deterministic regardless of the ship
you're on.

Fixes #2681
 2020-04-25 07:20:42 +10:00
Logan Allen
ce1f7c957b s3-js: got upload working successfully, required CORS * and Headers * and public-read ACL 2020-04-24 12:19:01 -04:00
Logan Allen
ff313fb720 groups-js: initial s3 work 2020-04-24 12:19:01 -04:00
Logan Allen
9c6cb61d61 s3: got tests passing and added the rest of the generators 2020-04-24 12:19:01 -04:00
Logan Allen
285f0bd5e3 s3: integrated with store and reducers 2020-04-24 12:19:01 -04:00
Logan Allen
bec650957c s3: added configuration settings for setting current bucket and adding / removing buckets from list 2020-04-24 12:19:01 -04:00
Logan Allen
877ae66169 s3.js: switched from putObject to upload for better handling of large files 2020-04-24 12:19:01 -04:00
Logan Allen
38f65474e3 s3: made S3 upload API coherent 2020-04-24 12:19:01 -04:00
Logan Allen
ab3a759ce2 s3-store: poke functionality, updated credentials, added generators 2020-04-24 12:19:01 -04:00
Logan Allen
daf32fd0f9 s3-store: initial commit 2020-04-24 12:19:01 -04:00
Matilde Park
e657a5514c chat: toggle code at start of input 2020-04-24 09:38:38 -04:00
Jared Tobin
0bcd971c5f
release: urbit-os-v1.0.14.rc1 2020-04-24 12:15:39 +04:00
Matilde Park
83312afb99 groups: add avatar prop to share sheet 2020-04-23 23:05:44 -04:00
Matilde Park
e64da1e79c publish: show avatars if set 2020-04-23 22:33:00 -04:00
Matilde Park
9ff8f1106a link: show avatars if set 2020-04-23 22:32:52 -04:00
Matilde Park
51b7635672 groups: show avatars if set 2020-04-23 22:32:29 -04:00
Matilde Park
7ebc09a41a chat: display avatars if set 2020-04-23 22:32:16 -04:00
Logan Allen
15404e0989 groups-js: added ability to set avatar images 2020-04-23 21:28:04 -04:00
Logan Allen
d29ea5703e channel-js: fixed long-standing issue with subscription errors not being propagated 2020-04-23 16:51:53 -04:00
Liam Fitzgerald
ec03c29b72 chat-hook: fix variable name 2020-04-23 23:12:30 +10:00
Jared Tobin
413ae72164
Merge branch 'ted/sloe' (#2764) 
* ted/sloe:
  pill: update solid
  fix +sloe for %hint'ed cores

Signed-off-by: Jared Tobin <jared@tlon.io>
 2020-04-23 15:05:57 +04:00
Fang
a810468dcf
Merge pull request #2777 from urbit/ixv/publish-groupify 
publish: groupify notebooks
 2020-04-23 02:00:24 +02:00
matildepark
5ccfd0537b
Merge pull request #2740 from liam-fitzgerald/lf/chat-group-autoleave 
chat: leave chats associated with group on group leave
 2020-04-22 18:41:10 -04:00
matildepark
8dca42ee19
Merge pull request #2759 from liam-fitzgerald/lf/unread-title 
various-fe: add unread counts to title
 2020-04-22 18:40:46 -04:00
Matilde Park
0beabe2195 Merge branch 'master' into mp/sigil-foregrounding 2020-04-22 18:37:13 -04:00
matildepark
8968190e55
Merge pull request #2714 from liam-fitzgerald/lf/profile-overlay 
chat: profile overlay and DMs
 2020-04-22 18:32:53 -04:00
Isaac Visintainer
f46bc4b397 publish: addressed review, fixed issue with metadata 2020-04-22 15:14:24 -07:00
Logan Allen
c374e17ba5 contact-view: redirect upon url case of avatar 2020-04-22 18:08:59 -04:00
Liam Fitzgerald
f5d8a36df2 Merge branch 'master' into lf/profile-overlay 2020-04-23 07:49:04 +10:00
Logan
c36c5a9bd3
Merge branch 'master' into os1-avatar 2020-04-22 11:42:33 -04:00
Jared Tobin
5b9887ca19
Merge branch 'la-contact-delete-fix' (#2738) 
* origin/la-contact-delete-fix:
  t groups + contacts: make removes completely clean up state
  contact-js: made channel handle onChannelError
  contact-hook: tested it, got /synced path working, and subscriptions loading
  contacts: fix group deletion and do some quality of life fixes

Signed-off-by: Jared Tobin <jared@tlon.io>
 2020-04-22 14:04:19 +04:00
Jared Tobin
d79d216ad2
Merge branch 'mp/publish/numbered-list-line-height' (#2775) 
* origin/mp/publish/numbered-list-line-height:
  publish: set font size for ordered lists
  publish: change line-height on numbered lists

Signed-off-by: Jared Tobin <jared@tlon.io>
 2020-04-22 14:03:13 +04:00
Liam Fitzgerald
c16b711278 chat-js: correct overlay reflow and review comments 2020-04-22 15:03:19 +10:00
Liam Fitzgerald
8277802027 chat-js: lint changed files 2020-04-22 13:46:03 +10:00
Liam Fitzgerald
8e028ad255 Merge branch 'master' into lf/profile-overlay 2020-04-22 13:39:00 +10:00
Logan Allen
f6a2f7f83c contact: finish %octt implementation 2020-04-21 19:59:03 -04:00
Matilde Park
707bedc2b4 publish: set font size for ordered lists 2020-04-21 19:36:30 -04:00
Isaac Visintainer
a29aa2d01a publish: add groupify frontend 2020-04-21 14:34:45 -07:00
Isaac Visintainer
5a771157c5 publish: fix edit-book reducer 2020-04-21 14:34:45 -07:00
Isaac Visintainer
49463197f5 publish: add groupify action 2020-04-21 14:34:40 -07:00
Logan Allen
2f7e8fd811 contacts: added "url" avatar support and finished "octet" avatar 
fetching support
 2020-04-21 15:29:47 -04:00
Matilde Park
bcde27a7ff publish: change line-height on numbered lists 2020-04-21 15:05:48 -04:00
Logan Allen
6d4a694aeb t groups + contacts: make removes completely clean up state 2020-04-21 15:00:43 -04:00
Matilde Park
fa35038c2b groups: lint contact-card.js 2020-04-21 14:57:26 -04:00
Matilde Park
68961c484c groups: restrict sigil color input to 6 hex chars 2020-04-21 14:56:45 -04:00
Matilde Park
0e357373c0 chat: lint chat-input.js 2020-04-21 14:31:32 -04:00
Matilde Park
de077ffb47 chat: set code toggle only at start of input 2020-04-21 14:30:28 -04:00
Liam Fitzgerald
3ded8c9f68 chat-fe: add backlog loading indicator 
Adds a backlog loading indicator that displays when we have not yet
received the backlog from the host.
 2020-04-21 19:38:30 +10:00
Jared Tobin
995b92650e
Merge branch 'lf/unread-day-indicators' (#2768) 
* origin/lf/unread-day-indicators:
  chat-fe: fix unreadnotice position on mobile
  chat-fe: add unread and day indicators

Signed-off-by: Jared Tobin <jared@tlon.io>
 2020-04-21 13:07:25 +04:00
Jared Tobin
bee001de26
Merge branch 'lf/contacts-separate-user' (#2766) 
* origin/lf/contacts-separate-user:
  groups-js: seperate user's ship from rest of contacts

Signed-off-by: Jared Tobin <jared@tlon.io>
 2020-04-21 13:06:49 +04:00
Jared Tobin
358aa5025f
Merge branch 'liam-fitzgerald/lf/chat-markdown-input' (#2756) 
* liam-fitzgerald/lf/chat-markdown-input:
  chat-js: revive # prefix for code messages
  chat-js: toggle code editor on icon click
  chat-js: disabled block level elements in messages
  chat-js: render markdown in messages
  chat-js: use CodeMirror for chat input
  chat-js: add CodeMirror dependency

Signed-off-by: Jared Tobin <jared@tlon.io>
 2020-04-21 13:06:18 +04:00
Jared Tobin
a9d10a5471
Merge branch 'liam-fitzgerald/lf/publish-del-edit' (#2734) 
* liam-fitzgerald/lf/publish-del-edit:
  chat-fe: move cancel button below comment edit
  publish-js: lift editing state to comment list
  publish: fix check on edit-comment delta
  publish-js: avoid unnecessary scrollbars on note view
  publish-js: allow deletion and editing of comments
  publish: use @tas for comment ref in marks

Signed-off-by: Jared Tobin <jared@tlon.io>
 2020-04-21 13:05:57 +04:00
Jared Tobin
a5b9631c9e
Merge branch 'king-handle-ames-exception' (#2698) 
* origin/king-handle-ames-exception:
  king: handle IOError from recvFrom in ames.
  king: increment version for new pill

Signed-off-by: Jared Tobin <jared@tlon.io>
 2020-04-21 13:05:29 +04:00