Commit Graph

123 Commits

Author SHA1 Message Date
Galen Wolfe-Pauly
177d4e530c fixed arvo spinner 2015-06-17 18:30:19 -07:00
Raymond Pasco
6b9b3bf850 Document ++ob
formatting
2015-06-17 14:16:43 -07:00
Raymond Pasco
74ea5dc599 Document ++ob 2015-06-17 17:11:40 -04:00
Anton Dyudin
4e406694e0 update talk help from readme, closing #293 2015-06-17 13:26:53 -07:00
Anton Dyudin
c3c86b2061 Merge branch 'master' into test
Conflicts:
	urb/zod/base/pub/tree/src/js/main.js
2015-06-17 13:20:11 -07:00
Anton Dyudin
8a8055ba3a demo sched mark 2015-06-16 18:06:58 -07:00
Galen Wolfe-Pauly
409d208cd9 too many basepath 2015-06-16 15:57:29 -07:00
Anton Dyudin
b845051bf6 Merge branch 'master' into test
Conflicts:
	urb/urbit.pill
	urb/zod/base/mar/oct3-move.hoon
	urb/zod/base/pub/cloud/fab/hymn.hook
	urb/zod/base/pub/cloud/src/main.js
2015-06-16 15:19:51 -07:00
Anton Dyudin
035d5c1efa talk ;help v1 2015-06-16 12:34:40 -07:00
Anton Dyudin
6cbb6b060d Revert "remove docs for demo", "remove odds and ends", "demo network", "DEMO ONLY: root beak as %demo.", "DEMO ONLY: don't show doznec flapping.", "Prinrtf."
This reverts commit 8e1e40d75b3ab15c194b6bf9570f3edc46e2de58.
This reverts commit f073c490f9fd7c5abc033af4857df92229877de7.
This reverts commit f187d2d7e01a54823f3e979af9bbd148b398e7e9.
This reverts commit bc272862a73cfce1b118586ca39d3a377d841f1b.
This reverts commit 30a397513f8890a3406dc7ab91c6e067e3bbfbbb.
This reverts commit 4fc6856fb50d88c20a0f533392ca606641c5f38f.

Conflicts:
	urb/urbit.pill
	urb/zod/base/lib/drum.hoon
2015-06-15 18:10:02 -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
ff94ef162b Revert "Revert "remove docs for demo", "remove odds and ends", "demo network", "DEMO ONLY: root beak as %demo.""
This reverts commit b07f8c81db3f7ab0a10d1b8ddc58de7c593612fc.

Conflicts:
	urb/urbit.pill
	urb/zod/base/pub/doc/guide/a-ford.md
	urb/zod/base/pub/doc/hoon/library/3bg.md
2015-06-15 14:56:52 -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
Galen Wolfe-Pauly
9076c6074b talk detail 2015-06-09 14:56:54 -07:00
Galen Wolfe-Pauly
a4e3254c8a fonts and some talk details 2015-06-08 18:14:18 -07:00
Anton Dyudin
b644040e7a minor clean-up: dawn.c->down.c, -sqar.c 2015-06-05 15:52:52 -07:00
Galen Wolfe-Pauly
f837e082b6 nock spec 2015-06-05 15:45:52 -07:00
Anton Dyudin
7b4e85bad4 psal -> elem 2015-06-05 15:20:26 -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
80ac6ffe0a 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.

Conflicts:
	urb/urbit.pill
2015-06-05 14:03:30 -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
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
Henry Ault
224939f6e9 trying to booth gce s with external ips 2015-06-03 17:49:20 -07:00
Galen Wolfe-Pauly
5b48108ae6 formatting, &c 2015-06-03 17:29:56 -07:00
Anton Dyudin
75fd854f40 Merge branch 'demo' into test 2015-06-03 13:15:46 -07:00
Galen Wolfe-Pauly
5e54a45902 change path in hymn 2015-06-03 09:36:19 -07:00
Henry Ault
7f16f641bd weird talk bug 2015-06-02 18:36:23 -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
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
Henry Ault
9c30b51395 Merge branch 'master' of https://github.com/urbit/urbit 2015-05-29 19:48:09 -07:00
Henry Ault
6e904f5b6f complete unified interface, actions & imgs left 2015-05-29 19:45:56 -07:00
Anton Dyudin
3e0e63eaa5 fixed styl mark 2015-05-29 15:05:47 -07:00
Anton Dyudin
19fd175abe misc untrackeditude 2015-05-29 12:09:21 -07:00
Anton Dyudin
11b024858f Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-28 16:34:40 -07:00
Galen Wolfe-Pauly
8888a449cf talk changes 2015-05-28 16:30:06 -07:00
Galen Wolfe-Pauly
fa0d6326c9 octo frontend 2015-05-28 16:16:01 -07:00
Anton Dyudin
1bd371b1cc more liberal casting 2015-05-28 14:36:19 -07:00
Florian Steinel
357c8606c7 fix link 2015-05-27 21:20:23 +02:00