Commit Graph

56 Commits

Author SHA1 Message Date
Anton Dyudin
035d5c1efa talk ;help v1 2015-06-16 12:34:40 -07:00
Anton Dyudin
49ee373df7 Merge branch 'test' into demo
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/hood.hoon
	urb/zod/base/mar/hoon.hoon
2015-06-15 15:06:59 -07:00
Anton Dyudin
307e8cf776 formatting, .hoon highlighting 2015-06-11 14:53:32 -07:00
Henry Ault
273400608c cutting out create-disk 2015-06-10 13:53:43 -07:00
Henry Ault
277886d092 list images 2015-06-09 10:35:02 -07:00
C. Guy Yarvin
a4cf8b1d0e Fix auth url in bit. Add app/ in %app talk report. 2015-06-08 14:30:32 -07:00
Anton Dyudin
b644040e7a minor clean-up: dawn.c->down.c, -sqar.c 2015-06-05 15:52:52 -07:00
Anton Dyudin
7b4e85bad4 psal -> elem 2015-06-05 15:20:26 -07:00
Galen Wolfe-Pauly
8f84e30e44 Merge branch 'demo' of github.com:urbit/urbit into demo 2015-06-05 14:09:12 -07:00
Galen Wolfe-Pauly
5cd6aff30e codemirror css 2015-06-05 14:09:02 -07:00
Anton Dyudin
b9de345874 Revert "Revert "remove docs for demo", "remove odds and ends", "demo network", "DEMO ONLY: root beak as %demo.""
This reverts commit b112c9ea1efb661d4bb33965b10ad0a511a86a0c.

Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/cloud.hoon
	urb/zod/base/pub/cloud/src/main.js
2015-06-05 11:58:32 -07:00
Anton Dyudin
496d115b2f taped over lib/talk bug 2015-06-04 18:33:52 -07:00
Anton Dyudin
0eb309eb8f path refactoring 2015-06-04 17:27:01 -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
e266db77ad minor cleanup, fixed lib/talk serial type 2015-06-04 16:24:55 -07:00
Anton Dyudin
09e4021349 added %core silk, transitioned mar lib ape etc. 2015-06-04 15:16:48 -07:00
C. Guy Yarvin
496264b2e9 Bad files. 2015-06-03 14:19:38 -07:00
Anton Dyudin
b996b7ff5f fix %url speech type change 2015-06-03 11:44:40 -07:00
C. Guy Yarvin
282a9ec75f Various fixes and improvements. 2015-06-02 11:36:56 -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
Anton Dyudin
8ca9c69be9 userspace cleaning 2015-05-30 00:53:19 -07:00
C. Guy Yarvin
69059e72c0 Split octo into three versions. 2015-05-29 15:24:34 -07:00
Anton Dyudin
3e0e63eaa5 fixed styl mark 2015-05-29 15:05:47 -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
7545115853 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-29 12:09:42 -07:00
Anton Dyudin
19fd175abe misc untrackeditude 2015-05-29 12:09:21 -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
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
Anton Dyudin
d7df3d2ce9 :bit port to hiss v1 2015-05-28 16:07:03 -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
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
C. Guy Yarvin
4d4bc1688b Basic functionality on new octo. 2015-05-25 19:15:08 -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
7e4cf03c93 codemirror tree v1 2015-05-20 15:13:27 -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
Henry Ault
4ce18a92d2 beginning of GCE auth 2015-05-20 13:49:19 -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
Anton Dyudin
0cafcc4612 standalone hook coloring 2015-05-19 20:29:04 -07:00
Philip C Monk
759106d25a more cleanup 2015-05-18 17:32:14 -04: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
Henry Ault
689b5df159 about to port 2015-05-12 15:58:27 -07:00
Anton Dyudin
fdbf46ce16 added json octo interfaces 2015-05-12 12:57:58 -07:00
C. Guy Yarvin
cf6cd46177 Various fixes and improvements. 2015-05-08 18:08:18 -07:00
Galen Wolfe-Pauly
369dd1878a tree for editing 2015-05-08 16:47:46 -07:00