Commit Graph

338 Commits

Author SHA1 Message Date
Steve Dee
c8655dbeca Merge branch 'master' into newbreach
Took master's pill.

Conflicts:
	Makefile
	urb/urbit.pill
2014-04-16 10:53:50 -07:00
C. Guy Yarvin
2e0dbf2ecf Merge branch 'master' of github.com:urbit/urbit 2014-04-15 18:36:43 -07:00
C. Guy Yarvin
f60a3e31b2 Eyre console stuff. 2014-04-15 18:35:25 -07:00
Steve Dee
680b666026 Generate tree diffs, comment out jamfile umph 2014-04-15 18:28:38 -07:00
Steve Dee
69ef62338b Apply tree diffs 2014-04-15 18:28:38 -07:00
C. Guy Yarvin
c899e40277 Merge branch 'master' of github.com:urbit/urbit 2014-04-15 17:49:22 -07:00
C. Guy Yarvin
7db0bbf04b Add @ui. 2014-04-15 17:49:11 -07:00
Steve Dee
93193477cc Don't generate diffs we can't apply 2014-04-15 17:43:15 -07:00
Steve Dee
1d347ede31 Tree edit 2014-04-15 16:47:57 -07:00
Steve Dee
79e34e3929 Map union jet 2014-04-15 13:07:11 -07:00
C. Guy Yarvin
66a68f4ce5 Merge branch 'master' of github.com:urbit/urbit 2014-04-15 10:33:01 -07:00
C. Guy Yarvin
3d9983f39e More advanced and faster. 2014-04-15 10:32:48 -07:00
Steve Dee
3904660cdf Remove redundant(?) woof
A structurally identical decl exists in hoon.hoon, so I'm assuming this
is redundant.
2014-04-14 19:20:21 -07:00
C. Guy Yarvin
9630807126 Remove debug printf. 2014-04-14 11:53:57 -07:00
C. Guy Yarvin
e0a6db7ddc More gentle handling for unacceptable inconsistencies. 2014-04-14 11:43:06 -07:00
C. Guy Yarvin
7208047f0e Sometimes we need trailing whitespace. 2014-04-14 11:22:36 -07:00
C. Guy Yarvin
20c6d005b3 Clean up requests from dead connections. 2014-04-14 11:01:18 -07:00
~hatteb-mitlyd
e0dfb10b42 veri jet skeleton, still not working 2014-04-12 19:59:02 -07:00
~hatteb-mitlyd
dac62b87e2 sort-of fix jets for Ed25519
puck:ed is correct for at least the single test-point i tried.

sign:ed is still wrong.
2014-04-11 17:17:39 -07:00
~hatteb-mitlyd
a0762ef8c8 first hack at sign:ed jet 2014-04-10 18:05:59 -07:00
~hatteb-mitlyd
33bb87af0f Merge remote-tracking branch 'urbit/master' into newbreach
Update to the latest vere
2014-04-10 12:04:51 -07:00
C. Guy Yarvin
e866603ae6 Some fixes. 2014-04-09 18:01:46 -07:00
Steve Dee
09ddf90b62 Use acru/crua in ames 2014-04-09 17:39:40 -07:00
C. Guy Yarvin
24f0d3cfb1 Good pill, no debug. 2014-04-09 17:06:33 -07:00
C. Guy Yarvin
ffd462591f Merge branch 'master' of github.com:urbit/urbit
Conflicts:
	urb/zod/arvo/zuse.hoon
2014-04-09 16:52:25 -07:00
C. Guy Yarvin
9178eba744 Script fixes. 2014-04-09 16:51:19 -07:00
Gavin Whelan
f36faa5e3b Merge branch 'master' of github.com:urbit/urbit 2014-04-09 16:48:29 -07:00
Gavin Whelan
2860413be3 Fixing breakage from reformatting 2014-04-09 16:25:11 -07:00
Gavin Whelan
a1cb94b1e4 hoon regex 2014-04-09 13:35:28 -07:00
Steve Dee
02f8900165 One change that didn't make it in 2014-04-09 13:03:02 -07:00
Steve Dee
8e0604c4d2 Sign the input message, not the whole sealed noun 2014-04-09 12:59:09 -07:00
Steve Dee
0d901a8608 Trailing whitespace
Repeat after me:

    find urb/zod/ -type f -name *.hoon | xargs sed -i '' -e 's/[[:space:]]*$//'
2014-04-08 17:34:29 -07:00
C. Guy Yarvin
d28162053e Fix syntax error. 2014-04-08 15:56:07 -07:00
C. Guy Yarvin
2676054930 Merge branch 'master' of github.com:urbit/urbit
Conflicts:
	urb/zod/arvo/eyre.hoon
	urb/zod/arvo/hoon.hoon
2014-04-08 15:28:36 -07:00
C. Guy Yarvin
deaa14d27a Various fixes and improvements. 2014-04-08 15:26:01 -07:00
Steve Dee
b54dea7533 New cryptosuite interface
`seal`/`tear` now imply `sign`/`sure` and take the public key of
the other party. As this muddies the `pu`/`se` distinction, we lump
all asym ops under `as`.
2014-04-08 10:59:49 -07:00
Steve Dee
977a7fc702 Trailing whitespace
You guys. The default git precommit hook checks for this. You can enable
it by copying and pasting this command into a shell in your Urbit
checkout:

    cp .git/hooks/precommit{.sample,}
2014-04-07 10:19:02 -07:00
C. Guy Yarvin
0879da2286 Final template tweaks. 2014-04-05 14:25:16 -07:00
C. Guy Yarvin
08c3078647 "Fix" script and style non-escaping. 2014-04-05 12:04:05 -07:00
C. Guy Yarvin
bd21f15624 Merge branch 'master' of github.com:urbit/urbit 2014-04-04 15:36:21 -07:00
C. Guy Yarvin
80b6707039 More template tweaks. 2014-04-04 15:35:59 -07:00
johncburnham
bea2dd0d55 added some comments to hoon.hoon 2014-04-04 03:00:26 -07:00
C. Guy Yarvin
774beceac3 Template language. 2014-04-02 18:06:45 -07:00
C. Guy Yarvin
88e4aed25e Okay this works. 2014-03-27 10:52:31 -07:00
C. Guy Yarvin
e7acee9de8 Grr. 2014-03-27 10:50:14 -07:00
C. Guy Yarvin
b894894c1c Grr. 2014-03-27 10:46:57 -07:00
C. Guy Yarvin
50adabc51a Fix proxy name. 2014-03-27 10:39:17 -07:00
C. Guy Yarvin
499f9d2e33 More proxy testing. 2014-03-27 10:20:53 -07:00
C. Guy Yarvin
d17ffb8069 Fix ship from DNS resolution. 2014-03-27 10:06:58 -07:00
C. Guy Yarvin
891f026bbd Fix a bad checkin. 2014-03-26 18:06:11 -07:00