Commit Graph

705 Commits

Author SHA1 Message Date
Ubuntu
4b40092688 %- dec arvo-proper-bugs 2014-09-24 01:03:20 +00:00
Anton Dyudin
32da6e8589 Nices rectified, commands typed. 2014-09-22 18:00:25 -07:00
Ubuntu
5e07872bc7 shell not broken 2014-09-22 23:06:55 +00:00
Ubuntu
ccd389b4a8 shell work 2014-09-22 22:20:47 +00:00
Ubuntu
7e445e92f4 terminal working 2014-09-18 02:56:49 +00:00
Ubuntu
e95c042e85 cleanup 2014-09-17 22:25:58 +00:00
Ubuntu
d0e81dcd7a %gall seems to be working 2014-09-17 21:23:48 +00:00
C. Guy Yarvin
9f22287791 Merges and bugfixes. 2014-09-16 17:29:12 -07:00
Ubuntu
83f9454159 cede test app 2014-09-17 00:20:46 +00:00
Ubuntu
3375c8f048 telling next of kin 2014-09-17 00:04:58 +00:00
Ubuntu
9bdfaa845e really finished clay doc 2014-09-16 15:30:11 +00:00
Ubuntu
f92a265216 finished clay doc 2014-09-16 15:25:06 +00:00
Ubuntu
fabf390eac updated clay doc and code 2014-09-16 14:19:15 +00:00
Ubuntu
c33eab7645 updated clay doc 2014-09-16 12:42:37 +00:00
Ubuntu
0f7ce25b9e improved %gall kill handling 2014-09-16 02:56:44 +00:00
Anton Dyudin
f5f9e7f17c Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2014-09-15 18:20:30 -07:00
C. Guy Yarvin
69de3fdb92 Some support stuff. 2014-09-12 12:55:15 -07:00
Ubuntu
c14d6b4d05 basic terminal and shell apps 2014-09-12 02:11:03 +00:00
Ubuntu
c2e05b0e2f ability to sire 2014-09-11 20:44:46 +00:00
Ubuntu
102fced646 clay fixes 2014-09-11 18:52:25 +00:00
Ubuntu
ba92dee46b basic skeleton of %sire 2014-09-11 00:55:44 +00:00
Ubuntu
dd1b229b6b separate app identity from instance 2014-09-10 23:35:03 +00:00
Ubuntu
d0d80f6ce2 clay foreign request doc done 2014-09-10 19:52:06 +00:00
Ubuntu
8732d6e097 clay local subscription doc done 2014-09-10 00:31:17 +00:00
Ubuntu
0b7ce49282 reflect clay refactor in doc 2014-09-09 20:25:00 +00:00
Ubuntu
d789f4ec88 more clay refactoring 2014-09-09 18:53:27 +00:00
Ubuntu
c4f30c5660 updated %clay doc 2014-09-08 22:30:58 +00:00
C. Guy Yarvin
f79aa14786 Better tools for test kernels. 2014-09-06 19:54:25 -07:00
C. Guy Yarvin
d13c0b3ddc Moar test. 2014-09-06 15:43:54 -07:00
C. Guy Yarvin
1984268a2c Merge branch 'test' of git://github.com/urbit/urbit-new into test 2014-09-06 14:09:33 -07:00
C. Guy Yarvin
2840da1066 Simple test pill for memorable. 2014-09-06 14:09:15 -07:00
Ubuntu
afb776f077 update %clay doc 2014-09-05 16:25:02 +00:00
Ubuntu
2d15399137 updated clay doc 2014-09-04 01:16:23 +00: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
Anton Dyudin
f9c0b35bb8 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-03 00:20:19 -07:00
Anton Dyudin
c6ad315be6 Alphabetica 2014-09-03 00:20:08 -07:00
Ubuntu
8d7ecb1f5b updated %clay doc 2014-09-03 01:37:24 +00:00
ault011
9fbfb51a6d Fixed ford-advanced doc typo 2014-09-02 12:54:47 -07:00
Anton Dyudin
69d64fe590 File browser browses files 2014-09-02 11:11:37 -07:00
Ubuntu
1af92e7dcc Merge branch 'master' into test 2014-09-02 00:47:05 +00:00
Ubuntu
91f5171e06 updated %clay doc 2014-09-02 00:46:21 +00:00
Anton Dyudin
9b04cf46dd Added clay browser 2014-08-28 18:28:13 -07:00
Anton Dyudin
b55c48ef2c Fixed say/arvo doc structure 2014-08-28 18:00:43 -07:00
Anton Dyudin
b84542fbc1 s/hymn/psal/ 2014-08-28 17:28:37 -07:00
Anton Dyudin
c843d99b78 Volumes up. 2014-08-28 16:33:15 -07:00
Anton Dyudin
8963999510 Flattened vol 2014-08-28 14:51:01 -07:00
Anton Dyudin
c2f6bc7d06 Chat repl time 2014-08-28 14:30:02 -07:00
ault011
623261f92f Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-28 13:42:55 -07:00
ault011
08eadcaf75 Propozed zuse sectioning 2014-08-28 13:42:30 -07:00
Anton Dyudin
19de1a4d7a Spurious date zeroes 2014-08-28 12:20:35 -07:00
Anton Dyudin
79b8e6aa29 Chat \\ leniency 2014-08-28 12:02:56 -07:00
Ubuntu
e066bc2148 a few basic tests 2014-08-28 01:37:29 +00:00
Ubuntu
f7d338ab9c added bone to ++pour 2014-08-27 23:00:41 +00:00
Ubuntu
86ccab6a86 updated ames doc 2014-08-27 22:30:42 +00:00
Ubuntu
2e0038b272 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-27 21:59:38 +00:00
Ubuntu
bdc921b56f lifecycle of a packet doc done 2014-08-27 21:59:20 +00:00
Anton Dyudin
be4848f3c9 Fixed blank-lined code blocks 2014-08-27 13:24:31 -07:00
ault011
d6aefb1cc2 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-26 19:00:56 -07:00
ault011
10c80387da WIP single-file site 2014-08-26 19:00:09 -07:00
Ubuntu
351b148714 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-27 01:45:48 +00:00
Ubuntu
5c107029f6 almost done with lifecycle of a packet 2014-08-27 01:45:26 +00:00
johncburnham
a41bdf7ad2 Update syntax.md 2014-08-26 14:11:07 -07:00
johncburnham
59413d6773 Update phonology.md 2014-08-26 13:39:52 -07:00
johncburnham
8092089048 Update morphology.md 2014-08-26 13:02:22 -07:00
johncburnham
b7bdbf83e0 Update index.md 2014-08-26 12:59:32 -07:00
ault011
7314f2e651 deleted last paragraph 2014-08-26 11:56:32 -07:00
ault011
d9a60b2bdb backstep addition 2014-08-26 11:53:42 -07:00
johncburnham
32982c1837 rename syntax.md 2014-08-26 10:21:22 -07:00
johncburnham
cdaff6b551 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-26 10:19:33 -07:00
johncburnham
a8931ecb19 Some more doc 2014-08-26 10:19:08 -07:00
ault011
69c2318bea Push 2014-08-25 19:33:05 -07:00
Ubuntu
ad098e276b updated %ames doc 2014-08-25 17:10:13 +00:00
Anton Dyudin
3a043c3604 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-23 15:56:50 -07:00
Anton Dyudin
13dfbc804f Rescued urbit.org markdown 2014-08-23 15:56:35 -07:00
Ubuntu
9200bcb02d updated %ames doc 2014-08-23 02:42:18 +00:00
Ubuntu
ef682f2aca updated morphology doc 2014-08-22 23:13:55 +00:00
Ubuntu
e2d856f202 updated morphology doc 2014-08-22 21:14:04 +00:00
Ubuntu
b84867eb66 a little more %ames doc 2014-08-22 03:07:10 +00:00
johncburnham
f1ae7e4594 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-21 14:18:03 -07:00
johncburnham
5222da66ad added some extremely rough hoon reference 2014-08-21 14:09:52 -07:00
Ubuntu
554a22660b Merge branch 'master' into test
Conflicts:
	urb/urbit.pill
2014-08-21 20:08:32 +00:00
ault011
0317c0f1b1 Restructured the directory format for doc/ref/vol 2014-08-21 13:00:19 -07:00
Anton Dyudin
2dfa8b8b91 twit unmurder 2014-08-21 12:44:55 -07:00
Anton Dyudin
3d454f2acf Am I doing this right? 2014-08-21 12:15:05 -07:00
Ubuntu
87f8bc901f Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-21 03:25:12 +00:00
Ubuntu
1eee97237f more %ames doc 2014-08-21 03:24:54 +00:00
Anton Dyudin
1f09fe15b9 XML templating documentation 2014-08-20 14:35:02 -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
Anton Dyudin
b2e8cdc593 Reemsymboled :cat, tweaked :poxo 2014-08-18 21:40:11 -07:00
Anton Dyudin
3c0161d5b6 urb.js block scope fix
Will inspect more thoroughly.
2014-08-18 01:41:01 -07:00
Anton Dyudin
74e325fb77 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-14 14:18:22 -07:00
Anton Dyudin
88a85ae0a4 Preliminary %dill models 2014-08-14 14:18:02 -07:00
Anton Dyudin
89756c5817 Made appl optional if set globally on window.urb 2014-08-14 14:15:40 -07:00
ault011
40cb7e6499 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-14 13:21:00 -07:00
ault011
2035eaf83b more cleanup 2014-08-14 13:20:09 -07:00
ault011
6e9229712d deleted swap 2014-08-14 13:16:57 -07:00
ault011
8444bca522 deletions of rawshit 2014-08-14 13:14:58 -07:00
ault011
7436510bca splitting up volumes 2014-08-14 13:13:26 -07:00
Anton Dyudin
d32d4848b4 more lenient :cat 2014-08-12 23:21:59 -07:00
Anton Dyudin
d47a837d2d More parsf doc 2014-08-12 16:47:56 -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
C. Guy Yarvin
e3587a9f3d Some cleanups. 2014-08-11 18:21:02 -07:00
C. Guy Yarvin
c7c877de05 Merge branch 'master' of github.com:urbit/urbit 2014-08-11 17:13:06 -07:00
C. Guy Yarvin
058d3d866f Various fixes and improvements. 2014-08-11 17:12:51 -07:00
johncburnham
a341c74593 now you can looka at hook files directly 2014-08-11 15:03:07 -07:00
Galen Wolfe-Pauly
d1e176224c urbit time for twit 2014-08-11 14:09:06 -07:00
Galen Wolfe-Pauly
e612f44895 ok fine, now it works 2014-08-11 13:44:51 -07:00
Galen Wolfe-Pauly
865f22dab7 a rendered timeline 2014-08-11 13:13:53 -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
c735a5a522 More cleanups. 2014-08-11 02:38:23 -07:00
C. Guy Yarvin
966499980b More cleanups. 2014-08-11 01:42:23 -07:00
C. Guy Yarvin
2061d0aaf6 More stylistic improvements. 2014-08-11 01:17:21 -07:00
C. Guy Yarvin
cc3733e6d4 Various mainly stylistic improvements. 2014-08-11 00:47:46 -07:00
C. Guy Yarvin
0f23312aec Back to compiling. 2014-08-10 22:28:10 -07:00
C. Guy Yarvin
2a10f4dd34 Improve some eyre printfs. 2014-08-10 21:43:43 -07:00
C. Guy Yarvin
9805fd21fd Add old twitter app. 2014-08-10 20:49:56 -07:00
C. Guy Yarvin
fe9c4c8a85 Various fixes and improvements. 2014-08-10 20:09:56 -07:00
johncburnham
3d5d00d9a3 reworked twitter api and ap 2014-08-10 04:46:39 -07:00
Galen Wolfe-Pauly
e9ab68d6e7 js fix for twit 2014-08-09 00:04:37 -04:00
Galen Wolfe-Pauly
a06b2cb956 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-09 00:00:48 -04:00
Galen Wolfe-Pauly
e0a8012d71 twit fixes and improvements 2014-08-09 00:00:44 -04:00
johncburnham
eecf50bf36 merge conflicts 2014-08-08 20:57:36 -07:00
johncburnham
e445e64579 Merge branch 'master' of https://github.com/urbit/urbit
Conflicts:
	urb/zod/main/pub/src/doc/ref/vol2.md
	urb/zod/main/pub/src/site/res/sidebar.html
2014-08-08 20:57:12 -07:00
johncburnham
438732a670 more sitework 2014-08-08 20:55:42 -07:00
C. Guy Yarvin
5613dc3682 Merge branch 'master' of github.com:urbit/urbit 2014-08-08 20:43:06 -07:00
johncburnham
be038f4c11 reworked the site 2014-08-08 20:36:35 -07:00
Galen Wolfe-Pauly
3ee6aafaa6 no double underlines 2014-08-08 22:48:51 -04:00
John Dulin
185a4bc3c0 Finished vol2 markdownification. 2014-08-08 19:22:22 -07:00
John Dulin
15b335d4c4 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-08 18:36:14 -07:00
John Dulin
9684ef85bb Markdownified parsing, containers, formatting. 2014-08-08 18:36:08 -07:00
ault011
b3ce191659 2eh-2em 2014-08-08 17:49:19 -07:00
ault011
05578eba5c error check pass through sets 2014-08-08 16:51:09 -07:00
ault011
c0e47e8bf8 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-08 16:15:43 -07:00
ault011
0e794b47d0 updates for jd 2014-08-08 16:15:04 -07:00
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