Commit Graph

2815 Commits

Author SHA1 Message Date
Galen Wolfe-Pauly
7373c47237 talking 2015-03-07 11:09:30 -08:00
Anton Dyudin
404b8cedf7 %- stack trace annotation 2015-03-06 17:15:51 -08:00
Philip C Monk
1d6e199d65 merging across network tentatively works 2015-03-06 17:28:55 -05:00
Philip C Monk
459604b7df first over-the-network typed merge 2015-03-06 16:07:34 -05:00
Anton Dyudin
b692b1d75c slab -> slob
Conflicts:
	urb/zod/arvo/ford.hoon
2015-03-06 16:07:26 -05:00
Anton Dyudin
8771f59ff3 Fix #262 2015-03-06 11:27:39 -08:00
C. Guy Yarvin
ff0f2d2c22 Dojo with command parser, etc. 2015-03-06 01:11:01 -08:00
Galen Wolfe-Pauly
91ebe88f6d talk reorg 2015-03-05 19:58:23 -08:00
Philip C Monk
4f2e514563 waypoint 2015-03-05 20:19:54 -05:00
Philip C Monk
31d3788115 Merge remote-tracking branch 'origin/master' into typedclay
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/eyre.hoon
	urb/zod/arvo/hoon.hoon
	urb/zod/arvo/zuse.hoon
	urb/zod/main/app/poke/core.hook
	urb/zod/main/app/reboot/core.hook
	urb/zod/main/app/shell/core.hook
	urb/zod/main/app/tree/core.hook
2015-03-05 18:27:07 -05:00
C. Guy Yarvin
46f4f89183 Re-converged ford with dojo. 2015-03-05 14:58:04 -08:00
C. Guy Yarvin
8fbb779a7a Merge branch 'master' into dillbo
Conflicts:
	urb/urbit.pill
2015-03-05 13:31:35 -08:00
C. Guy Yarvin
f4d4cd6ba7 Various fixes and improvements. 2015-03-05 13:22:39 -08:00
Galen Wolfe-Pauly
bda5010311 talking 2015-03-04 17:51:03 -08:00
Philip C Monk
092a2822e9 progress toward sub-booting 2015-03-04 19:36:29 -05:00
Anton Dyudin
f92d84c7a1 passing ced to ford 2015-03-03 18:22:02 -08:00
Philip C Monk
55e8072b3b arvo side of getting subs to boot 2015-03-03 20:05:41 -05:00
Anton Dyudin
de05d4c2b5 restructuring, auth 2015-03-02 17:52:55 -08:00
Anton Dyudin
01becd1f7c - regex 2015-03-02 17:52:39 -08:00
Philip C Monk
8777772efa basic userspace merge tool 2015-03-02 20:28:32 -05:00
Philip C Monk
0e024a009f move along, nothing to see here 2015-02-27 01:35:41 -05:00
Anton Dyudin
cfa3183640 improved odor checking 2015-02-26 18:20:07 -08:00
Anton Dyudin
6cd54faa7a Syntax tightening 2015-02-26 17:29:39 -08:00
Anton Dyudin
5d5aa0242b Fixed regular $ rune parsing 2015-02-26 16:04:50 -08:00
Anton Dyudin
432bf24aed clarity refactoring 2015-02-26 16:04:12 -08:00
Anton Dyudin
7638f58977 more ship hacks 2015-02-26 13:23:46 -08:00
Anton Dyudin
002a9b6f46 preen %e 2015-02-26 13:17:29 -08:00
C. Guy Yarvin
e33384f379 rebase prep 2015-02-26 12:06:23 -08:00
Anton Dyudin
6f3ba3d9a5 preliminary auth 2015-02-25 17:20:45 -08:00
Philip C Monk
fe5821eb73 real text merge 2015-02-25 20:16:24 -05:00
Philip C Monk
5d4ef54ca1 first crack at %meld 2015-02-25 17:58:47 -05:00
C. Guy Yarvin
25bbc1c67f Basic dialog workings. 2015-02-25 08:57:43 -08:00
Anton Dyudin
82f89036e2 BTC base58check @uc odour v1 2015-02-24 18:10:11 -08:00
C. Guy Yarvin
7b56bcfe06 Back to where I thought I was. 2015-02-24 15:42:28 -08:00
C. Guy Yarvin
bd4eff0fbb Recover a BUNCH of old stuff from a stash. 2015-02-24 15:31:58 -08:00
C. Guy Yarvin
e6f584023d Don't reverse moves. 2015-02-24 15:25:17 -08:00
C. Guy Yarvin
8b2dfedee2 Barnaby, almost working. 2015-02-24 14:53:31 -08:00
Galen Wolfe-Pauly
ec2b8f56fd doc -> docs 2015-02-24 11:33:50 -08:00
C. Guy Yarvin
afa7d7f752 Merge branch 'master' into dillbo
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/ford.hoon
2015-02-24 11:01:26 -08:00
C. Guy Yarvin
24932f3b44 Various fixes and improvements. 2015-02-24 10:57:47 -08:00
Philip C Monk
a22cef74f7 fix false positives in crisscross detection 2015-02-23 20:21:53 -05:00
Galen Wolfe-Pauly
bbcea8c08f moved into doc desk 2015-02-23 15:28:09 -08:00
Philip C Monk
ae63f74ef5 %mate works? 2015-02-23 17:35:22 -05:00
C. Guy Yarvin
a1e015931f Forgot to commit the dojo. 2015-02-21 14:42:36 -08:00
C. Guy Yarvin
22b43e2527 Basic funktionality on :dojo. 2015-02-21 14:37:35 -08:00
C. Guy Yarvin
0d511f2a59 Various fixes and improvements. 2015-02-20 18:40:15 -08:00
Philip C Monk
4ced937e60 %mate conflict detection 2015-02-20 21:07:45 -05:00
Anton Dyudin
d5b51d1842 Cached %bake 2015-02-20 13:42:57 -08:00
Anton Dyudin
bdf3f1400a dbg wip 2015-02-19 21:27:23 -08:00
Anton Dyudin
0928494416 Merge branch 'master' into eyre-new
Conflicts:
	n/t.c
2015-02-19 19:59:03 -08:00