Commit Graph

517 Commits

Author SHA1 Message Date
John Dulin
5fff837b8b Merge branch 'master' of https://github.com/urbit/urbit 2014-08-08 14:42:11 -07:00
John Dulin
9814f30a89 Finished markdownifying maps, adding some content. 2014-08-08 14:41:56 -07:00
ault011
1079fcf76c more markdown updates 2014-08-08 14:34:49 -07:00
C. Guy Yarvin
bdca596c35 Merge branch 'master' of github.com:urbit/urbit 2014-08-08 13:10:22 -07:00
ault011
da48151031 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-08 11:32:19 -07:00
ault011
25ad8b3d4e Small update. 2014-08-08 11:31:46 -07:00
C. Guy Yarvin
b8e08ae079 Merge branch 'master' of github.com:urbit/urbit 2014-08-08 11:23:34 -07:00
C. Guy Yarvin
196dcf4337 Merge branch 'master' of github.com:urbit/urbit 2014-08-08 10:57:17 -07:00
johncburnham
511d6965a8 twitter app works 2014-08-08 00:41:54 -07:00
Anton Dyudin
a6397f1e8e Merge branch 'master' of https://github.com/urbit/urbit 2014-08-07 17:58:30 -07:00
Anton Dyudin
b736d930aa Added /js/ door.hook, removed spurious ++grab 2014-08-07 17:57:10 -07:00
Ubuntu
fe77032a68 clay datastructures doced 2014-08-08 00:30:27 +00:00
Ubuntu
83c41db7f1 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-07 22:50:16 +00:00
Ubuntu
842ac82c94 documented ++room and children for clay 2014-08-07 22:49:45 +00:00
ault011
3f5cc2c25c Merge branch 'master' of https://github.com/urbit/urbit 2014-08-07 15:10:22 -07:00
C. Guy Yarvin
3a1ef5e648 Remove "community" link. 2014-08-07 15:02:31 -07:00
C. Guy Yarvin
85590dad8b Move docsite to fab/. 2014-08-07 15:01:06 -07:00
ault011
6db00c3e6c Merge branch 'master' of https://github.com/urbit/urbit 2014-08-07 14:43:56 -07:00
ault011
cf4a572907 update 2014-08-07 14:43:19 -07:00
C. Guy Yarvin
642250e99c Merge branch 'master' of github.com:urbit/urbit 2014-08-07 14:38:03 -07:00
Anton Dyudin
b53e794a3d Merge branch 'master' of https://github.com/urbit/urbit 2014-08-07 14:27:02 -07:00
Anton Dyudin
faf3cbe8b7 :tree is like :ls, but with levels 2014-08-07 14:25:53 -07:00
C. Guy Yarvin
ab9173a902 Back to old name. 2014-08-07 14:23:31 -07:00
C. Guy Yarvin
fa1f4a9585 Merge branch 'master' of github.com:urbit/urbit 2014-08-07 14:23:06 -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
John Dulin
15f1e97f9c Merge branch 'master' of https://github.com/urbit/urbit 2014-08-07 13:48:56 -07:00
John Dulin
826e22b59f Markdownified Volume 1 of doc. 2014-08-07 13:48:43 -07:00
Anton Dyudin
556b52c907 And by :foal I mean :into 2014-08-07 13:35:31 -07:00
Ubuntu
c4fd825f3d start of %clay docs 2014-08-07 20:33:55 +00:00
C. Guy Yarvin
57fa88e7c0 Properly serve pngs. 2014-08-07 12:40:28 -07:00
Ubuntu
e95c8c24bd remove %chat-pour-unexpected printf 2014-08-07 18:10:35 +00:00
johncburnham
f349b9d674 this is a website 2014-08-07 11:01:17 -07:00
Anton Dyudin
360fe07ab2 Revert "Minor changes to update..."
This reverts commit de0d03a1921391a17aa27afd15a027615b29a020.
2014-08-05 19:52:31 -07:00
johncburnham
61a7a3a276 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-05 19:17:58 -07:00
johncburnham
a5a42f9ea8 nock doc is done 2014-08-05 19:17:35 -07:00
Ubuntu
aac3f66774 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-06 00:54:39 +00:00
Ubuntu
3d9dba476d work on %ames doc 2014-08-06 00:54:26 +00:00
John Dulin
3cf31e7dc1 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-05 16:50:08 -07:00
John Dulin
70e5fee2b0 Some more updates. 2014-08-05 16:49:54 -07:00
Anton Dyudin
f3f793e1b3 Fixed eyre inject, demo app 2014-08-05 15:09:19 -07:00
ault011
42e0f7aed7 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-05 14:04:56 -07:00
johncburnham
897855c76b Merge branch 'master' of https://github.com/urbit/urbit 2014-08-05 14:03:16 -07:00
ault011
61ac61fab8 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-05 14:02:49 -07:00
johncburnham
88d8346ec3 cleaning main/app 2014-08-05 14:02:17 -07:00
C. Guy Yarvin
9b880d9b7c Merge branch 'master' of github.com:urbit/urbit 2014-08-05 14:01:02 -07:00
ault011
40e1c4a504 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-05 14:00:58 -07:00
C. Guy Yarvin
715bb37cc2 Various example files. 2014-08-05 14:00:48 -07:00
ault011
6cb02976e7 Edits to 9, 10. Crash default 2014-08-05 14:00:14 -07:00
johncburnham
764e7d4a98 no more tabs in markdown 2014-08-05 13:56:27 -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
John Dulin
169aa8ca57 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-05 12:15:15 -07:00
John Dulin
02da74b4d0 Finished updating, adding examples for, and markdownifying jug, jar engines. 2014-08-05 12:15:07 -07:00
Anton Dyudin
7fc5e08ea1 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-05 11:49:52 -07:00
Anton Dyudin
cf3d302b8b (flop mac/zongs/grow/hymn) 2014-08-05 11:49:04 -07:00
Galen Wolfe-Pauly
eb58bf1b1c Merge branch 'master' of https://github.com/urbit/urbit 2014-08-05 11:46:03 -07:00
Galen Wolfe-Pauly
2bc1c1a877 callbacks and put data 2014-08-05 11:45:59 -07:00
Ubuntu
8736df13c5 fixed chat help bug 2014-08-05 18:35:16 +00:00
Jared Hance
aca0aaf5a6 Minor changes to update... 2014-08-05 11:18:05 -04:00
John Dulin
4122a73b65 Cleaned up urbit time, bit of trees tools. 2014-08-04 20:34:26 -07:00
C. Guy Yarvin
722b6c556b Some renamings. 2014-08-04 20:23:29 -07:00
Anton Dyudin
dac2ab6df3 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 17:59:13 -07:00
Anton Dyudin
ede38054d2 Increased specificity of doc vol1 "used by" backreferences. 2014-08-04 17:54:20 -07:00
Ubuntu
702f8eef85 fixed subscriptions in %eyre 2014-08-04 22:49:34 +00:00
Anton Dyudin
e876eac0c1 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 14:05:53 -07:00
Anton Dyudin
b7694eef35 Added basic vol1 usage references 2014-08-04 14:05:28 -07:00
ault011
e12edc40c3 deleted wrong copy 2014-08-04 13:32:04 -07:00
ault011
7a828f0821 Deleted swap 2014-08-04 13:31:44 -07:00
ault011
d309d1cac7 changes to 9, 10 2014-08-04 13:24:30 -07:00
Galen Wolfe-Pauly
257d240523 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 12:50:37 -07:00
Galen Wolfe-Pauly
89778db699 cb obj 2014-08-04 12:44:27 -07:00
ault011
5f7483226b Nock 9, 10 2014-08-04 12:40:00 -07:00
ault011
ea79e990ba Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 12:05:40 -07:00
ault011
b4a4df7c9b nock 9, 10 2014-08-04 12:05:11 -07:00
johncburnham
7f3a5b9efc some doc work 2014-08-04 11:59:31 -07:00
C. Guy Yarvin
02494787db New urbit.pill. 2014-08-04 10:32:48 -07:00
C. Guy Yarvin
d08bf31fc0 A great renaming, and other works. 2014-08-04 10:18:26 -07:00
Galen Wolfe-Pauly
6852cdec5b Merge branch 'urbjs' 2014-08-03 12:04:55 -07:00
C. Guy Yarvin
2908e8aafa Rename pro to mac. 2014-08-02 17:37:36 -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
johncburnham
6da42a48a4 the markdown parser mysteriously broke 2014-08-01 18:05:54 -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
pcmonk
eb414be4fa fixed structures 2014-08-01 16:41:46 -07:00
C. Guy Yarvin
3009394270 Merge branch 'master' of github.com:urbit/urbit 2014-08-01 16:39:30 -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
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
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
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
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
975d69bfb1 Homogenized assignments 2014-07-31 10:46:44 -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
Jared Hance
c1a4aa7886 Merge branch 'master' into klay
Conflicts:
	urb/urbit.pill
2014-07-30 15:14:38 -04: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
15e6734ccb Added :wipe gall %wipe app retcon utility. 2014-07-29 16:45:33 -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
Jared Hance
ef94352267 Merge branch 'master' into klay
Conflicts:
	urb/urbit.pill
2014-07-29 13:25:18 -04: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
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
667ad45403 Semi-working merges. 2014-07-24 15:21:58 -04:00
Jared Hance
fb24594e9e Can boot subs now! 2014-07-24 11:11:40 -04:00
John Dulin
c281cae593 Merge branch 'master' of https://github.com/urbit/urbit 2014-07-23 19:05:30 -07:00
John Dulin
620cebadad Fixed stupid imaginary type in the asset protocol 2014-07-23 19:05:15 -07:00
pcmonk
2b9b533a6f work on making end-to-end acks work 2014-07-23 19:02:50 -07:00
Anton Dyudin
d4cd1cdb47 :update "merge method" clarification 2014-07-23 15:36:10 -07:00
Anton Dyudin
cde3031388 :begin ~ship ~ticket form 2014-07-23 15:15:30 -07:00
Galen Wolfe-Pauly
0ddba5cf1b Merge branch 'master' of https://github.com/urbit/urbit 2014-07-21 11:42:07 -07:00
Galen Wolfe-Pauly
59a5281541 preened urb.js 2014-07-21 11:42:02 -07:00
John Dulin
383b75a47b Merge branch 'master' of https://github.com/urbit/urbit 2014-07-20 23:19:05 -07:00
John Dulin
5152f23085 Added asset [ship guid] logo to /main/sys for streams subscription messages 2014-07-20 23:18:56 -07:00
C. Guy Yarvin
3378245281 Functional build skeleton. 2014-07-20 20:15:02 -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
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
Jared Hance
3c85c88040 Merge branch 'clay'
Conflicts:
	urb/urbit.pill
2014-07-16 13:56:34 -04:00
pcmonk
f20944f107 Finished heartbeat 2014-07-11 19:02:11 -07:00
pcmonk
5acce9cc04 checkpoint 2014-07-11 16:44:33 -07:00
pcmonk
d20aee378b initial work on eyre heartbeat 2014-07-10 19:40:58 -07:00
C. Guy Yarvin
efde5692ed Fix some path reversal bugs. 2014-07-10 16:13:42 -07:00
pcmonk
9ec4de8d6b %lean is gone, long live %mean 2014-07-10 13:10:41 -07:00
pcmonk
0dd086550d add timestamps and textual names for = in chat 2014-07-10 12:01:24 -07:00
pcmonk
6f66d66f16 chat entering not reported bug fixed 2014-07-10 11:05:20 -07:00
pcmonk
aba680d1a8 Merge branch 'master' of https://github.com/urbit/urbit 2014-07-10 10:42:46 -07:00
pcmonk
8b8e1218fd chat private messaging prompt now persistent 2014-07-10 10:42:05 -07:00
Jared Hance
07998df9e1 Add ++niku to ++saba. 2014-07-10 10:38:53 -04:00
C. Guy Yarvin
2c53cdb8cb Fix a very eyre bug. 2014-07-09 18:39:01 -07:00
C. Guy Yarvin
a608e99ce0 Various fixes and improvements. 2014-07-09 17:48:53 -07:00
C. Guy Yarvin
27bf640e79 Merge branch 'master' of github.com:urbit/urbit
Conflicts:
	urb/urbit.pill
2014-07-09 17:17:07 -07:00
pcmonk
426cfb7367 improved zongs-to-hymn translator 2014-07-09 16:34:44 -07:00
John Dulin
d30fcda95a Updated foobug, appbug-2, philbug to not break and not have %rasps. Only appbug-2 functions properly though. 2014-07-09 15:27:41 -07:00
C. Guy Yarvin
720ca0a14f Various fixes and improvements. 2014-07-09 14:43:30 -07:00
C. Guy Yarvin
5496fe9e79 Fix FCGI cache handling. 2014-07-09 02:40:49 -07:00
C. Guy Yarvin
2d9e4e4a29 Merge branch 'master' of github.com:urbit/urbit
Conflicts:
	urb/urbit.pill
2014-07-09 00:40:19 -07:00
C. Guy Yarvin
f9236fe2c8 Various fixes and improvements. 2014-07-09 00:37:47 -07:00
C. Guy Yarvin
8296c6189d Fix FCGI suffix. 2014-07-08 20:24:40 -07:00
pcmonk
2e230304fc Fixed lag bug 2014-07-08 20:20:38 -07:00
C. Guy Yarvin
95eb7baca5 Various fixes and improvements. 2014-07-08 20:00:30 -07:00
C. Guy Yarvin
acbb821155 Fix basic functional publishing. 2014-07-08 15:46:34 -07:00
C. Guy Yarvin
46c9731e21 A bunch of translators. 2014-07-08 15:12:42 -07:00
C. Guy Yarvin
ffad1ede43 Merge branch 'master' of github.com:urbit/urbit
Conflicts:
	urb/urbit.pill
2014-07-07 23:19:18 -07:00
C. Guy Yarvin
b67420b10f Merge branch 'master' of github.com:urbit/urbit
Conflicts:
	urb/urbit.pill
2014-07-07 23:16:17 -07:00
pcmonk
77db780c48 chat no longer echoes own messages 2014-07-07 18:15:53 -07:00
pcmonk
55738f5215 Merge branch 'master' of https://github.com/urbit/urbit 2014-07-07 17:33:30 -07:00
pcmonk
a55d4d1413 fixed %nice, %mean over %ames 2014-07-07 17:32:58 -07:00
Anton Dyudin
912c7b35f9 Merge branch 'master' of https://github.com/urbit/urbit 2014-07-07 17:08:22 -07:00
pcmonk
a4d8d0478c %rasp is now replaced with %nice and %mean 2014-07-07 16:59:39 -07:00
pcmonk
b2f5a36cae Merge branch 'temp'
Conflicts:
	urb/urbit.pill
2014-07-07 16:56:44 -07:00
pcmonk
ce2a89fdd2 partial switch away from %rasp 2014-07-07 16:36:35 -07:00
Anton Dyudin
3ccb376995 new file: urb/zod/main/lib/urb.js 2014-07-07 16:19:21 -07:00
C. Guy Yarvin
6e1acf52fe Fix some ford and md bugs. 2014-07-07 16:17:21 -07:00
pcmonk
5edc4de136 fixed chat with functional publishing changes 2014-07-07 11:18:10 -07:00
pcmonk
996ed44e9d bug fix in %gall 2014-07-07 10:58:15 -07:00
C. Guy Yarvin
e35426a8f5 Eliminate superfluous |* in funpub. 2014-07-06 09:57:37 -07:00
C. Guy Yarvin
e473ab7cf4 Fix functional publishing and add debug feedback. 2014-07-05 16:38:15 -07:00
pcmonk
dcd09da912 fixed backlog, heartbeat, private messages in chat 2014-07-03 18:47:51 -07:00
pcmonk
40329afb12 improved chat 2014-07-03 11:14:22 -07:00
pcmonk
f0d41ea9d6 progress in chat, added reverse of sup.hid 2014-07-02 18:53:53 -07:00
pcmonk
ea49cdca02 progress on %gall over %ames 2014-07-02 15:08:02 -07:00
C. Guy Yarvin
373ad8b2eb Re-rename after bugfix. 2014-07-01 20:45:06 -07:00