Ted Blackman
3ebeb8243f
Merge remote-tracking branch 'origin/master' into king-haskell
2019-12-09 20:26:07 -05:00
Logan Allen
30264bbc93
chat-js: fix unread counts and indentation
2019-12-09 13:05:56 -08:00
Philip Monk
5ff9e04204
drum: revert tang ordering change
...
Turns out this wasn't a regression, it was intended behavior. I
continue to believe it's the wrong behavior, but that will require a
longer discussion.
2019-12-09 11:47:48 -08:00
Joe Bryan
0235b178f9
ames: refactors udp init() and bind()
2019-12-09 11:11:32 -08:00
Joe Bryan
6bd34bbd00
ames: honor -p for galaxies, with warning
2019-12-09 11:10:40 -08:00
Jared Tobin
96621c6062
Merge branch 'm/chat-hook-kickback' ( #2059 )
...
* origin/m/chat-hook-kickback:
chat-hook: no-op on /backlog kick if not synced
Signed-off-by: Jared Tobin <jared@tlon.io>
2019-12-09 20:47:16 +08:00
pilfer-pandex
bc2db1a21d
fix whnf, add rec, infra but not impl in nest
2019-12-08 21:46:52 -08:00
pilfer-pandex
0a46bbb649
add cas, with mandatory included type sorry
2019-12-08 20:38:43 -08:00
Ted Blackman
10e7c0945a
vere: print arg to c3_malloc() et. al. on failure
2019-12-08 19:32:55 -05:00
Fang
6722f789a9
chat-hook: no-op on /backlog kick if not synced
...
This matches the behavior that's used for +kick on /mailbox, among other flows.
2019-12-08 20:08:23 +01:00
Joe Bryan
134e947481
ames: adds port printfs for all ships
2019-12-07 23:59:21 -08:00
Joe Bryan
5784373bb6
ames: honor -p for non-galaxies
2019-12-07 23:56:38 -08:00
Jared Tobin
baedc50567
sh: replace merge helper [ci skip]
...
Replaces the 'merge-and-update-solid' script with the simpler
'merge-with-custom-msg' which merges branches using a custom merge
commit message.
Maintainers may want to alias it locally via something like:
git config alias.mu '!sh/merge-with-custom-msg'
Then use it via:
git mu SOME_BRANCH SOME_PR_NUMBER
2019-12-07 17:05:26 +08:00
Jared Tobin
fa4544406e
Merge branch 'chat-safe-tab' ( #2053 )
...
* origin/chat-safe-tab:
chat: give terminal bell on tab in an empty buffer
chat: don't crash on tab in an empty buffer
Signed-off-by: Jared Tobin <jared@tlon.io>
2019-12-07 17:03:44 +08:00
Jared Tobin
74c3ad619a
Merge branch 'decommission' ( #2051 )
...
* origin/decommission:
ames: remove last remnants of |nuke
Signed-off-by: Jared Tobin <jared@tlon.io>
2019-12-07 17:02:55 +08:00
Jared Tobin
31f20c30c6
Merge branch 'philip/ew-printfs' ( #2050 )
...
* origin/philip/ew-printfs:
eth-watcher: silence printfs
Signed-off-by: Jared Tobin <jared@tlon.io>
2019-12-07 17:01:01 +08:00
Jared Tobin
dc45806e99
Merge branch 'mp/chat-design-tweak' ( #2049 )
...
* mp/chat-design-tweak:
chat: chat tab bar re-aligned and resized
Signed-off-by: Jared Tobin <jared@tlon.io>
2019-12-07 16:55:29 +08:00
Jared Tobin
63bd7c62db
Merge branch 'mp/soto-catch-unidentified' ( #2018 )
...
* mp/soto-catch-unidentified:
soto: mutate cursor for tab complete inserts
soto: click sets cursor
soto: catch 'unidentified' key
Signed-off-by: Jared Tobin <jared@tlon.io>
2019-12-07 16:51:52 +08:00
Jared Tobin
de7b7d80f0
Merge branch 'pkova/patch-1' ( #2017 )
...
* pkova/patch-1:
vere: filter out content-length header from eyre
Signed-off-by: Jared Tobin <jared@tlon.io>
2019-12-07 16:51:00 +08:00
Jared Tobin
27b5ded1d2
Merge branch 'm/chat-eval' ( #2009 )
...
* m/chat-eval:
chat: include .^ paths in its eval failure case
chat: improve eval implementation
Signed-off-by: Jared Tobin <jared@tlon.io>
2019-12-07 16:48:42 +08:00
Philip Monk
8f99735982
Merge remote-tracking branch 'origin/philip/timers'
...
* origin/philip/timers:
ames: reduce load by increasing timer delays
Signed-off-by: Philip Monk <phil@pcmonk.me>
2019-12-06 14:24:08 -08:00
Matilde Park
f5faf6eb11
chat: chat tab bar re-aligned and resized
...
The placement of the buttons and chat title on Landscape were slightly
off-line with each other. This commit lines them up
and changes font size to f8 to match the mockup closely.
2019-12-06 16:44:45 -05:00
Philip Monk
abde1d8aa9
ames: reduce load by increasing timer delays
2019-12-06 12:11:06 -08:00
Joe Bryan
c8958a2553
chat: give terminal bell on tab in an empty buffer
2019-12-06 12:03:32 -08:00
Joe Bryan
706d25ba79
chat: don't crash on tab in an empty buffer
2019-12-06 12:02:59 -08:00
Joe Bryan
a0d2d41d0c
ames: remove last remnants of |nuke
2019-12-06 11:46:55 -08:00
Philip Monk
2d9a043e6f
eth-watcher: silence printfs
2019-12-06 11:19:05 -08:00
Jared Tobin
ea8e331d93
vere: patch version bump [ci skip]
2019-12-06 21:25:01 +08:00
Jared Tobin
9d02b5e88e
Merge branch 'bh/cross-debug' ( #2030 )
...
* bh/cross-debug:
build: add support for releasing cross-compiled debug binaries
Signed-off-by: Jared Tobin <jared@tlon.io>
2019-12-06 21:19:20 +08:00
Jared Tobin
5cbfb844e8
Merge branch 'newt-clean' ( #2042 )
...
* newt-clean:
vere: refactors ipc message parsing and assembly
Signed-off-by: Jared Tobin <jared@tlon.io>
2019-12-06 21:15:21 +08:00
Joe Bryan
acddc88d66
vere: refactors ipc message parsing and assembly
...
We've periodically seen malloc failures (ie, returning a null pointer)
in newt.c, our IPC implementation ("memory lost" assertion failures).
I've suspected that they were caused by attempts to allocate zero bytes.
We were not properly following libuv's read callback conventions for
EAGAIN/EWOULDBLOCK, which would've had that result.
The message parsing and assembly was in one large function that I found
it hard to follow, so I've refactored into smaller pieces, so it should
be more maintainable going forward.
2019-12-06 21:13:42 +08:00
Pyry Kovanen
864fa7ef47
vere: filter out content-length header from eyre
2019-12-06 13:21:25 +02:00
Jared Tobin
6f044b173a
Merge branch 'debug-symbols-last-time' ( #2047 )
...
* debug-symbols-last-time:
nix: actually enables debug symbols in release builds
Signed-off-by: Jared Tobin <jared@tlon.io>
2019-12-06 12:35:35 +08:00
Jared Tobin
d5f1efc7bc
Merge branch 'permisson-group-hook-fix' ( #2044 )
...
* permisson-group-hook-fix:
permission-group-hook: fixed permission associate flow
Signed-off-by: Jared Tobin <jared@tlon.io>
2019-12-06 12:24:07 +08:00
Jared Tobin
16b81727d2
Merge branch 'la-scrollback' ( #2037 )
...
* la-scrollback:
chat-store: fix scrollback issue due to malformattedd peek
Signed-off-by: Jared Tobin <jared@tlon.io>
2019-12-06 12:22:20 +08:00
Jared Tobin
383a86032f
Merge branch 'philip/dns-quiet' ( #2036 )
...
* philip/dns-quiet:
dns: give quieter errors
Signed-off-by: Jared Tobin <jared@tlon.io>
2019-12-06 12:21:21 +08:00
Jared Tobin
0bad1401f0
Merge branch 'philip/drum-order' ( #2035 )
...
* philip/drum-order:
drum: print tangs in order
Signed-off-by: Jared Tobin <jared@tlon.io>
2019-12-06 12:20:53 +08:00
Jared Tobin
4251b13d0e
Merge branch 'matilde/chat-feedback' ( #2027 )
...
* matilde/chat-feedback:
chat: Fix chat join link - %ask-history error
chat: join channel on enter
chat: wrap long links, join button uses pointer
Signed-off-by: Jared Tobin <jared@tlon.io>
2019-12-06 12:10:55 +08:00
Jared Tobin
3fc349d995
Merge branch 'philip/eth-watcher-silence' ( #2022 )
...
* philip/eth-watcher-silence:
eth-watcher: be quieter about parse errors
Signed-off-by: Jared Tobin <jared@tlon.io>
2019-12-06 12:10:12 +08:00
Joe Bryan
68a94f420f
nix: actually enables debug symbols in release builds
2019-12-05 17:17:33 -08:00
Isaac Visintainer
5a7c0b1181
permission-group-hook: fixed permission associate flow
2019-12-05 15:45:30 -08:00
Philip Monk
956a3c7420
eyre: add instructions to login page
2019-12-05 12:31:42 -08:00
Logan Allen
14dc580c06
chat-store: fix scrollback issue due to malformattedd peek
2019-12-05 12:18:21 -08:00
Philip Monk
1eeca16f1a
dns: give quieter errors
...
!! crashes the thread, so dojo prints a stack trace. An explicit
failure lets you give a custom error message.
2019-12-05 11:59:59 -08:00
Philip Monk
ddbfb53b28
drum: print tangs in order
2019-12-05 11:58:55 -08:00
Jared Tobin
5eec015343
chat-store: fix errant 'this'
...
6c938e1
resolved a merge conflict, but retained a reference to 'this'
from the wrong parent.
2019-12-05 21:18:11 +08:00
Jared Tobin
6c938e188d
Merge branch 'm/chat-store-eval' ( #2010 )
...
* m/chat-store-eval:
chat-store: only evaluate our own %code
Signed-off-by: Jared Tobin <jared@tlon.io>
2019-12-05 20:59:13 +08:00
Jared Tobin
9d8a1845fc
Merge branch 'no-larval-crash'
...
* no-larval-crash:
ames: don't crash on missing queued larval event
Signed-off-by: Jared Tobin <jared@tlon.io>
2019-12-05 17:05:02 +08:00
Ted Blackman
bee0b5803a
ames: don't crash on missing queued larval event
2019-12-05 17:04:24 +08:00
Jared Tobin
2047d6a676
Merge branch 'debug-release' ( #2029 )
...
* debug-release:
nix: enables debug symbols in release builds
Signed-off-by: Jared Tobin <jared@tlon.io>
2019-12-05 16:49:12 +08:00