Commit Graph

333 Commits

Author SHA1 Message Date
Ubuntu
102fced646 clay fixes 2014-09-11 18:52:25 +00:00
Ubuntu
8732d6e097 clay local subscription doc done 2014-09-10 00:31:17 +00:00
Ubuntu
0b7ce49282 reflect clay refactor in doc 2014-09-09 20:25:00 +00:00
Ubuntu
d789f4ec88 more clay refactoring 2014-09-09 18:53:27 +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
99072c03b1 Merge branch 'test' of git://github.com/urbit/urbit-new into test
Conflicts:
	urb/urbit.pill
2014-09-04 17:25:08 -07:00
C. Guy Yarvin
a386d59068 Fix ++nest bug - in hoon.hoon only for now. 2014-09-04 17:24:27 -07:00
Ubuntu
06b0890e22 fixed clay bug 2014-09-03 19:56:16 +00:00
C. Guy Yarvin
06fb497dca Add MurmurHash3. 2014-08-26 12:11:59 -07:00
Anton Dyudin
2d7c533207 ++cork gate composition 2014-08-17 16:43:33 -07:00
Anton Dyudin
f5ec44de15 ++perk cube fern parser 2014-08-13 18:46:10 -07:00
C. Guy Yarvin
7a25b4d59f Merge branch 'master' of github.com:urbit/urbit 2014-08-13 13:50:26 -07:00
C. Guy Yarvin
26d5b811e5 Translate some memory code. 2014-08-13 12:32:14 -07:00
Anton Dyudin
2526a5c29f Added ++scanf, beginnings of 3b doc 2014-08-12 16:16:30 -07:00
C. Guy Yarvin
7c543b2f22 Fix JSON escaping. 2014-08-11 11:51:48 -07:00
johncburnham
daa6204336 hmac was broken 2014-08-07 15:37:25 -07:00
Jared Hance
03362d6cb6 Various fixes to merge 2014-08-07 14:07:04 -04:00
Jared Hance
48ffc3ded9 Add ++zeas, future ++zeal 2014-08-06 13:31:42 -04:00
Jared Hance
24f522281c Some %fine merges weren't doing anything, oops 2014-08-06 09:49:10 -04:00
Jared Hance
6bc5ecd9ad Fix this/that 2014-08-06 09:11:17 -04:00
Jared Hance
125b0a9603 Fix hashes in ++azel 2014-08-05 10:10:15 -04:00
C. Guy Yarvin
1d49dc93cc Ames protocol to 3. 2014-08-04 18:19:15 -07:00
pcmonk
b7f2e2bc79 Merge branch 'master' into klay
Conflicts:
	urb/urbit.pill
2014-08-01 16:53:42 -07:00
pcmonk
a70b13bae5 Merge branch 'master' into e2e-real
Conflicts:
	urb/urbit.pill
2014-08-01 16:46:00 -07:00
C. Guy Yarvin
e97b3c08a5 Various fixes and improvements. 2014-08-01 16:39:15 -07:00
pcmonk
97755be677 Merge branch 'master' into e2e-real
Conflicts:
	urb/urbit.pill
2014-08-01 16:27:44 -07: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
Jared Hance
83e0291f99 256 bit hashes for objects... 2014-08-01 12:40:19 -04:00
Jared Hance
e48181b23e Optimize merge ancestor location 2014-08-01 12:21:26 -04:00
Jared Hance
0512cc6d47 Optimize ++zerg for common case 2014-08-01 11:45:29 -04:00
Jared Hance
21034aa855 Various fixes, including timers 2014-08-01 10:54:31 -04:00
pcmonk
7d581a3714 most of new chat 2014-07-31 19:44:49 -07:00
C. Guy Yarvin
03c714afe5 Merge branch 'turbomem'
Conflicts:
	urb/urbit.pill
2014-07-31 13:38:05 -07:00
C. Guy Yarvin
46226c3dbf More memory pls. 2014-07-31 13:23:02 -07:00
Jared Hance
2769378368 ++forge compiles 2014-07-31 16:17:37 -04:00
Jared Hance
8f62bce5f4 Remove printfs 2014-07-30 15:09:59 -04:00
Jared Hance
968a002d68 Various fixes to make this thing usable 2014-07-30 14:56:51 -04:00
Jared Hance
9c20b7c2c1 Conflicts work 2014-07-30 13:42:48 -04:00
Jared Hance
c7a78be9bd Almost working 2014-07-30 13:04:40 -04:00
pcmonk
41d5757552 Merge branch 'master' into e2e-real
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/gall.hoon
	urb/zod/arvo/zuse.hoon
2014-07-29 17:39:49 -07:00
Jared Hance
3e0b18494c Send original copy to merge 2014-07-29 14:16:35 -04:00
Jared Hance
68fb76214d Fix referential transparency in %merg 2014-07-29 13:43:20 -04:00
Jared Hance
ef94352267 Merge branch 'master' into klay
Conflicts:
	urb/urbit.pill
2014-07-29 13:25:18 -04:00
C. Guy Yarvin
d145dd069a Merge branch 'master' of github.com:urbit/urbit
Conflicts:
	urb/urbit.pill
2014-07-28 15:54:58 -07:00
C. Guy Yarvin
009a767f52 FCGI pulls markdown. 2014-07-28 15:46:03 -07:00
pcmonk
17592239e3 Merge branch 'master' into e2e-real
Conflicts:
	urb/urbit.pill
2014-07-28 10:56:39 -07:00
Jared Hance
dbb5995c9d Trivial fixes 2014-07-28 10:25:07 -04:00
pcmonk
1445aefca4 Merge branch 'master' into e2e-real
Conflicts:
	urb/urbit.pill
2014-07-25 19:34:51 -07:00