Commit Graph

111 Commits

Author SHA1 Message Date
Yaseen
94d55f1e33 story: misc changes 2022-02-04 12:49:10 -05:00
Yaseen
e1f8f4db45 story: fix error with null jug 2022-02-02 23:35:55 -05:00
Yaseen
b7e0b28220
Merge branch 'urbit:master' into story 2022-01-30 16:03:48 -05:00
Yaseen
9afc2b8258 story: diff: use dif-ju and uni-ju 2022-01-30 16:03:10 -05:00
Yaseen
68da061f47 story: update outdated diff types 2022-01-30 16:02:47 -05:00
Yaseen
f723088f4d story: create fundamental jug operations 2022-01-30 16:02:25 -05:00
Yaseen
e791c501a0 story: fix lib import 2022-01-30 16:01:45 -05:00
Yaseen
08cd2feed7 story: use new parser in mark 2022-01-30 16:01:31 -05:00
Yaseen
10e252bca0 story: add new parsers to lib 2022-01-30 16:01:00 -05:00
Yaseen
b87a754622 story: rip out parsers 2022-01-30 16:00:38 -05:00
Yaseen
75d6882b51 story: fix to-text arms 2022-01-30 15:59:58 -05:00
Yaseen
9286d89fa2 story: add chapter type 2022-01-30 15:59:06 -05:00
Yaseen
8787c43c83 story: cleanup 2022-01-30 15:58:35 -05:00
Yaseen
1e871e3c35 story: use crip/trip where necessary 2022-01-26 18:07:00 -05:00
Yaseen
484772e2b7 story: misc changes 2022-01-26 11:41:22 -05:00
Yaseen
d8450c2892 story: use lib arms in txt:grow 2022-01-26 11:41:08 -05:00
Yaseen
3105176df9 story: handle conflicts for updated $story type (mvp) 2022-01-26 11:39:18 -05:00
Yaseen
b0a666d2eb story: add lib/story.hoon 2022-01-26 11:37:02 -05:00
Yaseen
194f3d55c6 story: make sur file an lead core 2022-01-25 13:52:40 -05:00
Yaseen
606acd8fa2 story: restore previous mark functionality, ignore conflicts 2022-01-21 11:50:05 -05:00
Yaseen
f2b8a1b7f7 story: update sur file 2022-01-20 15:54:37 -05:00
Yaseen
df9e5175d1 story: create sur file and extract type 2022-01-16 22:36:52 -05:00
Yaseen
6a25f8ffca story: add custom ++grad core 2022-01-15 23:37:51 -05:00
Yaseen
e5642b5ff3 story: rename door sample to tale 2022-01-15 23:26:33 -05:00
jose
f158ebe312
Merge pull request #5532 from urbit/azimuth/jael-fix
jael: give new private key to subscribers on %keys new-event
2022-01-12 12:47:21 +01:00
yosoyubik
4724c32d3d pill: load azimuth snapshot file with mime mark 2021-12-14 09:40:34 +01:00
yosoyubik
f6dca03786 pill: restore solid pill 2021-12-10 16:19:59 +01: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
yosoyubik
fb2c078fde pill: load azimuth snapshot as mime in file-ovum 2021-12-09 07:28:57 +01:00
fang
35e820bfe6
Merge branch 'next/arvo' into m/shoe-scry 2021-12-08 13:13:54 +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
yosoyubik
81eb6ae247 pill: add azimuth snapshot 2021-12-07 16:13:39 +01: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
Yaseen
6982735650 story: make sure terminating newline is present in text encoding 2021-11-25 11:38:06 -05:00
Yaseen
7564f922a2 base-dev: initial mime:grab impl for story mark 2021-11-19 16:10:47 -05:00
Yaseen
90cc57d062 base-dev: fix story to text encoding format 2021-11-19 16:09:57 -05:00
Yaseen
8689a165c8 base-dev: create story mark for storing commit messages 2021-11-19 14:50:24 -05:00
Yaseen
8819d61ff6 symlink arvo/lib/azimuth.hoon to base-dev/lib/azimuth.hoon 2021-11-19 12:33:12 -05:00
Yaseen
1a7708ba45 base-dev: remove sys.kelvin 2021-11-19 12:15:07 -05:00
Philip Monk
a2a89d3532
Merge remote-tracking branch 'origin/next/arvo' into philip/roller 2021-11-16 13:58:57 -08:00
Yaseen
0a2bd43d1d base-dev: remove outdated desk.bill 2021-11-12 15:23:28 -05:00
Philip Monk
7b96cf7a82
kiln: don't revive apps at wrong kelvin 2021-11-10 22:17:05 -08:00
Philip Monk
9fc74f60d9
Merge remote-tracking branch 'origin/master' into philip/roller 2021-11-09 22:03:25 -08:00
Liam Fitzgerald
2fa9c8e494 kiln: respect .liv flag in +get-apps-want
Accounts for the value of .liv in +get-apps-want, such that if a desk
is suspended then +get-apps-want should always return the empty list.
2021-11-08 16:43:48 -06:00
fang
0ec3d5111d
Merge branch 'master' into naive/roller 2021-10-26 20:46:32 +02:00
fang
ef90e9db31
Merge pull request #5233 from urbit/m/eip-1559-plus
ethereum: add signing support for eip-1559 transactions
2021-10-08 19:16:37 +02:00
fang
5131d3165d
Merge branch 'release/next-userspace' into m/eip-1559-plus 2021-10-08 20:42:37 +04:00
fang
a6bc01e791
hood: no longer work around bad clay %u behavior
Previously it would crash for non-existent desk. No longer does, so we
don't need to avoid this.
2021-10-07 21:58:56 +04:00
Jake Miller
af2a1bfb10
Merge pull request #5306 from urbit/jm/fix-ames-glob
spider, docket: fix versioning and validate-mark
2021-10-06 15:01:19 -04:00