Jared Hance
38122c5b5a
Fix merge...
2014-07-22 15:33:17 -04:00
Jared Hance
27f38c45bd
Merge branch 'master' into klay
...
Conflicts:
urb/zod/arvo/zuse.hoon
2014-07-22 15:03:59 -04:00
Jared Hance
5ba302978c
Broken.
2014-07-22 14:56:04 -04:00
Jared Hance
36549106ae
zuse compiles again...
2014-07-22 10:11:03 -04:00
Jared Hance
4e6e0e79eb
Add +-got to ++by.
2014-07-22 10:10:01 -04:00
C. Guy Yarvin
edfae53ddc
Fix horrid indentation thing.
2014-07-22 09:32:35 -07:00
C. Guy Yarvin
5d8bca3bea
Some hoof tweaks.
2014-07-21 18:55:40 -07:00
C. Guy Yarvin
9c39abae1c
Merge branch 'master' of github.com:urbit/urbit
...
Conflicts:
urb/urbit.pill
2014-07-21 15:54:29 -07:00
C. Guy Yarvin
2b5e57de2d
Replace ++logo with ++mark to match doc.
2014-07-21 15:14:52 -07:00
Anton Dyudin
847253d685
fixed %eyre urb.user inject
2014-07-21 13:38:46 -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
C. Guy Yarvin
ac488f6225
We are very close to the memory limit on :solid!
2014-07-18 19:45:10 -07:00
C. Guy Yarvin
925ae8ccb7
Merge branch 'master' of github.com:urbit/urbit
2014-07-18 17:51:37 -07:00
C. Guy Yarvin
79b91ebd7a
New ford skeleton; some hoon cleanups
2014-07-18 17:51:22 -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
C. Guy Yarvin
2260d31b1c
Merge branch 'master' of github.com:urbit/urbit
2014-07-17 13:56:22 -07:00
C. Guy Yarvin
f3e3eb01e0
Preparing to integrate new ford.
2014-07-17 13:56:08 -07:00
Jared Hance
f82578e30d
Add useful stuff
2014-07-17 16:04:18 -04:00
Jared Hance
1933149d04
Zuse compiles again, new model.
2014-07-17 14:27:14 -04:00
Jared Hance
2bcde8f6ee
Initial klay stuff.
...
Clay.hoon doesn't work yet, haven't done subscriptions.
Should probably changes yakis to only reference yaki mugs rather than
yakis themselves - and have a blob map in the dome. Otherwise
subscriptions and merges will suck for large stuff.
2014-07-17 11:40:52 -04:00
johncburnham
5987ff2f8d
improved xml parser
2014-07-16 19:46:46 -07:00
pcmonk
20574f69f7
more work on eyre-stuff -- compiles
2014-07-16 19:10:13 -07:00
Jared Hance
7faf70e14d
Some klay changes.
2014-07-16 15:14:12 -04: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
C. Guy Yarvin
5b8844207e
Minor tweaks.
2014-07-16 11:54:53 -07:00
pcmonk
2df55edb87
Bump protocol number
2014-07-16 11:25:22 -07:00
Jared Hance
3c85c88040
Merge branch 'clay'
...
Conflicts:
urb/urbit.pill
2014-07-16 13:56:34 -04:00
johncburnham
bbe73c468f
added an xml parser
2014-07-15 22:47:43 -07:00
pcmonk
3fafa64ed5
initial work on eyre changes
2014-07-15 19:30:29 -07:00
Anton Dyudin
ecb2ebf79b
zl:jo no longer builds faceless poles
2014-07-15 16:07:39 -07:00
Jared Hance
0dbe195676
nori -> yaki.
2014-07-15 15:40:57 -04:00
Jared Hance
072c87e5fb
Better klay zerg.
2014-07-15 14:58:49 -04:00
Jared Hance
08a48d88e4
Add klay.hoon.
2014-07-15 14:41:48 -04:00
pcmonk
92f7bddcd8
unkludged eyre heartbeat
2014-07-14 19:45:04 -07:00
Jared Hance
e086185603
Add ++reap.
...
Makes constructing lists for testing alot nicer.
2014-07-14 11:59:16 -04:00
C. Guy Yarvin
ff5e56a05c
Move silks around, etc.
2014-07-12 11:24:52 -07:00
pcmonk
f20944f107
Finished heartbeat
2014-07-11 19:02:11 -07:00
pcmonk
5acce9cc04
checkpoint
2014-07-11 16:44:33 -07:00
Jared Hance
58e1f03655
Ugly ++lize stuff.
...
Well, merges work better, two-way parties seem fine with merging back
and forth.
2014-07-11 14:05:07 -04: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
Jared Hance
8e5c44a628
Update mergepoints.
2014-07-10 16:54:28 -04:00
pcmonk
9ec4de8d6b
%lean is gone, long live %mean
2014-07-10 13:10:41 -07:00
Jared Hance
057ff37574
Clay revision control basically works.
...
Just need to update the agons, coming soon.
2014-07-10 16:07:48 -04:00