Commit Graph

16 Commits

Author SHA1 Message Date
Anton Dyudin
8d6666f9b1 issue real (old) tickets 2016-04-14 17:10:57 -07:00
Anton Dyudin
d0418c1f20 poke-manage save ship in office 2016-04-14 16:52:37 -07:00
Anton Dyudin
582f1d156c generators and routing for womb pokes 2016-04-12 17:48:55 -07:00
Anton Dyudin
5fd2317b88 add womb to hood, set up peek 2016-04-12 17:10:53 -07:00
Raymond Pasco
a0358c17d9 Merge branches 'breach-20160302' and 'cgyarvin-teaching', remote-tracking branches 'ohaitch/talk-read-component', 'ohaitch/virtualize-pact-hoon' and 'ohaitch/eyre-sec'
Conflicts:
	arvo/eyre.hoon

Breaching changes for 2016-03-02
Language/dojo improvements for teaching.
add web/listen.hoon module for listening to comment changes
virtualize ++pact %hoon side-path
Eyre security drivers
2016-03-02 21:21:23 -05:00
Philip C Monk
17d6fccced reset on initial pull 2016-02-25 18:19:44 -05:00
Philip C Monk
7268164eba Merge remote-tracking branch 'arvo/master' into HEAD
Conflicts:
	app/hood.hoon
	arvo/ford.hoon
	gen/cat.hoon
	gen/ls.hoon
	gen/ls/subdir.hoon
2016-02-18 18:52:34 -05:00
Philip C Monk
67cc10f55a Merge tag 'hoon-151' of https://github.com/juped/urbit into transfer
Hoon 151 merge

%gh crashes on startup

Conflicts:
    urb/urbit.pill
    urb/zod/app/dojo.hoon
    urb/zod/app/hood.hoon
    urb/zod/arvo/eyre.hoon
    urb/zod/arvo/ford.hoon
    urb/zod/arvo/gall.hoon
    urb/zod/arvo/hoon.hoon
    urb/zod/arvo/zuse.hoon
    urb/zod/gen/cat.hoon
    urb/zod/gen/ls.hoon
    urb/zod/gen/ls/subdir.hoon
2016-02-18 18:31:26 -05:00
Anton Dyudin
7675107acf 151ified apps 2016-02-17 14:57:46 -08:00
Anton Dyudin
9b2ae7f460 fix lib/write 2016-02-11 16:33:22 -08:00
Anton Dyudin
81297bc162 Merge branch 'hoon-151' into tree-comments
Merge hoon 151
2016-02-10 19:43:53 -08:00
Raymond Pasco
309805f5e7 Merge in Hoon 151
Complicated merge of Hoon 151. This commit is a major sequence point.
2016-02-10 14:03:28 -05:00
Raymond Pasco
d5e097e82a Merge remote-tracking branch 'galenwp/factor'
Conflicts:
	urb/urbit.pill
	urb/zod/ape/bit.hoon
	urb/zod/arvo/eyre.hoon
	urb/zod/mar/hook.hoon
	urb/zod/pub/bit/fab/hymn.hook
	urb/zod/pub/docs/dev/hoon/principles/1-twigs.md
	urb/zod/pub/docs/dev/hoon/principles/2-syntax.md
	urb/zod/pub/docs/dev/hoon/reference/odors.md
	urb/zod/pub/docs/dev/hoon/reference/pronunciation.md
	urb/zod/pub/docs/dev/hoon/runes/sg/sgcn.md
	urb/zod/pub/docs/dev/hoon/runes/sm.md
	urb/zod/pub/docs/dev/hoon/runes/sm/smsg.md
	urb/zod/pub/docs/dev/hoon/runes/sm/smzz.md
	urb/zod/pub/docs/dev/hoon/runes/ts/tssg.md
	urb/zod/pub/docs/dev/hoon/runes/wt/wthz.md
	urb/zod/pub/docs/dev/hoon/runes/wt/wtls.md
	urb/zod/pub/docs/dev/hoon/runes/zp/zpzp.md
	urb/zod/pub/docs/theory/whitepaper.md
	urb/zod/pub/docs/user/appliance.md
	urb/zod/pub/docs/user/intro.md
	urb/zod/pub/docs/user/talk.md

Merged Galen and Anton's web refactoring work
2016-02-08 16:14:03 -08:00
Anton Dyudin
f469557a42 clean up unbound generators 2016-02-05 14:17:30 -08:00
Anton Dyudin
c05e96c62f fix hoon location header information 2016-02-04 19:05:37 -08:00
Anton Dyudin
bf11734b85 ape -> app 2016-02-04 16:38:18 -08:00