Commit Graph

144 Commits

Author SHA1 Message Date
Henry Ault
2a583c0ee9 Merge branch 'do' of https://github.com/urbit/urbit into do
Conflicts:
	urb/zod/base/ape/bit/core.hook
2015-05-20 13:50:42 -07:00
Anton Dyudin
1515de98c3 changed to :bit+send 0cADDRESS 'BTC-amount' 2015-05-20 12:17:52 -07:00
Anton Dyudin
ab078ee41a Merge branch 'test' into do
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/  --  took --theirs
	urb/zod/base/fap/talk/core.hook
2015-05-20 11:45:37 -07:00
C. Guy Yarvin
43cd71b227 Check in demo instructions. 2015-05-19 19:38:03 -07:00
C. Guy Yarvin
dc0df6ce52 Various fixes and improvements. 2015-05-19 16:37:52 -07:00
C. Guy Yarvin
b35f0970fb Fix subs. 2015-05-19 16:22:25 -07:00
C. Guy Yarvin
6e938f99a1 Change to /web. 2015-05-19 16:08:35 -07:00
C. Guy Yarvin
6843bd4e04 -T for autoboot. 2015-05-19 11:38:23 -07:00
C. Guy Yarvin
9110f4cc3e Change talk prompt. 2015-05-18 21:31:30 -07:00
C. Guy Yarvin
7331650ae2 Fixed starting an app with # *. 2015-05-18 21:27:39 -07:00
Philip C Monk
8d5d2f0b32 fixed :+mass 2015-05-18 21:16:32 -04: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
08ab26aec7 drum compiles. 2015-05-15 17:23:40 -07:00
C. Guy Yarvin
b567343d54 Merge branch 'test' into livetest
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/hood/core.hook
	urb/zod/base/arvo/dill.hoon
2015-05-15 13:34:41 -07:00
C. Guy Yarvin
6b4f6a80f1 Various fixes. 2015-05-15 01:09:12 -07:00
C. Guy Yarvin
9a60d48e21 Various fixes and improvements. 2015-05-14 16:27:45 -07:00
C. Guy Yarvin
e190e20256 Checking in for fun and profit. 2015-05-14 12:24:43 -07:00
Anton Dyudin
15bcbb23e7 cleaning up %base to %home 2015-05-14 11:04:32 -07:00
C. Guy Yarvin
cc2a7defb5 Various fixes and improvements. 2015-05-13 16:31:13 -07:00
Anton Dyudin
b60cf4d702 port complete 2015-05-13 13:17:38 -07:00
Anton Dyudin
5d252b315e Merge branch 'test' into do 2015-05-13 12:46:39 -07:00
Anton Dyudin
a8578d4ed2 port1 2015-05-13 12:46:25 -07:00
Anton Dyudin
77796a4fa6 Merge branch 'test' into do
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/dill.hoon
	urb/zod/base/arvo/gall.hoon
2015-05-13 12:21:53 -07:00
C. Guy Yarvin
2b940d9346 Various fixes and improvements; test can :?begin. 2015-05-13 01:02:34 -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
6952ecaa75 Switch from helm to hood. 2015-05-11 17:43:47 -07:00
C. Guy Yarvin
2cfe3c252b Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-11 17:32:47 -07:00
C. Guy Yarvin
1f2ed6ae76 Merge old helm code into hood/kiln. 2015-05-11 17:31:37 -07:00
Anton Dyudin
0eaaa00f6f cherry-pick 8caa882 'add tym to dojo' 2015-05-11 12:09:41 -07:00
C. Guy Yarvin
1a7b72fbe9 Forgot a file. 2015-05-11 11:05:14 -07:00
C. Guy Yarvin
66f7b16d5e Various fixes and improvements. 2015-05-11 10:53:47 -07:00
C. Guy Yarvin
fa5f5dc786 Didn't mean to chek in a broken helm. 2015-05-09 15:35:57 -07:00
C. Guy Yarvin
ea5ab48776 Various fixes and improvements. 2015-05-09 13:38:33 -07:00
C. Guy Yarvin
cf6cd46177 Various fixes and improvements. 2015-05-08 18:08:18 -07:00
C. Guy Yarvin
fbf9930b34 test now switched over to behn. 2015-05-08 16:02:50 -07:00
C. Guy Yarvin
e15fcdbcda Unbreak eyre. 2015-05-08 13:57:34 -07:00
C. Guy Yarvin
802a76a279 Command-line functionality with %behn. 2015-05-08 12:43:11 -07:00
C. Guy Yarvin
b0eac3721a Latest stuff hand-merged from %behn. 2015-05-08 10:56:30 -07:00
C. Guy Yarvin
de80178627 Hand-merge in all newgall files. 2015-05-06 19:31:54 -07:00