urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-14 01:08:54 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,792 Commits 768 Branches 10 Tags 215 MiB
55fa6d0408
Commit Graph

124 Commits

Author SHA1 Message Date
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
Jared Hance
d549b6a4fe Fix revision origin. 2014-07-10 10:24:29 -04:00
pcmonk
2c15e0c0bf %send effect does not need to drop through anymore 2014-07-09 14:42:08 -07:00
Jared Hance
235583e858 Almost there... 2014-07-09 16:56:23 -04:00
Jared Hance
8703188407 Restructure clay. 
Hopefully this is the only commit that would require a breach.

Writing a data transition would be trivial later.

Still need to fix ++domo.
 2014-07-09 15:11:25 -04:00
Jared Hance
c787b33b8e More ++doze in %clay changes... 
Still trying to figure out the %clay model.
 2014-07-07 10:59:11 -04:00
Jared Hance
1242d1b456 Rewrite ++doze in %clay. 
I'm always a fan of removing ugly names just for a single call.
 2014-07-07 10:29:47 -04:00
Anton Dyudin
afa76048e0 comment fixes 2014-07-01 15:51:42 -07:00
C. Guy Yarvin
f939071722 Various fixes and improvements. 2014-06-24 10:32:59 -07:00
C. Guy Yarvin
23186f9a24 Some renaming. 2014-06-21 22:49:10 -07:00
C. Guy Yarvin
caebe96b2f About halfway refactored. 2014-06-21 15:06:42 -07:00
C. Guy Yarvin
bfd17aae6c Reversed toss order. 2014-06-21 11:42:34 -07:00
C. Guy Yarvin
5a1963fd52 Intermediate point in vane protocol change. 2014-06-19 22:49:39 -07:00
C. Guy Yarvin
d6b1ecde47 Various fixes and improvements. 2014-06-19 11:53:16 -07:00
C. Guy Yarvin
120760563c Various fixes and improvements. 2014-06-11 07:06:36 -07:00
C. Guy Yarvin
82a9ce1211 Merge branch 'nextbreach' of github.com:urbit/urbit into nextbreach 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
 2014-06-07 19:56:38 -07:00
C. Guy Yarvin
ff2c010efe Applications properly self-reload. 2014-06-07 19:45:00 -07:00
Gavin Whelan
3bb02fe9d7 Fixing typo 2014-06-06 18:07:47 -04:00
Gavin Whelan
32e8bb7d96 merge fixes 
Conflicts:
	urb/zod/arvo/clay.hoon
 2014-06-06 15:03:24 -04:00
C. Guy Yarvin
d51bc114aa More vane cleaanups 2014-06-05 16:00:19 -07:00