urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-15 04:22:48 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,064 Commits 768 Branches 10 Tags 215 MiB
11b024858f
Commit Graph

87 Commits

Author SHA1 Message Date
Anton Dyudin
11b024858f Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-28 16:34:40 -07:00
Anton Dyudin
b56591a002 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/zod/base/ape/bit/core.hook
 2015-05-28 16:34:26 -07:00
Galen Wolfe-Pauly
fa0d6326c9 octo frontend 2015-05-28 16:16:01 -07:00
Anton Dyudin
d7df3d2ce9 :bit port to hiss v1 2015-05-28 16:07:03 -07:00
C. Guy Yarvin
2b9aafc94e Correct merge from test. 2015-05-28 12:28:12 -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
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
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
dd4aa98d02 Merge branch 'test'@0b9d56f 
Conflicts:
	urb/urbit.pill
 2015-05-26 14:45:48 -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
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
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
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
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
C. Guy Yarvin
9fad0573db Fix up demo a little bit. 2015-05-21 09:05:14 -07:00
C. Guy Yarvin
4b14564c72 Just checking in. 2015-05-20 22:37:14 -07:00
Henry Ault
5703d91b33 ported do to newgall 2015-05-20 18:34:45 -07:00
C. Guy Yarvin
b561cdcb95 Display %url lines. 2015-05-20 17:45:24 -07:00
C. Guy Yarvin
42b26c65e6 Just saving. 2015-05-20 16:55:46 -07:00
C. Guy Yarvin
703a8200d0 Check in just to save. 2015-05-20 16:54:49 -07:00
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