Commit Graph

3357 Commits

Author SHA1 Message Date
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
Philip C Monk
c21b335a36 better ames pass paths for debugging 2015-06-03 16:29:41 -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
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
b996b7ff5f fix %url speech type change 2015-06-03 11:44:40 -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
Galen Wolfe-Pauly
5e54a45902 change path in hymn 2015-06-03 09:36: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
Philip C Monk
f770556baf Merge branch 'goningfix' into test 2015-06-02 21:25:16 -04:00
Philip C Monk
174a07bece Merge branch 'test' of https://github.com/urbit/urbit into test 2015-06-02 21:24:56 -04: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
Galen Wolfe-Pauly
e216eb1f36 remove docs for demo 2015-06-02 15:59:27 -07:00
Galen Wolfe-Pauly
c81d742f60 remove odds and ends 2015-06-02 15:59:10 -07:00
C. Guy Yarvin
dba0c71c38 Actually X. 2015-06-02 14:31:29 -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
Philip C Monk
68f76aecd8 attempting to fix goning problem 2015-06-02 16:40:53 -04:00
Henry Ault
3ddaa35c35 merging cloud front end 2015-06-02 13:20:16 -07:00
ault011
1afa1602e9 Delete main.css 2015-06-02 13:19:16 -07:00
ault011
5df03ea9b1 Delete main.js 2015-06-02 13:19:10 -07:00
ault011
c3a18d3c91 Delete hymn.hook 2015-06-02 13:18:37 -07:00
ault011
ee4eb06e93 cloud not ready 2015-06-02 13:17:34 -07:00
Henry Ault
088397fac7 merging back into test 2015-06-02 13:15:40 -07:00
Anton Dyudin
a46173ce74 pointed breload actually at /=base= 2015-06-02 13:09:21 -07:00