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
johncburnham
6bb974f2ec
fixed minor bug in xml parser
2014-07-22 12:02:44 -07: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
C. Guy Yarvin
edfae53ddc
Fix horrid indentation thing.
2014-07-22 09:32:35 -07:00
C. Guy Yarvin
2b5e57de2d
Replace ++logo with ++mark to match doc.
2014-07-21 15:14:52 -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
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
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
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
Anton Dyudin
ecb2ebf79b
zl:jo no longer builds faceless poles
2014-07-15 16:07:39 -07:00
C. Guy Yarvin
ff5e56a05c
Move silks around, etc.
2014-07-12 11:24:52 -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
Jared Hance
8e5c44a628
Update mergepoints.
2014-07-10 16:54:28 -04: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
Jared Hance
7eb4282f33
Finish ++alne.
2014-07-10 15:24:22 -04:00
Jared Hance
d9782a5b5f
Merges work again.
2014-07-10 15:13:42 -04:00
Jared Hance
8c7281a330
Modify the data flow in zuse.
...
Gets the ++niku passed around everywhere, so we have enough information
to actually merge.
2014-07-10 10:45:17 -04:00
Jared Hance
07998df9e1
Add ++niku to ++saba.
2014-07-10 10:38:53 -04:00
Jared Hance
d549b6a4fe
Fix revision origin.
2014-07-10 10:24:29 -04:00
C. Guy Yarvin
a608e99ce0
Various fixes and improvements.
2014-07-09 17:48:53 -07:00
C. Guy Yarvin
27bf640e79
Merge branch 'master' of github.com:urbit/urbit
...
Conflicts:
urb/urbit.pill
2014-07-09 17:17:07 -07:00
C. Guy Yarvin
0d91fcb76a
Changes to ++sill.
2014-07-09 17:16:17 -07:00
C. Guy Yarvin
56a8799501
Various fixes and improvements.
2014-07-09 16:12:26 -07:00
pcmonk
0966b543c8
Merge branch 'master' of https://github.com/urbit/urbit
...
Conflicts:
urb/urbit.pill
2014-07-09 14:44:54 -07:00
C. Guy Yarvin
720ca0a14f
Various fixes and improvements.
2014-07-09 14:43:30 -07:00
pcmonk
2c15e0c0bf
%send effect does not need to drop through anymore
2014-07-09 14:42:08 -07:00
Jared Hance
235583e858
Almost there...
2014-07-09 16:56:23 -04:00
Jared Hance
8703188407
Restructure clay.
...
Hopefully this is the only commit that would require a breach.
Writing a data transition would be trivial later.
Still need to fix ++domo.
2014-07-09 15:11:25 -04:00
C. Guy Yarvin
5496fe9e79
Fix FCGI cache handling.
2014-07-09 02:40:49 -07:00
C. Guy Yarvin
f9236fe2c8
Various fixes and improvements.
2014-07-09 00:37:47 -07:00
C. Guy Yarvin
95eb7baca5
Various fixes and improvements.
2014-07-08 20:00:30 -07:00
C. Guy Yarvin
fee2d7011e
Merge branch 'master' of github.com:urbit/urbit
...
Conflicts:
urb/urbit.pill
2014-07-08 12:07:38 -07:00
C. Guy Yarvin
6337290934
Fix json reparser.
2014-07-08 11:38:07 -07:00
Jared Hance
0becefd519
Small change.
...
Not sure why I had troubles doing this before. Probably didn't change
%+ to %- or something.
2014-07-08 14:07:14 -04:00
Jared Hance
56b590f5e6
Rewrite ++urle.
...
In theory this is an optimization...
2014-07-08 14:07:14 -04:00
C. Guy Yarvin
4387713100
Eliminate old XML abbreviations.
2014-07-06 15:16:20 -07:00
C. Guy Yarvin
35b48e0cb9
Various fixes and improvements.
2014-07-05 14:26:35 -07:00
C. Guy Yarvin
f9f5f7c29d
Merge branch 'master' of github.com:urbit/urbit
...
Conflicts:
urb/urbit.pill
2014-07-03 13:06:52 -07:00
Jared Hance
e96868996b
Rewrite ++lode and ++wode
...
Total lines added/deleted for patch.
2014-07-03 15:50:55 -04:00
Jared Hance
49364e07ce
Rewrite ++lith.
2014-07-03 15:32:10 -04:00
Jared Hance
787bdae914
Document ++lisp.
...
Merge of woof and urge.
2014-07-03 15:27:43 -04:00
pcmonk
24fb18fe73
Merge branch 'master' of https://github.com/urbit/urbit
...
Conflicts:
urb/urbit.pill
2014-07-03 11:17:57 -07:00
pcmonk
40329afb12
improved chat
2014-07-03 11:14:22 -07:00
Jared Hance
1f5ca20c6e
Revive ++ja.
2014-07-03 14:07:21 -04:00
Jared Hance
408529e7f3
Rewrite ++lyre (miso commute with woof)
2014-07-03 12:41:37 -04:00
Jared Hance
af077d1c23
Rewrite ++alto.
...
Most of the first part of ++ze is now clean and understood.
2014-07-03 12:05:41 -04:00
Jared Hance
4748aa2df2
Rewrite ++alda and ++alot.
2014-07-03 11:46:26 -04:00
Jared Hance
bbcaf18703
Various fixes and improvements.
2014-07-03 11:35:17 -04:00
C. Guy Yarvin
f86e80187a
Fix json reparser.
2014-07-02 19:56:33 -07:00
pcmonk
ea49cdca02
progress on %gall over %ames
2014-07-02 15:08:02 -07:00
Anton Dyudin
1fc8f3d104
Merge branch 'master' of https://github.com/urbit/urbit
2014-07-01 16:30:30 -07:00
C. Guy Yarvin
37f933b33a
Change ++ja to ++jo and fix some stuff.
2014-07-01 16:29:44 -07:00
Anton Dyudin
4751de0d5f
Merge branch 'master' of https://github.com/urbit/urbit
2014-07-01 15:51:47 -07:00
Anton Dyudin
afa76048e0
comment fixes
2014-07-01 15:51:42 -07:00
C. Guy Yarvin
7f2a8deb61
Merge branch 'master' of github.com:urbit/urbit
2014-07-01 13:35:36 -07:00
C. Guy Yarvin
a857ff6445
Merge branch 'master' of github.com:urbit/urbit
...
Conflicts:
urb/urbit.pill
2014-07-01 13:34:06 -07:00
Anton Dyudin
20d14296c0
Moar indentation
2014-06-30 19:28:47 -07:00
C. Guy Yarvin
c0758b3704
Merge branch 'master' of github.com:urbit/urbit
...
Conflicts:
urb/urbit.pill
2014-06-29 20:03:15 -07:00
Anton Dyudin
c13fa17fe6
Partially fixed reel/roll. Alas, while (reel wall
~["ab" "cd"] welp) now compiles it loses type info, because passing wet gates to wet gates makes nest:ut sad
2014-06-28 16:47:49 -07:00
C. Guy Yarvin
28e63d7a36
Trailing whitespace and stuff.
2014-06-26 21:02:05 -07:00
C. Guy Yarvin
43f7dcba1d
%ames to %gall as /q/gm/[app]/[logo].
2014-06-26 05:18:30 -07:00
C. Guy Yarvin
fee99966cb
Fix irritating %logo bug.
2014-06-24 12:13:26 -07:00
C. Guy Yarvin
d6b1ecde47
Various fixes and improvements.
2014-06-19 11:53:16 -07:00
C. Guy Yarvin
7b095d47c8
Today's modifications.
2014-06-18 20:27:36 -07:00
C. Guy Yarvin
39b72cbb5a
App model 1.1 at least compiles.
2014-06-16 18:33:31 -07:00
C. Guy Yarvin
4ccea74016
Various fixes and improvements.
2014-06-13 17:38:51 -07:00
C. Guy Yarvin
120760563c
Various fixes and improvements.
2014-06-11 07:06:36 -07:00
C. Guy Yarvin
47db363c25
Merge branch 'nextbreach' of github.com:urbit/urbit into nextbreach
...
Conflicts:
Makefile
urb/urbit.pill
2014-06-09 13:09:50 -07:00
C. Guy Yarvin
df8ae2368d
More %eyre fixes.
2014-06-09 13:09:14 -07:00
~hatteb-mitlyd
4fc08655c8
move dill tiles to dill.hoon
2014-06-08 14:27:04 -07:00
C. Guy Yarvin
82a9ce1211
Merge branch 'nextbreach' of github.com:urbit/urbit into nextbreach
...
Conflicts:
urb/urbit.pill
urb/zod/arvo/hoon.hoon
2014-06-07 19:56:38 -07:00
C. Guy Yarvin
ff2c010efe
Applications properly self-reload.
2014-06-07 19:45:00 -07:00
C. Guy Yarvin
ba59c5bffc
Various fixes and improvements.
2014-06-07 11:36:31 -07:00
Gavin Whelan
eeb1591fb6
Minor changes
2014-06-07 13:42:48 -04:00
Gavin Whelan
d7d0f40758
Fixed typo
2014-06-06 15:03:27 -04:00
Gavin Whelan
32e8bb7d96
merge fixes
...
Conflicts:
urb/zod/arvo/clay.hoon
2014-06-06 15:03:24 -04:00
C. Guy Yarvin
ea79a1301a
++card is gone.
2014-06-05 16:51:59 -07:00
C. Guy Yarvin
2dca2aa638
First pass through all vanes typed.
2014-06-05 16:48:13 -07:00
C. Guy Yarvin
90fe034995
%batz reasonably healthy on nextbreach.
2014-06-05 12:17:25 -07:00
C. Guy Yarvin
2f00948780
Merge branch 'nextbreach' of github.com:urbit/urbit into nextbreach
...
Conflicts:
urb/urbit.pill
2014-06-04 03:44:33 -07:00
C. Guy Yarvin
6e00dd5ee3
Tighten types on some vanes.
2014-06-04 03:40:09 -07:00
~hatteb-mitlyd
ec273c2b0c
beginning stages of fake-net hackery
2014-06-03 16:39:28 -07:00
C. Guy Yarvin
01465717d3
IPv4 lanes now have a timestamp.
2014-06-03 14:01:40 -07:00
Gavin Whelan
376e1079d4
Removed printout and improved :update
2014-06-02 14:41:53 -04:00
Gavin Whelan
4b4ba12e1c
Merge branch 'master' of https://github.com/urbit/urbit
2014-06-02 09:19:06 -04:00
Gavin Whelan
6838d3aed8
Commit for debugging, formatting and stuff
2014-06-02 09:19:00 -04:00
C. Guy Yarvin
ea54293ee2
Improved eyre/gall integration.
2014-06-01 14:07:13 -07:00
johncburnham
130f653433
fixed hmac comment
2014-05-31 16:49:48 -07:00
Gavin Whelan
7eea04ce1e
Minor interface changes
2014-05-31 14:11:11 -07:00
C. Guy Yarvin
4db07a816d
More pre-breach fixes.
2014-05-31 13:22:49 -07:00
C. Guy Yarvin
733ff7f0c6
Fill in some stubs in %ford.
2014-05-31 05:52:06 -07:00
C. Guy Yarvin
afa57ae065
Change %ames namespace.
2014-05-30 21:58:37 -07:00