urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-15 04:22:48 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,674 Commits 768 Branches 10 Tags 215 MiB
69b63718cb
Commit Graph

1095 Commits

Author SHA1 Message Date
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
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