urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-14 20:02:51 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,379 Commits 768 Branches 10 Tags 215 MiB
774d48af35
Commit Graph

318 Commits

Author SHA1 Message Date
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
pcmonk
2b4fec9a51 all (well-formed) test apps work 2014-07-25 19:10:24 -07:00
C. Guy Yarvin
a18ded751e Fix basic ford bugs. 2014-07-25 17:29:01 -07:00
Jared Hance
3a48876a4d Fix referential transparency in %cu 2014-07-25 13:44:06 -04:00
Jared Hance
d71b5c6bc1 Functional neoclay 2014-07-25 11:38:13 -04:00
Jared Hance
bd3f0377b8 Fast-forward merges should work (untested) 2014-07-24 16:23:54 -04:00
Jared Hance
667ad45403 Semi-working merges. 2014-07-24 15:21:58 -04:00
Jared Hance
9eea495578 Zuse compiles w/ some merge code. 2014-07-24 12:13:36 -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
pcmonk
2b9b533a6f work on making end-to-end acks work 2014-07-23 19:02:50 -07:00
pcmonk
13a4df24a1 cleanup 2014-07-23 11:25:53 -07:00
C. Guy Yarvin
7051a7f711 Merge branch 'master' of github.com:urbit/urbit 2014-07-23 11:17:55 -07:00
C. Guy Yarvin
271e4f2c0e Remove XX. 2014-07-23 11:17:43 -07:00
johncburnham
58921e9fd4 xml parser II: the richard donner cut 2014-07-22 16:12:38 -07:00
johncburnham
9d4302698d Revert "fixed minor bug in xml parser" 
This reverts commit 908d8d5fde6f03e41adb10bc8163e5cc2c0dc285.
 2014-07-22 15:59:43 -07:00