urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-22 18:31:44 +03:00
Code Issues Packages Projects Releases Wiki Activity
27,096 Commits 768 Branches 10 Tags 215 MiB
0dfac89e26
Commit Graph

27096 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Liam Fitzgerald
0dfac89e26 grid: permalink to apps and treaties 2021-09-08 13:04:03 +10:00
Liam Fitzgerald
b3e634db48 treaty: request treaties from outside alliance 2021-09-08 12:59:05 +10:00
Liam Fitzgerald
999ce96112 grid: registering protocol handler in settings 2021-09-08 12:58:02 +10:00
Ted Blackman
f7970cbac0 kiln: minor cleanup 2021-09-07 21:57:55 +03:00
Ted Blackman
cceca0ad12
Merge pull request #5207 from urbit/lf/dist-wireup 
dist: fix update ordering in kiln, wire to UI
 2021-09-07 21:37:06 +03:00
Liam Fitzgerald
8eaf2310e0 kiln: add kiln-bump mark 2021-09-07 14:50:31 +10:00
Liam Fitzgerald
56893092e1 grid: bump desk from ui 2021-09-07 14:47:49 +10:00
Liam Fitzgerald
26c36ac588 @urbit/api: update kilnBump poke 2021-09-07 14:46:44 +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
83be5162ed docket: manual merge of @Fang- web glob upload 2021-09-06 22:37:13 +03:00
Ted Blackman
18019b3eb4 minor cleanups 2021-09-06 21:59:24 +03:00
Ted Blackman
5fbaa143d5 fix find/replace miss 2021-09-06 21:59:13 +03:00
Ted Blackman
973ab3de11 docket: rename tag in $glob-location 2021-09-06 21:33:51 +03:00
Ted Blackman
8d523eed8e garden/desk.docket: fix commented-out glob-http 2021-09-06 21:33:01 +03:00
Ted Blackman
f58d115ce5 Merge remote-tracking branch 'ryjm/jm/ship-globs' into dist 2021-09-06 21:29:38 +03: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
1c3384177b
Merge pull request #5199 from urbit/lf/spider-desk 
spider: store desk for http response
 2021-09-06 08:20:21 +10:00
Liam Fitzgerald
5bcc0e98c8 spider: store desk for http response 2021-09-02 10:44:49 +10:00
Liam Fitzgerald
9c32c502d8 lib/versioning: parameterise desk 2021-09-02 09:06:06 +10:00
Liam Fitzgerald
1793157cfa graph-push-hook: parameterise desk 2021-09-02 08:58:10 +10:00
Ted Blackman
119547011a symlink %base-dev and %garden-dev into %landscape 2021-09-02 00:39:55 +03:00
Ted Blackman
f3e15396f3 %garden-dev desk; also cleaned up %base-dev 2021-09-02 00:37:56 +03:00
ryjm
ad8f6f681e docket: download globs over ames 
Kind of a pain to test, need a better way to insert a `charge` directly.
Either that or rework `chad`, but I don't entirely understand why the
`chad` lifecycle is the way it is.
 2021-09-01 02:22:54 -04:00
Ted Blackman
63fac6bec2 kiln: parameterize +bump on kelvin 2021-09-01 03:00:40 +03:00
Ted Blackman
e0874f22fa kiln: revise +bump 2021-09-01 02:43:25 +03:00
Hunter Miller
0351220374 types: fixing type issues and updating grid glob 2021-08-31 14:59:32 -05:00
Hunter Miller
0b22ee3bb5 leap: making leap transitions more direct 2021-08-31 12:57:11 -05:00
Liam Fitzgerald
967a074734 garden: fix misc breakage from merge 2021-08-31 11:05:10 +10:00
Liam Fitzgerald
cdbb44f736 garden: update desk.docket 2021-08-31 10:02:08 +10:00
Hunter Miller
2724849bb7
Merge pull request #5194 from urbit/hm/grid-help-and-support 
grid: help and support
 2021-08-30 18:47:08 -05:00
Hunter Miller
86875ad483
Merge pull request #5175 from urbit/hm/grid-system-preferences 
grid: implementing preferences menu ui
 2021-08-30 18:42:28 -05:00
Hunter Miller
2d0eb3178f Merge branch 'dist' into hm/grid-system-preferences 2021-08-30 18:41:43 -05:00
Ted Blackman
572e23e43d Merge branch 'ted/dist-temp' into dist 2021-08-31 02:34:48 +03:00
Liam Fitzgerald
f4fb4bc7a9
Merge pull request #5177 from urbit/lf/grid-kiln 
grid: Graft prototype onto API
 2021-08-31 09:24:08 +10:00
Ted Blackman
844386076f %base: symlinks; some -test tests fail 2021-08-30 20:39:37 +03:00
Ted Blackman
f277c9f1ae pkg/symbolic-merge.sh from @Fang- 2021-08-30 20:19:16 +03:00
Hunter Miller
f816b9af40
Merge pull request #5187 from urbit/hm/grid-system-update-flow 
grid: stateful notification link and leap bug fixes
 2021-08-30 10:46:50 -05:00
Hunter Miller
38b1576bcc leap: normalizing desk prop and fixing bugs 2021-08-27 12:25:16 -05:00
Ted Blackman
5f4c02c6d2 bin/solid.pill 2021-08-27 18:38:20 +03:00
Ted Blackman
91714f5579 lull,dill,gall,kiln: move %pyre to :agent:gall 2021-08-27 18:06:53 +03:00
Ted Blackman
453c2900da bin/solid.pill 2021-08-27 17:39:20 +03:00
Ted Blackman
68a80660b2 kiln: don't die so easily in +bump 2021-08-27 17:38:30 +03:00
Liam Fitzgerald
9053a994b8 garden: fix varable shadow 2021-08-27 17:13:01 +10:00
Liam Fitzgerald
2cce688d6e garden: update desk.docket 2021-08-27 13:35:41 +10:00
Liam Fitzgerald
f8edf723e0 kiln: add vats-diff mark 2021-08-27 13:19:45 +10:00
Liam Fitzgerald
b1ff1eb3ff treaty: fix allied treaties query 2021-08-27 12:24:59 +10:00
Liam Fitzgerald
54eea393b6 various: update globs 2021-08-26 13:24:21 +10:00
Liam Fitzgerald
76cc80af6c bitcoin: split into seperate desk 2021-08-26 13:00:58 +10:00