Commit Graph

1157 Commits

Author SHA1 Message Date
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
johncburnham
51af8cc7c5 swap files bad 2014-08-01 14:22:31 -07:00
johncburnham
b6b8ca70b2 but actually 2014-08-01 14:16:38 -07:00
johncburnham
737afa1c3c sane doc structure 2014-08-01 14:14:23 -07:00
ault011
d98be5839d added split volumes of "doc-split-me" 2014-08-01 12:51:30 -07: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
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
ault011
1ab66767cc Merge branch 'master' of https://github.com/urbit/urbit 2014-07-31 13:06:16 -07:00
ault011
7ad9bc9d2e updated ++need 2014-07-31 13:05:55 -07:00
Anton Dyudin
10a7d6be8e Merge branch 'master' of https://github.com/urbit/urbit 2014-07-31 12:24:48 -07:00
Anton Dyudin
8c197777a2 Zongs converter up :3 2014-07-31 12:24:30 -07:00
John Dulin
1974ca3e8e Moved doc.txt over from urbit.org. Unseperated (yet). 2014-07-31 12:16:31 -07:00
John Dulin
aed1aeb1b4 Merge branch 'master' of https://github.com/urbit/urbit 2014-07-31 10:47:01 -07:00
John Dulin
975d69bfb1 Homogenized assignments 2014-07-31 10:46:44 -07:00
johncburnham
5fd348d1e9 roll protocol for breach 2014-07-31 08:25:29 -07:00
John Dulin
c50edb134a Doc assignments. 2014-07-31 01:24:03 -07:00
C. Guy Yarvin
f572cabe75 Clean up some markdown stuff. 2014-07-30 21:28:48 -07:00
Anton Dyudin
e43867c6c1 Preliminary doc claim 2014-07-30 16:38:10 -07:00
C. Guy Yarvin
9f78133295 Merge branch 'master' of github.com:urbit/urbit
Conflicts:
	urb/zod/main/str/markdown/gate.hoon
2014-07-30 15:58:30 -07:00
C. Guy Yarvin
21691f4330 Fix structures in structures; str -> sur. 2014-07-30 15:56:56 -07:00
johncburnham
8b939067d3 the start of self-hosted doc 2014-07-30 15:34:18 -07:00
johncburnham
a5f27bd5b3 changed span to spel in markdown parser 2014-07-30 13:22:18 -07:00
C. Guy Yarvin
bba003c59d Rename maud to markdown. 2014-07-30 12:43:08 -07: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
Anton Dyudin
cc9bf52fc8 working* %zuse in chat hax 2014-07-29 18:09:11 -07:00
Anton Dyudin
473944dca1 %zuse in chat hax 2014-07-29 18:05:05 -07:00
Anton Dyudin
f56941787f Merge branch 'master' of https://github.com/urbit/urbit 2014-07-29 18:04:07 -07: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
dfcb6fda06 added protocols necessary for chat 2014-07-29 17:18:17 -07:00
Anton Dyudin
344116eaa8 Merge branch 'master' of https://github.com/urbit/urbit 2014-07-29 16:47:03 -07:00
Anton Dyudin
15e6734ccb Added :wipe gall %wipe app retcon utility. 2014-07-29 16:45:33 -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
johncburnham
d0fabbd8a2 connected markdown parser to funpub 2014-07-29 13:47:57 -07:00
pcmonk
248190ba3d appbug-2 works 2014-07-29 11:09:56 -07:00
Anton Dyudin
4f82d49c0b /pro/json, disn't seem to help 2014-07-28 21:13:44 -07:00
Anton Dyudin
c6fa2b34b5 /pro/hymn 2014-07-28 16:43:33 -07: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
a8f5877fc4 Zong! 2014-07-28 16:02:28 -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