Commit Graph

143 Commits

Author SHA1 Message Date
Philip C Monk
72ef5c2cbd urb/zod/base -> urb/zod 2015-06-19 17:16:48 -04:00
Philip C Monk
f55f5bc295 moving stuff around 2015-03-11 20:37:37 -04:00
Philip C Monk
7bf9db3b1a merging across network works 2015-03-11 15:43:44 -04:00
Philip C Monk
7c04b9b9f8 boots 2015-03-10 20:54:39 -04:00
Philip C Monk
3406a1e9a4 waypoint 2015-03-10 19:56:08 -04:00
Philip C Monk
030cae0cde waypoint 2015-03-10 17:09:53 -04:00
Philip C Monk
c5fb969904 remove extraneous printfs 2015-03-09 17:36:04 -04:00
Philip C Monk
1d6e199d65 merging across network tentatively works 2015-03-06 17:28:55 -05:00
Philip C Monk
459604b7df first over-the-network typed merge 2015-03-06 16:07:34 -05:00
Philip C Monk
4f2e514563 waypoint 2015-03-05 20:19:54 -05:00
Philip C Monk
31d3788115 Merge remote-tracking branch 'origin/master' into typedclay
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/eyre.hoon
	urb/zod/arvo/hoon.hoon
	urb/zod/arvo/zuse.hoon
	urb/zod/main/app/poke/core.hook
	urb/zod/main/app/reboot/core.hook
	urb/zod/main/app/shell/core.hook
	urb/zod/main/app/tree/core.hook
2015-03-05 18:27:07 -05:00
Philip C Monk
092a2822e9 progress toward sub-booting 2015-03-04 19:36:29 -05:00
Philip C Monk
55e8072b3b arvo side of getting subs to boot 2015-03-03 20:05:41 -05:00
Philip C Monk
0e024a009f move along, nothing to see here 2015-02-27 01:35:41 -05:00
Philip C Monk
56fe217022 fix ye olde dotket bug
fixes #194
2014-12-09 17:59:31 -05:00
Philip C Monk
1b79d012c2 fixed some chat problems 2014-11-25 20:02:48 -05:00
Philip C Monk
3e2a16a3ea fixed :begin entropy bug 2014-11-20 17:40:59 -05:00
Philip C Monk
f51f4ae580 wise man said, a commit is better than a stash 2014-11-20 16:00:40 -05:00
Philip C Monk
dcec7f962f added helpful waiting messages during sync 2014-11-18 19:10:11 -05:00
Philip C Monk
c6f86e7b6a Merge branch 'test' into dish
Conflicts:
	include/v/vere.h
	urb/urbit.pill
	urb/zod/arvo/ames.hoon
	urb/zod/arvo/hoon.hoon
	v/loop.c
	v/raft.c
2014-11-04 16:42:02 -05:00
Philip C Monk
5242925469 Merge branch 'test' into shell
Conflicts:
	include/v/vere.h
	urb/urbit.pill
	urb/zod/arvo/clay.hoon
	urb/zod/arvo/eyre.hoon
	urb/zod/arvo/hoon.hoon
	urb/zod/main/mar/hook/door.hook
	urb/zod/main/mar/psal/door.hook
	urb/zod/main/mar/txt/door.hook
	urb/zod/main/pub/src/doc/ref/vol/1.md
	v/loop.c
	v/raft.c
	v/reck.c
	v/unix.c
2014-11-04 15:22:33 -05:00
C. Guy Yarvin
d707ae35ea Merge branch 'test' into memorable
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
	urb/zod/arvo/zuse.hoon
	urb/zod/main/pub/src/doc/ref/vol/4c.md
	v/reck.c
2014-11-02 02:03:13 -08:00
C. Guy Yarvin
4f29307601 Various fixes and improvements. 2014-10-31 15:36:01 -07:00
Philip C Monk
1fbd634ff4 added :ticket 2014-10-29 20:37:17 -04:00
Ubuntu
e12a41c08e autosync/unsync works 2014-10-28 19:59:26 +00:00
Ubuntu
8f1bf03d50 autosync seems to be working 2014-10-28 01:50:07 +00:00
Ubuntu
b1ecf8882a hooked dill up to shell; removed batz 2014-10-22 02:59:05 +00:00
Ubuntu
656bce55a3 weaned clay off its own timer 2014-10-16 20:42:45 +00:00
C. Guy Yarvin
9f22287791 Merges and bugfixes. 2014-09-16 17:29:12 -07:00
Ubuntu
fabf390eac updated clay doc and code 2014-09-16 14:19:15 +00:00
Ubuntu
102fced646 clay fixes 2014-09-11 18:52:25 +00:00
Ubuntu
d0d80f6ce2 clay foreign request doc done 2014-09-10 19:52:06 +00:00
Ubuntu
c405a4bd7a some clay refactoring 2014-09-09 00:21:40 +00:00
Ubuntu
ef15359455 clay bug fix 2014-09-05 22:59:56 +00:00
Ubuntu
539c6c2710 now you can subscribe to individual directories 2014-09-05 22:10:11 +00:00
C. Guy Yarvin
906a27b19b Fix "every other" sync bug. 2014-08-13 15:47:08 -07:00
Jared Hance
4e9d9b44cf Add zapcols 2014-08-01 14:11:46 -04:00
Jared Hance
537e2695ff Merge branch 'master' into klay
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/zuse.hoon
2014-08-01 14:02:51 -04:00
C. Guy Yarvin
46226c3dbf More memory pls. 2014-07-31 13:23:02 -07:00
Jared Hance
8f62bce5f4 Remove printfs 2014-07-30 15:09:59 -04:00
Jared Hance
68fb76214d Fix referential transparency in %merg 2014-07-29 13:43:20 -04:00
Jared Hance
3a48876a4d Fix referential transparency in %cu 2014-07-25 13:44:06 -04:00
Jared Hance
873bd9b208 Simple change 2014-07-25 08:53:39 -04:00
Jared Hance
bb18c8b086 Unix sync out. 2014-07-24 11:47:11 -04:00
Jared Hance
fb24594e9e Can boot subs now! 2014-07-24 11:11:40 -04:00
Jared Hance
27f38c45bd Merge branch 'master' into klay
Conflicts:
	urb/zod/arvo/zuse.hoon
2014-07-22 15:03:59 -04:00
Jared Hance
5ba302978c Broken. 2014-07-22 14:56:04 -04:00
C. Guy Yarvin
2b5e57de2d Replace ++logo with ++mark to match doc. 2014-07-21 15:14:52 -07:00
Jared Hance
2bcde8f6ee Initial klay stuff.
Clay.hoon doesn't work yet, haven't done subscriptions.

Should probably changes yakis to only reference yaki mugs rather than
yakis themselves - and have a blob map in the dome. Otherwise
subscriptions and merges will suck for large stuff.
2014-07-17 11:40:52 -04:00
Jared Hance
3c85c88040 Merge branch 'clay'
Conflicts:
	urb/urbit.pill
2014-07-16 13:56:34 -04:00