Commit Graph

1048 Commits

Author SHA1 Message Date
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
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
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
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
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
pcmonk
0dd086550d add timestamps and textual names for = in chat 2014-07-10 12:01:24 -07:00
pcmonk
2f2112f153 bump protocol number for breach 2014-07-10 11:21:49 -07:00
pcmonk
6f66d66f16 chat entering not reported bug fixed 2014-07-10 11:05:20 -07:00
pcmonk
aba680d1a8 Merge branch 'master' of https://github.com/urbit/urbit 2014-07-10 10:42:46 -07:00
pcmonk
8b8e1218fd chat private messaging prompt now persistent 2014-07-10 10:42:05 -07: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
606dc97887 Merge branch 'master' of github.com:urbit/urbit 2014-07-09 18:39:19 -07:00
C. Guy Yarvin
2c53cdb8cb Fix a very eyre bug. 2014-07-09 18:39:01 -07:00
johncburnham
4c2cb96dae Small improvement to error messages in browser 2014-07-09 18:37:44 -07: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
pcmonk
426cfb7367 improved zongs-to-hymn translator 2014-07-09 16:34:44 -07:00
C. Guy Yarvin
56a8799501 Various fixes and improvements. 2014-07-09 16:12:26 -07:00
pcmonk
96482b8292 Merge branch 'master' of https://github.com/urbit/urbit 2014-07-09 15:59:44 -07:00
pcmonk
81ada0aa99 removed stale %send handling 2014-07-09 15:59:22 -07:00
John Dulin
d30fcda95a Updated foobug, appbug-2, philbug to not break and not have %rasps. Only appbug-2 functions properly though. 2014-07-09 15:27:41 -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
Jared Hance
3866e5a5df Small indent fix. 2014-07-09 11:36:28 -04:00
C. Guy Yarvin
5496fe9e79 Fix FCGI cache handling. 2014-07-09 02:40:49 -07:00
C. Guy Yarvin
2d9e4e4a29 Merge branch 'master' of github.com:urbit/urbit
Conflicts:
	urb/urbit.pill
2014-07-09 00:40:19 -07:00
C. Guy Yarvin
f9236fe2c8 Various fixes and improvements. 2014-07-09 00:37:47 -07:00
C. Guy Yarvin
8296c6189d Fix FCGI suffix. 2014-07-08 20:24:40 -07:00
pcmonk
2e230304fc Fixed lag bug 2014-07-08 20:20:38 -07:00
C. Guy Yarvin
95eb7baca5 Various fixes and improvements. 2014-07-08 20:00:30 -07:00
C. Guy Yarvin
acbb821155 Fix basic functional publishing. 2014-07-08 15:46:34 -07:00
C. Guy Yarvin
46c9731e21 A bunch of translators. 2014-07-08 15:12:42 -07:00