1
0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-29 01:44:08 +03:00
Commit Graph

167 Commits

Author SHA1 Message Date
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
d4fedca801 ip loop 2015-06-11 14:30:48 -07:00
Henry Ault
303d79a556 ip addresses 2015-06-11 13:03:49 -07:00
Henry Ault
521c83207a Merge branch 'demo' of https://github.com/urbit/urbit into demo 2015-06-10 17:01:46 -07:00
Henry Ault
9bb5d52804 big clean up 2015-06-10 17:01:23 -07:00
Henry Ault
273400608c cutting out create-disk 2015-06-10 13:53:43 -07:00
C. Guy Yarvin
94fca664fe Some formatting cleanups. 2015-06-10 11:08:49 -07:00
Anton Dyudin
b3fbdc6d3a various fixes and improvements 2015-06-09 16:35:04 -07:00
C. Guy Yarvin
47409846e0 Revert "Debug printfs."
This reverts commit a565c4ae8d515311883e9fa4ad7e9f253de38d0c.

Conflicts:
	urb/zod/base/ape/talk.hoon
2015-06-09 16:34:03 -07:00
C. Guy Yarvin
ef3052e696 Revert "Moar printf."
This reverts commit 4455f5388aaea0229afee9532f59108c4a7b22aa.

Conflicts:
	urb/zod/base/ape/talk.hoon
2015-06-09 16:33:34 -07:00
C. Guy Yarvin
c81f2448bc Revert "Right."
This reverts commit fbdff0c3e2aae8364f044c4572eff9faa1dc1700.

Conflicts:
	urb/zod/base/ape/talk.hoon
2015-06-09 16:33:00 -07:00
Anton Dyudin
a0c5212ee3 work around ^~ language issue, restore lib/talk
Conflicts:
	urb/zod/base/lib/talk.hoon
2015-06-09 12:21:54 -07:00
Anton Dyudin
a02f8d0f06 work around ^~ language issue, restore lib/talk 2015-06-09 12:20:51 -07:00
Henry Ault
277886d092 list images 2015-06-09 10:35:02 -07:00
Galen Wolfe-Pauly
ae4ddbb50b Merge branch 'demo' of github.com:urbit/urbit into demo 2015-06-09 10:12:10 -07:00
C. Guy Yarvin
63a71c7200 Some tweaks. 2015-06-09 08:23:40 -07:00
C. Guy Yarvin
5c745dbcc4 Prinrtf. 2015-06-08 17:05:43 -07:00
C. Guy Yarvin
e35e682bd4 Yes. 2015-06-08 16:48:46 -07:00
C. Guy Yarvin
edb77b95cb But actually compiling. 2015-06-08 16:46:56 -07:00
C. Guy Yarvin
ecc39e0fef Printf. 2015-06-08 16:46:26 -07:00
C. Guy Yarvin
5a17929381 Right. 2015-06-08 15:53:43 -07:00
C. Guy Yarvin
50d0d7e5fa Moar printf. 2015-06-08 15:52:51 -07:00
C. Guy Yarvin
481a8cc2d0 Moar printf. 2015-06-08 15:41:38 -07:00
C. Guy Yarvin
4a10194d5c Typo. 2015-06-08 15:17:47 -07:00
C. Guy Yarvin
5865526981 Debug printfs. 2015-06-08 15:16:04 -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
C. Guy Yarvin
d155f0497f Various fixes and improvements. 2015-06-08 12:48:35 -07:00
C. Guy Yarvin
c584282cd1 Bandaid 2, a gross one. 2015-06-06 22:49:53 -07:00
Anton Dyudin
e2ec03fb56 stray core.hook 2015-06-05 15:59:39 -07:00
Anton Dyudin
7dee1f7466 Merge branch 'demo' of https://github.com/urbit/urbit into demo 2015-06-05 13:30:42 -07:00
Anton Dyudin
89a76c488b Merge branch 'demo' of https://github.com/urbit/urbit into demo
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/dojo.hoon
2015-06-05 13:22:29 -07:00
Henry Ault
4a370a7318 talk bug, instructions in asana 2015-06-05 12:36:58 -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
C. Guy Yarvin
7524157829 Various fixes and improvements. 2015-06-04 21:14:07 -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
b32c688648 Revert "remove docs for demo", "remove odds and ends", "demo network", "DEMO ONLY: root beak as %demo."
This reverts commit 8e1e40d75b3ab15c194b6bf9570f3edc46e2de58.
This reverts commit f073c490f9fd7c5abc033af4857df92229877de7.
This reverts commit f187d2d7e01a54823f3e979af9bbd148b398e7e9.
This reverts commit bc272862a73cfce1b118586ca39d3a377d841f1b.
2015-06-04 16:56:30 -07:00
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