Commit Graph

218 Commits

Author SHA1 Message Date
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
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
e09301dd48 Fix obsolete-beak and gall-misordering bugs. 2015-06-08 23:53:39 -07:00
C. Guy Yarvin
1d09626776 Less. 2015-06-08 16:36:14 -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
C. Guy Yarvin
5818f4c437 Disable olz mechanism in ames. 2015-06-06 22:00:18 -07:00
C. Guy Yarvin
6334937f1a New pill. 2015-06-05 15:33:07 -07:00
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
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
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
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
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
a0156a472a First phase of gall beak redo. 2015-06-04 13:47:49 -07:00
Anton Dyudin
bb17c271eb cleaned up dependency handling 2015-06-03 18:03:35 -07:00
Philip C Monk
41f14b5c2e more debugging stuff 2015-06-03 19:07:17 -04: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
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
Anton Dyudin
3ed0d1cda4 Revert "demo network"
This reverts commit f187d2d7e01a54823f3e979af9bbd148b398e7e9.

Conflicts:
	urb/urbit.pill
2015-06-03 14:19:49 -07:00
Philip C Monk
3307443e12 use kiln for initial autosync 2015-06-03 17:18:13 -04: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
Philip C Monk
d5454d373e better ames pass paths for debugging 2015-06-03 16:37:02 -04: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
63ae7612f6 Merge commit 'f073c490f9^' into test
Conflicts:
	urb/urbit.pill
2015-06-03 12:54:56 -07:00
Anton Dyudin
def96a0254 normalized %eyre* to use ++back for root-beak casting
Conflicts:
	urb/urbit.pill
2015-06-03 12:21:47 -07:00
Anton Dyudin
e91effd5ec normalized %ford to use ++back wherever %cast
Conflicts:
	urb/urbit.pill
2015-06-03 12:21:27 -07:00
Anton Dyudin
6e86d8efc4 normalized %eyre* to use ++back for root-beak casting 2015-06-03 11:20:25 -07:00
Philip C Monk
e95531688c move initial autosync to userspace 2015-06-03 14:06:44 -04:00
Anton Dyudin
22062b0b18 normalized %ford to use ++back wherever %cast 2015-06-03 11:04:19 -07:00
Henry Ault
93f0872626 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-06-02 18:36:40 -07:00
Henry Ault
7f16f641bd weird talk bug 2015-06-02 18:36:23 -07:00
Anton Dyudin
2153067463 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-06-02 18:35:56 -07:00
Anton Dyudin
2c34ae94da bidirectional translation rc1 2015-06-02 18:05:11 -07:00
Anton Dyudin
2e30e2b5e6 add +-gas:ju 2015-06-02 17:40:34 -07:00
C. Guy Yarvin
5b5054e8f6 Various fixes and improvements. 2015-06-02 16:17:55 -07:00
C. Guy Yarvin
52555291bc Fix hood to route errors properly through :talk. 2015-06-02 13:52:33 -07:00
Philip C Monk
68f76aecd8 attempting to fix goning problem 2015-06-02 16:40:53 -04: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
Anton Dyudin
6a08824905 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-06-01 16:25:21 -07:00
Anton Dyudin
6fbca6aabf turn on gages, use them to ignore files that crash on sync 2015-06-01 16:16:55 -07:00