Commit Graph

2597 Commits

Author SHA1 Message Date
Hunter Miller
502f2e8a9c Merge branch 'hm/btc-wallet-conflict-resolution' into ea/master-dist-deconflict 2021-09-27 18:55:45 -05: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
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
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
f51ac34517
dojo: reset =dir during migration
The base desk is the new default. If we leave the dir untouched, for
most users this means they remain on home, which gets rendered
explicitly in the prompt since it's no longer the default desk.
2021-09-25 15:43:43 +04:00
Fang
dc5662b73e
dojo: finalize new +desk!generator syntax 2021-09-25 01:12:55 +04:00
Fang
9f89dadc41
dojo: support running other-desk generators
Syntax is +desk#gen. (We can probably find something nicer.)

:app|gen desugars to :app +desk#gen, where the desk is the desk the app
is running on.

:app|desk#gen currently broken, in the sense that the above desugaring
takes precedence.

+on-load just aborts any running user action to avoid having a
monstrously large state adapter.
2021-09-23 20:09:54 +02:00
Hunter Miller
c7cafd8e1a permalink: fixed path and spider case 2021-09-20 21:09:19 -05:00
Fang
da28fbfed9
Merge dist into m/distpilled 2021-09-20 19:35:51 +02:00
Liam Fitzgerald
143a8e08e6 various: fix dependencies & tests 2021-09-17 14:51:19 +10:00
Ted Blackman
3b30b67a3e Merge branch 'ted/kiln-warp' into m/distpilled, and
modify Kiln to listen for %writ's from Clay to track commits to Clay
that were not generated by Kiln itself.
2021-09-16 12:25:02 -04:00
Liam Fitzgerald
a433e4f911 Merge remote-tracking branch 'origin/dist' into lf/nu-hark-store 2021-09-14 12:40:52 +10:00
Liam Fitzgerald
f95a182071 spider: store desk for http response 2021-09-13 21:01:42 +10:00
Liam Fitzgerald
39a9ed4faa hood: fix update ordering
When we receive the %mere gift from clay, the kernel has not yet been
reloaded. This means any attempts to bump desks will fail, as they will
be bumped against the old kernel. Rectifies this by continuing the %base
desk update flow in +on-load, instead of +take-merge-main. Also adds a
wef=(unit weft) to the state in order to discriminate whether or not the
kernel has just been reloaded
2021-09-07 14:37:36 +10:00
Ted Blackman
6d7d168735 Revert "Merge branch 'dist' of github.com:urbit/urbit into dist"
This reverts commit f50f2cd1f3, reversing
changes made to 248b968550.
2021-09-06 21:13:07 +03:00
Ted Blackman
f50f2cd1f3 Merge branch 'dist' of github.com:urbit/urbit into dist 2021-09-06 18:22:49 +03:00
Ted Blackman
248b968550 kiln: |pause and |resume an app 2021-09-06 17:27:17 +03:00
Liam Fitzgerald
f24fbe3eba Merge remote-tracking branch 'origin/dist' into lf/nu-hark-store 2021-09-06 14:34:46 +10:00
Liam Fitzgerald
76e033c649 landscape: upgrade for new hark-store 2021-09-06 13:31:11 +10:00
Liam Fitzgerald
5bcc0e98c8 spider: store desk for http response 2021-09-02 10:44:49 +10:00
Ted Blackman
572e23e43d Merge branch 'ted/dist-temp' into dist 2021-08-31 02:34:48 +03:00
Liam Fitzgerald
b60aada75e spider: parameterize desk in http request 2021-08-26 12:13:15 +10:00
Ted Blackman
7bc19d04a4 hood: fix migration from master 2021-08-24 18:56:01 +03:00
Liam Fitzgerald
c6ee0944db dojo: improve autocomplete between desks 2021-08-24 13:23:44 +10:00
Ted Blackman
4dfc09d1a4 kiln: |suspend,|revive 2021-08-20 01:57:31 +03:00
janeway
fa894b9690 glob: update to 0v758lj.uf0s5.0nh3m.gunn6.942gj 2021-08-19 15:25:15 -07:00
janeway
6ab7f53fff glob: update to 0v4.e52ik.udm4j.6aus5.02b25.vomaj 2021-08-18 18:12:52 -07:00
ixv
5f56eb9a1b Merge branch 'lf/aqua-revive' 2021-08-18 17:36:01 -07:00
ixv
6cd4f6d751 aqua: assert pill type 2021-08-18 17:25:17 -07:00
Ted Blackman
6408baaa93 various: fix merge problems 2021-08-18 01:16:48 +03:00
Ted Blackman
616ab66f26 merge master; loosen :hood's updates 2021-08-11 19:23:36 +03:00
ryjm
54935ece34 dm-hook: reload agents on dm-hook state change
This fixes the %notify bug that prevented dms from coming through.
2021-07-29 14:43:02 -04:00
janeway
d76cf9ae8b
glob: update to 0v7.v4dng.o33qi.kc497.5jc02.ke5es 2021-07-29 11:51:48 +10:00
ixv
d951a28913 notify: conditional rewatch in on-load 2021-07-28 18:20:55 -07:00
ixv
df4a34c79a notify: drop card 2021-07-28 18:16:13 -07:00
ixv
0226bc0a7f agentio: fix bug with fact-all 2021-07-28 17:05:48 -07:00
ixv
83aaaa398a hood: start notify 2021-07-28 12:26:33 -07:00
ixv
25e61ba000 metadata-store: expose metadata to web scries 2021-07-28 12:19:11 -07:00
ixv
e0358d2103 notify: style cleanup 2021-07-28 12:19:11 -07:00
ixv
867e7721cc notify: initial app, mar, and sur 2021-07-28 12:19:11 -07:00
Liam Fitzgerald
3417927aef
aqua: address joe review 2021-07-26 15:30:23 +10:00
Ted Blackman
944c172f67 herm: move from %landscape to %base 2021-07-23 14:02:24 +03:00
janeway
ceed4b78d0
glob: update to 0v2.ifoe4.fbv35.aigir.66su4.fbspu 2021-07-23 13:53:54 +10:00
janeway
2f9044ab99
glob: update to 0v2.ifoe4.fbv35.aigir.66su4.fbspu 2021-07-23 11:46:06 +10:00
Liam Fitzgerald
de5118fa5f
graph-store: fix newest scry 2021-07-23 11:11:21 +10:00
Matilde Park
8f27e2ae53 Merge branch 'release/next-userspace' into release/2021-7-22 2021-07-22 12:54:40 -04:00
Philip Monk
d15d832ef4
Merge remote-tracking branch 'origin/master' into release/next-sys 2021-07-21 13:49:07 -04:00
Ted Blackman
442fa7617b spider: hack to make landscape http threads work 2021-07-21 11:56:03 +03:00
janeway
8ceb3d10e6
glob: update to 0v2.ifoe4.fbv35.aigir.66su4.fbspu 2021-07-21 17:14:12 +10:00
Liam Fitzgerald
fad3b240c2
graph-store: fix scries 2021-07-21 12:25:23 +10:00