Skip to content

Commit 9a1b9b4

Browse files
joemfbjoemfb
committed
Merge branch 'master' into release/next-vere
* master: (595 commits) grid: updating glob landscape: updating glob graph-store: clean up merge artefact interface: reduce %all-stats correctly docket: correctly en-vase a docket definition kiln: don't +mean the tang noun alongside the tang hood: scry for list of desks with empty desk name hood: remove needless weld hood: report %kids desk hash in +report-vats landscape: fix joining indicator in statusbar interface: reduce %saw-place correctly app-prefs: fixing logic around enabled pull-hook: add nice flag to kick poke graph-pull-hook: renegotiate subscriptions graph-store: Handle missing update-logs gracefully in scries arvo: update jamfiles landscape: correctly freeze graph-update-2 jael: on rekey, update life if moon tmp/ jamfiles btc: updating glob ...
2 parents 6c43748 + 103ba2c commit 9a1b9b4

File tree

1,221 files changed

+98672
-44566
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,221 files changed

+98672
-44566
lines changed

‎.gitattributes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,8 @@ bin/* filter=lfs diff=lfs merge=lfs -text
22
bin/*/* filter=lfs diff=lfs merge=lfs -text
33
pkg/arvo/**/*.css binary
44
**/package-lock.json binary merge=theirs
5+
pkg/arvo/tmp/garden.jam filter=lfs diff=lfs merge=lfs -text
6+
pkg/arvo/tmp/landscape.jam filter=lfs diff=lfs merge=lfs -text
7+
pkg/arvo/tmp/base.jam filter=lfs diff=lfs merge=lfs -text
8+
pkg/arvo/tmp/bitcoin.jam filter=lfs diff=lfs merge=lfs -text
9+
pkg/arvo/tmp/webterm.jam filter=lfs diff=lfs merge=lfs -text

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,5 @@ pkg/interface/link-webext/web-ext-artifacts
8282

8383
# Logs
8484
*.log
85+
86+
.vercel

‎.vercel/README.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
> Why do I have a folder named ".vercel" in my project?
2+
The ".vercel" folder is created when you link a directory to a Vercel project.
3+
4+
> What does the "project.json" file contain?
5+
The "project.json" file contains:
6+
- The ID of the Vercel project that you linked ("projectId")
7+
- The ID of the user or team your Vercel project is owned by ("orgId")
8+
9+
> Should I commit the ".vercel" folder?
10+
No, you should not share the ".vercel" folder with anyone.
11+
Upon creation, it will be automatically added to your ".gitignore" file.

‎.vercel/project.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"orgId":"EDiU8DZExvM9N4unZGYQbG3d","projectId":"prj_fbAU5smemBgtr5t8lsk5ZoT9zNtI"}

‎.vercelignore

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
bin
2+
doc
3+
extras
4+
nix
5+
pkg/arvo
6+
pkg/base-dev
7+
pkg/docker-image
8+
pkg/ent
9+
pkg/garden
10+
pkg/garden-dev
11+
pkg/ge-additions
12+
pkg/herb
13+
pkg/hs
14+
pkg/libaes_siv
15+
pkg/urbit
16+
sh

‎bin/multi-brass.pill

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:5159d6516c0b3d12b3c7f39f434ab769e99392dc94aa43add32bb2a91455c73a
3+
size 6121099

‎bin/multi.pill

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:4427b6e4a925502fe2e63087e190dfe0c77f75644dfe31a306de64d269b128f2
3+
size 14661883

‎bin/solid.pill

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:3cc76dec0e5110e35647a8a7341c5c1648d33eab636c067b4ce5893d13af86d8
3-
size 6755088
2+
oid sha256:8baf284490d8c7cfbad2481f1ef0d17a6bb05200bc179b78c1a8718461756a06
3+
size 12941119

‎default.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
/* Examples
23
34
Shared urbit and urbit-worker binaries:
@@ -105,6 +106,8 @@ let
105106

106107
solid = callPackage ./nix/pkgs/pill/solid.nix { };
107108

109+
marsSources = callPackage ./nix/pkgs/marsSources { };
110+
108111
urbit = callPackage ./nix/pkgs/urbit { inherit enableStatic; };
109112

110113
urcrypt = callPackage ./nix/pkgs/urcrypt { inherit enableStatic; };

‎lerna.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"packages": [
33
"pkg/npm/*",
44
"pkg/btc-wallet",
5-
"pkg/interface"
5+
"pkg/interface",
6+
"pkg/grid"
67
],
78
"version": "independent"
89
}

0 commit comments

Comments
 (0)