Jared Hance
|
c7a78be9bd
|
Almost working
|
2014-07-30 13:04:40 -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
|
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 |
|
Jared Hance
|
3e0b18494c
|
Send original copy to merge
|
2014-07-29 14:16:35 -04:00 |
|
pcmonk
|
248190ba3d
|
appbug-2 works
|
2014-07-29 11:09:56 -07:00 |
|
Jared Hance
|
68fb76214d
|
Fix referential transparency in %merg
|
2014-07-29 13:43:20 -04: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
|
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 |
|
pcmonk
|
6d386f15cc
|
give (slightly) more helpful crud errors in %gall
|
2014-07-28 12:23:51 -07:00 |
|
pcmonk
|
f34071c4ff
|
e2e-acks in a consistent state, ready to merge
|
2014-07-28 11:44:56 -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 |
|
johncburnham
|
e5bc25e3a1
|
improved markdown, now with html printer
|
2014-07-28 05:00:56 -07:00 |
|
C. Guy Yarvin
|
9951d710bd
|
Merge branch 'master' of github.com:urbit/urbit
|
2014-07-27 12:18:22 -07:00 |
|
C. Guy Yarvin
|
3c4696fefd
|
More tweaking round the bleeding edges.
|
2014-07-27 05:04:30 -07:00 |
|
C. Guy Yarvin
|
c8399fdacf
|
Moving toward new translation.
|
2014-07-27 03:26:17 -07: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 |
|
Galen Wolfe-Pauly
|
d69390ff36
|
Merge branch 'master' of https://github.com/urbit/urbit
|
2014-07-25 12:11:06 -07:00 |
|
Galen Wolfe-Pauly
|
3d51055812
|
need data-scri in the head now
|
2014-07-25 12:11:01 -07:00 |
|
Jared Hance
|
3a48876a4d
|
Fix referential transparency in %cu
|
2014-07-25 13:44:06 -04:00 |
|
C. Guy Yarvin
|
d8b3c5f7d5
|
Remove eyre console code to save memory.
|
2014-07-25 09:38:22 -07:00 |
|
C. Guy Yarvin
|
2f42a419ea
|
Ford, with some comments to save memory.
|
2014-07-25 09:26:12 -07:00 |
|
C. Guy Yarvin
|
3aa1580c03
|
Merge branch 'master' of github.com:urbit/urbit
|
2014-07-25 09:02:51 -07:00 |
|
Jared Hance
|
d71b5c6bc1
|
Functional neoclay
|
2014-07-25 11:38:13 -04:00 |
|
Jared Hance
|
873bd9b208
|
Simple change
|
2014-07-25 08:53:39 -04:00 |
|
johncburnham
|
18b00ae650
|
a markdown parser
|
2014-07-25 03:45:46 -07:00 |
|
C. Guy Yarvin
|
faf33d012b
|
Ford compiles - still needs some syntax.
|
2014-07-24 13:29:16 -07:00 |
|
Jared Hance
|
bd3f0377b8
|
Fast-forward merges should work (untested)
|
2014-07-24 16:23:54 -04:00 |
|
Jared Hance
|
667ad45403
|
Semi-working merges.
|
2014-07-24 15:21:58 -04:00 |
|
C. Guy Yarvin
|
f9e53c2541
|
Merge branch 'master' of github.com:urbit/urbit
|
2014-07-24 11:16:50 -07:00 |
|
C. Guy Yarvin
|
96e2eef2b2
|
Fix some indents.
|
2014-07-24 11:16:39 -07:00 |
|
Jared Hance
|
9eea495578
|
Zuse compiles w/ some merge code.
|
2014-07-24 12:13:36 -04:00 |
|