Commit Graph

179 Commits

Author SHA1 Message Date
Anton Dyudin
09e4021349 added %core silk, transitioned mar lib ape etc. 2015-06-04 15:16:48 -07:00
C. Guy Yarvin
27c102e6fb Merge branch 'demo' of https://github.com/urbit/urbit into demo 2015-06-04 13:48:19 -07:00
C. Guy Yarvin
a0156a472a First phase of gall beak redo. 2015-06-04 13:47:49 -07:00
Henry Ault
224939f6e9 trying to booth gce s with external ips 2015-06-03 17:49:20 -07:00
Galen Wolfe-Pauly
e4ab9c4aed Merge branch 'demo' of github.ct push origin demoom:urbit/urbit into demo 2015-06-03 17:30:44 -07:00
Galen Wolfe-Pauly
5b48108ae6 formatting, &c 2015-06-03 17:29:56 -07:00
Anton Dyudin
08c5fb4719 doubly-wet from-* in hood 2015-06-03 15:16:32 -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
C. Guy Yarvin
7d4bc90020 Merge branch 'demo' of https://github.com/urbit/urbit into demo 2015-06-03 14:12:53 -07:00
C. Guy Yarvin
ddea34f856 Fix hand-sent moves. 2015-06-03 13:46:53 -07:00
Anton Dyudin
75fd854f40 Merge branch 'demo' into test 2015-06-03 13:15:46 -07:00
Anton Dyudin
63ae7612f6 Merge commit 'f073c490f9^' into test
Conflicts:
	urb/urbit.pill
2015-06-03 12:54:56 -07:00
Anton Dyudin
b996b7ff5f fix %url speech type change 2015-06-03 11:44:40 -07:00
Henry Ault
7f16f641bd weird talk bug 2015-06-02 18:36:23 -07:00
C. Guy Yarvin
5b5054e8f6 Various fixes and improvements. 2015-06-02 16:17:55 -07:00
Galen Wolfe-Pauly
c81d742f60 remove odds and ends 2015-06-02 15:59:10 -07:00
C. Guy Yarvin
22a7829b80 Clean up prep and some debugging msgs. 2015-06-02 14:30:00 -07:00
C. Guy Yarvin
52555291bc Fix hood to route errors properly through :talk. 2015-06-02 13:52:33 -07:00
Henry Ault
088397fac7 merging back into test 2015-06-02 13:15:40 -07:00
C. Guy Yarvin
282a9ec75f Various fixes and improvements. 2015-06-02 11:36:56 -07:00
C. Guy Yarvin
3db089b444 Merge branch 'test' into demo
Conflicts:
	urb/urbit.pill
2015-06-01 16:47:09 -07:00
C. Guy Yarvin
29ffce7aa6 Various cleanups for demo. 2015-06-01 16:25:22 -07:00
Philip C Monk
54bca477d5 fix validate-foreign-plops 2015-06-01 16:46:36 -04:00
C. Guy Yarvin
c9e785bb48 Support | syntax for hood stuff. 2015-06-01 13:46:22 -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
C. Guy Yarvin
60b5bdacba Fixes. 2015-05-31 12:07:42 -07:00
C. Guy Yarvin
32e87179e9 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-31 01:18:00 -07:00
C. Guy Yarvin
697b911fa8 Various fixes and improvements to oct*. 2015-05-31 01:17:32 -07:00
C. Guy Yarvin
d03d3fcf4e Various fixes and improvements. 2015-05-31 00:19:35 -07:00
Anton Dyudin
8ca9c69be9 userspace cleaning 2015-05-30 00:53:19 -07:00
Anton Dyudin
38839bf941 minor cleaning 2015-05-29 16:48:58 -07:00
C. Guy Yarvin
69059e72c0 Split octo into three versions. 2015-05-29 15:24:34 -07:00
C. Guy Yarvin
4a0517f666 Various fixes and improvements. 2015-05-29 15:09:25 -07:00
C. Guy Yarvin
a228f88491 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-29 12:45:27 -07:00
C. Guy Yarvin
1a514466c9 Fix some bugs. Spay talk display. 2015-05-29 12:45:05 -07:00
Anton Dyudin
c4cd7cb075 fix sigh types 2015-05-29 12:27:09 -07:00
C. Guy Yarvin
ecff43975d More fixes, etc. 2015-05-29 01:48:14 -07:00
C. Guy Yarvin
4bee29b89c Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/zod/base/ape/octo/core.hook
2015-05-29 01:37:12 -07:00
C. Guy Yarvin
1671375215 Various fixes and improvements. 2015-05-29 01:36:23 -07:00
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
Philip C Monk
7fe05c5255 couple of fixes 2015-05-27 13:53:33 -04: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
Philip C Monk
6cd237ef7f move :+sync to userspace 2015-05-25 21:20:45 -04: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
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