Commit Graph

1535 Commits

Author SHA1 Message Date
Ubuntu
822f69d228 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-06 17:36:00 +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
Anton Dyudin
360fe07ab2 Revert "Minor changes to update..."
This reverts commit de0d03a1921391a17aa27afd15a027615b29a020.
2014-08-05 19:52:31 -07:00
Ubuntu
205276c17e Revert "Minor changes to update..."
This reverts commit de0d03a1921391a17aa27afd15a027615b29a020.
2014-08-06 02:49:07 +00: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
C. Guy Yarvin
43cbddd1f3 Merge branch 'master' of github.com:urbit/urbit 2014-08-05 17:19:28 -07:00
C. Guy Yarvin
ac33a315bb Remove "keywords" in hood. 2014-08-05 17:17:36 -07: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
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
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
vere
165a37626c bump protocol 2014-08-05 19:25:09 +00: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
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
aca0aaf5a6 Minor changes to update... 2014-08-05 11:18:05 -04:00
Jared Hance
125b0a9603 Fix hashes in ++azel 2014-08-05 10:10:15 -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
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
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
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
Anton Dyudin
e876eac0c1 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 14:05:53 -07:00