Commit Graph

28888 Commits

Author SHA1 Message Date
Jōshin
1c1852f30d
Merge pull request #5486 from mrdomino/next/arvo
next/arvo: merge master
2021-12-10 11:00:43 -08:00
Jōshin
d94aa5704b
Merge branch 'master' into next/arvo
Conflicts:
	pkg/arvo/lib/azimuth.hoon

This file was turned into a symlink to pkg/base-dev/lib/azimuth.hoon on
one side of the fork, and meanwhile edited on the other side of the fork
(to update ecliptic to the new address for the WSTR fix.)

The two sides of the fork both had different outdated addresses in
base-dev's azimuth.hoon file, and Git's UI helpfully refilled the
contents of arvo's azimuth.hoon so that it showed a merge conflict with
an empty diff.

Resolved by reading out HEAD:pkg/arvo/lib/azimuth.hoon into
pkg/base-dev/lib/azimuth.hoon and manually recreating the symlink.
2021-12-10 08:24:32 +00: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
5a334edfef
Merge pull request #5294 from urbit/m/shoe-scry
shoe: allow scrying into the underlying shoe app
2021-12-08 13:14:22 +01:00
fang
35e820bfe6
Merge branch 'next/arvo' into m/shoe-scry 2021-12-08 13:13:54 +01:00
Philip Monk
5c20b63a5a
Merge pull request #5412 from urbit/jb/safer-dojo
dojo: improve safety of mark conversion
2021-12-07 20:20:53 -08:00
Philip Monk
82372be48b
Merge pull request #5427 from ynx0/hoon-lf-fix
meta: enforce LF line endings for hoon files
2021-12-07 20:11:24 -08: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
Philip Monk
7583d33cf1
Merge pull request #5436 from urbit/m/claz-lockup-txs
claz: better linear lockup ops support
2021-12-07 18:41:55 -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
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
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
fang
1cb2b56f55
Merge pull request #5466 from urbit/m/nucliptic
azimuth: update ecliptic address
2021-12-02 21:47:52 +01:00
fang
2c71a5d79d
azimuth: update ecliptic address
To account for the recent upgrade.
2021-12-02 21:45:39 +01:00
Liam Fitzgerald
fe84339747 landscape: update glob, version 2021-12-02 14:07:41 -05:00
Liam Fitzgerald
0af4d998c1
Merge pull request #5449 from urbit/lf/group-view-refactor
groups: refactor joining process
2021-12-02 12:09:09 -05:00
Liam Fitzgerald
9658d45dac
Merge pull request #5461 from urbit/lf/revive-notify
notify: upgrade for new hark-store, miscellaneous improvements
2021-12-02 12:08:26 -05:00
Liam Fitzgerald
f68c4db4d2 notify: address mark review 2021-12-02 10:19:22 -05:00
Liam Fitzgerald
12cc826a38
Merge pull request #5462 from urbit/lf/fix-moon-invites
invite-hook: use equality instead of team:title
2021-12-02 09:06:01 -05:00
Liam Fitzgerald
77d0071315
Merge pull request #5465 from urbit/ixv/publish-url-fix 2021-12-02 08:24:16 -05:00
fang
b67830e800
Merge pull request #5457 from h5gq3/patch-1
zuse: allow " in xml text nodes during parsing
2021-12-02 12:15:11 +01:00
ixv
0b678949e1 interface: fix publish url preprocessing 2021-12-01 15:48:41 -08:00
Hunter Miller
41b17ce7be
Merge pull request #5463 from urbit/hm/color-changer-fix
groups: fixing color input
2021-11-30 21:17:56 -06:00
Hunter Miller
98496c1bfd bg-color: changing to always store ux, optimizing displayform and colorinput 2021-11-30 16:59:16 -06:00
Hunter Miller
39b4749b65 api: handling 000000 hexToUX 2021-11-30 16:56:49 -06:00
Liam Fitzgerald
eb4cce0da7 invite-hook: use equality instead of team:title
Fixes a bug that prevented moons from being invited
2021-11-30 16:19:24 -05:00
Liam Fitzgerald
c6a68ced13 notify: prevent memory leak, cleanup notifications when dismissed 2021-11-30 13:41:51 -05:00
Liam Fitzgerald
4c47bc3ba0 notify: rework subscription wires and rewatch 2021-11-30 13:05:59 -05:00
Liam Fitzgerald
1f0465c1d6 notify: update for new hark-store 2021-11-30 11:31:46 -05:00
Liam Fitzgerald
accba6a3ea landscape: add %hark-note mark 2021-11-30 11:25:48 -05:00
Liam Fitzgerald
5f52ec9ad6 garden: move /+ hark-store into -dev 2021-11-30 11:25:30 -05:00