Hunter Miller
8bd405c00f
tile: improved status rendering
2021-09-27 19:33:24 -05:00
Hunter Miller
2358bb5408
tile: moving status to predictable area
2021-09-27 19:08:08 -05:00
Hunter Miller
9f45dce312
Merge branch 'dist' of github.com:urbit/urbit into dist
2021-09-27 18:57:16 -05:00
Hunter Miller
72e3aca57c
Merge branch 'ea/master-dist-deconflict' into dist
2021-09-27 18:56:49 -05:00
Hunter Miller
502f2e8a9c
Merge branch 'hm/btc-wallet-conflict-resolution' into ea/master-dist-deconflict
2021-09-27 18:55:45 -05:00
Ted Blackman
855e97d17a
kiln: update other agents on kernel updates
2021-09-27 19:34:15 -04:00
Hunter Miller
5272346cb8
btc-wallet: manual merge from master to resolve conflicts
2021-09-27 17:28:30 -05:00
Fang
18701b2ad2
kiln: always check local desk when adjusting dudes
...
We do not care about what's on foreign, the local desk is the thing
we're taking action on. This is more robust in the face of absent
information about foreign desks etc.
Also stops pretending to take-commet during take-merge-main. We'll get a
separate commit event.
2021-09-28 00:57:38 +04:00
Fang
18bad9c423
gall: give correct %gu results
...
Give false for suspended agents, instead of always giving true if the
agent exists.
2021-09-28 00:22:52 +04:00
Hunter Miller
8d5e4e797d
Merge branch 'dist' of github.com:urbit/urbit into dist
2021-09-27 15:10:31 -05:00
Fang
4785dbbee5
docket: %leave glob subscriptions if necessary
...
If we're about to re-%watch on the same wire, we need to %leave first to
avoid getting into a duplicate wire situation.
2021-09-27 23:57:39 +04:00
Hunter Miller
e8d6e28ae8
tile: handle hung chads better
2021-09-27 14:11:29 -05:00
Edward Amsden
02d2185eb3
move hoons to base-dev
2021-09-27 15:10:19 -04:00
Ted Blackman
3ed2f26f59
bin/multi.pill
2021-09-27 14:54:52 -04:00
Ted Blackman
7665e75849
manual merge @liam-fitzgerald misc. fixes PR
2021-09-27 14:50:58 -04:00
Ted Blackman
9084ac16fd
bin/multi.pill
2021-09-27 14:43:10 -04:00
Ted Blackman
a869a75e4c
pkg/arvo/tmp: update jamfiles
2021-09-27 14:35:11 -04:00
Ted Blackman
c947f899e6
-jam-all-desks: prevent recursive tempfile cancer
2021-09-27 14:20:44 -04:00
Hunter Miller
d02d25bfa3
suspend-app: even simpler copy
2021-09-27 13:15:58 -05:00
Hunter Miller
31283c2b58
suspend-app: updating to clearer copy
2021-09-27 12:54:48 -05:00
Hunter Miller
a24656cc36
Merge branch 'dist' of github.com:urbit/urbit into dist
2021-09-27 11:55:03 -05:00
Hunter Miller
fa781bed5d
notifications: cleaning up system references
2021-09-27 11:54:55 -05:00
Edward Amsden
8484a87399
updated base.jam
2021-09-27 12:52:16 -04:00
Edward Amsden
20104b056b
dojo: fix house-6 type to use session-6 instead of session
...
Co-authored-by: Fang-
2021-09-27 12:39:06 -04:00
Hunter Miller
641975ba39
vatmeta: fixing potential null ref
2021-09-27 10:35:37 -05:00
Fang
934c32d401
dojo: !< the vase like a normal person
...
It was never broken to begin with.
2021-09-27 19:12:39 +04:00
Fang
ca6636b149
kiln: ensure +vats engine always initialized
...
This was not the case for +poke-install, leading us to write a vat to
state under the %$ desk.
2021-09-27 15:06:47 +04:00
Fang
82ab1c04c2
dist: track deskjams properly
2021-09-27 13:57:16 +04:00
Fang
deade98d02
dist: update pills and jams
2021-09-27 13:52:22 +04:00
Fang
1640ff6d38
dist: add glob mark, merge base-dev into others
...
This had fallen off the wagon at some point.
2021-09-27 13:34:23 +04:00
Ted Blackman
ede1976745
kiln: partial fixes for +take-download scry crash
2021-09-27 00:08:11 -04:00
Ted Blackman
733f7c5bcc
bin/multi.pill
2021-09-26 22:26:28 -04:00
Ted Blackman
9aa8566a6e
-jam-all-desks
2021-09-26 22:03:13 -04:00
Ted Blackman
84f306532c
sur/hood: fix uninitialized foreign desk crash
2021-09-26 21:54:36 -04:00
Ted Blackman
78d1dfb2f8
bin/multi.pill
2021-09-26 21:18:02 -04:00
Ted Blackman
bc7c2abe50
lib/pill: remove dead imports
2021-09-26 18:18:34 -04:00
Ted Blackman
cd39b6e223
bin/multi.pill
2021-09-26 17:33:43 -04:00
Ted Blackman
cac8fd1226
bin/solid.pill
2021-09-26 17:18:47 -04:00
Ted Blackman
2544b79e4b
kiln,desks: remove %fish from /desk/bill; fix some other kiln issues
2021-09-26 17:03:26 -04:00
Fang
f9675040d1
dist: include desk jam files for livenet upgrade
...
These are required to ship alongside the rest of /pkg/arvo in the
"upgrade from master" case.
2021-09-27 00:31:20 +04:00
Edward Amsden
5181cc40c1
Merge pull request #5256 from urbit/ea/fix-dist-urbit-tests
...
nix: fix broken symlinks in arvo and ropsten-patched arvo
2021-09-26 15:37:45 -04:00
Ted Blackman
54e7f31d25
kiln: minor print cleanup
2021-09-26 15:32:27 -04:00
Edward Amsden
25d32e1d5d
nix: fix broken symlinks in arvo and ropsten-patched arvo
2021-09-26 15:26:48 -04:00
Fang
665be9709d
webterm: symbolic-merge base-dev and garden-dev
2021-09-26 22:14:40 +04:00
Fang
c9f8e56ecc
pill: update
2021-09-26 22:06:41 +04:00
Fang
09c74dbaff
docket: fix "do we have this glob yet" check
...
We were incorrectly assuming we were comparing against a unit value.
Also makes a ~| more useful.
2021-09-26 21:55:22 +04:00
Fang
131cd82fc8
docket: include hash and target in glob wires
...
To avoid running into "duplicate wire" situations when we're just trying
to request the latest thing.
Additionally now does hash validation on http globs, and just silently
no-ops if the result we got came from a previous request.
2021-09-26 21:53:13 +04:00
Fang
059fb9e1ee
dbug: fix dashboard for the softdist age
...
We can no longer rely on landscape to be installed and serving a
channel.js, so we bring our own.
App discovery works through gall now. We can only ask per desk though,
so we still need to talk to clay for the set of desks.
2021-09-26 14:21:54 +04:00
Fang
2836fbde50
docket: better hash mismatch output
...
Could be useful to know both hashes when a mismatch happens.
2021-09-26 12:49:27 +04:00
Ted Blackman
38767e5dee
kiln: don't merge %kids from random desks
2021-09-26 01:07:45 -04:00
