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
|
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
|
a0fedff20c
|
Trivial fixes
|
2014-08-01 11:35:56 -04:00 |
|
Jared Hance
|
aaeaa07a04
|
Better :show
|
2014-08-01 11:34:42 -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 |
|
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 |
|
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 |
|
Jared Hance
|
fe2682adc9
|
Get rid of batz ugly in show/revert
|
2014-07-31 13:42:02 -04:00 |
|
Jared Hance
|
c9f4fdcf22
|
Small fixes to :show
|
2014-07-31 13:32:27 -04:00 |
|
Jared Hance
|
90ebf0155d
|
Better show
|
2014-07-31 13:30:19 -04:00 |
|
johncburnham
|
5fd348d1e9
|
roll protocol for breach
|
2014-07-31 08:25:29 -07:00 |
|
Jared Hance
|
36bd690c18
|
show.hoon
|
2014-07-31 11:17:51 -04: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 |
|
Jared Hance
|
d809b036dd
|
Add revert.hoon
|
2014-07-30 16:40:56 -04: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 |
|
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 |
|