63 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
Fang	1640ff6d38	dist: add glob mark, merge base-dev into others ... This had fallen off the wagon at some point.	2021-09-27 13:34:23 +04:00
Ted Blackman	2544b79e4b	kiln,desks: remove %fish from /desk/bill; fix some other kiln issues	2021-09-26 17:03:26 -04:00
Liam Fitzgerald	862eab4097	garden,landscape: update globs	2021-09-24 14:41:56 +10:00
Liam Fitzgerald	e1ee384e05	interface: rename Landscape -> Groups	2021-09-24 10:03:09 +10:00
Ted Blackman	6bf3a7fe4c	Merge branch 'ted/dist-migrate-wip' into dist	2021-09-23 18:12:09 -04:00
Ted Blackman	c80fb82318	clay,kiln,landscape/notify: migration runs	2021-09-23 18:07:13 -04:00
Liam Fitzgerald	5dadee5375	Merge remote-tracking branch 'origin/dist' into m/dist-ames-glob-fixes	2021-09-23 15:50:55 +10:00
Liam Fitzgerald	42e19b53f6	grid, interface: glob	2021-09-23 15:08:31 +10:00
Liam Fitzgerald	57d0a7def4	group-view: do not crash on rejoin ... Fixes urbit/lansdcape#1113	2021-09-23 12:11:05 +10:00
Liam Fitzgerald	dab1084842	landscape: update glob, again	2021-09-22 14:47:14 +10:00
Liam Fitzgerald	2804c86587	interface: fixed glob	2021-09-22 14:45:11 +10:00
Liam Fitzgerald	6c6b7a526c	grid, interface: glob	2021-09-22 14:25:01 +10:00
Liam Fitzgerald	eedf6edf4d	garden,landscape: update globs	2021-09-22 10:55:11 +10:00
Liam Fitzgerald	e0a029dbdf	landscape: update glob	2021-09-21 15:13:53 +10:00
Liam Fitzgerald	7194b3586c	garden,landscape: update globs	2021-09-21 14:28:45 +10:00
Liam Fitzgerald	848f52a8ad	Merge remote-tracking branch 'origin/dist' into lf/dist-fixes	2021-09-21 13:44:12 +10:00
Liam Fitzgerald	9cc2d07a4e	dm-hook: notify on pending	2021-09-21 13:34:09 +10:00
Hunter Miller	e9ac2bd9cf	types: correcting path type v2	2021-09-20 20:34:23 -05:00
Hunter Miller	7aefdd957d	Merge branch 'dist' into hm/landscape-app-link	2021-09-20 20:04:03 -05:00
Liam Fitzgerald	afc42760ea	grid, interface: glob	2021-09-20 14:39:49 +10:00
Liam Fitzgerald	2b9df91f2a	interface: update landscape glob	2021-09-20 12:17:54 +10:00
Hunter Miller	2dbfbedd05	app-reference: correcting structure and hoon typings	2021-09-17 18:25:32 -05:00
Liam Fitzgerald	7b9b0c62b7	various: update symbolic merges	2021-09-17 14:54:01 +10:00
Liam Fitzgerald	143a8e08e6	various: fix dependencies & tests	2021-09-17 14:51:19 +10:00
Liam Fitzgerald	caad190e22	garden-dev: fix hark-store sur/ packaging	2021-09-17 10:51:30 +10:00
Liam Fitzgerald	8a457c0762	landscape: update hark hooks for timeboxing	2021-09-17 10:48:38 +10:00
Hunter Miller	d786c8d677	permalink: app embeds	2021-09-16 16:05:54 -05: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	2a15658d2e	interface: fix packaging	2021-09-13 22:04:52 +10:00
Liam Fitzgerald	e4fad4f7b1	various: fix packaging	2021-09-10 14:37:17 +10:00
Liam Fitzgerald	553e848554	various: update globs	2021-09-10 14:31:30 +10:00
Liam Fitzgerald	ce919f15fd	hark-graph-hook: handle migration case	2021-09-10 13:45:43 +10:00
Liam Fitzgerald	8745980f56	landscape: amend for setting-store namespacing	2021-09-09 11:59:25 +10:00
Liam Fitzgerald	e08ac991b3	garden: move settings-store	2021-09-09 09:52:56 +10: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	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
Liam Fitzgerald	962ab54f40	garden: move hark-store	2021-09-01 14:36:31 +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
Liam Fitzgerald	b60aada75e	spider: parameterize desk in http request	2021-08-26 12:13:15 +10:00
Liam Fitzgerald	2d43877b15	Merge remote-tracking branch 'origin/ted/dist' into lf/kiln-json	2021-08-23 11:56:51 +10:00
Ted Blackman	6408baaa93	various: fix merge problems	2021-08-18 01:16:48 +03:00
Ted Blackman	70bba97180	hark-graph-hook: fix merge artifact	2021-08-12 17:08:20 +03:00
Liam Fitzgerald	a8dfca8246	Merge remote-tracking branch 'origin/ted/dist' into lf/dist-v2	2021-08-12 11:42:39 +10:00
Ted Blackman	616ab66f26	merge master; loosen :hood's updates	2021-08-11 19:23:36 +03:00
Liam Fitzgerald	b51877764a	landscape: update manifests	2021-08-11 14:40:42 +10:00