C. Guy Yarvin
acc4b61cda
Merge branch 'demo' of https://github.com/urbit/urbit into demo
...
Conflicts:
urb/urbit.pill
urb/zod/base/arvo/clay.hoon
2015-06-05 15:11:55 -07:00
C. Guy Yarvin
2888822f70
Remove numerous printfs.
2015-06-05 15:07:40 -07:00
Galen Wolfe-Pauly
493c5e1c0a
minor cm css
2015-06-05 14:11:03 -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
5fee8a558e
fix tree relative path
2015-06-05 13:32:29 -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
Anton Dyudin
bfa80ec64b
abstract oct3 fab over desk
2015-06-05 12:50:34 -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
68f37a69a3
Merge branch 'test' of https://github.com/urbit/urbit into test
2015-06-04 18:35:23 -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
e76d14c3cf
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:07:28 -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
3ce58169c9
Merge branch 'demo' of https://github.com/urbit/urbit into demo
2015-06-04 16:37:01 -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
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
Anton Dyudin
95c01388be
Merge branch 'test' of https://github.com/urbit/urbit into test
2015-06-03 18:04:11 -07:00
Anton Dyudin
bb17c271eb
cleaned up dependency handling
2015-06-03 18:03:35 -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
C. Guy Yarvin
eba2e52a08
Merge branch 'demo' of https://github.com/urbit/urbit into demo
2015-06-03 16:36:06 -07:00
Philip C Monk
41f14b5c2e
more debugging stuff
2015-06-03 19:07:17 -04:00
Anton Dyudin
08c5fb4719
doubly-wet from-* in hood
2015-06-03 15:16:32 -07:00
Anton Dyudin
7b629c02df
Merge branch 'test' of https://github.com/urbit/urbit into test
...
Conflicts:
urb/urbit.pill
2015-06-03 15:15:12 -07:00
Anton Dyudin
e3df8c3be4
print failing marks in lilt
2015-06-03 14:42:26 -07:00
Anton Dyudin
d58940cd43
Merge branch 'test' into demo: ignore fakenet revert
2015-06-03 14:41:24 -07:00
Philip C Monk
4e7a0c8ca5
Merge branch 'test' of https://github.com/urbit/urbit into test
...
Conflicts:
urb/urbit.pill
2015-06-03 17:36:45 -04: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
C. Guy Yarvin
82875311bd
DEMO ONLY: root beak as %demo.
2015-06-03 14:24:57 -07:00
C. Guy Yarvin
b3b3827f28
Good file.
2015-06-03 14:19:53 -07:00
Anton Dyudin
3ed0d1cda4
Revert "demo network"
...
This reverts commit f187d2d7e01a54823f3e979af9bbd148b398e7e9.
Conflicts:
urb/urbit.pill
2015-06-03 14:19:49 -07:00
C. Guy Yarvin
496264b2e9
Bad files.
2015-06-03 14:19:38 -07: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
Anton Dyudin
1f6a69c3bf
Merge branch 'demo' of https://github.com/urbit/urbit into demo
...
Conflicts:
urb/urbit.pill
2015-06-03 13:54:06 -07:00
C. Guy Yarvin
ddea34f856
Fix hand-sent moves.
2015-06-03 13:46:53 -07:00
Philip C Monk
d5454d373e
better ames pass paths for debugging
2015-06-03 16:37:02 -04:00
Anton Dyudin
84e60726d4
Merge branch 'test' into demo
2015-06-03 13:26:48 -07:00
Anton Dyudin
6342a8424a
Ignore commit '209cae1bcfaae' into demo
2015-06-03 13:26:11 -07:00
Anton Dyudin
ca912bc379
Merge branch 'test' into demo
2015-06-03 13:24:37 -07:00
Anton Dyudin
75fd854f40
Merge branch 'demo' into test
2015-06-03 13:15:46 -07:00
Anton Dyudin
06de2a91f4
Ignore commits 'f073c490f9f' and '8e1e40d75' in test.
...
Docs kept, "odds and ends" kept
2015-06-03 13:15:06 -07:00
