Commit Graph

50 Commits

Author SHA1 Message Date
C. Guy Yarvin
c584282cd1 Bandaid 2, a gross one. 2015-06-06 22:49:53 -07:00
C. Guy Yarvin
acc4b61cda Merge branch 'demo' of https://github.com/urbit/urbit into demo
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/clay.hoon
2015-06-05 15:11:55 -07:00
C. Guy Yarvin
2888822f70 Remove numerous printfs. 2015-06-05 15:07:40 -07:00
Anton Dyudin
89a76c488b Merge branch 'demo' of https://github.com/urbit/urbit into demo
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/dojo.hoon
2015-06-05 13:22:29 -07:00
C. Guy Yarvin
7524157829 Various fixes and improvements. 2015-06-04 21:14:07 -07:00
Anton Dyudin
e760115f8a Merge branch 'demo' into test
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/cloud.hoon
	urb/zod/base/arvo/gall.hoon
	urb/zod/base/mar/oct2-move.hoon
	urb/zod/base/mar/oct2-update.hoon
2015-06-04 17:16:13 -07:00
Anton Dyudin
09e4021349 added %core silk, transitioned mar lib ape etc. 2015-06-04 15:16:48 -07:00
C. Guy Yarvin
a0156a472a First phase of gall beak redo. 2015-06-04 13:47:49 -07:00
Philip C Monk
1357ce6198 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/hood/core.hook
	urb/zod/base/lib/helm/core.hook
2015-06-03 17:31:37 -04:00
Philip C Monk
3307443e12 use kiln for initial autosync 2015-06-03 17:18:13 -04:00
Henry Ault
7f16f641bd weird talk bug 2015-06-02 18:36:23 -07:00
Philip C Monk
56c47a8125 Merge branch 'nextbreach' into test
Conflicts:
	urb/zod/base/ape/hood/core.hook
	urb/zod/base/lib/kiln/core.hook
2015-05-31 23:36:30 -04:00
Anton Dyudin
38839bf941 minor cleaning 2015-05-29 16:48:58 -07:00
Anton Dyudin
c4cd7cb075 fix sigh types 2015-05-29 12:27:09 -07:00
C. Guy Yarvin
82339474c7 Merge branch 'test' into goodtest 2015-05-28 12:17:44 -07:00
C. Guy Yarvin
16004b615e Merge branch 'test' into goodtest
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/dojo/core.hook
	urb/zod/base/ape/hood/core.hook
	urb/zod/base/ape/octo/core.hook
	urb/zod/base/arvo/hoon.hoon
2015-05-28 12:16:10 -07:00
Anton Dyudin
a4c42bc7ee cli utils, yet untyped 2015-05-28 10:38:25 -07:00
C. Guy Yarvin
ae67dcdf34 Finish moving ++from into bowl. 2015-05-28 00:56:08 -07:00
C. Guy Yarvin
7ec596e1b5 Moved from to bowl. 2015-05-27 23:51:32 -07:00
C. Guy Yarvin
7e841df093 Replaced hide with bowl. 2015-05-27 20:48:25 -07:00
C. Guy Yarvin
fc07a7e44a Before merging to update gall. 2015-05-27 19:00:53 -07:00
Anton Dyudin
f2e0911933 hiss/sigh typed http requests 2015-05-27 15:34:01 -07:00
Philip C Monk
6cd237ef7f move :+sync to userspace 2015-05-25 21:20:45 -04:00
Anton Dyudin
593aa09701 wip 2015-05-25 18:17:59 -07:00
C. Guy Yarvin
cd09667bc7 Before from tweak. 2015-05-23 10:03:02 -07:00
Henry Ault
5703d91b33 ported do to newgall 2015-05-20 18:34:45 -07:00
Philip C Monk
8d5d2f0b32 fixed :+mass 2015-05-18 21:16:32 -04:00
C. Guy Yarvin
4fc95723e7 Various fixes and unimprovements. 2015-05-17 20:51:17 -07:00
C. Guy Yarvin
1f17f99852 Various fixes and improvements. 2015-05-17 19:34:05 -07:00
C. Guy Yarvin
e28c7fd468 Fix queuing issue. 2015-05-17 12:39:03 -07:00
C. Guy Yarvin
be7ce2d332 hood without sole seems ready to use. 2015-05-16 19:37:36 -07:00
C. Guy Yarvin
a277625d5e drum in hood works, modulo slow update bug. 2015-05-16 17:31:28 -07:00
C. Guy Yarvin
9a60d48e21 Various fixes and improvements. 2015-05-14 16:27:45 -07:00
Anton Dyudin
15bcbb23e7 cleaning up %base to %home 2015-05-14 11:04:32 -07:00
C. Guy Yarvin
04379dac6e Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-05-13 17:15:06 -07:00
C. Guy Yarvin
cc2a7defb5 Various fixes and improvements. 2015-05-13 16:31:13 -07:00
C. Guy Yarvin
2b940d9346 Various fixes and improvements; test can :?begin. 2015-05-13 01:02:34 -07:00
C. Guy Yarvin
30d32255b9 Let %them through. 2015-05-12 15:00:18 -07:00
C. Guy Yarvin
6dcbda8df4 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/helm/core.hook
2015-05-12 13:36:21 -07:00
C. Guy Yarvin
5665fb132a Various cleanups. 2015-05-12 13:10:22 -07:00
Anton Dyudin
fdbf46ce16 added json octo interfaces 2015-05-12 12:57:58 -07:00
C. Guy Yarvin
1f2ed6ae76 Merge old helm code into hood/kiln. 2015-05-11 17:31:37 -07:00
C. Guy Yarvin
b3027a328b And %gall is reborn. 2015-05-09 15:55:05 -07:00
C. Guy Yarvin
e7791411cb The great god %gall is dead. 2015-05-09 13:49:11 -07:00
C. Guy Yarvin
cf6cd46177 Various fixes and improvements. 2015-05-08 18:08:18 -07:00
Anton Dyudin
b72da57ce8 Merge branch 'space-tools' into test
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/time.hoon
2015-05-07 10:30:32 -07:00
Philip C Monk
98801c4a14 added space profiling tools 2015-05-06 22:25:41 -04:00
C. Guy Yarvin
9d55c17455 Hand-merge behn and gall. 2015-05-06 19:25:10 -07:00
Philip C Monk
ed698889f6 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-04-29 19:03:59 -04:00
Philip C Monk
f03263852c main->base, arvo events depth-first 2015-04-29 18:48:45 -04:00