Commit Graph

300 Commits

Author SHA1 Message Date
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
C. Guy Yarvin
cd5026cce5 Yo, didn't add. 2015-05-28 11:28:31 -07:00
C. Guy Yarvin
82da3d3adb Semi-fixed octo. 2015-05-28 10:04:24 -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
ec1bb36984 Change lat to now. 2015-05-27 20:54:20 -07:00
C. Guy Yarvin
7e841df093 Replaced hide with bowl. 2015-05-27 20:48:25 -07:00
C. Guy Yarvin
217a539e54 Um, commit this. 2015-05-27 20:17:09 -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
Henry Ault
6450ed4ca1 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-26 17:29:15 -07:00
Henry Ault
ae094a05dc updating joint state 2015-05-26 17:29:02 -07:00
Anton Dyudin
b18bc0bc24 Merge branch 'master' into test
Conflicts:
	urb/urbit.pill
	urb/zod/base/pub/tree/src/js/components/CodeMirror.coffee
	urb/zod/base/pub/tree/src/js/main.js
2015-05-26 15:12:26 -07:00
Anton Dyudin
23b190e9de line numbers 2015-05-26 14:52:59 -07:00
Anton Dyudin
dd4aa98d02 Merge branch 'test'@0b9d56f
Conflicts:
	urb/urbit.pill
2015-05-26 14:45:48 -07:00
Anton Dyudin
991bc3fb3d working tree js 2015-05-26 14:35:30 -07:00
Anton Dyudin
06384f6bc0 re-add CM react 2015-05-26 14:35:30 -07:00
Anton Dyudin
5ffead0ec0 re-add CM react 2015-05-26 14:23:39 -07:00
Anton Dyudin
809c524e70 working tree js 2015-05-26 14:22:49 -07:00
Anton Dyudin
276042f78e Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-26 13:57:30 -07:00
Anton Dyudin
c2641a464a gage unwinding stable 2015-05-26 13:56:21 -07:00
Henry Ault
e6a6f40405 pre-state unification 2015-05-26 13:47:57 -07:00
Anton Dyudin
cab4b671a6 reloads 2015-05-26 13:24:14 -07:00
C. Guy Yarvin
b50faa769b octo, possibly almost perfect. 2015-05-25 21:00:34 -07:00
Henry Ault
7ac192a5a1 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-25 19:28:24 -07:00
Henry Ault
8918885dd5 create disk, check status 2015-05-25 19:28:08 -07:00
C. Guy Yarvin
4d4bc1688b Basic functionality on new octo. 2015-05-25 19:15:08 -07:00
Anton Dyudin
593aa09701 wip 2015-05-25 18:17:59 -07:00
ault011
9c96a3da76 delete coin 2015-05-25 11:32:14 -07:00
Henry Ault
ed2ba93eb2 outbound gce create request 2015-05-23 14:40:20 -07:00
Henry Ault
58e4cf42c8 question 2 2015-05-23 14:21:47 -07:00
Henry Ault
71754c764b question about error msgs 2015-05-23 13:45:42 -07:00
C. Guy Yarvin
1e76f8b4dc Fix preceding commit. 2015-05-23 10:27:24 -07:00
C. Guy Yarvin
a2853db342 Fix preceding commit. 2015-05-23 10:05:17 -07:00
C. Guy Yarvin
cd09667bc7 Before from tweak. 2015-05-23 10:03:02 -07:00
C. Guy Yarvin
ea4e7b917f Add ++gulf and &/, |/ syntax to match ++each. 2015-05-21 22:30:08 -07:00
Henry Ault
8515db0b3a reorganized frontend components 2015-05-21 19:53:50 -07:00
Anton Dyudin
1f8a857d7a Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-21 17:40:05 -07:00
Anton Dyudin
ffed0f0c62 debugging printf 2015-05-21 17:39:55 -07:00
Henry Ault
b5d7375817 Merge branch 'do' into test 2015-05-21 17:24:09 -07:00
Henry Ault
e6d8ec36d0 do->cloud rename 2015-05-21 17:22:56 -07:00
Anton Dyudin
860df1d8b4 missing desk assert 2015-05-21 16:47:50 -07:00
Anton Dyudin
21fb3d6b12 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-05-21 16:04:11 -07:00
Anton Dyudin
f60df5f6b5 /= decrash 2015-05-21 15:56:14 -07:00
demo
5650ae05f8 tame empty-broq-peek 2015-05-21 21:34:06 +00:00
Philip C Monk
f1cbc2bed5 Merge branch 'nextbreach'
Conflicts:
	urb/urbit.pill
2015-05-21 13:49:21 -04:00
C. Guy Yarvin
9fad0573db Fix up demo a little bit. 2015-05-21 09:05:14 -07:00
C. Guy Yarvin
5421c42f46 Merge branch 'master' into test 2015-05-20 23:17:02 -07:00
C. Guy Yarvin
2efa61a6f8 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-20 23:09:05 -07:00
C. Guy Yarvin
4b14564c72 Just checking in. 2015-05-20 22:37:14 -07:00