Commit Graph

28924 Commits

Author SHA1 Message Date
Hunter Miller
318cb9f00e Merge branch 'master' into next/landscape 2022-01-05 16:59:32 -06:00
Philip Monk
04246b9c38
Merge pull request #5382 from urbit/philip/branches
meta: update branch conventions
2022-01-04 19:52:51 -07:00
Philip Monk
0cad4413ea
Merge pull request #5520 from urbit/update-contributing
readme: update CONTRIBUTING.md
2022-01-04 19:50:58 -07:00
drbeefsupreme
60e27fa077
readme: update CONTRIBUTING.md
This fixes some links and updates the git policy to reflect the use of
`next/` branches.
2022-01-04 16:20:29 -05:00
Philip Monk
e243d5adf6
landscape,garden: make build
Boot was broken, fixing the hark-note file mark and re-adding the
hark-store library fixed it.

This lets us push a new pill, which is necessary for the fix in #5434 to
actually work.

Fixes #5501
Fixes #5502
2021-12-18 22:54:49 -08:00
Joe Bryan
663934b5cf
Merge pull request #5478 from urbit/bh/remove-haskell-nix
build: remove urbit-king haskell releases and haskell.nix dependency
2021-12-17 20:36:21 -08:00
Edward Amsden
a50b7d0dff
[nix] track nixos-21.11 branch whenever niv updates, bump to include qemu-in-virtualization fix 2021-12-16 13:17:04 -06:00
fang
dd6b090bfa
Merge pull request #5454 from urbit/m/backport-nu-webterm
webterm: backport
2021-12-14 19:23:23 +01:00
fang
960f2b1ae2
webterm: v1.0.0 2021-12-14 17:17:32 +01:00
fang
fd375c1d90
herm: permission checks
Make sure herm can only be interacted with by the local ship.
2021-12-13 14:25:14 +01:00
fang
c7c601c041
herm: avoid trailing empty path segments
append /view to the existing subscription paths to "wrap" the possibly
empty path segment of the session name.
2021-12-13 14:24:20 +01:00
Jōshin
150e9e8023
Merge pull request #5483 from urbit/jo/remove-haskell-nix
pmnsh: update secp256k1
2021-12-09 10:10:06 -08:00
Jōshin
8396f1e39e
pmnsh: update secp256k1 configure flags
Just used the ones from the most recent nixpkgs, except I kept
--disable-shared.
2021-12-09 09:16:07 +00:00
Brendan Hay
dbb6a09564
secp256k1: use nixpkgs provided secp256k1 and add to sources-pmnsh 2021-12-09 09:15:13 +01:00
fang
b20abb8841
webterm: remove border, let term live in page
This also helps conceal some xterm resizing inaccuracies.
2021-12-09 00:36:50 +01:00
Hunter Miller
3ee9132416 theme: cleaning up a few mismatches 2021-12-08 17:00:25 -06:00
Liam Fitzgerald
ac2337a6a7 landscape: bump version, glob 2021-12-08 16:46:59 -05:00
Liam Fitzgerald
fb5151bf4b
Merge pull request #5479 from urbit/lf/hide-invite-if-joined
interface: hide invite if joined
2021-12-08 16:40:48 -05:00
Liam Fitzgerald
0979b8fc39 interface: hide invite if already joined 2021-12-08 15:24:32 -05:00
Liam Fitzgerald
b8da026c5e Merge branch 'next/groups' 2021-12-08 13:42:49 -05:00
fang
81a45608a0
webterm: handle old-style blits and belts
Additions and changes easily distinguishable for extermination once the
new backend lands.
2021-12-08 17:12:38 +01:00
Brendan Hay
4f1acce662
build: correct lmdb static builds 2021-12-08 16:08:37 +01:00
Brendan Hay
d9ba577721
build: explicitly override h2o build platforms to support darwin 2021-12-08 10:20:50 +01:00
Brendan Hay
345565b0dd
ci: upgrade cachix/install-nix-action from v13 -> v16 2021-12-08 10:08:59 +01:00
Brendan Hay
16379db9b0
build: remove haskell related nix code and haskell.nix dependency
* Upgrades the nixpkgs pin to 21.11.
* Removes nix code, sources, and attributes related to haskell.nix and
  the code under pkg/hs.
* Continuous integration no longer builds (or packages/releases)
  urbit-king (haskell).
* To continue to developing any haskell code under pkg/hs it's left as
  a user exercise uto install and configure GHC/Stack.

As a consequence running nix-shell should be considerably more
performant and requires downloading or building less dependencies.
2021-12-08 10:06:42 +01:00
Philip Monk
1ffdad8719
Merge pull request #5439 from ynx0/dev-fixes
meta: fix various issues in file tree for development
2021-12-07 19:07:34 -08:00
Liam Fitzgerald
1893ffd651 landscape: update glob 2021-12-07 11:23:50 -05:00
Liam Fitzgerald
4fb50c8d7d
Merge pull request #5476 from urbit/lf/fix-redirect-behaviour
interface: address design nits for group joining
2021-12-07 11:12:23 -05:00
Liam Fitzgerald
ba9cfd8e92 interface: do not redirect to joined group automatically 2021-12-07 11:04:36 -05:00
Liam Fitzgerald
119805fd04 interface: hide aborted requests 2021-12-07 11:02:23 -05:00
Liam Fitzgerald
ee67f6d49e
Merge pull request #5388 from urbit/lf/scry-invite-store
invite-store: change /all scry to return %invite-update
2021-12-07 10:42:18 -05:00
Liam Fitzgerald
d58666d4c7 invite-store: change /all scry to return %invite-update 2021-12-06 15:28:26 -05:00
Liam Fitzgerald
8be81d7dc5
Merge pull request #5469 from urbit/hm/group-join-fixes
interface: minor group join fixes
2021-12-06 14:34:35 -05:00
Liam Fitzgerald
641cf79894 interface: fix tsc 2021-12-06 14:16:17 -05:00
Liam Fitzgerald
9de35cfd70 webterm: update imports 2021-12-06 10:05:54 -05:00
Liam Fitzgerald
cbc1b910fd @urbit/api: move term types 2021-12-06 10:05:36 -05:00
Liam Fitzgerald
3fa572b53a webterm: fix broken imports 2021-12-06 10:05:14 -05:00
Liam Fitzgerald
3b3564cae9 webterm: update package name for lerna 2021-12-06 10:04:36 -05:00
Liam Fitzgerald
97f334e819 interface: address hunter review 2021-12-06 09:38:20 -05:00
Liam Fitzgerald
4dbf4a9e9f
Merge pull request #5472 from urbit/jo/graph-store-mark
landscape: correct mark
2021-12-06 09:36:15 -05:00
fang
3df0efd7c6
Merge pull request #5473 from urbit/m/base-atom
pkg: include atom mark in base-dev
2021-12-06 15:11:12 +01:00
fang
4bff1df7e8
pkg: include atom mark in base-dev 2021-12-05 14:50:50 +01:00
Jōshin
ffc2d8f0b9
landscape: correct mark
This was crashing before due to a `[%no-cast-from %graph-update-3 %graph-update]`. With this change it produces output.
2021-12-04 20:55:15 -08:00
Hunter Miller
9e3ed16c76 Merge branch 'master' into next/landscape 2021-12-03 16:44:51 -06:00
Liam Fitzgerald
04d88ae5e7 interface: refine spacing 2021-12-03 15:16:50 -05:00
Liam Fitzgerald
dff232816d interface: fix invite notifications 2021-12-03 15:16:13 -05:00
Liam Fitzgerald
413b4b8c9f landscape: add invite declination 2021-12-03 14:42:39 -05:00
Liam Fitzgerald
e655b84f10 landscape: prevent reflow jank in group summary on load 2021-12-03 12:39:46 -05:00
Liam Fitzgerald
f863a83d4c interface: fix unjoined graph permalink redirect 2021-12-03 12:39:24 -05:00
Hunter Miller
87337d0e7a join: automatically join when done 2021-12-02 17:06:42 -06:00