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,874 Commits 768 Branches 10 Tags 215 MiB
ee4d43f045
Commit Graph

1225 Commits

Author SHA1 Message Date
Anton Dyudin
b45f3e374e Fixed (sand %ta) to conform to doc 2014-09-09 14:38:19 -07:00
Anton Dyudin
56f03cc709 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-09 14:33:51 -07:00
Ubuntu
0b7ce49282 reflect clay refactor in doc 2014-09-09 20:25:00 +00:00
Anton Dyudin
2bc68f86ec Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-09 12:51:56 -07:00
Anton Dyudin
f4adae2471 Removed redundant duty args 2014-09-09 12:46:42 -07:00
Ubuntu
1fc560e94e Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-09 18:53:36 +00:00
Ubuntu
d789f4ec88 more clay refactoring 2014-09-09 18:53:27 +00:00
C. Guy Yarvin
9456e17bae Tweak test. 2014-09-08 19:38:41 -07:00
C. Guy Yarvin
76c9b03166 Compatible with k.164. 2014-09-08 19:35:25 -07:00
Ubuntu
c405a4bd7a some clay refactoring 2014-09-09 00:21:40 +00:00
vere
9c5a438955 bump protocol number 2014-09-08 21:06:21 +00:00
C. Guy Yarvin
f79aa14786 Better tools for test kernels. 2014-09-06 19:54:25 -07: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
Ubuntu
f84354bdcd Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
 2014-09-05 16:22:22 +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
Anton Dyudin
d83db302f6 /gep/hart.js long-poll utils factored out 2014-09-04 14:37:29 -07:00
Ubuntu
b74dc1aee9 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2014-09-03 20:04:27 +00:00
Ubuntu
06b0890e22 fixed clay bug 2014-09-03 19:56:16 +00:00
Galen Wolfe-Pauly
a9ca22a5a4 Better aut.ced hacks 2014-09-03 11:41:25 -07:00
Galen Wolfe-Pauly
8aa3c5ab3d Revert "Url aut hacks" 
This reverts commit bbe14dd81309574eab0f56d875d5231d85f6ff13.
 2014-09-03 11:32:48 -07:00
Anton Dyudin
ad5058d039 Url aut hacks 2014-09-03 11:09:00 -07:00
Galen Wolfe-Pauly
c09899136e Merge branch 'test' of github.com:urbit/urbit-new into test 2014-09-03 10:52:27 -07:00
C. Guy Yarvin
0cab269935 Before jet renaming. 2014-09-02 19:58:36 -07:00
johncburnham
2278666a05 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
 2014-09-02 17:15:20 -07:00
johncburnham
e63f332aaf hoon.hoon cleanup part 1 2014-09-02 17:12:38 -07:00
Galen Wolfe-Pauly
3ecb674c78 fas pam, not fas fas 2014-09-02 16:31:56 -07:00
C. Guy Yarvin
1ffb73c558 Pull in murmur3. 2014-09-02 13:45:49 -07:00
C. Guy Yarvin
ad83c31753 Ready to switch over mug. 2014-09-02 13:13:12 -07:00
C. Guy Yarvin
91b1d718a3 Revert "some hoon.hoon edits" 
This reverts commit c9670e2a48eaf2a089bd4dd2d9f47f5f38d42a91.
 2014-09-02 12:23:39 -07:00
johncburnham
00fde5f0c7 some hoon.hoon edits 2014-09-02 00:04:22 -07:00
johncburnham
05068f17e1 roll breach protocol 2014-09-01 20:07:55 -07:00
Ubuntu
af394c1907 Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
 2014-09-01 17:43:49 +00:00
Ubuntu
e92d03213e bump protocol number 2014-09-01 16:55:14 +00:00
Ubuntu
d89c0ff9f0 pokes over %ames now get acks 2014-08-29 17:05:00 +00:00
C. Guy Yarvin
1fb108907c Various fixes and improvements. 2014-08-28 12:40:40 -07:00
Ubuntu
13d4772a95 Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
 2014-08-28 17:20:02 +00:00
Ubuntu
cde357f317 bump protocol number and add Anton's carrier 2014-08-28 16:59:44 +00:00
Ubuntu
f7d338ab9c added bone to ++pour 2014-08-27 23:00:41 +00:00
Ubuntu
5c107029f6 almost done with lifecycle of a packet 2014-08-27 01:45:26 +00:00
Ubuntu
3afd35241a fixed ++mur 2014-08-26 19:49:31 +00:00
C. Guy Yarvin
06fb497dca Add MurmurHash3. 2014-08-26 12:11:59 -07:00
Ubuntu
ee80bb021f Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
 2014-08-25 15:09:50 +00:00
Anton Dyudin
f7be77e81b All ++norm:vast arms commented 2014-08-24 21:20:32 -07:00
vere
5b9fd272c6 bump protocol number 2014-08-24 22:13:27 +00:00
Anton Dyudin
dc78296507 Moar ++norm comments 2014-08-23 19:20:02 -07:00
Anton Dyudin
b28000dd01 ++vast comments 2014-08-22 18:38:20 -07:00
Ubuntu
554a22660b Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
 2014-08-21 20:08:32 +00:00
Anton Dyudin
3d454f2acf Am I doing this right? 2014-08-21 12:15:05 -07:00
johncburnham
d408ebc495 breach protocol roll 2014-08-21 06:08:56 -07:00
Galen Wolfe-Pauly
2f24750980 Merge branch 'master' into test 2014-08-19 18:13:49 -07:00
Galen Wolfe-Pauly
86c4defc40 heartbeater 2014-08-19 18:11:41 -07:00
Ubuntu
38f1f3b4a7 reenabled heartbeat drops 2014-08-20 01:05:05 +00:00
Ubuntu
d6462e962a Merge branch 'master' into test 2014-08-19 20:46:16 +00:00
Anton Dyudin
775e8f80e1 Commented section 2fA 2014-08-18 21:42:09 -07:00
johncburnham
4a59dfc9d4 carriers 2014-08-18 20:17:40 -07:00
Galen Wolfe-Pauly
29d86662ab heartbeat consistency 2014-08-18 14:20:51 -07:00
Galen Wolfe-Pauly
5d203f9461 No !: in eyre 2014-08-18 14:09:14 -07:00
Galen Wolfe-Pauly
6c16e01046 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-18 13:30:44 -07:00
Galen Wolfe-Pauly
f3e5867cb5 eyre heartbeat fix 2014-08-18 13:30:33 -07:00
Ubuntu
91164ee9c7 added harmless printf 2014-08-18 20:28:26 +00:00
Ubuntu
30d5841158 fixed eyre injection ordering 2014-08-18 19:53:43 +00:00
johncburnham
4ac0c678d5 roll protocol for breach 2014-08-18 00:05:57 -07:00
Anton Dyudin
f75ad9dab7 Swapped order, cork is λ[a b].λx.(b(a(x))) 2014-08-17 17:41:32 -07:00
Anton Dyudin
5592e16d6a Restructured in case the backward-threading ++corl is ever needed 2014-08-17 17:21:56 -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
8ee1732c79 Normalize dependency cases to %ud. 2014-08-13 18:32:15 -07:00
Galen Wolfe-Pauly
c3dc727e90 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-13 16:27:09 -07:00
Galen Wolfe-Pauly
0bec3a87bf dont overwrite bind 2014-08-13 16:18:58 -07:00
Anton Dyudin
14ebd696ef Merge branch 'master' of https://github.com/urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-08-13 15:57:27 -07:00
Anton Dyudin
063fbc6db6 Fixed %eyre window.urb queuing 2014-08-13 15:50:49 -07:00
C. Guy Yarvin
906a27b19b Fix "every other" sync bug. 2014-08-13 15:47:08 -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
4016124e87 Delete some old files; activate debug printfs. 2014-08-12 14:16:50 -07:00
johncburnham
adaaca8735 roll breach protocol 2014-08-11 19:21:54 -07:00
C. Guy Yarvin
058d3d866f Various fixes and improvements. 2014-08-11 17:12:51 -07:00
Galen Wolfe-Pauly
db727ccf13 no console logs in production 2014-08-11 12:57:25 -07:00
C. Guy Yarvin
7c543b2f22 Fix JSON escaping. 2014-08-11 11:51:48 -07:00
C. Guy Yarvin
cc3733e6d4 Various mainly stylistic improvements. 2014-08-11 00:47:46 -07:00
C. Guy Yarvin
2a10f4dd34 Improve some eyre printfs. 2014-08-10 21:43:43 -07:00
C. Guy Yarvin
fe9c4c8a85 Various fixes and improvements. 2014-08-10 20:09:56 -07:00
vere
920c998f1b roll protocol again 2014-08-09 20:59:52 +00:00
johncburnham
3861f41ba0 roll protocol 2014-08-09 13:22:33 -07:00
Anton Dyudin
a0bca4331a soqblok leading line comments, blok blank line insignificance 2014-08-08 11:18:09 -07:00
Anton Dyudin
32b98ba0e5 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-08 10:37:42 -07:00
Anton Dyudin
e24cdb1945 ++ cury f(a,b)-> f(a)-> f(b) 2014-08-08 10:36:32 -07:00
Jared Hance
65a61e0414 Floating point clarity. 2014-08-08 12:36:44 -04:00
johncburnham
c50349c447 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-07 15:37:56 -07:00
johncburnham
daa6204336 hmac was broken 2014-08-07 15:37:25 -07:00
C. Guy Yarvin
9f5a51fffb Remove a zapcol. 2014-08-07 14:37:39 -07:00
C. Guy Yarvin
eb0962e1e2 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-08-07 14:22:28 -07:00
C. Guy Yarvin
57fa88e7c0 Properly serve pngs. 2014-08-07 12:40:28 -07:00
Jared Hance
03362d6cb6 Various fixes to merge 2014-08-07 14:07:04 -04:00
Anton Dyudin
56c9d62871 Fixed %eyre inject not to stop on newlines 2014-08-06 17:06:36 -07:00
C. Guy Yarvin
ea6366ef0e A bigger bandaid. 2014-08-06 14:03:33 -07:00
C. Guy Yarvin
26cfffd043 Install another bandaid. 2014-08-06 13:15:20 -07:00
Ubuntu
705b7812bb bump protocol number 2014-08-06 18:00:41 +00: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
C. Guy Yarvin
ac33a315bb Remove "keywords" in hood. 2014-08-05 17:17:36 -07:00
C. Guy Yarvin
e74b381e7e Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-08-05 15:33:52 -07:00
C. Guy Yarvin
a37bad2337 Some debugging improvements. 2014-08-05 15:30:08 -07:00
Anton Dyudin
f3f793e1b3 Fixed eyre inject, demo app 2014-08-05 15:09:19 -07:00
C. Guy Yarvin
93ee3f741d Various fixes and improvements. 2014-08-05 13:24:26 -07:00
C. Guy Yarvin
b44358ac73 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-08-05 12:50:16 -07:00
vere
165a37626c bump protocol 2014-08-05 19:25:09 +00:00
Galen Wolfe-Pauly
2bc1c1a877 callbacks and put data 2014-08-05 11:45:59 -07:00
Jared Hance
a86b55ab96 More FP fixes. I hate FP. 2014-08-05 12:08:59 -04:00
Jared Hance
5727b136d6 Floating point fix 2014-08-05 11:27:55 -04:00
Jared Hance
125b0a9603 Fix hashes in ++azel 2014-08-05 10:10:15 -04:00
C. Guy Yarvin
722b6c556b Some renamings. 2014-08-04 20:23:29 -07:00
C. Guy Yarvin
5d4dd0272a Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-08-04 18:20:00 -07:00
C. Guy Yarvin
1d49dc93cc Ames protocol to 3. 2014-08-04 18:19:15 -07:00
Ubuntu
702f8eef85 fixed subscriptions in %eyre 2014-08-04 22:49:34 +00:00
Ubuntu
0efc0a8933 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 21:52:40 +00:00
Ubuntu
0df2b977a3 fix %eyre on firefox and ack subscriptions 2014-08-04 21:51:24 +00:00
Galen Wolfe-Pauly
feee558c08 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 13:22:08 -07:00
C. Guy Yarvin
a4a3c67664 Protocol to 2. 2014-08-04 12:51:34 -07:00
Galen Wolfe-Pauly
257d240523 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 12:50:37 -07:00
C. Guy Yarvin
bac72d4277 Delete annpying ringtf. 2014-08-04 12:40:40 -07:00
Galen Wolfe-Pauly
68238ba57e Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 12:38:02 -07:00
Galen Wolfe-Pauly
f00f19bc58 better eyre subscriptions 2014-08-04 12:37:43 -07:00
C. Guy Yarvin
e772988cae Moving to protocol 1. 2014-08-04 10:46:37 -07:00
johncburnham
e2118154a2 Merge branch 'master' of https://github.com/urbit/urbit 
Conflicts:
	urb/zod/arvo/ames.hoon
 2014-08-04 10:19:56 -07:00
johncburnham
86e0312934 bad commit 2014-08-04 10:18:58 -07:00
C. Guy Yarvin
d08bf31fc0 A great renaming, and other works. 2014-08-04 10:18:26 -07:00
johncburnham
4e925fa53d git dropped a commit? 2014-08-04 09:54:14 -07:00
Galen Wolfe-Pauly
6852cdec5b Merge branch 'urbjs' 2014-08-03 12:04:55 -07:00
Galen Wolfe-Pauly
98a1d2cce5 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-03 12:04:19 -07:00
C. Guy Yarvin
2908e8aafa Rename pro to mac. 2014-08-02 17:37:36 -07:00
C. Guy Yarvin
d3e3c826b4 Turn off !: to clear some memory room. Grrr... 2014-08-02 16:55:56 -07:00
C. Guy Yarvin
b4b28aa094 Merge branch 'master' of github.com:urbit/urbit 2014-08-02 16:40:49 -07:00
C. Guy Yarvin
d52646f14b Various fixes, renamings, and improvements. 2014-08-02 16:33:22 -07:00
pcmonk
1cb4bb27cb drop redundant acks instead of crashing 2014-08-01 19:04:50 -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
pcmonk
fe828ce29c chat is working 2014-08-01 16:17:24 -07:00
Galen Wolfe-Pauly
500acfb39f fixed subs 2014-08-01 11:21:28 -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
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
Galen Wolfe-Pauly
8178c40b95 urb.js retooling 2014-07-31 16:57:35 -07:00
Galen Wolfe-Pauly
02f62ed48d Merge branch 'master' of https://github.com/urbit/urbit 2014-07-31 16:26:47 -07:00
C. Guy Yarvin
03c714afe5 Merge branch 'turbomem' 
Conflicts:
	urb/urbit.pill
 2014-07-31 13:38:05 -07:00
C. Guy Yarvin
06776448a0 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-31 13:25:06 -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
johncburnham
5fd348d1e9 roll protocol for breach 2014-07-31 08:25:29 -07:00
C. Guy Yarvin
f572cabe75 Clean up some markdown stuff. 2014-07-30 21:28:48 -07:00
C. Guy Yarvin
21691f4330 Fix structures in structures; str -> sur. 2014-07-30 15:56:56 -07:00
Jared Hance
c1a4aa7886 Merge branch 'master' into klay 
Conflicts:
	urb/urbit.pill
 2014-07-30 15:14:38 -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
pcmonk
fb8bf21a2e Merge branch 'master' of https://github.com/urbit/urbit 2014-07-30 11:12:30 -07:00
pcmonk
46a27f53e6 %ford search in right place for protocols 2014-07-30 11:09:48 -07:00
C. Guy Yarvin
6febd493c3 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/zod/main/pro/down/core.hoon
 2014-07-30 10:53:58 -07:00
C. Guy Yarvin
0a01d489df Various fixes and improvements. 2014-07-30 10:53:30 -07: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
pcmonk
1a2c960325 couple of %ford fixes 2014-07-29 16:29:56 -07:00
pcmonk
c5fe282e75 added %wipe to wipe app state 2014-07-29 15:44:41 -07:00
pcmonk
20da6ef2f1 fixed timeout crash with ++peek 2014-07-29 14:25:13 -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
pcmonk
22dd323fbc Merge branch 'master' of https://github.com/urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-28 16:21:40 -07:00
pcmonk
d5eda8f962 fixed autoreload 2014-07-28 16:17:59 -07: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
c2bf2592c9 %eyre drops old subscribers even without ++pull 2014-07-28 13:23:26 -07:00
pcmonk
6d386f15cc give (slightly) more helpful crud errors in %gall 2014-07-28 12:23:51 -07:00
pcmonk
f34071c4ff e2e-acks in a consistent state, ready to merge 2014-07-28 11:44:56 -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
C. Guy Yarvin
3c4696fefd More tweaking round the bleeding edges. 2014-07-27 05:04:30 -07:00
C. Guy Yarvin
c8399fdacf Moving toward new translation. 2014-07-27 03:26:17 -07: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
Galen Wolfe-Pauly
d69390ff36 Merge branch 'master' of https://github.com/urbit/urbit 2014-07-25 12:11:06 -07:00
Galen Wolfe-Pauly
3d51055812 need data-scri in the head now 2014-07-25 12:11:01 -07:00
Jared Hance
3a48876a4d Fix referential transparency in %cu 2014-07-25 13:44:06 -04:00
C. Guy Yarvin
d8b3c5f7d5 Remove eyre console code to save memory. 2014-07-25 09:38:22 -07:00
C. Guy Yarvin
2f42a419ea Ford, with some comments to save memory. 2014-07-25 09:26:12 -07:00
Jared Hance
d71b5c6bc1 Functional neoclay 2014-07-25 11:38:13 -04:00
Jared Hance
873bd9b208 Simple change 2014-07-25 08:53:39 -04:00
C. Guy Yarvin
faf33d012b Ford compiles - still needs some syntax. 2014-07-24 13:29:16 -07: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
C. Guy Yarvin
f9e53c2541 Merge branch 'master' of github.com:urbit/urbit 2014-07-24 11:16:50 -07:00
C. Guy Yarvin
96e2eef2b2 Fix some indents. 2014-07-24 11:16:39 -07: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
C. Guy Yarvin
20c5c1d5a0 Code complete on ford. 2014-07-23 16:23:53 -07:00
Anton Dyudin
7e50755029 Restructured raws/rads:og for =^ result order, added /=pals= %ames .^ 2014-07-23 14:01:52 -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
424fa7398d once more into the breach 2014-07-23 01:31:09 -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
Jared Hance
38122c5b5a Fix merge... 2014-07-22 15:33:17 -04:00
Jared Hance
27f38c45bd Merge branch 'master' into klay 
Conflicts:
	urb/zod/arvo/zuse.hoon
 2014-07-22 15:03:59 -04:00
johncburnham
6bb974f2ec fixed minor bug in xml parser 2014-07-22 12:02:44 -07:00
Jared Hance
5ba302978c Broken. 2014-07-22 14:56:04 -04:00
Jared Hance
36549106ae zuse compiles again... 2014-07-22 10:11:03 -04:00
Jared Hance
4e6e0e79eb Add +-got to ++by. 2014-07-22 10:10:01 -04:00
C. Guy Yarvin
edfae53ddc Fix horrid indentation thing. 2014-07-22 09:32:35 -07:00
C. Guy Yarvin
5d8bca3bea Some hoof tweaks. 2014-07-21 18:55:40 -07:00
C. Guy Yarvin
9c39abae1c Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-21 15:54:29 -07:00
C. Guy Yarvin
2b5e57de2d Replace ++logo with ++mark to match doc. 2014-07-21 15:14:52 -07:00
Anton Dyudin
847253d685 fixed %eyre urb.user inject 2014-07-21 13:38:46 -07:00
C. Guy Yarvin
3378245281 Functional build skeleton. 2014-07-20 20:15:02 -07:00
C. Guy Yarvin
ac488f6225 We are very close to the memory limit on :solid! 2014-07-18 19:45:10 -07:00
C. Guy Yarvin
925ae8ccb7 Merge branch 'master' of github.com:urbit/urbit 2014-07-18 17:51:37 -07:00
C. Guy Yarvin
79b91ebd7a New ford skeleton; some hoon cleanups 2014-07-18 17:51:22 -07:00
pcmonk
372ece59d3 unsubscriptions through %eyre 2014-07-18 12:23:35 -07:00
pcmonk
dd7400682b Merge branch 'eyre-stuff' 
Conflicts:
	urb/urbit.pill
 2014-07-17 16:16:28 -07:00
pcmonk
895b4a8f84 clients divorced from apps, streams multiplexed 2014-07-17 16:11:00 -07:00
C. Guy Yarvin
2260d31b1c Merge branch 'master' of github.com:urbit/urbit 2014-07-17 13:56:22 -07:00
C. Guy Yarvin
f3e3eb01e0 Preparing to integrate new ford. 2014-07-17 13:56:08 -07:00
Jared Hance
f82578e30d Add useful stuff 2014-07-17 16:04:18 -04:00
Jared Hance
1933149d04 Zuse compiles again, new model. 2014-07-17 14:27:14 -04: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
johncburnham
5987ff2f8d improved xml parser 2014-07-16 19:46:46 -07:00
pcmonk
20574f69f7 more work on eyre-stuff -- compiles 2014-07-16 19:10:13 -07:00
C. Guy Yarvin
b9b6d522b9 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-16 11:56:15 -07:00
C. Guy Yarvin
5b8844207e Minor tweaks. 2014-07-16 11:54:53 -07:00
pcmonk
2df55edb87 Bump protocol number 2014-07-16 11:25:22 -07:00
Jared Hance
3c85c88040 Merge branch 'clay' 
Conflicts:
	urb/urbit.pill
 2014-07-16 13:56:34 -04:00
johncburnham
bbe73c468f added an xml parser 2014-07-15 22:47:43 -07:00
pcmonk
3fafa64ed5 initial work on eyre changes 2014-07-15 19:30:29 -07:00
Anton Dyudin
ecb2ebf79b zl:jo no longer builds faceless poles 2014-07-15 16:07:39 -07:00
pcmonk
92f7bddcd8 unkludged eyre heartbeat 2014-07-14 19:45:04 -07:00
Jared Hance
e086185603 Add ++reap. 
Makes constructing lists for testing alot nicer.
 2014-07-14 11:59:16 -04:00
C. Guy Yarvin
ff5e56a05c Move silks around, etc. 2014-07-12 11:24:52 -07:00